From 3a3e10f0ab42a850ed90108cfdd8d775414e5cd4 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Thu, 17 Nov 2022 10:50:41 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=20=E4=BD=93=E9=AA=8C=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20#1461?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/package.json                     |  2 +-
 .../src/components/ip-selector/entry.vue      |  4 ++--
 .../index.vue => collapse-box.vue}            | 20 ++++++++++++++++---
 .../views-box/components/search-host.vue      |  6 +++---
 .../ip-selector/views-box/dynamic-group.vue   | 10 ++++++----
 .../components/ip-selector/views-box/host.vue | 10 ++++++----
 .../ip-selector/views-box/index.vue           |  8 ++++----
 .../components/ip-selector/views-box/node.vue | 10 ++++++----
 8 files changed, 45 insertions(+), 25 deletions(-)
 rename src/frontend/src/components/ip-selector/views-box/components/{collapse-box/index.vue => collapse-box.vue} (77%)

diff --git a/src/frontend/package.json b/src/frontend/package.json
index fa1dcc3e53..6309901647 100644
--- a/src/frontend/package.json
+++ b/src/frontend/package.json
@@ -19,7 +19,7 @@
     "@vue/composition-api": "^1.5.0",
     "ace-builds": "^1.13.0",
     "axios": "^0.27.2",
-    "bk-magic-vue": "2.5.3-beta.4",
+    "bk-magic-vue": "2.5.3-beta.5",
     "core-js": "^3.26.1",
     "cron-parser-custom": "^2.13.0",
     "diff": "^5.0.0",
diff --git a/src/frontend/src/components/ip-selector/entry.vue b/src/frontend/src/components/ip-selector/entry.vue
index 6b056fb511..008b370d6f 100644
--- a/src/frontend/src/components/ip-selector/entry.vue
+++ b/src/frontend/src/components/ip-selector/entry.vue
@@ -187,8 +187,8 @@
         refresh () {
             viewsRef.value && viewsRef.value.refresh();
         },
-        collapseToggle () {
-            viewsRef.value && viewsRef.value.collapseToggle();
+        collapseToggle (toggle) {
+            viewsRef.value && viewsRef.value.collapseToggle(toggle);
         },
     });
 </script>
diff --git a/src/frontend/src/components/ip-selector/views-box/components/collapse-box/index.vue b/src/frontend/src/components/ip-selector/views-box/components/collapse-box.vue
similarity index 77%
rename from src/frontend/src/components/ip-selector/views-box/components/collapse-box/index.vue
rename to src/frontend/src/components/ip-selector/views-box/components/collapse-box.vue
index cc452a18d8..d7bc1593f6 100644
--- a/src/frontend/src/components/ip-selector/views-box/components/collapse-box/index.vue
+++ b/src/frontend/src/components/ip-selector/views-box/components/collapse-box.vue
@@ -24,7 +24,13 @@
 <script setup>
   import { ref } from 'vue';
 
-  import IpSelectorIcon from '../../../common/ip-selector-icon';
+  import IpSelectorIcon from '../../common/ip-selector-icon';
+
+  const props = defineProps({
+    name: {
+        type: String,
+    },
+  });
 
   const isShow = ref(true);
 
@@ -33,8 +39,16 @@
   };
 
   defineExpose({
-    toggle () {
-        handleToggle();
+    toggle (lastStatus) {
+        if (lastStatus === undefined) {
+            handleToggle();
+        } else if (lastStatus === false) {
+            isShow.value = false;
+        } else if (lastStatus === true) {
+            isShow.value = true;
+        } else if (Array.isArray(lastStatus) && props.name && lastStatus.includes(props.name)) {
+            isShow.value = true;
+        }
     },
   });
 </script>
diff --git a/src/frontend/src/components/ip-selector/views-box/components/search-host.vue b/src/frontend/src/components/ip-selector/views-box/components/search-host.vue
index 5368301d37..424382935d 100644
--- a/src/frontend/src/components/ip-selector/views-box/components/search-host.vue
+++ b/src/frontend/src/components/ip-selector/views-box/components/search-host.vue
@@ -88,7 +88,7 @@
         groupHostList,
     } from '../../utils';
 
