Explorar o código

!906 优化代码模板
Merge pull request !906 from koy0755/优化代码生成

zuohuaijun %!s(int64=2) %!d(string=hai) anos
pai
achega
85fff86399

+ 9 - 0
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Manage.js.vm

@@ -5,6 +5,7 @@ enum Api {
   Delete@(@Model.ClassName) = '/api/@(@Model.LowerClassName)/delete',
   Update@(@Model.ClassName) = '/api/@(@Model.LowerClassName)/update',
   Page@(@Model.ClassName) = '/api/@(@Model.LowerClassName)/page',
+  Detail@(@Model.ClassName) = '/api/@(@Model.LowerClassName)/detail',
   @foreach (var column in Model.TableField){
 if(@column.EffectType == "fk" && (@column.WhetherAddUpdate == "Y" || column.QueryWhether == "Y")){
   @:Get@(@column.FkEntityName)@(@column.PropertyName)Dropdown = '/api/@(@Model.LowerClassName)/@(@column.FkEntityName)@(@column.PropertyName)Dropdown',
@@ -49,6 +50,14 @@ export const page@(@Model.ClassName) = (params?: any) =>
 			data: params,
 		});
 
+// 详情@(@Model.BusName)
+export const detail@(@Model.ClassName) = (id: any) => 
+	request({
+			url: Api.Detail@(@Model.ClassName),
+			method: 'get',
+			data: { id },
+		});
+
 @foreach (var column in Model.TableField){
 	if(@column.EffectType == "fk" && (@column.WhetherAddUpdate == "Y" || column.QueryWhether == "Y")){
 @:export const get@(@column.FkEntityName)@(@column.PropertyName)Dropdown = () =>

+ 9 - 3
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/editDialog.vue.vm

@@ -178,7 +178,7 @@
     @:import { UploadRequestOptions } from "element-plus";
     @:import {@string.Join(",",Model.TableField.Where(x=>x.EffectType == "Upload").Select(x=>"upload"+x.PropertyName).ToList())} from '/@@/api/main/@(@Model.LowerClassName)';
 }
-	import { add@(@Model.ClassName), update@(@Model.ClassName) } from "/@@/api/main/@(@Model.LowerClassName)";
+	import { add@(@Model.ClassName), update@(@Model.ClassName), detail@(@Model.ClassName) } from "/@@/api/main/@(@Model.LowerClassName)";
 	@foreach (var column in Model.TableField){
 	if(@column.EffectType == "ApiTreeSelect" && !definedObjects.ContainsKey("import__@(@column.FkEntityName)Tree")){
 	@{definedObjects.Add("import__@(@column.FkEntityName)Tree", 1);}
@@ -224,8 +224,14 @@
 	});
 
 	// 打开弹窗
-	const openDialog = (row: any) => {
-		ruleForm.value = JSON.parse(JSON.stringify(row));
+	const openDialog = async (row: any) => {
+		// ruleForm.value = JSON.parse(JSON.stringify(row));
+		// 改用detail获取最新数据来编辑
+		let rowData = JSON.parse(JSON.stringify(row));
+		if (rowData.id)
+			ruleForm.value = (await detailDmModel(rowData.id)).data.result;
+		else
+			ruleForm.value = rowData;
 		isShowDialog.value = true;
 	};