From 61f73cbffe4d01fbc7172bfb552d2a1ecc4c3bb8 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Mon, 18 Nov 2024 21:27:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=A0=91=E5=BD=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=87=AA=E5=8A=A8=E5=8C=96=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/resource/package/web/view/form.vue.tpl |  11 +-
 .../resource/package/web/view/table.vue.tpl   |  12 +-
 .../plugin/server/api/api.go.template         |  23 +-
 .../plugin/server/model/model.go.template     |  20 +-
 .../plugin/server/service/service.go.template |  21 +-
 .../plugin/web/form/form.vue.template         |  65 +++-
 .../plugin/web/view/view.vue.template         | 291 +++++++++++-------
 7 files changed, 307 insertions(+), 136 deletions(-)

diff --git a/server/resource/package/web/view/form.vue.tpl b/server/resource/package/web/view/form.vue.tpl
index a49f27edac..33581c7ed5 100644
--- a/server/resource/package/web/view/form.vue.tpl
+++ b/server/resource/package/web/view/form.vue.tpl
@@ -169,7 +169,7 @@ getDataSourceFunc()
           <el-form-item label="父节点:" prop="parentID" >
               <el-tree-select
                   v-model="formData.parentID"
-                  :data="tableData"
+                  :data="[rootNode,...tableData]"
                   check-strictly
                   :render-after-expand="false"
                   :props="defaultProps"
