chore: 优化代码生成模板并修复部分已知bug

Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs

@@ -15,7 +15,7 @@ public class EnumToDictJob : IJob
 {
     private readonly IServiceScopeFactory _scopeFactory;
     private const int OrderOffset = 10;
-    private const string DefaultTagType = "info";
+    private const string DefaultTagType = "primary";
 
     public EnumToDictJob(IServiceScopeFactory scopeFactory)
     {

Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Dto.cs.vm

@@ -4,7 +4,7 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
-namespace @Model.NameSpace;
+namespace @Model.NameSpace.Service;
 
 /// <summary>
 /// @(Model.BusName)输出参数

Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Entity.cs.vm

@@ -7,7 +7,7 @@
 @if(Model.BaseClassName!=""){
 @:using Admin.NET.Core;
 }
-namespace @Model.NameSpace;
+namespace @Model.NameSpace.Entity;
 
 /// <summary>
 /// @(Model.Description)

Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Input.cs.vm

@@ -7,7 +7,7 @@
 using Admin.NET.Core;
 using System.ComponentModel.DataAnnotations;
 
-namespace @Model.NameSpace;
+namespace @Model.NameSpace.Service;
 
 /// <summary>
 /// @(Model.BusName)基础输入参数
@@ -30,24 +30,21 @@ if (column.ColumnKey != "True" && column.WhetherAddUpdate == "Y" && !(column.Net
 /// </summary>
 public class Page@(Model.ClassName)Input : BasePageInput
 {
-@foreach (var column in Model.TableField){
-    if (column.QueryWhether == "Y"){
-    @:/// <summary>
-    @:/// @column.ColumnComment
-    @:/// </summary>
-    @:public @column.NetType.TrimEnd('?')? @column.PropertyName { get; set; }
-    }
-
+@foreach (var column in Model.TableField.Where(u => u.QueryWhether == "Y")){
     if(column.NetType?.TrimEnd('?') == "DateTime" && column.QueryType == "~"){
     @:/// <summary>
     @: /// @(column.ColumnComment)范围
     @: /// </summary>
     @: public DateTime?[] @(column.PropertyName)Range { get; set; }
+    } else {
+    @:/// <summary>
+    @:/// @column.ColumnComment
+    @:/// </summary>
+    @:public @column.NetType.TrimEnd('?')? @column.PropertyName { get; set; }
     }
     @:
 }
 }
-}
 
 /// <summary>
 /// @(Model.BusName)增加输入参数

Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Output.cs.vm

@@ -4,7 +4,7 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
-namespace @Model.NameSpace;
+namespace @Model.NameSpace.Service;
 
 /// <summary>
 /// @(Model.BusName)输出参数

Admin.NET/Admin.NET.Web.Entry/wwwroot/template/SeedData.cs.vm

@@ -7,7 +7,7 @@
 using Admin.NET.Core;
 using @Model.EntityNameSpace;
 
-namespace @Model.NameSpace;
+namespace @Model.NameSpace.SeedData;
 
 /// <summary>
 /// @(Model.Description) 表种子数据

Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Service.cs.vm

@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Http;
     var hasdictService = dictTableField.Count() > 0;
     var importField = Model.TableField.Where(x => x.WhetherImport == "Y");
 }
-namespace @Model.NameSpace;
+namespace @Model.NameSpace.Service;
 
 /// <summary>
 /// @(Model.BusName)服务

Admin.NET/Admin.NET.Web.Entry/wwwroot/template/index.vue.vm

@@ -146,7 +146,7 @@
           if (isStatus) {
             @:<el-switch v-model="scope.row.@column.LowerPropertyName" :active-value="1" :inactive-value="2" size="small" @@change="change@(Model.ClassName)Status(scope.row)" />
           } else {
-            @:<dict-label :value="scope.row.@column.LowerPropertyName" code="@column.DictTypeCode" prop-label="value" prop-value="code" />
+            @:<dict-label :value="scope.row.@column.LowerPropertyName" code="@column.DictTypeCode" />
           }
           @:</template>
         @:</el-table-column>
@@ -329,13 +329,13 @@
 
   // 批量删除
   const batchDel@(@Model.ClassName) = () => {
-    ElMessageBox.confirm(`确定要删除${selectData.length}条记录吗?`, "提示", {
+    ElMessageBox.confirm(`确定要删除${selectData.value.length}条记录吗?`, "提示", {
       confirmButtonText: "确定",
       cancelButtonText: "取消",
       type: "warning",
     }).then(async () => {
       @foreach (var column in @Model.TableField.Where(u => u.ColumnKey == "True")) {
-      @:const count = await batchDelete@(@Model.ClassName)({ @(@column.LowerPropertyName)List: selectData.map(u => u.@(@column.LowerPropertyName)) });
+      @:const count = await batchDelete@(@Model.ClassName)({ @(@column.LowerPropertyName)List: selectData.value.map(u => u.@(@column.LowerPropertyName)) });
       }
       handleQuery();
       ElMessage.success(`成功批量删除${count}条记录`);