From 57f7bd5ce600d6a8cac17b0492feb55a0d5b8a15 Mon Sep 17 00:00:00 2001
From: Bunny <1319900154@qq.com>
Date: Wed, 30 Oct 2024 23:52:58 +0800
Subject: [PATCH] =?UTF-8?q?optimize:=20=E2=99=BB=EF=B8=8F=20=E5=B0=86?=
=?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=92=8C=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E5=85=A8=E9=83=A8=E6=94=B9=E6=88=90=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/configuration/emailTemplate/index.vue | 4 ++--
.../configuration/emailTemplate/utils/columns.ts | 4 ++--
src/views/configuration/emailUsers/index.vue | 4 ++--
src/views/configuration/emailUsers/utils/columns.ts | 4 ++--
src/views/configuration/menuIcon/index.vue | 4 ++--
src/views/configuration/menuIcon/utils/columns.ts | 4 ++--
src/views/message/messageType/index.vue | 5 -----
src/views/monitor/files/index.vue | 4 ++--
src/views/monitor/files/utils/columns.ts | 4 ++--
src/views/monitor/schedulerExecuteLog/index.vue | 4 ++--
.../monitor/schedulerExecuteLog/utils/columns.ts | 4 ++--
src/views/monitor/userLoginLog/index.vue | 4 ++--
src/views/monitor/userLoginLog/utils/columns.ts | 4 ++--
src/views/scheduler/schedulersGroup/index.vue | 4 ++--
src/views/scheduler/schedulersGroup/utils/columns.ts | 4 ++--
src/views/system/adminUser/index.vue | 4 ++--
src/views/system/adminUser/utils/columns.tsx | 4 ++--
src/views/system/dept/index.vue | 4 ++--
src/views/system/dept/utils/columns.ts | 4 ++--
src/views/system/menu/index.vue | 4 ++--
src/views/system/menu/utils/columns.tsx | 4 ++--
src/views/system/power/index.vue | 12 +++---------
src/views/system/power/utils/columns.ts | 4 ++--
src/views/system/role/index.vue | 5 ++---
src/views/system/role/utils/columns.ts | 4 ++--
25 files changed, 49 insertions(+), 61 deletions(-)
diff --git a/src/views/configuration/emailTemplate/index.vue b/src/views/configuration/emailTemplate/index.vue
index c302e6f..dea470b 100644
--- a/src/views/configuration/emailTemplate/index.vue
+++ b/src/views/configuration/emailTemplate/index.vue
@@ -113,13 +113,13 @@ onMounted(() => {
- {{ $t('table.createUser') }}
+ {{ row.createUsername }}
- {{ $t('table.updateUser') }}
+ {{ row.updateUsername }}
diff --git a/src/views/configuration/emailTemplate/utils/columns.ts b/src/views/configuration/emailTemplate/utils/columns.ts
index 39aff3e..813941a 100644
--- a/src/views/configuration/emailTemplate/utils/columns.ts
+++ b/src/views/configuration/emailTemplate/utils/columns.ts
@@ -17,8 +17,8 @@ export const columns: TableColumnList = [
{ label: $t('emailTemplate_type'), prop: 'type' },
{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true, width: 160 },
{ label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 },
- { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 90 },
- { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90 },
+ { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
+ { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 },
{ label: $t('table.operation'), fixed: 'right', width: 210, slot: 'operation' },
];
diff --git a/src/views/configuration/emailUsers/index.vue b/src/views/configuration/emailUsers/index.vue
index 091dbb5..32bc943 100644
--- a/src/views/configuration/emailUsers/index.vue
+++ b/src/views/configuration/emailUsers/index.vue
@@ -129,13 +129,13 @@ onMounted(() => {
- {{ $t('table.createUser') }}
+ {{ row.createUsername }}
- {{ $t('table.updateUser') }}
+ {{ row.updateUsername }}
diff --git a/src/views/configuration/emailUsers/utils/columns.ts b/src/views/configuration/emailUsers/utils/columns.ts
index 4b231cd..08446a4 100644
--- a/src/views/configuration/emailUsers/utils/columns.ts
+++ b/src/views/configuration/emailUsers/utils/columns.ts
@@ -19,8 +19,8 @@ export const columns: TableColumnList = [
{ label: $t('emailUsers_isDefault'), prop: 'isDefault', slot: 'isDefault', width: 100 },
{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true, width: 160 },
{ label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 },
- { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 90 },
- { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90 },
+ { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
+ { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 },
{ label: $t('table.operation'), fixed: 'right', width: 210, slot: 'operation' },
];
diff --git a/src/views/configuration/menuIcon/index.vue b/src/views/configuration/menuIcon/index.vue
index 95534c9..5cb39d3 100644
--- a/src/views/configuration/menuIcon/index.vue
+++ b/src/views/configuration/menuIcon/index.vue
@@ -112,13 +112,13 @@ onMounted(() => {
- {{ $t('table.createUser') }}
+ {{ row.createUsername }}
- {{ $t('table.updateUser') }}
+ {{ row.updateUsername }}
diff --git a/src/views/configuration/menuIcon/utils/columns.ts b/src/views/configuration/menuIcon/utils/columns.ts
index ec95adb..45cfc30 100644
--- a/src/views/configuration/menuIcon/utils/columns.ts
+++ b/src/views/configuration/menuIcon/utils/columns.ts
@@ -11,8 +11,8 @@ export const columns: TableColumnList = [
{ label: $t('menuIcon_iconName'), prop: 'iconName', slot: 'iconName' },
{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true },
{ label: $t('table.createTime'), prop: 'createTime', sortable: true },
- { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 90 },
- { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90 },
+ { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
+ { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 },
{ label: $t('table.operation'), fixed: 'right', width: 210, slot: 'operation' },
];
diff --git a/src/views/message/messageType/index.vue b/src/views/message/messageType/index.vue
index 6b68abd..cb2a1f3 100644
--- a/src/views/message/messageType/index.vue
+++ b/src/views/message/messageType/index.vue
@@ -68,11 +68,6 @@ onMounted(() => {
-
-
-
-
-
diff --git a/src/views/monitor/files/index.vue b/src/views/monitor/files/index.vue
index 5828eba..ffb3af6 100644
--- a/src/views/monitor/files/index.vue
+++ b/src/views/monitor/files/index.vue
@@ -107,13 +107,13 @@ onMounted(() => {
>
- {{ $t('table.createUser') }}
+ {{ row.createUsername }}
- {{ $t('table.updateUser') }}
+ {{ row.updateUsername }}
diff --git a/src/views/monitor/files/utils/columns.ts b/src/views/monitor/files/utils/columns.ts
index 351f0c8..b0f66ae 100644
--- a/src/views/monitor/files/utils/columns.ts
+++ b/src/views/monitor/files/utils/columns.ts
@@ -15,8 +15,8 @@ export const columns: TableColumnList = [
{ label: $t('files_downloadCount'), prop: 'downloadCount', width: 90 },
{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true, width: 160 },
{ label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 },
- { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 90 },
- { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90 },
+ { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
+ { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 },
{ label: $t('table.operation'), fixed: 'right', width: 210, slot: 'operation' },
];
diff --git a/src/views/monitor/schedulerExecuteLog/index.vue b/src/views/monitor/schedulerExecuteLog/index.vue
index ccb3ba3..381ee20 100644
--- a/src/views/monitor/schedulerExecuteLog/index.vue
+++ b/src/views/monitor/schedulerExecuteLog/index.vue
@@ -128,13 +128,13 @@ onMounted(() => {
- {{ $t('table.createUser') }}
+ {{ row.createUsername }}
- {{ $t('table.updateUser') }}
+ {{ row.updateUsername }}
diff --git a/src/views/monitor/schedulerExecuteLog/utils/columns.ts b/src/views/monitor/schedulerExecuteLog/utils/columns.ts
index f656eb2..7fee62f 100644
--- a/src/views/monitor/schedulerExecuteLog/utils/columns.ts
+++ b/src/views/monitor/schedulerExecuteLog/utils/columns.ts
@@ -21,8 +21,8 @@ export const columns: TableColumnList = [
{ label: $t('quartzExecuteLog_duration'), prop: 'duration' },
{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true, width: 160 },
{ label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 },
- { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 90 },
- { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90 },
+ { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
+ { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 },
{ label: $t('table.operation'), fixed: 'right', width: 160, slot: 'operation' },
];
// 添加规则
diff --git a/src/views/monitor/userLoginLog/index.vue b/src/views/monitor/userLoginLog/index.vue
index a738edb..bc735a6 100644
--- a/src/views/monitor/userLoginLog/index.vue
+++ b/src/views/monitor/userLoginLog/index.vue
@@ -122,13 +122,13 @@ onMounted(() => {
>
- {{ $t('table.createUser') }}
+ {{ row.createUsername }}
- {{ $t('table.updateUser') }}
+ {{ row.updateUsername }}
diff --git a/src/views/monitor/userLoginLog/utils/columns.ts b/src/views/monitor/userLoginLog/utils/columns.ts
index 24b9b60..0473eb9 100644
--- a/src/views/monitor/userLoginLog/utils/columns.ts
+++ b/src/views/monitor/userLoginLog/utils/columns.ts
@@ -21,8 +21,8 @@ export const columns: TableColumnList = [
{ label: $t('userLoginLog_token'), prop: 'token', width: 200 },
{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true, width: 160 },
{ label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 },
- { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 90 },
- { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90 },
+ { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
+ { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 },
{ label: $t('table.operation'), fixed: 'right', width: 160, slot: 'operation' },
];
diff --git a/src/views/scheduler/schedulersGroup/index.vue b/src/views/scheduler/schedulersGroup/index.vue
index dc310e4..93ef307 100644
--- a/src/views/scheduler/schedulersGroup/index.vue
+++ b/src/views/scheduler/schedulersGroup/index.vue
@@ -106,13 +106,13 @@ onMounted(() => {
>
- {{ $t('table.createUser') }}
+ {{ row.createUsername }}
- {{ $t('table.updateUser') }}
+ {{ row.updateUsername }}
diff --git a/src/views/scheduler/schedulersGroup/utils/columns.ts b/src/views/scheduler/schedulersGroup/utils/columns.ts
index fcb4b24..db454d7 100644
--- a/src/views/scheduler/schedulersGroup/utils/columns.ts
+++ b/src/views/scheduler/schedulersGroup/utils/columns.ts
@@ -11,8 +11,8 @@ export const columns: TableColumnList = [
{ label: $t('schedulersGroup_description'), prop: 'description' },
{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true, width: 160 },
{ label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 },
- { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 90 },
- { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90 },
+ { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
+ { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 },
{ label: $t('table.operation'), fixed: 'right', width: 210, slot: 'operation' },
];
diff --git a/src/views/system/adminUser/index.vue b/src/views/system/adminUser/index.vue
index 7b51913..2686540 100644
--- a/src/views/system/adminUser/index.vue
+++ b/src/views/system/adminUser/index.vue
@@ -201,13 +201,13 @@ onMounted(() => {
- {{ $t('table.createUser') }}
+ {{ row.createUsername }}
- {{ $t('table.updateUser') }}
+ {{ row.updateUsername }}
diff --git a/src/views/system/adminUser/utils/columns.tsx b/src/views/system/adminUser/utils/columns.tsx
index 86f5cb1..70770cf 100644
--- a/src/views/system/adminUser/utils/columns.tsx
+++ b/src/views/system/adminUser/utils/columns.tsx
@@ -32,8 +32,8 @@ export const columns: TableColumnList = [
{ label: $t('lastLoginIpAddress'), prop: 'ipRegion', width: 130 },
{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true, width: 160 },
{ label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 },
- { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90, fixed: 'right' },
- { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 90, fixed: 'right' },
+ { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
+ { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 },
{ label: $t('table.operation'), fixed: 'right', width: 210, slot: 'operation' },
];
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 274d2ae..cdae8ea 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -109,13 +109,13 @@ onMounted(() => {
>
- {{ $t('table.createUser') }}
+ {{ row.createUsername }}
- {{ $t('table.updateUser') }}
+ {{ row.updateUsername }}
diff --git a/src/views/system/dept/utils/columns.ts b/src/views/system/dept/utils/columns.ts
index 0a4157c..9c75096 100644
--- a/src/views/system/dept/utils/columns.ts
+++ b/src/views/system/dept/utils/columns.ts
@@ -13,8 +13,8 @@ export const columns: TableColumnList = [
{ label: $t('dept_summary'), prop: 'summary', width: 360 },
{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true, width: 160 },
{ label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 },
- { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 90 },
- { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90 },
+ { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
+ { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 },
{ label: $t('table.operation'), fixed: 'right', width: 210, slot: 'operation' },
];
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 6526c82..2fbfe92 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -120,13 +120,13 @@ onMounted(() => {
- {{ $t('table.createUser') }}
+ {{ row.createUsername }}
- {{ $t('table.updateUser') }}
+ {{ row.updateUsername }}
diff --git a/src/views/system/menu/utils/columns.tsx b/src/views/system/menu/utils/columns.tsx
index ab34740..5089fe8 100644
--- a/src/views/system/menu/utils/columns.tsx
+++ b/src/views/system/menu/utils/columns.tsx
@@ -70,8 +70,8 @@ export const columns: TableColumnList = [
{ label: '隐藏', prop: 'visible', slot: 'visible', width: 100 },
{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true },
{ label: $t('table.createTime'), prop: 'createTime', sortable: true },
- { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 90 },
- { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90 },
+ { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
+ { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 },
{ label: $t('table.operation'), fixed: 'right', width: 230, slot: 'operation' },
];
diff --git a/src/views/system/power/index.vue b/src/views/system/power/index.vue
index ff25341..42c9880 100644
--- a/src/views/system/power/index.vue
+++ b/src/views/system/power/index.vue
@@ -54,12 +54,7 @@ const resetForm = async (formEl: FormInstance) => {
formEl.resetFields();
await onSearch();
};
-
-/**
- * * 按钮类
- */
-const buttonClass = computed(() => ['!h-[20px]', 'reset-margin', '!text-gray-500', 'dark:!text-white', 'dark:hover:!text-primary']);
-
+computed(() => ['!h-[20px]', 'reset-margin', '!text-gray-500', 'dark:!text-white', 'dark:hover:!text-primary']);
onMounted(() => {
onSearch();
});
@@ -123,16 +118,15 @@ onMounted(() => {
>
- {{ $t('table.createUser') }}
+ {{ row.createUsername }}
- {{ $t('table.updateUser') }}
+ {{ row.updateUsername }}
-
{{ $t('modify') }}
diff --git a/src/views/system/power/utils/columns.ts b/src/views/system/power/utils/columns.ts
index 7e45e6a..e208cec 100644
--- a/src/views/system/power/utils/columns.ts
+++ b/src/views/system/power/utils/columns.ts
@@ -14,8 +14,8 @@ export const columns: TableColumnList = [
{ label: $t('power_requestUrl'), prop: 'requestUrl' },
{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true },
{ label: $t('table.createTime'), prop: 'createTime', sortable: true },
- { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 90 },
- { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90 },
+ { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
+ { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 },
{ label: $t('table.operation'), fixed: 'right', width: 210, slot: 'operation' },
];
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 0bcd350..3e1930b 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -114,16 +114,15 @@ onMounted(() => {
>
- {{ $t('table.createUser') }}
+ {{ row.createUsername }}
- {{ $t('table.updateUser') }}
+ {{ row.updateUsername }}
-
{{ $t('modify') }}
diff --git a/src/views/system/role/utils/columns.ts b/src/views/system/role/utils/columns.ts
index 60cb3fc..ac96350 100644
--- a/src/views/system/role/utils/columns.ts
+++ b/src/views/system/role/utils/columns.ts
@@ -11,8 +11,8 @@ export const columns: TableColumnList = [
{ label: $t('role_description'), prop: 'description' },
{ label: $t('table.updateTime'), prop: 'updateTime', sortable: true },
{ label: $t('table.createTime'), prop: 'createTime', sortable: true },
- { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 90 },
- { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90 },
+ { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
+ { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 },
{ label: $t('table.operation'), fixed: 'right', width: 240, slot: 'operation' },
];