@@ -253,6 +253,9 @@ import {
   {{- if .HasDataSource }}
     get{{.StructName}}DataSource,
   {{- end }}
+  {{- if .IsTree }}
+    get{{.StructName}}List,
+  {{- end }}
   create{{.StructName}},
   update{{.StructName}},
   find{{.StructName}}
@@ -300,6 +303,12 @@ const defaultProps = {
   value: "{{ .PrimaryField.FieldJson }}"
 }
 
+const rootNode = {
+  {{ .PrimaryField.FieldJson }}: 0,
+  {{ .TreeJson }}: '根节点',
+  children: []
+}
+
 const getTableData = async() => {
   const table = await get{{.StructName}}List()
   if (table.code === 0) {
diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl
index 2cf95a6db0..35dfd1b2b3 100644
--- a/server/resource/package/web/view/table.vue.tpl
+++ b/server/resource/package/web/view/table.vue.tpl
@@ -540,7 +540,7 @@ getDataSourceFunc()
         >
         <el-table-column type="selection" width="55" />
         {{ if .GvaModel }}
-        <el-table-column align="left" label="日期" prop="createdAt" {{- if .IsTree }}min-{{- end }}width="180">
+        <el-table-column align="left" label="日期" prop="createdAt" {{- if .IsTree }} min-{{- end }}width="180">
             <template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
         </el-table-column>
         {{ end }}
@@ -668,7 +668,7 @@ getDataSourceFunc()
             <el-form-item label="父节点:" prop="parentID" >
                 <el-tree-select
                     v-model="formData.parentID"
-                    :data="tableData"
+                    :data="[rootNode,...tableData]"
                     check-strictly
                     :render-after-expand="false"
                     :props="defaultProps"
@@ -757,7 +757,7 @@ getDataSourceFunc()
             <el-descriptions-item label="父节点">
                 <el-tree-select
                   v-model="detailFrom.parentID"
-                  :data="tableData"
+                  :data="[rootNode,...tableData]"
                   check-strictly
                   disabled
                   :render-after-expand="false"
@@ -1086,6 +1086,12 @@ const defaultProps = {
   value: "{{ .PrimaryField.FieldJson }}"
 }
 
+const rootNode = {
+  {{ .PrimaryField.FieldJson }}: 0,
+  {{ .TreeJson }}: '根节点',
+  children: []
+}
+
 // 查询
 const getTableData = async() => {
   const table = await get{{.StructName}}List()
diff --git a/server/resource/plugin/server/api/api.go.template b/server/resource/plugin/server/api/api.go.template
index edf4651801..bd6a5f27a6 100644
--- a/server/resource/plugin/server/api/api.go.template
+++ b/server/resource/plugin/server/api/api.go.template
@@ -5,7 +5,9 @@ import (
 	"{{.Module}}/global"
     "{{.Module}}/model/common/response"
     "{{.Module}}/plugin/{{.Package}}/model"
+    {{- if not .IsTree}}
     "{{.Module}}/plugin/{{.Package}}/model/request"
+    {{- end }}
     "github.com/gin-gonic/gin"
     "go.uber.org/zap"
     {{- if .AutoCreateResource}}
@@ -142,6 +144,25 @@ func (a *{{.Abbreviation}}) Find{{.StructName}}(c *gin.Context) {
     response.OkWithData(re{{.Abbreviation}}, c)
 }
 
+{{- if .IsTree }}
+// Get{{.StructName}}List 分页获取{{.Description}}列表
+// @Tags {{.StructName}}
+// @Summary 分页获取{{.Description}}列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "获取成功"
+// @Router /{{.Abbreviation}}/get{{.StructName}}List [get]
+func (a *{{.Abbreviation}}) Get{{.StructName}}List(c *gin.Context) {
+	list, err := service{{ .StructName }}.Get{{.StructName}}InfoList()
+	if err != nil {
+	    global.GVA_LOG.Error("获取失败!", zap.Error(err))
+        response.FailWithMessage("获取失败:" + err.Error(), c)
+        return
+    }
+    response.OkWithDetailed(list, "获取成功", c)
+}
+{{- else }}
 // Get{{.StructName}}List 分页获取{{.Description}}列表
 // @Tags {{.StructName}}
 // @Summary 分页获取{{.Description}}列表
@@ -171,6 +192,7 @@ func (a *{{.Abbreviation}}) Get{{.StructName}}List(c *gin.Context) {
         PageSize: pageInfo.PageSize,
     }, "获取成功", c)
 }
+{{- end }}
 
 {{- if .HasDataSource }}
 // Get{{.StructName}}DataSource 获取{{.StructName}}的数据源
@@ -197,7 +219,6 @@ func (a *{{.Abbreviation}}) Get{{.StructName}}DataSource(c *gin.Context) {
 // @Summary 不需要鉴权的{{.Description}}接口
 // @accept application/json
 // @Produce application/json
-// @Param data query request.{{.StructName}}Search true "分页获取{{.Description}}列表"
 // @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
 // @Router /{{.Abbreviation}}/get{{.StructName}}Public [get]
 func (a *{{.Abbreviation}}) Get{{.StructName}}Public(c *gin.Context) {
diff --git a/server/resource/plugin/server/model/model.go.template b/server/resource/plugin/server/model/model.go.template
index edf8a59cfa..503eb0a36e 100644
--- a/server/resource/plugin/server/model/model.go.template
+++ b/server/resource/plugin/server/model/model.go.template
@@ -72,8 +72,8 @@ type {{.StructName}} struct {
     DeletedBy  uint   `gorm:"column:deleted_by;comment:删除者"`
     {{- end }}
     {{- if .IsTree }}
-    Children   []{{.StructName}} `json:"children"`
-    ParentId   int             `json:"parentId" gorm:"column:parent_id;comment:父节点ID"`
+    Children   []{{.StructName}} `json:"children" gorm:"-"`     //子节点
+    ParentID   int             `json:"parentID" gorm:"column:parent_id;comment:父节点"`
     {{- end }}
     {{- end }}
 }
@@ -88,23 +88,23 @@ func ({{.StructName}}) TableName() string {
 
 {{ if .IsTree }}
 // GetChildren 实现TreeNode接口
-func ({{.StructName}}) GetChildren() []{{.StructName}} {
-    return {{.StructName}}.Children
+func (s {{.StructName}}) GetChildren() []{{.StructName}} {
+    return s.Children
 }
 
 // SetChildren 实现TreeNode接口
-func ({{.StructName}}) SetChildren(children []{{.StructName}}) {
-    {{.StructName}}.Children = children
+func (s {{.StructName}}) SetChildren(in *{{.StructName}},children {{.StructName}}) {
+	in.Children = append(in.Children, children)
 }
 
 // GetID 实现TreeNode接口
-func ({{.StructName}}) GetID() int {
-    return {{.StructName}}.ID
+func (s {{.StructName}}) GetID() int {
+    return int({{if not .GvaModel}}*{{- end }}s.{{.PrimaryField.FieldName}})
 }
 
 // GetParentID 实现TreeNode接口
-func ({{.StructName}}) GetParentID() int {
-    return {{.StructName}}.ParentId
+func (s {{.StructName}}) GetParentID() int {
+    return s.ParentID
 }
 {{ end }}
 
diff --git a/server/resource/plugin/server/service/service.go.template b/server/resource/plugin/server/service/service.go.template
index 4b1c814ea2..60f63bd6b4 100644
--- a/server/resource/plugin/server/service/service.go.template
+++ b/server/resource/plugin/server/service/service.go.template
@@ -60,10 +60,15 @@ import (
 {{- if not .OnlyTemplate }}
 	"{{.Module}}/global"
 	"{{.Module}}/plugin/{{.Package}}/model"
+	{{- if not .IsTree }}
     "{{.Module}}/plugin/{{.Package}}/model/request"
+    {{- end }}
     {{- if .AutoCreateResource }}
     "gorm.io/gorm"
     {{- end}}
+{{- if .IsTree }}
+    "{{.Module}}/utils"
+{{- end }}
 {{- end }}
 )
 
@@ -137,6 +142,20 @@ func (s *{{.Abbreviation}}) Get{{.StructName}}({{.PrimaryField.FieldJson}} strin
 	return
 }
 
+
+{{- if .IsTree }}
+// Get{{.StructName}}InfoList 分页获取{{.Description}}记录,Tree模式下不添加分页和搜索
+// Author [yourname](https://github.com/yourname)
+func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList() (list []model.{{.StructName}},err error) {
+    // 创建db
+	db := {{$db}}.Model(&model.{{.StructName}}{})
+    var {{.Abbreviation}}s []model.{{.StructName}}
+
+	err = db.Find(&{{.Abbreviation}}s).Error
+
+	return utils.BuildTree({{.Abbreviation}}s), err
+}
+{{- else }}
 // Get{{.StructName}}InfoList 分页获取{{.Description}}记录
 // Author [yourname](https://github.com/yourname)
 func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList(info request.{{.StructName}}Search) (list []model.{{.StructName}}, total int64, err error) {
@@ -199,7 +218,7 @@ func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList(info request.{{.StructNam
 	err = db.Find(&{{.Abbreviation}}s).Error
 	return  {{.Abbreviation}}s, total, err
 }
-
+{{- end }}
 {{- if .HasDataSource }}
 func (s *{{.Abbreviation}})Get{{.StructName}}DataSource() (res map[string][]map[string]any, err error) {
 	res = make(map[string][]map[string]any)
diff --git a/server/resource/plugin/web/form/form.vue.template b/server/resource/plugin/web/form/form.vue.template
index 2c221d912b..6726ee41a0 100644
--- a/server/resource/plugin/web/form/form.vue.template
+++ b/server/resource/plugin/web/form/form.vue.template
@@ -148,6 +148,7 @@ const {{ $element }}Options = ref([])
 {{- if .HasDataSource }}
 // 请引用
 get{{.StructName}}DataSource,
+
 //  获取数据源
 const dataSource = ref([])
 const getDataSourceFunc = async()=>{
@@ -159,13 +160,27 @@ const getDataSourceFunc = async()=>{
 getDataSourceFunc()
 {{- end }}
 {{- else }}
-{{- if not .OnlyTemplate}}
+{{- if not .OnlyTemplate }}
 <template>
   <div>
     <div class="gva-form-box">
       <el-form :model="formData" ref="elFormRef" label-position="right" :rules="rule" label-width="80px">
+        {{- if .IsTree }}
+          <el-form-item label="父节点:" prop="parentID" >
+              <el-tree-select
+                  v-model="formData.parentID"
+                  :data="[rootNode,...tableData]"
+                  check-strictly
+                  :render-after-expand="false"
+                  :props="defaultProps"
+                  clearable
+                  style="width: 240px"
+                  placeholder="根节点"
+              />
+          </el-form-item>
+        {{- end }}
       {{- range .Fields}}
-        {{- if .Form }}
+      {{- if .Form }}
         <el-form-item label="{{.FieldDesc}}:" prop="{{.FieldJson}}">
        {{- if .CheckDataSource}}
         <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
@@ -219,13 +234,13 @@ getDataSourceFunc()
        {{- end }}
        {{- if eq .FieldType "array" }}
           <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
-        {{- end }}
+       {{- end }}
        {{- end }}
        </el-form-item>
       {{- end }}
       {{- end }}
         <el-form-item>
-          <el-button type="primary" @click="save">保存</el-button>
+          <el-button :loading="btnLoading" type="primary" @click="save">保存</el-button>
           <el-button type="primary" @click="back">返回</el-button>
         </el-form-item>
       </el-form>
@@ -238,6 +253,9 @@ import {
   {{- if .HasDataSource }}
     get{{.StructName}}DataSource,
   {{- end }}
+  {{- if .IsTree }}
+    get{{.StructName}}List,
+  {{- end }}
   create{{.StructName}},
   update{{.StructName}},
   find{{.StructName}}
@@ -272,14 +290,47 @@ import RichEdit from '@/components/richtext/rich-edit.vue'
 import ArrayCtrl from '@/components/arrayCtrl/arrayCtrl.vue'
 {{- end }}
 
+
 const route = useRoute()
 const router = useRouter()
 
+{{- if .IsTree }}
+const tableData = ref([])
+
+const defaultProps = {
+  children: "children",
+  label: "{{ .TreeJson }}",
+  value: "{{ .PrimaryField.FieldJson }}"
+}
+
+const rootNode = {
+  {{ .PrimaryField.FieldJson }}: 0,
+  {{ .TreeJson }}: '根节点',
+  children: []
+}
+
+const getTableData = async() => {
+  const table = await get{{.StructName}}List()
+  if (table.code === 0) {
+    tableData.value = table.data
+  }
+}
+
+getTableData()
+
+{{- end }}
+
+// 提交按钮loading
+const btnLoading = ref(false)
+
 const type = ref('')
     {{- range $index, $element := .DictTypes}}
 const {{ $element }}Options = ref([])
     {{- end }}
 const formData = ref({
+        {{- if .IsTree }}
+            parentID: undefined,
+        {{- end }}
         {{- range .Fields}}
           {{- if .Form }}
             {{- if eq .FieldType "bool" }}
@@ -324,7 +375,6 @@ const formData = ref({
 // 验证规则
 const rule = reactive({
     {{- range .Fields }}
-      {{- if .Form }}
             {{- if eq .Require true }}
                {{.FieldJson }} : [{
                    required: true,
@@ -332,7 +382,6 @@ const rule = reactive({
                    trigger: ['input','blur'],
                }],
             {{- end }}
-       {{- end }}
     {{- end }}
 })
 
@@ -369,8 +418,9 @@ const init = async () => {
 init()
 // 保存按钮
 const save = async() => {
+      btnLoading.value = true
       elFormRef.value?.validate( async (valid) => {
-         if (!valid) return
+         if (!valid) return btnLoading.value = false
             let res
            switch (type.value) {
              case 'create':
@@ -383,6 +433,7 @@ const save = async() => {
                res = await create{{.StructName}}(formData.value)
                break
            }
+           btnLoading.value = false
            if (res.code === 0) {
              ElMessage({
                type: 'success',
diff --git a/server/resource/plugin/web/view/view.vue.template b/server/resource/plugin/web/view/view.vue.template
index eb43bfaa79..35dfd1b2b3 100644
--- a/server/resource/plugin/web/view/view.vue.template
+++ b/server/resource/plugin/web/view/view.vue.template
@@ -1,6 +1,5 @@
 {{- $global := . }}
 {{- $templateID := printf "%s_%s" .Package .StructName }}
-
 {{- if .IsAdd }}
 // 请在搜索条件中增加如下代码
 {{- range .Fields}}  {{- if .FieldSearchType}} {{- if eq .FieldType "bool" }}
@@ -272,6 +271,7 @@
     {{- range $index, $element := .DictTypes}}
 const {{ $element }}Options = ref([])
     {{- end }}
+
 // setOptions方法中增加如下调用
 
 {{- range $index, $element := .DictTypes }}
@@ -341,9 +341,12 @@ const {{ $element }}Options = ref([])
         {{- end }}
     {{- end }}
 
+
+
 {{- if .HasDataSource }}
 // 请引用
 get{{.StructName}}DataSource,
+
 //  获取数据源
 const dataSource = ref({})
 const getDataSourceFunc = async()=>{
@@ -360,6 +363,7 @@ getDataSourceFunc()
 {{- if not .OnlyTemplate}}
 <template>
   <div>
+  {{- if not .IsTree }}
     <div class="gva-search-box">
       <el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
       {{- if .GvaModel }}
@@ -398,11 +402,11 @@ getDataSourceFunc()
               <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
             </el-select>
             </el-form-item>
-            {{- else if .CheckDataSource}}
-             <el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
-                <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="searchInfo.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" :clearable="{{.Clearable}}" >
-                    <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
-                </el-select>
+           {{- else if .CheckDataSource}}
+            <el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
+               <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="searchInfo.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" :clearable="{{.Clearable}}" >
+                   <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+               </el-select>
             </el-form-item>
             {{- else}}
         <el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
@@ -439,7 +443,6 @@ getDataSourceFunc()
         {{- else}}
          <el-input v-model="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
         {{- end}}
-
         </el-form-item>{{ end }}{{ end }}{{ end }}{{ end }}
 
         <template v-if="showAllQuery">
@@ -513,9 +516,10 @@ getDataSourceFunc()
         </el-form-item>
       </el-form>
     </div>
+  {{- end }}
     <div class="gva-table-box">
         <div class="gva-btn-list">
-            <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.add"{{ end }} type="primary" icon="plus" @click="openDialog">新增</el-button>
+            <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.add"{{ end }} type="primary" icon="plus" @click="openDialog()">新增</el-button>
             <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.batchDelete"{{ end }} icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="onDelete">删除</el-button>
             {{ if .HasExcel -}}
             <ExportTemplate {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.exportTemplate"{{ end }} template-id="{{$templateID}}" />
@@ -536,7 +540,7 @@ getDataSourceFunc()
         >
         <el-table-column type="selection" width="55" />
         {{ if .GvaModel }}
-        <el-table-column align="left" label="日期" prop="createdAt" width="180">
+        <el-table-column align="left" label="日期" prop="createdAt" {{- if .IsTree }} min-{{- end }}width="180">
             <template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
         </el-table-column>
         {{ end }}
@@ -614,19 +618,22 @@ getDataSourceFunc()
                   [JSON]
               </template>
           </el-table-column>
-          {{- else if eq .FieldType "array" }}
-          <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
-              <template #default="scope">
+           {{- else if eq .FieldType "array" }}
+           <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+               <template #default="scope">
                   <ArrayCtrl v-model="scope.row.{{ .FieldJson }}"/>
-              </template>
-          </el-table-column>
-        {{- else }}
-        <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
-        {{- end }}
+               </template>
+           </el-table-column>
+          {{- else }}
+          <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
+          {{- end }}
         {{- end }}
         {{- end }}
         <el-table-column align="left" label="操作" fixed="right" min-width="240">
             <template #default="scope">
+            {{- if .IsTree }}
+            <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.add"{{ end }} type="primary" link class="table-button" @click="openDialog(scope.row)"><el-icon style="margin-right: 5px"><InfoFilled /></el-icon>新增子节点</el-button>
+            {{- end }}
             <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.info"{{ end }} type="primary" link class="table-button" @click="getDetails(scope.row)"><el-icon style="margin-right: 5px"><InfoFilled /></el-icon>查看</el-button>
             <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.edit"{{ end }} type="primary" link icon="edit" class="table-button" @click="update{{.StructName}}Func(scope.row)">编辑</el-button>
             <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.delete"{{ end }} type="primary" link icon="delete" @click="deleteRow(scope.row)">删除</el-button>
@@ -650,15 +657,29 @@ getDataSourceFunc()
               <div class="flex justify-between items-center">
                 <span class="text-lg">{{"{{"}}type==='create'?'新增':'编辑'{{"}}"}}</span>
                 <div>
-                  <el-button type="primary" @click="enterDialog">确 定</el-button>
+                  <el-button :loading="btnLoading" type="primary" @click="enterDialog">确 定</el-button>
                   <el-button @click="closeDialog">取 消</el-button>
                 </div>
               </div>
             </template>
 
           <el-form :model="formData" label-position="top" ref="elFormRef" :rules="rule" label-width="80px">
+          {{- if .IsTree }}
+            <el-form-item label="父节点:" prop="parentID" >
+                <el-tree-select
+                    v-model="formData.parentID"
+                    :data="[rootNode,...tableData]"
+                    check-strictly
+                    :render-after-expand="false"
+                    :props="defaultProps"
+                    clearable
+                    style="width: 240px"
+                    placeholder="根节点"
+                />
+            </el-form-item>
+          {{- end }}
         {{- range .Fields}}
-        {{- if .Form}}
+          {{- if .Form}}
             <el-form-item label="{{.FieldDesc}}:"  prop="{{.FieldJson}}" >
           {{- if .CheckDataSource}}
             <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
@@ -730,51 +751,62 @@ getDataSourceFunc()
           </el-form>
     </el-drawer>
 
-
-
-        <el-drawer destroy-on-close size="800" v-model="detailShow" :show-close="true" :before-close="closeDetailShow" title="查看">
-                <el-descriptions column="1" border>
-                {{- range .Fields}}
-                  {{- if .Desc }}
-                        <el-descriptions-item label="{{ .FieldDesc }}">
-                  {{- if .CheckDataSource }}
-                      <template #default="scope">
-                          {{- if eq .DataSource.Association 2}}
-                          <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}})" :key="key">
-                               {{ "{{ item }}" }}
-                          </el-tag>
-                          {{- else }}
-                          <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}}) {{"}}"}}</span>
-                          {{- end }}
-                      </template>
+    <el-drawer destroy-on-close size="800" v-model="detailShow" :show-close="true" :before-close="closeDetailShow" title="查看">
+            <el-descriptions :column="1" border>
+            {{- if .IsTree }}
+            <el-descriptions-item label="父节点">
+                <el-tree-select
+                  v-model="detailFrom.parentID"
+                  :data="[rootNode,...tableData]"
+                  check-strictly
+                  disabled
+                  :render-after-expand="false"
+                  :props="defaultProps"
+                  clearable
+                  style="width: 240px"
+                  placeholder="根节点"
+                />
+            </el-descriptions-item>
+            {{- end }}
+            {{- range .Fields}}
+              {{- if .Desc }}
+                    <el-descriptions-item label="{{ .FieldDesc }}">
+                    {{- if .CheckDataSource }}
+                   <template #default="scope">
+                       {{- if eq .DataSource.Association 2}}
+                       <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}})" :key="key">
+                            {{ "{{ item }}" }}
+                       </el-tag>
+                       {{- else }}
+                       <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}}) {{"}}"}}</span>
+                       {{- end }}
+                   </template>
                 {{- else if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
-                            {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
-                    {{- else }}
-                        {{- if eq .FieldType "picture" }}
-                                <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :src="getUrl(detailFrom.{{ .FieldJson }})" fit="cover" />
-                        {{- end }}
-                        {{- if eq .FieldType "array" }}
-                             <ArrayCtrl v-model="detailFrom.{{ .FieldJson }}"/>
-                        {{- end }}
-                        {{- if eq .FieldType "pictures" }}
-                                <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
-                        {{- end }}
-                        {{- if eq .FieldType "file" }}
-                                <div class="fileBtn" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index">
-                                  <el-button type="primary" text bg @click="onDownloadFile(item.url)">
-                                    <el-icon style="margin-right: 5px"><Download /></el-icon>
-                                    {{"{{"}}item.name{{"}}"}}
-                                  </el-button>
-                                </div>
-                        {{- end }}
+                        {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
+                {{- else }}
+                    {{- if eq .FieldType "picture" }}
+                            <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :src="getUrl(detailFrom.{{ .FieldJson }})" fit="cover" />
+                    {{- end }}
+                    {{- if eq .FieldType "array" }}
+                            <ArrayCtrl v-model="detailFrom.{{ .FieldJson }}"/>
+                    {{- end }}
+                    {{- if eq .FieldType "pictures" }}
+                            <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
+                    {{- end }}
+                    {{- if eq .FieldType "file" }}
+                            <div class="fileBtn" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index">
+                              <el-button type="primary" text bg @click="onDownloadFile(item.url)">
+                                <el-icon style="margin-right: 5px"><Download /></el-icon>
+                                {{"{{"}}item.name{{"}}"}}
+                              </el-button>
+                            </div>
                     {{- end }}
-                        </el-descriptions-item>
-                  {{- end }}
                 {{- end }}
-                </el-descriptions>
-            </el-drawer>
-
-
+                    </el-descriptions-item>
+              {{- end }}
+            {{- end }}
+            </el-descriptions>
+        </el-drawer>
 
   </div>
 </template>
@@ -790,7 +822,7 @@ import {
   update{{.StructName}},
   find{{.StructName}},
   get{{.StructName}}List
-} from '@/plugin/{{.Package}}/api/{{.PackageName}}'
+} from '@/api/{{.Package}}/{{.PackageName}}'
 
 {{- if or .HasPic .HasFile}}
 import { getUrl } from '@/utils/image'
@@ -805,7 +837,6 @@ import SelectImage from '@/components/selectImage/selectImage.vue'
 import RichEdit from '@/components/richtext/rich-edit.vue'
 {{- end }}
 
-
 {{- if .HasFile }}
 // 文件选择组件
 import SelectFile from '@/components/selectFile/selectFile.vue'
@@ -844,6 +875,9 @@ defineOptions({
     const btnAuth = useBtnAuth()
 {{- end }}
 
+// 提交按钮loading
+const btnLoading = ref(false)
+
 // 控制更多查询条件显示/隐藏状态
 const showAllQuery = ref(false)
 
@@ -852,45 +886,48 @@ const showAllQuery = ref(false)
 const {{ $element }}Options = ref([])
     {{- end }}
 const formData = ref({
-        {{- range .Fields}}
-        {{- if .Form}}
-        {{- if eq .FieldType "bool" }}
-        {{.FieldJson}}: false,
-        {{- end }}
-        {{- if eq .FieldType "string" }}
-        {{.FieldJson}}: '',
-        {{- end }}
-        {{- if eq .FieldType "richtext" }}
-        {{.FieldJson}}: '',
-        {{- end }}
-        {{- if eq .FieldType "int" }}
-        {{.FieldJson}}: {{- if or .DictType .DataSource}} undefined{{ else }} 0{{- end }},
-        {{- end }}
-        {{- if eq .FieldType "time.Time" }}
-        {{.FieldJson}}: new Date(),
-        {{- end }}
-        {{- if eq .FieldType "float64" }}
-        {{.FieldJson}}: 0,
-        {{- end }}
-        {{- if eq .FieldType "picture" }}
-        {{.FieldJson}}: "",
-        {{- end }}
-        {{- if eq .FieldType "video" }}
-        {{.FieldJson}}: "",
-        {{- end }}
-        {{- if eq .FieldType "pictures" }}
-        {{.FieldJson}}: [],
-        {{- end }}
-        {{- if eq .FieldType "file" }}
-        {{.FieldJson}}: [],
-        {{- end }}
-        {{- if eq .FieldType "json" }}
-        {{.FieldJson}}: {},
-        {{- end }}
-        {{- if eq .FieldType "array" }}
-        {{.FieldJson}}: [],
-        {{- end }}
+        {{- if .IsTree }}
+            parentID:undefined,
         {{- end }}
+        {{- range .Fields}}
+          {{- if .Form}}
+            {{- if eq .FieldType "bool" }}
+            {{.FieldJson}}: false,
+            {{- end }}
+            {{- if eq .FieldType "string" }}
+            {{.FieldJson}}: '',
+            {{- end }}
+            {{- if eq .FieldType "richtext" }}
+            {{.FieldJson}}: '',
+            {{- end }}
+            {{- if eq .FieldType "int" }}
+            {{.FieldJson}}: {{- if or .DictType .DataSource}} undefined{{ else }} 0{{- end }},
+            {{- end }}
+            {{- if eq .FieldType "time.Time" }}
+            {{.FieldJson}}: new Date(),
+            {{- end }}
+            {{- if eq .FieldType "float64" }}
+            {{.FieldJson}}: 0,
+            {{- end }}
+            {{- if eq .FieldType "picture" }}
+            {{.FieldJson}}: "",
+            {{- end }}
+            {{- if eq .FieldType "video" }}
+            {{.FieldJson}}: "",
+            {{- end }}
+            {{- if eq .FieldType "pictures" }}
+            {{.FieldJson}}: [],
+            {{- end }}
+            {{- if eq .FieldType "file" }}
+            {{.FieldJson}}: [],
+            {{- end }}
+            {{- if eq .FieldType "json" }}
+            {{.FieldJson}}: {},
+            {{- end }}
+            {{- if eq .FieldType "array" }}
+            {{.FieldJson}}: [],
+            {{- end }}
+          {{- end }}
         {{- end }}
         })
 
@@ -910,7 +947,7 @@ const formData = ref({
 // 验证规则
 const rule = reactive({
     {{- range .Fields }}
-      {{- if .Form }}
+        {{- if .Form }}
             {{- if eq .Require true }}
                {{.FieldJson }} : [{
                    required: true,
@@ -926,7 +963,7 @@ const rule = reactive({
               {{- end }}
               ],
             {{- end }}
-       {{- end }}
+        {{- end }}
     {{- end }}
 })
 
@@ -978,13 +1015,13 @@ const searchInfo = ref({})
 const sortChange = ({ prop, order }) => {
   const sortMap = {
     {{- range .Fields}}
-      {{- if .Table}}
-        {{- if and .Sort}}
-          {{- if not (eq .ColumnName "")}}
-              {{.FieldJson}}: '{{.ColumnName}}',
-          {{- end}}
+     {{- if .Table}}
+      {{- if and .Sort}}
+        {{- if not (eq .ColumnName "")}}
+            {{.FieldJson}}: '{{.ColumnName}}',
         {{- end}}
       {{- end}}
+     {{- end}}
     {{- end}}
   }
 
@@ -999,6 +1036,7 @@ const sortChange = ({ prop, order }) => {
 }
 {{- end}}
 
+{{- if not .IsTree }}
 // 重置
 const onReset = () => {
   searchInfo.value = {}
@@ -1040,6 +1078,28 @@ const getTableData = async() => {
     pageSize.value = table.data.pageSize
   }
 }
+{{- else }}
+// 树选择器配置
+const defaultProps = {
+  children: "children",
+  label: "{{ .TreeJson }}",
+  value: "{{ .PrimaryField.FieldJson }}"
+}
+
+const rootNode = {
+  {{ .PrimaryField.FieldJson }}: 0,
+  {{ .TreeJson }}: '根节点',
+  children: []
+}
+
+// 查询
+const getTableData = async() => {
+  const table = await get{{.StructName}}List()
+  if (table.code === 0) {
+    tableData.value = table.data
+  }
+}
+{{- end }}
 
 getTableData()
 
@@ -1140,8 +1200,11 @@ const delete{{.StructName}}Func = async (row) => {
 const dialogFormVisible = ref(false)
 
 // 打开弹窗
-const openDialog = () => {
+const openDialog = ({{- if .IsTree -}}row{{- end -}}) => {
     type.value = 'create'
+    {{- if .IsTree }}
+    formData.value.parentID = row ? row.{{.PrimaryField.FieldJson}} : undefined
+    {{- end }}
     dialogFormVisible.value = true
 }
 
@@ -1193,8 +1256,9 @@ const closeDialog = () => {
 }
 // 弹窗确定
 const enterDialog = async () => {
+     btnLoading.value = true
      elFormRef.value?.validate( async (valid) => {
-             if (!valid) return
+             if (!valid) return btnLoading.value = false
               let res
               switch (type.value) {
                 case 'create':
@@ -1207,6 +1271,7 @@ const enterDialog = async () => {
                   res = await create{{.StructName}}(formData.value)
                   break
               }
+              btnLoading.value = false
               if (res.code === 0) {
                 ElMessage({
                   type: 'success',
@@ -1223,7 +1288,6 @@ const downloadFile = (url) => {
 }
 {{end}}
 
-
 const detailFrom = ref({})
 
 // 查看详情控制标记
@@ -1284,5 +1348,6 @@ defineOptions({
 </script>
 <style>
 </style>
-{{- end}}
-{{- end}}
+{{- end }}
+
+{{- end }}