Skip to content

Commit e90f41f

Browse files
UtilCoreUtilCore
committed
1. 新增按钮样式单选框 TagHelper 标签 <util-radio-button>.
 2. 对文字提示, 气泡卡片 ,气泡确认框相关扩展方法进行重构. 3. 重构输入框自动完成组件, 调整表达式绑定相关设置. 4. 补齐 <util-list> 相关标签的属性. 5. 修复在未设置 ngModel, 或已设置 formControlName 时, 输入框 `允许清除` 全局配置导致的问题.
1 parent c9e0e6b commit e90f41f

File tree

201 files changed

+2489
-2244
lines changed

Some content is hidden

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

201 files changed

+2489
-2244
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>14</VersionPatch>
5+
<VersionPatch>15</VersionPatch>
66
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
77
<VersionSuffix></VersionSuffix>
88
</PropertyGroup>

‎src/Util.AspNetCore/08-Util.AspNetCore.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
34+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.5" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

‎src/Util.Data.Core/01-Util.Data.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.12" />
30+
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.14" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/Util.Data.Dapper.Oracle/05-Util.Data.Dapper.Oracle.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.140" />
30+
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.4.0" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/Util.Data.Dapper.PostgreSql/03-Util.Data.Dapper.PostgreSql.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Npgsql" Version="8.0.2" />
30+
<PackageReference Include="Npgsql" Version="8.0.3" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/Util.Data.EntityFrameworkCore.Oracle/06-Util.Data.EntityFrameworkCore.Oracle.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.140" />
30+
<PackageReference Include="Oracle.EntityFrameworkCore" Version="8.23.40" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/Util.Data.EntityFrameworkCore.PostgreSql/03-Util.Data.EntityFrameworkCore.PostgreSql.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
30+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/Util.Data.EntityFrameworkCore.SqlServer/02-Util.Data.EntityFrameworkCore.SqlServer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.5" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/Util.Data.EntityFrameworkCore.Sqlite/05-Util.Data.EntityFrameworkCore.Sqlite.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/Util.Data.EntityFrameworkCore/01-Util.Data.EntityFrameworkCore.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.5" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

‎src/Util.Generators/Configuration/ProjectOptions.cs

