新增树表代码生成

ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs

@@ -202,12 +202,7 @@ namespace ZR.Admin.WebApi.Controllers
             }
             var genTable = genTableDto.Adapt<GenTable>().ToUpdate(HttpContext);
 
-            genTable.Options = JsonConvert.SerializeObject(new
+            genTable.Options = JsonConvert.SerializeObject(genTableDto.Params);
-            {
-                parentMenuId = genTableDto.ParentMenuId,
-                sortField = genTableDto.SortField,
-                sortType = genTable.SortType
-            });
             DbResult<bool> result = GenTableService.UseTran(() =>
             {
                 int rows = GenTableService.UpdateGenTable(genTable);

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt

@@ -51,6 +51,21 @@ namespace ${options.ApiControllerNamespace}.Controllers
             return SUCCESS(response);
         }
 
+$if(genTable.TplCategory == "tree")
+        /// <summary>
+        /// 查询${genTable.FunctionName}列表树
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("treeList")]
+        [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:list")]
+        public IActionResult QueryTree${replaceDto.ModelTypeName}([FromQuery] ${replaceDto.ModelTypeName}QueryDto parm)
+        {
+            var response = _${replaceDto.ModelTypeName}Service.GetTreeList(parm);
+            return SUCCESS(response);
+        }
+$end
+
         /// <summary>
         /// 查询${genTable.FunctionName}详情
         /// </summary>

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplIService.txt

@@ -2,6 +2,7 @@
 using ${options.ModelsNamespace};
 using ${options.ModelsNamespace}.Dto;
 using ${options.ModelsNamespace}.Models;
+using System.Collections.Generic;
 
 namespace ${options.IServicsNamespace}.${options.SubNamespace}.I${options.SubNamespace}Service
 {
@@ -14,5 +15,9 @@ namespace ${options.IServicsNamespace}.${options.SubNamespace}.I${options.SubNam
     public interface I${replaceDto.ModelTypeName}Service : IBaseService<${replaceDto.ModelTypeName}>
     {
         PagedInfo<${replaceDto.ModelTypeName}> GetList(${replaceDto.ModelTypeName}QueryDto parm);
+
+$if(genTable.TplCategory == "tree")
+        List<${replaceDto.ModelTypeName}> GetTreeList(${replaceDto.ModelTypeName}QueryDto parm);
+$end
     }
 }

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt

@@ -25,5 +25,10 @@ $elseif(item.CsharpField.ToLower() != item.ColumnName.ToLower())
 $end
         public $item.CsharpType$item.RequiredStr $item.CsharpField { get; set; }
 ${end}
+
+$if(genTable.TplCategory == "tree")
+        [SugarColumn(IsIgnore = true)]
+        public List<${replaceDto.ModelTypeName}> Children { get; set; }
+$end
     }
 }

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt

@@ -7,6 +7,7 @@ using ${options.IRepositoriesNamespace};
 using ${options.IServicsNamespace}.${options.SubNamespace}.I${options.SubNamespace}Service;
 using System;
 using SqlSugar;
+using System.Collections.Generic;
 
 namespace ${options.ServicesNamespace}.${options.SubNamespace}
 {
@@ -54,11 +55,39 @@ $end
 $if(genTable.SortField != "" && genTable.SortField != null)
             var response = _${replaceDto.ModelTypeName}repository.GetPages(predicate.ToExpression(), parm, x => x.${genTable.SortField}, "${genTable.SortType}");
 $else
-            var response = _${replaceDto.ModelTypeName}repository.Where(predicate.ToExpression()).ToPage(parm);
+            var response = _${replaceDto.ModelTypeName}repository.Queryable().Where(predicate.ToExpression()).ToPage(parm);
 $end
             return response;
         }
 