-    import CollapseBox from './collapse-box/index.vue';
+    import CollapseBox from './collapse-box.vue';
 
     const props = defineProps({
         data: {
@@ -175,7 +175,7 @@
             isInnerChange = false;
             return;
         }
-        
+
         if (props.data.length > 0) {
             fetchData();
         } else {
@@ -238,7 +238,7 @@
     };
 </script>
 <style lang="postcss">
-    @import "../../styles/table.mixin.css";
+    @import url("../../styles/table.mixin.css");
 
     .ip-selector-view-host {
         @include table;
diff --git a/src/frontend/src/components/ip-selector/views-box/dynamic-group.vue b/src/frontend/src/components/ip-selector/views-box/dynamic-group.vue
index b8a05211d5..733c4c6284 100644
--- a/src/frontend/src/components/ip-selector/views-box/dynamic-group.vue
+++ b/src/frontend/src/components/ip-selector/views-box/dynamic-group.vue
@@ -2,7 +2,9 @@
     <div
         v-bkloading="{ isLoading }"
         class="ip-selector-view-dynamic-group">
-        <collapse-box ref="collapseBoxRef">
+        <collapse-box
+            ref="collapseBoxRef"
+            name="dynamicGroup">
             <template #title>
                 <span style="font-weight: bold;">【动态分组】</span>
                 <span>
@@ -113,7 +115,7 @@
     } from '../utils';
 
     import RenderAgentStatistics from './components/agent-statistics.vue';
-    import CollapseBox from './components/collapse-box/index.vue';
+    import CollapseBox from './components/collapse-box.vue';
     import HostList from './components/dynamic-group-host-list.vue';
 
     const props = defineProps({
@@ -266,8 +268,8 @@
         refresh () {
             fetchData();
         },
-        collapseToggle () {
-            collapseBoxRef.value.toggle();
+        collapseToggle (toggle) {
+            collapseBoxRef.value.toggle(toggle);
         },
     });
 </script>
diff --git a/src/frontend/src/components/ip-selector/views-box/host.vue b/src/frontend/src/components/ip-selector/views-box/host.vue
index cb2a6cd5eb..c85d8149d5 100644
--- a/src/frontend/src/components/ip-selector/views-box/host.vue
+++ b/src/frontend/src/components/ip-selector/views-box/host.vue
@@ -2,7 +2,9 @@
     <div
         v-bkloading="{ isLoading }"
         class="ip-selector-view-host">
-        <collapse-box ref="collapseBoxRef">
+        <collapse-box
+            ref="collapseBoxRef"
+            name="host">
             <template #title>
                 <span style="font-weight: bold;">【静态拓扑】</span>
                 <span>
@@ -95,7 +97,7 @@
         isAliveHost,
     } from '../utils';
 
-    import CollapseBox from './components/collapse-box/index.vue';
+    import CollapseBox from './components/collapse-box.vue';
 
     const props = defineProps({
         data: {
@@ -292,8 +294,8 @@
         refresh () {
             fetchData();
         },
-        collapseToggle () {
-            collapseBoxRef.value.toggle();
+        collapseToggle (toggle) {
+            collapseBoxRef.value.toggle(toggle);
         },
     });
 </script>
diff --git a/src/frontend/src/components/ip-selector/views-box/index.vue b/src/frontend/src/components/ip-selector/views-box/index.vue
index 4978e08db5..f11c0003e7 100644
--- a/src/frontend/src/components/ip-selector/views-box/index.vue
+++ b/src/frontend/src/components/ip-selector/views-box/index.vue
@@ -136,10 +136,10 @@
             nodeRef.value && nodeRef.value.refresh();
             dynamicGroupRef.value && dynamicGroupRef.value.refresh();
         },
-        collapseToggle () {
-            hostRef.value && hostRef.value.collapseToggle();
-            nodeRef.value && nodeRef.value.collapseToggle();
-            dynamicGroupRef.value && dynamicGroupRef.value.collapseToggle();
+        collapseToggle (toggle) {
+            hostRef.value && hostRef.value.collapseToggle(toggle);
+            nodeRef.value && nodeRef.value.collapseToggle(toggle);
+            dynamicGroupRef.value && dynamicGroupRef.value.collapseToggle(toggle);
         },
     });
 </script>
diff --git a/src/frontend/src/components/ip-selector/views-box/node.vue b/src/frontend/src/components/ip-selector/views-box/node.vue
index 84b32c7008..7c1267bc72 100644
--- a/src/frontend/src/components/ip-selector/views-box/node.vue
+++ b/src/frontend/src/components/ip-selector/views-box/node.vue
@@ -2,7 +2,9 @@
     <div
         v-bkloading="{ isLoading }"
         class="ip-selector-view-node">
-        <collapse-box ref="collapseBoxRef">
+        <collapse-box
+            ref="collapseBoxRef"
+            name="node">
             <template #title>
                 <span style="font-weight: bold;">【动态拓扑】</span>
                 <span>
@@ -114,7 +116,7 @@
     } from '../utils';
 
     import RenderAgentStatistics from './components/agent-statistics.vue';
-    import CollapseBox from './components/collapse-box/index.vue';
+    import CollapseBox from './components/collapse-box.vue';
     import NodeHostList from './components/node-host-list.vue';
 
     const props = defineProps({
@@ -288,8 +290,8 @@
         refresh () {
             fetchData();
         },
-        collapseToggle () {
-            collapseBoxRef.value.toggle();
+        collapseToggle (toggle) {
+            collapseBoxRef.value.toggle(toggle);
         },
     });
 </script>