1、FK控件，如果不需要录入的(只为了在查询界面显示)，就不生成接口代码、不生成配置菜单

2、调整vue模板中的缩进，使得符合ESLint要求

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -516,7 +516,8 @@ public class SysCodeGenService : IDynamicApiController, ITransient
 
         var menuList = new List<SysMenu>() { menuType2, menuType2_1, menuType2_2, menuType2_3, menuType2_4 };
         // 加入fk、Upload、ApiTreeSelect 等接口的权限
-        var fkTableList = tableFieldList.Where(u => u.EffectType == "fk").ToList();
+        // 在生成表格时，有些字段只是查询时显示，不需要填写（WhetherAddUpdate），所以这些字段没必要生成相应接口
+        var fkTableList = tableFieldList.Where(u => u.EffectType == "fk" && (u.WhetherAddUpdate == "Y" || u.QueryWhether == "Y")).ToList();
         foreach (var @column in fkTableList)
         {
             var menuType = new SysMenu

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Manage.js.vm

@@ -6,7 +6,7 @@ enum Api {
   Update@(@Model.ClassName) = '/api/@(@Model.LowerClassName)/update',
   Page@(@Model.ClassName) = '/api/@(@Model.LowerClassName)/page',
   @foreach (var column in Model.TableField){
-if(@column.EffectType == "fk"){
+if(@column.EffectType == "fk" && (@column.WhetherAddUpdate == "Y" || column.QueryWhether == "Y")){
   @:Get@(@column.FkEntityName)@(@column.PropertyName)Dropdown = '/api/@(@Model.LowerClassName)/@(@column.FkEntityName)@(@column.PropertyName)Dropdown',
 }else if(@column.EffectType == "ApiTreeSelect" && !definedObjects.ContainsKey("Get@(@column.FkEntityName)Tree")){
   @{definedObjects.Add("Get@(@column.FkEntityName)Tree", 1);}
@@ -50,7 +50,7 @@ export const page@(@Model.ClassName) = (params?: any) =>
 		});
 
 @foreach (var column in Model.TableField){
-	if(@column.EffectType == "fk"){
+	if(@column.EffectType == "fk" && (@column.WhetherAddUpdate == "Y" || column.QueryWhether == "Y")){
 @:export const get@(@column.FkEntityName)@(@column.PropertyName)Dropdown = () =>
 		@:request({
 		@:url: Api.Get@(@column.FkEntityName)@(@column.PropertyName)Dropdown,

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

@@ -1,35 +1,35 @@
 namespace @Model.NameSpace;
 
-    /// <summary>
-    /// @(@Model.BusName)输出参数
-    /// </summary>
-    public class @(@Model.ClassName)Output
-    {
+/// <summary>
+/// @(@Model.BusName)输出参数
+/// </summary>
+public class @(@Model.ClassName)Output
+{
 @foreach (var column in Model.TableField){
-       @:/// <summary>
-       @:/// @column.ColumnComment
-       @:/// </summary>
+    @:/// <summary>
+    @:/// @column.ColumnComment
+    @:/// </summary>
 if(column.EffectType == "fk")
 {
-       @:public @column.NetType @column.PropertyName { get; set; } 
-       @:
-       @:/// <summary>
-       @:/// @(column.ColumnComment) 描述
-       @:/// </summary>
-       @:public @(@column.FkColumnNetType) @(@column.PropertyName)@(@column.FkColumnName) { get; set; } 
+    @:public @column.NetType @column.PropertyName { get; set; } 
+    @:
+    @:/// <summary>
+    @:/// @(column.ColumnComment) 描述
+    @:/// </summary>
+    @:public @(@column.FkColumnNetType) @(@column.PropertyName)@(@column.FkColumnName) { get; set; } 
 
 }else if(column.EffectType == "Upload"){
-       @:public @column.NetType @column.PropertyName { get; set; }
-       @:public SysFile @(@column.PropertyName)Attachment { get; set; }
+    @:public @column.NetType @column.PropertyName { get; set; }
+    @:public SysFile @(@column.PropertyName)Attachment { get; set; }
 }else if(column.EffectType == "ApiTreeSelect"){
-       @:public @column.NetType @column.PropertyName { get; set; } 
-       @:
-       @:/// <summary>
-       @:/// @(column.ColumnComment) 描述 
-       @:/// </summary>
-       @:public string? @(@column.PropertyName)@(@column.DisplayColumn) { get; set; } 
+    @:public @column.NetType @column.PropertyName { get; set; } 
+    @:
+    @:/// <summary>
+    @:/// @(column.ColumnComment) 描述 
+    @:/// </summary>
+    @:public string? @(@column.PropertyName)@(@column.DisplayColumn) { get; set; } 
 }else{
-       @:public @column.NetType @(@column.PropertyName) { get; set; }
+    @:public @column.NetType @(@column.PropertyName) { get; set; }
 }
     @:
 }

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

@@ -163,7 +163,7 @@ if (@column.ColumnKey == "True"){
     }
 
 @foreach (var column in Model.TableField){
-if(@column.EffectType == "fk"){  
+if(@column.EffectType == "fk" && (@column.WhetherAddUpdate == "Y" || column.QueryWhether == "Y")){  
     @:/// <summary>
     @:/// 获取@(@column.ColumnComment)列表
     @:/// </summary>

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/editDialog.vue.vm

@@ -143,9 +143,9 @@
 	</div>
 </template>
 <style scoped>
-/deep/ .el-select,
-/deep/ .el-input-number {
-  width: 100%;
+:deep(.el-select),
+:deep(.el-input-number) {
+	width: 100%;
 }
 </style>
 <script lang="ts" setup>
@@ -166,7 +166,7 @@
 	@{definedObjects.Add("import__@(@column.FkEntityName)Tree", 1);}
 	@:import { get@(@column.FkEntityName)Tree } from '/@@/api/main/@(@Model.LowerClassName)';
 	}
-	if(@column.EffectType == "fk"){
+	if(@column.EffectType == "fk" && @column.WhetherAddUpdate == "Y"){
 	@:import { get@(@column.FkEntityName)@(@column.PropertyName)Dropdown } from '/@@/api/main/@(@Model.LowerClassName)';
 	}
 	}
@@ -181,9 +181,9 @@
 	}
 	//父级传递来的参数
 	var props = defineProps({
-	title: {
-	type: String,
-	default: "",
+		title: {
+		type: String,
+		default: "",
 	},
 	});
 	//父级传递来的函数，用于回调
@@ -191,124 +191,124 @@
 	const ruleFormRef = ref();
 	const isShowDialog = ref(false);
 	const ruleForm = ref<any>({});
-		//自行添加其他规则
-		const rules = ref<FormRules>({
-  @foreach (var column in Model.TableField){
-		if(@column.WhetherRequired == "Y"){
-			if(@column.EffectType == "Input" || @column.EffectType == "InputNumber" ||@column.EffectType == "InputTextArea"){
+	//自行添加其他规则
+	const rules = ref<FormRules>({
+@foreach (var column in Model.TableField){
+	if(@column.WhetherRequired == "Y"){
+		if(@column.EffectType == "Input" || @column.EffectType == "InputNumber" ||@column.EffectType == "InputTextArea"){
 		@:@column.LowerPropertyName: [{required: true, message: '请输入@(@column.ColumnComment)！', trigger: 'blur',},],
-			}else if(@column.EffectType == "DatePicker" || @column.EffectType == "Select" ||@column.EffectType == "ApiTreeSelect"){
+		}else if(@column.EffectType == "DatePicker" || @column.EffectType == "Select" ||@column.EffectType == "ApiTreeSelect"){
 		@:@column.LowerPropertyName: [{required: true, message: '请选择@(@column.ColumnComment)！', trigger: 'change',},],
-			}
+		}
     }
   }
-});
+	});
 
-// 打开弹窗
-const openDialog = (row: any) => {
-  ruleForm.value = JSON.parse(JSON.stringify(row));
-  isShowDialog.value = true;
-};
+	// 打开弹窗
+	const openDialog = (row: any) => {
+		ruleForm.value = JSON.parse(JSON.stringify(row));
+		isShowDialog.value = true;
+	};
 
-// 关闭弹窗
-const closeDialog = () => {
-  emit("reloadTable");
-  isShowDialog.value = false;
-};
+	// 关闭弹窗
+	const closeDialog = () => {
+		emit("reloadTable");
+		isShowDialog.value = false;
+	};
 
-// 取消
-const cancel = () => {
-  isShowDialog.value = false;
-};
+	// 取消
+	const cancel = () => {
+		isShowDialog.value = false;
+	};
 
-// 提交
-const submit = async () => {
-  ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
-    if (isValid) {
-      let values = ruleForm.value;
-      if (ruleForm.value.@(@pkFieldName) == undefined || ruleForm.value.@(@pkFieldName) == null || ruleForm.value.@(@pkFieldName) == "" || ruleForm.value.@(@pkFieldName) == 0) {
-        await add@(@Model.ClassName)(values);
-      } else {
-		await update@(@Model.ClassName)(values);
-      }
-      closeDialog();
-    } else {
-      ElMessage({
-        message: `表单有${Object.keys(fields).length}处验证失败，请修改后再提交`,
-        type: "error",
-      });
-    }
-  });
-};
+	// 提交
+	const submit = async () => {
+		ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
+			if (isValid) {
+				let values = ruleForm.value;
+				if (ruleForm.value.@(@pkFieldName) == undefined || ruleForm.value.@(@pkFieldName) == null || ruleForm.value.@(@pkFieldName) == "" || ruleForm.value.@(@pkFieldName) == 0) {
+					await add@(@Model.ClassName)(values);
+				} else {
+					await update@(@Model.ClassName)(values);
+				}
+				closeDialog();
+			} else {
+				ElMessage({
+					message: `表单有${Object.keys(fields).length}处验证失败，请修改后再提交`,
+					type: "error",
+				});
+			}
+		});
+	};
 
-@foreach (var column in Model.TableField){
-  if(@column.EffectType == "Select"){
-    @:const dictTypeDataList = async (val: any) => {
-      @:let list = await getDictDataList(val);
-      @:return list.data.result ?? [];
-    @:};
-    break;
-  }
-}
+	@foreach (var column in Model.TableField){
+	if(@column.EffectType == "Select"){
+		@:const dictTypeDataList = async (val: any) => {
+		@:let list = await getDictDataList(val);
+		@:return list.data.result ?? [];
+		@:};
+		break;
+	}
+	}
 
-@foreach (var column in Model.TableField){
-  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();
-@:
-  }
-}
+	@foreach (var column in Model.TableField){
+	if(@column.EffectType == "fk" && @column.WhetherAddUpdate == "Y"){
+	@: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();
+	@:
+	}
+	}
 
-@foreach (var column in Model.TableField){
-  if(@column.EffectType == "ApiTreeSelect" && !definedObjects.ContainsKey("define_get@(@column.FkEntityName)TreeData")){
-	@{definedObjects.Add("define_get@(@column.FkEntityName)TreeData", 1);}
-@:const @LowerFirstLetter(@column.FkEntityName)TreeData = ref<any>([]); 
-@:const get@(@column.FkEntityName)TreeData = async () => {
-    @:let list = await get@(@column.FkEntityName)Tree();
-    @:@LowerFirstLetter(@column.FkEntityName)TreeData.value = list.data.result ?? [];
-@:};
-@:get@(@column.FkEntityName)TreeData();
-@:
-  }
-  else if(@column.EffectType == "ConstSelector"){   
-@:const @LowerFirstLetter(@column.DictTypeCode)DropdownList = ref<any>([]); 
-@:const get@(@column.DictTypeCode)DropdownList = async () => {
-	@:let list = await getConstSelectorList("@column.DictTypeCode");
-	@:@LowerFirstLetter(@column.DictTypeCode)DropdownList.value = list.data.result ?? [];
-@:};
-@:get@(@column.DictTypeCode)DropdownList();
-@:
-  }
-}
+	@foreach (var column in Model.TableField){
+	if(@column.EffectType == "ApiTreeSelect" && !definedObjects.ContainsKey("define_get@(@column.FkEntityName)TreeData")){
+		@{definedObjects.Add("define_get@(@column.FkEntityName)TreeData", 1);}
+	@:const @LowerFirstLetter(@column.FkEntityName)TreeData = ref<any>([]); 
+	@:const get@(@column.FkEntityName)TreeData = async () => {
+		@:let list = await get@(@column.FkEntityName)Tree();
+		@:@LowerFirstLetter(@column.FkEntityName)TreeData.value = list.data.result ?? [];
+	@:};
+	@:get@(@column.FkEntityName)TreeData();
+	@:
+	}
+	else if(@column.EffectType == "ConstSelector"){   
+	@:const @LowerFirstLetter(@column.DictTypeCode)DropdownList = ref<any>([]); 
+	@:const get@(@column.DictTypeCode)DropdownList = async () => {
+		@:let list = await getConstSelectorList("@column.DictTypeCode");
+		@:@LowerFirstLetter(@column.DictTypeCode)DropdownList.value = list.data.result ?? [];
+	@:};
+	@:get@(@column.DictTypeCode)DropdownList();
+	@:
+	}
+	}
 
 
 
-@foreach (var column in Model.TableField){ 
-if(column.WhetherAddUpdate=="N") continue;
-if(@column.EffectType == "Upload"){
-@:const upload@(@column.PropertyName)Handle = async (options: UploadRequestOptions) => {
-	@:const res = await upload@(@column.PropertyName)(options);
-	@:ruleForm.value.@(column.LowerPropertyName) = res.data.result?.url;
-@:};
+	@foreach (var column in Model.TableField){ 
+	if(column.WhetherAddUpdate=="N") continue;
+	if(@column.EffectType == "Upload"){
+	@:const upload@(@column.PropertyName)Handle = async (options: UploadRequestOptions) => {
+		@:const res = await upload@(@column.PropertyName)(options);
+		@:ruleForm.value.@(column.LowerPropertyName) = res.data.result?.url;
+	@:};
+		}
 	}
-}
 
 
-// 页面加载时
-onMounted(async () => {
-	@foreach (var column in Model.TableField){
-	if(@column.EffectType == "Select"){
-	@:getEdit@(@column.LowerPropertyName)Data.value= await dictTypeDataList('@(@column.DictTypeCode)');
-	 }
-	}
-});
+	// 页面加载时
+	onMounted(async () => {
+		@foreach (var column in Model.TableField){
+		if(@column.EffectType == "Select"){
+		@:getEdit@(@column.LowerPropertyName)Data.value= await dictTypeDataList('@(@column.DictTypeCode)');
+		}
+		}
+	});
 
-//将属性或者函数暴露给父组件
-defineExpose({ openDialog });
+	//将属性或者函数暴露给父组件
+	defineExpose({ openDialog });
 </script>
 
 

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

@@ -105,7 +105,7 @@
         </el-table-column>
         }
         else {
-        @:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" width="@(column.ColumnComment!=null && column.ColumnComment.Length > 5 ? column.ColumnComment.Length * 15 : 130)" show-overflow-tooltip="" />
+        @:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" width="@(column.ColumnComment!=null && column.ColumnComment.Length > 5 ? column.ColumnComment.Length * 15 : 140)" show-overflow-tooltip="" />
         }
         }
         }
@@ -120,7 +120,7 @@
 				v-model:currentPage="tableParams.page"
 				v-model:page-size="tableParams.pageSize"
 				:total="tableParams.total"
-				:page-sizes="[10, 20, 50, 100]"
+				:page-sizes="[10, 20, 50, 100, 200]"
 				small=""
 				background=""
 				@@size-change="handleSizeChange"
@@ -128,9 +128,9 @@
 				layout="total, sizes, prev, pager, next, jumper"
 	/>
       <editDialog
-			    ref="editDialogRef"
-			    :title="edit@(@Model.ClassName)Title"
-			    @@reloadTable="handleQuery"
+        ref="editDialogRef"
+        :title="edit@(@Model.ClassName)Title"
+        @@reloadTable="handleQuery"
       />
     </el-card>
   </div>
@@ -165,81 +165,79 @@
     }
     }
 
-    const editDialogRef = ref();
-    const loading = ref(false);
-    const tableData = ref<any>
-      ([]);
-      const queryParams = ref<any>
-        ({});
-        const tableParams = ref({
-        page: 1,
-        pageSize: 10,
-        total: 0,
-        });
-        const edit@(@Model.ClassName)Title = ref("");
+  const editDialogRef = ref();
+  const loading = ref(false);
+  const tableData = ref<any>([]);
+  const queryParams = ref<any>({});
+  const tableParams = ref({
+  page: 1,
+  pageSize: 10,
+  total: 0,
+  });
+  const edit@(@Model.ClassName)Title = ref("");
 
 
-        // 查询操作
-        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;
-        @foreach (var column in Model.QueryWhetherList){
-        if(@column.EffectType == "Select"){
-        @:get@(@column.LowerPropertyName)Data.value = await dictTypeDataList('@(@column.DictTypeCode)');
-        }
-        }
-        };
+  // 查询操作
+  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;
+  @foreach (var column in Model.QueryWhetherList){
+  if(@column.EffectType == "Select"){
+    @:get@(@column.LowerPropertyName)Data.value = await dictTypeDataList('@(@column.DictTypeCode)');
+  }
+  }
+  };
 
-        // 打开新增页面
-        const openAdd@(@Model.ClassName) = () => {
-        edit@(@Model.ClassName)Title.value = '添加@(@Model.BusName)';
-        editDialogRef.value.openDialog({});
-        };
+  // 打开新增页面
+  const openAdd@(@Model.ClassName) = () => {
+    edit@(@Model.ClassName)Title.value = '添加@(@Model.BusName)';
+    editDialogRef.value.openDialog({});
+  };
 
-        // 打开编辑页面
-        const openEdit@(@Model.ClassName) = (row: any) => {
-        edit@(@Model.ClassName)Title.value = '编辑@(@Model.BusName)';
-        editDialogRef.value.openDialog(row);
-        };
+  // 打开编辑页面
+  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 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;
-        handleQuery();
-        };
+  // 改变页面容量
+  const handleSizeChange = (val: number) => {
+    tableParams.value.pageSize = val;
+    handleQuery();
+  };
 
-        // 改变页码序号
-        const handleCurrentChange = (val: number) => {
-        tableParams.value.page = 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 () => {
+  @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();
+  @:};
+  @:get@(@column.FkEntityName)@(@column.PropertyName)DropdownList();
 @:
   }
 }
@@ -253,7 +251,7 @@
     break;
   }
 }
-handleQuery();
+  handleQuery();
 </script>