+4
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ public ProjectOptions() {
5050
/// </summary>
5151
public string ApiPort { get; set; }
5252
/// <summary>
53+
/// UI项目端口
54+
/// </summary>
55+
public string UiPort { get; set; }
56+
/// <summary>
5357
/// 是否启用架构
5458
/// </summary>
5559
public bool EnableSchema { get; set; }

‎src/Util.Generators/Contexts/GeneratorContextBuilder.cs

+1
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ protected async Task<ProjectContext> CreateProjectContext( GeneratorContext gene
114114
I18n = projectOptions.I18n,
115115
ProjectType = projectOptions.ProjectType,
116116
ApiPort = projectOptions.ApiPort,
117+
UiPort = projectOptions.UiPort,
117118
EnableSchema = projectOptions.EnableSchema,
118119
Extend = projectOptions.Extend
119120
};

‎src/Util.Generators/Contexts/ProjectContext.cs

+6
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ public ProjectContext( GeneratorContext generatorContext ) {
7171
/// </summary>
7272
public string ApiPort { get; set; }
7373

74+
/// <summary>
75+
/// UI项目端口
76+
/// </summary>
77+
public string UiPort { get; set; }
78+
7479
/// <summary>
7580
/// 项目类型
7681
/// </summary>
@@ -141,6 +146,7 @@ public ProjectContext Clone( GeneratorContext generatorContext ) {
141146
I18n = I18n,
142147
ProjectType = ProjectType,
143148
ApiPort = ApiPort,
149+
UiPort = UiPort,
144150
EnableSchema = EnableSchema,
145151
Extend = Extend
146152
};

‎src/Util.Http/07-Util.Http.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.4" />
30+
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.5" />
3131
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
3232
</ItemGroup>
3333

‎src/Util.Localization/09-Util.Localization.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<ItemGroup>
3030
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
31-
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.4" />
31+
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.5" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

‎src/Util.Logging.Serilog/02-Util.Logging.Serilog.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
3131
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
3232
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
33-
<PackageReference Include="Serilog.Sinks.Seq" Version="7.0.0" />
33+
<PackageReference Include="Serilog.Sinks.Seq" Version="7.0.1" />
3434
</ItemGroup>
3535

3636
<ItemGroup>

‎src/Util.Microservices.Dapr/03-Util.Microservices.Dapr.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Dapr.AspNetCore" Version="1.13.0" />
30-
<PackageReference Include="Dapr.Extensions.Configuration" Version="1.13.0" />
29+
<PackageReference Include="Dapr.AspNetCore" Version="1.13.1" />
30+
<PackageReference Include="Dapr.Extensions.Configuration" Version="1.13.1" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/Util.Microservices.HealthChecks/04-Util.Microservices.HealthChecks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<ItemGroup>
3030
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
3131
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="8.0.1" />
32-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.4" />
32+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.5" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

‎src/Util.Microservices.Polly/02-Util.Microservices.Polly.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Polly" Version="8.3.1" />
29+
<PackageReference Include="Polly" Version="8.4.0" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

‎src/Util.Scheduling.Quartz/02-Util.Scheduling.Quartz.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Quartz" Version="3.8.1" />
31-
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.8.1" />
30+
<PackageReference Include="Quartz" Version="3.9.0" />
31+
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.9.0" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

‎src/Util.Templates.Razor/02-Util.Templates.Razor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</ItemGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.29" />
40+
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.30" />
4141
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
4242
</ItemGroup>
4343
</Project>

‎src/Util.Ui.Angular/Configs/AngularConst.cs

+13-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ public static class AngularConst {
4949
/// </summary>
5050
public const string BindOptional = "bind-optional";
5151
/// <summary>
52+
/// 当前锚点
53+
/// </summary>
54+
public const string BindCurrentAnchor = "bind-current-anchor";
55+
/// <summary>
5256
/// 可选帮助
5357
/// </summary>
5458
public const string BindOptionalHelp = "bind-optional-help";
@@ -57,6 +61,10 @@ public static class AngularConst {
5761
/// </summary>
5862
public const string BindOptionalHelpColor = "bind-optional-help-color";
5963
/// <summary>
64+
/// 弹出确认自动聚焦
65+
/// </summary>
66+
public const string BindPopconfirmAutoFocus = "bind-popconfirm-auto-focus";
67+
/// <summary>
6068
/// 间距
6169
/// </summary>
6270
public const string BindGutter = "bind-gutter";
@@ -1505,6 +1513,10 @@ public static class AngularConst {
15051513
/// </summary>
15061514
public const string BindTooltipColor = "bind-tooltip-color";
15071515
/// <summary>
1516+
/// 提示可见性
1517+
/// </summary>
1518+
public const string BindonTooltipVisible = "bindon-tooltip-visible";
1519+
/// <summary>
15081520
/// 提示移入延时
15091521
/// </summary>
15101522
public const string BindTooltipMouseEnterDelay = "bind-tooltip-mouse-enter-delay";
@@ -1643,7 +1655,7 @@ public static class AngularConst {
16431655
/// <summary>
16441656
/// 弹出确认是否可见
16451657
/// </summary>
1646-
public const string BindPopconfirmVisible = "bind-popconfirm-visible";
1658+
public const string BindonPopconfirmVisible = "bindon-popconfirm-visible";
16471659
/// <summary>
16481660
/// 弹出确认显示箭头
16491661
/// </summary>

‎src/Util.Ui.NgZorro/03-Util.Ui.NgZorro.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.4" />
30+
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.5" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/Util.Ui.NgZorro/Components/Anchors/AnchorTagHelper.cs

+25
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Microsoft.AspNetCore.Razor.TagHelpers;
22
using Util.Ui.Angular.TagHelpers;
33
using Util.Ui.NgZorro.Components.Anchors.Renders;
4+
using Util.Ui.NgZorro.Enums;
45
using Util.Ui.Renders;
56

67
namespace Util.Ui.NgZorro.Components.Anchors;
@@ -35,10 +36,34 @@ public class AnchorTagHelper : AngularTagHelperBase {
3536
/// </summary>
3637
public string BindContainer { get; set; }
3738
/// <summary>
39+
/// nzCurrentAnchor,自定义高亮的锚点
40+
/// </summary>
41+
public string CurrentAnchor { get; set; }
42+
/// <summary>
43+
/// [nzCurrentAnchor],自定义高亮的锚点
44+
/// </summary>
45+
public string BindCurrentAnchor { get; set; }
46+
/// <summary>
47+
/// [nzTargetOffset],锚点滚动偏移量，默认与 offsetTop 相同, 类型: number
48+
/// </summary>
49+
public string TargetOffset { get; set; }
50+
/// <summary>
51+
/// nzDirection,设置导航方向, 可选值: 'vertical' | 'horizontal', 默认值: 'vertical'
52+
/// </summary>
53+
public AnchorDirection Direction { get; set; }
54+
/// <summary>
55+
/// [nzDirection],设置导航方向, 可选值: 'vertical' | 'horizontal', 默认值: 'vertical'
56+
/// </summary>
57+
public string BindDirection { get; set; }
58+
/// <summary>
3859
/// (nzClick),单击事件,类型: EventEmitter&lt;string>
3960
/// </summary>
4061
public string OnClick { get; set; }
4162
/// <summary>
63+
/// (nzChange),锚点链接变更事件,类型: EventEmitter&lt;string>
64+
/// </summary>
65+
public string OnChange { get; set; }
66+
/// <summary>
4267
/// (nzScroll), 滚动事件,滚动至指定锚点时触发,类型: EventEmitter&lt;NzAnchorLinkComponent>
4368
/// </summary>
4469
public string OnScroll { get; set; }

‎src/Util.Ui.NgZorro/Components/Anchors/Builders/AnchorBuilder.cs

+32-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Util.Ui.Angular.Builders;
22
using Util.Ui.Angular.Configs;
3+
using Util.Ui.NgZorro.Enums;
34

45
namespace Util.Ui.NgZorro.Components.Anchors.Builders;
56

@@ -60,11 +61,38 @@ public AnchorBuilder Container() {
6061
return this;
6162
}
6263

64+
/// <summary>
65+
/// 配置自定义高亮的锚点
66+
/// </summary>
67+
public AnchorBuilder CurrentAnchor() {
68+
AttributeIfNotEmpty( "nzCurrentAnchor", _config.GetValue( UiConst.CurrentAnchor ) );
69+
AttributeIfNotEmpty( "[nzCurrentAnchor]", _config.GetValue( AngularConst.BindCurrentAnchor ) );
70+
return this;
71+
}
72+
73+
/// <summary>
74+
/// 配置锚点滚动偏移量
75+
/// </summary>
76+
public AnchorBuilder TargetOffset() {
77+
AttributeIfNotEmpty( "[nzTargetOffset]", _config.GetValue( UiConst.TargetOffset ) );
78+
return this;
79+
}
80+
81+
/// <summary>
82+
/// 配置方向
83+
/// </summary>
84+
public AnchorBuilder Direction() {
85+
AttributeIfNotEmpty( "nzDirection", _config.GetValue<AnchorDirection?>( UiConst.Direction )?.Description() );
86+
AttributeIfNotEmpty( "[nzDirection]", _config.GetValue( AngularConst.BindDirection ) );
87+
return this;
88+
}
89+
6390
/// <summary>
6491
/// 配置事件
6592
/// </summary>
6693
public AnchorBuilder Events() {
6794
AttributeIfNotEmpty( "(nzClick)", _config.GetValue( UiConst.OnClick ) );
95+
AttributeIfNotEmpty( "(nzChange)", _config.GetValue( UiConst.OnChange ) );
6896
AttributeIfNotEmpty( "(nzScroll)", _config.GetValue( UiConst.OnScroll ) );
6997
return this;
7098
}
@@ -74,6 +102,9 @@ public AnchorBuilder Events() {
74102
/// </summary>
75103
public override void Config() {
76104
base.Config();
77-
Affix().Bounds().OffsetTop().ShowInkInFixed().Container().Events();
105+
Affix().Bounds().OffsetTop().ShowInkInFixed()
106+
.Container().CurrentAnchor().TargetOffset()
107+
.Direction()
108+
.Events();
78109
}
79110
}

‎src/Util.Ui.NgZorro/Components/Anchors/Builders/LinkBuilder.cs

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Util.Ui.Angular.Builders;
22
using Util.Ui.Angular.Configs;
3+
using Util.Ui.Enums;
34

45
namespace Util.Ui.NgZorro.Components.Anchors.Builders;
56

@@ -28,6 +29,15 @@ public LinkBuilder Href() {
2829
return this;
2930
}
3031

32+
/// <summary>
33+
/// 配置链接打开目标
34+
/// </summary>
35+
public LinkBuilder Target() {
36+
AttributeIfNotEmpty( "nzTarget", _config.GetValue<ATarget?>( UiConst.Target )?.Description() );
37+
AttributeIfNotEmpty( "[nzTarget]", _config.GetValue( AngularConst.BindTarget ) );
38+
return this;
39+
}
40+
3141
/// <summary>
3242
/// 配置标题
3343
/// </summary>
@@ -42,6 +52,6 @@ public LinkBuilder Title() {
4252
/// </summary>
4353
public override void Config() {
4454
base.Config();
45-
Href().Title();
55+
Href().Target().Title();
4656
}
4757
}

0 commit comments

Comments
 (0)