代码生成新增单表查询

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

@@ -46,13 +46,13 @@ ${VueViewListContent}
     <!-- 添加或修改${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>
+        <el-row :gutter="20">
 ${VueViewFormContent}
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取 消</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 

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

@@ -45,13 +45,13 @@ ${VueViewListContent}
     <!-- 添加或修改${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>
+        <el-row :gutter="20">
 ${VueViewFormContent}
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取 消</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 

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

@@ -0,0 +1,262 @@
+<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-form-item>
+        <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-form-item>
+    </el-form>
+    <!-- 工具区域 -->
+    <el-row :gutter="10" class="mb8">
+      <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 :data="dataList" v-loading="loading" ref="table" border highlight-current-row @selection-change="handleSelectionChange">
+      <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" type="success" icon="el-icon-view" title="查看" 
+            @click="handleView(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 :lock-scroll="false" :visible.sync="open" >
+      <el-form ref="form" :model="form" label-position="left" :label-width="formLabelWidth">
+$foreach(item in genTable.Columns)
+        <el-form-item label="$if(item.ColumnComment == "")${item.CsharpField}${else}${item.ColumnComment}${end}">
+$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox"))
+          <dict-tag :options="${item.CsharpFieldFl}Options" :value="form.${item.CsharpFieldFl}" />
+$elseif(item.HtmlType == "imageUpload")
+          <el-image fit="contain" :src="form.${item.CsharpFieldFl}" :preview-src-list="[form.${item.CsharpFieldFl}]">
+            <div slot="error"><i class="el-icon-picture" /></div>
+          </el-image>
+$else
+          {{form.${item.CsharpFieldFl}}}
+$end
+        </el-form-item>
+$end
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { 
+  list${genTable.BusinessName},
+  get${genTable.BusinessName},
+$if(replaceDto.ShowBtnExport)
+  export${genTable.BusinessName},
+$end
+} from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${tool.FirstLowerCase(genTable.BusinessName)}.js';
+
+export default {
+  name: "${genTable.BusinessName.ToLower()}",
+  data() {
+    return {
+      labelWidth: "100px",
+      formLabelWidth:"100px",
+      // 选中${replaceDto.FistLowerPk}数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 遮罩层
+      loading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        sort: undefined,
+        sortType: undefined,
+$foreach(item in genTable.Columns)
+$if(item.IsQuery == true)
+        ${item.CsharpFieldFl}: undefined,
+$end
+$end
+      },
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 表单参数
+      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}: [],
+$end
+$end
+      // 数据列表
+      dataList: [],
+      // 总记录数
+      total: 0,
+      // 提交按钮是否显示
+      btnSubmitVisible: true,
+    };
+  },
+  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;
+      list${genTable.BusinessName}(this.queryParams).then(res => {
+         if (res.code == 200) {
+           this.dataList = res.data.result;
+           this.total = res.data.totalNum;
+           this.loading = false;
+         }
+       })
+    },
+    // 取消按钮
+    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();
+    },
+    /** 删除按钮操作 */
+    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(() => {});
+    },
+    /** 预览按钮操作 */
+    handleView(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.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
+  },
+};
+</script>

ZR.CodeGenerator/CodeGenerateTemplate.cs

@@ -108,10 +108,6 @@ namespace ZR.CodeGenerator
                 sb.AppendLine("    <el-col :lg=\"12\">");
                 sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
                 sb.AppendLine($"        <el-radio-group v-model=\"form.{columnName}\">");
-                //if (string.IsNullOrEmpty(dbFieldInfo.DictType))
-                //{
-                //    sb.AppendLine("           <el-radio :label=\"1\">请选择字典生成</el-radio>");
-                //}
                 sb.AppendLine($"          <el-radio v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"{value}\">{{{{item.dictLabel}}}}</el-radio>");
                 sb.AppendLine("        </el-radio-group>");
                 sb.AppendLine("      </el-form-item>");
@@ -141,10 +137,6 @@ namespace ZR.CodeGenerator
                 sb.AppendLine("    <el-col :lg=\"12\">");
                 sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
                 sb.AppendLine($"        <el-select v-model=\"form.{columnName}\" placeholder=\"请选择{labelName}\"> ");
-                //if (string.IsNullOrEmpty(dbFieldInfo.DictType))
-                //{
-                //    sb.AppendLine($"          <el-option label=\"请选择字典生成\" value=\"\"></el-option>");
-                //}
                 sb.AppendLine($"          <el-option v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictLabel\" :value=\"{value}\"></el-option>");
                 sb.AppendLine("        </el-select>");
                 sb.AppendLine("      </el-form-item>");
