public/FastapiAdmin
1
0
Fork 0
mirror of https://github.com/fastapiadmin/FastapiAdmin.git synced 2026-09-22 21:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 统一状态字段类型为字符串并重构基础类型

Browse Source 
refactor: 重构前后端状态字段类型从布尔值改为字符串
feat: 新增基础类型定义和通用类型接口
refactor: 移除不必要的时间范围字段并统一使用created_time
style: 更新前端组件以匹配新的字段命名
docs: 更新接口文档和类型定义
This commit is contained in:
zhangtao
2025-11-27 23:47:23 +08:00
parent 2c9d66e2a7
commit 0c86069efa
73 changed files with 590 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/api/module_application/job.ts
+18 -37
View File
@@ -123,23 +123,16 @@ export default JobAPI;
export interface JobPageQuery extends PageQuery {
name?: string;
status?: boolean;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
status?: string;
created_id?: number;
created_time?: string[];
}
export interface JobLogPageQuery extends PageQuery {
status?: boolean;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
/** 任务ID */
job_id?: number;
job_name?: string;
status?: string;
created_time?: string[];
}
export interface JobOptionData {
@@ -147,9 +140,7 @@ export interface JobOptionData {
option?: number; //操作类型 1: 暂停 2: 恢复 3: 重启
}
export interface JobTable {
index?: number;
id: number;
export interface JobTable extends BaseType {
name: string;
func?: string;
trigger?: string;
@@ -162,15 +153,13 @@ export interface JobTable {
trigger_args?: string;
start_date?: string;
end_date?: string;
status?: boolean;
description?: string;
created_at?: string;
updated_at?: string;
creator?: creatorType;
created_by?: creatorType;
updated_by?: updatorType;
tenant?: CommonType;
customer?: CommonType;
}
export interface JobForm {
id?: number;
export interface JobForm extends BaseFormType {
name?: string;
func?: string;
trigger?: string;
@@ -183,13 +172,10 @@ export interface JobForm {
trigger_args?: string;
start_date?: string;
end_date?: string;
status?: boolean;
description?: string;
}
// 定时任务运行日志接口（对应Scheduler实时状态）
export interface JobRunLog {
id: string;
export interface JobRunLog extends BaseType {
name: string;
trigger: string;
executor: string;
@@ -201,12 +187,11 @@ export interface JobRunLog {
coalesce: boolean;
max_instances: number;
next_run_time: string;
state: string;
tenant?: CommonType;
}
// 定时任务日志详情接口（对应数据库日志表）
export interface JobLogDetail {
id: number;
export interface JobLogDetail extends BaseType {
job_name: string;
job_group: string;
job_executor: string;
@@ -215,15 +200,12 @@ export interface JobLogDetail {
job_kwargs?: string;
job_trigger?: string;
job_message?: string;
status: boolean;
exception_info?: string;
create_time: string;
tenant?: CommonType;
}
// 定时任务日志列表接口（对应数据库日志表）
export interface JobLogTable {
index?: number;
id: number;
export interface JobLogTable extends BaseType {
job_name: string;
job_group: string;
job_executor: string;
@@ -232,7 +214,6 @@ export interface JobLogTable {
job_kwargs?: string;
job_trigger?: string;
job_message?: string;
status: boolean;
exception_info?: string;
create_time: string;
tenant?: CommonType;
}
frontend/src/api/module_application/myapp.ts
+9 -37
View File
@@ -82,58 +82,30 @@ export default ApplicationAPI;
* 应用分页查询参数
*/
export interface ApplicationPageQuery extends PageQuery {
/** 应用名称 */
name?: string;
/** 是否启用 */
status?: boolean;
/** 创建人 */
creator?: number;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
/** 排序字段,格式:[{'field':'asc/desc'}] */
order_by?: string;
status?: string;
created_id?: number;
created_time?: string[];
}
/**
* 应用信息
*/
export interface ApplicationInfo {
/** 应用ID */
id?: number;
/** 应用名称 */
export interface ApplicationInfo extends BaseType {
name?: string;
/** 访问地址 */
access_url?: string;
/** 图标地址 */
icon_url?: string;
/** 是否启用 */
status?: boolean;
/** 应用描述 */
description?: string;
/** 创建时间 */
created_at?: string;
/** 更新时间 */
updated_at?: string;
/** 创建人 */
creator?: creatorType;
created_by?: creatorType;
updated_by?: updatorType;
tenant?: CommonType;
customer?: CommonType;
}
/**
* 应用表单
*/
export interface ApplicationForm {
/** 应用ID */
id?: number;
/** 应用名称 */
export interface ApplicationForm extends BaseFormType {
name: string;
/** 访问地址 */
access_url: string;
/** 图标地址 */
icon_url: string;
/** 是否启用 */
status: boolean;
/** 应用描述 */
description?: string;
}
frontend/src/api/module_example/demo.ts
+11 -19
View File
@@ -85,29 +85,21 @@ export interface DemoPageQuery extends PageQuery {
/** 示例标题 */
name?: string;
/** 示例状态 */
status?: boolean;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
/** 创建人 */
creator?: number;
status?: string;
/** 创建时间 */
created_time?: string[];
// 创建人ID
created_id?: number;
}
export interface DemoTable {
index?: number;
id?: number;
export interface DemoTable extends BaseType {
name?: string;
status?: boolean;
description?: string;
created_at?: string;
updated_at?: string;
creator?: creatorType;
created_by?: creatorType;
updated_by?: updatorType;
tenant?: CommonType;
customer?: CommonType;
}
export interface DemoForm {
id?: number;
export interface DemoForm extends BaseFormType {
name?: string;
status?: boolean;
description?: string;
}
frontend/src/api/module_system/customer.ts
+101
View File
@@ -0,0 +1,101 @@
import request from "@/utils/request";
const API_PATH = "/system/customer";
const CustomerAPI = {
listCustomer(query: CustomerPageQuery) {
return request<ApiResponse<PageResult<CustomerTable[]>>>({
url: `${API_PATH}/list`,
method: "get",
params: query,
});
},
detailCustomer(query: number) {
return request<ApiResponse<CustomerTable>>({
url: `${API_PATH}/detail/${query}`,
method: "get",
});
},
createCustomer(body: CustomerForm) {
return request<ApiResponse>({
url: `${API_PATH}/create`,
method: "post",
data: body,
});
},
updateCustomer(id: number, body: CustomerForm) {
return request<ApiResponse>({
url: `${API_PATH}/update/${id}`,
method: "put",
data: body,
});
},
deleteCustomer(body: number[]) {
return request<ApiResponse>({
url: `${API_PATH}/delete`,
method: "delete",
data: body,
});
},
batchCustomer(body: BatchType) {
return request<ApiResponse>({
url: `${API_PATH}/available/setting`,
method: "patch",
data: body,
});
},
exportCustomer(body: CustomerPageQuery) {
return request<Blob>({
url: `${API_PATH}/export`,
method: "post",
data: body,
responseType: "blob",
});
},
downloadCustomer() {
return request<ApiResponse>({
url: `${API_PATH}/download/template`,
method: "post",
responseType: "blob",
});
},
importCustomer(body: FormData) {
return request<ApiResponse>({
url: `${API_PATH}/import`,
method: "post",
data: body,
headers: {
"Content-Type": "multipart/form-data",
},
});
},
};
export default CustomerAPI;
export interface CustomerPageQuery extends PageQuery {
name?: string;
status?: string;
created_time?: string[];
}
export interface CustomerTable extends BaseType {
name?: string;
code?: string;
created_by?: creatorType;
updated_by?: updatorType;
tenant?: CommonType;
}
export interface CustomerForm extends BaseFormType {
name?: string;
code?: string;
}
frontend/src/api/module_system/dept.ts
+13 -17
View File
@@ -55,35 +55,31 @@ export default DeptAPI;
export interface DeptPageQuery {
name?: string;
status?: boolean;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
status?: string;
created_time?: string[];
}
export interface DeptTable {
index?: number;
id?: number;
export interface DeptTable extends BaseType {
name?: string;
order?: number;
code?: string;
leader?: string;
phone?: string;
email?: string;
parent_id?: number;
parent_name?: string;
status?: boolean;
description?: string;
created_at?: string;
updated_at?: string;
children?: DeptTable[];
creator?: creatorType;
created_by?: creatorType;
updated_by?: updatorType;
tenant?: CommonType;
}
export interface DeptForm {
id?: number;
export interface DeptForm extends BaseFormType {
name?: string;
order?: number;
code?: string;
leader?: string;
phone?: string;
email?: string;
parent_id?: number;
status?: boolean;
description?: string;
}
frontend/src/api/module_system/dict.ts
+12 -36
View File
@@ -138,71 +138,47 @@ export interface DictPageQuery extends PageQuery {
/** 通知类型 */
dict_type?: string;
/** 通知状态 */
status?: boolean;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
status?: string;
/** 创建时间 */
created_time?: string[];
}
export interface DictDataPageQuery extends PageQuery {
dict_label?: string;
dict_type?: string;
status?: boolean;
start_time?: string;
end_time?: string;
// 创建人ID
creator?: number;
dict_type_id?: number;
status?: string;
created_time?: string[];
}
export interface DictTable {
index?: number;
id?: number;
export interface DictTable extends BaseType {
dict_name?: string;
dict_type?: string;
status?: boolean;
description?: string;
created_at?: string;
updated_at?: string;
creator?: creatorType;
}
export interface DictForm {
id?: number;
export interface DictForm extends BaseFormType {
dict_name?: string;
dict_type?: string;
status?: boolean;
description?: string;
}
export interface DictDataTable {
index?: number;
id?: number;
export interface DictDataTable extends BaseType {
dict_sort?: number;
dict_label?: string;
dict_value?: string;
dict_type_id?: number;
dict_type?: string;
css_class?: string;
list_class?: string;
is_default?: boolean;
status?: boolean;
description?: string;
created_at?: string;
updated_at?: string;
creator?: creatorType;
}
export interface DictDataForm {
id?: number;
export interface DictDataForm extends BaseFormType {
dict_sort?: number;
dict_label?: string;
dict_value?: string;
dict_type_id?: number;
dict_type?: string;
css_class?: string;
list_class?: string;
is_default?: boolean;
status?: boolean;
description?: string;
}
frontend/src/api/module_system/log.ts
+7 -12
View File
@@ -42,16 +42,11 @@ export interface LogPageQuery extends PageQuery {
type?: number;
request_path?: string;
creator_name?: string;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
created_time?: string[];
created_id?: number;
}
export interface LogTable {
id?: number;
export interface LogTable extends BaseType {
type?: number; // 1 登录日志 2 操作日志
request_path?: string;
request_method?: string;
@@ -63,8 +58,8 @@ export interface LogTable {
request_payload?: string;
response_json?: string;
process_time?: string;
description?: string;
created_at?: string;
updated_at?: string;
creator?: creatorType;
created_by?: creatorType;
updated_by?: updatorType;
tenant?: CommonType;
customer?: CommonType;
}
frontend/src/api/module_system/menu.ts
+5 -16
View File
@@ -55,16 +55,12 @@ export default MenuAPI;
export interface MenuPageQuery {
name?: string;
status?: boolean;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
status?: string;
/** 创建时间 */
created_time?: string[];
}
export interface MenuTable {
index?: number;
id?: number;
export interface MenuTable extends BaseType {
name?: string;
type?: number;
icon?: string;
@@ -82,15 +78,10 @@ export interface MenuTable {
title?: string;
params?: { key: string; value: string }[];
affix?: boolean;
status?: boolean;
description?: string;
created_at?: string;
updated_at?: string;
children?: MenuTable[];
}
export interface MenuForm {
id?: number;
export interface MenuForm extends BaseFormType {
name?: string;
type?: number;
icon?: string;
@@ -107,8 +98,6 @@ export interface MenuForm {
title?: string;
params?: KeyValue[];
affix?: boolean;
status?: boolean;
description?: string;
}
export interface KeyValue {
frontend/src/api/module_system/notice.ts
+9 -22
View File
@@ -70,38 +70,25 @@ const NoticeAPI = {
export default NoticeAPI;
export interface NoticePageQuery extends PageQuery {
/** 通知标题 */
notice_title?: string;
/** 通知类型 */
notice_type?: string;
/** 通知状态 */
status?: boolean;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
status?: string;
created_time?: string[];
created_id?: number;
}
export interface NoticeTable {
index?: number;
id?: number;
export interface NoticeTable extends BaseType {
notice_title?: string;
notice_type?: string;
notice_content?: string;
status?: boolean;
description?: string;
created_at?: string;
updated_at?: string;
creator?: creatorType;
created_by?: creatorType;
updated_by?: updatorType;
tenant?: CommonType;
customer?: CommonType;
}
export interface NoticeForm {
id?: number;
export interface NoticeForm extends BaseFormType {
notice_title?: string;
notice_type?: string;
notice_content?: string;
status?: boolean;
description?: string;
}
frontend/src/api/module_system/params.ts
+4 -15
View File
@@ -77,31 +77,20 @@ export interface ConfigPageQuery extends PageQuery {
config_key?: string;
/** 配置类型 */
config_type?: boolean;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
/** 创建时间 */
created_time?: string[];
}
export interface ConfigTable {
id?: number;
export interface ConfigTable extends BaseType {
config_name?: string;
config_key?: string;
config_value?: string;
config_type?: boolean;
description?: string;
created_at?: string;
updated_at?: string;
creator?: creatorType;
}
export interface ConfigForm {
id?: number;
export interface ConfigForm extends BaseFormType {
config_name?: string;
config_key?: string;
config_value?: string;
config_type?: boolean;
description?: string;
}
frontend/src/api/module_system/position.ts
+8 -19
View File
@@ -64,31 +64,20 @@ export default PositionAPI;
export interface PositionPageQuery extends PageQuery {
name?: string;
status?: boolean;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
status?: string;
created_id?: number;
created_time?: string[];
}
export interface PositionTable {
index?: number;
id?: number;
export interface PositionTable extends BaseType {
name?: string;
order?: number;
status?: boolean;
description?: string;
created_at?: string;
updated_at?: string;
creator?: creatorType;
created_by?: creatorType;
updated_by?: updatorType;
tenant?: CommonType;
}
export interface PositionForm {
id?: number;
export interface PositionForm extends BaseFormType {
name?: string;
order?: number;
status?: boolean;
description?: string;
}
frontend/src/api/module_system/role.ts
+9 -25
View File
@@ -72,49 +72,33 @@ export default RoleAPI;
export interface TablePageQuery extends PageQuery {
name?: string;
status?: boolean;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
status?: string;
created_id?: number;
created_time?: string[];
}
export interface RoleTable {
index?: number;
id: number;
export interface RoleTable extends BaseType {
name: string;
order?: number;
code?: string;
data_scope?: number;
status?: boolean;
menus?: permissionMenuType[];
depts?: permissionDeptType[];
description?: string;
created_at?: string;
updated_at?: string;
creator?: creatorType;
created_by?: creatorType;
updated_by?: updatorType;
tenant?: CommonType;
}
export interface RoleForm {
id?: number;
export interface RoleForm extends BaseFormType {
name?: string;
order?: number;
code?: string;
status?: boolean;
description?: string;
created_at?: string;
updated_at?: string;
creator?: creatorType;
menus?: permissionMenuType[];
depts?: permissionDeptType[];
}
export interface permissionDataType {
data_scope: number;
role_ids: RoleTable["id"][];
menu_ids: permissionMenuType["id"][];
data_scope: number;
dept_ids: permissionDeptType["id"][];
}
frontend/src/api/module_system/tenant.ts
+15 -23
View File
@@ -82,34 +82,26 @@ const TenantAPI = {
export default TenantAPI;
export interface TenantPageQuery extends PageQuery {
/** 示例标题 */
name?: string;
/** 示例状态 */
status?: boolean;
/** 开始时间 */
status?: string;
created_time?: string[];
}
export interface TenantTable extends BaseType {
name?: string;
code?: string;
start_time?: string;
/** 结束时间 */
end_time?: string;
/** 创建人 */
creator?: number;
max_user_count?: number;
enable_quota_limit?: boolean;
current_user_count?: number;
}
export interface TenantTable {
index?: number;
id?: number;
export interface TenantForm extends BaseFormType {
name?: string;
code?: string;
status?: boolean;
description?: string;
created_at?: string;
updated_at?: string;
// creator?: creatorType;
}
export interface TenantForm {
id?: number;
name?: string;
code?: string;
status?: boolean;
description?: string;
start_time?: string;
end_time?: string;
max_user_count?: number;
enable_quota_limit?: boolean;
}
frontend/src/api/module_system/user.ts
+22 -22
View File
@@ -141,26 +141,31 @@ export default UserAPI;
export interface ForgetPasswordForm {
username: string;
new_password: string;
mobile?: string;
confirmPassword: string;
}
export interface RegisterForm {
name: string;
mobile?: string;
username: string;
password: string;
role_ids?: number[];
customer_id?: number;
description?: string;
user_type?: string;
confirmPassword: string;
}
export interface UserPageQuery extends PageQuery {
username?: string;
name?: string;
status?: boolean;
mobile?: string;
email?: string;
dept_id?: number;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
// 创建人ID
creator?: number;
status?: string;
created_time?: string[];
created_id?: number;
}
export interface searchSelectDataType {
@@ -168,9 +173,7 @@ export interface searchSelectDataType {
status?: string;
}
export interface UserInfo {
index?: number;
id?: number;
export interface UserInfo extends BaseType {
username?: string;
name?: string;
avatar?: string;
@@ -189,12 +192,11 @@ export interface UserInfo {
position_names?: positionSelectorType["name"][];
position_ids?: positionSelectorType["id"][];
is_superuser?: boolean;
status?: boolean;
description?: string;
last_login?: string;
created_at?: string;
updated_at?: string;
creator?: creatorType;
created_by?: creatorType;
updated_by?: updatorType;
tenant?: CommonType;
customer?: CommonType;
}
export interface deptTreeType {
@@ -208,7 +210,7 @@ export interface roleSelectorType {
id?: number;
name?: string;
code?: string;
status?: boolean;
status?: string;
description?: string;
menus?: MenuForm[];
}
@@ -216,7 +218,7 @@ export interface roleSelectorType {
export interface positionSelectorType {
id?: number;
name?: string;
status?: boolean;
status?: string;
description?: string;
}
@@ -232,7 +234,8 @@ export interface InfoFormState {
positions?: positionSelectorType[];
roles?: roleSelectorType[];
avatar?: string;
created_at?: string;
created_time?: string;
updated_time?: string;
}
export interface PasswordFormState {
@@ -246,8 +249,7 @@ export interface ResetPasswordForm {
password: string;
}
export interface UserForm {
id?: number;
export interface UserForm extends BaseFormType {
username?: string;
name?: string;
dept_id?: number;
@@ -261,8 +263,6 @@ export interface UserForm {
email?: string;
mobile?: string;
is_superuser?: boolean;
status?: boolean;
description?: string;
}
export interface CurrentUserFormState {
frontend/src/components/Notification/index.vue
+3 -3
View File
@@ -23,7 +23,7 @@
<!-- 时间 -->
<div class="text-xs text-gray">
{{ item.created_at }}
{{ item.created_time }}
</div>
</div>
</div>
@@ -67,13 +67,13 @@
<el-icon>
<User />
</el-icon>
{{ noticeDetail.creator?.username }}
{{ noticeDetail.created_by?.username }}
</span>
<span class="ml-2 flex-y-center">
<el-icon>
<Timer />
</el-icon>
{{ noticeDetail.created_at }}
{{ noticeDetail.created_time }}
</span>
</div>
frontend/src/types/global.d.ts
Vendored
+40 -1
View File
@@ -126,6 +126,14 @@ declare global {
messageList: Array<string>;
}
/**
* 创建人
*/
interface CommonType {
id?: number;
name?: string;
}
/**
* 创建人
*/
@@ -135,6 +143,37 @@ declare global {
username?: string;
}
/**
* 更新人
*/
interface updatorType {
id?: number;
name?: string;
username?: string;
}
/**
* 基础类型
*/
interface BaseType {
index?: number;
id?: number;
uuid?: string;
status?: string;
description?: string;
created_time?: string;
updated_time?: string;
}
/**
* 基础类型
*/
interface BaseFormType {
id?: number;
status?: string;
description?: string;
}
/**
* 上传文件返回
*/
@@ -150,7 +189,7 @@ declare global {
*/
export interface BatchType {
ids?: number[];
status?: boolean;
status?: string;
}
}
export {};
frontend/src/views/current/profile.vue
+2 -2
View File
@@ -116,7 +116,7 @@
<span>加入时间</span>
</div>
</template>
<span>{{ infoFormState.created_at }}</span>
<span>{{ infoFormState.created_time }}</span>
</el-descriptions-item>
</el-descriptions>
</el-card>
@@ -340,7 +340,7 @@ const infoFormState = reactive<InfoFormState>({
positions: [],
roles: [],
avatar: undefined,
created_at: undefined,
created_time: undefined,
});
// 修改密码表单
frontend/src/views/dashboard/workplace.vue
+2 -2
View File
@@ -105,7 +105,7 @@
</el-tag>
</div>
<span class="text-xs text-[var(--el-text-color-regular)]">
{{ formatTime(item.created_at) }}
{{ formatTime(item.created_time) }}
</span>
</div>
<div class="text-sm text-[var(--el-text-color-regular)] mb-3 line-clamp-2">
@@ -113,7 +113,7 @@
</div>
<div class="flex justify-between items-center text-xs">
<span class="text-[var(--el-text-color-regular)]">
{{ item.creator?.name }} 发布
{{ item.created_by?.name }} 发布
</span>
<el-tooltip placement="top" :content="item.description || item.notice_content">
<ElButton target="_blank" type="primary" link @click="goToNotice()">
frontend/src/views/module_application/job/index.vue
+7 -7
View File
@@ -205,8 +205,8 @@
</template>
</el-table-column>
<el-table-column label="描述" prop="description" min-width="100" />
<el-table-column label="创建时间" prop="created_at" min-width="200" sortable />
<el-table-column label="更新时间" prop="updated_at" min-width="200" sortable />
<el-table-column label="创建时间" prop="created_time" min-width="200" sortable />
<el-table-column label="更新时间" prop="updated_time" min-width="200" sortable />
<OperationColumn :list-data-length="pageTableData.length">
<template #default="scope">
@@ -362,13 +362,13 @@
{{ detailFormData.end_date }}
</el-descriptions-item>
<el-descriptions-item label="创建人" :span="2">
{{ detailFormData.creator?.name }}
{{ detailFormData.created_by?.name }}
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">
{{ detailFormData.created_at }}
{{ detailFormData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="2">
{{ detailFormData.updated_at }}
{{ detailFormData.updated_time }}
</el-descriptions-item>
<el-descriptions-item label="描述" :span="4">
{{ detailFormData.description }}
@@ -944,8 +944,8 @@ const exportColumns = [
{ prop: "coalesce", label: "并发执行" },
{ prop: "status", label: "状态" },
{ prop: "description", label: "描述" },
{ prop: "created_at", label: "创建时间" },
{ prop: "updated_at", label: "更新时间" },
{ prop: "created_time", label: "创建时间" },
{ prop: "updated_time", label: "更新时间" },
];
// 导出配置（用于导出弹窗）
frontend/src/views/module_application/myapp/index.vue
+2 -2
View File
@@ -150,11 +150,11 @@
<div class="card-footer">
<div class="footer-item">
<el-icon size="14" class="footer-icon"><User /></el-icon>
<span class="footer-text">{{ app.creator?.name || "未知" }}</span>
<span class="footer-text">{{ app.created_by?.name || "未知" }}</span>
</div>
<div class="footer-item">
<el-icon size="14" class="footer-icon"><Clock /></el-icon>
<span class="footer-text">{{ formatTime(app.created_at) }}</span>
<span class="footer-text">{{ formatTime(app.created_time) }}</span>
</div>
</div>
</template>
frontend/src/views/module_application/workflow/index.vue
+10 -10
View File
@@ -178,16 +178,16 @@
min-width="140"
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'created_at')?.show"
v-if="tableColumns.find((col) => col.prop === 'created_time')?.show"
label="创建时间"
prop="created_at"
prop="created_time"
min-width="180"
sortable
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'updated_at')?.show"
v-if="tableColumns.find((col) => col.prop === 'updated_time')?.show"
label="更新时间"
prop="updated_at"
prop="updated_time"
min-width="180"
sortable
/>
@@ -198,7 +198,7 @@
min-width="100"
>
<template #default="scope">
{{ scope.row.creator?.name }}
{{ scope.row.created_by?.name }}
</template>
</el-table-column>
@@ -276,13 +276,13 @@
{{ detailFormData.description }}
</el-descriptions-item>
<el-descriptions-item label="创建人" :span="2">
{{ detailFormData.creator?.name }}
{{ detailFormData.created_by?.name }}
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">
{{ detailFormData.created_at }}
{{ detailFormData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="2">
{{ detailFormData.updated_at }}
{{ detailFormData.updated_time }}
</el-descriptions-item>
</el-descriptions>
</template>
@@ -361,8 +361,8 @@ const tableColumns = ref([
{ prop: "name", label: "名称", show: true },
{ prop: "status", label: "状态", show: true },
{ prop: "description", label: "描述", show: true },
{ prop: "created_at", label: "创建时间", show: true },
{ prop: "updated_at", label: "更新时间", show: true },
{ prop: "created_time", label: "创建时间", show: true },
{ prop: "updated_time", label: "更新时间", show: true },
{ prop: "creator", label: "创建人", show: true },
{ prop: "operation", label: "操作", show: true },
]);
frontend/src/views/module_example/demo/index.vue
+12 -12
View File
@@ -245,15 +245,15 @@
min-width="140"
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'created_at')?.show"
v-if="tableColumns.find((col) => col.prop === 'created_time')?.show"
label="创建时间"
prop="created_at"
prop="created_time"
min-width="180"
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'updated_at')?.show"
v-if="tableColumns.find((col) => col.prop === 'updated_time')?.show"
label="更新时间"
prop="updated_at"
prop="updated_time"
min-width="180"
/>
<el-table-column
@@ -263,7 +263,7 @@
min-width="120"
>
<template #default="scope">
<el-tag>{{ scope.row.creator?.name }}</el-tag>
<el-tag>{{ scope.row.created_by?.name }}</el-tag>
</template>
</el-table-column>
<el-table-column
@@ -340,13 +340,13 @@
{{ detailFormData.description }}
</el-descriptions-item>
<el-descriptions-item label="创建人" :span="2">
{{ detailFormData.creator?.name }}
{{ detailFormData.created_by?.name }}
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">
{{ detailFormData.created_at }}
{{ detailFormData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="2">
{{ detailFormData.updated_at }}
{{ detailFormData.updated_time }}
</el-descriptions-item>
</el-descriptions>
</template>
@@ -449,8 +449,8 @@ const tableColumns = ref([
{ prop: "name", label: "名称", show: true },
{ prop: "status", label: "状态", show: true },
{ prop: "description", label: "描述", show: true },
{ prop: "created_at", label: "创建时间", show: true },
{ prop: "updated_at", label: "更新时间", show: true },
{ prop: "created_time", label: "创建时间", show: true },
{ prop: "updated_time", label: "更新时间", show: true },
{ prop: "creator", label: "创建人", show: true },
{ prop: "operation", label: "操作", show: true },
]);
@@ -460,8 +460,8 @@ const exportColumns = [
{ prop: "name", label: "名称" },
{ prop: "status", label: "状态" },
{ prop: "description", label: "描述" },
{ prop: "created_at", label: "创建时间" },
{ prop: "updated_at", label: "更新时间" },
{ prop: "created_time", label: "创建时间" },
{ prop: "updated_time", label: "更新时间" },
];
// 导入/导出配置
frontend/src/views/module_generator/backcode/index.vue
+12 -12
View File
@@ -194,14 +194,14 @@
:show-overflow-tooltip="true"
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'created_at')?.show"
v-if="tableColumns.find((col) => col.prop === 'created_time')?.show"
label="创建时间"
prop="created_at"
prop="created_time"
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'updated_at')?.show"
v-if="tableColumns.find((col) => col.prop === 'updated_time')?.show"
label="更新时间"
prop="updated_at"
prop="updated_time"
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'operation')?.show"
@@ -1006,8 +1006,8 @@ const tableColumns = ref<TableColumn[]>([
{ prop: "table_name", label: "表名称", show: true },
{ prop: "table_comment", label: "表描述", show: true },
{ prop: "class_name", label: "实体", show: true },
{ prop: "created_at", label: "创建时间", show: true },
{ prop: "updated_at", label: "更新时间", show: true },
{ prop: "created_time", label: "创建时间", show: true },
{ prop: "updated_time", label: "更新时间", show: true },
{ prop: "operation", label: "操作", show: true },
]);
@@ -1410,8 +1410,8 @@ function loadExampleMysql(): void {
\`creator_id\` int DEFAULT NULL COMMENT '创建人ID',
\`id\` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
\`description\` text COLLATE utf8mb4_unicode_ci COMMENT '备注/描述',
\`created_at\` datetime DEFAULT NULL COMMENT '创建时间',
\`updated_at\` datetime DEFAULT NULL COMMENT '更新时间',
\`created_time\` datetime DEFAULT NULL COMMENT '创建时间',
\`updated_time\` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (\`id\`),
KEY \`ix_gen_demo01_creator_id\` (\`creator_id\`),
CONSTRAINT \`gen_demo01_ibfk_1\` FOREIGN KEY (\`creator_id\`) REFERENCES \`system_users\` (\`id\`) ON DELETE SET NULL ON UPDATE CASCADE
@@ -1427,8 +1427,8 @@ function loadExamplePostgres(): void {
creator_id integer,
id SERIAL NOT NULL,
description text,
created_at timestamp without time zone,
updated_at timestamp without time zone,
created_time timestamp without time zone,
updated_time timestamp without time zone,
PRIMARY KEY(id),
CONSTRAINT gen_demo01_creator_id_fkey FOREIGN key(creator_id) REFERENCES system_users(id)
);
@@ -1439,8 +1439,8 @@ function loadExamplePostgres(): void {
COMMENT ON COLUMN gen_demo01.creator_id IS '创建人ID';
COMMENT ON COLUMN gen_demo01.id IS '主键ID';
COMMENT ON COLUMN gen_demo01.description IS '备注/描述';
COMMENT ON COLUMN gen_demo01.created_at IS '创建时间';
COMMENT ON COLUMN gen_demo01.updated_at IS '更新时间';`;
COMMENT ON COLUMN gen_demo01.created_time IS '创建时间';
COMMENT ON COLUMN gen_demo01.updated_time IS '更新时间';`;
createContent.value = exampleSql;
}
frontend/src/views/module_system/dept/index.vue
+10 -10
View File
@@ -217,18 +217,18 @@
min-width="100"
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'created_at')?.show"
key="created_at"
v-if="tableColumns.find((col) => col.prop === 'created_time')?.show"
key="created_time"
label="创建时间"
prop="created_at"
prop="created_time"
min-width="120"
sortable
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'updated_at')?.show"
key="updated_at"
v-if="tableColumns.find((col) => col.prop === 'updated_time')?.show"
key="updated_time"
label="更新时间"
prop="updated_at"
prop="updated_time"
min-width="120"
sortable
/>
@@ -313,10 +313,10 @@
{{ detailFormData.order }}
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">
{{ detailFormData.created_at }}
{{ detailFormData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="2">
{{ detailFormData.updated_at }}
{{ detailFormData.updated_time }}
</el-descriptions-item>
<el-descriptions-item label="描述" :span="4">
{{ detailFormData.description }}
@@ -424,8 +424,8 @@ const tableColumns = ref([
{ prop: "order", label: "排序", show: true },
{ prop: "status", label: "状态", show: true },
{ prop: "description", label: "描述", show: true },
{ prop: "created_at", label: "创建时间", show: true },
{ prop: "updated_at", label: "更新时间", show: true },
{ prop: "created_time", label: "创建时间", show: true },
{ prop: "updated_time", label: "更新时间", show: true },
{ prop: "operation", label: "操作", show: true },
]);
frontend/src/views/module_system/dict/components/DataDrawer.vue
+8 -8
View File
@@ -190,11 +190,11 @@
</template>
</el-table-column>
<el-table-column label="描述" prop="description" min-width="100" show-overflow-tooltip />
<el-table-column label="创建时间" prop="created_at" min-width="200" sortable />
<el-table-column label="更新时间" prop="updated_at" min-width="200" sortable />
<el-table-column label="创建时间" prop="created_time" min-width="200" sortable />
<el-table-column label="更新时间" prop="updated_time" min-width="200" sortable />
<el-table-column label="创建人" prop="creator" min-width="100">
<template #default="scope">
{{ scope.row.creator?.name }}
{{ scope.row.created_by?.name }}
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" min-width="200">
@@ -283,13 +283,13 @@
{{ detailFormData.description }}
</el-descriptions-item>
<el-descriptions-item label="创建人" :span="2">
{{ detailFormData.creator?.name }}
{{ detailFormData.created_by?.name }}
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">
{{ detailFormData.created_at }}
{{ detailFormData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="2">
{{ detailFormData.updated_at }}
{{ detailFormData.updated_time }}
</el-descriptions-item>
</el-descriptions>
</template>
@@ -708,8 +708,8 @@ const exportColumns = [
{ prop: "is_default", label: "是否默认" },
{ prop: "status", label: "状态" },
{ prop: "description", label: "描述" },
{ prop: "created_at", label: "创建时间" },
{ prop: "updated_at", label: "更新时间" },
{ prop: "created_time", label: "创建时间" },
{ prop: "updated_time", label: "更新时间" },
];
// 导出配置（用于导出弹窗）
frontend/src/views/module_system/dict/index.vue
+14 -14
View File
@@ -243,18 +243,18 @@
show-overflow-tooltip
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'created_at')?.show"
key="created_at"
v-if="tableColumns.find((col) => col.prop === 'created_time')?.show"
key="created_time"
label="创建时间"
prop="created_at"
prop="created_time"
min-width="200"
sortable
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'updated_at')?.show"
key="updated_at"
v-if="tableColumns.find((col) => col.prop === 'updated_time')?.show"
key="updated_time"
label="更新时间"
prop="updated_at"
prop="updated_time"
min-width="200"
sortable
/>
@@ -265,7 +265,7 @@
min-width="120"
>
<template #default="scope">
{{ scope.row.creator?.name }}
{{ scope.row.created_by?.name }}
</template>
</el-table-column>
<el-table-column
@@ -354,13 +354,13 @@
{{ detailFormData.description }}
</el-descriptions-item>
<el-descriptions-item label="创建人" :span="2">
{{ detailFormData.creator?.name }}
{{ detailFormData.created_by?.name }}
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">
{{ detailFormData.created_at }}
{{ detailFormData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="2">
{{ detailFormData.updated_at }}
{{ detailFormData.updated_time }}
</el-descriptions-item>
</el-descriptions>
</template>
@@ -465,8 +465,8 @@ const tableColumns = ref([
{ prop: "status", label: "状态", show: true },
{ prop: "description", label: "描述", show: true },
{ prop: "creator", label: "创建人", show: true },
{ prop: "created_at", label: "创建时间", show: true },
{ prop: "updated_at", label: "更新时间", show: true },
{ prop: "created_time", label: "创建时间", show: true },
{ prop: "updated_time", label: "更新时间", show: true },
{ prop: "operation", label: "操作", show: true },
]);
@@ -724,8 +724,8 @@ const exportColumns = [
{ prop: "dict_type", label: "字典类型" },
{ prop: "status", label: "状态" },
{ prop: "description", label: "描述" },
{ prop: "created_at", label: "创建时间" },
{ prop: "updated_at", label: "更新时间" },
{ prop: "created_time", label: "创建时间" },
{ prop: "updated_time", label: "更新时间" },
];
// 导出配置（用于导出弹窗）
frontend/src/views/module_system/log/index.vue
+7 -7
View File
@@ -195,10 +195,10 @@
/>
<el-table-column label="系统" prop="request_os" min-width="100" />
<el-table-column label="描述" prop="description" min-width="120" show-overflow-tooltip />
<el-table-column label="创建时间" prop="created_at" min-width="200" sortable />
<el-table-column label="创建时间" prop="created_time" min-width="200" sortable />
<el-table-column label="创建人" prop="creator" min-width="120">
<template #default="scope">
{{ scope.row.creator?.name }}
{{ scope.row.created_by?.name }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="150">
@@ -287,13 +287,13 @@
{{ formData.login_location }}
</el-descriptions-item>
<el-descriptions-item label="创建人" :span="4">
{{ formData.creator?.name }}
{{ formData.created_by?.name }}
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="4">
{{ formData.created_at }}
{{ formData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="4">
{{ formData.updated_at }}
{{ formData.updated_time }}
</el-descriptions-item>
<el-descriptions-item label="描述" :span="8">
{{ formData.description }}
@@ -540,8 +540,8 @@ const exportColumns = [
{ prop: "request_browser", label: "浏览器" },
{ prop: "request_os", label: "系统" },
{ prop: "description", label: "描述" },
{ prop: "created_at", label: "创建时间" },
{ prop: "updated_at", label: "更新时间" },
{ prop: "created_time", label: "创建时间" },
{ prop: "updated_time", label: "更新时间" },
];
// 导入/导出配置（用于导出弹窗）
frontend/src/views/module_system/menu/index.vue
+4 -4
View File
@@ -221,8 +221,8 @@
<el-table-column label="组件路径" prop="component_path" min-width="200" />
<el-table-column label="路由参数" prop="params" min-width="100" />
<el-table-column label="描述" prop="description" min-width="200" />
<el-table-column label="创建时间" prop="created_at" min-width="200" sortable />
<el-table-column label="更新时间" prop="updated_at" min-width="200" sortable />
<el-table-column label="创建时间" prop="created_time" min-width="200" sortable />
<el-table-column label="更新时间" prop="updated_time" min-width="200" sortable />
<el-table-column fixed="right" label="操作" align="center" min-width="260">
<template #default="scope">
@@ -365,10 +365,10 @@
{{ detailFormData.order }}
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">
{{ detailFormData.created_at }}
{{ detailFormData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="2">
{{ detailFormData.updated_at }}
{{ detailFormData.updated_time }}
</el-descriptions-item>
<el-descriptions-item label="描述" :span="4">
{{ detailFormData.description }}
frontend/src/views/module_system/notice/index.vue
+12 -12
View File
@@ -264,16 +264,16 @@
show-overflow-tooltip
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'created_at')?.show"
v-if="tableColumns.find((col) => col.prop === 'created_time')?.show"
label="创建时间"
prop="created_at"
prop="created_time"
min-width="180"
sortable
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'updated_at')?.show"
v-if="tableColumns.find((col) => col.prop === 'updated_time')?.show"
label="更新时间"
prop="updated_at"
prop="updated_time"
min-width="180"
sortable
/>
@@ -284,7 +284,7 @@
min-width="100"
>
<template #default="scope">
{{ scope.row.creator?.name }}
{{ scope.row.created_by?.name }}
</template>
</el-table-column>
@@ -375,13 +375,13 @@
<WangEditor v-model="detailFormData.notice_content" :readonly="true" />
</el-descriptions-item>
<el-descriptions-item label="创建人" :span="2">
{{ detailFormData.creator?.name }}
{{ detailFormData.created_by?.name }}
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">
{{ detailFormData.created_at }}
{{ detailFormData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="2">
{{ detailFormData.updated_at }}
{{ detailFormData.updated_time }}
</el-descriptions-item>
</el-descriptions>
</template>
@@ -490,8 +490,8 @@ const tableColumns = ref([
{ prop: "notice_content", label: "内容", show: true },
{ prop: "status", label: "状态", show: true },
{ prop: "description", label: "描述", show: true },
{ prop: "created_at", label: "创建时间", show: true },
{ prop: "updated_at", label: "更新时间", show: true },
{ prop: "created_time", label: "创建时间", show: true },
{ prop: "updated_time", label: "更新时间", show: true },
{ prop: "creator", label: "创建人", show: true },
{ prop: "operation", label: "操作", show: true },
]);
@@ -741,8 +741,8 @@ const exportColumns = [
{ prop: "notice_type", label: "类型" },
{ prop: "notice_content", label: "内容" },
{ prop: "description", label: "描述" },
{ prop: "created_at", label: "创建时间" },
{ prop: "updated_at", label: "更新时间" },
{ prop: "created_time", label: "创建时间" },
{ prop: "updated_time", label: "更新时间" },
];
// 导入/导出配置（用于导出弹窗）
frontend/src/views/module_system/param/index.vue
+14 -14
View File
@@ -230,18 +230,18 @@
min-width="120"
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'created_at')?.show"
key="created_at"
v-if="tableColumns.find((col) => col.prop === 'created_time')?.show"
key="created_time"
label="创建时间"
prop="created_at"
prop="created_time"
min-width="200"
sortable
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'updated_at')?.show"
key="updated_at"
v-if="tableColumns.find((col) => col.prop === 'updated_time')?.show"
key="updated_time"
label="更新时间"
prop="updated_at"
prop="updated_time"
min-width="200"
sortable
/>
@@ -252,7 +252,7 @@
min-width="120"
>
<template #default="scope">
{{ scope.row.creator?.name }}
{{ scope.row.created_by?.name }}
</template>
</el-table-column>
<el-table-column
@@ -334,13 +334,13 @@
{{ detailFormData.description }}
</el-descriptions-item>
<el-descriptions-item label="创建人" :span="2">
{{ detailFormData.creator?.name }}
{{ detailFormData.created_by?.name }}
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">
{{ detailFormData.created_at }}
{{ detailFormData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="2">
{{ detailFormData.updated_at }}
{{ detailFormData.updated_time }}
</el-descriptions-item>
</el-descriptions>
</template>
@@ -451,8 +451,8 @@ const tableColumns = ref([
{ prop: "config_value", label: "配置值", show: true },
{ prop: "config_type", label: "系统内置", show: true },
{ prop: "description", label: "描述", show: true },
{ prop: "created_at", label: "创建时间", show: true },
{ prop: "updated_at", label: "更新时间", show: true },
{ prop: "created_time", label: "创建时间", show: true },
{ prop: "updated_time", label: "更新时间", show: true },
{ prop: "creator", label: "创建人", show: true },
{ prop: "operation", label: "操作", show: true },
]);
@@ -675,8 +675,8 @@ const exportColumns = [
{ prop: "config_value", label: "配置值" },
{ prop: "config_type", label: "系统内置" },
{ prop: "description", label: "描述" },
{ prop: "created_at", label: "创建时间" },
{ prop: "updated_at", label: "更新时间" },
{ prop: "created_time", label: "创建时间" },
{ prop: "updated_time", label: "更新时间" },
];
// 导入/导出配置（用于导出弹窗）
frontend/src/views/module_system/position/index.vue
+15 -15
View File
@@ -235,18 +235,18 @@
min-width="120"
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'created_at')?.show"
key="created_at"
v-if="tableColumns.find((col) => col.prop === 'created_time')?.show"
key="created_time"
label="创建时间"
prop="created_at"
prop="created_time"
min-width="200"
sortable
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'updated_at')?.show"
key="updated_at"
v-if="tableColumns.find((col) => col.prop === 'updated_time')?.show"
key="updated_time"
label="更新时间"
prop="updated_at"
prop="updated_time"
min-width="200"
sortable
/>
@@ -257,7 +257,7 @@
min-width="100"
>
<template #default="scope">
{{ scope.row.creator?.name }}
{{ scope.row.created_by?.name }}
</template>
</el-table-column>
@@ -334,13 +334,13 @@
<el-tag v-else type="danger">停用</el-tag>
</el-descriptions-item>
<el-descriptions-item label="创建人" :span="2">
{{ detailFormData.creator?.name }}
{{ detailFormData.created_by?.name }}
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">
{{ detailFormData.created_at }}
{{ detailFormData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="2">
{{ detailFormData.updated_at }}
{{ detailFormData.updated_time }}
</el-descriptions-item>
<el-descriptions-item label="描述" :span="4">
{{ detailFormData.description }}
@@ -443,8 +443,8 @@ const tableColumns = ref([
{ prop: "order", label: "岗位排序", show: true },
{ prop: "status", label: "状态", show: true },
{ prop: "description", label: "描述", show: true },
{ prop: "created_at", label: "创建时间", show: true },
{ prop: "updated_at", label: "更新时间", show: true },
{ prop: "created_time", label: "创建时间", show: true },
{ prop: "updated_time", label: "更新时间", show: true },
{ prop: "creator", label: "创建人", show: true },
{ prop: "operation", label: "操作", show: true },
]);
@@ -680,8 +680,8 @@ const exportColumns = [
{ prop: "order", label: "岗位排序" },
{ prop: "status", label: "状态" },
{ prop: "description", label: "描述" },
{ prop: "created_at", label: "创建时间" },
{ prop: "updated_at", label: "更新时间" },
{ prop: "created_time", label: "创建时间" },
{ prop: "updated_time", label: "更新时间" },
];
// 导入/导出配置（用于导出）
@@ -717,7 +717,7 @@ onMounted(() => {
// 导出字段 const exportColumns = [ { prop: 'name', label: '岗位名称' }, { prop: 'order', label:
'岗位排序' }, { prop: 'status', label: '状态' }, { prop: 'description', label: '描述' }, { prop:
'created_at', label: '创建时间' }, { prop: 'updated_at', label: '更新时间' }, ]; //
'created_time', label: '创建时间' }, { prop: 'updated_time', label: '更新时间' }, ]; //
导入/导出配置（仅用于导出） const curdContentConfig = { permPrefix: 'module_system:position', cols:
exportColumns as any, exportsAction: async (params: any) => { const query: any = { ...params }; if
(typeof query.status === 'string') { query.status = query.status === 'true'; } query.page_no = 1;
frontend/src/views/module_system/role/index.vue
+14 -14
View File
@@ -258,18 +258,18 @@
min-width="100"
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'created_at')?.show"
key="created_at"
v-if="tableColumns.find((col) => col.prop === 'created_time')?.show"
key="created_time"
label="创建时间"
prop="created_at"
prop="created_time"
min-width="200"
sortable
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'updated_at')?.show"
key="updated_at"
v-if="tableColumns.find((col) => col.prop === 'updated_time')?.show"
key="updated_time"
label="更新时间"
prop="updated_at"
prop="updated_time"
min-width="200"
sortable
/>
@@ -280,7 +280,7 @@
min-width="120"
>
<template #default="scope">
{{ scope.row.creator?.name }}
{{ scope.row.created_by?.name }}
</template>
</el-table-column>
@@ -395,13 +395,13 @@
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="创建人" :span="2">
{{ detailFormData.creator?.name }}
{{ detailFormData.created_by?.name }}
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">
{{ detailFormData.created_at }}
{{ detailFormData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="2">
{{ detailFormData.updated_at }}
{{ detailFormData.updated_time }}
</el-descriptions-item>
<el-descriptions-item label="描述" :span="4">
{{ detailFormData.description }}
@@ -521,8 +521,8 @@ const tableColumns = ref([
{ prop: "code", label: "角色编码", show: true },
{ prop: "status", label: "状态", show: true },
{ prop: "description", label: "描述", show: true },
{ prop: "created_at", label: "创建时间", show: true },
{ prop: "updated_at", label: "更新时间", show: true },
{ prop: "created_time", label: "创建时间", show: true },
{ prop: "updated_time", label: "更新时间", show: true },
{ prop: "creator", label: "创建人", show: true },
{ prop: "operation", label: "操作", show: true },
]);
@@ -777,8 +777,8 @@ const exportColumns = [
{ prop: "order", label: "排序" },
{ prop: "status", label: "状态" },
{ prop: "description", label: "描述" },
{ prop: "created_at", label: "创建时间" },
{ prop: "updated_at", label: "更新时间" },
{ prop: "created_time", label: "创建时间" },
{ prop: "updated_time", label: "更新时间" },
];
// 导入/导出配置
frontend/src/views/module_system/tenant/index.vue
+12 -12
View File
@@ -251,20 +251,20 @@
min-width="140"
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'created_at')?.show"
v-if="tableColumns.find((col) => col.prop === 'created_time')?.show"
label="创建时间"
prop="created_at"
prop="created_time"
min-width="180"
/>
<el-table-column
v-if="tableColumns.find((col) => col.prop === 'updated_at')?.show"
v-if="tableColumns.find((col) => col.prop === 'updated_time')?.show"
label="更新时间"
prop="updated_at"
prop="updated_time"
min-width="180"
/>
<!-- <el-table-column v-if="tableColumns.find((col) => col.prop === 'creator')?.show" label="创建人" prop="creator" min-width="120">
<template #default="scope">
<el-tag>{{ scope.row.creator?.name }}</el-tag>
<el-tag>{{ scope.row.created_by?.name }}</el-tag>
</template>
</el-table-column> -->
<el-table-column
@@ -344,13 +344,13 @@
{{ detailFormData.description }}
</el-descriptions-item>
<!-- <el-descriptions-item label="创建人" :span="2">
{{ detailFormData.creator?.name }}
{{ detailFormData.created_by?.name }}
</el-descriptions-item> -->
<el-descriptions-item label="创建时间" :span="2">
{{ detailFormData.created_at }}
{{ detailFormData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="2">
{{ detailFormData.updated_at }}
{{ detailFormData.updated_time }}
</el-descriptions-item>
</el-descriptions>
</template>
@@ -457,8 +457,8 @@ const tableColumns = ref([
{ prop: "code", label: "编码", show: true },
{ prop: "status", label: "状态", show: true },
{ prop: "description", label: "描述", show: true },
{ prop: "created_at", label: "创建时间", show: true },
{ prop: "updated_at", label: "更新时间", show: true },
{ prop: "created_time", label: "创建时间", show: true },
{ prop: "updated_time", label: "更新时间", show: true },
{ prop: "creator", label: "创建人", show: true },
{ prop: "operation", label: "操作", show: true },
]);
@@ -469,8 +469,8 @@ const exportColumns = [
{ prop: "code", label: "编码" },
{ prop: "status", label: "状态" },
{ prop: "description", label: "描述" },
{ prop: "created_at", label: "创建时间" },
{ prop: "updated_at", label: "更新时间" },
{ prop: "created_time", label: "创建时间" },
{ prop: "updated_time", label: "更新时间" },
];
// 导入/导出配置
frontend/src/views/module_system/user/components/UserTableSelect.vue
+2 -2
View File
@@ -99,10 +99,10 @@ interface IUser {
gender?: string;
avatar?: string;
email?: string | null;
status?: boolean;
status?: string;
dept_name?: string;
role_names?: string[];
created_at?: string;
created_time?: string;
}
const selectedUser = ref<IUser>();
function handleConfirm(data: IUser[]) {
frontend/src/views/module_system/user/index.vue
+8 -8
View File
@@ -244,11 +244,11 @@
<el-table-column label="手机号" prop="mobile" min-width="160" />
<el-table-column label="邮箱" prop="email" min-width="160" />
<el-table-column label="创建时间" prop="created_at" min-width="200" />
<el-table-column label="更新时间" prop="updated_at" min-width="200" />
<el-table-column label="创建时间" prop="created_time" min-width="200" />
<el-table-column label="更新时间" prop="updated_time" min-width="200" />
<el-table-column label="创建人" prop="creator" min-width="120">
<template #default="scope">
{{ scope.row.creator?.name }}
{{ scope.row.created_by?.name }}
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" min-width="280">
@@ -393,13 +393,13 @@
{{ detailFormData.last_login }}
</el-descriptions-item>
<el-descriptions-item label="创建人" :span="2">
{{ detailFormData.creator?.name }}
{{ detailFormData.created_by?.name }}
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">
{{ detailFormData.created_at }}
{{ detailFormData.created_time }}
</el-descriptions-item>
<el-descriptions-item label="更新时间" :span="2">
{{ detailFormData.updated_at }}
{{ detailFormData.updated_time }}
</el-descriptions-item>
<el-descriptions-item label="描述" :span="4">
{{ detailFormData.description }}
@@ -682,8 +682,8 @@ const exportColumns = [
{ prop: "mobile", label: "手机号" },
{ prop: "is_superuser", label: "是否超管" },
{ prop: "description", label: "描述" },
{ prop: "created_at", label: "创建时间" },
{ prop: "updated_at", label: "更新时间" },
{ prop: "created_time", label: "创建时间" },
{ prop: "updated_time", label: "更新时间" },
];
// 导入/导出配置