From 78213d91cf7c1c76b1dc24f917f81baca63e0c1d 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: Sat, 16 Dec 2023 16:33:01 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=E4=BC=98=E5=8C=96=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/app/api.txt       |  4 ++--
 .../wwwroot/CodeGenTemplate/app/form.txt      | 24 ++++++++++---------
 .../wwwroot/CodeGenTemplate/app/vue2.txt      | 12 ++++++----
 ZR.CodeGenerator/CodeGenerateTemplate.cs      |  7 +-----
 .../{ => Model}/CodeGenerateOption.cs         |  7 +-----
 5 files changed, 24 insertions(+), 30 deletions(-)
 rename ZR.CodeGenerator/{ => Model}/CodeGenerateOption.cs (89%)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt
index d1f318e..30f869c 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt
@@ -56,7 +56,7 @@ $if(replaceDto.ShowBtnDelete || replaceDto.ShowBtnMultiDel)
 */
 export function del${genTable.BusinessName}(pid) {
   return request({
-    url: '/${genTable.ModuleName}/${genTable.BusinessName}/' + pid,
+    url: '/${genTable.ModuleName}/${genTable.BusinessName}/delete/' + pid,
     method: 'delete'
   })
 }
@@ -73,6 +73,6 @@ $end
 $if(replaceDto.ShowBtnExport)
 // 导出${genTable.functionName}
 export async function export${genTable.BusinessName}(query) {
-  await downFile('$/{genTable.ModuleName}/${genTable.BusinessName}/export', { ...query })
+  await downFile('/${genTable.ModuleName}/${genTable.BusinessName}/export', { ...query })
 }
 $end
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt
index 4d6dd90..429ae15 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt
@@ -12,7 +12,7 @@ $if(column.CsharpType == "int" || column.CsharpType == "long")
 $end
 
 $if(column.IsPK || column.IsIncrement)
-$if(column.IsPK && column.IsIncrement == false)
+$if(column.IsPK && column.IsIncrement == false && replaceDto.useSnowflakeId == false)
       <u-form-item label="${labelName}" prop="${columnName}">
         <u--input type="number" v-model.number="form.${columnName}" placeholder="请输入${labelName}" :disabled="opertype != 1"></u--input>
       </u-form-item>
@@ -83,7 +83,6 @@ $end
 </template>
 
 <script>
-  import "@/static/scss/page.scss";
   import {
     get${genTable.BusinessName},
 $if(replaceDto.ShowBtnAdd) 
@@ -92,15 +91,9 @@ $end
 $if(replaceDto.ShowBtnEdit) 
     update${genTable.BusinessName},
 $end
-  }
-from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
+  } from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
 
   export default {
-$if(replaceDto.UploadFile == 1)
-    components: {
-      UploadImage
-    },
-$end
     dicts: [
 $foreach(item in genTable.Columns)
 $if((item.HtmlType == "radio" || item.HtmlType.Contains("select") || item.HtmlType == "checkbox") && item.DictType != "")
@@ -110,7 +103,15 @@ $end
     ],
     data() {
       return {
-        form: {},
+        form: {
+$foreach(item in genTable.Columns)
+$if(item.HtmlType == "checkbox")
+          ${item.CsharpFieldFl}Checked: [],
+$else
+          $item.CsharpFieldFl: undefined,
+$end
+$end
+        },
         rules: {
 $foreach(column in genTable.Columns)
 $if(column.IsRequired && column.IsIncrement == false)
@@ -202,7 +203,8 @@ $end
   }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+  @import "@/static/scss/page.scss";
   .btn-wrap {
     margin: 150rpx auto 0 auto;
     width: 80%
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt
index c964ad9..189ffba 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt
@@ -134,14 +134,12 @@ $end
   import {
     checkPermi
   } from '@/utils/permission.js'
-  import "@/static/scss/page.scss";
-  import { 
+  import {
     list${genTable.BusinessName},
 $if(replaceDto.ShowBtnDelete)
     del${genTable.BusinessName},
 $end
-  }
-  from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
+  } from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
 
   import {
     getDate
@@ -285,4 +283,8 @@ $end
       }
     }
   }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+  @import "@/static/scss/page.scss";
+</style>
\ No newline at end of file
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index a0cc978..9601729 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Linq;
-using System.Text;
-using ZR.Model.System.Generate;
-
-namespace ZR.CodeGenerator
+namespace ZR.CodeGenerator
 {
     /// <summary>
     /// 代码生成模板
diff --git a/ZR.CodeGenerator/CodeGenerateOption.cs b/ZR.CodeGenerator/Model/CodeGenerateOption.cs
similarity index 89%
rename from ZR.CodeGenerator/CodeGenerateOption.cs
rename to ZR.CodeGenerator/Model/CodeGenerateOption.cs
index ca906e2..66398aa 100644
--- a/ZR.CodeGenerator/CodeGenerateOption.cs
+++ b/ZR.CodeGenerator/Model/CodeGenerateOption.cs
@@ -1,4 +1,4 @@
-namespace ZR.CodeGenerator
+namespace ZR.CodeGenerator.Model
 {
     public class CodeGenerateOption
     {
@@ -39,11 +39,6 @@
         /// Api控制器命名空间
         /// </summary>
         public string ApiControllerNamespace { get; set; }
-
-        /// <summary>
-        /// 去掉的表头字符
-        /// </summary>
-        public string ReplaceTableNameStr { get; set; }
         /// <summary>
         /// 要生数据的表，用“，”分割
         /// </summary>