vue2-client 1.9.173 → 1.9.174

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.173",
+  "version": "1.9.174",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XTree/XTreePro.vue

@@ -6,7 +6,10 @@
           <span>{{ config.title }}</span>
         </a-col>
         <a-col span="1" :offset="2" v-if="treeDisplaySwitch">
-          <a-icon :type="treeDisplayConfig.showTree? 'caret-down':'caret-left'" :style="{color: treeDisplayConfig.buttonColor}" @click="treeDisplayConfig.showTree=!treeDisplayConfig.showTree"/>
+          <a-icon
+            :type="treeDisplayConfig.showTree? 'caret-down':'caret-left'"
+            :style="{color: treeDisplayConfig.buttonColor}"
+            @click="treeDisplayConfig.showTree=!treeDisplayConfig.showTree"/>
         </a-col>
       </a-row>
     </div>
@@ -206,6 +209,7 @@ export default {
   methods: {
     // 节点展开暂存
     nodeExpand (node) {
+      console.log('====需要展开节点', node, this.replaceFields.key)
       if (this.expandedKeys.includes(node[this.replaceFields.key])) {
         this.expandedKeys = this.expandedKeys.filter(item => item !== node[this.replaceFields.key])
       } else {
@@ -252,9 +256,13 @@ export default {
     onChange: debounce(function (e) {
       this.$refs.veTree.filter(e.target.value)
     }, 150),
-    filterNode (value, data) {
+    filterNode (value, data, node) {
       if (!value) return true
-      return data.label.indexOf(value) !== -1
+      if (data.label.indexOf(value) !== -1) {
+        this.nodeExpand(node.data)
+        return true
+      }
+      return false
     },
     nodeItemClick (e) {
       this.selectedNode = e
@@ -332,6 +340,11 @@ export default {
       }), this.serviceName, this.env === 'dev').then(res => {
         this.localTreeData = res
         this.deepestNodes = this.getDeepestNodes(this.localTreeData)
+        this.$nextTick(() => {
+          if (this.searchInput) {
+            this.$refs.veTree.filter(this.searchInput)
+          }
+        })
       }).catch(e => {
         this.$message.error('获取数据失败：' + e)
       }).finally(() => {
@@ -379,12 +392,15 @@ export default {
   background-color: #E0E5EB;
   border-radius: 8px 8px 0 0;
 }
+
 .selected {
   font-weight: bold; /* 加粗字体 */
   color: #1890ff;
 }
-.row-search{
+
+.row-search {
   background-color: #E0E5EB;
+
   .content-search {
     background-color: rgb(224, 229, 235);
     height: 2.6rem;
@@ -396,6 +412,7 @@ export default {
     margin: auto 0;
   }
 }
+
 .active-button {
   border-color: @primary-color !important;
   color: @primary-color !important;