Merge branch 'next' of https://gitee.com/zuohuaijun/Admin.NET into next

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

@@ -3,7 +3,7 @@ enum Api {
   Add@(@Model.ClassName) = '/api/@(@Model.LowerClassName)/add',
   Delete@(@Model.ClassName) = '/api/@(@Model.LowerClassName)/delete',
   Update@(@Model.ClassName) = '/api/@(@Model.LowerClassName)/update',
-  Get@(@Model.ClassName)Page = '/api/@(@Model.LowerClassName)/page',
+  Page@(@Model.ClassName) = '/api/@(@Model.LowerClassName)/page',
   @foreach (var column in Model.TableField){
 if(@column.EffectType == "fk"){
   @:Get@(@column.FkEntityName)Dropdown = '/api/@(@Model.LowerClassName)/@(@column.FkEntityName)Dropdown',
@@ -40,10 +40,10 @@ export const update@(@Model.ClassName) = (params?: any) =>
 		});
 
 // 分页查询@(@Model.BusName)
-export const get@(@Model.ClassName)PageList = (params?: any) => 
+export const page@(@Model.ClassName) = (params?: any) => 
 	request({
-			url: Api.Get@(@Model.ClassName)Page,
-			method: 'get',
+			url: Api.Page@(@Model.ClassName),
+			method: 'post',
 			data: params,
 		});
 

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

@@ -18,9 +18,9 @@ public class @(@Model.ClassName)Service : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpGet]
+    [HttpPost]
     [ApiDescriptionSettings(Name = "Page")]
-    public async Task<SqlSugarPagedList<@(@Model.ClassName)Output>> Page([FromQuery] @(@Model.ClassName)Input input)
+    public async Task<SqlSugarPagedList<@(@Model.ClassName)Output>> Page(@(@Model.ClassName)Input input)
     {
         var query= _rep.AsQueryable()
 @foreach (var column in Model.TableField){

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

@@ -141,7 +141,7 @@
 	//import { formatDate } from '/@@/utils/formatTime';
 
 	import editDialog from '/@@/views/main/@(@Model.LowerClassName)/component/editDialog.vue'
-	import { get@(@Model.ClassName)PageList, delete@(@Model.ClassName) } from '/@@/api/main/@(@Model.LowerClassName)';
+	import { page@(@Model.ClassName), delete@(@Model.ClassName) } from '/@@/api/main/@(@Model.LowerClassName)';
 	@foreach (var column in Model.QueryWhetherList){
 	if(@column.EffectType == "fk"){
 	@:import { get@(@column.FkEntityName)Dropdown } from '/@@/api/main/@(@Model.LowerClassName)';
@@ -176,59 +176,59 @@ const queryParams = ref<any>
 	// 查询操作
 	const handleQuery = async () => {
 	loading.value = true;
-	var res = await get@(@Model.ClassName)PageList(Object.assign(queryParams.value, tableParams.value));
+	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.LowerColumnName)Data.value = await dictTypeDataList('@(@column.DictTypeCode)');
-		}
 	}
-};
+	}
+	};
 
-// 打开新增页面
-const openAdd@(@Model.ClassName) = () => {
+	// 打开新增页面
+	const openAdd@(@Model.ClassName) = () => {
 	edit@(@Model.ClassName)Title.value = '添加@(@Model.BusName)';
-  editDialogRef.value.openDialog({});
-};
+	editDialogRef.value.openDialog({});
+	};
 
-// 打开编辑页面
-const openEdit@(@Model.ClassName) = (row: any) => {
+	// 打开编辑页面
+	const openEdit@(@Model.ClassName) = (row: any) => {
 	edit@(@Model.ClassName)Title.value = '编辑@(@Model.BusName)';
-  editDialogRef.value.openDialog(row);
-};
+	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)DropdownList = ref<any>([]); 
+	@foreach (var column in Model.QueryWhetherList){
+	if(@column.EffectType == "fk"){
+	@:const @LowerFirstLetter(@column.FkEntityName)DropdownList = ref<any>([]); 
 @:const get@(@column.FkEntityName)DropdownList = async () => {
     @:let list = await get@(@column.FkEntityName)Dropdown();
     @:@LowerFirstLetter(@column.FkEntityName)DropdownList.value = list.data.result ?? [];