From ca9fadaef6d1fcbe6c5dc2a7051ab9ad1247577e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 8 Dec 2021 13:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/ZR.Admin.WebApi.csproj        |  1 -
 ZR.Admin.WebApi/appsettings.json              |  8 ++--
 .../wwwroot/CodeGenTemplate/TplVue.txt        | 41 +++++++++++--------
 ZR.CodeGenerator/CodeGenerateTemplate.cs      | 40 +++++++++---------
 ZR.CodeGenerator/CodeGeneratorTool.cs         |  2 +-
 ZR.Vue/src/views/tool/gen/editTable.vue       |  4 +-
 6 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
index 0b71c00..cbd8d09 100644
--- a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
+++ b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
@@ -67,7 +67,6 @@
 
   <ItemGroup>
     <Folder Include="Controllers\business\" />
-    <Folder Include="Controllers\demo\" />
     <Folder Include="wwwroot\export\" />
     <Folder Include="wwwroot\Generatecode\" />
     <Folder Include="wwwroot\uploads\" />
diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json
index bd00d8f..84d5bda 100644
--- a/ZR.Admin.WebApi/appsettings.json
+++ b/ZR.Admin.WebApi/appsettings.json
@@ -18,10 +18,10 @@
     "cors": "http://localhost:8887" //跨域地址（前端启动项目），多个用","隔开
   },
   "JwtSettings": {
-    "Issuer": "https://localhost:8888",
-    "Audience": "https://localhost:8888",
-    "SecretKey": "Hello-key-ZRADMIN.NET-20210101",
-    "Expire": 5
+    "Issuer": "ZRAdmin.NET",
+    "Audience": "ZRAdmin.NET",
+    "SecretKey": "SecretKey-ZRADMIN.NET-20210101",
+    "Expire": 30
   },
   "DemoMode": false, //是否演示模式
   "DbKey": "", //数据库加密key
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index 8f42fec..2606a9c 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -38,9 +38,7 @@ ${VueViewListContent}
       <el-table-column label="鎿嶄綔" align="center" width="200">
         <template slot-scope="scope">
           <el-button v-hasPermi="['${replaceDto.PermissionPrefix}:update']" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">缂栬緫</el-button>
-          <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="handleDelete(scope.row)" style="margin-left:10px">
-            <el-button slot="reference"  v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" type="text" icon="el-icon-delete">鍒犻櫎</el-button>
-          </el-popconfirm>
+          <el-button v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -50,7 +48,7 @@ ${VueViewListContent}
     <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" >
       <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
         <el-row>
-    ${VueViewFormContent}
+${VueViewFormContent}
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer" v-if="btnSubmitVisible">
@@ -91,7 +89,10 @@ export default {
       // 鏄剧ず鎼滅储鏉′欢
       showSearch: true,
       // 鏌ヨ鍙傛暟
-      queryParams: {},
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20
+      },
       // 寮瑰嚭灞傛爣棰�
       title: "",
       // 鏄惁鏄剧ず寮瑰嚭灞�
@@ -109,7 +110,6 @@ $elseif(item.HtmlType == "datetime" && item.IsQuery == true)
       dateRange${item.CsharpField}: [],
 $end
 $end
-
 $if(genTable.SortField != "" && genTable.SortField != null)
       // 鏄惁鏄剧ず缂栬緫鎺掑簭
       showEditSort: false,
@@ -122,7 +122,14 @@ $end
       btnSubmitVisible: true,
       // 琛ㄥ崟鏍￠獙
       rules: {
-${VueViewEditFormRuleContent}
+$foreach(column in genTable.Columns)
+$if(column.IsRequired)
+        ${column.ColumnName}: [
+          { 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
       },
     };
   },
@@ -181,11 +188,6 @@ $if(item.HtmlType == "datetime" && item.IsQuery == true)
 $end
 $end
       this.resetForm("queryForm");
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 20,
-        //TODO 閲嶇疆瀛楁
-      };
       this.handleQuery();
     },
     // 澶氶�夋閫変腑鏁版嵁
@@ -196,6 +198,7 @@ $end
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
+      this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -207,10 +210,16 @@ $end
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const Ids = row.${replaceDto.FistLowerPk} || this.ids;
-      del${genTable.BusinessName}(Ids).then((res) => {
-        this.msgSuccess("鍒犻櫎鎴愬姛");
-        this.handleQuery();
-      });
+
+      this.${confirm}confirm('鏄惁纭鍒犻櫎鍙傛暟缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�')
+        .then(function () {
+          return del${genTable.BusinessName}(Ids);
+        })
+        .then(() => {
+          this.handleQuery();
+          this.msgSuccess("鍒犻櫎鎴愬姛");
+        })
+        .catch(() => {});
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index 8c0cd4e..57394a1 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -42,25 +42,25 @@ namespace ZR.CodeGenerator
 
         #region vue 妯℃澘
 
