1. 新增 ng-alain 简易栅格容器组件 TagHelper 标签 <util-row-x> 或 <util-sg-container>.

2. 新增 ng-alain 简易栅格列组件 TagHelper 标签 <util-column-x> 或 <util-sg>. 3. 新增 ng-alain 查看容器组件 TagHelper 标签 <util-descriptions-x> 或 <util-sv-container>. 4. 新增 ng-alain 查看列组件 TagHelper 标签 <util-descriptions-x-item> 或 <util-sv>. 5. 新增 ng-alain 查看标题组件 TagHelper 标签 <util-descriptions-x-title> 或 <util-sv-title>. 6. 新增 ng-alain 查看值组件 TagHelper 标签 <util-descriptions-x-value> 或 <util-sv-value>. 7. 新增抽屉页脚组件 TagHelper 标签 <util-drawer-footer>. 8. <util-button> 和 <util-a> 标签新增 fullscreen 属性,用于支持对 dom 全屏操作. 9. 所有 TagHelper 布尔类型和数值类型属性移除 bind- 命名前缀. 10. 移除 <util-drawer-container> 标签, 抽屉拖动调整尺寸功能已内置, 调用 util.drawer.open() 时将动态添加此功能. 11. 移除 <util-dialog-container> 标签, 模态框拖动调整尺寸功能已内置, 调用 util.modal.open() 时将动态添加此功能.
dotnetcore · Apr 23, 2024 · c9e0e6b · c9e0e6b
1 parent adaebbb
commit c9e0e6b
Show file tree

Hide file tree

Showing 610 changed files with 7,072 additions and 10,271 deletions.
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>8</VersionMajor>
 		<VersionMinor>0</VersionMinor>
-		<VersionPatch>12</VersionPatch>
+		<VersionPatch>14</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 	</PropertyGroup>

