BUG 30982

packages/extra/AppCodeGeneration/components/Add.vue

@@ -135,20 +135,21 @@
           title="选择网格"
           :visible.sync="showGrid"
           :destroyOnClose="true"
+          @open="getGridList"
           @close="showGrid = false"
           @onConfirm="getCheckedTree"
           width="720px">
         <div class="grid">
           <el-tree
-            :data="treeObj.treeList"
-            :props="treeObj.defaultProps"
-            node-key="id"
-            ref="tree"
-            :check-strictly="true"
-            show-checkbox
-            :default-checked-keys="treeObj.checkedKeys"
-            :default-expanded-keys="treeObj.checkedKeys"
-            @check="onCheckChange">
+              :data="treeObj.treeList"
+              :props="treeObj.defaultProps"
+              node-key="id"
+              ref="tree"
+              :check-strictly="true"
+              show-checkbox
+              :default-checked-keys="treeObj.checkedKeys"
+              :default-expanded-keys="treeObj.checkedKeys"
+              @check="onCheckChange">
           </el-tree>
         </div>
       </ai-dialog>
@@ -215,7 +216,6 @@ export default {
     }
   },
   created() {
-    this.getGridList()
     this.getFormData()
     if (this.params.id) {
       this.getDetail()
@@ -224,23 +224,14 @@ export default {
   methods: {
     getGridList() {
       this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
-        if (res.code == 0) {
+        if (res?.data) {
           if (this.formData.girdId) {
             this.$set(this.treeObj, 'checkedKeys', [this.formData.girdId])
           }
-          this.treeObj.treeList = res.data.filter(e => !e.parentGirdId)
-          this.treeObj.treeList.map(p => this.addChild(p, res.data.map(v => {
-
-            return {
-              ...v
-            }
-          }), {
-            parent: 'parentGirdId'
-          }))
+          this.treeObj.treeList = this.$arr2tree(res.data, {parent: "parentGirdId"})
         }
       })
     },
-
     onChange(e) {
       this.formData.resident_id = e.id
       Object.keys(this.formData).forEach(item => {