+$if(genTable.TplCategory == "tree")
+        /// <summary>
+        /// 查询${genTable.FunctionName}树列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public List<${replaceDto.ModelTypeName}> GetTreeList(${replaceDto.ModelTypeName}QueryDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<${replaceDto.ModelTypeName}>();
+
+            //搜索条件查询语法参考Sqlsugar
+$foreach(column in genTable.Columns)
+$if(column.IsQuery)
+$if(column.CsharpType == "string")
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.${column.CsharpField}), ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
+$elseif(column.CsharpType == "int" || column.CsharpType == "long")
+            predicate = predicate.AndIF(parm.${column.CsharpField} != null, ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
+$end
+$end
+$end
+
+            var response = _${replaceDto.ModelTypeName}repository.Queryable().Where(predicate.ToExpression())
+                .ToTree(it => it.Children, it => it.${genTable.TreeParentCode}, 0);
+
+            return response;
+        }
+$end
         #endregion
     }
 }

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt

@@ -0,0 +1,383 @@
+<template>
+  <div class="app-container">
+    <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
+    <el-form :model="queryParams" label-position="left" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
+${vueQueryFormHtml}
+      <el-row class="mb8" style="text-align:center">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-row>
+    </el-form>
+    <!-- 工具区域 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" v-hasPermi="['${replaceDto.PermissionPrefix}:add']" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+      </el-col>
+       <el-col :span="1.5">
+        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" :disabled="multiple" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
+      </el-col>
+$if(replaceDto.ShowBtnExport)
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['${replaceDto.PermissionPrefix}:export']">导出</el-button>
+      </el-col>
+$end
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 数据区域 -->
+    <el-table v-if="refreshTable" :data="dataList" v-loading="loading" ref="table" border highlight-current-row @selection-change="handleSelectionChange"
+      :default-expand-all="isExpandAll" row-key="${tool.FirstLowerCase(genTable.TreeCode)}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <el-table-column type="selection" width="50" align="center"/>
+${VueViewListContent}
+      <el-table-column label="操作" align="center" width="140">
+        <template slot-scope="scope">
+          <el-button size="mini" v-hasPermi="['${replaceDto.PermissionPrefix}:update']" type="success" icon="el-icon-edit" title="编辑" 
+            @click="handleUpdate(scope.row)"></el-button>
+          <el-button size="mini" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" type="danger" icon="el-icon-delete" title="删除" 
+            @click="handleDelete(scope.row)"></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改${genTable.functionName}对话框 -->
+    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" >
+      <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
+        <el-row>
+${VueViewFormContent}
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+<script>
+import { 
+  treelist${genTable.BusinessName},
+  list${genTable.BusinessName},
+  add${genTable.BusinessName},
+  del${genTable.BusinessName},
+  update${genTable.BusinessName},
+  get${genTable.BusinessName},
+$if(replaceDto.ShowBtnExport)
+  export${genTable.BusinessName},
+$end
+$if(showCustomInput)
+  changeSort
+$end
+} from '@/api/${genTable.ModuleName}/${lowerBusinessName}.js';
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "${lowerBusinessName}",
+  components: { Treeselect },
+  data() {
+    return {
+      labelWidth: "100px",
+      formLabelWidth:"100px",
+      // 选中${replaceDto.FistLowerPk}数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+$foreach(item in genTable.Columns)
+$if(item.IsQuery == true)
+        ${item.CsharpFieldFl}: undefined,
+$end
+$end
+      },
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部折叠
+      isExpandAll: false,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 表单参数
+      form: {},
+      columns: [
+$set(index = 0)
+$foreach(column in genTable.Columns)
+        { index: $index, key: '${column.CsharpFieldFl}', label: `${column.ColumnComment}`, checked: $if(index < 9) true $else false $end },
+$set(index = index + 1)
+$end
+      ],
+$foreach(item in genTable.Columns)
+$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox"))
+      // ${item.ColumnComment}选项列表
+      ${item.CsharpFieldFl}Options: [],
+$elseif(item.HtmlType == "datetime" && item.IsQuery == true)
+      //${item.ColumnComment}时间范围
+      dateRange${item.CsharpField}: [],
+$elseif(item.HtmlType == "customInput")
+      editIndex: -1,
+$end
+$end
+      // 数据列表
+      dataList: [],
+      // 总记录数
+      total: 0,
+      // 提交按钮是否显示
+      btnSubmitVisible: true,
+      // 表单校验
+      rules: {
+$foreach(column in genTable.Columns)
+$if(column.IsRequired && column.IsIncrement == false)
+        ${column.CsharpFieldFl}: [
+          { required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end
+$if(column.CsharpType == "int" || column.CsharpType == "long"), type: "number"$end }
+        ],
+$end
+$end
+      },
+    };
+  },
+  created() {
+    // 列表数据查询
+    this.getList();
+
+    $set(index = 0)
+    var dictParams = [
+$foreach(item in genTable.Columns)
+$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox") && item.DictType != "")
+      { dictType: "${item.DictType}", columnName: "${item.CsharpFieldFl}Options" },
+$set(index = index + 1)
+$end
+$end
+    ];
+$if(index > 0)
+    this.getDicts(dictParams).then((response) => {
+      response.data.forEach((element) => {
+        this[element.columnName] = element.list;
+      });
+    });
+$end
+  },
+  methods: {
+    // 查询数据
+    getList() {
+$foreach(item in genTable.Columns)
+$if(item.HtmlType == "datetime" && item.IsQuery == true)
+      this.queryParams["begin${item.CsharpField}"] = this.addDateRange2(this.dateRange${item.CsharpField}, 0);
+      this.queryParams["end${item.CsharpField}"] = this.addDateRange2(this.dateRange${item.CsharpField}, 1);
+$end
+$end
+      this.loading = true;
+      treelist${genTable.BusinessName}(this.queryParams).then(res => {
+         if (res.code == 200) {
+           this.dataList = res.data;
+           //this.total = res.data.totalNum;
+           this.loading = false;
+         }
+       })
+    },
+    /** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.${tool.FirstLowerCase(genTable.TreeCode)},
+        label: node.${tool.FirstLowerCase(genTable.TreeName)},
+        children: node.children,
+      };
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 重置数据表单
+    reset() {
+      this.form = {
+$foreach(item in genTable.Columns)
+$if((item.IsEdit || item.IsInsert))
+        $item.CsharpFieldFl: undefined,
+$end
+$if((item.HtmlType == "checkbox"))
+        ${item.CsharpFieldFl}Checked: [],
+$end
+$end
+      };
+      this.resetForm("form");
+    },
+    /** 重置查询操作 */
+    resetQuery() {
+      this.timeRange = [];
+$foreach(item in genTable.Columns)
+$if(item.HtmlType == "datetime" && item.IsQuery == true)
+      //${item.ColumnComment}时间范围
+      this.dateRange${item.CsharpField}= [];
+$end
+$end
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.${replaceDto.FistLowerPk});
+      this.single = selection.length != 1
+      this.multiple = !selection.length;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加";
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const Ids = row.${replaceDto.FistLowerPk} || this.ids;
+
+      this.${confirm}confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+        .then(function () {
+          return del${genTable.BusinessName}(Ids);
+        })
+        .then(() => {
+          this.handleQuery();
+          this.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.${replaceDto.FistLowerPk} || this.ids;
+      get${genTable.BusinessName}(id).then((res) => {
+        const { code, data } = res;
+        if (code == 200) {
+          this.open = true;
+          this.title = "修改数据";
+
+          this.form = {
+            ...data,
+$foreach(item in genTable.Columns)
+$if(item.HtmlType == "checkbox")
+            ${item.CsharpFieldFl}Checked: data.${item.CsharpFieldFl} ? data.${item.CsharpFieldFl}.split(',') : [],
+$end
+$end
+          };
+        }
+      });
+    },
+$if(replaceDto.UploadFile == 1)
+    //图片上传成功方法
+    handleUploadSuccess(column, filelist) {
+      this.form[column] = filelist;
+    },
+$end
+$foreach(item in genTable.Columns)
+$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox"))
+    // ${item.ColumnComment}字典翻译
+    ${item.CsharpFieldFl}Format(row, column) {
+      return this.selectDictLabel(this.${item.CsharpFieldFl}Options, row.${item.CsharpFieldFl});
+    },
+$end
+$if(item.HtmlType == "customInput")
+    // 显示编辑排序
+    editCurrRow(rowId, str) {
+      this.editIndex = rowId;
+      let id = rowId + str;
+      
+      setTimeout(() => {
+        document.getElementById(id).focus();
+      }, 100);
+    },
+    // 保存排序
+    handleChangeSort(info) {
+      this.editIndex = -1;
+      changeSort({ value: info.${item.CsharpFieldFl}, id: info.${replaceDto.FistLowerPk} }).then(
+        (response) => {
+          this.msgSuccess("修改成功");
+          this.getList();
+        }
+      );
+    },
+$end
+$end
+    /** 提交按钮 */
+    submitForm: function () {
+      this.${refs}refs["form"].validate((valid) => {
+        if (valid) {
+$foreach(item in genTable.Columns)
+$if(item.HtmlType == "checkbox")
+          this.form.${item.CsharpFieldFl} = this.form.${item.CsharpFieldFl}Checked.toString();
+$end
+$end
+          console.log(JSON.stringify(this.form));
+          
+          if (this.form.${replaceDto.FistLowerPk} != undefined && this.title === "修改数据") {
+            update${genTable.BusinessName}(this.form)
+              .then((res) => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+            })
+            .catch((err) => {
+                //TODO 错误逻辑
+              });
+          } else {
+            add${genTable.BusinessName}(this.form)
+              .then((res) => {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+            })
+            .catch((err) => {
+                //TODO 错误逻辑
+              });
+          }
+        }
+      });
+    },
+$if(replaceDto.ShowBtnExport)
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.${confirm}confirm("是否确认导出所有${genTable.functionName}数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return export${genTable.BusinessName}(queryParams);
+        })
+        .then((response) => {
+          this.download(response.data.path);
+        });
+    },
+$end
+    //展开/折叠操作
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.${nextTick}nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+  },
+};
+</script>

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt

