Merge pull request TencentBlueKing#2647 from lhzzforever/dev/develop_ci

fix: 修复全平台ip选择器不同拓扑下相同类型的子集数据会被去重遗漏
Canway-shiisa · May 9, 2024 · 989d0d1 · 989d0d1
2 parents aa48d9c + 414bd30
commit 989d0d1
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 26 deletions.
diff --git a/frontend/src/components/choose-ip/grade.vue b/frontend/src/components/choose-ip/grade.vue
@@ -348,9 +348,15 @@
         const hasNode = {};
         const treeData = [...this.treeData];
         const list = treeData.reduce((curr, next) => {
-          // eslint-disable-next-line no-unused-expressions
-          hasNode[`${next.name}&${next.id}`] ? '' : hasNode[`${next.name}&${next.id}`] = true && curr.push(next);
-          // hasNode[next.name] ? '' : hasNode[next.name] = true && curr.push(next);
+          if (next.level > 0 && next.parentChain && next.parentChain.length > 0) {
+            const chainContent = next.parentChain.map((v) => `${v.id}&${v.name}&${v.type}`).join();
+            // eslint-disable-next-line no-unused-expressions
+            hasNode[`${next.id}&${next.name}&${chainContent}`] ? ''
+            : hasNode[`${next.id}&${next.name}&${chainContent}`] = true && curr.push(next);
+          } else {
+            // eslint-disable-next-line no-unused-expressions
+            hasNode[`${next.name}&${next.id}`] ? '' : hasNode[`${next.name}&${next.id}`] = true && curr.push(next);
+          }
           return curr;
         }, []);
         return list;
