From f5f436e90e769d4d3d0c7eadd55f3f2380d6d967 Mon Sep 17 00:00:00 2001
From: Kven <2955163637@qq.com>
Date: Mon, 10 Feb 2025 23:58:45 +0800
Subject: [PATCH] =?UTF-8?q?refactor(notification):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=80=89=E6=8B=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除部门树的搜索框
- 默认展开部门树的所有节点
- 使用 InputTag 组件显示已选用户
- 限制显示的用户数量为 5 个
- 优化用户选择的逻辑，支持全选和单选
-重构代码，提高可维护性和可读性
---
 .../notice/components/message-edit.vue        | 155 +++++-------------
 .../system/user/components/dept-tree.vue      |  11 +-
 2 files changed, 44 insertions(+), 122 deletions(-)

diff --git a/src/views/notification/notice/components/message-edit.vue b/src/views/notification/notice/components/message-edit.vue
index c3a82ee..298a8cd 100644
--- a/src/views/notification/notice/components/message-edit.vue
+++ b/src/views/notification/notice/components/message-edit.vue
@@ -33,9 +33,10 @@
         ]"
       >
         <a-input-tag
-          v-model="formData.userIds"
+          v-model="selectedNames"
           placeholder='请选择用戶'
-          :value=formData.userIds
+          :max-tag-count="5"
+          readonly
           @click="queryDeptTree"
         />
       </a-form-item>
@@ -143,27 +144,26 @@
     @cancel="deptTreeCancel"
   >
     <template #title>发送用户</template>
-    <div style="display: flex;height: 520px">
+    <div style="display: flex;">
       <a-card style="margin-right: 10px;width: 30%">
         <a-tree
           :data="deptTreeData"
           :field-names="{ title: 'name', key: 'id', children: 'children' }"
           style="margin-bottom: 8px; max-width: 240px"
           @select="handleClickTree"
-          @check="handleCheckTree"
         >
         </a-tree>
       </a-card>
       <a-card style="flex: 1">
         <a-button type="primary" style="margin-bottom: 10px" @click="handleCheckAllUsers">全选</a-button>
         <a-table
-          :data="selectedDepartmentMembers"
+          :data="renderData"
           :columns="columns"
-          style="height: 520px">
+        >
           <template #id="{ record }">
-            <a-checkbox v-model="selectedIds" :value="record.userId"> </a-checkbox>
+            <a-checkbox v-model="selectedIds" :value="record.id"> </a-checkbox>
           </template>
-          <template #username="{ record }">
+          <template #name="{ record }">
             {{ record.username }}
           </template>
         </a-table>
@@ -183,7 +183,7 @@
   import { CreateRecord } from '@/api/user';
   import { FormInstance } from '@arco-design/web-vue/es/form';
   import { Message } from '@arco-design/web-vue';
-  import { useMessageStore } from '@/store';
+  import { useMessageStore, useUserStore } from '@/store';
   import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
   import { IEditorConfig } from '@wangeditor/editor'
   import '@wangeditor/editor/dist/css/style.css'
@@ -196,6 +196,7 @@
     isCreate: Boolean,
   });
   // 部门树模态框状态