@@ -12,6 +12,20 @@ export function list${genTable.BusinessName}(query) {
   })
 }
 
+$if(genTable.TplCategory == "tree")
+/**
+* ${genTable.functionName}tree查询
+* @param {查询条件} data
+*/
+export function treelist${genTable.BusinessName}(query) {
+  return request({
+    url: '${genTable.ModuleName}/${genTable.BusinessName}/treelist',
+    method: 'get',
+    params: query,
+  })
+}
+$end
+
 /**
 * 新增${genTable.functionName}
 * @param data

ZR.CodeGenerator/CodeGenerateTemplate.cs

@@ -17,7 +17,7 @@ namespace ZR.CodeGenerator
         /// </summary>
         /// <param name="dbFieldInfo"></param>
         /// <returns></returns>
-        public static string TplVueFormContent(GenTableColumn dbFieldInfo)
+        public static string TplVueFormContent(GenTableColumn dbFieldInfo, GenTable genTable)
         {
             string columnName = dbFieldInfo.CsharpFieldFl;
             string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName);
@@ -36,6 +36,17 @@ namespace ZR.CodeGenerator
                 sb.AppendLine("    </el-col>");
                 return sb.ToString();
             }
+
+            //树
+            if (genTable.TplCategory.Equals("tree", StringComparison.OrdinalIgnoreCase) && genTable.TreeParentCode != null && dbFieldInfo.CsharpField.Equals(genTable.TreeParentCode))
+            {
+                sb.AppendLine(@"    <el-col :lg=""24"">");
+                sb.AppendLine($@"      <el-form-item label=""父级id"" prop=""{columnName}"">");
+                sb.AppendLine($@"        <treeselect v-model=""form.{columnName}"" :options=""dataList"" :normalizer=""normalizer"" :show-count=""true"" placeholder=""选择上级菜单"" />");
+                sb.AppendLine(@"      </el-form-item>");
+                sb.AppendLine(@"    </el-col>");
+                return sb.ToString();
+            }
             //主键、非自增要插入，不能编辑
             if (dbFieldInfo.IsPk || dbFieldInfo.IsIncrement)
             {

ZR.CodeGenerator/CodeGeneratorTool.cs

@@ -66,7 +66,7 @@ namespace ZR.CodeGenerator
                 dbFieldInfo.CsharpFieldFl = FirstLowerCase(dbFieldInfo.CsharpField);
                 //CodeGenerateTemplate.GetQueryDtoProperty(dbFieldInfo, replaceDto);
 
-                replaceDto.VueViewFormHtml += CodeGenerateTemplate.TplVueFormContent(dbFieldInfo);
+                replaceDto.VueViewFormHtml += CodeGenerateTemplate.TplVueFormContent(dbFieldInfo, dto.GenTable);
                 replaceDto.VueViewListHtml += CodeGenerateTemplate.TplTableColumn(dbFieldInfo, dto.GenTable);
                 replaceDto.VueQueryFormHtml += CodeGenerateTemplate.TplQueryFormHtml(dbFieldInfo);
             }
@@ -172,8 +172,19 @@ namespace ZR.CodeGenerator
         private static void GenerateVueViews(ReplaceDto replaceDto, GenerateDto generateDto)
         {
             var fullPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "views", generateDto.GenTable.ModuleName, $"{generateDto.GenTable.BusinessName}.vue");
-
+            string fileName = string.Empty;
-            var tpl = FileHelper.ReadJtTemplate("TplVue.txt");
+            switch (generateDto.GenTable.TplCategory)
+            {
+                case "tree":
+                    fileName = "TplTreeVue.txt";
+                    break;
+                case "crud":
+                    fileName = "TplVue.txt";
+                    break;
+                default:
+                    break;
+            }
+            var tpl = FileHelper.ReadJtTemplate(fileName);
             tpl.Set("vueQueryFormHtml", replaceDto.VueQueryFormHtml);
             tpl.Set("VueViewEditFormRuleContent", replaceDto.VueViewEditFormRuleContent);//添加、修改表单验证规则
             tpl.Set("VueViewFormContent", replaceDto.VueViewFormHtml);//添加、修改表单
@@ -459,6 +470,7 @@ namespace ZR.CodeGenerator
                 //options.DisableeLogogram = true;//禁用简写
                 options.Data.Set("refs", "$");//特殊标签替换
                 options.Data.Set("confirm", "$");//特殊标签替换
+                options.Data.Set("nextTick", "$");
                 options.Data.Set("replaceDto", replaceDto);
                 options.Data.Set("options", dto.GenOptions);
                 options.Data.Set("genTable", dto.GenTable);

ZR.Model/System/Dto/GenTableDto.cs

@@ -24,12 +24,28 @@ namespace ZR.Model.System.Dto
         /// <summary>
         /// 上级菜单id
         /// </summary>
-        public int? ParentMenuId { get; set; }
+        //public int? ParentMenuId { get; set; }
-        public string SortField { get; set; }
+        //public string SortField { get; set; }
-        public string SortType { get; set; }
+        //public string SortType { get; set; }
+        /// <summary>
+        /// 额外参数
+        /// </summary>
+        public Options Params { get; set; }
         public List<GenTableColumnDto> Columns { get; set; }
     }
 
+    /// <summary>
+    /// 额外参数
+    /// </summary>
+    public class Options
+    {
+        public string treeCode { get; set; }
+        public string treeName { get; set; }
+        public string treeParentCode { get; set; }
+        public int? parentMenuId { get; set; }
+        public string sortField { get; set; }
+        public string sortType { get; set; }
+    }
     public class GenTableColumnDto
     {
         public int ColumnId { get; set; }
@@ -56,4 +72,5 @@ namespace ZR.Model.System.Dto
         /// </summary>
         public string DictType { get; set; }
     }
+
 }

ZR.Model/System/Generate/GenTable.cs

@@ -83,8 +83,18 @@ namespace ZR.Model.System.Generate
         public object ParentMenuId { get; set; }
         [SqlSugar.SugarColumn(IsIgnore = true)]
         public object SortType { get; set; } = "asc";
+
         [SqlSugar.SugarColumn(IsIgnore = true)]
-        public object SortField { get; set; } = "";
+        public object SortField { get; set; } = string.Empty;
+        
+        [SqlSugar.SugarColumn(IsIgnore = true)]
+        public object TreeCode { get; set; } = string.Empty;
+
+        [SqlSugar.SugarColumn(IsIgnore = true)]
+        public object TreeName { get; set; } = string.Empty;
+
+        [SqlSugar.SugarColumn(IsIgnore = true)]
+        public object TreeParentCode { get; set; }
         #endregion
     }
 }

ZR.Service/System/GenTableService.cs

@@ -79,9 +79,16 @@ namespace ZR.Service.System
             if (!string.IsNullOrEmpty(genTable?.Options))
             {
                 Dictionary<string, object> options = JsonConvert.DeserializeObject<Dictionary<string, object>>(genTable.Options);
+                if (options == null) return;
+
                 genTable.ParentMenuId = options.GetValueOrDefault("parentMenuId") ?? null;
+                
                 genTable.SortType = options.GetValueOrDefault("sortType") ?? "asc";
-                genTable.SortField = options.GetValueOrDefault("sortField") ?? null;
+                genTable.SortField = options.GetValueOrDefault("sortField") ?? "";
+
+                genTable.TreeParentCode = options.GetValueOrDefault("treeParentCode") ?? "";
+                genTable.TreeName = options.GetValueOrDefault("treeName") ?? "";
+                genTable.TreeCode = options.GetValueOrDefault("treeCode") ?? "";
             }
         }
 

ZR.Vue/src/views/tool/gen/basicInfoForm.vue

@@ -1,28 +1,28 @@
 <template>
   <el-form ref="basicInfoForm" :model="info" :rules="rules" label-width="100px">
     <el-row>
-      <el-col :span="6">
+      <el-col :lg="6">
         <el-form-item label="表名称" prop="tableName">
           <el-input placeholder="请输入仓库名称" v-model="info.tableName" />
         </el-form-item>
       </el-col>
-      <el-col :span="6">
+      <el-col :lg="6">
         <el-form-item label="表描述" prop="tableComment">
           <el-input placeholder="请输入" v-model="info.tableComment" />
         </el-form-item>
       </el-col>
 
-      <el-col :span="6">
+      <el-col :lg="6">
         <el-form-item label="实体类名称" prop="className">
           <el-input placeholder="请输入" v-model="info.className" />
         </el-form-item>
       </el-col>
-      <el-col :span="6">
+      <el-col :lg="6">
         <el-form-item label="作者" prop="functionAuthor">
           <el-input placeholder="请输入" v-model="info.functionAuthor" />
         </el-form-item>
       </el-col>
-      <el-col :span="24">
+      <el-col :lg="24">
         <el-form-item label="备注" prop="remark">
           <el-input type="textarea" :rows="3" v-model="info.remark"></el-input>
         </el-form-item>

ZR.Vue/src/views/tool/gen/editTable.vue

@@ -179,13 +179,13 @@ export default {
           const genTable = Object.assign({}, basicForm.model, genForm.model);
           genTable.columns = this.columns;
           genTable.params = {
-            // treeCode: genTable.treeCode,
+            treeCode: genTable.treeCode,
-            // treeName: genTable.treeName,
+            treeName: genTable.treeName,
-            // treeParentCode: genTable.treeParentCode,
+            treeParentCode: genTable.treeParentCode,
-            //parentMenuId: genTable.parentMenuId,
+            parentMenuId: genTable.parentMenuId,
           };
           console.log("genForm", genTable);
-          // return;
+          
           updateGenTable(genTable).then((res) => {
             this.msgSuccess(res.msg);
             if (res.code === 200) {

ZR.Vue/src/views/tool/gen/genInfoForm.vue

@@ -1,20 +1,20 @@
 <template>
   <el-form ref="genInfoForm" :model="info" :rules="rules" label-width="150px">
     <el-row>
-      <el-col :span="12">
+      <el-col :lg="12">
         <el-form-item prop="tplCategory">
           <span slot="label">生成模板</span>
           <el-select v-model="info.tplCategory" @change="tplSelectChange">
 						<el-option label="单表（增删改查）" value="crud" />
             <!-- <el-option label="单表查询" value="select" /> -->
-            <!-- <el-option label="树表（增删改查）" value="tree" />
+            <el-option label="树表（增删改查）" value="tree" />
-						<el-option label="导航查询" value="subNav"></el-option> -->
+						<!-- <el-option label="导航查询" value="subNav"></el-option> -->
             <!-- <el-option label="主子表（增删改查）" value="sub" /> -->
           </el-select>
         </el-form-item>
       </el-col>
 
-      <el-col :span="12">
+      <el-col :lg="12">
         <el-form-item prop="baseNameSpace">
           <span slot="label">
             生成命名空间前缀
@@ -26,7 +26,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col :span="12">
+      <el-col :lg="12">
         <el-form-item prop="moduleName">
           <span slot="label">
             生成模块名
@@ -38,7 +38,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col :span="12">
+      <el-col :lg="12">
         <el-form-item prop="businessName">
           <span slot="label">
             生成业务名
@@ -50,7 +50,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col :span="12">
+      <el-col :lg="12">
         <el-form-item prop="functionName">
           <span slot="label">
             生成功能名
@@ -62,7 +62,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col :span="12">
+      <el-col :lg="12">
         <el-form-item>
           <span slot="label">
             上级菜单
@@ -74,7 +74,7 @@
             placeholder="请选择系统菜单" />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :lg="12">
         <el-form-item>
           <span slot="label">
             查询排序字段
@@ -90,7 +90,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col :span="12">
+      <el-col :lg="12">
         <el-form-item prop="genType">
           <span slot="label">
             生成代码方式
@@ -103,7 +103,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col :span="24" v-if="info.genType == '1'">
+      <el-col :lg="24" v-if="info.genType == '1'">
         <el-form-item prop="genPath">
           <span slot="label">
             自定义路径
@@ -128,7 +128,7 @@
 
     <el-row v-show="info.tplCategory == 'tree'">
       <h4 class="form-header">其他信息</h4>
-      <el-col :span="12">
+      <el-col :lg="12">
         <el-form-item>
           <span slot="label">
             树编码字段
@@ -137,12 +137,12 @@
             </el-tooltip>
           </span>
           <el-select v-model="info.treeCode" placeholder="请选择">
-            <el-option v-for="(column, index) in info.columns" :key="index" :label="column.columnName + '：' + column.columnComment"
+            <el-option v-for="(column, index) in columns" :key="index" :label="column.csharpField + '：' + column.columnComment"
-              :value="column.columnName"></el-option>
+              :value="column.csharpField"></el-option>
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :lg="12">
         <el-form-item>
           <span slot="label">
             树父编码字段
@@ -151,12 +151,12 @@
             </el-tooltip>
           </span>
           <el-select v-model="info.treeParentCode" placeholder="请选择">
-            <el-option v-for="(column, index) in info.columns" :key="index" :label="column.columnName + '：' + column.columnComment"
+            <el-option v-for="(column, index) in columns" :key="index" :label="column.csharpField + '：' + column.columnComment"
-              :value="column.columnName"></el-option>
+              :value="column.csharpField"></el-option>
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :lg="12">
         <el-form-item>
           <span slot="label">
             树名称字段
@@ -165,15 +165,15 @@
             </el-tooltip>
           </span>
           <el-select v-model="info.treeName" placeholder="请选择">
-            <el-option v-for="(column, index) in info.columns" :key="index" :label="column.columnName + '：' + column.columnComment"
+            <el-option v-for="(column, index) in columns" :key="index" :label="column.csharpField + '：' + column.columnComment"
-              :value="column.columnName"></el-option>
+              :value="column.csharpField"></el-option>
           </el-select>
         </el-form-item>
       </el-col>
     </el-row>
     <el-row v-show="info.tplCategory == 'sub'">
       <h4 class="form-header">关联信息</h4>
-      <el-col :span="12">
+      <el-col :lg="12">
         <el-form-item>
           <span slot="label">
             关联子表的表名
@@ -187,7 +187,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :lg="12">
         <el-form-item>
           <span slot="label">
             子表关联的外键名