diff --git a/src/Util.Application.WebApi/Controllers/TreeQueryControllerBase.cs b/src/Util.Application.WebApi/Controllers/TreeQueryControllerBase.cs
@@ -1,168 +1,168 @@
-using Util.Applications.Trees;
-using Util.Data.Trees;
-using Util.Data;
-
-namespace Util.Applications.Controllers; 
-
-/// <summary>
-/// 树形查询控制器
-/// </summary>
-/// <typeparam name="TDto">参数类型</typeparam>
-/// <typeparam name="TQuery">查询参数类型</typeparam>
-public abstract class TreeQueryControllerBase<TDto, TQuery> : WebApiControllerBase
-    where TDto : class, ITreeNode, new()
-    where TQuery : class, ITreeQueryParameter {
-
-    #region 字段
-
-    /// <summary>
-    /// 树形服务
-    /// </summary>
-    private readonly ITreeQueryService<TDto, TQuery> _service;
-
-    #endregion
-
-    #region 构造方法
-
-    /// <summary>
-    /// 初始化树形查询控制器
-    /// </summary>
-    /// <param name="service">树形服务</param>
-    protected TreeQueryControllerBase( ITreeQueryService<TDto, TQuery> service ) {
-        _service = service ?? throw new ArgumentNullException( nameof( service ) );
-    }
-
-    #endregion
-
-    #region GetMaxPageSize(获取最大分页大小 )
-
-    /// <summary>
-    /// 获取最大分页大小,默认值: 999
-    /// </summary>
-    protected virtual int GetMaxPageSize() {
-        return 999;
-    }
-
-    #endregion
-
-    #region GetLoadMode(获取加载模式)
-
-    /// <summary>
-    /// 获取加载模式,默认值: 同步加载模式
-    /// </summary>
-    protected virtual LoadMode GetLoadMode() {
-        var loadMode = Request.Query["loadMode"].SafeString();
-        var result = Util.Helpers.Enum.Parse<LoadMode?>( loadMode );
-        if ( result != null )
-            return result.Value;
-        return LoadMode.Sync;
-    }
-
-    #endregion
-
-    #region IsFirstLoad(是否首次加载)
-
-    /// <summary>
-    /// 是否首次加载
-    /// </summary>
-    protected virtual bool IsFirstLoad() {
-        var isSearch = Request.Query["is_search"].SafeString();
-        if( isSearch == "false" )
-            return true;
-        return false;
-    }
-
-    #endregion
-
-    #region IsExpandAll(是否展开所有节点)
-
-    /// <summary>
-    /// 是否展开所有节点,仅对同步加载和同步查询有效
-    /// </summary>
-    protected virtual bool IsExpandAll() {
-        var isExpandAll = Request.Query["is_expand_all"].SafeString();
-        if ( isExpandAll == "true" )
-            return true;
-        return false;
-    }
-
-    #endregion
-
-    #region IsExpandForRootAsync(根节点异步加载模式是否展开子节点)
-
-    /// <summary>
-    /// 根节点异步加载模式是否展开子节点,默认值: true
-    /// </summary>
-    protected virtual bool IsExpandForRootAsync() {
-        var isExpand = Request.Query["is_expand_for_root_async"].SafeString();
-        if ( isExpand == "false" )
-            return false;
-        return true;
-    }
-
-    #endregion
-
-    #region GetLoadKeys(获取需要加载的标识列表)
-
-    /// <summary>
-    /// 获取需要加载的标识列表,当异步模式首次加载时,将选中节点的相关父节点加载回来,标识列表以逗号分隔
-    /// </summary>
-    /// <param name="query">查询参数</param>
-    protected virtual string GetLoadKeys( TQuery query ) {
-        return Request.Query["load_keys"].SafeString();
-    }
-
-    #endregion
-
-    #region GetAsync(获取单个实体)
-
-    /// <summary>
-    /// 获取单个实体
-    /// </summary>
-    /// <param name="id">标识</param>
-    protected async Task<IActionResult> GetAsync( string id ) {
-        var result = await _service.GetByIdAsync( id );
-        return Success( result );
-    }
-
-    #endregion
-
-    #region QueryAsync(树形表格查询)
-
-    /// <summary>
-    /// 树形表格查询
-    /// </summary>
-    /// <param name="query">查询参数</param>
-    protected async Task<IActionResult> QueryAsync( TQuery query ) {
-        var action = new TreeTableQueryAction<TDto, TQuery>( _service, GetLoadMode(), GetOperation( query ),
-            GetMaxPageSize(), IsFirstLoad(), IsExpandAll(), IsExpandForRootAsync(), QueryBefore, QueryAfter );
-        var result = await action.QueryAsync( query );
-        return Success( result );
-    }
-
-    /// <summary>
-    /// 获取加载操作
-    /// </summary>
-    protected virtual LoadOperation GetOperation( TQuery query ) {
-        if ( query.ParentId.IsEmpty() )
-            return LoadOperation.Query;
-        return LoadOperation.LoadChildren;
-    }
-
-    /// <summary>
-    /// 查询前操作
-    /// </summary>
-    /// <param name="query">查询参数</param>
-    protected virtual void QueryBefore( TQuery query ) {
-    }
-
-    /// <summary>
-    /// 查询后操作
-    /// </summary>
-    /// <param name="data">数据列表</param>
-    /// <param name="query">查询参数</param>
-    protected virtual void QueryAfter( PageList<TDto> data, TQuery query ) {
-    }
-
-    #endregion
+using Util.Applications.Trees;
+using Util.Data.Trees;
+using Util.Data;
+
+namespace Util.Applications.Controllers; 
+
+/// <summary>
+/// 树形查询控制器
+/// </summary>
+/// <typeparam name="TDto">参数类型</typeparam>
+/// <typeparam name="TQuery">查询参数类型</typeparam>
+public abstract class TreeQueryControllerBase<TDto, TQuery> : WebApiControllerBase
+    where TDto : class, ITreeNode, new()
+    where TQuery : class, ITreeQueryParameter {
+
+    #region 字段
+
+    /// <summary>
+    /// 树形服务
+    /// </summary>
+    private readonly ITreeQueryService<TDto, TQuery> _service;
+
+    #endregion
+
+    #region 构造方法
+
+    /// <summary>
+    /// 初始化树形查询控制器
+    /// </summary>
+    /// <param name="service">树形服务</param>
+    protected TreeQueryControllerBase( ITreeQueryService<TDto, TQuery> service ) {
+        _service = service ?? throw new ArgumentNullException( nameof( service ) );
+    }
+
+    #endregion
+
+    #region GetMaxPageSize(获取最大分页大小 )
+
+    /// <summary>
+    /// 获取最大分页大小,默认值: 999
+    /// </summary>
+    protected virtual int GetMaxPageSize() {
+        return 999;
+    }
+
+    #endregion
+
+    #region GetLoadMode(获取加载模式)
+
+    /// <summary>
+    /// 获取加载模式,默认值: 同步加载模式
+    /// </summary>
+    protected virtual LoadMode GetLoadMode() {
+        var loadMode = Request.Query["loadMode"].SafeString();
+        var result = Util.Helpers.Enum.Parse<LoadMode?>( loadMode );
+        if ( result != null )
+            return result.Value;
+        return LoadMode.Sync;
+    }
+
+    #endregion
+
+    #region IsFirstLoad(是否首次加载)
+
+    /// <summary>
+    /// 是否首次加载
+    /// </summary>
+    protected virtual bool IsFirstLoad() {
+        var isSearch = Request.Query["is_search"].SafeString();
+        if( isSearch == "false" )
+            return true;
+        return false;
+    }
+
+    #endregion
+
+    #region IsExpandAll(是否展开所有节点)
+
+    /// <summary>
+    /// 是否展开所有节点,仅对同步加载和同步查询有效
+    /// </summary>
+    protected virtual bool IsExpandAll() {
+        var isExpandAll = Request.Query["is_expand_all"].SafeString();
+        if ( isExpandAll == "true" )
+            return true;
+        return false;
+    }
+
+    #endregion
+
+    #region IsExpandForRootAsync(根节点异步加载模式是否展开子节点)
+
+    /// <summary>
+    /// 根节点异步加载模式是否展开子节点,默认值: true
+    /// </summary>
+    protected virtual bool IsExpandForRootAsync() {
+        var isExpand = Request.Query["is_expand_for_root_async"].SafeString();
+        if ( isExpand == "false" )
+            return false;
+        return true;
+    }
+
+    #endregion
+
+    #region GetLoadKeys(获取需要加载的标识列表)
+
+    /// <summary>
+    /// 获取需要加载的标识列表,当异步模式首次加载时,将选中节点的相关父节点加载回来,标识列表以逗号分隔
+    /// </summary>
+    /// <param name="query">查询参数</param>
+    protected virtual string GetLoadKeys( TQuery query ) {
+        return Request.Query["load_keys"].SafeString();
+    }
+
+    #endregion
+
+    #region GetAsync(获取单个实体)
+
+    /// <summary>
+    /// 获取单个实体
+    /// </summary>
+    /// <param name="id">标识</param>
+    protected async Task<IActionResult> GetAsync( string id ) {
+        var result = await _service.GetByIdAsync( id );
+        return Success( result );
+    }
+
+    #endregion
+
+    #region QueryAsync(树形表格查询)
+
+    /// <summary>
+    /// 树形表格查询
+    /// </summary>
+    /// <param name="query">查询参数</param>
+    protected async Task<IActionResult> QueryAsync( TQuery query ) {
+        var action = new TreeTableQueryAction<TDto, TQuery>( _service, GetLoadMode(), GetOperation( query ),
+            GetMaxPageSize(), IsFirstLoad(), IsExpandAll(), IsExpandForRootAsync(), QueryBefore, QueryAfter );
+        var result = await action.QueryAsync( query );
+        return Success( result );
+    }
+
+    /// <summary>
+    /// 获取加载操作
+    /// </summary>
+    protected virtual LoadOperation GetOperation( TQuery query ) {
+        if ( query.ParentId.IsEmpty() )
+            return LoadOperation.Query;
+        return LoadOperation.LoadChildren;
+    }
+
+    /// <summary>
+    /// 查询前操作
+    /// </summary>
+    /// <param name="query">查询参数</param>
+    protected virtual void QueryBefore( TQuery query ) {
+    }
+
+    /// <summary>
+    /// 查询后操作
+    /// </summary>
+    /// <param name="data">数据列表</param>
+    /// <param name="query">查询参数</param>
+    protected virtual void QueryAfter( PageList<TDto> data, TQuery query ) {
+    }
+
+    #endregion
 }