+  const userStore = useUserStore();
   const deptVisible=ref(false);
   const emit = defineEmits(['refresh']);
   const modalTitle = computed(() => {
@@ -217,6 +218,8 @@
   const isFullScreen = ref(false);
   const mode = 'default';
   const selectedIds= ref<number[]>([]);
+  const selectedNames= ref<string[]>([]);
+
   const toolbarConfig = { excludeKeys: ['uploadVideo', 'insertImage','insertVideo']}
   const columns = computed<any[]>(()=>[
     {
@@ -230,45 +233,6 @@
     },
   ])
 
-  // const fieIds = ref(
-  //   {
-  //     userId:{
-  //       label: '用戶',
-  //       component: 'input',
-  //       type:'text'
-  //     },
-  //     title:{
-  //       label: '标题',
-  //       component: 'input',
-  //       type:'text'
-  //     },
-  //     remark:{
-  //       label: '备注',
-  //       component: 'input',
-  //       type:'text'
-  //     },
-  //     sms:{
-  //       label: '短信',
-  //       component: 'switch',
-  //       type:'switch'
-  //     },
-  //     email:{
-  //       label: '邮件',
-  //       component:'switch',
-  //       type:'switch'
-  //     },
-  //     attachmentIds:{
-  //       label: '附件',
-  //       component: 'input',
-  //       type:'text'
-  //     },
-  //     richEditor:{
-  //       label: '内容',
-  //       component: 'input',
-  //       type:'text'
-  //     },
-  //   },
-  // );
   const deptTreeData = ref([
     {
       id: '1',
@@ -301,7 +265,6 @@
       ]
     }
   ]);
-  const selectedDepartmentMembers: any = ref([]);
   const renderData = ref<any[]>([]);
   const messageType = computed(() => [
     {
@@ -314,8 +277,8 @@
     },
   ]);
   // 获取部门树
-  const getDeptTree = async () => {
-    const res = await getAllDeptTree(1);
+  const getDeptTree = async (deptId: number) => {
+    const res = await getAllDeptTree(deptId || 0);
     if (res.status === 200) {
       deptTreeData.value = res.data;
     }
@@ -325,76 +288,26 @@
     deptVisible.value = true;
   }
 
-  // 广度优先遍历树，获取选中的成员
-  const getSelectedMembers = (treeData: any[], selectedKeys: number[]) => {
-    const queue:any = [...treeData];
-    const selectedMembers: any[] = [];
-    while (queue.length > 0) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const node = queue.shift()!;
-      if (selectedKeys.includes(node.id)) {
-        if (node.members) {
-          selectedMembers.push(...node.members);
-        }
-      }
-      if (node.children) {
-        queue.push(...node.children);
-      }
+  // 获取用户列表
+  const fetchData = async (deptId: number) => {
+    try {
+      const res = await userStore.getUserList({
+        deptId,
+      });
+      renderData.value = res.data.records;
+      console.log(renderData);
+    } catch (err) {
+      // you can report use errorHandler or other
     }
-    return selectedMembers;
-  }
+  };
+
 
 
   // 部门树被点击
   const handleClickTree = (id: number[]) => {
-    // 假设 '1' 是总部门的键
-    if (id[0] === 1 && id.length === 1) {
-      // 广度优先遍历树，获取所有成员
-      const allMembers: any[] = [];
-      const queue:any = [...deptTreeData.value];
-      while (queue.length > 0) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const node = queue.shift()!;
-        if (node.members) {
-          allMembers.push(...node.members);
-        }
-        if (node.children) {
-          queue.push(...node.children);
-        }
-      }
-      selectedDepartmentMembers.value = allMembers;
-      renderData.value = selectedDepartmentMembers.value;
-      return;
-    }
-    const Members = getSelectedMembers(deptTreeData.value, id);
-    selectedDepartmentMembers.value = Members;
+    const [deptId] = id;
+    fetchData(deptId);
   }
-  // 部门树被选中
-  const handleCheckTree = (id: number[]) => {
-    if (id[0] === 1 ) { // 假设 '1' 是总部门的键
-      const allKeys: number[] = [];
-      const traverseTree = (node: any) => {
-        if (node.members) {
-          node.members.forEach((member: any) => {
-            allKeys.push(member.userId);
-          });
-        }
-        if (node.children) {
-          node.children.forEach((child: any) => {
-            traverseTree(child);
-          });
-        }
-      };
-      deptTreeData.value.forEach((node: any) => {
-        traverseTree(node);
-      });
-      selectedIds.value = allKeys;
-
-    } else {
-      const selectedKeys = getSelectedMembers(deptTreeData.value, id);
-      selectedIds.value = selectedKeys.map(item => item.userId);
-    }
-  };
 
   // 组件被点击
   const handleClick = () => {
@@ -446,18 +359,26 @@
     setVisible(false);
   };
 
+  const getNamesByIds = (ids: number[]) => {
+    return ids.map(id => renderData.value.find(dept => dept.id === id)?.username).filter(username => username !== undefined) as string[];
+  };
+
   // 部门树模态框提交
   const deptTreeSubmit = () => {
     deptVisible.value = false;
     formData.value.userIds = selectedIds.value;
+    selectedNames.value = getNamesByIds(selectedIds.value);
+    console.log(selectedNames.value);
   };
 
   // 选择所有用户
   const handleCheckAllUsers = () => {
     if(selectedIds.value.length ===0 ) {
-      handleCheckTree([1]);
+// 遍历 renderData 并提取所有用户的 id
+      selectedIds.value = renderData.value.map(user => user.id);
     } else {
       selectedIds.value = [];
+
     }
 
   };
@@ -468,7 +389,7 @@
     deptVisible.value = false;
   };
   onMounted(async () => {
-    await getDeptTree();
+    await getDeptTree(0);
   });
 </script>
 
diff --git a/src/views/system/user/components/dept-tree.vue b/src/views/system/user/components/dept-tree.vue
index 229c371..f9c55b4 100644
--- a/src/views/system/user/components/dept-tree.vue
+++ b/src/views/system/user/components/dept-tree.vue
@@ -1,11 +1,12 @@
 <template>
-  <a-input-search
-    v-model="searchKey"
-    placeholder="搜索"
-    style="margin-bottom: 8px; max-width: 240px"
-  />
+<!--  <a-input-search-->
+<!--    v-model="searchKey"-->
+<!--    placeholder="搜索"-->
+<!--    style="margin-bottom: 8px; max-width: 240px"-->
+<!--  />-->
   <a-tree
     :data="treeData"
+    :tree-default-expand-all="true"
     :field-names="{
               key: 'id',
               title: 'name',