From e882dfcc0c5233178c6f5accd4f18097d6f2eef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BD=BB=E9=A3=8E2016?= <616036448@qq.com>
Date: Fri, 30 Aug 2024 10:18:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BFbug,=E6=B7=BB=E5=8A=A0=E5=9F=BA=E4=BA=8Eel-table?=
 =?UTF-8?q?=E7=9A=84index=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin.NET.Application.csproj              |   4 +
 .../SeedData/SysCodeGenTemplate.cs            |   4 +-
 .../Service/CodeGen/SysCodeGenService.cs      |   4 +-
 .../template/web_views_el_table_index.vue.vm  | 400 ++++++++++++++++++
 .../wwwroot/template/web_views_index.vue.vm   |  29 +-
 .../codeGen/component/editCodeGenDialog.vue   |   2 +-
 6 files changed, 428 insertions(+), 15 deletions(-)
 create mode 100644 Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_el_table_index.vue.vm

diff --git a/Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj b/Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj
index a2246779..e732ac1e 100644
--- a/Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj
+++ b/Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj
@@ -29,4 +29,8 @@
     <ProjectReference Include="..\Plugins\Admin.NET.Plugin.GoView\Admin.NET.Plugin.GoView.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Entity\" />
+  </ItemGroup>
+
 </Project>
diff --git a/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs b/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs
index 0574815c..e91a1ba2 100644
--- a/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs
+++ b/Admin.NET/Admin.NET.Core/SeedData/SysCodeGenTemplate.cs
@@ -11,7 +11,7 @@ namespace Admin.NET.Core;
 /// <summary>
 /// 代码生成模板配置表种子数据
 /// </summary>
-public class SysCodeGenTemplateSeedData : ISqlSugarEntitySeedData<SysCodeGenTemplate>
+public class SysCodeGenTemplateSeedData : ISqlSugarEntitySeedData<SysCodeGenTemplate>                                                                                 
 {
     /// <summary>
     /// 种子数据
@@ -28,6 +28,8 @@ public class SysCodeGenTemplateSeedData : ISqlSugarEntitySeedData<SysCodeGenTemp
             new SysCodeGenTemplate{ Id=36036980202001, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Backend, Name="service_Service.cs.vm", OutputFile="Service/{TableName}/{TableName}Service.cs", Describe ="(服务端)业务",IsDefault=true},
             new SysCodeGenTemplate{ Id=36036980202002, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Backend, Name="service_InputDto.cs.vm", OutputFile="Service/{TableName}/Dto/{TableName}Input.cs", Describe ="(服务端)输入参数",IsDefault=true},
             new SysCodeGenTemplate{ Id=36036980202003, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Backend, Name="service_OutputDto.cs.vm", OutputFile="Service/{TableName}/Dto/{TableName}Output.cs", Describe ="(服务端)输出参数",IsDefault=true},
+
+            new SysCodeGenTemplate{ Id=36036980203001, SysFlag=YesNoEnum.Y, Type=CodeGenTypeEnum.Frontend, Name="web_views_el_table_index.vue.vm", OutputFile="views/{PagePath}/{TableNameLower}/index.vue", Describe ="(WEB)列表页面,基于el-table",IsDefault=false},
         };
     }
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
index aee6ffb0..3de4e46a 100644
--- a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
@@ -115,8 +115,8 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         var templateRelations = GetCodeGenTemplateRelation(codeGen.Id, input.CodeGenTemplateIds);
         codeGen.CodeGenTemplateRelations = templateRelations;
         //await _db.Updateable(codeGen).ExecuteCommandAsync();
-        await _db.UpdateNav(codeGen)
-            .Include(t => t.CodeGenTemplateRelations)
+        await _db.UpdateNav(codeGen)
+            .Include(t => t.CodeGenTemplateRelations)
             .ExecuteCommandAsync();
 
         // 更新配置表
diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_el_table_index.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_el_table_index.vue.vm
new file mode 100644
index 00000000..3e1c528f
--- /dev/null
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_el_table_index.vue.vm
@@ -0,0 +1,400 @@
+@{
+  var pkField = Model.TableField.Where(c => c.ColumnKey == "True").FirstOrDefault();
+  string pkFieldName = null;
+  if(pkField != null && !string.IsNullOrEmpty(pkField.PropertyName))
+  {
+    pkFieldName = LowerFirstLetter(pkField.PropertyName);
+  }
+  Dictionary<string, int> definedObjects = new Dictionary<string, int>();
+  bool haveLikeCdt = false;
+  foreach (var column in Model.TableField){
+      if (column.QueryWhether == "Y" && column.QueryType == "like"){
+          haveLikeCdt = true;
+      }
+  }
+}
+<template>
+  <div class="@(@Model.LowerClassName)-container">
+    <el-card shadow="hover" :body-style="{ paddingBottom: '0' }"> 
+      @<el-form :model="queryParams" ref="queryForm" labelWidth="90">
+        @<el-row>
+              @if(Model.QueryWhetherList.Count > 0){
+          @if(haveLikeCdt){
+          @:<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
+            @:<el-form-item label="关键字">
+              @:<el-input v-model="queryParams.searchKey" clearable="" placeholder="请输入模糊查询关键字"/>
+              @:
+            </el-form-item>
+          </el-col>
+          }
+          foreach (var column in Model.QueryWhetherList){
+          @:<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+            if(@column.EffectType == "Input" || @column.EffectType == "InputTextArea"){
+            @:<el-form-item label="@column.ColumnComment">
+              @:<el-input v-model="queryParams.@(@column.LowerPropertyName)" clearable="" placeholder="请输入@(@column.ColumnComment)"/>
+              @:
+            </el-form-item>
+            }else if(@column.EffectType == "InputTextArea"){
+            @:<el-form-item label="@column.ColumnComment">
+              @:<el-input-number v-model="queryParams.@(@column.LowerPropertyName)"  clearable="" placeholder="请输入@(@column.ColumnComment)"/>
+              @:
+            </el-form-item>
+            }else if(@column.EffectType == "InputNumber"){
+            @:<el-form-item label="@column.ColumnComment">
+              @:<el-input-number v-model="queryParams.@(@column.LowerPropertyName)"  clearable="" placeholder="请输入@(@column.ColumnComment)"/>
+              @:
+            </el-form-item>
+            }else if(@column.EffectType == "fk"){
+            @:<el-form-item label="@column.ColumnComment">
+              @:<el-select clearable="" filterable="" v-model="queryParams.@(@column.LowerPropertyName)" placeholder="请选择@(@column.ColumnComment)">
+                @:<el-option v-for="(item,index) in @LowerFirstLetter(@column.FkEntityName)@(@column.PropertyName)DropdownList" :key="index" :value="item.value" :label="item.label" />
+                @:
+              </el-select>
+              @:
+            </el-form-item>
+            }else if(@column.EffectType == "Select"){
+            @:<el-form-item label="@column.ColumnComment">
+              @:<el-select clearable="" v-model="queryParams.@(@column.LowerPropertyName)" placeholder="请选择@(@column.ColumnComment)">
+                @:<el-option v-for="(item,index) in dl('@(@column.DictTypeCode)')" :key="index" :value="item.code" :label="`[${item.code}] ${item.value}`" />
+                @:
+              </el-select>
+              @:
+            </el-form-item>
+            }else if(@column.EffectType == "EnumSelector"){
+            @:<el-form-item label="@column.ColumnComment">
+              @:<el-select clearable="" v-model="queryParams.@(@column.LowerPropertyName)" placeholder="请选择@(@column.ColumnComment)">
+                @:<el-option v-for="(item,index) in dl('@(@column.DictTypeCode)')" :key="index" :value="item.value" :label="`${item.name} (${item.code}) [${item.value}] `" />
+                @:
+              </el-select>
+              @:
+            </el-form-item>
+            }else if(@column.EffectType == "DatePicker"){
+            @:<el-form-item label="@column.ColumnComment">
+              if(@column.QueryType == "~"){
+              @:<el-date-picker type="daterange" v-model="queryParams.@(@column.LowerPropertyName)Range"  value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" />
+              }else
+              {
+              @:<el-date-picker placeholder="请选择@(@column.ColumnComment)" value-format="YYYY/MM/DD"  v-model="queryParams.@(@column.LowerPropertyName)" />
+              }
+              @:
+            </el-form-item>
+            }
+          @:</el-col>
+            } 
+      }
+          @<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
+            @<el-form-item @(Model.QueryWhetherList.Count > 0?"":"label-width=\"0px\"")>
+              @<el-button-group style="display: flex; align-items: center;">
+                @<el-button type="primary"  icon="ele-Search" @@click="handleQuery" v-auth="'@(@Model.LowerClassName)/page'"> @(Model.QueryWhetherList.Count > 0?"查询":"刷新") </el-button>
+                   @if(Model.QueryWhetherList.Count > 0){
+                      @:<el-button icon="ele-Refresh" @@click="() => queryParams = {}"> 重置 </el-button>
+                        @if(haveLikeCdt){
+                        @:<el-button icon="ele-ZoomIn" @@click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left:5px;"> 高级查询 </el-button>
+                        @:<el-button icon="ele-ZoomOut" @@click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left:5px;"> 隐藏 </el-button>
+                        }
+                    }
+                @<el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @@click="openAdd@(@Model.ClassName)" v-auth="'@(@Model.LowerClassName)/add'"> 新增 </el-button>
+                @
+              </el-button-group>
+            </el-form-item>
+            @
+          @</el-col>
+        </el-row>
+        @* 操作区另起一行
+        @:<el-row>
+          @:<el-col>
+            @:<el-button-group style="margin-left:20px;margin-bottom:5px;">
+              @:<el-button type="primary" icon="ele-Plus" @@click="openAdd@(@Model.ClassName)" v-auth="'@(@Model.LowerClassName)/add'"> 新增 </el-button>
+            </el-button-group>
+          @:</el-col>
+        </el-row>
+		*@
+      </el-form>
+    </el-card>
+    <el-card class="full-table" shadow="hover" style="margin-top: 5px">
+      <el-table
+				:data="tableData"
+				style="width: 100%"
+				v-loading="loading"
+				tooltip-effect="light"
+                @if(@pkFieldName != null)
+                {
+				@:row-key="@(@pkFieldName)"
+                }
+                @@sort-change="sortChange"
+				border="">
+        <el-table-column type="index" label="序号" width="55" align="center"/>
+        @foreach (var column in Model.TableField){
+        if(@column.WhetherTable == "Y"){
+        if(@column.EffectType == "Upload"||@column.EffectType == "fk"||@column.EffectType == "ApiTreeSelect"||@column.EffectType == "Switch"||@column.EffectType == "ConstSelector"){
+        @:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" @(column.WhetherSortable == "Y" ? "sortable='custom'" : "") show-overflow-tooltip="">
+          @:<template #default="scope">
+            if(@column.EffectType == "Upload"){
+            @:<el-image
+            @:v-if="scope.row.@column.LowerPropertyName"
+            @:style="width: 60px; height: 60px"
+            @::src="scope.row.@column.LowerPropertyName"
+            @::lazy="true"
+            @::hide-on-click-modal="true"
+            @::preview-src-list="[scope.row.@column.LowerPropertyName]"
+            @::initial-index="0"
+            @:fit="scale-down"
+            @:preview-teleported=""/>
+            }else if(@column.EffectType == "fk"){
+            @:<span>{{scope.row.@LowerFirstLetter(@column.PropertyName)@(@column.FkColumnName)}}</span>
+            }else if(@column.EffectType == "ApiTreeSelect"){
+            @:<span>{{scope.row.@LowerFirstLetter(@column.PropertyName)@(column.DisplayColumn)}}</span>
+            }else if(@column.EffectType == "Switch"){
+            @:<el-tag v-if="scope.row.@(@column.LowerPropertyName)"> 是 </el-tag>
+            @:<el-tag type="danger" v-else> 否 </el-tag>
+            }else if(@column.EffectType == "ConstSelector"){
+            @:<span>{{codeToName(scope.row.@(@column.LowerPropertyName), '@(@column.DictTypeCode)')}}</span>
+            }
+            @:
+          </template>
+          @:
+        </el-table-column>
+        }
+        else if(@column.EffectType == "Select"){
+          @:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" @(column.WhetherSortable == "Y" ? "sortable='custom'" : "") show-overflow-tooltip="" >
+            @:<template #default="scope">
+              @:<el-tag :type="di('@(@column.DictTypeCode)', scope.row.@(@column.LowerPropertyName))?.tagType"> {{di("@(@column.DictTypeCode)", scope.row.@(@column.LowerPropertyName))?.value}} </el-tag>
+            @:</template>
+          @:</el-table-column>
+        }
+        else if(@column.EffectType == "EnumSelector"){
+          @:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" @(column.WhetherSortable == "Y" ? "sortable='custom'" : "") show-overflow-tooltip="" >
+            @:<template #default="scope">
+              @:<el-tag :type="dv('@(@column.DictTypeCode)', scope.row.@(@column.LowerPropertyName))?.tagType"> {{dv('@(@column.DictTypeCode)', scope.row.@column.LowerPropertyName)?.name}}</el-tag>
+            @:</template>
+          @:</el-table-column>
+        }
+        else {
+        @:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" @(column.WhetherSortable == "Y" ? "sortable='custom'" : "") show-overflow-tooltip="" />
+        }
+        }
+        }
+        @if(@Model.PrintType != "off"){
+        @:<el-table-column label="操作" width="200" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('@(@Model.LowerClassName)/update') || auth('@(@Model.LowerClassName)/delete')">
+          @:<template #default="scope">
+            @:<el-button icon="ele-Printer" size="small" text="" type="primary" @@click="openPrint@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.LowerClassName)/print'"> 打印 </el-button>
+        }else{
+        @:<el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('@(@Model.LowerClassName)/update') || auth('@(@Model.LowerClassName)/delete')">
+          @:<template #default="scope">
+        }
+            <el-button icon="ele-Edit" size="small" text="" type="primary" @@click="openEdit@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.LowerClassName)/update'"> 编辑 </el-button>
+            <el-button icon="ele-Delete" size="small" text="" type="primary" @@click="del@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.LowerClassName)/delete'"> 删除 </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+				v-model:currentPage="tableParams.page"
+				v-model:page-size="tableParams.pageSize"
+				:total="tableParams.total"
+				:page-sizes="[10, 20, 50, 100, 200, 500]"
+				size="small"
+				background=""
+				@@size-change="handleSizeChange"
+				@@current-change="handleCurrentChange"
+				layout="total, sizes, prev, pager, next, jumper"
+	/>
+	@if(@Model.PrintType != "off"){
+      @:<printDialog
+        @:ref="printDialogRef"
+        @::title="print@(@Model.ClassName)Title"
+        @:@@reloadTable="handleQuery" />
+    }
+      <editDialog
+        ref="editDialogRef"
+        :title="edit@(@Model.ClassName)Title"
+        @@reloadTable="handleQuery"
+      />
+    </el-card>
+  </div>
+</template>
+
+<script lang="ts" setup="" name="@(@Model.LowerClassName)">
+  import { ref } from "vue";
+  import { ElMessageBox, ElMessage } from "element-plus";
+  import { auth } from '/@@/utils/authFunction';
+
+  @if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){
+  @:import { codeToName, getConstType } from "/@@/utils/constHelper";
+  } 
+  @if(@Model.TableField.Any(x=>x.EffectType == "Select") || @Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
+  @:import { getDictDataItem as di, getDictDataList as dl } from '/@@/utils/dict-utils';
+  }
+  @if(@Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
+  @:import { getDictLabelByVal as dv } from '/@@/utils/dict-utils';
+  }
+
+  import { Local } from '/@@/utils/storage';
+  @if(@Model.TableField.Any(x=>x.EffectType == "DatePicker")){
+  @:import { formatDate } from '/@@/utils/formatTime';
+  }
+
+  @if(@Model.PrintType != "off"){
+  @:// 推荐设置操作 width 为 200
+  @:import { hiprint } from 'vue-plugin-hiprint';
+  @:import { SysPrintApi } from '/@@/api-services/api';
+  @:import { SysPrint } from '/@@/api-services/models';
+  }
+  @if(@Model.PrintType != "off"){
+  @:import printDialog from '/@@/views/system/print/component/hiprint/preview.vue';
+  }
+  import editDialog from '/@@/views/@(@Model.PagePath)/@(@Model.LowerClassName)/component/editDialog.vue'
+  import { page@(@Model.ClassName), delete@(@Model.ClassName) } from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)';
+  @foreach (var column in Model.QueryWhetherList){
+  if(@column.EffectType == "fk"){
+  @:import { get@(@column.FkEntityName)@(@column.PropertyName)Dropdown } from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)';
+  }
+  }
+  @if(@Model.QueryWhetherList.Any(x=>x.EffectType == "EnumSelector")){
+	@:import { getAPI } from '/@@/utils/axios-utils';
+	@:import { SysEnumApi } from '/@@/api-services/api';
+  @:import commonFunction from '/@@/utils/commonFunction';
+	}
+
+  // 本地存储参数
+  const localPageParamKey = 'localPageParam:@(@Model.LowerClassName)';
+
+  @if(haveLikeCdt){
+  @:const showAdvanceQueryUI = ref(false);
+  }else {
+  @:const showAdvanceQueryUI = ref(true);
+  }
+  @if(@Model.PrintType != "off"){
+  @:const printDialogRef = ref();
+  }
+  const editDialogRef = ref();
+  const loading = ref(false);
+  const tableData = ref<any>([]);
+  const queryParams = ref<any>({});
+  const tableParams = ref({
+    page: 1,
+    pageSize: Local.get(localPageParamKey)?.pageSize || 10,
+    field: 'createTime', // 默认的排序字段
+    order: 'descending', // 排序方向
+    descstr: 'descending', // 降序排序的关键字符
+    total: 0 as any,
+  });
+
+  @if(@Model.PrintType != "off"){
+  @:const print@(@Model.ClassName)Title = ref("");
+  }
+  const edit@(@Model.ClassName)Title = ref("");
+
+  // 改变高级查询的控件显示状态
+  const changeAdvanceQueryUI = () => {
+    showAdvanceQueryUI.value = !showAdvanceQueryUI.value;
+  }
+
+  // 查询操作
+  const handleQuery = async () => {
+    loading.value = true;
+    var res = await page@(@Model.ClassName)(Object.assign(queryParams.value, tableParams.value));
+    tableData.value = res.data.result?.items ?? [];
+    tableParams.value.total = res.data.result?.total;
+    loading.value = false;
+  };
+
+  // 列排序
+  const sortChange = async (column: any) => {
+	tableParams.value.field = column.prop;
+	tableParams.value.order = column.order;
+	await handleQuery();
+  };
+
+  // 打开新增页面
+  const openAdd@(@Model.ClassName) = () => {
+    edit@(@Model.ClassName)Title.value = '添加@(@Model.BusName)';
+    let data = {
+	@foreach (var column in Model.TableField){
+		if(@column.WhetherAddUpdate == "Y"&&@column.DefaultValue!=null){
+			if(@column.NetType.StartsWith("int")||@column.NetType.StartsWith("decimal")){
+		@:@column.LowerPropertyName:@(string.IsNullOrEmpty(@column.DefaultValue)?0:@column.DefaultValue),
+			}
+			if(@column.NetType.StartsWith("string")){
+		@:@column.LowerPropertyName:'@(@column.DefaultValue)',
+			}
+		}
+	}
+	};
+    editDialogRef.value.openDialog(data);
+  };
+
+@if(@Model.PrintType != "off"){
+  @:// 打开打印页面
+  @:const openPrint@(@Model.ClassName) = async (row: any) => {
+    @:print@(@Model.ClassName)Title.value = '打印@(@Model.BusName)';
+    @if(@Model.PrintType != "off"){
+    @:var res = await getAPI(SysPrintApi).apiSysPrintPrintNameGet('@Model.PrintName');
+	  @:var printTemplate = res.data.result as SysPrint;
+    @:var template = JSON.parse(printTemplate.template);
+    @:row['printDate'] = formatDate(new Date(), 'YYYY-mm-dd HH:MM:SS')
+    @:printDialogRef.value.showDialog(new hiprint.PrintTemplate({template: template}), row, template.panels[0].width);
+    }
+  @:}
+}
+  
+  // 打开编辑页面
+  const openEdit@(@Model.ClassName) = (row: any) => {
+    edit@(@Model.ClassName)Title.value = '编辑@(@Model.BusName)';
+    editDialogRef.value.openDialog(row);
+  };
+
+  // 删除
+  const del@(@Model.ClassName) = (row: any) => {
+    ElMessageBox.confirm(`确定要删除吗?`, "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+  .then(async () => {
+    await delete@(@Model.ClassName)(row);
+    handleQuery();
+    ElMessage.success("删除成功");
+  })
+  .catch(() => {});
+  };
+
+  // 改变页面容量
+  const handleSizeChange = (val: number) => {
+    tableParams.value.pageSize = val;
+    Local.set(localPageParamKey, {pageSize:val});
+    handleQuery();
+  };
+
+  // 改变页码序号
+  const handleCurrentChange = (val: number) => {
+    tableParams.value.page = val;
+    handleQuery();
+  };
+
+  @foreach (var column in Model.QueryWhetherList){
+  if(@column.EffectType == "fk"){
+  @:const @LowerFirstLetter(@column.FkEntityName)@(@column.PropertyName)DropdownList = ref<any>([]); 
+  @:const get@(@column.FkEntityName)@(@column.PropertyName)DropdownList = async () => {
+    @:let list = await get@(@column.FkEntityName)@(@column.PropertyName)Dropdown();
+    @:@LowerFirstLetter(@column.FkEntityName)@(@column.PropertyName)DropdownList.value = list.data.result ?? [];
+  @:};
+  @:get@(@column.FkEntityName)@(@column.PropertyName)DropdownList();
+  @:
+  }
+}
+  handleQuery();
+</script>
+<style scoped>
+:deep(.el-input),
+:deep(.el-select),
+:deep(.el-input-number) {
+	width: 100%;
+}
+</style>
+
+@{
+string LowerFirstLetter(string text)
+{
+return text.ToString()[..1].ToLower() + text[1..]; // 首字母小写
+}
+}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_index.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_index.vue.vm
index bbbd1678..b01f7ca2 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_index.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_index.vue.vm
@@ -161,7 +161,7 @@
 					<ModifyRecord :data="row" />
 				</template>
 				<template #row_buttons="{ row }">
