fix(core): 统一创建时间字段名从 createTime 到 creationTime
This commit is contained in:
@@ -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(),
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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<T = any> {
|
||||
*
|
||||
* 排序支持的用法如下:
|
||||
* {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 每页大小
|
||||
|
||||
@@ -13,7 +13,7 @@ export interface Role {
|
||||
|
||||
export interface User {
|
||||
avatar: string;
|
||||
createTime: string;
|
||||
creationTime: string;
|
||||
deptId: number;
|
||||
deptName: string;
|
||||
email: string;
|
||||
|
||||
@@ -4,7 +4,7 @@ export interface OssFile {
|
||||
originalName: string;
|
||||
fileSuffix: string;
|
||||
url: string;
|
||||
createTime: string;
|
||||
creationTime: string;
|
||||
createBy: number;
|
||||
createByName: string;
|
||||
service: string;
|
||||
|
||||
@@ -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[];
|
||||
|
||||
@@ -22,5 +22,5 @@ export interface SocialInfo {
|
||||
code?: any;
|
||||
oauthToken?: any;
|
||||
oauthTokenSecret?: any;
|
||||
createTime: string;
|
||||
creationTime: string;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
export interface ProcessDefinition {
|
||||
id: string;
|
||||
createTime: string;
|
||||
creationTime: string;
|
||||
updateTime: string;
|
||||
tenantId: string;
|
||||
delFlag: string;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
export interface Flow {
|
||||
id: string;
|
||||
createTime: string;
|
||||
creationTime: string;
|
||||
updateTime: string;
|
||||
tenantId: string;
|
||||
delFlag: string;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -96,7 +96,7 @@ const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE;
|
||||
<template #title>
|
||||
<div class="flex flex-col items-center gap-2 p-2">
|
||||
<Avatar :size="36" :src="item.info.avatar" />
|
||||
<div>绑定时间: {{ item.info.createTime }}</div>
|
||||
<div>绑定时间: {{ item.info.creationTime }}</div>
|
||||
</div>
|
||||
</template>
|
||||
<div class="cursor-pointer">
|
||||
|
||||
@@ -32,7 +32,7 @@ export const querySchema: FormSchemaGetter = () => [
|
||||
},
|
||||
{
|
||||
component: 'RangePicker',
|
||||
fieldName: 'createTime',
|
||||
fieldName: 'creationTime',
|
||||
label: '操作时间',
|
||||
componentProps: {
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -39,7 +39,7 @@ const formOptions: VbenFormProps = {
|
||||
// 日期选择格式化
|
||||
fieldMappingTime: [
|
||||
[
|
||||
'createTime',
|
||||
'creationTime',
|
||||
['startTime', 'endTime'],
|
||||
['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
|
||||
],
|
||||
|
||||
@@ -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,
|
||||
},
|
||||
{
|
||||
|
||||
@@ -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'],
|
||||
],
|
||||
|
||||
@@ -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: '创建时间',
|
||||
},
|
||||
{
|
||||
|
||||
@@ -40,7 +40,7 @@ const formOptions: VbenFormProps = {
|
||||
// 日期选择格式化
|
||||
fieldMappingTime: [
|
||||
[
|
||||
'createTime',
|
||||
'creationTime',
|
||||
['startTime', 'endTime'],
|
||||
['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
|
||||
],
|
||||
|
||||
@@ -63,7 +63,7 @@ const gridOptions: VxeGridProps = {
|
||||
},
|
||||
{
|
||||
title: '创建时间',
|
||||
field: 'createTime',
|
||||
field: 'creationTime',
|
||||
},
|
||||
{
|
||||
title: '更新时间',
|
||||
|
||||
@@ -25,7 +25,7 @@ export const columns: VxeGridProps['columns'] = [
|
||||
title: '排序',
|
||||
},
|
||||
{
|
||||
field: 'createTime',
|
||||
field: 'creationTime',
|
||||
title: '创建时间',
|
||||
},
|
||||
{
|
||||
|
||||
@@ -53,7 +53,7 @@ const diffUpdateTimeString = computed(() => {
|
||||
<div class="font-bold">{{ info.nodeName }}</div>
|
||||
</DescriptionsItem>
|
||||
<DescriptionsItem label="提交时间">
|
||||
{{ info.createTime }}
|
||||
{{ info.creationTime }}
|
||||
</DescriptionsItem>
|
||||
<!-- <DescriptionsItem label="更新时间">
|
||||
{{ info.updateTime }}
|
||||
|
||||
@@ -428,7 +428,7 @@ async function handleCopy(text: string) {
|
||||
<Divider type="vertical" />
|
||||
<div class="flex items-center gap-1">
|
||||
<span class="icon-[mdi--clock-outline] size-[16px]"></span>
|
||||
提交时间: {{ task.createTime }}
|
||||
提交时间: {{ task.creationTime }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -139,7 +139,7 @@ function handleReductionSignature(userList: User[]) {
|
||||
{{ taskInfo.nodeCode }}
|
||||
</DescriptionsItem>
|
||||
<DescriptionsItem label="开始时间">
|
||||
{{ taskInfo.createTime }}
|
||||
{{ taskInfo.creationTime }}
|
||||
</DescriptionsItem>
|
||||
<DescriptionsItem label="流程实例ID">
|
||||
{{ taskInfo.instanceId }}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"title": "Department Management",
|
||||
"deptName": "Department Name",
|
||||
"status": "Status",
|
||||
"createTime": "Create Time",
|
||||
"creationTime": "Create Time",
|
||||
"remark": "Remark",
|
||||
"operation": "Operation",
|
||||
"parentDept": "Parent Department"
|
||||
@@ -57,7 +57,7 @@
|
||||
"id": "Role ID",
|
||||
"status": "Status",
|
||||
"remark": "Remark",
|
||||
"createTime": "Creation Time",
|
||||
"creationTime": "Creation Time",
|
||||
"operation": "Operation",
|
||||
"permissions": "Permissions",
|
||||
"setPermissions": "Permissions"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"dept": {
|
||||
"list": "部门列表",
|
||||
"createTime": "创建时间",
|
||||
"creationTime": "创建时间",
|
||||
"deptName": "部门名称",
|
||||
"name": "部门",
|
||||
"operation": "操作",
|
||||
@@ -58,7 +58,7 @@
|
||||
"id": "角色ID",
|
||||
"status": "状态",
|
||||
"remark": "备注",
|
||||
"createTime": "创建时间",
|
||||
"creationTime": "创建时间",
|
||||
"operation": "操作",
|
||||
"permissions": "权限",
|
||||
"setPermissions": "授权"
|
||||
|
||||
@@ -93,9 +93,9 @@ export function useColumns(
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
field: 'createTime',
|
||||
field: 'creationTime',
|
||||
resizable: false,
|
||||
title: $t('system.dept.createTime'),
|
||||
title: $t('system.dept.creationTime'),
|
||||
width: 'auto',
|
||||
},
|
||||
{
|
||||
|
||||
@@ -68,8 +68,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
|
||||
},
|
||||
{
|
||||
component: 'RangePicker',
|
||||
fieldName: 'createTime',
|
||||
label: $t('system.role.createTime'),
|
||||
fieldName: 'creationTime',
|
||||
label: $t('system.role.creationTime'),
|
||||
},
|
||||
];
|
||||
}
|
||||
@@ -104,8 +104,8 @@ export function useColumns<T = SystemRoleApi.SystemRole>(
|
||||
title: $t('system.role.remark'),
|
||||
},
|
||||
{
|
||||
field: 'createTime',
|
||||
title: $t('system.role.createTime'),
|
||||
field: 'creationTime',
|
||||
title: $t('system.role.creationTime'),
|
||||
width: 200,
|
||||
},
|
||||
{
|
||||
|
||||
@@ -26,7 +26,7 @@ const [FormDrawer, formDrawerApi] = useVbenDrawer({
|
||||
|
||||
const [Grid, gridApi] = useVbenVxeGrid({
|
||||
formOptions: {
|
||||
fieldMappingTime: [['createTime', ['startTime', 'endTime']]],
|
||||
fieldMappingTime: [['creationTime', ['startTime', 'endTime']]],
|
||||
schema: useGridFormSchema(),
|
||||
submitOnChange: true,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user