From 9741192beef72d0e83c36cb791d670f1b3edcafd Mon Sep 17 00:00:00 2001
From: Maple <869445424@qq.com>
Date: Mon, 28 Jul 2025 15:12:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B0=86=E9=83=A8=E9=97=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=E7=9A=84=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=97=E6=8E=A7=E7=9A=84=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=9C=A8=E6=98=AF=E7=82=B9=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E8=80=8C=E5=85=A8=E9=83=A8=E5=B1=95=E5=BC=80=E6=88=96=E8=80=85?=
 =?UTF-8?q?=E6=94=B6=E7=BC=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/auto-imports.d.ts     |  2 +-
 src/views/system/dept/index.vue | 24 ++++++++++++++++++++----
 src/views/system/role/index.vue |  1 +
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts
index 369aad4..eab6be6 100644
--- a/src/types/auto-imports.d.ts
+++ b/src/types/auto-imports.d.ts
@@ -70,6 +70,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index bec6925..905266d 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -9,13 +9,15 @@
     <GiTable
       v-show="viewType === 'table'"
       ref="tableRef"
-      row-key="id"
+      row-key="deptId"
       :data="dataList"
       :columns="columns"
       :loading="loading"
       :scroll="{ x: '100%', y: '100%', minWidth: 1000 }"
       :pagination="false"
       :disabled-column-keys="['name']"
+      :expanded-keys="expandedKeys"
+      @expand="onExpand"
       @refresh="search"
     >
       <template #expand-icon="{ expanded }">
@@ -109,9 +111,10 @@ const {
 } = useTable<DeptResp>(() => getDeptTree(queryForm), {
   immediate: true,
   onSuccess: () => {
-    nextTick(() => {
-      tableRef.value?.tableRef?.expandAll(true)
-    })
+    // nextTick(() => {
+    //   tableRef.value?.tableRef?.expandAll(true)
+    // })
+    // 移除自动全部展开，保持默认折叠
   },
 })
 // 查看视图类型
@@ -124,6 +127,8 @@ const menus = [
 ]
 // 所有节点展开状态
 const nodeExpandAll = ref<boolean>(true)
+// 表格视图展开的节点
+const expandedKeys = ref<string[]>([])
 // 过滤树
 const searchData = (name: string) => {
   const loop = (data: DeptResp[]) => {
@@ -204,6 +209,17 @@ const handleAdd = (record: DeptResp) => {
 const onUpdate = (record: DeptResp) => {
   DeptAddModalRef.value?.onUpdate(record.deptId)
 }
+
+const onExpand = (expanded: boolean, record: DeptResp) => {
+  const key = record.deptId
+  if (expanded) {
+    if (!expandedKeys.value.includes(key)) {
+      expandedKeys.value.push(key)
+    }
+  } else {
+    expandedKeys.value = expandedKeys.value.filter(k => k !== key)
+  }
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 1f321bf..fa77b82 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,4 +1,5 @@
 <template>
+  <h1>这个暂时写不了，角色管理采用菜单权限的设置</h1>
   <GiPageLayout :header-style="{ padding: 0, borderBottom: 'none' }">
     <template #left>
       <RoleTree @node-click="handleSelectRole" />