bug

packages/grid/AppGridBlock/components/list.vue

@@ -217,8 +217,6 @@ export default {
     getTreeList() {
       this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
         if (res?.data) {
-          // this.treeObj.treeList = [res.data];
-          // this.info = res.data
           this.$nextTick(() => {
             this.$refs.tree.setCurrentKey(res.data.id)
           })

packages/grid/AppGridMap/components/list.vue

@@ -13,19 +13,19 @@
           </header>
           <div class="tree-div">
             <el-tree
-                :data="treeObj.treeList"
+              :data="treeObj.treeList"
-                :props="treeObj.defaultProps"
+              :props="treeObj.defaultProps"
-                @node-click="handleNodeClick"
+              @node-click="handleNodeClick"
-                node-key="id"
+              node-key="id"
-                ref="tree"
+              ref="tree"
-                :expand-on-click-node="false"
+              :expand-on-click-node="false"
-                :filter-node-method="filterNode"
+              :filter-node-method="filterNode"
-                default-expand-all
+              :default-expanded-keys="treeObj.defaultExpandedKeys"
-                highlight-current>
+              highlight-current>
               <template slot-scope="{node,data}">
-                <el-tooltip :content="node.label">
+                <!-- <el-tooltip :content="node.label"> -->
-                  <div class="el-tree-node__label" v-text="node.label"/>
+                <div class="el-tree-node__label" :title="node.label" v-text="node.label"/>
-                </el-tooltip>
+                <!-- </el-tooltip> -->
               </template>
             </el-tree>
           </div>
@@ -61,7 +61,7 @@ export default {
       treeObj: {
         treeList: [],
         defaultProps: {
-          children: "girdList",
+          children: "children",
           label: "girdName",
         },
         defaultExpandedKeys: [],
@@ -88,9 +88,7 @@ export default {
   },
   created() {
     this.dict.load("onlineStatus")
-    this.getTreeList().then(() => {
+    this.getTreeList()
-      this.getLeafNodes()
-    })
   },
   watch: {
     filterText(val) {
@@ -103,15 +101,29 @@ export default {
       return data.girdName.indexOf(value) !== -1;
     },
     getTreeList() {
-      return this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
-        if (res.code == 0) {
+        if (res?.data) {
-          this.treeObj.treeList = res.data;
-
           this.$nextTick(() => {
-            res.data.length && this.$refs.tree.setCurrentKey(res.data[0].id)
+            this.$refs.tree.setCurrentKey(res.data.id)
           })
+
+          this.treeObj.treeList = res.data.filter(e => !e.parentGirdId)
+          const parentGirdId = this.treeObj.treeList[0].id
+
+          this.treeObj.treeList.map(p => this.addChild(p, res.data.map(v => {
+            if (v.id === parentGirdId) {
+              this.treeObj.defaultExpandedKeys.push(v.id)
+            }
+
+            return {
+              ...v
+            }
+          }), {
+            parent: 'parentGirdId'
+          }))
+          this.getLeafNodes()
         }
-      })
+      });
     },
 
     onMapInit() {