🔄refactor: 完善代码生成器

OpenAuth.App/Base/PagedDynamicDataResp.cs

@@ -6,7 +6,7 @@
 // Last Modified By : yubaolee
 // Last Modified On : 03-09-2016
 // ***********************************************************************
-// <copyright file="TableData.cs" company="Microsoft">
+// <copyright file="PagedDynamicDataResp.cs" company="Microsoft">
 //     版权所有(C) Microsoft 2015
 // </copyright>
 // <summary>layui datatable数据返回</summary>

OpenAuth.WebApi/Template/BuildControllerApi.html

@@ -79,7 +79,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]Query{ClassName}ListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]Query{ClassName}ListReq request)
         {
             return await _app.Load(request);
         }

OpenAuth.WebApi/Template/MultiTable/BuildApp.html

@@ -15,7 +15,7 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(Query{ClassName}ListReq request)
+        public async Task<PagedDynamicDataResp> Load(Query{ClassName}ListReq request)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
@@ -23,7 +23,7 @@ namespace OpenAuth.App
                 throw new CommonException("登录已过期", Define.INVALID_TOKEN);
             }
 
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = GetDataPrivilege("u");
             if (!string.IsNullOrEmpty(request.key))
             {
@@ -34,10 +34,10 @@ namespace OpenAuth.App
                 objs = objs.Where(request.sqlWhere);
             }
 
-            result.data = objs.OrderBy(u => u.Id)
+            result.Data = objs.OrderBy(u => u.Id)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToList();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
         public void Add(AddOrUpdate{ClassName}Req request)

OpenAuth.WebApi/Template/MultiTable/BuildAppWithDynamicHeader.html

@@ -15,7 +15,7 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(Query{ClassName}ListReq request)
+        public async Task<PagedDynamicDataResp> Load(Query{ClassName}ListReq request)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
@@ -27,8 +27,8 @@ namespace OpenAuth.App
             {
                 throw new Exception("请在代码生成界面配置{ClassName}表的字段属性");
             }
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
-            result.columnFields = columns;
+            result.ColumnFields = columns;
             var objs = GetDataPrivilege("u");
             if (!string.IsNullOrEmpty(request.key))
             {
@@ -39,10 +39,10 @@ namespace OpenAuth.App
                 objs = objs.Where(request.sqlWhere);
             }
             var propertyStr = string.Join(',', columns.Select(u => u.ColumnName));
-            result.data = objs.OrderBy(u => u.Id)
+            result.Data = objs.OrderBy(u => u.Id)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).Select($"{propertyStr}").ToList();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
         public void Add(AddOrUpdate{ClassName}Req request)

OpenAuth.WebApi/Template/SingleTable/BuildApp.html

@@ -18,7 +18,7 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(Query{ClassName}ListReq request)
+        public async Task<PagedDynamicDataResp> Load(Query{ClassName}ListReq request)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
@@ -26,7 +26,7 @@ namespace OpenAuth.App
                 throw new CommonException("登录已过期", Define.INVALID_TOKEN);
             }
 
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = GetDataPrivilege("u");
             if (!string.IsNullOrEmpty(request.key))
             {
@@ -39,10 +39,10 @@ namespace OpenAuth.App
 
             {ForeignKeyTemplate}
 
-            result.data = objs.OrderBy(u => u.Id)
+            result.Data = objs.OrderBy(u => u.Id)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToList();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
 

OpenAuth.WebApi/Template/SingleTable/BuildAppWithDynamicHeader.html

@@ -18,7 +18,7 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(Query{ClassName}ListReq request)
+        public async Task<PagedDynamicDataResp> Load(Query{ClassName}ListReq request)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
@@ -32,7 +32,7 @@ namespace OpenAuth.App
                 throw new Exception("请在代码生成界面配置{ClassName}表的字段属性");
             }
 
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = GetDataPrivilege("u");
             if (!string.IsNullOrEmpty(request.key))
             {
@@ -44,11 +44,11 @@ namespace OpenAuth.App
 
             var columnnames = columnFields.Select(u => u.ColumnName);
             var propertyStr = string.Join(',', columnnames);
-            result.columnFields = columnFields;
+            result.ColumnFields = columnFields;
-            result.data = objs.OrderByDescending(u => u.Id)
+            result.Data = objs.OrderByDescending(u => u.Id)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).Select($"{propertyStr}").ToList();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
 

