Skip to content

Commit 47539d9

Browse files
UtilCoreUtilCore
committed
1. 代码生成器上下文属性对象Util.Generators.Contexts.Property新增IsGuid属性.
2. 树形表格组件使用表格设置时,第一列不应受标题对齐和内容对齐设置的影响. 3. 修复日期范围组件for-begin和for-end扩展属性的实现方式. 4. 开启表格设置后,默认标题对齐方式改为 left .
1 parent 28135c7 commit 47539d9

File tree

15 files changed

+351
-138
lines changed

15 files changed

+351
-138
lines changed

‎build/version.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<VersionMajor>8</VersionMajor>
44
<VersionMinor>0</VersionMinor>
5-
<VersionPatch>6</VersionPatch>
5+
<VersionPatch>7</VersionPatch>
66
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
77
<VersionSuffix></VersionSuffix>
88
</PropertyGroup>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,19 @@ public Property( EntityContext entity ) {
134134
/// <summary>
135135
/// 是否整数
136136
/// </summary>
137-
public bool IsInteger => SystemType == Generators.SystemType.Short ||
138-
SystemType == Generators.SystemType.Int ||
139-
SystemType == Generators.SystemType.Long;
137+
public bool IsInteger => SystemType is Generators.SystemType.Short or Generators.SystemType.Int or Generators.SystemType.Long;
140138
/// <summary>
141139
/// 是否浮点数
142140
/// </summary>
143-
public bool IsFloat => SystemType == Generators.SystemType.Single ||
144-
SystemType == Generators.SystemType.Double ||
145-
SystemType == Generators.SystemType.Decimal;
141+
public bool IsFloat => SystemType is Generators.SystemType.Single or Generators.SystemType.Double or Generators.SystemType.Decimal;
146142
/// <summary>
147143
/// 是否数值类型,包含整数和浮点数
148144
/// </summary>
149145
public bool IsNumber => IsInteger || IsFloat;
146+
/// <summary>
147+
/// 是否Guid类型
148+
/// </summary>
149+
public bool IsGuid => SystemType == Generators.SystemType.Guid;
150150

151151
/// <summary>
152152
/// 是否树形属性

‎src/Util.Ui.NgZorro/Components/DatePickers/Builders/RangePickerBuilder.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,6 @@ private void EnableExtend() {
237237
Attribute( "x-range-picker-extend" );
238238
Attribute( $"#{ExtendId}", "xRangePickerExtend" );
239239
Attribute( "[(ngModel)]", $"{ExtendId}.rangeDates", true );
240-
var onCalendarChange = _config.GetValue( UiConst.OnCalendarChange );
241-
onCalendarChange = onCalendarChange.IsEmpty() ? "" : ";" + onCalendarChange;
242-
Attribute( "(nzOnCalendarChange)", $"{ExtendId}.handleRangeDateChange($event){onCalendarChange}", true );
243240
BeginDate();
244241
EndDate();
245242
}

‎src/Util.Ui.NgZorro/Components/Tables/Builders/TableColumnBuilder.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public TableColumnBuilder BindRight( string value ) {
189189
/// <summary>
190190
/// 配置对齐方式
191191
/// </summary>
192-
public TableColumnBuilder Align() {
192+
public virtual TableColumnBuilder Align() {
193193
if ( _shareConfig.IsEnableTableSettings ) {
194194
BindAlign( $"{_shareConfig.TableSettingsId}.getAlign('{_shareConfig.Title}')" );
195195
return this;
@@ -202,7 +202,7 @@ public TableColumnBuilder Align() {
202202
/// <summary>
203203
/// 配置对齐方式
204204
/// </summary>
205-
public TableColumnBuilder Align( string title ) {
205+
public virtual TableColumnBuilder Align( string title ) {
206206
if ( _shareConfig.IsEnableTableSettings )
207207
BindAlign( $"{_shareConfig.TableSettingsId}.getAlign('{title}')" );
208208
return this;

‎src/Util.Ui.NgZorro/Components/Tables/Builders/TableHeadColumnBuilder.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public TableHeadColumnBuilder Sort() {
148148
/// <summary>
149149
/// 排序
150150
/// </summary>
151-
private void Sort( string order ) {
151+
protected void Sort( string order ) {
152152
if ( order.IsEmpty() )
153153
return;
154154
ShowSort( "true" );
@@ -310,7 +310,7 @@ public TableHeadColumnBuilder Right( string value, string title ) {
310310
/// <summary>
311311
/// 配置对齐方式
312312
/// </summary>
313-
public TableHeadColumnBuilder Align() {
313+
public virtual TableHeadColumnBuilder Align() {
314314
if ( _shareConfig.IsEnableTableSettings )
315315
return this;
316316
AttributeIfNotEmpty( "nzAlign", _config.GetValue<TableHeadColumnAlign?>( UiConst.Align )?.Description() );
@@ -329,7 +329,7 @@ public TableHeadColumnBuilder BindAlign( string value ) {
329329
/// <summary>
330330
/// 配置标题对齐方式
331331
/// </summary>
332-
public TableHeadColumnBuilder TitleAlign() {
332+
public virtual TableHeadColumnBuilder TitleAlign() {
333333
if ( _shareConfig.IsEnableTableSettings ) {
334334
var title = _config.GetValue( UiConst.Title );
335335
BindTitleAlign( $"{_shareConfig.TableSettingsId}.getTitleAlign('{title}')" );
@@ -343,7 +343,7 @@ public TableHeadColumnBuilder TitleAlign() {
343343
/// <summary>
344344
/// 配置标题对齐方式
345345
/// </summary>
346-
public TableHeadColumnBuilder TitleAlign( string title ) {
346+
public virtual TableHeadColumnBuilder TitleAlign( string title ) {
347347
if ( _shareConfig.IsEnableTableSettings )
348348
BindTitleAlign( $"{_shareConfig.TableSettingsId}.getTitleAlign('{title}')" );
349349
return this;

‎src/Util.Ui.NgZorro/Components/Tables/Builders/TableSettingsBuilder.cs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@ public TableShareConfig GetTableShareConfig() {
3535
return _tableShareConfig ??= _config.GetValueFromItems<TableShareConfig>() ?? new TableShareConfig();
3636
}
3737

38+
/// <summary>
39+
/// 设置表格尺寸
40+
/// </summary>
41+
public TableSettingsBuilder IsTreeTable() {
42+
if (_tableShareConfig.IsTreeTable == false)
43+
return this;
44+
Attribute( "[isTreeTable]","true" );
45+
return this;
46+
}
47+
3848
/// <summary>
3949
/// 设置表格尺寸
4050
/// </summary>
@@ -160,7 +170,7 @@ public override void Config() {
160170
throw new ArgumentNullException( "表格存储标识属性 Key 必须设置!" );
161171
Attribute( $"#{_tableShareConfig.TableSettingsId}" );
162172
Attribute( "key", _tableShareConfig.Key );
163-
Size().Bordered().Scroll().EnableFixedColumn();
173+
IsTreeTable().Size().Bordered().Scroll().EnableFixedColumn();
164174
InitColumns();
165175
}
166176
}

‎src/Util.Ui.NgZorro/Components/TreeTables/Builders/TreeTableColumnBuilder.cs‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Util.Ui.NgZorro.Components.Tables.Builders;
1+
using Util.Ui.Angular.Configs;
2+
using Util.Ui.NgZorro.Components.Tables.Builders;
23
using Util.Ui.NgZorro.Components.Tables.Builders.Contents;
34
using Util.Ui.NgZorro.Components.Tables.Configs;
45
using Util.Ui.NgZorro.Components.TreeTables.Builders.Contents;
@@ -56,4 +57,30 @@ protected void ConfigDefault() {
5657
Attribute( "[nzExpand]", $"{tableExtendId}.isExpand(row)" );
5758
Attribute( "(nzExpandChange)", $"{tableExtendId}.collapse(row,$event)" );
5859
}
60+
61+
/// <summary>
62+
/// 配置对齐方式
63+
/// </summary>
64+
public override TableColumnBuilder Align() {
65+
if (_shareConfig.IsFirst)
66+
return this;
67+
if ( _shareConfig.IsEnableTableSettings ) {
68+
BindAlign( $"{_shareConfig.TableSettingsId}.getAlign('{_shareConfig.Title}')" );
69+
return this;
70+
}
71+
AttributeIfNotEmpty( "nzAlign", _shareConfig.Align );
72+
BindAlign( _config.GetValue( AngularConst.BindAlign ) );
73+
return this;
74+
}
75+
76+
/// <summary>
77+
/// 配置对齐方式
78+
/// </summary>
79+
public override TableColumnBuilder Align( string title ) {
80+
if ( _shareConfig.IsFirst )
81+
return this;
82+
if ( _shareConfig.IsEnableTableSettings )
83+
BindAlign( $"{_shareConfig.TableSettingsId}.getAlign('{title}')" );
84+
return this;
85+
}
5986
}

‎src/Util.Ui.NgZorro/Components/TreeTables/Builders/TreeTableHeadColumnBuilder.cs‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
using Util.Ui.NgZorro.Components.Tables.Builders;
1+
using Util.Ui.Angular.Configs;
2+
using Util.Ui.NgZorro.Components.Tables.Builders;
23
using Util.Ui.NgZorro.Components.Tables.Configs;
34
using Util.Ui.NgZorro.Components.Tables.Helpers;
45
using Util.Ui.NgZorro.Configs;
6+
using Util.Ui.NgZorro.Enums;
57
namespace Util.Ui.NgZorro.Components.TreeTables.Builders;
68

79
/// <summary>
@@ -27,6 +29,46 @@ public TreeTableHeadColumnBuilder( Config config, TableHeadColumnShareConfig sha
2729
_shareConfig = shareConfig;
2830
}
2931

32+
/// <summary>
33+
/// 配置标题对齐方式
34+
/// </summary>
35+
public override TableHeadColumnBuilder TitleAlign() {
36+
if ( _shareConfig.IsFirst )
37+
return this;
38+
if ( _shareConfig.IsEnableTableSettings ) {
39+
var title = _config.GetValue( UiConst.Title );
40+
BindTitleAlign( $"{_shareConfig.TableSettingsId}.getTitleAlign('{title}')" );
41+
return this;
42+
}
43+
AttributeIfNotEmpty( "titleAlign", _shareConfig.TitleAlign );
44+
BindTitleAlign( _config.GetValue( AngularConst.BindTitleAlign ) );
45+
return this;
46+
}
47+
48+
/// <summary>
49+
/// 配置标题对齐方式
50+
/// </summary>
51+
public override TableHeadColumnBuilder TitleAlign( string title ) {
52+
if ( _shareConfig.IsFirst )
53+
return this;
54+
if ( _shareConfig.IsEnableTableSettings )
55+
BindTitleAlign( $"{_shareConfig.TableSettingsId}.getTitleAlign('{title}')" );
56+
return this;
57+
}
58+
59+
/// <summary>
60+
/// 配置对齐方式
61+
/// </summary>
62+
public override TableHeadColumnBuilder Align() {
63+
if ( _shareConfig.IsFirst )
64+
return this;
65+
if ( _shareConfig.IsEnableTableSettings )
66+
return this;
67+
AttributeIfNotEmpty( "nzAlign", _config.GetValue<TableHeadColumnAlign?>( UiConst.Align )?.Description() );
68+
BindAlign( _config.GetValue( AngularConst.BindAlign ) );
69+
return this;
70+
}
71+
3072
/// <inheritdoc />
3173
protected override void ConfigContent( Config config ) {
3274
if ( _shareConfig.IsFirst && _shareConfig.IsShowCheckbox )
@@ -43,12 +85,15 @@ public override void AddColumn( ColumnInfo column ) {
4385
AddFirstColumn( column );
4486
else
4587
Title( column.Title );
88+
if ( column.IsSort )
89+
Sort( column.Column );
4690
SetColumnWidth( column );
4791
Left( column.IsLeft, column.Title );
4892
Right( column.IsRight, column.Title );
4993
SetAcl( column.Acl, column.AclElseTemplateId );
5094
EnableCustomColumn( column.GetCellControl() );
5195
EnableResizable( column );
96+
TitleAlign( column.Title );
5297
}
5398

5499
/// <summary>

‎src/Util.Ui.NgZorro/NgZorroOptions.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ public class NgZorroOptions {
5151
/// </summary>
5252
public string TableSettingsTag { get; set; } = "x-table-settings";
5353
/// <summary>
54-
/// 表格复选框对齐方式，默认值：居中对齐
54+
/// 表格复选框对齐方式，默认值：左对齐
5555
/// </summary>
56-
public TableHeadColumnAlign TableCheckboxAlign { get; set; } = TableHeadColumnAlign.Center;
56+
public TableHeadColumnAlign TableCheckboxAlign { get; set; } = TableHeadColumnAlign.Left;
5757
/// <summary>
58-
/// 表格单选按钮对齐方式，默认值：居中对齐
58+
/// 表格单选按钮对齐方式，默认值：左对齐
5959
/// </summary>
60-
public TableHeadColumnAlign TableRadioAlign { get; set; } = TableHeadColumnAlign.Center;
60+
public TableHeadColumnAlign TableRadioAlign { get; set; } = TableHeadColumnAlign.Left;
6161
/// <summary>
62-
/// 表格序号对齐方式，默认值：居中对齐
62+
/// 表格序号对齐方式，默认值：左对齐
6363
/// </summary>
64-
public TableHeadColumnAlign TableLineNumberAlign { get; set; } = TableHeadColumnAlign.Center;
64+
public TableHeadColumnAlign TableLineNumberAlign { get; set; } = TableHeadColumnAlign.Left;
6565
}

‎test/Util.Ui.NgZorro.Tests/DatePickers/RangePickerTagHelperTest.Expression.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void TestForBegin_ForEnd_1() {
3939
result.Append( "<nz-form-item>" );
4040
result.Append( "<nz-form-label [nzRequired]=\"true\">出生日期</nz-form-label>" );
4141
result.Append( "<nz-form-control [nzErrorTip]=\"vt_id\">" );
42-
result.Append( "<nz-range-picker #v_id=\"xValidationExtend\" #x_id=\"xRangePickerExtend\" (nzOnCalendarChange)=\"x_id.handleRangeDateChange($event)\" " );
42+
result.Append( "<nz-range-picker #v_id=\"xValidationExtend\" #x_id=\"xRangePickerExtend\" " );
4343
result.Append( "displayName=\"出生日期\" name=\"beginBirthday\" x-range-picker-extend=\"\" x-validation-extend=\"\" " );
4444
result.Append( "[(beginDate)]=\"model.beginBirthday\" [(endDate)]=\"model.endBirthday\" [(ngModel)]=\"x_id.rangeDates\" [required]=\"true\">" );
4545
result.Append( "</nz-range-picker>" );

0 commit comments

Comments
 (0)