From 689b136724953068f1bc43987b132d74530f74ca Mon Sep 17 00:00:00 2001 From: dubai Date: Sun, 11 Jan 2026 14:15:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(core):=20=E7=BB=9F=E4=B8=80=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BB=8E?= =?UTF-8?q?=20createTime=20=E5=88=B0=20creationTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/backend-mock/api/system/dept/list.ts | 4 ++-- .../apps/backend-mock/api/system/role/list.ts | 6 +++--- Yi.Vben5.Vue3/apps/web-antd/src/api/common.d.ts | 8 ++++---- Yi.Vben5.Vue3/apps/web-antd/src/api/core/user.ts | 2 +- .../apps/web-antd/src/api/system/oss/model.d.ts | 2 +- .../apps/web-antd/src/api/system/profile/model.d.ts | 6 +++--- .../apps/web-antd/src/api/system/social/model.d.ts | 2 +- .../apps/web-antd/src/api/system/user/model.d.ts | 4 ++-- .../apps/web-antd/src/api/tool/gen/model.d.ts | 10 +++++----- .../web-antd/src/api/workflow/definition/model.d.ts | 2 +- .../apps/web-antd/src/api/workflow/instance/model.d.ts | 2 +- .../apps/web-antd/src/api/workflow/task/model.d.ts | 4 ++-- .../views/_core/profile/components/account-bind.vue | 2 +- .../apps/web-antd/src/views/monitor/operlog/data.tsx | 2 +- .../apps/web-antd/src/views/monitor/operlog/index.vue | 2 +- .../apps/web-antd/src/views/system/oss/data.tsx | 4 ++-- .../apps/web-antd/src/views/system/oss/index.vue | 2 +- .../apps/web-antd/src/views/tool/gen/data.tsx | 4 ++-- .../apps/web-antd/src/views/tool/gen/index.vue | 2 +- .../web-antd/src/views/tool/gen/table-import-modal.vue | 2 +- .../apps/web-antd/src/views/workflow/category/data.ts | 2 +- .../src/views/workflow/components/approval-card.vue | 2 +- .../src/views/workflow/components/approval-panel.vue | 2 +- .../views/workflow/components/flow-interfere-modal.vue | 2 +- .../playground/src/locales/langs/en-US/system.json | 4 ++-- .../playground/src/locales/langs/zh-CN/system.json | 4 ++-- Yi.Vben5.Vue3/playground/src/views/system/dept/data.ts | 4 ++-- Yi.Vben5.Vue3/playground/src/views/system/role/data.ts | 8 ++++---- .../playground/src/views/system/role/list.vue | 2 +- 29 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Yi.Vben5.Vue3/apps/backend-mock/api/system/dept/list.ts b/Yi.Vben5.Vue3/apps/backend-mock/api/system/dept/list.ts index ae819b62..90cfbf3f 100644 --- a/Yi.Vben5.Vue3/apps/backend-mock/api/system/dept/list.ts +++ b/Yi.Vben5.Vue3/apps/backend-mock/api/system/dept/list.ts @@ -21,7 +21,7 @@ function generateMockDataList(count: number) { pid: 0, name: faker.commerce.department(), status: faker.helpers.arrayElement([0, 1]), - createTime: formatterCN.format( + creationTime: formatterCN.format( faker.date.between({ from: '2021-01-01', to: '2022-12-31' }), ), remark: faker.lorem.sentence(), @@ -34,7 +34,7 @@ function generateMockDataList(count: number) { pid: dataItem.id, name: faker.commerce.department(), status: faker.helpers.arrayElement([0, 1]), - createTime: formatterCN.format( + creationTime: formatterCN.format( faker.date.between({ from: '2023-01-01', to: '2023-12-31' }), ), remark: faker.lorem.sentence(), diff --git a/Yi.Vben5.Vue3/apps/backend-mock/api/system/role/list.ts b/Yi.Vben5.Vue3/apps/backend-mock/api/system/role/list.ts index 2d6feae4..4b64bdbf 100644 --- a/Yi.Vben5.Vue3/apps/backend-mock/api/system/role/list.ts +++ b/Yi.Vben5.Vue3/apps/backend-mock/api/system/role/list.ts @@ -23,7 +23,7 @@ function generateMockDataList(count: number) { id: faker.string.uuid(), name: faker.commerce.product(), status: faker.helpers.arrayElement([0, 1]), - createTime: formatterCN.format( + creationTime: formatterCN.format( faker.date.between({ from: '2022-01-01', to: '2025-01-01' }), ), permissions: faker.helpers.arrayElements(menuIds), @@ -71,10 +71,10 @@ export default eventHandler(async (event) => { ); } if (startTime) { - listData = listData.filter((item) => item.createTime >= startTime); + listData = listData.filter((item) => item.creationTime >= startTime); } if (endTime) { - listData = listData.filter((item) => item.createTime <= endTime); + listData = listData.filter((item) => item.creationTime <= endTime); } if (['0', '1'].includes(status as string)) { listData = listData.filter((item) => item.status === Number(status)); diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/api/common.d.ts b/Yi.Vben5.Vue3/apps/web-antd/src/api/common.d.ts index 22edf6a7..508e5495 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/api/common.d.ts +++ b/Yi.Vben5.Vue3/apps/web-antd/src/api/common.d.ts @@ -4,7 +4,7 @@ export type IDS = (number | string)[]; export interface BaseEntity { createBy?: string; createDept?: string; - createTime?: string; + creationTime?: string; updateBy?: string; updateTime?: string; } @@ -24,9 +24,9 @@ export interface PageResult { * * 排序支持的用法如下: * {isAsc:"asc",orderByColumn:"id"} order by id asc - * {isAsc:"asc",orderByColumn:"id,createTime"} order by id asc,create_time asc - * {isAsc:"desc",orderByColumn:"id,createTime"} order by id desc,create_time desc - * {isAsc:"asc,desc",orderByColumn:"id,createTime"} order by id asc,create_time desc + * {isAsc:"asc",orderByColumn:"id,creationTime"} order by id asc,create_time asc + * {isAsc:"desc",orderByColumn:"id,creationTime"} order by id desc,create_time desc + * {isAsc:"asc,desc",orderByColumn:"id,creationTime"} order by id asc,create_time desc * * @param SkipCount 当前页 * @param MaxResultCount 每页大小 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 981a7d8c..1119b38d 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 @@ -13,7 +13,7 @@ export interface Role { export interface User { avatar: string; - createTime: string; + creationTime: string; deptId: number; deptName: string; email: string; diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/oss/model.d.ts b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/oss/model.d.ts index 6eb4f371..a31b9695 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/oss/model.d.ts +++ b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/oss/model.d.ts @@ -4,7 +4,7 @@ export interface OssFile { originalName: string; fileSuffix: string; url: string; - createTime: string; + creationTime: string; createBy: number; createByName: string; service: string; 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 3d5c3068..eb681610 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 @@ -9,7 +9,7 @@ export interface Dept { phone?: any; email: string; status: string; - createTime?: any; + creationTime?: any; } export interface Role { @@ -22,7 +22,7 @@ export interface Role { deptCheckStrictly?: any; status: string; remark: string; - createTime?: any; + creationTime?: any; flag: boolean; superAdmin: boolean; } @@ -42,7 +42,7 @@ export interface User { loginIp: string; loginDate: string; remark: string; - createTime: string; + creationTime: string; dept: Dept; roles: Role[]; roleIds?: 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 d00b88e4..6e8c4615 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 @@ -22,5 +22,5 @@ export interface SocialInfo { code?: any; oauthToken?: any; oauthTokenSecret?: any; - createTime: string; + creationTime: string; } diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/user/model.d.ts b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/user/model.d.ts index 435e317c..2cdd9856 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/user/model.d.ts +++ b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/user/model.d.ts @@ -28,7 +28,7 @@ export interface Role { deptCheckStrictly?: boolean; status: string; remark: string; - createTime?: string; + creationTime?: string; flag: boolean; superAdmin: boolean; } @@ -68,7 +68,7 @@ export interface Post { postSort: number; status: string; remark: string; - createTime: string; + creationTime: string; } /** diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/api/tool/gen/model.d.ts b/Yi.Vben5.Vue3/apps/web-antd/src/api/tool/gen/model.d.ts index b859c8ff..310bbda8 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/api/tool/gen/model.d.ts +++ b/Yi.Vben5.Vue3/apps/web-antd/src/api/tool/gen/model.d.ts @@ -1,7 +1,7 @@ export interface Column { createDept?: any; createBy?: any; - createTime?: any; + creationTime?: any; updateBy?: any; updateTime?: any; columnId: string; @@ -37,7 +37,7 @@ export interface Column { export interface Table { createDept?: any; createBy?: any; - createTime?: any; + creationTime?: any; updateBy?: any; updateTime?: any; tableId: string; @@ -72,7 +72,7 @@ export interface Table { export interface Row { createDept: number; createBy: number; - createTime: string; + creationTime: string; updateBy: number; updateTime: string; columnId: string; @@ -108,7 +108,7 @@ export interface Row { export interface Column { createDept?: any; createBy?: any; - createTime?: any; + creationTime?: any; updateBy?: any; updateTime?: any; columnId: string; @@ -144,7 +144,7 @@ export interface Column { export interface Info { createDept?: any; createBy?: any; - createTime?: any; + creationTime?: any; updateBy?: any; updateTime?: any; tableId: string; diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/api/workflow/definition/model.d.ts b/Yi.Vben5.Vue3/apps/web-antd/src/api/workflow/definition/model.d.ts index b5eeed9c..0273e036 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/api/workflow/definition/model.d.ts +++ b/Yi.Vben5.Vue3/apps/web-antd/src/api/workflow/definition/model.d.ts @@ -1,6 +1,6 @@ export interface ProcessDefinition { id: string; - createTime: string; + creationTime: string; updateTime: string; tenantId: string; delFlag: string; 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 5bfab113..ec068e85 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 @@ -1,6 +1,6 @@ export interface Flow { id: string; - createTime: string; + creationTime: string; updateTime: string; tenantId: string; delFlag: string; diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/api/workflow/task/model.d.ts b/Yi.Vben5.Vue3/apps/web-antd/src/api/workflow/task/model.d.ts index 5f638a8f..294947a1 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/api/workflow/task/model.d.ts +++ b/Yi.Vben5.Vue3/apps/web-antd/src/api/workflow/task/model.d.ts @@ -7,7 +7,7 @@ export interface ButtonWithPermission { export interface TaskInfo { id: string; categoryName: string; - createTime: string; + creationTime: string; updateTime: string; tenantId: string; delFlag?: any; @@ -85,7 +85,7 @@ export type TaskOperationType = export interface NextNodeInfo { skipList: string[]; id: string; - createTime: string; + creationTime: string; updateTime: string; tenantId: string; delFlag: string; 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 292967a5..fcb0a848 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 @@ -96,7 +96,7 @@ const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE;
diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/monitor/operlog/data.tsx b/Yi.Vben5.Vue3/apps/web-antd/src/views/monitor/operlog/data.tsx index 8189e5e0..c4827667 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/monitor/operlog/data.tsx +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/monitor/operlog/data.tsx @@ -32,7 +32,7 @@ export const querySchema: FormSchemaGetter = () => [ }, { component: 'RangePicker', - fieldName: 'createTime', + fieldName: 'creationTime', label: '操作时间', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/monitor/operlog/index.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/monitor/operlog/index.vue index d48528f7..b52a703a 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/monitor/operlog/index.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/monitor/operlog/index.vue @@ -39,7 +39,7 @@ const formOptions: VbenFormProps = { // 日期选择格式化 fieldMappingTime: [ [ - 'createTime', + 'creationTime', ['startTime', 'endTime'], ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'], ], diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/oss/data.tsx b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/oss/data.tsx index 8184c4f1..1859f2bd 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/oss/data.tsx +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/oss/data.tsx @@ -24,7 +24,7 @@ export const querySchema: FormSchemaGetter = () => [ }, { component: 'RangePicker', - fieldName: 'createTime', + fieldName: 'creationTime', label: '创建时间', }, ]; @@ -53,7 +53,7 @@ export const columns: VxeGridProps['columns'] = [ }, { title: '创建时间', - field: 'createTime', + field: 'creationTime', sortable: true, }, { diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/oss/index.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/oss/index.vue index 0f3032e3..486c0944 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/oss/index.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/oss/index.vue @@ -51,7 +51,7 @@ const formOptions: VbenFormProps = { // 日期选择格式化 fieldMappingTime: [ [ - 'createTime', + 'creationTime', ['params[beginCreateTime]', 'params[endCreateTime]'], ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'], ], diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/data.tsx b/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/data.tsx index e8de2864..8eab8a1e 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/data.tsx +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/data.tsx @@ -23,7 +23,7 @@ export const querySchema: FormSchemaGetter = () => [ }, { component: 'RangePicker', - fieldName: 'createTime', + fieldName: 'creationTime', label: '创建时间', }, ]; @@ -43,7 +43,7 @@ export const columns: VxeGridProps['columns'] = [ title: '实体类', }, { - field: 'createTime', + field: 'creationTime', title: '创建时间', }, { diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/index.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/index.vue index 689e658c..7e49a5ec 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/index.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/index.vue @@ -40,7 +40,7 @@ const formOptions: VbenFormProps = { // 日期选择格式化 fieldMappingTime: [ [ - 'createTime', + 'creationTime', ['startTime', 'endTime'], ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'], ], diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/table-import-modal.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/table-import-modal.vue index b6109009..f3e64e32 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/table-import-modal.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/table-import-modal.vue @@ -63,7 +63,7 @@ const gridOptions: VxeGridProps = { }, { title: '创建时间', - field: 'createTime', + field: 'creationTime', }, { title: '更新时间', diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/category/data.ts b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/category/data.ts index 9dfe1940..3a8838f9 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/category/data.ts +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/category/data.ts @@ -25,7 +25,7 @@ export const columns: VxeGridProps['columns'] = [ title: '排序', }, { - field: 'createTime', + field: 'creationTime', title: '创建时间', }, { diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/approval-card.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/approval-card.vue index d8f1a060..89908780 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/approval-card.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/workflow/components/approval-card.vue @@ -53,7 +53,7 @@ const diffUpdateTimeString = computed(() => {
{{ info.nodeName }}
- {{ info.createTime }} + {{ info.creationTime }}