From d881b93c7814d6cd92fb81717ab690dd1ac8c732 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sat, 12 Oct 2024 21:10:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=AE=A1=E7=90=86=E3=80=81=E8=8F=9C=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A0=91=E5=88=97=E8=A1=A8=E8=BF=87=E6=BB=A4=EF=BC=88?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=BF=87=E6=BB=A4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/system/type.ts                |  2 -
 src/views/system/dept/index.vue        | 78 +++++++++++++++-----------
 src/views/system/menu/MenuAddModal.vue |  2 +-
 src/views/system/menu/index.vue        | 50 +++++++++++------
 src/views/system/user/dept/index.vue   | 52 ++++++++++++++---
 src/views/system/user/index.vue        |  2 +-
 6 files changed, 125 insertions(+), 61 deletions(-)

diff --git a/src/apis/system/type.ts b/src/apis/system/type.ts
index fb40135e..115ba2af 100644
--- a/src/apis/system/type.ts
+++ b/src/apis/system/type.ts
@@ -114,7 +114,6 @@ export interface MenuResp {
 export interface MenuQuery {
   title?: string
   status?: number
-  sort: Array<string>
 }
 
 /** 系统部门类型 */
@@ -136,7 +135,6 @@ export interface DeptResp {
 export interface DeptQuery {
   description?: string
   status?: number
-  sort: Array<string>
 }
 
 /** 系统字典类型 */
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 101e29b6..a293a028 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -18,17 +18,9 @@
         <IconRight v-else />
       </template>
       <template #custom-left>
-        <a-input v-model="queryForm.description" placeholder="请输入名称/描述" allow-clear @change="search">
+        <a-input v-model="name" placeholder="请输入名称" allow-clear @change="search">
           <template #prefix><icon-search /></template>
         </a-input>
-        <a-select
-          v-model="queryForm.status"
-          :options="DisEnableStatusList"
-          placeholder="请选择状态"
-          allow-clear
-          style="width: 150px"
-          @change="search"
-        />
         <a-button @click="reset">重置</a-button>
       </template>
       <template #custom-right>
@@ -80,10 +72,53 @@ import type { TableInstanceColumns } from '@/components/GiTable/type'
 import { useDownload, useTable } from '@/hooks'
 import { isMobile } from '@/utils'
 import has from '@/utils/has'
-import { DisEnableStatusList } from '@/constant/common'
 
 defineOptions({ name: 'SystemDept' })
 
+const tableRef = ref<InstanceType<typeof GiTable>>()
+const queryForm = reactive<DeptQuery>({})
+const {
+  tableData,
+  loading,
+  search,
+  handleDelete
+} = useTable(() => listDept(queryForm), {
+  immediate: true,
+  onSuccess: () => {
+    nextTick(() => {
+      tableRef.value?.tableRef?.expandAll(true)
+    })
+  }
+})
+
+// 过滤树
+const name = ref('')
+const searchData = (name: string) => {
+  const loop = (data: DeptResp[]) => {
+    const result = [] as DeptResp[]
+    data.forEach((item: DeptResp) => {
+      if (item.name?.toLowerCase().includes(name.toLowerCase())) {
+        result.push({ ...item })
+      } else if (item.children) {
+        const filterData = loop(item.children)
+        if (filterData.length) {
+          result.push({
+            ...item,
+            children: filterData
+          })
+        }
+      }
+    })
+    return result
+  }
+  return loop(tableData.value)
+}
+
+const dataList = computed(() => {
+  if (!name.value) return tableData.value
+  return searchData(name.value)
+})
+
 const columns: TableInstanceColumns[] = [
   { title: '名称', dataIndex: 'name', width: 170, ellipsis: true, tooltip: true },
   { title: '状态', slotName: 'status', align: 'center' },
@@ -104,30 +139,9 @@ const columns: TableInstanceColumns[] = [
   }
 ]
 
-const queryForm = reactive<DeptQuery>({
-  sort: ['parentId,asc', 'sort,asc', 'createTime,desc']
-})
-
-const tableRef = ref<InstanceType<typeof GiTable>>()
-const {
-  tableData: dataList,
-  loading,
-  search,
-  handleDelete
-} = useTable(() => listDept(queryForm), {
-  immediate: true,
-  onSuccess: () => {
-    nextTick(() => {
-      tableRef.value?.tableRef?.expandAll(true)
-    })
-  }
-})
-
 // 重置
 const reset = () => {
-  queryForm.description = undefined
-  queryForm.status = undefined
-  search()
+  name.value = ''
 }
 
 // 删除
diff --git a/src/views/system/menu/MenuAddModal.vue b/src/views/system/menu/MenuAddModal.vue
index af0ec871..39f5de9f 100644
--- a/src/views/system/menu/MenuAddModal.vue
+++ b/src/views/system/menu/MenuAddModal.vue
@@ -145,7 +145,7 @@ const menuSelectTree = computed(() => {
   }))
 })
 