@@ -422,7 +428,8 @@
 
       handleOnExpanded (index, expanded) {
         window.changeAlert = true;
-        if (!expanded && this.treeData[index + 2].type === 'search-empty') {
+        const searchEmptyData = this.treeData[index + 2];
+        if (!expanded && searchEmptyData && searchEmptyData.type === 'search-empty') {
           this.treeData.splice(index + 2, 1);
         }
       },
@@ -1167,12 +1174,19 @@
 
       removeAsyncNode () {
         // 需要过滤掉name为空以及反复切换选中造成的重复数据的节点
-        const obj = {};
-        const treeList = _.cloneDeep(this.treeData.filter(item => item.name));
-        this.treeData = treeList.reduce((pre, item) => {
-          // eslint-disable-next-line no-unused-expressions
-          obj[`${item.id}${item.name}`] ? '' : obj[`${item.id}${item.name}`] = true && pre.push(item);
-          return pre;
+        const hasNode = {};
+        const treeList = _.cloneDeep(this.treeData.filter(item => item.name !== ''));
+        this.treeData = treeList.reduce((curr, next) => {
+          if (next.level > 0 && next.parentChain && next.parentChain.length > 0) {
+            const chainContent = next.parentChain.map((v) => `${v.id}&${v.name}&${v.type}`).join();
+            // eslint-disable-next-line no-unused-expressions
+            hasNode[`${next.id}&${next.name}&${chainContent}`] ? ''
+            : hasNode[`${next.id}&${next.name}&${chainContent}`] = true && curr.push(next);
+          } else {
+            // eslint-disable-next-line no-unused-expressions
+            hasNode[`${next.name}&${next.id}`] ? '' : hasNode[`${next.name}&${next.id}`] = true && curr.push(next);
+          }
+          return curr;
         }, []);
         const index = this.treeData.findIndex(item => item.type === 'async');
         if (index > -1) this.treeData.splice(index, 1);

diff --git a/frontend/src/components/choose-ip/grade/index.vue b/frontend/src/components/choose-ip/grade/index.vue
@@ -386,8 +386,15 @@
         const hasNode = {};
         const treeData = [...this.treeData];
         const list = treeData.reduce((curr, next) => {
-          // eslint-disable-next-line no-unused-expressions
-          hasNode[`${next.name}&${next.id}`] ? '' : hasNode[`${next.name}&${next.id}`] = true && curr.push(next);
+          if (next.level > 0 && next.parentChain && next.parentChain.length > 0) {
+            const chainContent = next.parentChain.map((v) => `${v.id}&${v.name}&${v.type}`).join();
+            // eslint-disable-next-line no-unused-expressions
+            hasNode[`${next.id}&${next.name}&${chainContent}`] ? ''
+            : hasNode[`${next.id}&${next.name}&${chainContent}`] = true && curr.push(next);
+          } else {
+            // eslint-disable-next-line no-unused-expressions
+            hasNode[`${next.name}&${next.id}`] ? '' : hasNode[`${next.name}&${next.id}`] = true && curr.push(next);
+          }
           return curr;
         }, []);
         return list;
@@ -603,7 +610,8 @@
 
       handleOnExpanded (index, expanded) {
         window.changeAlert = true;
-        if (!expanded && this.treeData[index + 2].type === 'search-empty') {
+        const searchEmptyData = this.treeData[index + 2];
+        if (!expanded && searchEmptyData && searchEmptyData.type === 'search-empty') {
           this.treeData.splice(index + 2, 1);
         }
       },
@@ -1681,14 +1689,21 @@
 
       removeAsyncNode () {
         // 需要过滤掉name为空以及反复切换选中造成的重复数据的节点
-        const obj = {};
-        const treeList = _.cloneDeep(this.treeData.filter(item => item.name));
-        this.treeData = treeList.reduce((pre, item) => {
-          // eslint-disable-next-line no-unused-expressions
-          obj[`${item.id}${item.name}`] ? '' : obj[`${item.id}${item.name}`] = true && pre.push(item);
-          return pre;
+        const hasNode = {};
+        const treeList = _.cloneDeep(this.treeData.filter(item => item.name !== ''));
+        this.treeData = treeList.reduce((curr, next) => {
+          if (next.level > 0 && next.parentChain && next.parentChain.length > 0) {
+            const chainContent = next.parentChain.map((v) => `${v.id}&${v.name}&${v.type}`).join();
+            // eslint-disable-next-line no-unused-expressions
+            hasNode[`${next.id}&${next.name}&${chainContent}`] ? ''
+            : hasNode[`${next.id}&${next.name}&${chainContent}`] = true && curr.push(next);
+          } else {
+            // eslint-disable-next-line no-unused-expressions
+            hasNode[`${next.name}&${next.id}`] ? '' : hasNode[`${next.name}&${next.id}`] = true && curr.push(next);
+          }
+          return curr;
         }, []);
-        const index = this.treeData.findIndex((item) => item.type === 'async');
+        const index = this.treeData.findIndex(item => item.type === 'async');
         if (index > -1) this.treeData.splice(index, 1);
       },
 

diff --git a/frontend/src/components/choose-ip/index.vue b/frontend/src/components/choose-ip/index.vue
@@ -369,7 +369,6 @@
       renderTopologyData () {
         const hasNode = {};
         const treeData = [...this.treeData];
-        console.log(treeData, '去重前的数据');
         const list = treeData.reduce((curr, next) => {
           if (next.level > 0 && next.parentChain && next.parentChain.length > 0) {
             const chainContent = next.parentChain.map((v) => `${v.id}&${v.name}&${v.type}`).join();
@@ -382,7 +381,6 @@
           }
           return curr;
         }, []);
-        console.log(list, '去重后的数据');
         return list;
       },
       getSystemParams () {
@@ -462,7 +460,8 @@
 
       handleOnExpanded (index, expanded) {
         window.changeAlert = true;
-        if (!expanded && this.treeData[index + 2] && this.treeData[index + 2].type === 'search-empty') {
+        const searchEmptyData = this.treeData[index + 2];
+        if (!expanded && searchEmptyData && searchEmptyData.type === 'search-empty') {
           this.treeData.splice(index + 2, 1);
         }
       },
@@ -1299,11 +1298,9 @@
         // 需要过滤掉name为空以及反复切换选中造成的重复数据的节点
         const hasNode = {};
         const treeList = _.cloneDeep(this.treeData.filter(item => item.name !== ''));
-        console.log(treeList, 'remove前');
         this.treeData = treeList.reduce((curr, next) => {
           if (next.level > 0 && next.parentChain && next.parentChain.length > 0) {
             const chainContent = next.parentChain.map((v) => `${v.id}&${v.name}&${v.type}`).join();
-            console.log(chainContent, '父级数据');
             // eslint-disable-next-line no-unused-expressions
             hasNode[`${next.id}&${next.name}&${chainContent}`] ? ''
             : hasNode[`${next.id}&${next.name}&${chainContent}`] = true && curr.push(next);
@@ -1313,7 +1310,6 @@
           }
           return curr;
         }, []);
-        console.log(this.treeData, 'remove前后');
         const index = this.treeData.findIndex(item => item.type === 'async');
         if (index > -1) this.treeData.splice(index, 1);
       },