From 74fba9f0cddb87c70bf7067943aac28de88dfa69 Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Fri, 25 Apr 2025 16:58:41 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E3=80=BD=EF=B8=8F=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/v1/system/dept.ts                                | 2 +-
 src/views/configuration/email-template/utils/columns.tsx | 4 ++--
 src/views/configuration/email-user/utils/columns.ts      | 4 ++--
 src/views/configuration/menu-icon/utils/columns.ts       | 4 ++--
 src/views/i18n/i18n-type-setting/utils/columns.tsx       | 4 ++--
 src/views/message-manger/message-send/utils/columns.tsx  | 4 ++--
 src/views/message-manger/message-type/utils/columns.tsx  | 4 ++--
 src/views/scheduler/schedulers-group/utils/columns.ts    | 4 ++--
 src/views/scheduler/schedulers/utils/columns.ts          | 4 ++--
 src/views/system/admin-user/utils/columns.tsx            | 4 ++--
 src/views/system/dept/utils/columns.ts                   | 2 +-
 src/views/system/files/utils/columns.ts                  | 4 ++--
 src/views/system/menu/utils/modules/columns.tsx          | 8 ++++----
 src/views/system/menu/utils/modules/hooks.tsx            | 2 +-
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/api/v1/system/dept.ts b/src/api/v1/system/dept.ts
index 6d0efd3..bf7e36e 100644
--- a/src/api/v1/system/dept.ts
+++ b/src/api/v1/system/dept.ts
@@ -10,7 +10,7 @@ export const fetchGetDeptList = (data: any) => {
 
 /** 部门管理---获取所有部门管理列表 */
 export const fetchGetAllDeptList = () => {
-  return http.request<BaseResult<object>>('get', 'dept/noManage/getAllDeptList');
+  return http.request<BaseResult<object>>('get', 'dept/noManage/allDeptList');
 };
 
 /** 部门管理---添加部门管理 */
diff --git a/src/views/configuration/email-template/utils/columns.tsx b/src/views/configuration/email-template/utils/columns.tsx
index 48fd7ff..d72b96c 100644
--- a/src/views/configuration/email-template/utils/columns.tsx
+++ b/src/views/configuration/email-template/utils/columns.tsx
@@ -1,6 +1,6 @@
-import { reactive } from 'vue';
 import { $t } from '@/plugins/i18n';
 import { ElTag } from 'element-plus';
+import { reactive } from 'vue';
 
 // 表格列
 export const columns: TableColumnList = [
@@ -35,7 +35,7 @@ export const columns: TableColumnList = [
   { label: $t('table.createTime'), prop: 'createTime', sortable: true, minWidth: 160 },
   { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', minWidth: 130 },
   { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', minWidth: 130 },
-  { label: $t('table.operation'), fixed: 'right', minWidth: 210, slot: 'operation' },
+  { label: $t('table.operation'), fixed: 'right', minWidth: 160, slot: 'operation' },
 ];
 
 // 添加规则
diff --git a/src/views/configuration/email-user/utils/columns.ts b/src/views/configuration/email-user/utils/columns.ts
index d317550..d733ab4 100644
--- a/src/views/configuration/email-user/utils/columns.ts
+++ b/src/views/configuration/email-user/utils/columns.ts
@@ -1,5 +1,5 @@
-import { reactive } from 'vue';
 import { $t } from '@/plugins/i18n';
+import { reactive } from 'vue';
 
 // 表格列
 export const columns: TableColumnList = [
@@ -23,7 +23,7 @@ export const columns: TableColumnList = [
   { label: $t('table.createTime'), prop: 'createTime', sortable: true, minWidth: 160 },
   { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', minWidth: 130 },
   { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', minWidth: 130 },
-  { label: $t('table.operation'), fixed: 'right', minWidth: 210, slot: 'operation' },
+  { label: $t('table.operation'), fixed: 'right', minWidth: 160, slot: 'operation' },
 ];
 
 // 添加规则
diff --git a/src/views/configuration/menu-icon/utils/columns.ts b/src/views/configuration/menu-icon/utils/columns.ts
index 14772d7..923f292 100644
--- a/src/views/configuration/menu-icon/utils/columns.ts
+++ b/src/views/configuration/menu-icon/utils/columns.ts
@@ -1,5 +1,5 @@
-import { reactive } from 'vue';
 import { $t } from '@/plugins/i18n';
+import { reactive } from 'vue';
 
 // 表格列
 export const columns: TableColumnList = [
@@ -13,7 +13,7 @@ export const columns: TableColumnList = [
   { label: $t('table.createTime'), prop: 'createTime', sortable: true },
   { 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' },
+  { label: $t('table.operation'), fixed: 'right', width: 160, slot: 'operation' },
 ];
 
 // 添加规则
diff --git a/src/views/i18n/i18n-type-setting/utils/columns.tsx b/src/views/i18n/i18n-type-setting/utils/columns.tsx
index cfa7e60..8254433 100644
--- a/src/views/i18n/i18n-type-setting/utils/columns.tsx
+++ b/src/views/i18n/i18n-type-setting/utils/columns.tsx
@@ -1,5 +1,5 @@
-import { reactive, ref } from 'vue';
 import { $t } from '@/plugins/i18n';
+import { reactive, ref } from 'vue';
 
 export const editMap = ref({});
 
@@ -12,7 +12,7 @@ export const columns: TableColumnList = [
   { label: $t('table.createTime'), prop: 'createTime' },
   { 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' },
+  { label: $t('table.operation'), fixed: 'right', width: 160, slot: 'operation' },
 ];
 
 // 添加规则
diff --git a/src/views/message-manger/message-send/utils/columns.tsx b/src/views/message-manger/message-send/utils/columns.tsx
index f5223a4..2df71d6 100644
--- a/src/views/message-manger/message-send/utils/columns.tsx
+++ b/src/views/message-manger/message-send/utils/columns.tsx
@@ -1,6 +1,6 @@
-import { reactive } from 'vue';
 import { $t } from '@/plugins/i18n';
 import { ElTag, type FormRules } from 'element-plus';
+import { reactive } from 'vue';
 
 // 表格列
 export const columns: TableColumnList = [
@@ -39,7 +39,7 @@ export const columns: TableColumnList = [
   { label: $t('table.createTime'), prop: 'createTime', sortable: true, minWidth: 160 },
   { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', minWidth: 130 },
   { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', minWidth: 130 },
-  { label: $t('table.operation'), fixed: 'right', minWidth: 150, slot: 'operation' },
+  { label: $t('table.operation'), fixed: 'right', minWidth: 160, slot: 'operation' },
 ];
 
 // 添加规则
diff --git a/src/views/message-manger/message-type/utils/columns.tsx b/src/views/message-manger/message-type/utils/columns.tsx
index 90b445f..3169972 100644
--- a/src/views/message-manger/message-type/utils/columns.tsx
+++ b/src/views/message-manger/message-type/utils/columns.tsx
@@ -1,6 +1,6 @@
-import { reactive } from 'vue';
 import { $t } from '@/plugins/i18n';
 import type { FormRules } from 'element-plus';
+import { reactive } from 'vue';
 
 // 表格列
 export const columns: TableColumnList = [
@@ -18,7 +18,7 @@ export const columns: TableColumnList = [
   { label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 },
   { 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' },
+  { label: $t('table.operation'), fixed: 'right', width: 160, slot: 'operation' },
 ];
 
 // 添加规则
diff --git a/src/views/scheduler/schedulers-group/utils/columns.ts b/src/views/scheduler/schedulers-group/utils/columns.ts
index 88fbe75..a9559f7 100644
--- a/src/views/scheduler/schedulers-group/utils/columns.ts
+++ b/src/views/scheduler/schedulers-group/utils/columns.ts
@@ -1,5 +1,5 @@
-import { reactive } from 'vue';
 import { $t } from '@/plugins/i18n';
+import { reactive } from 'vue';
 
 // 表格列
 export const columns: TableColumnList = [
@@ -13,7 +13,7 @@ export const columns: TableColumnList = [
   { label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 },
   { 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' },
+  { label: $t('table.operation'), fixed: 'right', width: 160, slot: 'operation' },
 ];
 
 // 添加规则
diff --git a/src/views/scheduler/schedulers/utils/columns.ts b/src/views/scheduler/schedulers/utils/columns.ts
index eadfcf6..8f7317a 100644
--- a/src/views/scheduler/schedulers/utils/columns.ts
+++ b/src/views/scheduler/schedulers/utils/columns.ts
@@ -1,5 +1,5 @@
-import { reactive } from 'vue';
 import { $t } from '@/plugins/i18n';
+import { reactive } from 'vue';
 
 // 表格列
 export const columns: TableColumnList = [
@@ -18,7 +18,7 @@ export const columns: TableColumnList = [
   { label: $t('schedulers_triggerState'), prop: 'triggerState' },
   // corn表达式
   { label: $t('schedulers_cronExpression'), prop: 'cronExpression' },
-  { label: $t('table.operation'), fixed: 'right', minWidth: 210, slot: 'operation' },
+  { label: $t('table.operation'), fixed: 'right', minWidth: 160, slot: 'operation' },
 ];
 
 // 添加规则
diff --git a/src/views/system/admin-user/utils/columns.tsx b/src/views/system/admin-user/utils/columns.tsx
index 8866549..dfe0e29 100644
--- a/src/views/system/admin-user/utils/columns.tsx
+++ b/src/views/system/admin-user/utils/columns.tsx
@@ -1,7 +1,7 @@
-import { computed, reactive, ref } from 'vue';
 import { $t } from '@/plugins/i18n';
-import type { FormRules } from 'element-plus';
 import { REGEXP_PWD } from '@/views/login/utils/rule';
+import type { FormRules } from 'element-plus';
+import { computed, reactive, ref } from 'vue';
 
 // 是否是更新用户信息
 export const isAddUserinfo = ref(false);
diff --git a/src/views/system/dept/utils/columns.ts b/src/views/system/dept/utils/columns.ts
index 620ac57..2b06e94 100644
--- a/src/views/system/dept/utils/columns.ts
+++ b/src/views/system/dept/utils/columns.ts
@@ -15,7 +15,7 @@ export const columns: TableColumnList = [
   { label: $t('table.createTime'), prop: 'createTime', sortable: true, minWidth: 160 },
   { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', minWidth: 130 },
   { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', minWidth: 130 },
-  { label: $t('table.operation'), fixed: 'right', minWidth: 210, slot: 'operation' },
+  { label: $t('table.operation'), fixed: 'right', minWidth: 160, slot: 'operation' },
 ];
 
 // 添加规则
diff --git a/src/views/system/files/utils/columns.ts b/src/views/system/files/utils/columns.ts
index 6b3353d..d2295d7 100644
--- a/src/views/system/files/utils/columns.ts
+++ b/src/views/system/files/utils/columns.ts
@@ -1,5 +1,5 @@
-import { reactive } from 'vue';
 import { $t } from '@/plugins/i18n';
+import { reactive } from 'vue';
 
 // 表格列
 export const columns: TableColumnList = [
@@ -17,7 +17,7 @@ export const columns: TableColumnList = [
   { label: $t('table.createTime'), prop: 'createTime', sortable: true, minWidth: 160 },
   { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', minWidth: 130 },
   { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', minWidth: 130 },
-  { label: $t('table.operation'), fixed: 'right', minWidth: 210, slot: 'operation' },
+  { label: $t('table.operation'), fixed: 'right', minWidth: 160, slot: 'operation' },
 ];
 
 // 添加规则
diff --git a/src/views/system/menu/utils/modules/columns.tsx b/src/views/system/menu/utils/modules/columns.tsx
index ad6fe94..9a88dc3 100644
--- a/src/views/system/menu/utils/modules/columns.tsx
+++ b/src/views/system/menu/utils/modules/columns.tsx
@@ -1,11 +1,11 @@
 import { useRenderIcon } from '@/components/ReIcon/src/hooks';
 import { $t } from '@/plugins/i18n';
+import { userMenuStore } from '@/store/system/menu';
+import { messageBox } from '@/utils/message';
+import { mergeArgs } from '@/views/system/menu/utils';
 import { isAllEmpty } from '@pureadmin/utils';
 import { ElLink, ElTag, type FormRules } from 'element-plus';
 import { h, reactive } from 'vue';
-import { mergeArgs } from '@/views/system/menu/utils';
-import { messageBox } from '@/utils/message';
-import { userMenuStore } from '@/store/system/menu';
 
 const menuStore = userMenuStore();
 
@@ -104,7 +104,7 @@ export const columns: TableColumnList = [
   { label: $t('table.createTime'), prop: 'createTime', sortable: true, minWidth: 160 },
   { label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', minWidth: 130 },
   { label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', minWidth: 130 },
-  { label: $t('table.operation'), fixed: 'right', minWidth: 150, slot: 'operation' },
+  { label: $t('table.operation'), fixed: 'right', minWidth: 160, slot: 'operation' },
 ];
 
 /** 自定义表单规则校验 */
diff --git a/src/views/system/menu/utils/modules/hooks.tsx b/src/views/system/menu/utils/modules/hooks.tsx
index 428e156..61ee989 100644
--- a/src/views/system/menu/utils/modules/hooks.tsx
+++ b/src/views/system/menu/utils/modules/hooks.tsx
@@ -51,7 +51,7 @@ function onAdd(parentId: any = 0) {
         hiddenTag: false,
         fixedTag: false,
         showLink: true,
-        showParent: false,
+        showParent: true,
       },
     },
     width: '45%',