-// 过滤菜单树
+// 过滤树
 const filterOptions = (searchKey: string, nodeData: TreeNodeData) => {
   if (nodeData.title) {
     return nodeData.title.toLowerCase().includes(searchKey.toLowerCase())
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index b51fc9ca..9b2d58eb 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -17,17 +17,9 @@
         <IconRight v-else />
       </template>
       <template #custom-left>
-        <a-input v-model="queryForm.title" placeholder="请输入菜单标题" allow-clear @change="search">
+        <a-input v-model="title" placeholder="请输入菜单标题" allow-clear @change="search">
           <template #prefix><icon-search /></template>
         </a-input>
-        <a-select
-          v-model="queryForm.status"
-          :options="DisEnableStatusList"
-          placeholder="请选择状态"
-          allow-clear
-          style="width: 150px"
-          @change="search"
-        />
         <a-button @click="reset">重置</a-button>
       </template>
       <template #custom-right>
@@ -88,24 +80,48 @@ import MenuAddModal from './MenuAddModal.vue'
 import { type MenuQuery, type MenuResp, deleteMenu, listMenu } from '@/apis/system'
 import type GiTable from '@/components/GiTable/index.vue'
 import type { TableInstanceColumns } from '@/components/GiTable/type'
-import { DisEnableStatusList } from '@/constant/common'
 import { isMobile } from '@/utils'
 import has from '@/utils/has'
 import { useTable } from '@/hooks'
 
 defineOptions({ name: 'SystemMenu' })
 
-const queryForm = reactive<MenuQuery>({
-  sort: ['parentId,asc', 'sort,asc', 'createTime,desc']
-})
-
+const queryForm = reactive<MenuQuery>({})
 const {
-  tableData: dataList,
+  tableData,
   loading,
   search,
   handleDelete
 } = useTable(() => listMenu(queryForm), { immediate: true })
 
+// 过滤树
+const title = ref('')
+const searchData = (title: string) => {
+  const loop = (data: MenuResp[]) => {
+    const result = [] as MenuResp[]
+    data.forEach((item: MenuResp) => {
+      if (item.title?.toLowerCase().includes(title.toLowerCase())) {
+        result.push({ ...item })
+      } else if (item.children) {
+        const filterData = loop(item.children)
+        if (filterData.length) {
+          result.push({
+            ...item,
+            children: filterData
+          })
+        }
+      }
+    })
+    return result
+  }
+  return loop(tableData.value)
+}
+
+const dataList = computed(() => {
+  if (!title.value) return tableData.value
+  return searchData(title.value)
+})
+
 const columns: TableInstanceColumns[] = [
   { title: '菜单标题', dataIndex: 'title', slotName: 'title', width: 170, fixed: !isMobile() ? 'left' : undefined },
   { title: '类型', slotName: 'type', align: 'center' },
@@ -134,9 +150,7 @@ const columns: TableInstanceColumns[] = [
 
 // 重置
 const reset = () => {
-  queryForm.title = undefined
-  queryForm.status = undefined
-  search()
+  title.value = ''
 }
 
 // 删除
diff --git a/src/views/system/user/dept/index.vue b/src/views/system/user/dept/index.vue
index cf2021f7..d80e8e2d 100644
--- a/src/views/system/user/dept/index.vue
+++ b/src/views/system/user/dept/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="left-tree">
     <div class="left-tree__search">
-      <a-input v-model="inputValue" :placeholder="props.placeholder" allow-clear>
+      <a-input v-model="searchKey" :placeholder="props.placeholder" allow-clear>
         <template #prefix><icon-search /></template>
       </a-input>
     </div>
@@ -9,7 +9,7 @@
       <div class="left-tree__tree">
         <a-tree
           ref="treeRef"
-          :data="deptList"
+          :data="treeData"
           show-line
           block-node
           default-expand-all
@@ -20,6 +20,13 @@
             <IconCaretDown v-if="!isLeaf" />
             <IconIdcard v-else />
           </template>
+          <template #title="nodeData">
+            <template v-if="index = getMatchIndex(nodeData?.title), index < 0">{{ nodeData?.title }}</template>
+            <span v-else>{{ nodeData?.title?.substr(0, index) }}
+              <span style="color: rgb(var(--arcoblue-6));">{{ nodeData?.title?.substr(index, searchKey.length) }}</span>
+              {{ nodeData?.title?.substr(index + searchKey.length) }}
+            </span>
+          </template>
         </a-tree>
       </div>
     </div>
@@ -27,7 +34,7 @@
 </template>
 
 <script setup lang="tsx">
-import type { TreeInstance } from '@arco-design/web-vue'
+import type { TreeInstance, TreeNodeData } from '@arco-design/web-vue'
 import { ref } from 'vue'
 import { useDept } from '@/hooks/app'
 
@@ -58,12 +65,43 @@ const { deptList, getDeptList } = useDept({
   }
 })
 
-// 树查询
-const inputValue = ref('')
-watch(inputValue, (val) => {
-  getDeptList(val)
+// 过滤树
+const searchKey = ref('')
+const search = (keyword: string) => {
+  const loop = (data: TreeNodeData[]) => {
+    const result = [] as TreeNodeData[]
+    data.forEach((item: TreeNodeData) => {
+      if (item.title?.toLowerCase().includes(keyword.toLowerCase())) {
+        result.push({ ...item })
+      } else if (item.children) {
+        const filterData = loop(item.children)
+        if (filterData.length) {
+          result.push({
+            ...item,
+            children: filterData
+          })
+        }
+      }
+    })
+    return result
+  }
+  return loop(deptList.value)
+}
+
+const treeData = computed(() => {
+  if (!searchKey.value) return deptList.value
+  return search(searchKey.value)
 })
 
+/**
+ * 获取匹配索引
+ * @param name 名称
+ */
+const getMatchIndex = (name: string) => {
+  if (!searchKey.value) return -1
+  return name.toLowerCase().indexOf(searchKey.value.toLowerCase())
+}
+
 onMounted(() => {
   getDeptList()
 })
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a1f0d52d..fcdefdec 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -9,7 +9,7 @@
     </a-row>
     <a-row align="stretch" :gutter="14" class="h-full page_content">
       <a-col :xs="0" :sm="8" :md="7" :lg="6" :xl="5" :xxl="4" flex="260px" class="h-full ov-hidden">
-        <DeptTree placeholder="请输入名称/描述" @node-click="handleSelectDept" />
+        <DeptTree placeholder="请输入名称" @node-click="handleSelectDept" />
       </a-col>
       <a-col :xs="24" :sm="16" :md="17" :lg="18" :xl="19" :xxl="20" flex="1" class="h-full ov-hidden">
         <GiTable row-key="id" :data="dataList" :columns="columns" :loading="loading"