Skip to content

Commit

Permalink
1. 日期范围组件 <util-range-picker> 新增 for-begin和 for-end属性,用于绑定起始和结束日期.
Browse files Browse the repository at this point in the history 
2. 表格组件<util-table>新增 Key 属性,用于保存表格设置时作为存储键.
3. 表格组件<util-table>新增 EnableTableSettings 属性, 开启表格设置功能,支持自定义列,拖动调整列宽,固定列等功能.
4. 新增抽屉内容容器组件<util-drawer-container>,用于拖动调整抽屉尺寸.
5. 新增对话框内容容器组件<util-dialog-container>,用于拖动调整对话框尺寸.
6. 新增分段控制器组件<util-segmented>,已扩展为单选按钮的使用方式.
  • Loading branch information
@UtilCore
UtilCore committed Mar 10, 2024
1 parent ec00e69 commit be0a784
Show file tree
Hide file tree
Showing 167 changed files with 8,307 additions and 1,397 deletions.
2 changes: 1 addition & 1 deletion build/version.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<VersionMajor>8</VersionMajor>
<VersionMinor>0</VersionMinor>
<VersionPatch>1</VersionPatch>
<VersionPatch>4</VersionPatch>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
<VersionSuffix></VersionSuffix>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.AspNetCore/08-Util.AspNetCore.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Core/01-Util.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 9 additions & 1 deletion src/Util.Core/Item.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ public class Item : IComparable<Item> {
/// <param name="group">组</param>
/// <param name="disabled">禁用</param>
/// <param name="selected">选中</param>
public Item( string text, object value, int? sortId = null, string group = null, bool? disabled = null, bool? selected = null ) {
/// <param name="icon">图标</param>
public Item( string text, object value, int? sortId = null, string group = null, bool? disabled = null, bool? selected = null,string icon = null ) {
Text = text;
Value = value;
SortId = sortId;
Group = group;
Disabled = disabled;
Selected = selected;
Icon = icon;
}

/// <summary>
Expand Down Expand Up @@ -58,6 +60,12 @@ public Item( string text, object value, int? sortId = null, string group = null,
[JsonPropertyName( "selected" )]
public bool? Selected { get; }

/// <summary>
/// 图标
/// </summary>
[JsonPropertyName( "icon" )]
public string Icon { get; }

/// <summary>
/// 比较
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Data.Core/01-Util.Data.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.8" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.10" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Data.Dapper.Core/01-Util.Data.Dapper.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.28" />
<PackageReference Include="Dapper" Version="2.1.35" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Data.Dapper.PostgreSql/03-Util.Data.Dapper.PostgreSql.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Npgsql" Version="8.0.1" />
<PackageReference Include="Npgsql" Version="8.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Data.Dapper.SqlServer/02-Util.Data.Dapper.SqlServer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Data.Dapper.SqlServer/Metadata/SqlServerMetadataService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private void SetGetTablesSql() {
.LeftJoin( "sys.Schemas s" ).On( "o.schema_id", "s.schema_id" )
.LeftJoin( "sys.Extended_Properties ep" ).On( "o.object_id", "ep.major_id" ).On( "ep.minor_id", 0 )
.Join( GetColumnsSql(), "c" ).On( "c.object_id", "o.object_id" )
.In( "o.type", new[] { 'U', 'V' } );
.In( "o.type", new[] { 'U' } );
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Data.EntityFrameworkCore.MySql/04-Util.Data.EntityFrameworkCore.MySql.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0-beta.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...il.Data.EntityFrameworkCore.PostgreSql/03-Util.Data.EntityFrameworkCore.PostgreSql.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...Util.Data.EntityFrameworkCore.SqlServer/02-Util.Data.EntityFrameworkCore.SqlServer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Data.EntityFrameworkCore.Sqlite/05-Util.Data.EntityFrameworkCore.Sqlite.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Util.Data.EntityFrameworkCore/01-Util.Data.EntityFrameworkCore.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.FileStorage.Minio/03-Util.FileStorage.Minio.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Minio" Version="6.0.1" />
<PackageReference Include="Minio" Version="6.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 5 additions & 2 deletions src/Util.Generators/Contexts/GeneratorContextBuilder.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
using Util.Data.Metadata;
using Util.Generators.Configuration;
using Util.Generators.Logs;
using Util.Helpers;

namespace Util.Generators.Contexts;
namespace Util.Generators.Contexts;

/// <summary>
/// 生成器上下文构建器
Expand Down Expand Up @@ -76,7 +77,9 @@ protected virtual string GetPhysicalPath( string path ) {
/// <summary>
/// 是否绝对路径
/// </summary>
protected virtual bool IsAbsolutePath( string path ) {
protected virtual bool IsAbsolutePath( string path ) {
if ( Common.IsWindows == false && path.StartsWith( "/" ) )
return true;
if ( path.Contains( @":\" ) )
return true;
if ( path.Contains( ":/" ) )
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Http/07-Util.Http.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Util.Images.ImageSharp/01-Util.Images.ImageSharp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.1" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Util.Localization/09-Util.Localization.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Logging.Serilog/02-Util.Logging.Serilog.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.Seq" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Util.Microservices.Dapr/03-Util.Microservices.Dapr.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Dapr.AspNetCore" Version="1.12.0" />
<PackageReference Include="Dapr.Extensions.Configuration" Version="1.12.0" />
<PackageReference Include="Dapr.AspNetCore" Version="1.13.0" />
<PackageReference Include="Dapr.Extensions.Configuration" Version="1.13.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Microservices.HealthChecks/04-Util.Microservices.HealthChecks.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Microservices.Polly/02-Util.Microservices.Polly.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Polly" Version="8.2.1" />
<PackageReference Include="Polly" Version="8.3.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.ObjectMapping.AutoMapper/02-Util.ObjectMapping.AutoMapper.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="AutoMapper" Version="13.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Scheduling.Hangfire/03-Util.Scheduling.Hangfire.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.9" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.11" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Util.Scheduling.Quartz/02-Util.Scheduling.Quartz.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Quartz" Version="3.8.0" />
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.8.0" />
<PackageReference Include="Quartz" Version="3.8.1" />
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.8.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Util.Templates.Razor/02-Util.Templates.Razor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.26" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.27" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
</ItemGroup>
</Project>
12 changes: 12 additions & 0 deletions src/Util.Ui.Angular/Configs/AngularConst.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,10 @@ public static class AngularConst {
/// </summary>
public const string BindAlign = "bind-align";
/// <summary>
/// 标题对齐
/// </summary>
public const string BindTitleAlign = "bind-title-align";
/// <summary>
/// 序号
/// </summary>
public const string BindOrder = "bind-order";
Expand All @@ -325,6 +329,14 @@ public static class AngularConst {
/// </summary>
public const string BindWidth = "bind-width";
/// <summary>
/// 最小宽度
/// </summary>
public const string BindMinWidth = "bind-min-width";
/// <summary>
/// 最大宽度
/// </summary>
public const string BindMaxWidth = "bind-max-width";
/// <summary>
/// 高度
/// </summary>
public const string BindHeight = "bind-height";
Expand Down
2 changes: 1 addition & 1 deletion src/Util.Ui.NgZorro/03-Util.Ui.NgZorro.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Util.Ui.NgZorro/Components/Alerts/Builders/AlertBuilder.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Util.Ui.Angular.Builders;
using Util.Ui.Angular.Configs;
using Util.Ui.Configs;
using Util.Ui.NgZorro.Enums;

namespace Util.Ui.NgZorro.Components.Alerts.Builders;
Expand Down
Loading

0 comments on commit be0a784

Please sign in to comment.