From 956b496fa079c27bb775debd9e8e88337d650253 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: Sun, 22 May 2022 18:07:33 +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=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/v3/Vue.txt        | 43 +++++++------------
 ZR.CodeGenerator/CodeGeneratorTool.cs         |  1 +
 ZR.Model/System/Generate/GenTable.cs          | 29 ++-----------
 ZR.Model/System/Generate/GenTableColumn.cs    | 11 +++++
 4 files changed, 32 insertions(+), 52 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 451da59..4c4f917 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -138,7 +138,6 @@ $else
 $end
 $end
 $end
-
       <el-table-column label="操作" align="center" width="140">
         <template #default="scope">
 $if(replaceDto.ShowBtnEdit)
@@ -160,7 +159,6 @@ $end
         <el-row :gutter="20">
 $foreach(column in genTable.Columns)
 $set(labelName = "")
-$set(labelDisabled = "")
 $set(columnName = column.CsharpFieldFl)
 $set(value = "item.dictValue")
 $if(column.ColumnComment != "")
@@ -168,19 +166,12 @@ $set(labelName = column.ColumnComment)
 $else
 $set(labelName = column.CsharpFieldFl)
 $end
-$if(column.IsPk == true)
-$set(labelDisabled = ":disabled=true")
-$end
 $if(column.CsharpType == "int" || column.CsharpType == "long")
     $set(value = "parseInt(item.dictValue)")
 $end
 
-$if(column.IsInsert == false && column.IsEdit == false)
-          <el-col :lg="12" v-if="opertype == 2">
-            <el-form-item label="${labelName}">{{form.${columnName}}}</el-form-item>
-          </el-col>
-$elseif(column.IsPK || column.IsIncrement)
-          <el-col :lg="12">
+$if(column.IsPK || column.IsIncrement)
+          <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
 $if(column.IsIncrement == false)
               <el-input-number v-model.number="form.${columnName}" controls-position="right" placeholder="请输入${labelName}" :disabled="title=='修改数据'"/>
@@ -191,15 +182,15 @@ $end
           </el-col>
 $else
 $if(column.HtmlType == "inputNumber")
-          <el-col :lg="12">
+          <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input-number v-model.number="form.${columnName}" controls-position="right" placeholder="请输入${labelName}" ${labelDisabled}/>
+              <el-input-number v-model.number="form.${columnName}" controls-position="right" placeholder="请输入${labelName}" ${column.DisabledStr}/>
             </el-form-item>
           </el-col>
 $elseif(column.HtmlType == "datetime")
-          <el-col :lg="12">
+          <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-date-picker v-model="form.${columnName}" type="datetime" placeholder="选择日期时间"></el-date-picker>
+              <el-date-picker v-model="form.${columnName}" type="datetime" placeholder="选择日期时间"${column.DisabledStr}></el-date-picker>
             </el-form-item>
           </el-col>
 $elseif(column.HtmlType == "imageUpload")
@@ -215,9 +206,9 @@ $elseif(column.HtmlType == "fileUpload")
             </el-form-item>
           </el-col>
 $elseif(column.HtmlType == "radio")
-          <el-col :lg="12">
+          <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-radio-group v-model="form.${columnName}">
+              <el-radio-group v-model="form.${columnName}"${column.DisabledStr}>
                 <el-radio v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="${value}">{{item.dictLabel}}</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -225,7 +216,7 @@ $elseif(column.HtmlType == "radio")
 $elseif(column.HtmlType == "textarea")
           <el-col :lg="24">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input type="textarea" v-model="form.${columnName}" placeholder="请输入${labelName}"/>
+              <el-input type="textarea" v-model="form.${columnName}" placeholder="请输入${labelName}"${column.DisabledStr}/>
             </el-form-item>
           </el-col>
 $elseif(column.HtmlType == "editor")
@@ -235,9 +226,9 @@ $elseif(column.HtmlType == "editor")
             </el-form-item>
           </el-col>
 $elseif(column.HtmlType == "select")
-          <el-col :lg="12">
+          <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-select v-model="form.${columnName}" placeholder="请选择${labelName}">
+              <el-select v-model="form.${columnName}" placeholder="请选择${labelName}"${column.DisabledStr}>
                 <el-option v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictLabel" :value="${value}"></el-option>
               </el-select>
             </el-form-item>
