Merge branch 'dev' into build

# Conflicts:
#	project/oms/apps/develop/AppDeployCustom/add.vue

packages/extra/AppCodeGeneration/components/Add.vue

@@ -140,15 +140,15 @@
           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-expand-all
-              @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>
@@ -192,7 +192,7 @@ export default {
       treeObj: {
         treeList: [],
         defaultProps: {
-          children: "girdList",
+          children: "children",
           label: "girdName",
         },
         checkedKeys: [],
@@ -223,12 +223,20 @@ export default {
   },
   methods: {
     getGridList() {
-      this.instance.post(`/app/appgirdinfo/listAll`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
         if (res.code == 0) {
-          this.treeObj.treeList = this.format(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'
+          }))
         }
       })
     },