diff --git a/resource/template/vm/go/logic.template b/resource/template/vm/go/logic.template index d9ec78c..dbb17c6 100644 --- a/resource/template/vm/go/logic.template +++ b/resource/template/vm/go/logic.template @@ -298,9 +298,10 @@ func (s *s{{.table.ClassName}})GetChildrenIds(ctx context.Context,ids []{{$.tabl list[k] = gconv.Map(info) } for _, id := range ids { + returnIds = append(returnIds,id) children := libUtils.FindSonByParentId(list, id, "{{.table.TreeParentCode}}", "{{.table.TreeCode}}") for _, cid := range children { - returnIds = append(ids, cid["{{.table.TreeCode}}"].({{$.table.PkColumn.GoType}})) + returnIds = append(returnIds, cid["{{.table.TreeCode}}"].({{$.table.PkColumn.GoType}})) } } }) diff --git a/resource/template/vm/vue/tree-vue.template b/resource/template/vm/vue/tree-vue.template index 5307f61..4277990 100644 --- a/resource/template/vm/vue/tree-vue.template +++ b/resource/template/vm/vue/tree-vue.template @@ -288,7 +288,7 @@ size="small" type="primary" link - icon="el-icon-edit" + @click="handleUpdate(scope.row)" v-auth="'{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/edit'" >修改 >([]) const state = reactive<{{.table.ClassName}}TableDataState>({ {{.table.PkColumn.HtmlField}}s:[], tableData: { @@ -532,10 +534,12 @@ export default defineComponent({ {{end}} }) }) + dataList.value = _.clone(res.data.list) list = proxy.handleTree(res.data.list||[], "{{$treeCode}}", "{{$treeParentCode}}"); state.tableData.data = list; }) {{else}} + dataList.value = _.clone(res.data.list) list = proxy.handleTree(res.data.list||[], "{{$treeCode}}", "{{$treeParentCode}}"); state.tableData.data = list; {{end}} @@ -587,7 +591,7 @@ export default defineComponent({ } const handleUpdate = (row: {{$.table.ClassName}}TableColumns) => { if(!row){ - row = state.tableData.data.find((item:{{$.table.ClassName}}TableColumns)=>{ + row = dataList.value.find((item:{{$.table.ClassName}}TableColumns)=>{ return item.{{.table.PkColumn.HtmlField}} ===state.{{.table.PkColumn.HtmlField}}s[0] }) as {{$.table.ClassName}}TableColumns }