@@ -156,10 +148,6 @@ namespace ZR.CodeGenerator
                 sb.AppendLine("    <el-col :lg=\"24\">");
                 sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
                 sb.AppendLine($"        <el-checkbox-group v-model=\"form.{columnName}Checked\"> ");
-                //if (string.IsNullOrEmpty(dbFieldInfo.DictType))
-                //{
-                //    sb.AppendLine($"          <el-checkbox>请选择字典生成</el-checkbox>");
-                //}
                 sb.AppendLine($"          <el-checkbox v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictValue\">{{{{item.dictLabel}}}}</el-checkbox>");
                 sb.AppendLine("        </el-checkbox-group>");
                 sb.AppendLine("      </el-form-item>");

ZR.CodeGenerator/CodeGeneratorTool.cs

@@ -181,6 +181,9 @@ namespace ZR.CodeGenerator
                 case "crud":
                     fileName = "TplVue.txt";
                     break;
+                case "select":
+                    fileName = "TplVueSelect.txt";
+                    break;
                 default:
                     break;
             }
@@ -189,7 +192,6 @@ namespace ZR.CodeGenerator
             tpl.Set("VueViewEditFormRuleContent", replaceDto.VueViewEditFormRuleContent);//添加、修改表单验证规则
             tpl.Set("VueViewFormContent", replaceDto.VueViewFormHtml);//添加、修改表单
             tpl.Set("VueViewListContent", replaceDto.VueViewListHtml);//查询 table列
-            //tpl.Set("lowerBusinessName", FirstLowerCase(generateDto.GenTable.BusinessName));
 
             var result = tpl.Render();
             var fullPath = generateDto.IsPreview ? string.Empty : Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "views", generateDto.GenTable.ModuleName.FirstLowerCase(), $"{generateDto.GenTable.BusinessName.FirstUpperCase()}.vue");

ZR.Vue/src/views/system/dept/index.vue

@@ -26,7 +26,8 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId" :default-expand-all="isExpandAll" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+    <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId" :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
       <el-table-column prop="leader" label="负责人" width="100"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
@@ -44,7 +45,8 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
-          <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
+          <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dept:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -52,7 +54,7 @@
     <!-- 添加或修改部门对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
+        <el-row :gutter="20">
           <el-col :lg="24" v-if="form.parentId !== 0">
             <el-form-item label="上级部门" prop="parentId">
               <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
@@ -93,8 +95,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取 消</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -36,12 +36,12 @@
               <el-input v-model="scope.row.csharpField"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="插入" min-width="5%">
+          <el-table-column label="插入" min-width="5%" v-if="info.tplCategory != 'select'">
             <template slot-scope="scope">
               <el-checkbox v-model="scope.row.isInsert" :disabled="scope.row.isIncrement"></el-checkbox>
             </template>
           </el-table-column>
-          <el-table-column label="编辑" min-width="5%">
+          <el-table-column label="编辑" min-width="5%" v-if="info.tplCategory != 'select'">
             <template slot-scope="scope">
               <el-checkbox v-model="scope.row.isEdit" :disabled="scope.row.isPk  || scope.row.isIncrement"></el-checkbox>
             </template>

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

@@ -6,7 +6,7 @@
           <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="select" />
             <el-option label="树表（增删改查）" value="tree" />
             <!-- <el-option label="导航查询" value="subNav"></el-option> -->
             <!-- <el-option label="主子表（增删改查）" value="sub" /> -->
@@ -125,7 +125,7 @@
           </el-input>
         </el-form-item>
       </el-col>
-      <el-col :lg="24">
+      <el-col :lg="24" v-show="info.tplCategory != 'select'">
         <el-form-item label="显示按钮">
           <el-checkbox-group v-model="checkedBtn" @change="checkedBtnSelect">
             <el-checkbox :label="1">

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

@@ -7,7 +7,6 @@
       </el-form-item>
       <el-form-item>
         <el-button size="mini" type="primary" icon="el-icon-search" @click="handleSearch()">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <!-- <el-button type="default" icon="el-icon-refresh" size="small" @click="loadTableData()">刷新</el-button> -->
       </el-form-item>
     </el-form>
@@ -36,7 +35,7 @@
       <el-table-column prop="className" label="实体" :show-overflow-tooltip="true" />
       <el-table-column prop="createTime" label="创建时间" />
       <el-table-column prop="updateTime" label="更新时间" />
-      <el-table-column label="操作" align="center" width="350">
+      <el-table-column label="操作" align="center" width="320">
         <template slot-scope="scope">
           <el-button type="text" icon="el-icon-view" @click="handlePreview(scope.row)" v-hasPermi="['tool:gen:preview']">预览</el-button>
           <el-button type="text" icon="el-icon-edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:gen:edit']">编辑</el-button>