-					@if(@Model.PrintType == "custom") {
+					@if(@Model.PrintType != "off") {
 					<el-tooltip content="打印" placement="top">
 						<el-button icon="ele-Printer" size="small" text type="primary" @@click="handlePrint(row)" v-auth="'@(@Model.LowerClassName)/print'" />
 					</el-tooltip>
@@ -175,8 +175,9 @@
 				</template>
 			</vxe-grid>
 		</el-card>
-
-		<PrintDialog ref="printDialogRef" :title="state.title" @@reloadTable="handleQuery" />
+		@if(@Model.PrintType != "off"){
+		@:<PrintDialog ref="printDialogRef" :title="state.title" @@reloadTable="handleQuery" />
+		}
 		<EditDialog ref="editDialogRef" :title="state.title" @@reloadTable="handleQuery" />
 	</div>
 </template>
@@ -210,7 +211,9 @@ import { Local } from '/@@/utils/storage';
 @:import { SysPrint } from '/@@/api-services/models';
 }
 // 子窗口
-import PrintDialog from '/@@/views/system/print/component/hiprint/preview.vue';
+@if(@Model.PrintType != "off") {
+@:import PrintDialog from '/@@/views/system/print/component/hiprint/preview.vue';
+}
 import EditDialog from '/@@/views/@(@Model.PagePath)/@(@Model.LowerClassName)/component/editDialog.vue';
 import ModifyRecord from '/@@/components/table/modifyRecord.vue';
 
@@ -235,7 +238,9 @@ foreach (var column in Model.QueryWhetherList){
 
 // 子窗口对象
 const xGrid = ref<VxeGridInstance>();
-const printDialogRef = ref<InstanceType<typeof PrintDialog>>();
+@if(@Model.PrintType != "off") {
+@:const printDialogRef = ref<InstanceType<typeof PrintDialog>>();
+}
 const editDialogRef = ref<InstanceType<typeof EditDialog>>();
 
 // 变量
@@ -359,7 +364,7 @@ const handleAdd = () => {
 	@foreach (var column in Model.TableField){
 		if(@column.WhetherAddUpdate == "Y"&&@column.DefaultValue!=null){
 			if(@column.NetType.StartsWith("int")||@column.NetType.StartsWith("decimal")){
-		@:@column.LowerPropertyName:@(@column.DefaultValue),
+		@:@column.LowerPropertyName:@(string.IsNullOrEmpty(@column.DefaultValue)?0:@column.DefaultValue),
 			}
 			if(@column.NetType.StartsWith("string")){
 		@:@column.LowerPropertyName:'@(@column.DefaultValue)',
@@ -376,10 +381,11 @@ const handleEdit = (row: any) => {
 	editDialogRef.value?.openDialog(row);
 };
 
-// 打开打印页面
-const handlePrint = async (row: any) => {
-	state.title = '打印@(@Model.BusName)';
-	@if(@Model.PrintType == "custom"){
+@if(@Model.PrintType != "off") {
+@:// 打开打印页面
+@:const handlePrint = async (row: any) => {
+	@:state.title = '打印@(@Model.BusName)';
+	@if(@Model.PrintType != "off"){
 	if (@Model.IsApiService) {
 	@:var res = await getAPI(SysPrintApi).apiSysPrintPrintNameGet('@Model.PrintName');
 	} else {
@@ -396,7 +402,8 @@ const handlePrint = async (row: any) => {
 	@if(@Model.PrintType == "auto"){
 	@:printDialogRef.value.showDialog(row);
 	}
-};
+@:};
+}
 
 // 删除
 const handleDelete = (row: any) => {
diff --git a/Web/src/views/system/codeGen/component/editCodeGenDialog.vue b/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
index 3cad74df..d493e681 100644
--- a/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
+++ b/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
@@ -272,7 +272,7 @@ const getSysCodeGenTemplateList = async () => {
 			// console.log('state.ruleForm.codeGenTemplateRelations', state.ruleForm.codeGenTemplateRelations);
 			//修改
 			data.forEach((element: any) => {
-				if (element.isDefault && state.ruleForm.codeGenTemplateRelations.some((ele: any) => ele.templateId == element.id)) {
+				if (state.ruleForm.codeGenTemplateRelations.some((ele: any) => ele.templateId == element.id)) {
 					checkedRows.push(element);
 					templateTableRef.value.toggleRowSelection(element, true);
 				}