Merge pull request #638 from veops/dev_ui_ipam

fix(ui): ipam - filter search value error
veops · Nov 12, 2024 · 6f13321 · 6f13321
2 parents 03fdf5c + 5fa18ee
commit 6f13321
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/cmdb-ui/src/components/CMDBFilterComp/expression.vue b/cmdb-ui/src/components/CMDBFilterComp/expression.vue
@@ -139,9 +139,9 @@
         :normalizer="
           (node) => {
             return {
-              id: String(node[0] || ''),
-              label: node[1] ? node[1].label || node[0] : node[0],
-              children: node.children && node.children.length ? node.children : undefined,
+              id: node.id,
+              label: node.label,
+              children: node.children,
             }
           }
         "
@@ -352,8 +352,12 @@ export default {
     },
     getChoiceValueByProperty(property) {
       const _find = this.canSearchPreferenceAttrList.find((item) => item.name === property)
-      if (_find) {
-        return _find.choice_value
+      if (_find?.choice_value?.length) {
+        return _find.choice_value.map((node) => ({
+          id: String(node?.[0] ?? ''),
+          label: node?.[1]?.label || node?.[0] || '',
+          children: node?.children?.length ? node.children : undefined
+        }))
       }
       return []
     },

diff --git a/cmdb-ui/src/modules/cmdb/views/ipam/components/ipamTree.vue b/cmdb-ui/src/modules/cmdb/views/ipam/components/ipamTree.vue
@@ -9,6 +9,7 @@
     <div class="ipam-tree-main">
       <a-tree
         v-if="treeData.length"
+        autoExpandParent
         :treeData="filterTreeData"
         :selectedKeys="treeKey ? [treeKey] : []"
         :defaultExpandedKeys="treeKey ? [treeKey] : []"
@@ -238,7 +239,7 @@ export default {
         }
       }
 
-      & > li:first-child {
+      .ipam-tree-node-all {
         .ant-tree-switcher {
           display: none;
         }

diff --git a/cmdb-ui/src/modules/cmdb/views/ipam/index.vue b/cmdb-ui/src/modules/cmdb/views/ipam/index.vue
@@ -185,6 +185,7 @@ export default {
         showCatalogBtn: rootShowCatalogBtn,
         showSubnetBtn: rootShowSubnetBtn,
         parentId: '',
+        class: 'ipam-tree-node-all'
       })
 
       this.treeData = treeData