Skip to content

Commit c9e0e6b

Browse files
UtilCoreUtilCore
committed
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() 时将动态添加此功能.
1 parent adaebbb commit c9e0e6b

File tree

610 files changed

+7072
-10271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

610 files changed

+7072
-10271
lines changed

‎build/version.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<VersionMajor>8</VersionMajor>
44
<VersionMinor>0</VersionMinor>
5-
<VersionPatch>12</VersionPatch>
5+
<VersionPatch>14</VersionPatch>
66
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
77
<VersionSuffix></VersionSuffix>
88
</PropertyGroup>

‎src/Util.Application.WebApi/Controllers/TreeQueryControllerBase.cs

+167-167
Original file line numberDiff line numberDiff line change
@@ -1,168 +1,168 @@
1-
using Util.Applications.Trees;
2-
using Util.Data.Trees;
3-
using Util.Data;
4-
5-
namespace Util.Applications.Controllers;
6-
7-
/// <summary>
8-
/// 树形查询控制器
9-
/// </summary>
10-
/// <typeparam name="TDto">参数类型</typeparam>
11-
/// <typeparam name="TQuery">查询参数类型</typeparam>
12-
public abstract class TreeQueryControllerBase<TDto, TQuery> : WebApiControllerBase
13-
where TDto : class, ITreeNode, new()
14-
where TQuery : class, ITreeQueryParameter {
15-
16-
#region 字段
17-
18-
/// <summary>
19-
/// 树形服务
20-
/// </summary>
21-
private readonly ITreeQueryService<TDto, TQuery> _service;
22-
23-
#endregion
24-
25-
#region 构造方法
26-
27-
/// <summary>
28-
/// 初始化树形查询控制器
29-
/// </summary>
30-
/// <param name="service">树形服务</param>
31-
protected TreeQueryControllerBase( ITreeQueryService<TDto, TQuery> service ) {
32-
_service = service ?? throw new ArgumentNullException( nameof( service ) );
33-
}
34-
35-
#endregion
36-
37-
#region GetMaxPageSize(获取最大分页大小 )
38-
39-
/// <summary>
40-
/// 获取最大分页大小,默认值: 999
41-
/// </summary>
42-
protected virtual int GetMaxPageSize() {
43-
return 999;
44-
}
45-
46-
#endregion
47-
48-
#region GetLoadMode(获取加载模式)
49-
50-
/// <summary>
51-
/// 获取加载模式,默认值: 同步加载模式
52-
/// </summary>
53-
protected virtual LoadMode GetLoadMode() {
54-
var loadMode = Request.Query["loadMode"].SafeString();
55-
var result = Util.Helpers.Enum.Parse<LoadMode?>( loadMode );
56-
if ( result != null )
57-
return result.Value;
58-
return LoadMode.Sync;
59-
}
60-
61-
#endregion
62-
63-
#region IsFirstLoad(是否首次加载)
64-
65-
/// <summary>
66-
/// 是否首次加载
67-
/// </summary>
68-
protected virtual bool IsFirstLoad() {
69-
var isSearch = Request.Query["is_search"].SafeString();
70-
if( isSearch == "false" )
71-
return true;
72-
return false;
73-
}
74-
75-
#endregion
76-
77-
#region IsExpandAll(是否展开所有节点)
78-
79-
/// <summary>
80-
/// 是否展开所有节点,仅对同步加载和同步查询有效
81-
/// </summary>
82-
protected virtual bool IsExpandAll() {
83-
var isExpandAll = Request.Query["is_expand_all"].SafeString();
84-
if ( isExpandAll == "true" )
85-
return true;
86-
return false;
87-
}
88-
89-
#endregion
90-
91-
#region IsExpandForRootAsync(根节点异步加载模式是否展开子节点)
92-
93-
/// <summary>
94-
/// 根节点异步加载模式是否展开子节点,默认值: true
95-
/// </summary>
96-
protected virtual bool IsExpandForRootAsync() {
97-
var isExpand = Request.Query["is_expand_for_root_async"].SafeString();
98-
if ( isExpand == "false" )
99-
return false;
100-
return true;
101-
}
102-
103-
#endregion
104-
105-
#region GetLoadKeys(获取需要加载的标识列表)
106-
107-
/// <summary>
108-
/// 获取需要加载的标识列表,当异步模式首次加载时,将选中节点的相关父节点加载回来,标识列表以逗号分隔
109-
/// </summary>
110-
/// <param name="query">查询参数</param>
111-
protected virtual string GetLoadKeys( TQuery query ) {
112-
return Request.Query["load_keys"].SafeString();
113-
}
114-
115-
#endregion
116-
117-
#region GetAsync(获取单个实体)
118-
119-
/// <summary>
120-
/// 获取单个实体
121-
/// </summary>
122-
/// <param name="id">标识</param>
123-
protected async Task<IActionResult> GetAsync( string id ) {
124-
var result = await _service.GetByIdAsync( id );
125-
return Success( result );
126-
}
127-
128-
#endregion
129-
130-
#region QueryAsync(树形表格查询)
131-
132-
/// <summary>
133-
/// 树形表格查询
134-
/// </summary>
135-
/// <param name="query">查询参数</param>
136-
protected async Task<IActionResult> QueryAsync( TQuery query ) {
137-
var action = new TreeTableQueryAction<TDto, TQuery>( _service, GetLoadMode(), GetOperation( query ),
138-
GetMaxPageSize(), IsFirstLoad(), IsExpandAll(), IsExpandForRootAsync(), QueryBefore, QueryAfter );
139-
var result = await action.QueryAsync( query );
140-
return Success( result );
141-
}
142-
143-
/// <summary>
144-
/// 获取加载操作
145-
/// </summary>
146-
protected virtual LoadOperation GetOperation( TQuery query ) {
147-
if ( query.ParentId.IsEmpty() )
148-
return LoadOperation.Query;
149-
return LoadOperation.LoadChildren;
150-
}
151-
152-
/// <summary>
153-
/// 查询前操作
154-
/// </summary>
155-
/// <param name="query">查询参数</param>
156-
protected virtual void QueryBefore( TQuery query ) {
157-
}
158-
159-
/// <summary>
160-
/// 查询后操作
161-
/// </summary>
162-
/// <param name="data">数据列表</param>
163-
/// <param name="query">查询参数</param>
164-
protected virtual void QueryAfter( PageList<TDto> data, TQuery query ) {
165-
}
166-
167-
#endregion
1+
using Util.Applications.Trees;
2+
using Util.Data.Trees;
3+
using Util.Data;
4+
5+
namespace Util.Applications.Controllers;
6+
7+
/// <summary>
8+
/// 树形查询控制器
9+
/// </summary>
10+
/// <typeparam name="TDto">参数类型</typeparam>
11+
/// <typeparam name="TQuery">查询参数类型</typeparam>
12+
public abstract class TreeQueryControllerBase<TDto, TQuery> : WebApiControllerBase
13+
where TDto : class, ITreeNode, new()
14+
where TQuery : class, ITreeQueryParameter {
15+
16+
#region 字段
17+
18+
/// <summary>
19+
/// 树形服务
20+
/// </summary>
21+
private readonly ITreeQueryService<TDto, TQuery> _service;
22+
23+
#endregion
24+
25+
#region 构造方法
26+
27+
/// <summary>
28+
/// 初始化树形查询控制器
29+
/// </summary>
30+
/// <param name="service">树形服务</param>
31+
protected TreeQueryControllerBase( ITreeQueryService<TDto, TQuery> service ) {
32+
_service = service ?? throw new ArgumentNullException( nameof( service ) );
33+
}
34+
35+
#endregion
36+
37+
#region GetMaxPageSize(获取最大分页大小 )
38+
39+
/// <summary>
40+
/// 获取最大分页大小,默认值: 999
41+
/// </summary>
42+
protected virtual int GetMaxPageSize() {
43+
return 999;
44+
}
45+
46+
#endregion
47+
48+
#region GetLoadMode(获取加载模式)
49+
50+
/// <summary>
51+
/// 获取加载模式,默认值: 同步加载模式
52+
/// </summary>
53+
protected virtual LoadMode GetLoadMode() {
54+
var loadMode = Request.Query["loadMode"].SafeString();
55+
var result = Util.Helpers.Enum.Parse<LoadMode?>( loadMode );
56+
if ( result != null )
57+
return result.Value;
58+
return LoadMode.Sync;
59+
}
60+
61+
#endregion
62+
63+
#region IsFirstLoad(是否首次加载)
64+
65+
/// <summary>
66+
/// 是否首次加载
67+
/// </summary>
68+
protected virtual bool IsFirstLoad() {
69+
var isSearch = Request.Query["is_search"].SafeString();
70+
if( isSearch == "false" )
71+
return true;
72+
return false;
73+
}
74+
75+
#endregion
76+
77+
#region IsExpandAll(是否展开所有节点)
78+
79+
/// <summary>
80+
/// 是否展开所有节点,仅对同步加载和同步查询有效
81+
/// </summary>
82+
protected virtual bool IsExpandAll() {
83+
var isExpandAll = Request.Query["is_expand_all"].SafeString();
84+
if ( isExpandAll == "true" )
85+
return true;
86+
return false;
87+
}
88+
89+
#endregion
90+
91+
#region IsExpandForRootAsync(根节点异步加载模式是否展开子节点)
92+
93+
/// <summary>
94+
/// 根节点异步加载模式是否展开子节点,默认值: true
95+
/// </summary>
96+
protected virtual bool IsExpandForRootAsync() {
97+
var isExpand = Request.Query["is_expand_for_root_async"].SafeString();
98+
if ( isExpand == "false" )
99+
return false;
100+
return true;
101+
}
102+
103+
#endregion
104+
105+
#region GetLoadKeys(获取需要加载的标识列表)
106+
107+
/// <summary>
108+
/// 获取需要加载的标识列表,当异步模式首次加载时,将选中节点的相关父节点加载回来,标识列表以逗号分隔
109+
/// </summary>
110+
/// <param name="query">查询参数</param>
111+
protected virtual string GetLoadKeys( TQuery query ) {
112+
return Request.Query["load_keys"].SafeString();
113+
}
114+
115+
#endregion
116+
117+
#region GetAsync(获取单个实体)
118+
119+
/// <summary>
120+
/// 获取单个实体
121+
/// </summary>
122+
/// <param name="id">标识</param>
123+
protected async Task<IActionResult> GetAsync( string id ) {
124+
var result = await _service.GetByIdAsync( id );
125+
return Success( result );
126+
}
127+
128+
#endregion
129+
130+
#region QueryAsync(树形表格查询)
131+
132+
/// <summary>
133+
/// 树形表格查询
134+
/// </summary>
135+
/// <param name="query">查询参数</param>
136+
protected async Task<IActionResult> QueryAsync( TQuery query ) {
137+
var action = new TreeTableQueryAction<TDto, TQuery>( _service, GetLoadMode(), GetOperation( query ),
138+
GetMaxPageSize(), IsFirstLoad(), IsExpandAll(), IsExpandForRootAsync(), QueryBefore, QueryAfter );
139+
var result = await action.QueryAsync( query );
140+
return Success( result );
141+
}
142+
143+
/// <summary>
144+
/// 获取加载操作
145+
/// </summary>
146+
protected virtual LoadOperation GetOperation( TQuery query ) {
147+
if ( query.ParentId.IsEmpty() )
148+
return LoadOperation.Query;
149+
return LoadOperation.LoadChildren;
150+
}
151+
152+
/// <summary>
153+
/// 查询前操作
154+
/// </summary>
155+
/// <param name="query">查询参数</param>
156+
protected virtual void QueryBefore( TQuery query ) {
157+
}
158+
159+
/// <summary>
160+
/// 查询后操作
161+
/// </summary>
162+
/// <param name="data">数据列表</param>
163+
/// <param name="query">查询参数</param>
164+
protected virtual void QueryAfter( PageList<TDto> data, TQuery query ) {
165+
}
166+
167+
#endregion
168168
}

0 commit comments

Comments
 (0)