-        /// <summary>
-        /// Vue rules
-        /// </summary>
-        /// <param name="dbFieldInfo"></param>
-        /// <returns></returns>
-        public static string TplFormRules(GenTableColumn dbFieldInfo)
-        {
-            StringBuilder sbRule = new StringBuilder();
-            //Rule 瑙勫垯楠岃瘉
-            if (!dbFieldInfo.IsPk && !dbFieldInfo.IsIncrement && dbFieldInfo.IsRequired)
-            {
-                sbRule.AppendLine($"        {dbFieldInfo.ColumnName}: [{{ required: true, message: '璇疯緭鍏dbFieldInfo.ColumnComment}', trigger: \"blur\"}}],");
-            }
-            else if (CodeGeneratorTool.IsNumber(dbFieldInfo.ColumnType) && dbFieldInfo.IsRequired)
-            {
-                sbRule.AppendLine($"        {dbFieldInfo.ColumnName}: [{{ type: 'number', message: '{dbFieldInfo.ColumnName}蹇呴』涓烘暟瀛楀��', trigger: \"blur\"}}],");
-            }
-            return sbRule.ToString();
-        }
+        ///// <summary>
+        ///// Vue rules
+        ///// </summary>
+        ///// <param name="dbFieldInfo"></param>
+        ///// <returns></returns>
+        //public static string TplFormRules(GenTableColumn dbFieldInfo)
+        //{
+        //    StringBuilder sbRule = new StringBuilder();
+        //    //Rule 瑙勫垯楠岃瘉
+        //    if (!dbFieldInfo.IsPk && !dbFieldInfo.IsIncrement && dbFieldInfo.IsRequired)
+        //    {
+        //        sbRule.AppendLine($"        {dbFieldInfo.ColumnName}: [{{ required: true, message: '璇疯緭鍏dbFieldInfo.ColumnComment}', trigger: \"blur\"}}],");
+        //    }
+        //    else if (CodeGeneratorTool.IsNumber(dbFieldInfo.ColumnType) && dbFieldInfo.IsRequired)
+        //    {
+        //        sbRule.AppendLine($"        {dbFieldInfo.ColumnName}: [{{ type: 'number', message: '{dbFieldInfo.ColumnName}蹇呴』涓烘暟瀛楀��', trigger: \"blur\"}}],");
+        //    }
+        //    return sbRule.ToString();
+        //}
 
         /// <summary>
         /// Vue 娣诲姞淇敼琛ㄥ崟
@@ -133,7 +133,7 @@ namespace ZR.CodeGenerator
             {
                 sb.AppendLine("    <el-col :span=\"24\">");
                 sb.AppendLine($"      <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
-                sb.AppendLine($"        <el-input type=\"textarea\" v-model=\"form.{columnName}\" placeholder=\"璇疯緭鍏ュ唴瀹筡"/>");
+                sb.AppendLine($"        <el-input type=\"textarea\" v-model=\"form.{columnName}\" placeholder=\"璇疯緭鍏labelName}\"/>");
                 sb.AppendLine("      </el-form-item>");
                 sb.AppendLine("    </el-col>");
             }
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index c863a5f..663d845 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -69,7 +69,7 @@ namespace ZR.CodeGenerator
 
                 replaceDto.VueViewFormHtml += CodeGenerateTemplate.TplVueFormContent(dbFieldInfo);
                 replaceDto.VueViewListHtml += CodeGenerateTemplate.TplTableColumn(dbFieldInfo, dto.GenTable);
-                replaceDto.VueViewEditFormRuleContent += CodeGenerateTemplate.TplFormRules(dbFieldInfo);
+                //replaceDto.VueViewEditFormRuleContent += CodeGenerateTemplate.TplFormRules(dbFieldInfo);
                 replaceDto.VueQueryFormHtml += CodeGenerateTemplate.TplQueryFormHtml(dbFieldInfo);
             }
 
diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue
index 5f50c81..93c22cf 100644
--- a/ZR.Vue/src/views/tool/gen/editTable.vue
+++ b/ZR.Vue/src/views/tool/gen/editTable.vue
@@ -79,7 +79,7 @@
                 <el-option label="鏂囨湰鍩�" value="textarea" />
                 <el-option label="涓嬫媺妗�" value="select" />
                 <el-option label="鍗曢�夋" value="radio" />
-                <el-option label="澶嶉�夋" value="checkbox" />
+                <!-- <el-option label="澶嶉�夋" value="checkbox" /> -->
                 <el-option label="鏃ユ湡鎺т欢" value="datetime" />
                 <el-option label="鍥剧墖涓婁紶" value="imageUpload" />
                 <el-option label="鏂囦欢涓婁紶" value="fileUpload" />
@@ -89,7 +89,7 @@
           </el-table-column>
           <el-table-column label="瀛楀吀绫诲瀷" min-width="12%">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.dictType" clearable filterable placeholder="璇烽�夋嫨" :disabled="scope.row.htmlType == 'datetime'">
+              <el-select v-model="scope.row.dictType" clearable filterable placeholder="璇烽�夋嫨" v-if="scope.row.htmlType == 'select' || scope.row.htmlType == 'radio' || scope.row.htmlType =='checkbox'">
                 <el-option v-for="dict in dictOptions" :key="dict.dictType" :label="dict.dictName" :value="dict.dictType">
                   <span style="float: left">{{ dict.dictName }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.dictType }}</span>