From 33fb5e4243bf8ccc57849a111a1c0e7820a19504 Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Wed, 1 Feb 2023 09:08:17 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90-?=
 =?UTF-8?q?=E6=A0=91=E8=A1=A8bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/template/vm/go/logic.template     | 3 ++-
 resource/template/vm/vue/tree-vue.template | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

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'"
               ><el-icon><ele-EditPen /></el-icon>修改</el-button>
               <el-button
@@ -399,6 +399,7 @@ import {
 } from "/@/views/{{$plugin}}{{.table.ModuleName}}/{{$businessName}}/list/component/model"
 import {{$plugin}}{{if ne $plugin ""}}{{.apiVersion|replace "/" "_"|CaseCamel}}{{else}}{{.apiVersion|replace "/" "_"|CaseCamelLower}}{{end}}{{.table.ModuleName|CaseCamel}}{{.table.ClassName}}Edit from "/@/views/{{$plugin}}{{.table.ModuleName}}/{{$businessName}}/list/component/edit.vue"
 import {{$plugin}}{{if ne $plugin ""}}{{.apiVersion|replace "/" "_"|CaseCamel}}{{else}}{{.apiVersion|replace "/" "_"|CaseCamelLower}}{{end}}{{.table.ModuleName|CaseCamel}}{{.table.ClassName}}Detail from "/@/views/{{$plugin}}{{.table.ModuleName}}/{{$businessName}}/list/component/detail.vue"
+import _ from 'lodash'
 export default defineComponent({
     name: "{{$plugin}}{{if ne $plugin ""}}{{.apiVersion|replace "/" "_"|CaseCamel}}{{else}}{{.apiVersion|replace "/" "_"|CaseCamelLower}}{{end}}{{.table.ModuleName|CaseCamel}}{{.table.ClassName}}List",
     components:{
@@ -452,6 +453,7 @@ export default defineComponent({
         {{end}}
         {{end}}
         {{end}}
+        const dataList = ref<Array<{{$.table.ClassName}}TableColumns>>([])
         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
             }