From 0d144e3089c8b9e6f3f37d881bd0648cff631dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9E=E4=BB=99=E9=83=BD=E6=B2=A1=E7=94=A8?=
 <615206459@qq.com>
Date: Fri, 24 Nov 2023 16:39:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/components/view/group/index.vue      | 20 ++++++++++++-------
 src/modules/base/hooks/dept.tsx               |  5 ++++-
 .../base/views/user/components/dept-list.vue  |  3 +--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/modules/base/components/view/group/index.vue b/src/modules/base/components/view/group/index.vue
index 46ad780..3e8a0dd 100644
--- a/src/modules/base/components/view/group/index.vue
+++ b/src/modules/base/components/view/group/index.vue
@@ -31,11 +31,13 @@
 									<el-tree
 										class="tree"
 										highlight-current
+										auto-expand-parent
+										:expand-on-click-node="false"
+										:ref="setRefs('tree')"
 										:lazy="tree.lazy"
 										:data="list"
 										:props="tree.props"
 										:load="tree.onLoad"
-										:default-expanded-keys="tree.defaultExpandedKeys"
 										@node-click="select"
 									>
 										<template #default="{ data }">
@@ -148,7 +150,7 @@ import {
 	Refresh as IconRefresh,
 	Plus
 } from "@element-plus/icons-vue";
-import { useBrowser } from "/@/cool";
+import { useBrowser, useCool } from "/@/cool";
 import { ContextMenu, useForm, setFocus } from "@cool-vue/crud";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { ClViewGroup } from "./hook";
@@ -158,6 +160,7 @@ import { deepTree } from "/@/cool/utils";
 const { browser, onScreenChange } = useBrowser();
 const slots = useSlots();
 const Form = useForm();
+const { refs, setRefs } = useCool();
 
 // 配置
 const config = reactive(
@@ -330,10 +333,12 @@ async function refresh(params?: any) {
 	let req;
 
 	if (tree.visible) {
+		// 树形数据
 		req = config.service.list(data).then((res) => {
 			list.value = deepTree(res);
 		});
 	} else {
+		// 列表数据
 		req = config.service.page(data).then((res) => {
 			const arr = config.onData?.(res.list) || res.list;
 
@@ -352,10 +357,13 @@ async function refresh(params?: any) {
 			const item = selected.value || list.value[0];
 
 			if (item) {
-				tree.defaultExpandedKeys = [item.id];
-			}
+				if (tree.visible) {
+					const node = refs.tree.getNode(item);
+					node.expand();
+				}
 
-			select(item);
+				select(item);
+			}
 		})
 		.catch((err) => {
 			ElMessage.error(err.message);
@@ -509,8 +517,6 @@ defineExpose({
 						display: flex;
 						align-items: center;
 						line-height: 1;
-						height: 100%;
-						width: 100%;
 					}
 				}
 
diff --git a/src/modules/base/hooks/dept.tsx b/src/modules/base/hooks/dept.tsx
index a72cfbf..4ceae33 100644
--- a/src/modules/base/hooks/dept.tsx
+++ b/src/modules/base/hooks/dept.tsx
@@ -7,9 +7,11 @@ import ClAvatar from "../components/avatar/index";
 export function useDeptViewGroup(options: DeepPartial<ClViewGroup.Options>) {
 	const { ViewGroup } = useViewGroup({
 		...options,
+		label: "员工列表",
 		service: service.base.sys.department,
 		enableAdd: false,
-		label: "员工列表",
+		enableRefresh: false,
+		enableContextMenu: false,
 		tree: {
 			lazy: true,
 			onLoad(node: Node, resolve: (data: TreeData) => void) {
@@ -25,6 +27,7 @@ export function useDeptViewGroup(options: DeepPartial<ClViewGroup.Options>) {
 								/>
 							);
 						});
+
 						res.unshift(...(node.data.children || []));
 
 						resolve(res);
diff --git a/src/modules/base/views/user/components/dept-list.vue b/src/modules/base/views/user/components/dept-list.vue
index 4fb68d3..e0b01d7 100644
--- a/src/modules/base/views/user/components/dept-list.vue
+++ b/src/modules/base/views/user/components/dept-list.vue
@@ -33,11 +33,11 @@
 					v-loading="loading"
 					node-key="id"
 					default-expand-all
-					highlight-current
 					:data="list"
 					:props="{
 						label: 'name'
 					}"
+					highlight-current
 					:draggable="isDrag"
 					:allow-drag="allowDrag"
 					:allow-drop="allowDrop"
@@ -450,7 +450,6 @@ onMounted(function () {
 
 			&.is-active {
 				color: var(--color-primary);
-				font-weight: bold;
 			}
 		}