@@ -245,15 +236,15 @@ $elseif(column.HtmlType == "select")
 $elseif(column.HtmlType == "checkbox")
           <el-col :lg="24">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-checkbox-group v-model="form.${columnName}Checked">
+              <el-checkbox-group v-model="form.${columnName}Checked"${column.DisabledStr}>
                 <el-checkbox v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </el-col>
 $else
-          <el-col :lg="12">
+          <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input v-model="form.${columnName}" placeholder="请输入${labelName}" ${labelDisabled}/>
+              <el-input v-model="form.${columnName}" placeholder="请输入${labelName}" ${column.DisabledStr}/>
             </el-form-item>
           </el-col>
 $end
@@ -262,10 +253,8 @@ $end
         </el-row>
       </el-form>
       <template #footer>
-        <div class="dialog-footer">
-          <el-button text @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
-          <el-button type="primary" @click="submitForm">{{ ${t}t('btn.submit') }}</el-button>
-        </div>
+        <el-button text @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">{{ ${t}t('btn.submit') }}</el-button>
       </template>
     </el-dialog>
 
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 5a18f89..1198904 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -222,6 +222,7 @@ namespace ZR.CodeGenerator
             tpl.Set("treeCode", generateDto.GenTable?.Options?.TreeCode?.FirstLowerCase());
             tpl.Set("treeName", generateDto.GenTable?.Options?.TreeName?.FirstLowerCase());
             tpl.Set("treeParentCode", generateDto.GenTable?.Options?.TreeParentCode?.FirstLowerCase());
+            tpl.Set("options", generateDto.GenTable?.Options);
 
             var result = tpl.Render();
             var fullPath = Path.Combine(generateDto.VueParentPath, "src", "views", generateDto.GenTable.ModuleName.FirstLowerCase(), $"{generateDto.GenTable.BusinessName.FirstUpperCase()}.vue");
diff --git a/ZR.Model/System/Generate/GenTable.cs b/ZR.Model/System/Generate/GenTable.cs
index 1fc6ad7..482ff3e 100644
--- a/ZR.Model/System/Generate/GenTable.cs
+++ b/ZR.Model/System/Generate/GenTable.cs
@@ -80,31 +80,6 @@ namespace ZR.Model.System.Generate
         [SqlSugar.SugarColumn(IsIgnore = true)]
         public List<GenTableColumn> Columns { get; set; }
 
-        //以下 Options扩展字段
-        //[SqlSugar.SugarColumn(IsIgnore = true)]
-        //public object ParentMenuId { get; set; }
-        //[SqlSugar.SugarColumn(IsIgnore = true)]
-        //public object SortType { get; set; } = "asc";
-
-        //[SqlSugar.SugarColumn(IsIgnore = true)]
-        //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; }
-        //[SqlSugar.SugarColumn(IsIgnore = true)]
-        //public string PermissionPrefix { get; set; }
-        /// <summary>
-        /// 生成的按钮功能
-        /// </summary>
-        //[SqlSugar.SugarColumn(IsIgnore = true)]
-        //public int[] CheckedBtn { get; set; } = new int[] { 1, 2, 3 };
-
         /// <summary>
         /// 字表信息
         /// </summary>
@@ -126,5 +101,9 @@ namespace ZR.Model.System.Generate
         /// 额外参数字符串
         /// </summary>
         public int[] CheckedBtn { get; set; } = new int[] { 1, 2, 3 };
+        /// <summary>
+        /// 列大小 12,24
+        /// </summary>
+        public int ColNum { get; set; } = 12;
     }
 }
diff --git a/ZR.Model/System/Generate/GenTableColumn.cs b/ZR.Model/System/Generate/GenTableColumn.cs
index 0f491ae..72efcbd 100644
--- a/ZR.Model/System/Generate/GenTableColumn.cs
+++ b/ZR.Model/System/Generate/GenTableColumn.cs
@@ -114,6 +114,17 @@ namespace ZR.Model.System.Generate
         /// </summary>
         [SugarColumn(IsIgnore = true)]
         public string CsharpFieldFl { get; set; }
+        /// <summary>
+        /// 前端 只读字段
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public string DisabledStr
+        {
+            get
+            {
+                return (((!IsInsert && !IsEdit) || IsPk) && !IsRequired) ? " :disabled=\"true\"" : "";
+            }
+        }
 
         #endregion
     }