From d1fc87bcc391ad46d45a5fb5569144ff04e10cb9 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: Tue, 14 Dec 2021 15:40:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E5=8A=A0CheckBox?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/TplVue.txt        |  25 +++++++++++++++---
 ZR.CodeGenerator/CodeGenerateTemplate.cs      |  15 +++++++++++
 document/admin-mysql.sql                      |   1 +
 document/admin-sqlserver-表字段说明导入.sql   | Bin 106144 -> 108670 bytes
 document/admin-sqlserver.sql                  | Bin 115860 -> 113428 bytes
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index d51dee7..832e1be 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -195,6 +195,9 @@ $foreach(item in genTable.Columns)
 $if((item.IsEdit || item.IsInsert))
         $item.ColumnName: undefined,
 $end
+$if((item.HtmlType == "checkbox"))
+        ${item.ColumnName}Checked: [],
+$end
 $end
       };
       this.resetForm("form");
@@ -247,10 +250,19 @@ $end
       this.reset();
       const id = row.${replaceDto.FistLowerPk} || this.ids;
       get${genTable.BusinessName}(id).then((res) => {
-        if (res.code == 200) {
-           this.form = res.data;
-           this.open = true;
-           this.title = "修改数据";
+        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.ColumnName}Checked: data.${item.columnName} ? data.${item.columnName}.split(',') : [],
+$end
+$end
+          };
         }
       });
     },
@@ -288,6 +300,11 @@ $end
     submitForm: function () {
       this.${refs}refs["form"].validate((valid) => {
         if (valid) {
+$foreach(item in genTable.Columns)
+$if(item.HtmlType == "checkbox")
+           this.form.${item.ColumnName} = this.form.${item.columnName}Checked.toString();
+$end
+$end
           console.log(JSON.stringify(this.form));
           
           if (this.form.${replaceDto.FistLowerPk} != undefined || this.title === "修改数据") {
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index 57ce232..d1549be 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -118,6 +118,21 @@ namespace ZR.CodeGenerator
                 sb.AppendLine("      </el-form-item>");
                 sb.AppendLine("    </el-col>");
             }
+            else if( dbFieldInfo.HtmlType == GenConstants.HTML_CHECKBOX)
+            {
+                //多选框
+                sb.AppendLine("    <el-col :span=\"12\">");
+                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>");
+                sb.AppendLine("    </el-col>");
+            }
             else
             {
                 string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
diff --git a/document/admin-mysql.sql b/document/admin-mysql.sql
index d3dfecf..ab61158 100644
--- a/document/admin-mysql.sql
+++ b/document/admin-mysql.sql
@@ -717,6 +717,7 @@ CREATE TABLE `gen_demo`  (
   `remark` VARCHAR(200) COMMENT '备注',
   `beginTime` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
   `endTime` datetime(0) NULL DEFAULT NULL COMMENT '结束时间',
+  `feature` varchar(100) NULL COMMENT '特征'
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
diff --git a/document/admin-sqlserver-表字段说明导入.sql b/document/admin-sqlserver-表字段说明导入.sql
index f6784aef029ce1c18f760f44b0d999efb028dcf6..537002d3282582ceb220603d7386b0cafc2fe09c 100644
GIT binary patch
delta 1338
zcmZ3mm+jvLwuUW?3+7F(@!{c9V0i4uSRr33kmQ|vwR`f1xgwKOn6;RB8Mr2Y<W?2-
zV^C*!)i^IAlOYAj(qRCJKa>=9RA2zfq%b5g<io^)bO?hZgA;=fgDY4Jq9&aol_8HI
z9;h~zAs3-~@<m}`VTcNd*+7#S+!_3*7m6~9B0GT}WD#%3hf1nj&!{lH(TY)+8K<rP
z!rY5!VC&?EbFo_r4sE+MtIBOfj0se?SQ!%9#S9t1SSV)*W+-7u1maSLVo(6%2z{`V
ze&;R-`j+}-D%G7N3vp5+Fma>+6Hg{Efus_0j7F(>l6r!65Y-(c3Jaf9h6+560H?=E
z$^CIucK|Rw9&E;u9>MXz5Pv$7Ch?#M@p=+4^wWW{kVkA>T&{~xr-_502?JDe5R)*#
Val#(?B8L`n(m0P%e6r0l4gi#d_d@^x

delta 11
Tcmex&fo;KFwuUW?3+4d;B+CV>

diff --git a/document/admin-sqlserver.sql b/document/admin-sqlserver.sql
index 8e3e93bd02b7a1c118c37971fcf77a608abd3338..009bed223ae25f012a4f721efa365118efe9e29a 100644
GIT binary patch
delta 52
zcmbQz$v)*9Tf-K{O<SkiY+>Z#Ph&`BNMtBsC}k)DvSKF(s>x3OkjW@D{m53vj_o`L
H7&}-1>ueGj

delta 2526
zcmc(hPfG$p7{=d)NC>?23A$}i_n<?dCU(dIwa`mz{>heFjop=$ps8D(f-s~@^ckY;
zLv-v*M5hiRK@dH&gY60hJMM;vGt17OcYgCc^Uikqlb!R($-Q#-(EZSr>Fz{NIb%u6
zQ<4%iLlzy7M%z@uuSzYlQP!R33R+BRpsb>{sZCLuB9+pV#fW9RwWy319X)K64UAK1
z9&@gtem%X(>zIeX5#zFmw}Pl?iZM^e3Y9R_?Uth$#c35C-N|asqBLh&#!&ABt)uS-
zCgni~!9`#mHidRx^S=wt{);-AduzKW9%9ep0L+FM!XU0gLIb;`I;6i-yU;9Lt-m%?
zrVnZtn(H41wGIOc+x@MzOYK6lFdV+Lv)JyLN>PejfV033w`dpShd7Ehl((sg!{|?Y
zz6&h8bN*@EX8P6lE2&)wOMj8Ja!5Y@y&p3FY;&Qc7Uwc!;kTe=OG5X7?9TZQmftVS
z7h6)y!ui7Z-uy3{+b#H>Uq}AkKA`5x3urd#tw!2YLE7zJay;XbV$N+POJ2hIYw&s<
zxl`8h!+XGj-0aWCS}ounu%DY+b`QkI$yoU#g_r%2oiFr{kEFi|{S9P$llDk`JnAXe
F6W<aAiI@NY