newdocs/docs/notes/core/apiauth.md

@@ -51,7 +51,7 @@ X-Token: e4a5aa00
 ```csharp
 [HttpGet]
 [AllowAnonymous]
-public async Task<TableData> Load([FromQuery]QueryWmsInboundOrderDtblListReq request)
+public async Task<PagedDynamicDataResp> Load([FromQuery]QueryWmsInboundOrderDtblListReq request)
 {
     return await _app.Load(request);
 }

newdocs/docs/notes/core/datapropertyrule.md

@@ -35,11 +35,11 @@ if (columnFields == null || columnFields.Count == 0)
 }
 
 var propertyStr = string.Join(',', columnFields.Select(u => u.ColumnName));
-result.columnFields = columnFields;
+result.ColumnFields = columnFields;
-result.data = resources.OrderBy(u => u.TypeId)
+result.Data = resources.OrderBy(u => u.TypeId)
 	.Skip((request.page - 1) * request.limit)
 	.Take(request.limit).Select($"new ({propertyStr})");
-result.count = await resources.CountAsync();
+result.Count = await resources.CountAsync();
 return result;
 ```
 

newdocs/docs/notes/core/unitwork.md

@@ -43,19 +43,19 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public TableData Load(QueryStockListReq request)
+        public PagedDynamicDataResp Load(QueryStockListReq request)
         {
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = Repository.Find(null);
             if (!string.IsNullOrEmpty(request.key))
             {
                 objs = objs.Where(u => u.Id.Contains(request.key));
             }
 
-            result.data = objs.OrderBy(u => u.Id)
+            result.Data = objs.OrderBy(u => u.Id)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit);
-            result.count = objs.Count();
+            result.Count = objs.Count();
             return result;
         }
 

newdocs/docs/notes/pro/datapropertyrule.md

@@ -34,11 +34,11 @@ if (columnFields == null || columnFields.Count == 0)
 }
 
 var propertyStr = string.Join(',', columnFields.Select(u => u.ColumnName));
-result.columnFields = columnFields;
+result.ColumnFields = columnFields;
-result.data = resources.OrderBy(u => u.TypeId)
+result.Data = resources.OrderBy(u => u.TypeId)
 	.Skip((request.page - 1) * request.limit)
 	.Take(request.limit).Select($"new ({propertyStr})");
-result.count = await resources.CountAsync();
+result.Count = await resources.CountAsync();
 return result;
 ```
 

newdocs/docs/notes/pro/querybuilder.md

@@ -116,7 +116,7 @@ const handleSearch = () => {
 ```csharp
 public class XXApp : SqlSugarBaseApp<XX>
 {
-  public async Task<TableData> Load(QueryXXListReq request)
+  public async Task<PagedDynamicDataResp> Load(QueryXXListReq request)
     {
         //...
         if (!string.IsNullOrEmpty(request.sqlWhere))

newdocs/docs/notes/vue2/datapropertyrule.md

@@ -35,11 +35,11 @@ if (columnFields == null || columnFields.Count == 0)
 }
 
 var propertyStr = string.Join(',', columnFields.Select(u => u.ColumnName));
-result.columnFields = columnFields;
+result.ColumnFields = columnFields;
-result.data = resources.OrderBy(u => u.TypeId)
+result.Data = resources.OrderBy(u => u.TypeId)
 	.Skip((request.page - 1) * request.limit)
 	.Take(request.limit).Select($"new ({propertyStr})");
-result.count = await resources.CountAsync();
+result.Count = await resources.CountAsync();
 return result;
 ```