From dec414894db8b225fb8672eaf7b843a1eab1f53f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com>
Date: Sat, 15 Jan 2022 00:42:00 +0800
Subject: [PATCH] =?UTF-8?q?pd-tree=20treeTable.js=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/Psyduck/pd-tree.vue        | 30 +++++++++++++++----
 magic-boot-ui/src/scripts/treeTable.js        | 14 +++++----
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/magic-boot-ui/src/components/Psyduck/pd-tree.vue b/magic-boot-ui/src/components/Psyduck/pd-tree.vue
index 79618f4..ace7014 100644
--- a/magic-boot-ui/src/components/Psyduck/pd-tree.vue
+++ b/magic-boot-ui/src/components/Psyduck/pd-tree.vue
@@ -1,11 +1,16 @@
 <template>
   <div>
-    <el-button v-if="expand" type="primary" size="mini" icon="el-icon-sort" plain @click="doExpand">展开/折叠</el-button>
-    <el-button v-if="checked" type="primary" size="mini" icon="el-icon-check" plain @click="() => { treeAllChecked = !treeAllChecked; checkedAll(treeData, treeAllChecked) }">全选/全不选</el-button>
+    <div>
+      <el-button v-if="expand" type="primary" size="mini" icon="el-icon-sort" plain @click="doExpand">展开/折叠</el-button>
+      <el-button v-if="checked" type="primary" size="mini" icon="el-icon-check" plain @click="() => { treeAllChecked = !treeAllChecked; checkedAll(searchData, treeAllChecked) }">全选/全不选</el-button>
+    </div>
+    <div style="margin: 5px 0px;" v-if="search">
+      <el-input v-model="searchValue" @input="searchTree" style="width: 90%" />
+    </div>
     <el-tree
       v-if="refreshTree"
       ref="tree"
-      :data="treeData"
+      :data="searchData"
       v-bind="el"
       node-key="id"
       :default-expand-all="defaultExpandAll"
@@ -49,12 +54,16 @@ export default {
     checked: {
       type: Boolean,
       default: true
+    },
+    search: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {
     async selectValues() {
       await this.loadTreeData()
-      this.checkedAll(this.treeData, false)
+      this.checkedAll(this.searchData, false)
       var values = this.selectValues.split(',');
       for(var i in values){
         this.$refs.tree.setChecked(values[i], true, false)
@@ -64,19 +73,28 @@ export default {
   data() {
     return {
       treeData: [],
+      searchData: [],
       defaultProps: {
         children: 'children',
         label: 'name'
       },
       defaultExpandAll: true,
       refreshTree: true,
-      treeAllChecked: false
+      treeAllChecked: false,
+      searchValue: ''
     }
   },
   async created() {
     await this.loadTreeData()
   },
   methods: {
+    searchTree() {
+      if(this.searchValue){
+        this.searchData = this.$treeTable.recursionSearch(['name'], this.$common.copyNew(this.treeData), this.searchValue, false)
+      }else{
+        this.searchData = this.treeData
+      }
+    },
     doExpand() {
       this.refreshTree = false
       this.defaultExpandAll = !this.defaultExpandAll
@@ -86,6 +104,7 @@ export default {
       if(this.treeData.length == 0){
         await this.$get(this.url, this.params).then((res) => {
           this.treeData = res.data.list
+          this.searchData = this.treeData
         })
       }
     },
@@ -99,6 +118,7 @@ export default {
         selectMenus.push(checkedNodes[i].id)
       }
       this.$emit('update:select-values', selectMenus.join(','))
+      this.$emit('check-change', selectMenus.join(','))
     },
     nodeClick(param1, param2, param3){
       this.$emit('node-click', param1, param2, param3)
diff --git a/magic-boot-ui/src/scripts/treeTable.js b/magic-boot-ui/src/scripts/treeTable.js
index a6a2768..22371d8 100644
--- a/magic-boot-ui/src/scripts/treeTable.js
+++ b/magic-boot-ui/src/scripts/treeTable.js
@@ -61,27 +61,29 @@ treeTable.deleteEmptyChildren = (children) => {
   }
 }
 
-treeTable.recursionSearch = (fields, data, text) => {
+treeTable.recursionSearch = (fields, data, text, html) => {
   var searchData = []
   for(var i in data){
     var treeNode = data[i]
     var children = treeNode.children
     if(children && children.length > 0){
-      var childrenSearch = treeTable.recursionSearch(fields, children, text)
+      var childrenSearch = treeTable.recursionSearch(fields, children, text, html)
       treeNode.children = childrenSearch && childrenSearch.length > 0 ? childrenSearch : treeNode.children
-      treeTable.treeNodeReplace(fields, searchData, treeNode, text, childrenSearch)
+      treeTable.treeNodeReplace(fields, searchData, treeNode, text, childrenSearch, html)
     }else{
-      treeTable.treeNodeReplace(fields, searchData, treeNode, text)
+      treeTable.treeNodeReplace(fields, searchData, treeNode, text, null, html)
     }
   }
   return searchData
 }
 
-treeTable.treeNodeReplace = (fields, searchData, treeNode, text, childrenSearch) => {
+treeTable.treeNodeReplace = (fields, searchData, treeNode, text, childrenSearch, html) => {
   var exist = false
   fields.forEach((f) => {
     if(treeNode[f] && treeNode[f].indexOf(text) != -1){
-      treeNode[f] = treeNode[f].replace(text, `<font color="#FAA353">${text}</font>`)
+      if(html){
+        treeNode[f] = treeNode[f].replace(text, `<font color="#FAA353">${text}</font>`)
+      }
       exist = true
     }
   })