From 802d6f6cd3c842a29ed5d8dbd901fc9e1b485673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 12 Aug 2022 16:00:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B5=84=E4=BA=A7=E6=A0=91=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=85=B3=E9=97=AD=E6=90=9C=E7=B4=A2=EF=BC=9B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=90=9C=E7=B4=A2url=E6=90=BA=E5=B8=A6=E7=9A=84?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetSelect/index.vue          |  2 ++
 src/components/AutoDataZTree/index.vue        |  4 +--
 .../DataZTree/components/ZTree/index.vue      | 30 ++++++++++++++-----
 src/views/assets/Asset/AssetList.vue          |  2 ++
 src/views/ops/CommandExecution.vue            | 14 +++++++--
 5 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue
index b7ba67f14..870d20e76 100644
--- a/src/components/AssetSelect/index.vue
+++ b/src/components/AssetSelect/index.vue
@@ -75,6 +75,8 @@ export default {
         showMenu: false,
         showRefresh: true,
         showAssets: false,
+        showSearch: true,
+        customTreeHeader: true,
         url: '/api/v1/assets/assets/?fields_size=mini',
         nodeUrl: '/api/v1/assets/nodes/',
         // ?assets=0不显示资产. =1显示资产
diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue
index 8c9ef54d5..929fbd186 100644
--- a/src/components/AutoDataZTree/index.vue
+++ b/src/components/AutoDataZTree/index.vue
@@ -38,9 +38,9 @@ export default {
         showCreate: true,
         showDelete: true,
         showUpdate: true,
-        showSearch: true,
+        showSearch: false,
         // 自定义header
-        customTreeHeader: true,
+        customTreeHeader: false,
         customTreeHeaderName: this.$t('assets.Asset'),
         async: {
           enable: true,
diff --git a/src/components/DataZTree/components/ZTree/index.vue b/src/components/DataZTree/components/ZTree/index.vue
index eaac60329..b21dfb853 100644
--- a/src/components/DataZTree/components/ZTree/index.vue
+++ b/src/components/DataZTree/components/ZTree/index.vue
@@ -32,16 +32,19 @@
         {{ this.$t('common.tree.Loading') }}...
       </ul>
       <ul v-show="!loading" :id="iZTreeID" class="ztree" />
+      <div v-if="treeSetting.treeUrl===''" class="tree-empty">
+        {{ this.$t('common.tree.Empty') }}
+      </div>
     </div>
     <div v-else class="treebox">
       <ul v-show="loading" class="ztree">
         {{ this.$t('common.tree.Loading') }}...
       </ul>
       <ul v-show="!loading" :id="iZTreeID" class="ztree" />
-    </div>
-    <div v-if="treeSetting.treeUrl===''">
-      {{ this.$t('common.tree.Empty') }}
-      <a id="tree-refresh"><i class="fa fa-refresh" /></a>
+      <div v-if="treeSetting.treeUrl===''" class="tree-empty">
+        {{ this.$t('common.tree.Empty') }}
+        <a id="tree-refresh"><i class="fa fa-refresh" /></a>
+      </div>
     </div>
     <div :id="iRMenuID" class="rMenu">
       <ul class="dropdown-menu menu-actions">
@@ -189,7 +192,11 @@ export default {
       searchInput.oninput = _.debounce((e) => {
         e.stopPropagation()
         const value = e.target.value || ''
-        this.filterAssetsServer(value)
+        if (this.treeSetting.async.enable) {
+          this.filterAssetsServer(value)
+        } else {
+          this.filterTree(value)
+        }
       }, 600)
     },
     getCheckedNodes: function() {
@@ -230,7 +237,8 @@ export default {
         return groups[group]
       })
     },
-    filterTree(keyword, tree) {
+    filterTree(keyword, tree = this.zTree) {
+      if (!this.zTree) return
       const searchNode = tree.getNodesByFilter((node) => node.id === 'search')
       if (searchNode) tree.removeNode(searchNode[0])
       const nodes = tree.transformToArray(tree.getNodes())
@@ -301,7 +309,12 @@ export default {
         this.zTree.hideNodes(treeNodes)
       }
 
-      const searchUrl = `/api/v1/assets/nodes/children/tree/?search=${keyword}&all=all`
+      let treeUrl = this.treeSetting.treeUrl
+      const filterField = treeUrl.includes('?') ? `&search=${keyword}` : `?search=${keyword}`
+      if (treeUrl.indexOf('assets/nodes/children/tree') > -1) {
+        treeUrl = treeUrl + '&all=all'
+      }
+      const searchUrl = `${treeUrl}${filterField}`
       this.$axios.get(searchUrl).then(nodes => {
         let name = this.$t('common.Search')
         const assetsAmount = nodes.length
@@ -491,4 +504,7 @@ export default {
       }
     }
   }
+  .tree-empty {
+    margin-left: 4px;
+  }
 </style>
diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue
index dfb20225b..2d54ed606 100644
--- a/src/views/assets/Asset/AssetList.vue
+++ b/src/views/assets/Asset/AssetList.vue
@@ -48,6 +48,8 @@ export default {
         showUpdate: true,
         showDelete: true,
         hasRightMenu: true,
+        showSearch: true,
+        customTreeHeader: true,
         url: '/api/v1/assets/assets/',
         nodeUrl: '/api/v1/assets/nodes/',
         // ?assets=0不显示资产. =1显示资产
diff --git a/src/views/ops/CommandExecution.vue b/src/views/ops/CommandExecution.vue
index e7b25b0b0..785fbd536 100644
--- a/src/views/ops/CommandExecution.vue
+++ b/src/views/ops/CommandExecution.vue
@@ -2,7 +2,11 @@
   <Page>
     <el-collapse-transition>
       <div style="display: flex;justify-items: center; flex-wrap: nowrap;justify-content:space-between;">
-        <div v-show="iShowTree" :style="iShowTree?('width:250px;'):('width:0;')" class="transition-box">
+        <div
+          v-show="iShowTree"
+          :style="{width: iShowTree?'20%': 0}"
+          class="transition-box tree-box"
+        >
           <AutoDataZTree
             ref="AutoDataZTree"
             :key="DataZTree"
@@ -10,7 +14,7 @@
             class="auto-data-ztree"
           />
         </div>
-        <div :style="iShowTree?('display: flex;width: calc(100% - 250px);'):('display: flex;width:100%;')">
+        <div :style="iShowTree?('display: flex;width: 80%;'):('display: flex;width:100%;')">
           <div class="mini">
             <div style="display:block" class="mini-button" @click="iShowTree=!iShowTree">
               <i v-show="iShowTree" class="fa fa-angle-left fa-x" /><i v-show="!iShowTree" class="fa fa-angle-right fa-x" />
@@ -70,6 +74,8 @@ export default {
         treeUrl: '',
         showRefresh: true,
         showMenu: false,
+        showSearch: true,
+        customTreeHeader: true,
         check: {
           enable: true
         },
@@ -276,4 +282,8 @@ export default {
     height: 100px;
     border: 1px solid #eee;
   }
+  .tree-box {
+    margin-right: 2px;
+    border: 1px solid #e0e0e0;
+  }
 </style>