yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: 批量去除 vo

pull/143/head
xingyu4j 2025-06-15 15:33:18 +08:00
parent 96c4ee974a
commit 93a02573d7
64 changed files with 240 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/web-antd/src/api/bpm/definition/index.ts
View File

@ -4,8 +4,7 @@ import { requestClient } from '#/api/request';
export namespace BpmProcessDefinitionApi { export namespace BpmProcessDefinitionApi {
/** 流程定义 */ /** 流程定义 */
// TODO @ziye：不用 VO 后缀哈 export interface ProcessDefinition {
export interface ProcessDefinitionVO {
id: string; id: string;
version: number; version: number;
deploymentTime: number; deploymentTime: number;
@ -21,7 +20,7 @@ export namespace BpmProcessDefinitionApi {
/** 查询流程定义 */ /** 查询流程定义 */
export async function getProcessDefinition(id?: string, key?: string) { export async function getProcessDefinition(id?: string, key?: string) {
return requestClient.get<BpmProcessDefinitionApi.ProcessDefinitionVO>( return requestClient.get<BpmProcessDefinitionApi.ProcessDefinition>(
'/bpm/process-definition/get', '/bpm/process-definition/get',
{ {
params: { id, key }, params: { id, key },
@ -32,13 +31,13 @@ export async function getProcessDefinition(id?: string, key?: string) {
/** 分页查询流程定义 */ /** 分页查询流程定义 */
export async function getProcessDefinitionPage(params: PageParam) { export async function getProcessDefinitionPage(params: PageParam) {
return requestClient.get< return requestClient.get<
PageResult<BpmProcessDefinitionApi.ProcessDefinitionVO> PageResult<BpmProcessDefinitionApi.ProcessDefinition>
>('/bpm/process-definition/page', { params }); >('/bpm/process-definition/page', { params });
} }
/** 查询流程定义列表 */ /** 查询流程定义列表 */
export async function getProcessDefinitionList(params: any) { export async function getProcessDefinitionList(params: any) {
return requestClient.get<BpmProcessDefinitionApi.ProcessDefinitionVO[]>( return requestClient.get<BpmProcessDefinitionApi.ProcessDefinition[]>(
'/bpm/process-definition/list', '/bpm/process-definition/list',
{ {
params, params,
@ -49,6 +48,6 @@ export async function getProcessDefinitionList(params: any) {
/** 查询流程定义列表（简单列表） */ /** 查询流程定义列表（简单列表） */
export async function getSimpleProcessDefinitionList() { export async function getSimpleProcessDefinitionList() {
return requestClient.get< return requestClient.get<
PageResult<BpmProcessDefinitionApi.ProcessDefinitionVO> PageResult<BpmProcessDefinitionApi.ProcessDefinition>
>('/bpm/process-definition/simple-list'); >('/bpm/process-definition/simple-list');
} }

11
apps/web-antd/src/api/bpm/oa/leave/index.ts
View File

@ -3,8 +3,7 @@ import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace BpmOALeaveApi { export namespace BpmOALeaveApi {
// TODO @ziye：不用 VO 后缀 export interface Leave {
export interface LeaveVO {
id: number; id: number;
status: number; status: number;
type: number; type: number;
@ -18,23 +17,23 @@ export namespace BpmOALeaveApi {
} }
/** 创建请假申请 */ /** 创建请假申请 */
export async function createLeave(data: BpmOALeaveApi.LeaveVO) { export async function createLeave(data: BpmOALeaveApi.Leave) {
return requestClient.post('/bpm/oa/leave/create', data); return requestClient.post('/bpm/oa/leave/create', data);
} }
/** 更新请假申请 */ /** 更新请假申请 */
export async function updateLeave(data: BpmOALeaveApi.LeaveVO) { export async function updateLeave(data: BpmOALeaveApi.Leave) {
return requestClient.post('/bpm/oa/leave/update', data); return requestClient.post('/bpm/oa/leave/update', data);
} }
/** 获得请假申请 */ /** 获得请假申请 */
export async function getLeave(id: number) { export async function getLeave(id: number) {
return requestClient.get<BpmOALeaveApi.LeaveVO>(`/bpm/oa/leave/get?id=${id}`); return requestClient.get<BpmOALeaveApi.Leave>(`/bpm/oa/leave/get?id=${id}`);
} }
/** 获得请假申请分页 */ /** 获得请假申请分页 */
export async function getLeavePage(params: PageParam) { export async function getLeavePage(params: PageParam) {
return requestClient.get<PageResult<BpmOALeaveApi.LeaveVO>>( return requestClient.get<PageResult<BpmOALeaveApi.Leave>>(
'/bpm/oa/leave/page', '/bpm/oa/leave/page',
{ params }, { params },
); );

13
apps/web-antd/src/api/bpm/processExpression/index.ts
View File

@ -3,9 +3,8 @@ import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace BpmProcessExpressionApi { export namespace BpmProcessExpressionApi {
// TODO @ziye：不用 VO 后缀 /** 流程表达式 */
/** 流程表达式 VO */ export interface ProcessExpression {
export interface ProcessExpressionVO {
id: number; // 编号 id: number; // 编号
name: string; // 表达式名字 name: string; // 表达式名字
status: number; // 表达式状态 status: number; // 表达式状态
@ -16,27 +15,27 @@ export namespace BpmProcessExpressionApi {
/** 查询流程表达式分页 */ /** 查询流程表达式分页 */
export async function getProcessExpressionPage(params: PageParam) { export async function getProcessExpressionPage(params: PageParam) {
return requestClient.get< return requestClient.get<
PageResult<BpmProcessExpressionApi.ProcessExpressionVO> PageResult<BpmProcessExpressionApi.ProcessExpression>
>('/bpm/process-expression/page', { params }); >('/bpm/process-expression/page', { params });
} }
/** 查询流程表达式详情 */ /** 查询流程表达式详情 */
export async function getProcessExpression(id: number) { export async function getProcessExpression(id: number) {
return requestClient.get<BpmProcessExpressionApi.ProcessExpressionVO>( return requestClient.get<BpmProcessExpressionApi.ProcessExpression>(
`/bpm/process-expression/get?id=${id}`, `/bpm/process-expression/get?id=${id}`,
); );
} }
/** 新增流程表达式 */ /** 新增流程表达式 */
export async function createProcessExpression( export async function createProcessExpression(
data: BpmProcessExpressionApi.ProcessExpressionVO, data: BpmProcessExpressionApi.ProcessExpression,
) { ) {
return requestClient.post<number>('/bpm/process-expression/create', data); return requestClient.post<number>('/bpm/process-expression/create', data);
} }
/** 修改流程表达式 */ /** 修改流程表达式 */
export async function updateProcessExpression( export async function updateProcessExpression(
data: BpmProcessExpressionApi.ProcessExpressionVO, data: BpmProcessExpressionApi.ProcessExpression,
) { ) {
return requestClient.put<boolean>('/bpm/process-expression/update', data); return requestClient.put<boolean>('/bpm/process-expression/update', data);
} }

52
apps/web-antd/src/api/bpm/processInstance/index.ts
View File

@ -9,29 +9,29 @@ import { requestClient } from '#/api/request';
export namespace BpmProcessInstanceApi { export namespace BpmProcessInstanceApi {
// TODO @芋艿：一些注释缺少或者不对； // TODO @芋艿：一些注释缺少或者不对；
export type Task = { export interface Task {
id: number; id: number;
name: string; name: string;
}; }
export type User = { export interface User {
avatar: string; avatar: string;
id: number; id: number;
nickname: string; nickname: string;
}; }
// 审批任务信息 // 审批任务信息
export type ApprovalTaskInfo = { export interface ApprovalTaskInfo {
assigneeUser: User; assigneeUser: User;
id: number; id: number;
ownerUser: User; ownerUser: User;
reason: string; reason: string;
signPicUrl: string; signPicUrl: string;
status: number; status: number;
}; }
// 审批节点信息 // 审批节点信息
export type ApprovalNodeInfo = { export interface ApprovalNodeInfo {
candidateStrategy?: BpmCandidateStrategyEnum; candidateStrategy?: BpmCandidateStrategyEnum;
candidateUsers?: User[]; candidateUsers?: User[];
endTime?: Date; endTime?: Date;
@ -41,10 +41,10 @@ export namespace BpmProcessInstanceApi {
startTime?: Date; startTime?: Date;
status: number; status: number;
tasks: ApprovalTaskInfo[]; tasks: ApprovalTaskInfo[];
}; }
/** 流程实例 */ /** 流程实例 */
export type ProcessInstanceVO = { export interface ProcessInstance {
businessKey: string; businessKey: string;
category: string; category: string;
createTime: string; createTime: string;
@ -61,20 +61,20 @@ export namespace BpmProcessInstanceApi {
startUser?: User; startUser?: User;
status: number; status: number;
tasks?: BpmProcessInstanceApi.Task[]; tasks?: BpmProcessInstanceApi.Task[];
}; }
// 审批详情 // 审批详情
export type ApprovalDetail = { export interface ApprovalDetail {
activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[];
formFieldsPermission: any; formFieldsPermission: any;
processDefinition: BpmModelApi.ProcessDefinition; processDefinition: BpmModelApi.ProcessDefinition;
processInstance: BpmProcessInstanceApi.ProcessInstanceVO; processInstance: BpmProcessInstanceApi.ProcessInstance;
status: number; status: number;
todoTask: BpmTaskApi.TaskVO; todoTask: BpmTaskApi.Task;
}; }
// 抄送流程实例 VO // 抄送流程实例
export type CopyVO = { export interface Copy {
activityId: string; activityId: string;
activityName: string; activityName: string;
createTime: number; createTime: number;
@ -90,12 +90,12 @@ export namespace BpmProcessInstanceApi {
value: string; value: string;
}[]; }[];
taskId: string; taskId: string;
}; }
} }
/** 查询我的流程实例分页 */ /** 查询我的流程实例分页 */
export async function getProcessInstanceMyPage(params: PageParam) { export async function getProcessInstanceMyPage(params: PageParam) {
return requestClient.get<PageResult<BpmProcessInstanceApi.ProcessInstanceVO>>( return requestClient.get<PageResult<BpmProcessInstanceApi.ProcessInstance>>(
'/bpm/process-instance/my-page', '/bpm/process-instance/my-page',
{ params }, { params },
); );
@ -103,7 +103,7 @@ export async function getProcessInstanceMyPage(params: PageParam) {
/** 查询管理员流程实例分页 */ /** 查询管理员流程实例分页 */
export async function getProcessInstanceManagerPage(params: PageParam) { export async function getProcessInstanceManagerPage(params: PageParam) {
return requestClient.get<PageResult<BpmProcessInstanceApi.ProcessInstanceVO>>( return requestClient.get<PageResult<BpmProcessInstanceApi.ProcessInstance>>(
'/bpm/process-instance/manager-page', '/bpm/process-instance/manager-page',
{ params }, { params },
); );
@ -111,7 +111,7 @@ export async function getProcessInstanceManagerPage(params: PageParam) {
/** 新增流程实例 */ /** 新增流程实例 */
export async function createProcessInstance(data: any) { export async function createProcessInstance(data: any) {
return requestClient.post<BpmProcessInstanceApi.ProcessInstanceVO>( return requestClient.post<BpmProcessInstanceApi.ProcessInstance>(
'/bpm/process-instance/create', '/bpm/process-instance/create',
data, data,
); );
@ -142,14 +142,14 @@ export async function cancelProcessInstanceByAdmin(id: number, reason: string) {
/** 查询流程实例详情 */ /** 查询流程实例详情 */
export async function getProcessInstance(id: number) { export async function getProcessInstance(id: number) {
return requestClient.get<BpmProcessInstanceApi.ProcessInstanceVO>( return requestClient.get<BpmProcessInstanceApi.ProcessInstance>(
`/bpm/process-instance/get?id=${id}`, `/bpm/process-instance/get?id=${id}`,
); );
} }
/** 查询复制流程实例分页 */ /** 查询复制流程实例分页 */
export async function getProcessInstanceCopyPage(params: PageParam) { export async function getProcessInstanceCopyPage(params: PageParam) {
return requestClient.get<PageResult<BpmProcessInstanceApi.ProcessInstanceVO>>( return requestClient.get<PageResult<BpmProcessInstanceApi.ProcessInstance>>(
'/bpm/process-instance/copy/page', '/bpm/process-instance/copy/page',
{ params }, { params },
); );
@ -157,9 +157,9 @@ export async function getProcessInstanceCopyPage(params: PageParam) {
/** 更新流程实例 */ /** 更新流程实例 */
export async function updateProcessInstance( export async function updateProcessInstance(
data: BpmProcessInstanceApi.ProcessInstanceVO, data: BpmProcessInstanceApi.ProcessInstance,
) { ) {
return requestClient.put<BpmProcessInstanceApi.ProcessInstanceVO>( return requestClient.put<BpmProcessInstanceApi.ProcessInstance>(
'/bpm/process-instance/update', '/bpm/process-instance/update',
data, data,
); );
@ -183,7 +183,7 @@ export async function getNextApprovalNodes(params: any) {
/** 获取表单字段权限 */ /** 获取表单字段权限 */
export async function getFormFieldsPermission(params: any) { export async function getFormFieldsPermission(params: any) {
return requestClient.get<BpmProcessInstanceApi.ProcessInstanceVO>( return requestClient.get<BpmProcessInstanceApi.ProcessInstance>(
`/bpm/process-instance/get-form-fields-permission`, `/bpm/process-instance/get-form-fields-permission`,
{ params }, { params },
); );
@ -191,7 +191,7 @@ export async function getFormFieldsPermission(params: any) {
/** 获取流程实例 BPMN 模型视图 */ /** 获取流程实例 BPMN 模型视图 */
export async function getProcessInstanceBpmnModelView(id: string) { export async function getProcessInstanceBpmnModelView(id: string) {
return requestClient.get<BpmProcessInstanceApi.ProcessInstanceVO>( return requestClient.get<BpmProcessInstanceApi.ProcessInstance>(
`/bpm/process-instance/get-bpmn-model-view?id=${id}`, `/bpm/process-instance/get-bpmn-model-view?id=${id}`,
); );
} }

13
apps/web-antd/src/api/bpm/processListener/index.ts
View File

@ -3,9 +3,8 @@ import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace BpmProcessListenerApi { export namespace BpmProcessListenerApi {
// TODO @ziye：不用 VO 后缀 /** BPM 流程监听器 */
/** BPM 流程监听器 VO */ export interface ProcessListener {
export interface ProcessListenerVO {
id: number; // 编号 id: number; // 编号
name: string; // 监听器名字 name: string; // 监听器名字
type: string; // 监听器类型 type: string; // 监听器类型
@ -18,7 +17,7 @@ export namespace BpmProcessListenerApi {
/** 查询流程监听器分页 */ /** 查询流程监听器分页 */
export async function getProcessListenerPage(params: PageParam) { export async function getProcessListenerPage(params: PageParam) {
return requestClient.get<PageResult<BpmProcessListenerApi.ProcessListenerVO>>( return requestClient.get<PageResult<BpmProcessListenerApi.ProcessListener>>(
'/bpm/process-listener/page', '/bpm/process-listener/page',
{ params }, { params },
); );
@ -26,21 +25,21 @@ export async function getProcessListenerPage(params: PageParam) {
/** 查询流程监听器详情 */ /** 查询流程监听器详情 */
export async function getProcessListener(id: number) { export async function getProcessListener(id: number) {
return requestClient.get<BpmProcessListenerApi.ProcessListenerVO>( return requestClient.get<BpmProcessListenerApi.ProcessListener>(
`/bpm/process-listener/get?id=${id}`, `/bpm/process-listener/get?id=${id}`,
); );
} }
/** 新增流程监听器 */ /** 新增流程监听器 */
export async function createProcessListener( export async function createProcessListener(
data: BpmProcessListenerApi.ProcessListenerVO, data: BpmProcessListenerApi.ProcessListener,
) { ) {
return requestClient.post<number>('/bpm/process-listener/create', data); return requestClient.post<number>('/bpm/process-listener/create', data);
} }
/** 修改流程监听器 */ /** 修改流程监听器 */
export async function updateProcessListener( export async function updateProcessListener(
data: BpmProcessListenerApi.ProcessListenerVO, data: BpmProcessListenerApi.ProcessListener,
) { ) {
return requestClient.put<boolean>('/bpm/process-listener/update', data); return requestClient.put<boolean>('/bpm/process-listener/update', data);
} }

31
apps/web-antd/src/api/bpm/task/index.ts
View File

@ -5,9 +5,8 @@ import type { BpmProcessInstanceApi } from '../processInstance';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace BpmTaskApi { export namespace BpmTaskApi {
// TODO @ziye：不用 VO 后缀；注释使用 /** */ 风格； /** BPM 流程监听器 */
/** BPM 流程监听器 VO */ export interface Task {
export interface TaskVO {
id: number; // 编号 id: number; // 编号
name: string; // 监听器名字 name: string; // 监听器名字
type: string; // 监听器类型 type: string; // 监听器类型
@ -16,8 +15,8 @@ export namespace BpmTaskApi {
valueType: string; // 监听器值类型 valueType: string; // 监听器值类型
} }
// 流程任务 VO // 流程任务
export interface TaskManagerVO { export interface TaskManager {
id: string; // 编号 id: string; // 编号
name: string; // 任务名称 name: string; // 任务名称
createTime: number; // 创建时间 createTime: number; // 创建时间
@ -29,7 +28,7 @@ export namespace BpmTaskApi {
assigneeUser: any; // 处理人 assigneeUser: any; // 处理人
taskDefinitionKey: string; // 任务定义key taskDefinitionKey: string; // 任务定义key
processInstanceId: string; // 流程实例id processInstanceId: string; // 流程实例id
processInstance: BpmProcessInstanceApi.ProcessInstanceVO; // 流程实例 processInstance: BpmProcessInstanceApi.ProcessInstance; // 流程实例
parentTaskId: any; // 父任务id parentTaskId: any; // 父任务id
children: any; // 子任务 children: any; // 子任务
formId: any; // 表单id formId: any; // 表单id
@ -46,27 +45,21 @@ export namespace BpmTaskApi {
/** 查询待办任务分页 */ /** 查询待办任务分页 */
export async function getTaskTodoPage(params: PageParam) { export async function getTaskTodoPage(params: PageParam) {
return requestClient.get<PageResult<BpmTaskApi.TaskVO>>( return requestClient.get<PageResult<BpmTaskApi.Task>>('/bpm/task/todo-page', {
'/bpm/task/todo-page', params,
{ });
params,
},
);
} }
/** 查询已办任务分页 */ /** 查询已办任务分页 */
export async function getTaskDonePage(params: PageParam) { export async function getTaskDonePage(params: PageParam) {
return requestClient.get<PageResult<BpmTaskApi.TaskVO>>( return requestClient.get<PageResult<BpmTaskApi.Task>>('/bpm/task/done-page', {
'/bpm/task/done-page', params,
{ });
params,
},
);
} }
/** 查询任务管理分页 */ /** 查询任务管理分页 */
export async function getTaskManagerPage(params: PageParam) { export async function getTaskManagerPage(params: PageParam) {
return requestClient.get<PageResult<BpmTaskApi.TaskVO>>( return requestClient.get<PageResult<BpmTaskApi.Task>>(
'/bpm/task/manager-page', '/bpm/task/manager-page',
{ params }, { params },
); );

15
apps/web-antd/src/api/bpm/userGroup/index.ts
View File

@ -3,9 +3,8 @@ import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace BpmUserGroupApi { export namespace BpmUserGroupApi {
// TODO @ziye：不用 VO 后缀 /** BPM 用户组 */
/** BPM 用户组 VO */ export interface UserGroup {
export interface UserGroupVO {
id: number; id: number;
name: string; name: string;
description: string; description: string;
@ -18,7 +17,7 @@ export namespace BpmUserGroupApi {
/** 查询用户组分页 */ /** 查询用户组分页 */
export async function getUserGroupPage(params: PageParam) { export async function getUserGroupPage(params: PageParam) {
return requestClient.get<PageResult<BpmUserGroupApi.UserGroupVO>>( return requestClient.get<PageResult<BpmUserGroupApi.UserGroup>>(
'/bpm/user-group/page', '/bpm/user-group/page',
{ params }, { params },
); );
@ -26,18 +25,18 @@ export async function getUserGroupPage(params: PageParam) {
/** 查询用户组详情 */ /** 查询用户组详情 */
export async function getUserGroup(id: number) { export async function getUserGroup(id: number) {
return requestClient.get<BpmUserGroupApi.UserGroupVO>( return requestClient.get<BpmUserGroupApi.UserGroup>(
`/bpm/user-group/get?id=${id}`, `/bpm/user-group/get?id=${id}`,
); );
} }
/** 新增用户组 */ /** 新增用户组 */
export async function createUserGroup(data: BpmUserGroupApi.UserGroupVO) { export async function createUserGroup(data: BpmUserGroupApi.UserGroup) {
return requestClient.post<number>('/bpm/user-group/create', data); return requestClient.post<number>('/bpm/user-group/create', data);
} }
/** 修改用户组 */ /** 修改用户组 */
export async function updateUserGroup(data: BpmUserGroupApi.UserGroupVO) { export async function updateUserGroup(data: BpmUserGroupApi.UserGroup) {
return requestClient.put<boolean>('/bpm/user-group/update', data); return requestClient.put<boolean>('/bpm/user-group/update', data);
} }
@ -48,7 +47,7 @@ export async function deleteUserGroup(id: number) {
/** 查询用户组列表 */ /** 查询用户组列表 */
export async function getUserGroupSimpleList() { export async function getUserGroupSimpleList() {
return requestClient.get<BpmUserGroupApi.UserGroupVO[]>( return requestClient.get<BpmUserGroupApi.UserGroup[]>(
`/bpm/user-group/simple-list`, `/bpm/user-group/simple-list`,
); );
} }

10
apps/web-antd/src/api/infra/codegen/index.ts
View File

@ -65,13 +65,13 @@ export namespace InfraCodegenApi {
} }
/** 更新代码生成请求 */ /** 更新代码生成请求 */
export interface CodegenUpdateReqVO { export interface CodegenUpdateReq {
table: any | CodegenTable; table: any | CodegenTable;
columns: CodegenColumn[]; columns: CodegenColumn[];
} }
/** 创建代码生成请求 */ /** 创建代码生成请求 */
export interface CodegenCreateListReqVO { export interface CodegenCreateListReq {
dataSourceConfigId?: number; dataSourceConfigId?: number;
tableNames: string[]; tableNames: string[];
} }
@ -106,7 +106,7 @@ export function getCodegenTable(tableId: number) {
} }
/** 修改代码生成表定义 */ /** 修改代码生成表定义 */
export function updateCodegenTable(data: InfraCodegenApi.CodegenUpdateReqVO) { export function updateCodegenTable(data: InfraCodegenApi.CodegenUpdateReq) {
return requestClient.put('/infra/codegen/update', data); return requestClient.put('/infra/codegen/update', data);
} }
@ -136,9 +136,7 @@ export function getSchemaTableList(params: any) {
} }
/** 基于数据库的表结构，创建代码生成器的表定义 */ /** 基于数据库的表结构，创建代码生成器的表定义 */
export function createCodegenList( export function createCodegenList(data: InfraCodegenApi.CodegenCreateListReq) {
data: InfraCodegenApi.CodegenCreateListReqVO,
) {
return requestClient.post('/infra/codegen/create-list', data); return requestClient.post('/infra/codegen/create-list', data);
} }

8
apps/web-antd/src/api/infra/file/index.ts
View File

@ -19,7 +19,7 @@ export namespace InfraFileApi {
} }
/** 文件预签名地址 */ /** 文件预签名地址 */
export interface FilePresignedUrlRespVO { export interface FilePresignedUrlResp {
configId: number; // 文件配置编号 configId: number; // 文件配置编号
uploadUrl: string; // 文件上传 URL uploadUrl: string; // 文件上传 URL
url: string; // 文件 URL url: string; // 文件 URL
@ -27,7 +27,7 @@ export namespace InfraFileApi {
} }
/** 上传文件 */ /** 上传文件 */
export interface FileUploadReqVO { export interface FileUploadReq {
file: globalThis.File; file: globalThis.File;
directory?: string; directory?: string;
} }
@ -47,7 +47,7 @@ export function deleteFile(id: number) {
/** 获取文件预签名地址 */ /** 获取文件预签名地址 */
export function getFilePresignedUrl(name: string, directory?: string) { export function getFilePresignedUrl(name: string, directory?: string) {
return requestClient.get<InfraFileApi.FilePresignedUrlRespVO>( return requestClient.get<InfraFileApi.FilePresignedUrlResp>(
'/infra/file/presigned-url', '/infra/file/presigned-url',
{ {
params: { name, directory }, params: { name, directory },
@ -62,7 +62,7 @@ export function createFile(data: InfraFileApi.File) {
/** 上传文件 */ /** 上传文件 */
export function uploadFile( export function uploadFile(
data: InfraFileApi.FileUploadReqVO, data: InfraFileApi.FileUploadReq,
onUploadProgress?: AxiosProgressEvent, onUploadProgress?: AxiosProgressEvent,
) { ) {
// 特殊：由于 upload 内部封装，即使 directory 为 undefined，也会传递给后端 // 特殊：由于 upload 内部封装，即使 directory 为 undefined，也会传递给后端

4
apps/web-antd/src/api/mall/statistics/common.ts
View File

@ -1,5 +1,5 @@
/** 数据对照 Response VO */ /** 数据对照 Response */
export interface MallDataComparisonRespVO<T> { export interface MallDataComparisonResp<T> {
value: T; value: T;
reference: T; reference: T;
} }

24
apps/web-antd/src/api/mall/statistics/member.ts
View File

@ -1,32 +1,32 @@
import type { MallDataComparisonRespVO } from './common'; import type { MallDataComparisonResp } from './common';
import { formatDate } from '@vben/utils'; import { formatDate } from '@vben/utils';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace MallMemberStatisticsApi { export namespace MallMemberStatisticsApi {
/** 会员分析 Request VO */ /** 会员分析 Request */
export interface AnalyseReq { export interface AnalyseReq {
times: Date[]; times: Date[];
} }
/** 会员分析对照数据 Response VO */ /** 会员分析对照数据 Response */
export interface AnalyseComparison { export interface AnalyseComparison {
registerUserCount: number; registerUserCount: number;
visitUserCount: number; visitUserCount: number;
rechargeUserCount: number; rechargeUserCount: number;
} }
/** 会员分析 Response VO */ /** 会员分析 Response */
export interface Analyse { export interface Analyse {
visitUserCount: number; visitUserCount: number;
orderUserCount: number; orderUserCount: number;
payUserCount: number; payUserCount: number;
atv: number; atv: number;
comparison: MallDataComparisonRespVO<AnalyseComparison>; comparison: MallDataComparisonResp<AnalyseComparison>;
} }
/** 会员地区统计 Response VO */ /** 会员地区统计 Response */
export interface AreaStatistics { export interface AreaStatistics {
areaId: number; areaId: number;
areaName: string; areaName: string;
@ -36,13 +36,13 @@ export namespace MallMemberStatisticsApi {
orderPayPrice: number; orderPayPrice: number;
} }
/** 会员性别统计 Response VO */ /** 会员性别统计 Response */
export interface SexStatistics { export interface SexStatistics {
sex: number; sex: number;
userCount: number; userCount: number;
} }
/** 会员统计 Response VO */ /** 会员统计 Response */
export interface Summary { export interface Summary {
userCount: number; userCount: number;
rechargeUserCount: number; rechargeUserCount: number;
@ -50,13 +50,13 @@ export namespace MallMemberStatisticsApi {
expensePrice: number; expensePrice: number;
} }
/** 会员终端统计 Response VO */ /** 会员终端统计 Response */
export interface TerminalStatistics { export interface TerminalStatistics {
terminal: number; terminal: number;
userCount: number; userCount: number;
} }
/** 会员数量统计 Response VO */ /** 会员数量统计 Response */
export interface Count { export interface Count {
/** 用户访问量 */ /** 用户访问量 */
visitUserCount: string; visitUserCount: string;
@ -64,7 +64,7 @@ export namespace MallMemberStatisticsApi {
registerUserCount: number; registerUserCount: number;
} }
/** 会员注册数量 Response VO */ /** 会员注册数量 Response */
export interface RegisterCount { export interface RegisterCount {
date: string; date: string;
count: number; count: number;
@ -114,7 +114,7 @@ export function getMemberTerminalStatisticsList() {
/** 获得用户数量量对照 */ /** 获得用户数量量对照 */
export function getUserCountComparison() { export function getUserCountComparison() {
return requestClient.get< return requestClient.get<
MallDataComparisonRespVO<MallMemberStatisticsApi.Count> MallDataComparisonResp<MallMemberStatisticsApi.Count>
>('/statistics/member/user-count-comparison'); >('/statistics/member/user-count-comparison');
} }

4
apps/web-antd/src/api/mall/statistics/pay.ts
View File

@ -2,7 +2,7 @@ import { requestClient } from '#/api/request';
export namespace MallPayStatisticsApi { export namespace MallPayStatisticsApi {
/** 支付统计 */ /** 支付统计 */
export interface PaySummaryRespVO { export interface PaySummaryResp {
/** 充值金额，单位分 */ /** 充值金额，单位分 */
rechargePrice: number; rechargePrice: number;
} }
@ -10,7 +10,7 @@ export namespace MallPayStatisticsApi {
/** 获取钱包充值金额 */ /** 获取钱包充值金额 */
export function getWalletRechargePrice() { export function getWalletRechargePrice() {
return requestClient.get<MallPayStatisticsApi.PaySummaryRespVO>( return requestClient.get<MallPayStatisticsApi.PaySummaryResp>(
'/statistics/pay/summary', '/statistics/pay/summary',
); );
} }

4
apps/web-antd/src/api/mall/statistics/product.ts
View File

@ -1,6 +1,6 @@
import type { PageParam, PageResult } from '@vben/request'; import type { PageParam, PageResult } from '@vben/request';
import type { MallDataComparisonRespVO } from './common'; import type { MallDataComparisonResp } from './common';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
@ -43,7 +43,7 @@ export namespace MallProductStatisticsApi {
/** 获得商品统计分析 */ /** 获得商品统计分析 */
export function getProductStatisticsAnalyse(params: PageParam) { export function getProductStatisticsAnalyse(params: PageParam) {
return requestClient.get< return requestClient.get<
MallDataComparisonRespVO<MallProductStatisticsApi.ProductStatistics> MallDataComparisonResp<MallProductStatisticsApi.ProductStatistics>
>('/statistics/product/analyse', { params }); >('/statistics/product/analyse', { params });
} }

22
apps/web-antd/src/api/mall/statistics/trade.ts
View File

@ -1,11 +1,11 @@
import type { MallDataComparisonRespVO } from './common'; import type { MallDataComparisonResp } from './common';
import { formatDate } from '@vben/utils'; import { formatDate } from '@vben/utils';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace MallTradeStatisticsApi { export namespace MallTradeStatisticsApi {
/** 交易统计 Response VO */ /** 交易统计 Response */
export interface TradeSummary { export interface TradeSummary {
yesterdayOrderCount: number; yesterdayOrderCount: number;
monthOrderCount: number; monthOrderCount: number;
@ -13,12 +13,12 @@ export namespace MallTradeStatisticsApi {
monthPayPrice: number; monthPayPrice: number;
} }
/** 交易状况 Request VO */ /** 交易状况 Request */
export interface TradeTrendReq { export interface TradeTrendReq {
times: [Date, Date]; times: [Date, Date];
} }
/** 交易状况统计 Response VO */ /** 交易状况统计 Response */
export interface TradeTrendSummary { export interface TradeTrendSummary {
time: string; time: string;
turnoverPrice: number; turnoverPrice: number;
@ -30,7 +30,7 @@ export namespace MallTradeStatisticsApi {
afterSaleRefundPrice: number; afterSaleRefundPrice: number;
} }
/** 交易订单数量 Response VO */ /** 交易订单数量 Response */
export interface TradeOrderCount { export interface TradeOrderCount {
/** 待发货 */ /** 待发货 */
undelivered?: number; undelivered?: number;
@ -42,7 +42,7 @@ export namespace MallTradeStatisticsApi {
auditingWithdraw?: number; auditingWithdraw?: number;
} }
/** 交易订单统计 Response VO */ /** 交易订单统计 Response */
export interface TradeOrderSummary { export interface TradeOrderSummary {
/** 支付订单商品数 */ /** 支付订单商品数 */
orderPayCount?: number; orderPayCount?: number;
@ -50,7 +50,7 @@ export namespace MallTradeStatisticsApi {
orderPayPrice?: number; orderPayPrice?: number;
} }
/** 订单量趋势统计 Response VO */ /** 订单量趋势统计 Response */
export interface TradeOrderTrend { export interface TradeOrderTrend {
/** 日期 */ /** 日期 */
date: string; date: string;
@ -71,7 +71,7 @@ const formatDateParam = (params: MallTradeStatisticsApi.TradeTrendReq) => {
/** 查询交易统计 */ /** 查询交易统计 */
export function getTradeStatisticsSummary() { export function getTradeStatisticsSummary() {
return requestClient.get< return requestClient.get<
MallDataComparisonRespVO<MallTradeStatisticsApi.TradeSummary> MallDataComparisonResp<MallTradeStatisticsApi.TradeSummary>
>('/statistics/trade/summary'); >('/statistics/trade/summary');
} }
@ -80,7 +80,7 @@ export function getTradeStatisticsAnalyse(
params: MallTradeStatisticsApi.TradeTrendReq, params: MallTradeStatisticsApi.TradeTrendReq,
) { ) {
return requestClient.get< return requestClient.get<
MallDataComparisonRespVO<MallTradeStatisticsApi.TradeTrendSummary> MallDataComparisonResp<MallTradeStatisticsApi.TradeTrendSummary>
>('/statistics/trade/analyse', { params: formatDateParam(params) }); >('/statistics/trade/analyse', { params: formatDateParam(params) });
} }
@ -113,7 +113,7 @@ export function getOrderCount() {
/** 获得交易订单数量对照 */ /** 获得交易订单数量对照 */
export function getOrderComparison() { export function getOrderComparison() {
return requestClient.get< return requestClient.get<
MallDataComparisonRespVO<MallTradeStatisticsApi.TradeOrderSummary> MallDataComparisonResp<MallTradeStatisticsApi.TradeOrderSummary>
>('/statistics/trade/order-comparison'); >('/statistics/trade/order-comparison');
} }
@ -124,7 +124,7 @@ export function getOrderCountTrendComparison(
endTime: Date, endTime: Date,
) { ) {
return requestClient.get< return requestClient.get<
MallDataComparisonRespVO<MallTradeStatisticsApi.TradeOrderTrend>[] MallDataComparisonResp<MallTradeStatisticsApi.TradeOrderTrend>[]
>('/statistics/trade/order-count-trend', { >('/statistics/trade/order-count-trend', {
params: { params: {
type, type,

4
apps/web-antd/src/api/pay/app/index.ts
View File

@ -24,7 +24,7 @@ export namespace PayAppApi {
status: number; status: number;
} }
export interface AppPageReqVO extends PageParam { export interface AppPageReq extends PageParam {
name?: string; name?: string;
status?: number; status?: number;
remark?: string; remark?: string;
@ -37,7 +37,7 @@ export namespace PayAppApi {
} }
/** 查询支付应用列表 */ /** 查询支付应用列表 */
export function getAppPage(params: PayAppApi.AppPageReqVO) { export function getAppPage(params: PayAppApi.AppPageReq) {
return requestClient.get<PageResult<PayAppApi.App>>('/pay/app/page', { return requestClient.get<PageResult<PayAppApi.App>>('/pay/app/page', {
params, params,
}); });

4
apps/web-antd/src/api/pay/demo/order/index.ts
View File

@ -20,7 +20,7 @@ export namespace DemoOrderApi {
createTime?: Date; createTime?: Date;
} }
export interface OrderPageReqVO extends PageParam { export interface OrderPageReq extends PageParam {
spuId?: number; spuId?: number;
createTime?: Date[]; createTime?: Date[];
} }
@ -32,7 +32,7 @@ export function createDemoOrder(data: DemoOrderApi.Order) {
} }
/** 获得示例订单分页 */ /** 获得示例订单分页 */
export function getDemoOrderPage(params: DemoOrderApi.OrderPageReqVO) { export function getDemoOrderPage(params: DemoOrderApi.OrderPageReq) {
return requestClient.get<PageResult<DemoOrderApi.Order>>( return requestClient.get<PageResult<DemoOrderApi.Order>>(
'/pay/demo-order/page', '/pay/demo-order/page',
{ {

8
apps/web-antd/src/api/pay/order/index.ts
View File

@ -40,7 +40,7 @@ export namespace PayOrderApi {
} }
/** 支付订单分页请求 */ /** 支付订单分页请求 */
export interface OrderPageReqVO extends PageParam { export interface OrderPageReq extends PageParam {
merchantId?: number; merchantId?: number;
appId?: number; appId?: number;
channelId?: number; channelId?: number;
@ -66,7 +66,7 @@ export namespace PayOrderApi {
} }
/** 支付订单导出请求 */ /** 支付订单导出请求 */
export interface OrderExportReqVO { export interface OrderExportReq {
merchantId?: number; merchantId?: number;
appId?: number; appId?: number;
channelId?: number; channelId?: number;
@ -93,7 +93,7 @@ export namespace PayOrderApi {
} }
/** 查询支付订单列表 */ /** 查询支付订单列表 */
export function getOrderPage(params: PayOrderApi.OrderPageReqVO) { export function getOrderPage(params: PayOrderApi.OrderPageReq) {
return requestClient.get<PageResult<PayOrderApi.Order>>('/pay/order/page', { return requestClient.get<PageResult<PayOrderApi.Order>>('/pay/order/page', {
params, params,
}); });
@ -120,6 +120,6 @@ export function submitOrder(data: any) {
} }
/** 导出支付订单 */ /** 导出支付订单 */
export function exportOrder(params: PayOrderApi.OrderExportReqVO) { export function exportOrder(params: PayOrderApi.OrderExportReq) {
return requestClient.download('/pay/order/export-excel', { params }); return requestClient.download('/pay/order/export-excel', { params });
} }

8
apps/web-antd/src/api/pay/refund/index.ts
View File

@ -35,7 +35,7 @@ export namespace PayRefundApi {
} }
/** 退款订单分页请求 */ /** 退款订单分页请求 */
export interface RefundPageReqVO extends PageParam { export interface RefundPageReq extends PageParam {
merchantId?: number; merchantId?: number;
appId?: number; appId?: number;
channelId?: number; channelId?: number;
@ -64,7 +64,7 @@ export namespace PayRefundApi {
} }
/** 退款订单导出请求 */ /** 退款订单导出请求 */
export interface RefundExportReqVO { export interface RefundExportReq {
merchantId?: number; merchantId?: number;
appId?: number; appId?: number;
channelId?: number; channelId?: number;
@ -94,7 +94,7 @@ export namespace PayRefundApi {
} }
/** 查询退款订单列表 */ /** 查询退款订单列表 */
export function getRefundPage(params: PayRefundApi.RefundPageReqVO) { export function getRefundPage(params: PayRefundApi.RefundPageReq) {
return requestClient.get<PageResult<PayRefundApi.Refund>>( return requestClient.get<PageResult<PayRefundApi.Refund>>(
'/pay/refund/page', '/pay/refund/page',
{ {
@ -124,6 +124,6 @@ export function deleteRefund(id: number) {
} }
/** 导出退款订单 */ /** 导出退款订单 */
export function exportRefund(params: PayRefundApi.RefundExportReqVO) { export function exportRefund(params: PayRefundApi.RefundExportReq) {
return requestClient.download('/pay/refund/export-excel', { params }); return requestClient.download('/pay/refund/export-excel', { params });
} }

4
apps/web-antd/src/api/pay/transfer/index.ts
View File

@ -21,7 +21,7 @@ export namespace PayTransferApi {
} }
/** 转账单分页请求 */ /** 转账单分页请求 */
export interface TransferPageReqVO extends PageParam { export interface TransferPageReq extends PageParam {
appId?: number; appId?: number;
channelId?: number; channelId?: number;
channelCode?: string; channelCode?: string;
@ -36,7 +36,7 @@ export namespace PayTransferApi {
} }
/** 查询转账单列表 */ /** 查询转账单列表 */
export function getTransferPage(params: PayTransferApi.TransferPageReqVO) { export function getTransferPage(params: PayTransferApi.TransferPageReq) {
return requestClient.get<PageResult<PayTransferApi.Transfer>>( return requestClient.get<PageResult<PayTransferApi.Transfer>>(
'/pay/transfer/page', '/pay/transfer/page',
{ {

16
apps/web-antd/src/api/pay/wallet/balance/index.ts
View File

@ -4,12 +4,12 @@ import { requestClient } from '#/api/request';
export namespace PayWalletApi { export namespace PayWalletApi {
/** 用户钱包查询参数 */ /** 用户钱包查询参数 */
export interface PayWalletUserReqVO { export interface PayWalletUserReq {
userId: number; userId: number;
} }
/** 钱包信息 */ /** 钱包信息 */
export interface WalletVO { export interface Wallet {
id: number; id: number;
userId: number; userId: number;
userType: number; userType: number;
@ -20,7 +20,7 @@ export namespace PayWalletApi {
} }
/** 钱包分页请求 */ /** 钱包分页请求 */
export interface WalletPageReqVO extends PageParam { export interface WalletPageReq extends PageParam {
userId?: number; userId?: number;
userType?: number; userType?: number;
balance?: number; balance?: number;
@ -31,15 +31,15 @@ export namespace PayWalletApi {
} }
/** 查询用户钱包详情 */ /** 查询用户钱包详情 */
export function getWallet(params: PayWalletApi.PayWalletUserReqVO) { export function getWallet(params: PayWalletApi.PayWalletUserReq) {
return requestClient.get<PayWalletApi.WalletVO>('/pay/wallet/get', { return requestClient.get<PayWalletApi.Wallet>('/pay/wallet/get', {
params, params,
}); });
} }
/** 查询会员钱包列表 */ /** 查询会员钱包列表 */
export function getWalletPage(params: PayWalletApi.WalletPageReqVO) { export function getWalletPage(params: PayWalletApi.WalletPageReq) {
return requestClient.get<PageResult<PayWalletApi.WalletVO>>( return requestClient.get<PageResult<PayWalletApi.Wallet>>(
'/pay/wallet/page', '/pay/wallet/page',
{ {
params, params,
@ -48,6 +48,6 @@ export function getWalletPage(params: PayWalletApi.WalletPageReqVO) {
} }
/** 修改会员钱包余额 */ /** 修改会员钱包余额 */
export function updateWalletBalance(data: PayWalletApi.WalletVO) { export function updateWalletBalance(data: PayWalletApi.Wallet) {
return requestClient.put('/pay/wallet/update-balance', data); return requestClient.put('/pay/wallet/update-balance', data);
} }

4
apps/web-antd/src/api/system/mail/template/index.ts
View File

@ -19,7 +19,7 @@ export namespace SystemMailTemplateApi {
} }
/** 邮件发送信息 */ /** 邮件发送信息 */
export interface MailSendReqVO { export interface MailSendReq {
mail: string; mail: string;
templateCode: string; templateCode: string;
templateParams: Record<string, any>; templateParams: Record<string, any>;
@ -57,6 +57,6 @@ export function deleteMailTemplate(id: number) {
} }
/** 发送邮件 */ /** 发送邮件 */
export function sendMail(data: SystemMailTemplateApi.MailSendReqVO) { export function sendMail(data: SystemMailTemplateApi.MailSendReq) {
return requestClient.post('/system/mail-template/send-mail', data); return requestClient.post('/system/mail-template/send-mail', data);
} }

4
apps/web-antd/src/api/system/notify/template/index.ts
View File

@ -17,7 +17,7 @@ export namespace SystemNotifyTemplateApi {
} }
/** 发送站内信请求 */ /** 发送站内信请求 */
export interface NotifySendReqVO { export interface NotifySendReq {
userId: number; userId: number;
userType: number; userType: number;
templateCode: string; templateCode: string;
@ -67,6 +67,6 @@ export function exportNotifyTemplate(params: any) {
} }
/** 发送站内信 */ /** 发送站内信 */
export function sendNotify(data: SystemNotifyTemplateApi.NotifySendReqVO) { export function sendNotify(data: SystemNotifyTemplateApi.NotifySendReq) {
return requestClient.post('/system/notify-template/send-notify', data); return requestClient.post('/system/notify-template/send-notify', data);
} }

4
apps/web-antd/src/api/system/oauth2/open/index.ts
View File

@ -3,7 +3,7 @@ import { requestClient } from '#/api/request';
/** OAuth2.0 授权信息响应 */ /** OAuth2.0 授权信息响应 */
export namespace SystemOAuth2ClientApi { export namespace SystemOAuth2ClientApi {
/** 授权信息 */ /** 授权信息 */
export interface AuthorizeInfoRespVO { export interface AuthorizeInfoResp {
client: { client: {
logo: string; logo: string;
name: string; name: string;
@ -17,7 +17,7 @@ export namespace SystemOAuth2ClientApi {
/** 获得授权信息 */ /** 获得授权信息 */
export function getAuthorize(clientId: string) { export function getAuthorize(clientId: string) {
return requestClient.get<SystemOAuth2ClientApi.AuthorizeInfoRespVO>( return requestClient.get<SystemOAuth2ClientApi.AuthorizeInfoResp>(
`/system/oauth2/authorize?clientId=${clientId}`, `/system/oauth2/authorize?clientId=${clientId}`,
); );
} }

12
apps/web-antd/src/api/system/permission/index.ts
View File

@ -2,19 +2,19 @@ import { requestClient } from '#/api/request';
export namespace SystemPermissionApi { export namespace SystemPermissionApi {
/** 分配用户角色请求 */ /** 分配用户角色请求 */
export interface AssignUserRoleReqVO { export interface AssignUserRoleReq {
userId: number; userId: number;
roleIds: number[]; roleIds: number[];
} }
/** 分配角色菜单请求 */ /** 分配角色菜单请求 */
export interface AssignRoleMenuReqVO { export interface AssignRoleMenuReq {
roleId: number; roleId: number;
menuIds: number[]; menuIds: number[];
} }
/** 分配角色数据权限请求 */ /** 分配角色数据权限请求 */
export interface AssignRoleDataScopeReqVO { export interface AssignRoleDataScopeReq {
roleId: number; roleId: number;
dataScope: number; dataScope: number;
dataScopeDeptIds: number[]; dataScopeDeptIds: number[];
@ -30,14 +30,14 @@ export async function getRoleMenuList(roleId: number) {
/** 赋予角色菜单权限 */ /** 赋予角色菜单权限 */
export async function assignRoleMenu( export async function assignRoleMenu(
data: SystemPermissionApi.AssignRoleMenuReqVO, data: SystemPermissionApi.AssignRoleMenuReq,
) { ) {
return requestClient.post('/system/permission/assign-role-menu', data); return requestClient.post('/system/permission/assign-role-menu', data);
} }
/** 赋予角色数据权限 */ /** 赋予角色数据权限 */
export async function assignRoleDataScope( export async function assignRoleDataScope(
data: SystemPermissionApi.AssignRoleDataScopeReqVO, data: SystemPermissionApi.AssignRoleDataScopeReq,
) { ) {
return requestClient.post('/system/permission/assign-role-data-scope', data); return requestClient.post('/system/permission/assign-role-data-scope', data);
} }
@ -51,7 +51,7 @@ export async function getUserRoleList(userId: number) {
/** 赋予用户角色 */ /** 赋予用户角色 */
export async function assignUserRole( export async function assignUserRole(
data: SystemPermissionApi.AssignUserRoleReqVO, data: SystemPermissionApi.AssignUserRoleReq,
) { ) {
return requestClient.post('/system/permission/assign-user-role', data); return requestClient.post('/system/permission/assign-user-role', data);
} }

4
apps/web-antd/src/api/system/sms/template/index.ts
View File

@ -20,7 +20,7 @@ export namespace SystemSmsTemplateApi {
} }
/** 发送短信请求 */ /** 发送短信请求 */
export interface SmsSendReqVO { export interface SmsSendReq {
mobile: string; mobile: string;
templateCode: string; templateCode: string;
templateParams: Record<string, any>; templateParams: Record<string, any>;
@ -65,6 +65,6 @@ export function exportSmsTemplate(params: any) {
} }
/** 发送短信 */ /** 发送短信 */
export function sendSms(data: SystemSmsTemplateApi.SmsSendReqVO) { export function sendSms(data: SystemSmsTemplateApi.SmsSendReq) {
return requestClient.post('/system/sms-template/send-sms', data); return requestClient.post('/system/sms-template/send-sms', data);
} }

8
apps/web-antd/src/api/system/social/user/index.ts
View File

@ -20,14 +20,14 @@ export namespace SystemSocialUserApi {
} }
/** 社交绑定请求 */ /** 社交绑定请求 */
export interface SocialUserBindReqVO { export interface SocialUserBindReq {
type: number; type: number;
code: string; code: string;
state: string; state: string;
} }
/** 取消社交绑定请求 */ /** 取消社交绑定请求 */
export interface SocialUserUnbindReqVO { export interface SocialUserUnbindReq {
type: number; type: number;
openid: string; openid: string;
} }
@ -49,12 +49,12 @@ export function getSocialUser(id: number) {
} }
/** 社交绑定，使用 code 授权码 */ /** 社交绑定，使用 code 授权码 */
export function socialBind(data: SystemSocialUserApi.SocialUserBindReqVO) { export function socialBind(data: SystemSocialUserApi.SocialUserBindReq) {
return requestClient.post<boolean>('/system/social-user/bind', data); return requestClient.post<boolean>('/system/social-user/bind', data);
} }
/** 取消社交绑定 */ /** 取消社交绑定 */
export function socialUnbind(data: SystemSocialUserApi.SocialUserUnbindReqVO) { export function socialUnbind(data: SystemSocialUserApi.SocialUserUnbindReq) {
return requestClient.delete<boolean>('/system/social-user/unbind', { data }); return requestClient.delete<boolean>('/system/social-user/unbind', { data });
} }

14
apps/web-antd/src/api/system/user/profile/index.ts
View File

@ -2,7 +2,7 @@ import { requestClient } from '#/api/request';
export namespace SystemUserProfileApi { export namespace SystemUserProfileApi {
/** 用户个人中心信息 */ /** 用户个人中心信息 */
export interface UserProfileRespVO { export interface UserProfileResp {
id: number; id: number;
username: string; username: string;
nickname: string; nickname: string;
@ -19,13 +19,13 @@ export namespace SystemUserProfileApi {
} }
/** 更新密码请求 */ /** 更新密码请求 */
export interface UpdatePasswordReqVO { export interface UpdatePasswordReq {
oldPassword: string; oldPassword: string;
newPassword: string; newPassword: string;
} }
/** 更新个人信息请求 */ /** 更新个人信息请求 */
export interface UpdateProfileReqVO { export interface UpdateProfileReq {
nickname?: string; nickname?: string;
email?: string; email?: string;
mobile?: string; mobile?: string;
@ -36,21 +36,19 @@ export namespace SystemUserProfileApi {
/** 获取登录用户信息 */ /** 获取登录用户信息 */
export function getUserProfile() { export function getUserProfile() {
return requestClient.get<SystemUserProfileApi.UserProfileRespVO>( return requestClient.get<SystemUserProfileApi.UserProfileResp>(
'/system/user/profile/get', '/system/user/profile/get',
); );
} }
/** 修改用户个人信息 */ /** 修改用户个人信息 */
export function updateUserProfile( export function updateUserProfile(data: SystemUserProfileApi.UpdateProfileReq) {
data: SystemUserProfileApi.UpdateProfileReqVO,
) {
return requestClient.put('/system/user/profile/update', data); return requestClient.put('/system/user/profile/update', data);
} }
/** 修改用户个人密码 */ /** 修改用户个人密码 */
export function updateUserPassword( export function updateUserPassword(
data: SystemUserProfileApi.UpdatePasswordReqVO, data: SystemUserProfileApi.UpdatePasswordReq,
) { ) {
return requestClient.put('/system/user/profile/update-password', data); return requestClient.put('/system/user/profile/update-password', data);
} }

2
apps/web-antd/src/components/simple-process-design/components/simple-process-designer.vue
View File

@ -97,7 +97,7 @@ const postOptions = ref<SystemPostApi.Post[]>([]); // 岗位列表
const userOptions = ref<SystemUserApi.User[]>([]); // 用户列表 const userOptions = ref<SystemUserApi.User[]>([]); // 用户列表
const deptOptions = ref<SystemDeptApi.Dept[]>([]); // 部门列表 const deptOptions = ref<SystemDeptApi.Dept[]>([]); // 部门列表
const deptTreeOptions = ref(); const deptTreeOptions = ref();
const userGroupOptions = ref<BpmUserGroupApi.UserGroupVO[]>([]); // 用户组列表 const userGroupOptions = ref<BpmUserGroupApi.UserGroup[]>([]); // 用户组列表
provide('formFields', formFields); provide('formFields', formFields);
provide('formType', formType); provide('formType', formType);

2
apps/web-antd/src/components/simple-process-design/helpers.ts
View File

@ -260,7 +260,7 @@ export function useNodeForm(nodeType: BpmNodeTypeEnum) {
const postOptions = inject<Ref<SystemPostApi.Post[]>>('postList', ref([])); // 岗位列表 const postOptions = inject<Ref<SystemPostApi.Post[]>>('postList', ref([])); // 岗位列表
const userOptions = inject<Ref<SystemUserApi.User[]>>('userList', ref([])); // 用户列表 const userOptions = inject<Ref<SystemUserApi.User[]>>('userList', ref([])); // 用户列表
const deptOptions = inject<Ref<SystemDeptApi.Dept[]>>('deptList', ref([])); // 部门列表 const deptOptions = inject<Ref<SystemDeptApi.Dept[]>>('deptList', ref([])); // 部门列表
const userGroupOptions = inject<Ref<BpmUserGroupApi.UserGroupVO[]>>( const userGroupOptions = inject<Ref<BpmUserGroupApi.UserGroup[]>>(
'userGroupList', 'userGroupList',
ref([]), ref([]),
); // 用户组列表 ); // 用户组列表

2
apps/web-antd/src/components/upload/use-upload.ts
View File

@ -136,7 +136,7 @@ export function getUploadUrl(): string {
* @param file 文件 * @param file 文件
*/ */
function createFile0( function createFile0(
vo: InfraFileApi.FilePresignedUrlRespVO, vo: InfraFileApi.FilePresignedUrlResp,
file: File, file: File,
): InfraFileApi.File { ): InfraFileApi.File {
const fileVO = { const fileVO = {

2
apps/web-antd/src/views/_core/profile/index.vue
View File

@ -19,7 +19,7 @@ const authStore = useAuthStore();
const activeName = ref('basicInfo'); const activeName = ref('basicInfo');
/** 加载个人信息 */ /** 加载个人信息 */
const profile = ref<SystemUserProfileApi.UserProfileRespVO>(); const profile = ref<SystemUserProfileApi.UserProfileResp>();
async function loadProfile() { async function loadProfile() {
profile.value = await getUserProfile(); profile.value = await getUserProfile();
} }

4
apps/web-antd/src/views/_core/profile/modules/base-info.vue
View File

@ -14,7 +14,7 @@ import { updateUserProfile } from '#/api/system/user/profile';
import { DICT_TYPE, getDictOptions } from '#/utils'; import { DICT_TYPE, getDictOptions } from '#/utils';
const props = defineProps<{ const props = defineProps<{
profile?: SystemUserProfileApi.UserProfileRespVO; profile?: SystemUserProfileApi.UserProfileResp;
}>(); }>();
const emit = defineEmits<{ const emit = defineEmits<{
(e: 'success'): void; (e: 'success'): void;
@ -77,7 +77,7 @@ async function handleSubmit(values: Recordable<any>) {
try { try {
formApi.setLoading(true); formApi.setLoading(true);
// 提交表单 // 提交表单
await updateUserProfile(values as SystemUserProfileApi.UpdateProfileReqVO); await updateUserProfile(values as SystemUserProfileApi.UpdateProfileReq);
// 关闭并提示 // 关闭并提示
emit('success'); emit('success');
message.success($t('ui.actionMessage.operationSuccess')); message.success($t('ui.actionMessage.operationSuccess'));

2
apps/web-antd/src/views/_core/profile/modules/profile-user.vue
View File

@ -14,7 +14,7 @@ import { CropperAvatar } from '#/components/cropper';
import { useUpload } from '#/components/upload/use-upload'; import { useUpload } from '#/components/upload/use-upload';
const props = defineProps<{ const props = defineProps<{
profile?: SystemUserProfileApi.UserProfileRespVO; profile?: SystemUserProfileApi.UserProfileResp;
}>(); }>();
const emit = defineEmits<{ const emit = defineEmits<{

6
apps/web-antd/src/views/bpm/group/index.vue
View File

@ -33,12 +33,12 @@ function handleCreate() {
} }
/** 编辑用户分组 */ /** 编辑用户分组 */
function handleEdit(row: BpmUserGroupApi.UserGroupVO) { function handleEdit(row: BpmUserGroupApi.UserGroup) {
formModalApi.setData(row).open(); formModalApi.setData(row).open();
} }
/** 删除用户分组 */ /** 删除用户分组 */
async function handleDelete(row: BpmUserGroupApi.UserGroupVO) { async function handleDelete(row: BpmUserGroupApi.UserGroup) {
const hideLoading = message.loading({ const hideLoading = message.loading({
content: $t('ui.actionMessage.deleting', [row.name]), content: $t('ui.actionMessage.deleting', [row.name]),
key: 'action_key_msg', key: 'action_key_msg',
@ -88,7 +88,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
refresh: { code: 'query' }, refresh: { code: 'query' },
search: true, search: true,
}, },
} as VxeTableGridOptions<BpmUserGroupApi.UserGroupVO>, } as VxeTableGridOptions<BpmUserGroupApi.UserGroup>,
}); });
</script> </script>

6
apps/web-antd/src/views/bpm/group/modules/form.vue
View File

@ -18,7 +18,7 @@ import { $t } from '#/locales';
import { useFormSchema } from '../data'; import { useFormSchema } from '../data';
const emit = defineEmits(['success']); const emit = defineEmits(['success']);
const formData = ref<BpmUserGroupApi.UserGroupVO>(); const formData = ref<BpmUserGroupApi.UserGroup>();
const getTitle = computed(() => { const getTitle = computed(() => {
return formData.value?.id return formData.value?.id
? $t('ui.actionTitle.edit', ['用户分组']) ? $t('ui.actionTitle.edit', ['用户分组'])
@ -46,7 +46,7 @@ const [Modal, modalApi] = useVbenModal({
} }
modalApi.lock(); modalApi.lock();
// 提交表单 // 提交表单
const data = (await formApi.getValues()) as BpmUserGroupApi.UserGroupVO; const data = (await formApi.getValues()) as BpmUserGroupApi.UserGroup;
try { try {
await (formData.value?.id await (formData.value?.id
? updateUserGroup(data) ? updateUserGroup(data)
@ -67,7 +67,7 @@ const [Modal, modalApi] = useVbenModal({
return; return;
} }
// 加载数据 // 加载数据
const data = modalApi.getData<BpmUserGroupApi.UserGroupVO>(); const data = modalApi.getData<BpmUserGroupApi.UserGroup>();
if (!data || !data.id) { if (!data || !data.id) {
return; return;
} }

2
apps/web-antd/src/views/bpm/model/definition/data.ts
View File

@ -4,7 +4,7 @@ import type { BpmProcessDefinitionApi } from '#/api/bpm/definition';
import { DICT_TYPE } from '#/utils'; import { DICT_TYPE } from '#/utils';
/** 列表的字段 */ /** 列表的字段 */
export function useGridColumns(): VxeTableGridOptions<BpmProcessDefinitionApi.ProcessDefinitionVO>['columns'] { export function useGridColumns(): VxeTableGridOptions<BpmProcessDefinitionApi.ProcessDefinition>['columns'] {
return [ return [
{ {
field: 'id', field: 'id',

2
apps/web-antd/src/views/bpm/model/form/index.vue
View File

@ -37,7 +37,7 @@ defineOptions({ name: 'BpmModelCreate' });
// 流程定义类型 // 流程定义类型
type BpmProcessDefinitionType = Omit< type BpmProcessDefinitionType = Omit<
BpmProcessDefinitionApi.ProcessDefinitionVO, BpmProcessDefinitionApi.ProcessDefinition,
'modelId' | 'modelType' 'modelId' | 'modelType'
> & { > & {
id?: string; id?: string;

10
apps/web-antd/src/views/bpm/oa/leave/create.vue
View File

@ -30,7 +30,7 @@ const tempStartUserSelectAssignees = ref({}); // 历史发起人选择审批人
const activityNodes = ref<BpmProcessInstanceApi.ApprovalNodeInfo[]>([]); // 审批节点信息 const activityNodes = ref<BpmProcessInstanceApi.ApprovalNodeInfo[]>([]); // 审批节点信息
const processDefinitionId = ref(''); const processDefinitionId = ref('');
const formData = ref<BpmOALeaveApi.LeaveVO>(); const formData = ref<BpmOALeaveApi.Leave>();
const getTitle = computed(() => { const getTitle = computed(() => {
return formData.value?.id return formData.value?.id
? $t('ui.actionTitle.edit', ['请假']) ? $t('ui.actionTitle.edit', ['请假'])
@ -70,7 +70,7 @@ async function onSubmit() {
} }
// 提交表单 // 提交表单
const data = (await formApi.getValues()) as BpmOALeaveApi.LeaveVO; const data = (await formApi.getValues()) as BpmOALeaveApi.Leave;
// 审批相关：设置指定审批人 // 审批相关：设置指定审批人
if (startUserSelectTasks.value?.length > 0) { if (startUserSelectTasks.value?.length > 0) {
@ -78,7 +78,7 @@ async function onSubmit() {
} }
// 格式化开始时间和结束时间的值 // 格式化开始时间和结束时间的值
const submitData: BpmOALeaveApi.LeaveVO = { const submitData: BpmOALeaveApi.Leave = {
...data, ...data,
startTime: Number(data.startTime), startTime: Number(data.startTime),
endTime: Number(data.endTime), endTime: Number(data.endTime),
@ -112,10 +112,10 @@ async function onDraft() {
return; return;
} }
const data = (await formApi.getValues()) as BpmOALeaveApi.LeaveVO; const data = (await formApi.getValues()) as BpmOALeaveApi.Leave;
// 格式化开始时间和结束时间的值 // 格式化开始时间和结束时间的值
const submitData: BpmOALeaveApi.LeaveVO = { const submitData: BpmOALeaveApi.Leave = {
...data, ...data,
startTime: Number(data.startTime), startTime: Number(data.startTime),
endTime: Number(data.endTime), endTime: Number(data.endTime),

2
apps/web-antd/src/views/bpm/oa/leave/detail.vue
View File

@ -14,7 +14,7 @@ const props = defineProps<{
id: string; id: string;
}>(); }>();
const datailLoading = ref(false); const datailLoading = ref(false);
const detailData = ref<BpmOALeaveApi.LeaveVO>(); const detailData = ref<BpmOALeaveApi.Leave>();
const { query } = useRoute(); const { query } = useRoute();
const queryId = computed(() => query.id as string); const queryId = computed(() => query.id as string);

8
apps/web-antd/src/views/bpm/oa/leave/index.vue
View File

@ -41,7 +41,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
refresh: { code: 'query' }, refresh: { code: 'query' },
search: true, search: true,
}, },
} as VxeTableGridOptions<BpmOALeaveApi.LeaveVO>, } as VxeTableGridOptions<BpmOALeaveApi.Leave>,
}); });
/** 创建请假 */ /** 创建请假 */
@ -55,7 +55,7 @@ function handleCreate() {
} }
/** 查看请假详情 */ /** 查看请假详情 */
function handleDetail(row: BpmOALeaveApi.LeaveVO) { function handleDetail(row: BpmOALeaveApi.Leave) {
router.push({ router.push({
name: 'OALeaveDetail', name: 'OALeaveDetail',
query: { id: row.id }, query: { id: row.id },
@ -63,7 +63,7 @@ function handleDetail(row: BpmOALeaveApi.LeaveVO) {
} }
/** 取消请假 */ /** 取消请假 */
function handleCancel(row: BpmOALeaveApi.LeaveVO) { function handleCancel(row: BpmOALeaveApi.Leave) {
prompt({ prompt({
async beforeClose(scope) { async beforeClose(scope) {
if (scope.isConfirm) { if (scope.isConfirm) {
@ -96,7 +96,7 @@ function handleCancel(row: BpmOALeaveApi.LeaveVO) {
} }
/** 审批进度 */ /** 审批进度 */
function handleProgress(row: BpmOALeaveApi.LeaveVO) { function handleProgress(row: BpmOALeaveApi.Leave) {
router.push({ router.push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
query: { id: row.processInstanceId }, query: { id: row.processInstanceId },

6
apps/web-antd/src/views/bpm/processExpression/index.vue
View File

@ -32,12 +32,12 @@ function handleCreate() {
} }
/** 编辑流程表达式 */ /** 编辑流程表达式 */
function handleEdit(row: BpmProcessExpressionApi.ProcessExpressionVO) { function handleEdit(row: BpmProcessExpressionApi.ProcessExpression) {
formModalApi.setData(row).open(); formModalApi.setData(row).open();
} }
/** 删除流程表达式 */ /** 删除流程表达式 */
async function handleDelete(row: BpmProcessExpressionApi.ProcessExpressionVO) { async function handleDelete(row: BpmProcessExpressionApi.ProcessExpression) {
const hideLoading = message.loading({ const hideLoading = message.loading({
content: $t('ui.actionMessage.deleting', [row.name]), content: $t('ui.actionMessage.deleting', [row.name]),
key: 'action_key_msg', key: 'action_key_msg',
@ -80,7 +80,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
refresh: { code: 'query' }, refresh: { code: 'query' },
search: true, search: true,
}, },
} as VxeTableGridOptions<BpmProcessExpressionApi.ProcessExpressionVO>, } as VxeTableGridOptions<BpmProcessExpressionApi.ProcessExpression>,
}); });
</script> </script>

7
apps/web-antd/src/views/bpm/processExpression/modules/form.vue
View File

@ -18,7 +18,7 @@ import { $t } from '#/locales';
import { useFormSchema } from '../data'; import { useFormSchema } from '../data';
const emit = defineEmits(['success']); const emit = defineEmits(['success']);
const formData = ref<BpmProcessExpressionApi.ProcessExpressionVO>(); const formData = ref<BpmProcessExpressionApi.ProcessExpression>();
const getTitle = computed(() => { const getTitle = computed(() => {
return formData.value?.id return formData.value?.id
? $t('ui.actionTitle.edit', ['流程表达式']) ? $t('ui.actionTitle.edit', ['流程表达式'])
@ -40,7 +40,7 @@ const [Modal, modalApi] = useVbenModal({
modalApi.lock(); modalApi.lock();
// 提交表单 // 提交表单
const data = const data =
(await formApi.getValues()) as BpmProcessExpressionApi.ProcessExpressionVO; (await formApi.getValues()) as BpmProcessExpressionApi.ProcessExpression;
try { try {
await (formData.value?.id await (formData.value?.id
? updateProcessExpression(data) ? updateProcessExpression(data)
@ -58,8 +58,7 @@ const [Modal, modalApi] = useVbenModal({
return; return;
} }
// 加载数据 // 加载数据
const data = const data = modalApi.getData<BpmProcessExpressionApi.ProcessExpression>();
modalApi.getData<BpmProcessExpressionApi.ProcessExpressionVO>();
if (!data || !data.id) { if (!data || !data.id) {
return; return;
} }

34
apps/web-antd/src/views/bpm/processInstance/create/index.vue
View File

@ -26,17 +26,23 @@ import ProcessDefinitionDetail from './modules/form.vue';
defineOptions({ name: 'BpmProcessInstanceCreate' }); defineOptions({ name: 'BpmProcessInstanceCreate' });
const route = useRoute(); // 路由 const route = useRoute();
const searchName = ref(''); // 当前搜索关键字 // 当前搜索关键字
const isSearching = ref(false); // 是否处于搜索状态 const searchName = ref('');
const processInstanceId: any = route.query.processInstanceId; // 流程实例编号。场景：重新发起时 const isSearching = ref(false);
const loading = ref(true); // 加载中 // 流程实例编号。场景：重新发起时
const categoryList: any = ref([]); // 分类的列表 const processInstanceId: any = route.query.processInstanceId;
const activeCategory = ref(''); // 当前选中的分类 // 加载中
const processDefinitionList = ref< const loading = ref(true);
BpmProcessDefinitionApi.ProcessDefinitionVO[] // 分类的列表
>([]); // 流程定义的列表 const categoryList: any = ref([]);
// 当前选中的分类
const activeCategory = ref('');
// 流程定义的列表
const processDefinitionList = ref<BpmProcessDefinitionApi.ProcessDefinition[]>(
[],
);
// 实现 groupBy 功能 // 实现 groupBy 功能
function groupBy(array: any[], key: string) { function groupBy(array: any[], key: string) {
@ -112,7 +118,7 @@ async function handleGetProcessDefinitionList() {
/** 用于存储搜索过滤后的流程定义 */ /** 用于存储搜索过滤后的流程定义 */
const filteredProcessDefinitionList = ref< const filteredProcessDefinitionList = ref<
BpmProcessDefinitionApi.ProcessDefinitionVO[] BpmProcessDefinitionApi.ProcessDefinition[]
>([]); >([]);
/** 搜索流程 */ /** 搜索流程 */
@ -159,13 +165,13 @@ const processDefinitionGroup = computed(() => {
// 按照 categoryList 的顺序重新组织数据 // 按照 categoryList 的顺序重新组织数据
const orderedGroup: Record< const orderedGroup: Record<
string, string,
BpmProcessDefinitionApi.ProcessDefinitionVO[] BpmProcessDefinitionApi.ProcessDefinition[]
> = {}; > = {};
categoryList.value.forEach((category: BpmCategoryApi.Category) => { categoryList.value.forEach((category: BpmCategoryApi.Category) => {
if (grouped[category.code]) { if (grouped[category.code]) {
orderedGroup[category.code] = grouped[ orderedGroup[category.code] = grouped[
category.code category.code
] as BpmProcessDefinitionApi.ProcessDefinitionVO[]; ] as BpmProcessDefinitionApi.ProcessDefinition[];
} }
}); });
return orderedGroup; return orderedGroup;
@ -183,7 +189,7 @@ const processDefinitionDetailRef = ref();
/** 处理选择流程的按钮操作 */ /** 处理选择流程的按钮操作 */
async function handleSelect( async function handleSelect(
row: BpmProcessDefinitionApi.ProcessDefinitionVO, row: BpmProcessDefinitionApi.ProcessDefinition,
formVariables?: any, formVariables?: any,
) { ) {
// 设置选择的流程 // 设置选择的流程

2
apps/web-antd/src/views/bpm/processInstance/create/modules/form.vue
View File

@ -166,7 +166,7 @@ async function initProcessInfo(row: any, formVariables?: any) {
}); });
// 加载流程图 // 加载流程图
const processDefinitionDetail: BpmProcessDefinitionApi.ProcessDefinitionVO = const processDefinitionDetail: BpmProcessDefinitionApi.ProcessDefinition =
await getProcessDefinition(row.id); await getProcessDefinition(row.id);
if (processDefinitionDetail) { if (processDefinitionDetail) {
bpmnXML.value = processDefinitionDetail.bpmnXml; bpmnXML.value = processDefinitionDetail.bpmnXml;

2
apps/web-antd/src/views/bpm/processInstance/detail/index.vue
View File

@ -63,7 +63,7 @@ enum FieldPermissionType {
} }
const processInstanceLoading = ref(false); // 流程实例的加载中 const processInstanceLoading = ref(false); // 流程实例的加载中
const processInstance = ref<BpmProcessInstanceApi.ProcessInstanceVO>(); // 流程实例 const processInstance = ref<BpmProcessInstanceApi.ProcessInstance>(); // 流程实例
const processDefinition = ref<any>({}); // 流程定义 const processDefinition = ref<any>({}); // 流程定义
const processModelView = ref<any>({}); // 流程模型视图 const processModelView = ref<any>({}); // 流程模型视图
const operationButtonRef = ref(); // 操作按钮组件 ref const operationButtonRef = ref(); // 操作按钮组件 ref

6
apps/web-antd/src/views/bpm/processInstance/detail/modules/task-list.vue
View File

@ -36,7 +36,7 @@ const columns = shallowRef([
field: 'approver', field: 'approver',
title: '审批人', title: '审批人',
slots: { slots: {
default: ({ row }: { row: BpmTaskApi.TaskManagerVO }) => { default: ({ row }: { row: BpmTaskApi.TaskManager }) => {
return row.assigneeUser?.nickname || row.ownerUser?.nickname; return row.assigneeUser?.nickname || row.ownerUser?.nickname;
}, },
}, },
@ -106,7 +106,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
cellConfig: { cellConfig: {
height: 60, height: 60,
}, },
} as VxeTableGridOptions<BpmTaskApi.TaskVO>, } as VxeTableGridOptions<BpmTaskApi.Task>,
}); });
/** /**
@ -137,7 +137,7 @@ const taskForm = ref<TaskForm>({
* 显示表单详情 * 显示表单详情
* @param row 任务数据 * @param row 任务数据
*/ */
async function showFormDetail(row: BpmTaskApi.TaskManagerVO): Promise<void> { async function showFormDetail(row: BpmTaskApi.TaskManager): Promise<void> {
// 设置表单配置和表单字段 // 设置表单配置和表单字段
taskForm.value = { taskForm.value = {
rule: [], rule: [],

6
apps/web-antd/src/views/bpm/processInstance/index.vue
View File

@ -27,7 +27,7 @@ function onRefresh() {
} }
/** 查看流程实例 */ /** 查看流程实例 */
function handleDetail(row: BpmTaskApi.TaskVO) { function handleDetail(row: BpmTaskApi.Task) {
router.push({ router.push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
query: { id: row.id }, query: { id: row.id },
@ -35,7 +35,7 @@ function handleDetail(row: BpmTaskApi.TaskVO) {
} }
/** 取消流程实例 */ /** 取消流程实例 */
function handleCancel(row: BpmTaskApi.TaskVO) { function handleCancel(row: BpmTaskApi.Task) {
prompt({ prompt({
async beforeClose(scope) { async beforeClose(scope) {
if (scope.isConfirm) { if (scope.isConfirm) {
@ -96,7 +96,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
cellConfig: { cellConfig: {
height: 64, height: 64,
}, },
} as VxeTableGridOptions<BpmTaskApi.TaskVO>, } as VxeTableGridOptions<BpmTaskApi.Task>,
}); });
</script> </script>

6
apps/web-antd/src/views/bpm/processInstance/manager/index.vue
View File

@ -33,7 +33,7 @@ function onTaskClick(task: BpmProcessInstanceApi.Task) {
} }
/** 查看流程实例 */ /** 查看流程实例 */
function handleDetail(row: BpmProcessInstanceApi.ProcessInstanceVO) { function handleDetail(row: BpmProcessInstanceApi.ProcessInstance) {
console.warn(row); console.warn(row);
router.push({ router.push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
@ -42,7 +42,7 @@ function handleDetail(row: BpmProcessInstanceApi.ProcessInstanceVO) {
} }
/** 取消流程实例 */ /** 取消流程实例 */
function handleCancel(row: BpmProcessInstanceApi.ProcessInstanceVO) { function handleCancel(row: BpmProcessInstanceApi.ProcessInstance) {
prompt({ prompt({
async beforeClose(scope) { async beforeClose(scope) {
if (scope.isConfirm) { if (scope.isConfirm) {
@ -102,7 +102,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
refresh: { code: 'query' }, refresh: { code: 'query' },
search: true, search: true,
}, },
} as VxeTableGridOptions<BpmProcessInstanceApi.ProcessInstanceVO>, } as VxeTableGridOptions<BpmProcessInstanceApi.ProcessInstance>,
}); });
</script> </script>

4
apps/web-antd/src/views/bpm/processInstance/report/data.ts
View File

@ -93,8 +93,8 @@ export function useGridFormSchema(
/** 列表的字段 */ /** 列表的字段 */
export function useGridColumns( export function useGridColumns(
formFields: any[] = [], formFields: any[] = [],
): VxeTableGridOptions<BpmProcessInstanceApi.ProcessInstanceVO>['columns'] { ): VxeTableGridOptions<BpmProcessInstanceApi.ProcessInstance>['columns'] {
const baseColumns: VxeGridPropTypes.Columns<BpmProcessInstanceApi.ProcessInstanceVO> = const baseColumns: VxeGridPropTypes.Columns<BpmProcessInstanceApi.ProcessInstance> =
[ [
{ {
field: 'name', field: 'name',

4
apps/web-antd/src/views/bpm/processInstance/report/index.vue
View File

@ -70,7 +70,7 @@ function onRefresh() {
} }
/** 查看详情 */ /** 查看详情 */
const handleDetail = (row: BpmProcessInstanceApi.ProcessInstanceVO) => { const handleDetail = (row: BpmProcessInstanceApi.ProcessInstance) => {
router.push({ router.push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
query: { query: {
@ -80,7 +80,7 @@ const handleDetail = (row: BpmProcessInstanceApi.ProcessInstanceVO) => {
}; };
/** 取消按钮操作 */ /** 取消按钮操作 */
const handleCancel = async (row: BpmProcessInstanceApi.ProcessInstanceVO) => { const handleCancel = async (row: BpmProcessInstanceApi.ProcessInstance) => {
cancelReason.value = ''; // 重置取消原因 cancelReason.value = ''; // 重置取消原因
confirm({ confirm({
title: '取消流程', title: '取消流程',

6
apps/web-antd/src/views/bpm/processListener/index.vue
View File

@ -32,12 +32,12 @@ function handleCreate() {
} }
/** 编辑流程监听器 */ /** 编辑流程监听器 */
function handleEdit(row: BpmProcessListenerApi.ProcessListenerVO) { function handleEdit(row: BpmProcessListenerApi.ProcessListener) {
formModalApi.setData(row).open(); formModalApi.setData(row).open();
} }
/** 删除流程监听器 */ /** 删除流程监听器 */
async function handleDelete(row: BpmProcessListenerApi.ProcessListenerVO) { async function handleDelete(row: BpmProcessListenerApi.ProcessListener) {
const hideLoading = message.loading({ const hideLoading = message.loading({
content: $t('ui.actionMessage.deleting', [row.name]), content: $t('ui.actionMessage.deleting', [row.name]),
key: 'action_key_msg', key: 'action_key_msg',
@ -80,7 +80,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
refresh: { code: 'query' }, refresh: { code: 'query' },
search: true, search: true,
}, },
} as VxeTableGridOptions<BpmProcessListenerApi.ProcessListenerVO>, } as VxeTableGridOptions<BpmProcessListenerApi.ProcessListener>,
}); });
</script> </script>

6
apps/web-antd/src/views/bpm/processListener/modules/form.vue
View File

@ -18,7 +18,7 @@ import { $t } from '#/locales';
import { useFormSchema } from '../data'; import { useFormSchema } from '../data';
const emit = defineEmits(['success']); const emit = defineEmits(['success']);
const formData = ref<BpmProcessListenerApi.ProcessListenerVO>(); const formData = ref<BpmProcessListenerApi.ProcessListener>();
const getTitle = computed(() => { const getTitle = computed(() => {
return formData.value?.id return formData.value?.id
? $t('ui.actionTitle.edit', ['流程监听器']) ? $t('ui.actionTitle.edit', ['流程监听器'])
@ -47,7 +47,7 @@ const [Modal, modalApi] = useVbenModal({
modalApi.lock(); modalApi.lock();
// 提交表单 // 提交表单
const data = const data =
(await formApi.getValues()) as BpmProcessListenerApi.ProcessListenerVO; (await formApi.getValues()) as BpmProcessListenerApi.ProcessListener;
try { try {
await (formData.value?.id await (formData.value?.id
? updateProcessListener(data) ? updateProcessListener(data)
@ -68,7 +68,7 @@ const [Modal, modalApi] = useVbenModal({
return; return;
} }
// 加载数据 // 加载数据
const data = modalApi.getData<BpmProcessListenerApi.ProcessListenerVO>(); const data = modalApi.getData<BpmProcessListenerApi.ProcessListener>();
if (!data || !data.id) { if (!data || !data.id) {
return; return;
} }

4
apps/web-antd/src/views/bpm/task/copy/index.vue
View File

@ -14,7 +14,7 @@ import { useGridColumns, useGridFormSchema } from './data';
defineOptions({ name: 'BpmCopyTask' }); defineOptions({ name: 'BpmCopyTask' });
/** 任务详情 */ /** 任务详情 */
function handleDetail(row: BpmProcessInstanceApi.CopyVO) { function handleDetail(row: BpmProcessInstanceApi.Copy) {
const query = { const query = {
id: row.processInstanceId, id: row.processInstanceId,
...(row.activityId && { activityId: row.activityId }), ...(row.activityId && { activityId: row.activityId }),
@ -54,7 +54,7 @@ const [Grid] = useVbenVxeGrid({
cellConfig: { cellConfig: {
height: 64, height: 64,
}, },
} as VxeTableGridOptions<BpmProcessInstanceApi.CopyVO>, } as VxeTableGridOptions<BpmProcessInstanceApi.Copy>,
}); });
</script> </script>

4
apps/web-antd/src/views/bpm/task/done/index.vue
View File

@ -13,7 +13,7 @@ import { useGridColumns, useGridFormSchema } from './data';
defineOptions({ name: 'BpmDoneTask' }); defineOptions({ name: 'BpmDoneTask' });
/** 查看历史 */ /** 查看历史 */
function handleHistory(row: BpmTaskApi.TaskManagerVO) { function handleHistory(row: BpmTaskApi.TaskManager) {
router.push({ router.push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
query: { query: {
@ -52,7 +52,7 @@ const [Grid] = useVbenVxeGrid({
cellConfig: { cellConfig: {
height: 64, height: 64,
}, },
} as VxeTableGridOptions<BpmTaskApi.TaskVO>, } as VxeTableGridOptions<BpmTaskApi.Task>,
}); });
</script> </script>

4
apps/web-antd/src/views/bpm/task/manager/index.vue
View File

@ -13,7 +13,7 @@ import { useGridColumns, useGridFormSchema } from './data';
defineOptions({ name: 'BpmManagerTask' }); defineOptions({ name: 'BpmManagerTask' });
/** 查看历史 */ /** 查看历史 */
function handleHistory(row: BpmTaskApi.TaskManagerVO) { function handleHistory(row: BpmTaskApi.TaskManager) {
router.push({ router.push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
query: { query: {
@ -51,7 +51,7 @@ const [Grid] = useVbenVxeGrid({
cellConfig: { cellConfig: {
height: 64, height: 64,
}, },
} as VxeTableGridOptions<BpmTaskApi.TaskManagerVO>, } as VxeTableGridOptions<BpmTaskApi.TaskManager>,
}); });
</script> </script>

4
apps/web-antd/src/views/bpm/task/todo/index.vue
View File

@ -13,7 +13,7 @@ import { useGridColumns, useGridFormSchema } from './data';
defineOptions({ name: 'BpmTodoTask' }); defineOptions({ name: 'BpmTodoTask' });
/** 办理任务 */ /** 办理任务 */
function handleAudit(row: BpmTaskApi.TaskVO) { function handleAudit(row: BpmTaskApi.Task) {
console.warn(row); console.warn(row);
router.push({ router.push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
@ -53,7 +53,7 @@ const [Grid] = useVbenVxeGrid({
cellConfig: { cellConfig: {
height: 64, height: 64,
}, },
} as VxeTableGridOptions<BpmTaskApi.TaskVO>, } as VxeTableGridOptions<BpmTaskApi.Task>,
}); });
</script> </script>

2
apps/web-antd/src/views/infra/codegen/modules/import-table.vue
View File

@ -21,7 +21,7 @@ const emit = defineEmits<{
(e: 'success'): void; (e: 'success'): void;
}>(); }>();
const formData = reactive<InfraCodegenApi.CodegenCreateListReqVO>({ const formData = reactive<InfraCodegenApi.CodegenCreateListReq>({
dataSourceConfigId: 0, dataSourceConfigId: 0,
tableNames: [], // 已选择的表列表 tableNames: [], // 已选择的表列表
}); });

2
apps/web-antd/src/views/member/user/components/user-account-info.vue
View File

@ -12,7 +12,7 @@ withDefaults(
defineProps<{ defineProps<{
mode?: 'kefu' | 'member'; mode?: 'kefu' | 'member';
user: MemberUserApi.User; user: MemberUserApi.User;
wallet: PayWalletApi.WalletVO; wallet: PayWalletApi.Wallet;
}>(), }>(),
{ {
mode: 'member', mode: 'member',

4
apps/web-antd/src/views/member/user/modules/detail.vue
View File

@ -33,13 +33,13 @@ const [FormModal, formModalApi] = useVbenModal({
const userId = Number(route.query.id); const userId = Number(route.query.id);
const user = ref<MemberUserApi.User>(); const user = ref<MemberUserApi.User>();
const wallet = ref<PayWalletApi.WalletVO>(); const wallet = ref<PayWalletApi.Wallet>();
/* 钱包初始化数据 */ /* 钱包初始化数据 */
const WALLET_INIT_DATA = { const WALLET_INIT_DATA = {
balance: 0, balance: 0,
totalExpense: 0, totalExpense: 0,
totalRecharge: 0, totalRecharge: 0,
} as PayWalletApi.WalletVO; } as PayWalletApi.Wallet;
async function getUserDetail() { async function getUserDetail() {
if (!userId) { if (!userId) {

4
apps/web-antd/src/views/pay/wallet/balance/index.vue
View File

@ -21,7 +21,7 @@ const [WalletModal, walletModalApi] = useVbenModal({
destroyOnClose: true, destroyOnClose: true,
}); });
function handleDetail(row: Required<PayWalletApi.WalletVO>) { function handleDetail(row: Required<PayWalletApi.Wallet>) {
walletModalApi.setData(row).open(); walletModalApi.setData(row).open();
} }
@ -51,7 +51,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
refresh: { code: 'query' }, refresh: { code: 'query' },
search: true, search: true,
}, },
} as VxeTableGridOptions<PayWalletApi.WalletVO>, } as VxeTableGridOptions<PayWalletApi.Wallet>,
}); });
</script> </script>

2
apps/web-antd/src/views/pay/wallet/balance/modules/detail.vue
View File

@ -15,7 +15,7 @@ const [Modal, modalApi] = useVbenModal({
return; return;
} }
// 加载数据 // 加载数据
const data = modalApi.getData<PayWalletApi.WalletVO>(); const data = modalApi.getData<PayWalletApi.Wallet>();
if (!data || !data.id) { if (!data || !data.id) {
return; return;
} }

2
apps/web-antd/src/views/system/mail/template/modules/send-form.vue
View File

@ -42,7 +42,7 @@ const [Modal, modalApi] = useVbenModal({
paramsObj[param] = values[`param_${param}`]; paramsObj[param] = values[`param_${param}`];
}); });
} }
const data: SystemMailTemplateApi.MailSendReqVO = { const data: SystemMailTemplateApi.MailSendReq = {
mail: values.mail, mail: values.mail,
templateCode: formData.value?.code || '', templateCode: formData.value?.code || '',
templateParams: paramsObj, templateParams: paramsObj,

2
apps/web-antd/src/views/system/notify/template/modules/send-form.vue
View File

@ -43,7 +43,7 @@ const [Modal, modalApi] = useVbenModal({
paramsObj[param] = values[`param_${param}`]; paramsObj[param] = values[`param_${param}`];
}); });
} }
const data: SystemNotifyTemplateApi.NotifySendReqVO = { const data: SystemNotifyTemplateApi.NotifySendReq = {
userId: values.userId, userId: values.userId,
userType: values.userType, userType: values.userType,
templateCode: formData.value?.code || '', templateCode: formData.value?.code || '',

2
apps/web-antd/src/views/system/sms/template/modules/send-form.vue
View File

@ -42,7 +42,7 @@ const [Modal, modalApi] = useVbenModal({
paramsObj[param] = values[`param_${param}`]; paramsObj[param] = values[`param_${param}`];
}); });
} }
const data: SystemSmsTemplateApi.SmsSendReqVO = { const data: SystemSmsTemplateApi.SmsSendReq = {
mobile: values.mobile, mobile: values.mobile,
templateCode: formData.value?.code || '', templateCode: formData.value?.code || '',
templateParams: paramsObj, templateParams: paramsObj,