diff --git a/packages/grid/AppGridBlock/components/add.vue b/packages/grid/AppGridBlock/components/add.vue
index 6bd7ea5d..d7bb0b64 100644
--- a/packages/grid/AppGridBlock/components/add.vue
+++ b/packages/grid/AppGridBlock/components/add.vue
@@ -17,10 +17,10 @@
-
+
-
+
@@ -185,13 +185,15 @@ export default {
girdMemberManageList: res.data.girdMemberManageList ? res.data.girdMemberManageList.map(v => {
return {
...v,
- id: v.wxUserId
+ id: v.wxUserId,
+ avatar: v.photo
}
}) : [],
girdMemberList: res.data.girdMemberList ? res.data.girdMemberList.map(v => {
return {
...v,
- id: v.wxUserId
+ id: v.wxUserId,
+ avatar: v.photo
}
}) : []
};
diff --git a/packages/grid/AppGridBlock/components/list.vue b/packages/grid/AppGridBlock/components/list.vue
index ff999eab..440227c4 100644
--- a/packages/grid/AppGridBlock/components/list.vue
+++ b/packages/grid/AppGridBlock/components/list.vue
@@ -13,7 +13,6 @@
node-key="id"
ref="tree"
:filter-node-method="filterNode"
- default-expand-all
highlight-current>
@@ -153,7 +152,7 @@ export default {
treeObj: {
treeList: [],
defaultProps: {
- children: "girdList",
+ children: "children",
label: "girdName",
},
defaultExpandedKeys: [],
@@ -216,13 +215,28 @@ export default {
this.getList();
},
getTreeList() {
- this.instance.post("/app/appgirdinfo/listAllByTop").then(res => {
+ this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
if (res?.data) {
- this.treeObj.treeList = [res.data];
- this.info = res.data
+ // this.treeObj.treeList = [res.data];
+ // this.info = res.data
this.$nextTick(() => {
- this.$refs.tree.setCurrentKey(this.info.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.defaultExpandedKeys.push(v.id)
+ }
+
+ return {
+ ...v
+ }
+ }), {
+ parent: 'parentGirdId'
+ }))
}
});
},