diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/api/core/user.ts b/Yi.Vben5.Vue3/apps/web-antd/src/api/core/user.ts index e5cc1250..744ad3b4 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/api/core/user.ts +++ b/Yi.Vben5.Vue3/apps/web-antd/src/api/core/user.ts @@ -19,7 +19,7 @@ export interface User { email: string; loginDate: string; loginIp: string; - nickName: string; + nick: string; phonenumber: string; remark: string; roles: Role[]; diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/profile/model.d.ts b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/profile/model.d.ts index bb1e4b38..a25873e5 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/profile/model.d.ts +++ b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/profile/model.d.ts @@ -32,7 +32,7 @@ export interface User { tenantId: string; deptId: number; userName: string; - nickName: string; + nick: string; userType: string; email: string; phonenumber: string; diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/social/model.d.ts b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/social/model.d.ts index 1e3b0157..d00b88e4 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/social/model.d.ts +++ b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/social/model.d.ts @@ -9,7 +9,7 @@ export interface SocialInfo { refreshToken: string; openId: string; userName: string; - nickName: string; + nick: string; email: string; avatar: string; accessCode?: any; diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/api/workflow/instance/model.d.ts b/Yi.Vben5.Vue3/apps/web-antd/src/api/workflow/instance/model.d.ts index 133d06a3..5bfab113 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/api/workflow/instance/model.d.ts +++ b/Yi.Vben5.Vue3/apps/web-antd/src/api/workflow/instance/model.d.ts @@ -32,7 +32,7 @@ export interface Flow { flowCode?: any; version?: any; runDuration: string; - nickName?: any; + nick?: any; } export interface FlowInfoResponse { diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/store/auth.ts b/Yi.Vben5.Vue3/apps/web-antd/src/store/auth.ts index e7b736e7..5971d7dd 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/store/auth.ts +++ b/Yi.Vben5.Vue3/apps/web-antd/src/store/auth.ts @@ -114,7 +114,7 @@ export const useAuthStore = defineStore('auth', () => { const userInfo: UserInfo = { avatar: user.avatar ?? '', permissions: permissionCodes, - realName: user.nickName, + realName: user.nick, roles: roleCodes, userId: user.userId, username: user.userName, diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/components/account-bind.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/components/account-bind.vue index 0da901c6..292967a5 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/components/account-bind.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/components/account-bind.vue @@ -100,7 +100,7 @@ const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE;
- 已绑定: {{ item.info.nickName }} + 已绑定: {{ item.info.nick }}
diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/components/base-setting.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/components/base-setting.vue index 1801b232..b6a8ab1e 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/components/base-setting.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/components/base-setting.vue @@ -44,7 +44,7 @@ const [BasicForm, formApi] = useVbenForm({ }, { component: 'Input', - fieldName: 'nickName', + fieldName: 'nick', label: '昵称', rules: 'required', }, @@ -104,7 +104,7 @@ async function handleSubmit(values: Recordable) { onMounted(() => { const data = pick(props.profile.user, [ 'userId', - 'nickName', + 'nick', 'email', 'phonenumber', 'sex', diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/profile-panel.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/profile-panel.vue index c1e9b2f7..781eaabc 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/profile-panel.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/profile-panel.vue @@ -49,7 +49,7 @@ const poetrySrc = computed(() => {
- {{ profile.user.nickName ?? '未知' }} + {{ profile.user.nick ?? '未知' }} diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/role-assign/data.tsx b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/role-assign/data.tsx index a26bd164..2cc5e98c 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/role-assign/data.tsx +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/role-assign/data.tsx @@ -22,7 +22,7 @@ export const columns: VxeGridProps['columns'] = [ }, { title: '用户昵称', - field: 'nickName', + field: 'nick', }, { title: '邮箱', diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/apply-modal.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/apply-modal.vue index d0116f03..b6d0ce71 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/apply-modal.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/apply-modal.vue @@ -117,7 +117,7 @@ async function handleSubmit() { // 需要转换数据 抄送人员 const flowCCList = (flowCopyList as Array).map((item) => ({ userId: item.userId, - userName: item.nickName, + userName: item.nick, })); const requestData = { fileId: attachment.join(','), diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/approval-modal.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/approval-modal.vue index bc9e7b90..e6066fd3 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/approval-modal.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/approval-modal.vue @@ -158,7 +158,7 @@ async function handleSubmit() { // 需要转换数据 抄送人员 const flowCopyList = (data.flowCopyList as Array).map((item) => ({ userId: item.userId, - userName: item.nickName, + userName: item.nick, })); const requestData = { ...omit(data, ['attachment']), diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/approval-panel.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/approval-panel.vue index b0a5632f..70144a49 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/approval-panel.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/approval-panel.vue @@ -273,7 +273,7 @@ function handleDelegation(userList: User[]) { const current = userList[0]; approveWithReasonModal({ title: '委托', - description: `确定委托给[${current?.nickName}]吗?`, + description: `确定委托给[${current?.nick}]吗?`, onOk: async (reason) => { await taskOperation( { taskId: props.task!.id, userId: current!.userId, message: reason }, @@ -295,7 +295,7 @@ function handleTransfer(userList: User[]) { const current = userList[0]; approveWithReasonModal({ title: '转办', - description: `确定转办给[${current?.nickName}]吗?`, + description: `确定转办给[${current?.nick}]吗?`, onOk: async (reason) => { await taskOperation( { taskId: props.task!.id, userId: current!.userId, message: reason }, @@ -362,7 +362,7 @@ function handleUpdateAssignee(userList: User[]) { if (!current) return; Modal.confirm({ title: '修改办理人', - content: `确定修改办理人为${current?.nickName}吗?`, + content: `确定修改办理人为${current?.nick}吗?`, centered: true, onOk: async () => { await updateAssignee([props.task!.id], current.userId); diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/copy-component.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/copy-component.vue index ead8f89a..2e4557dc 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/copy-component.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/copy-component.vue @@ -65,12 +65,12 @@ const displayedList = computed(() => {
diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/flow-interfere-modal.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/flow-interfere-modal.vue index 38b6d66c..07f61cac 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/flow-interfere-modal.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/flow-interfere-modal.vue @@ -57,7 +57,7 @@ function handleTransfer(userList: User[]) { const current = userList[0]; Modal.confirm({ title: '转办', - content: `确定转办给${current?.nickName}吗?`, + content: `确定转办给${current?.nick}吗?`, centered: true, onOk: async () => { await taskOperation( diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/user-select-modal.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/user-select-modal.vue index 67ec0037..60790114 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/user-select-modal.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/user-select-modal.vue @@ -205,7 +205,7 @@ const rightGridOptions: VxeGridProps = { checkboxConfig: {}, columns: [ { - field: 'nickName', + field: 'nick', title: '昵称', width: 200, resizable: false, @@ -300,13 +300,13 @@ function handleSubmit() {