igniteui-webcomponents-data-grids 7.1.0-alpha.1 → 7.1.0-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/igniteui-webcomponents-data-grids.umd.js +44020 -42109
- package/bundles/igniteui-webcomponents-data-grids.umd.min.js +1 -1
- package/esm2015/lib/CanvasCellPresenterBase.js +4 -4
- package/esm2015/lib/CanvasContentCellModelHelper.js +5 -5
- package/esm2015/lib/CanvasDateTimeCellPresenter.js +8 -8
- package/esm2015/lib/CanvasGridCellBase.js +13 -13
- package/esm2015/lib/CanvasImageCellPresenter.js +7 -7
- package/esm2015/lib/CanvasNumericCellPresenter.js +8 -8
- package/esm2015/lib/CanvasSectionHeaderCellPresenter.js +9 -9
- package/esm2015/lib/CanvasSummaryCell.js +2 -2
- package/esm2015/lib/CanvasSummaryCellPresenter.js +3 -3
- package/esm2015/lib/CanvasTemplateCellPresenter.js +2 -2
- package/esm2015/lib/CanvasTemplateHeaderCellPresenter.js +1 -1
- package/esm2015/lib/CanvasTextCellPresenter.js +9 -9
- package/esm2015/lib/CanvasTextHeaderCellPresenter.js +7 -7
- package/esm2015/lib/CellPresenterBase.js +25 -25
- package/esm2015/lib/CheckboxListBridge.js +36 -36
- package/esm2015/lib/CheckboxListView_combined.js +416 -411
- package/esm2015/lib/ColumnChooserView_combined.js +13 -13
- package/esm2015/lib/ColumnFilterCondition_combined.js +6915 -5977
- package/esm2015/lib/ColumnGroupingView_combined.js +13 -13
- package/esm2015/lib/ColumnOptionsIconAlignment.js +9 -1
- package/esm2015/lib/ColumnPinningView_combined.js +7 -7
- package/esm2015/lib/ComparisonOperatorSelectorView_combined.js +7 -7
- package/esm2015/lib/ContentCellModelHelper.js +5 -5
- package/esm2015/lib/DataGridCellLayoutPanel.js +14 -14
- package/esm2015/lib/DataGridLocaleEn.js +3 -0
- package/esm2015/lib/DataGridScrollerKeyboardListener.js +16 -16
- package/esm2015/lib/DataGridToolbarView_combined.js +1 -1
- package/esm2015/lib/DateTimeCellPresenter.js +8 -8
- package/esm2015/lib/Dragger.js +4 -4
- package/esm2015/lib/EditorCellPresenter.js +21 -21
- package/esm2015/lib/FilterCellPresenter.js +12 -12
- package/esm2015/lib/GridCellBase.js +6 -6
- package/esm2015/lib/GridColumnFilterOptionsView_combined.js +9 -9
- package/esm2015/lib/GridColumnGroupOptionsView_combined.js +5 -5
- package/esm2015/lib/GridColumnHideOptionsView_combined.js +3 -3
- package/esm2015/lib/GridColumnMoveOptionsView_combined.js +1 -1
- package/esm2015/lib/GridColumnOptionsViewBase_combined.js +2 -2
- package/esm2015/lib/GridColumnOptionsView_combined.js +1 -1
- package/esm2015/lib/GridColumnPinOptionsView_combined.js +1 -1
- package/esm2015/lib/GridColumnSummaryOptionsView_combined.js +7 -7
- package/esm2015/lib/GridExpansionIndicatorView_combined.js +5 -5
- package/esm2015/lib/GridExternalWrapper.js +6 -6
- package/esm2015/lib/GridFilterDialogView_combined.js +363 -258
- package/esm2015/lib/GridIconRepository.js +92 -0
- package/esm2015/lib/GridSortIndicatorView_combined.js +24 -20
- package/esm2015/lib/GridStyleRepository.js +6 -3
- package/esm2015/lib/ICheckboxListView.js +11 -0
- package/esm2015/lib/ISummaryChooserView_combined.js +7 -7
- package/esm2015/lib/ImageCellPresenter.js +7 -7
- package/esm2015/lib/MultiColumnComboBoxView_combined.js +7 -7
- package/esm2015/lib/NumericCellPresenter.js +8 -8
- package/esm2015/lib/PropertyEditorView_combined.js +23 -23
- package/esm2015/lib/SectionHeaderCellPresenter.js +9 -9
- package/esm2015/lib/SummaryCellPresenter.js +6 -6
- package/esm2015/lib/TemplateCellPresenter.js +2 -2
- package/esm2015/lib/TemplateHeader.js +3 -3
- package/esm2015/lib/TemplateHeaderCellModel.js +18 -18
- package/esm2015/lib/TemplateHeaderCellPresenter.js +1 -1
- package/esm2015/lib/TextCellPresenter.js +9 -9
- package/esm2015/lib/TextHeaderCell.js +62 -27
- package/esm2015/lib/TextHeaderCellPresenter.js +44 -25
- package/esm2015/lib/igc-cell-info.js +97 -91
- package/esm2015/lib/igc-checkbox-list-component.js +57 -58
- package/esm2015/lib/igc-combo-box-column-component.js +10 -10
- package/esm2015/lib/igc-data-binding-event-args.js +27 -22
- package/esm2015/lib/igc-data-grid-column-component.js +271 -188
- package/esm2015/lib/igc-data-grid-component.js +135 -0
- package/esm2015/lib/igc-data-grid-filter-dialog-component.js +109 -38
- package/esm2015/lib/igc-date-time-cell-info.js +12 -12
- package/esm2015/lib/igc-date-time-column-component.js +23 -23
- package/esm2015/lib/igc-date-time-column-module.js +2 -0
- package/esm2015/lib/igc-editor-cell-info.js +23 -23
- package/esm2015/lib/igc-filter-cell-info.js +26 -26
- package/esm2015/lib/igc-filter-row-definition-module.js +2 -0
- package/esm2015/lib/igc-image-cell-info.js +6 -6
- package/esm2015/lib/igc-image-column-component.js +12 -12
- package/esm2015/lib/igc-image-column-module.js +2 -0
- package/esm2015/lib/igc-numeric-cell-info.js +26 -26
- package/esm2015/lib/igc-numeric-column-component.js +35 -35
- package/esm2015/lib/igc-numeric-column-module.js +2 -0
- package/esm2015/lib/igc-row-separator-module.js +2 -0
- package/esm2015/lib/igc-section-header-cell-info.js +6 -6
- package/esm2015/lib/igc-section-header-module.js +2 -0
- package/esm2015/lib/igc-summary-cell-info.js +9 -9
- package/esm2015/lib/igc-template-cell-info.js +2 -2
- package/esm2015/lib/igc-template-column-module.js +2 -0
- package/esm2015/lib/igc-template-header-cell-info.js +2 -2
- package/esm2015/lib/igc-template-header-module.js +2 -0
- package/esm2015/lib/igc-template-section-header-module.js +4 -0
- package/esm2015/lib/igc-text-cell-info.js +2 -2
- package/esm2015/lib/igc-text-column-component.js +9 -9
- package/esm2015/lib/igc-text-column-module.js +2 -0
- package/esm2015/lib/igc-text-header-cell-info.js +74 -24
- package/esm2015/lib/igc-text-header-module.js +2 -0
- package/esm2015/public_api.js +2 -0
- package/esm5/lib/CanvasCellPresenterBase.js +4 -4
- package/esm5/lib/CanvasContentCellModelHelper.js +5 -5
- package/esm5/lib/CanvasDateTimeCellPresenter.js +8 -8
- package/esm5/lib/CanvasGridCellBase.js +13 -13
- package/esm5/lib/CanvasImageCellPresenter.js +7 -7
- package/esm5/lib/CanvasNumericCellPresenter.js +8 -8
- package/esm5/lib/CanvasSectionHeaderCellPresenter.js +9 -9
- package/esm5/lib/CanvasSummaryCell.js +2 -2
- package/esm5/lib/CanvasSummaryCellPresenter.js +3 -3
- package/esm5/lib/CanvasTemplateCellPresenter.js +2 -2
- package/esm5/lib/CanvasTemplateHeaderCellPresenter.js +1 -1
- package/esm5/lib/CanvasTextCellPresenter.js +9 -9
- package/esm5/lib/CanvasTextHeaderCellPresenter.js +7 -7
- package/esm5/lib/CellPresenterBase.js +25 -25
- package/esm5/lib/CheckboxListBridge.js +36 -36
- package/esm5/lib/CheckboxListView_combined.js +399 -394
- package/esm5/lib/ColumnChooserView_combined.js +13 -13
- package/esm5/lib/ColumnFilterCondition_combined.js +6922 -5827
- package/esm5/lib/ColumnGroupingView_combined.js +13 -13
- package/esm5/lib/ColumnOptionsIconAlignment.js +9 -1
- package/esm5/lib/ColumnPinningView_combined.js +7 -7
- package/esm5/lib/ComparisonOperatorSelectorView_combined.js +7 -7
- package/esm5/lib/ContentCellModelHelper.js +5 -5
- package/esm5/lib/DataGridCellLayoutPanel.js +14 -14
- package/esm5/lib/DataGridLocaleEn.js +3 -0
- package/esm5/lib/DataGridScrollerKeyboardListener.js +16 -16
- package/esm5/lib/DataGridToolbarView_combined.js +1 -1
- package/esm5/lib/DateTimeCellPresenter.js +8 -8
- package/esm5/lib/Dragger.js +4 -4
- package/esm5/lib/EditorCellPresenter.js +21 -21
- package/esm5/lib/FilterCellPresenter.js +12 -12
- package/esm5/lib/GridCellBase.js +6 -6
- package/esm5/lib/GridColumnFilterOptionsView_combined.js +9 -9
- package/esm5/lib/GridColumnGroupOptionsView_combined.js +5 -5
- package/esm5/lib/GridColumnHideOptionsView_combined.js +3 -3
- package/esm5/lib/GridColumnMoveOptionsView_combined.js +1 -1
- package/esm5/lib/GridColumnOptionsViewBase_combined.js +2 -2
- package/esm5/lib/GridColumnOptionsView_combined.js +1 -1
- package/esm5/lib/GridColumnPinOptionsView_combined.js +1 -1
- package/esm5/lib/GridColumnSummaryOptionsView_combined.js +7 -7
- package/esm5/lib/GridExpansionIndicatorView_combined.js +5 -5
- package/esm5/lib/GridExternalWrapper.js +6 -6
- package/esm5/lib/GridFilterDialogView_combined.js +377 -244
- package/esm5/lib/GridIconRepository.js +97 -0
- package/esm5/lib/GridSortIndicatorView_combined.js +24 -20
- package/esm5/lib/GridStyleRepository.js +10 -3
- package/esm5/lib/ICheckboxListView.js +11 -0
- package/esm5/lib/ISummaryChooserView_combined.js +7 -7
- package/esm5/lib/ImageCellPresenter.js +7 -7
- package/esm5/lib/MultiColumnComboBoxView_combined.js +7 -7
- package/esm5/lib/NumericCellPresenter.js +8 -8
- package/esm5/lib/PropertyEditorView_combined.js +23 -23
- package/esm5/lib/SectionHeaderCellPresenter.js +9 -9
- package/esm5/lib/SummaryCellPresenter.js +6 -6
- package/esm5/lib/TemplateCellPresenter.js +2 -2
- package/esm5/lib/TemplateHeader.js +3 -3
- package/esm5/lib/TemplateHeaderCellModel.js +17 -17
- package/esm5/lib/TemplateHeaderCellPresenter.js +1 -1
- package/esm5/lib/TextCellPresenter.js +9 -9
- package/esm5/lib/TextHeaderCell.js +62 -27
- package/esm5/lib/TextHeaderCellPresenter.js +44 -25
- package/esm5/lib/igc-cell-info.js +101 -91
- package/esm5/lib/igc-checkbox-list-component.js +57 -58
- package/esm5/lib/igc-combo-box-column-component.js +10 -10
- package/esm5/lib/igc-data-binding-event-args.js +27 -22
- package/esm5/lib/igc-data-grid-column-component.js +311 -188
- package/esm5/lib/igc-data-grid-component.js +177 -0
- package/esm5/lib/igc-data-grid-filter-dialog-component.js +133 -38
- package/esm5/lib/igc-date-time-cell-info.js +12 -12
- package/esm5/lib/igc-date-time-column-component.js +23 -23
- package/esm5/lib/igc-date-time-column-module.js +2 -0
- package/esm5/lib/igc-editor-cell-info.js +23 -23
- package/esm5/lib/igc-filter-cell-info.js +26 -26
- package/esm5/lib/igc-filter-row-definition-module.js +2 -0
- package/esm5/lib/igc-image-cell-info.js +6 -6
- package/esm5/lib/igc-image-column-component.js +12 -12
- package/esm5/lib/igc-image-column-module.js +2 -0
- package/esm5/lib/igc-numeric-cell-info.js +26 -26
- package/esm5/lib/igc-numeric-column-component.js +35 -35
- package/esm5/lib/igc-numeric-column-module.js +2 -0
- package/esm5/lib/igc-row-separator-module.js +2 -0
- package/esm5/lib/igc-section-header-cell-info.js +6 -6
- package/esm5/lib/igc-section-header-module.js +2 -0
- package/esm5/lib/igc-summary-cell-info.js +9 -9
- package/esm5/lib/igc-template-cell-info.js +2 -2
- package/esm5/lib/igc-template-column-module.js +2 -0
- package/esm5/lib/igc-template-header-cell-info.js +2 -2
- package/esm5/lib/igc-template-header-module.js +2 -0
- package/esm5/lib/igc-template-section-header-module.js +4 -0
- package/esm5/lib/igc-text-cell-info.js +2 -2
- package/esm5/lib/igc-text-column-component.js +9 -9
- package/esm5/lib/igc-text-column-module.js +2 -0
- package/esm5/lib/igc-text-header-cell-info.js +98 -24
- package/esm5/lib/igc-text-header-module.js +2 -0
- package/esm5/public_api.js +2 -0
- package/fesm2015/igniteui-webcomponents-data-grids.js +38809 -37228
- package/fesm5/igniteui-webcomponents-data-grids.js +44020 -42111
- package/lib/CheckboxListView_combined.d.ts +104 -104
- package/lib/ColumnFilterCondition_combined.d.ts +1518 -1434
- package/lib/ColumnOptionsIconAlignment.d.ts +9 -1
- package/lib/DataGridLocaleEn.d.ts +3 -0
- package/lib/GridFilterDialogView_combined.d.ts +100 -80
- package/lib/GridIconRepository.d.ts +44 -0
- package/lib/GridSortIndicatorView_combined.d.ts +5 -4
- package/lib/GridStyleRepository.d.ts +3 -2
- package/lib/ICheckboxListView.d.ts +38 -0
- package/lib/TemplateHeaderCellModel.d.ts +7 -7
- package/lib/igc-cell-info.d.ts +4 -0
- package/lib/igc-data-grid-column-component.d.ts +23 -0
- package/lib/igc-data-grid-component.d.ts +43 -0
- package/lib/igc-data-grid-filter-dialog-component.d.ts +30 -0
- package/lib/igc-text-header-cell-info.d.ts +15 -0
- package/package.json +4 -4
- package/public_api.d.ts +2 -0
|
@@ -343,8 +343,8 @@ let ColumnGroupingView = /*@__PURE__*/ (() => {
|
|
|
343
343
|
let e = this.c();
|
|
344
344
|
d += e[0];
|
|
345
345
|
c += e[1];
|
|
346
|
-
NativeUI.
|
|
347
|
-
NativeUI.
|
|
346
|
+
NativeUI.x(this.q, a.x + c);
|
|
347
|
+
NativeUI.ah(this.q, a.y + d);
|
|
348
348
|
}
|
|
349
349
|
}
|
|
350
350
|
al(a) {
|
|
@@ -662,7 +662,7 @@ let ColumnGrouping = /*@__PURE__*/ (() => {
|
|
|
662
662
|
break;
|
|
663
663
|
case "ItemHoverBackgroundColor": break;
|
|
664
664
|
case "BackgroundColor":
|
|
665
|
-
NativeUI.
|
|
665
|
+
NativeUI.n(this.b.u, this.bh);
|
|
666
666
|
break;
|
|
667
667
|
}
|
|
668
668
|
}
|
|
@@ -671,7 +671,7 @@ let ColumnGrouping = /*@__PURE__*/ (() => {
|
|
|
671
671
|
ba() {
|
|
672
672
|
let a = this.b.w;
|
|
673
673
|
if (this.bm != null) {
|
|
674
|
-
NativeUI.
|
|
674
|
+
NativeUI.r(a, this.bm);
|
|
675
675
|
}
|
|
676
676
|
}
|
|
677
677
|
a9() {
|
|
@@ -685,13 +685,13 @@ let ColumnGrouping = /*@__PURE__*/ (() => {
|
|
|
685
685
|
let b = this.b.j;
|
|
686
686
|
let c = this.b.k;
|
|
687
687
|
for (let d = 0; d < a.count; d++) {
|
|
688
|
-
NativeUI.
|
|
688
|
+
NativeUI.r(a._inner[d], this.bl);
|
|
689
689
|
}
|
|
690
690
|
for (let e = 0; e < b.count; e++) {
|
|
691
|
-
NativeUI.
|
|
691
|
+
NativeUI.r(b._inner[e], this.bi);
|
|
692
692
|
}
|
|
693
693
|
for (let f = 0; f < c.count; f++) {
|
|
694
|
-
NativeUI.
|
|
694
|
+
NativeUI.n(c._inner[f], this.bj);
|
|
695
695
|
}
|
|
696
696
|
}
|
|
697
697
|
a3() {
|
|
@@ -729,10 +729,10 @@ let ColumnGrouping = /*@__PURE__*/ (() => {
|
|
|
729
729
|
let c = this.targetGrid.groupDescriptions.j;
|
|
730
730
|
for (let d = 0; d < c.count; d++) {
|
|
731
731
|
let e = new GroupInfo();
|
|
732
|
-
let f = b.i((g) => g.
|
|
732
|
+
let f = b.i((g) => g.nf == c.item(d).f);
|
|
733
733
|
if (f != -1) {
|
|
734
|
-
if (!stringIsNullOrEmpty(b._inner[f].
|
|
735
|
-
e.c = b._inner[f].
|
|
734
|
+
if (!stringIsNullOrEmpty(b._inner[f].nm)) {
|
|
735
|
+
e.c = b._inner[f].nm;
|
|
736
736
|
}
|
|
737
737
|
else {
|
|
738
738
|
e.c = c.item(d).f;
|
|
@@ -763,7 +763,7 @@ let ColumnGrouping = /*@__PURE__*/ (() => {
|
|
|
763
763
|
let h = a;
|
|
764
764
|
let i = this.targetGrid.actualColumns._inner[h.cellPath.a5];
|
|
765
765
|
let j = new ColumnGroupDescription(0);
|
|
766
|
-
j.f = i.
|
|
766
|
+
j.f = i.nf;
|
|
767
767
|
j.c = 1;
|
|
768
768
|
let k = this.targetGrid.groupDescriptions.j.contains(j);
|
|
769
769
|
j.c = 0;
|
|
@@ -927,13 +927,13 @@ let ColumnGrouping = /*@__PURE__*/ (() => {
|
|
|
927
927
|
h.d = i[1] - e;
|
|
928
928
|
h.c = NativeUI.d(f._inner[g]);
|
|
929
929
|
h.f = NativeUI.k(f._inner[g]);
|
|
930
|
-
h.b = AppearanceHelper.a(NativeUI.
|
|
930
|
+
h.b = AppearanceHelper.a(NativeUI.ao(f._inner[g]));
|
|
931
931
|
h.g = f._inner[g].getText();
|
|
932
932
|
a.c.add(h);
|
|
933
933
|
}
|
|
934
934
|
let j = this.b.j;
|
|
935
935
|
for (let k = 0; k < j.count; k++) {
|
|
936
|
-
let l = this.q._inner[k].
|
|
936
|
+
let l = this.q._inner[k].bi();
|
|
937
937
|
let m = this.b.b(j._inner[k]);
|
|
938
938
|
l.i = m[0] - d;
|
|
939
939
|
l.g = m[1] - e;
|
|
@@ -21,9 +21,17 @@ export var ColumnOptionsIconAlignment = /*@__PURE__*/ (function (ColumnOptionsIc
|
|
|
21
21
|
* The icon is aligned with the edge of the column but opposite the alignment of the header text.
|
|
22
22
|
*/
|
|
23
23
|
ColumnOptionsIconAlignment[ColumnOptionsIconAlignment["Opposite"] = 2] = "Opposite";
|
|
24
|
+
/**
|
|
25
|
+
* The icon is always aligned with the left edge of the column.
|
|
26
|
+
*/
|
|
27
|
+
ColumnOptionsIconAlignment[ColumnOptionsIconAlignment["Left"] = 3] = "Left";
|
|
28
|
+
/**
|
|
29
|
+
* The icon is always aligned with the right edge of the column.
|
|
30
|
+
*/
|
|
31
|
+
ColumnOptionsIconAlignment[ColumnOptionsIconAlignment["Right"] = 4] = "Right";
|
|
24
32
|
return ColumnOptionsIconAlignment;
|
|
25
33
|
})({});
|
|
26
34
|
/**
|
|
27
35
|
* @hidden
|
|
28
36
|
*/
|
|
29
|
-
export let ColumnOptionsIconAlignment_$type = /*@__PURE__*/ markEnum('ColumnOptionsIconAlignment', 'Unset,0|None,1|Opposite,2');
|
|
37
|
+
export let ColumnOptionsIconAlignment_$type = /*@__PURE__*/ markEnum('ColumnOptionsIconAlignment', 'Unset,0|None,1|Opposite,2|Left,3|Right,4');
|
|
@@ -254,7 +254,7 @@ let ColumnPinning = /*@__PURE__*/ (() => {
|
|
|
254
254
|
break;
|
|
255
255
|
case "FilterPlaceholderText":
|
|
256
256
|
if (this.d != null) {
|
|
257
|
-
this.d.
|
|
257
|
+
this.d.cf = this.s;
|
|
258
258
|
}
|
|
259
259
|
break;
|
|
260
260
|
case "BaseTheme":
|
|
@@ -299,9 +299,9 @@ let ColumnPinning = /*@__PURE__*/ (() => {
|
|
|
299
299
|
let b = new ObservableCollection$1(ColumnPinningInfo.$, 0);
|
|
300
300
|
for (let c of fromEnum(this.b.actualColumns)) {
|
|
301
301
|
a = new ColumnPinningInfo();
|
|
302
|
-
let d = c.
|
|
303
|
-
if (c.
|
|
304
|
-
d = c.
|
|
302
|
+
let d = c.nf;
|
|
303
|
+
if (c.nm != null) {
|
|
304
|
+
d = c.nm;
|
|
305
305
|
}
|
|
306
306
|
a.columnName = d;
|
|
307
307
|
if (c.is == 1) {
|
|
@@ -314,7 +314,7 @@ let ColumnPinning = /*@__PURE__*/ (() => {
|
|
|
314
314
|
}
|
|
315
315
|
this.d.showSelectAll = false;
|
|
316
316
|
if (this.s != null) {
|
|
317
|
-
this.d.
|
|
317
|
+
this.d.cf = this.s;
|
|
318
318
|
}
|
|
319
319
|
this.d.itemsSource = b;
|
|
320
320
|
let e = "";
|
|
@@ -330,7 +330,7 @@ let ColumnPinning = /*@__PURE__*/ (() => {
|
|
|
330
330
|
let c = this.d.g.actualDataSource.getItemAtIndex(b.c);
|
|
331
331
|
let d = this.b.actualColumns.count;
|
|
332
332
|
for (let e = 0; e < d; e++) {
|
|
333
|
-
if (this.b.actualColumns._inner[e].
|
|
333
|
+
if (this.b.actualColumns._inner[e].nf == c.columnName || this.b.actualColumns._inner[e].n6 == c.columnName || this.b.actualColumns._inner[e].nm == c.columnName) {
|
|
334
334
|
if (this.b.actualColumns._inner[e].is == 0) {
|
|
335
335
|
this.b.actualColumns._inner[e].is = 1;
|
|
336
336
|
}
|
|
@@ -340,7 +340,7 @@ let ColumnPinning = /*@__PURE__*/ (() => {
|
|
|
340
340
|
else {
|
|
341
341
|
this.b.actualColumns._inner[e].is = 0;
|
|
342
342
|
}
|
|
343
|
-
this.b.actualColumns._inner[e].
|
|
343
|
+
this.b.actualColumns._inner[e].o9("Pinned");
|
|
344
344
|
break;
|
|
345
345
|
}
|
|
346
346
|
}
|
|
@@ -516,15 +516,15 @@ let ComparisonOperatorSelector = /*@__PURE__*/ (() => {
|
|
|
516
516
|
$ret.c = false;
|
|
517
517
|
return $ret;
|
|
518
518
|
})());
|
|
519
|
-
this.n.
|
|
520
|
-
this.n.
|
|
521
|
-
this.n.
|
|
519
|
+
this.n.lj = this.n.lk = 4;
|
|
520
|
+
this.n.ll = this.n.li = 0;
|
|
521
|
+
this.n.nf = "Icon";
|
|
522
522
|
let e = this.n;
|
|
523
523
|
e.cellUpdating = delegateCombine(e.cellUpdating, runOn(this, this.el));
|
|
524
524
|
this.f.columns.add(this.n);
|
|
525
525
|
let f = new TextColumn();
|
|
526
|
-
f.
|
|
527
|
-
f.
|
|
526
|
+
f.nf = "DisplayText";
|
|
527
|
+
f.lj = 0;
|
|
528
528
|
f.g = 0;
|
|
529
529
|
this.f.columns.add(f);
|
|
530
530
|
this.d4();
|
|
@@ -827,12 +827,12 @@ let ComparisonOperatorSelector = /*@__PURE__*/ (() => {
|
|
|
827
827
|
this.em();
|
|
828
828
|
}
|
|
829
829
|
d9(a, b) {
|
|
830
|
-
let c = b.cellInfo.
|
|
830
|
+
let c = b.cellInfo.fq;
|
|
831
831
|
this.i = this.f.actualDataSource.getItemAtIndex(c);
|
|
832
832
|
this.d8();
|
|
833
833
|
}
|
|
834
834
|
el(a, b) {
|
|
835
|
-
this.e.t(b.content, b.cellInfo.
|
|
835
|
+
this.e.t(b.content, b.cellInfo.ih);
|
|
836
836
|
}
|
|
837
837
|
}
|
|
838
838
|
ComparisonOperatorSelector.$t = /*@__PURE__*/ markType(ComparisonOperatorSelector, 'ComparisonOperatorSelector', Base.$, [INotifyPropertyChanged_$type]);
|
|
@@ -49,7 +49,7 @@ let ContentCellModelHelper = /*@__PURE__*/ (() => {
|
|
|
49
49
|
}
|
|
50
50
|
static a(a, b, c, d, e) {
|
|
51
51
|
if (b.a7) {
|
|
52
|
-
if (b.bc(CellModel.
|
|
52
|
+
if (b.bc(CellModel.fp) || b.bc(CellModel.eu) || b.bc(CellModel.h5) || b.bb("IsRowPinned") || b.bb("IsRowSticky") || b.bb("PinnedRowOpacity")) {
|
|
53
53
|
let f = Math.min(1, Math.max(0, b.c7));
|
|
54
54
|
let g = b.cp * (1 - f);
|
|
55
55
|
d.setRawStyleProperty("opacity", g.toString());
|
|
@@ -58,12 +58,12 @@ let ContentCellModelHelper = /*@__PURE__*/ (() => {
|
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
if (b.bc(CellModel.e5)) {
|
|
61
|
-
ContentCellModelHelper.c(d, b.
|
|
61
|
+
ContentCellModelHelper.c(d, b.nf);
|
|
62
62
|
if (b.bm) {
|
|
63
|
-
e.di(b.
|
|
63
|
+
e.di(b.nf);
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
|
-
if (b.bc(CellModel.
|
|
66
|
+
if (b.bc(CellModel.gv)) {
|
|
67
67
|
switch (b.ac) {
|
|
68
68
|
case 0:
|
|
69
69
|
d.setRawStyleProperty("white-space", "nowrap");
|
|
@@ -83,7 +83,7 @@ let ContentCellModelHelper = /*@__PURE__*/ (() => {
|
|
|
83
83
|
if (b.bb("TextDecoration")) {
|
|
84
84
|
ContentCellModelHelper.d(d, b.aa);
|
|
85
85
|
}
|
|
86
|
-
if (b.bc(CellModel.
|
|
86
|
+
if (b.bc(CellModel.gb) || b.bc(CellModel.h4)) {
|
|
87
87
|
let h = b.g;
|
|
88
88
|
let i = b.i;
|
|
89
89
|
ContentCellModelHelper.b(c, d, h);
|
|
@@ -187,7 +187,7 @@ let DataGridCellLayoutPanel = /*@__PURE__*/ (() => {
|
|
|
187
187
|
if (v.bl) {
|
|
188
188
|
m = true;
|
|
189
189
|
}
|
|
190
|
-
if (v.u == 1 && v.
|
|
190
|
+
if (v.u == 1 && v.ia != n) {
|
|
191
191
|
m = true;
|
|
192
192
|
}
|
|
193
193
|
}
|
|
@@ -243,8 +243,8 @@ let DataGridCellLayoutPanel = /*@__PURE__*/ (() => {
|
|
|
243
243
|
ag.nativeCell.isRemoved = false;
|
|
244
244
|
}
|
|
245
245
|
af.u = 2;
|
|
246
|
-
let al = (af.
|
|
247
|
-
let am = (af.
|
|
246
|
+
let al = (af.hf + intDivide(af.h6, 2));
|
|
247
|
+
let am = (af.hh + intDivide(af.f9, 2));
|
|
248
248
|
let an = (al - b) / this.f.actualVisibleRegion.width;
|
|
249
249
|
let ao = (am - a) / this.f.actualVisibleRegion.height;
|
|
250
250
|
if (af.bn) {
|
|
@@ -265,15 +265,15 @@ let DataGridCellLayoutPanel = /*@__PURE__*/ (() => {
|
|
|
265
265
|
aj.setRawStyleProperty("clip", this.y(af));
|
|
266
266
|
}
|
|
267
267
|
else {
|
|
268
|
-
if (Rect.l_op_Inequality(af.
|
|
269
|
-
aj.setRawStyleProperty("clip", this.x(af.
|
|
268
|
+
if (Rect.l_op_Inequality(af.n0, Rect.empty)) {
|
|
269
|
+
aj.setRawStyleProperty("clip", this.x(af.n0));
|
|
270
270
|
}
|
|
271
271
|
else {
|
|
272
272
|
aj.setRawStyleProperty("clip", "auto");
|
|
273
273
|
}
|
|
274
274
|
}
|
|
275
275
|
}
|
|
276
|
-
af.
|
|
276
|
+
af.ma();
|
|
277
277
|
if (ai) {
|
|
278
278
|
let ap = af.s.nativeCell;
|
|
279
279
|
ap.co(z);
|
|
@@ -281,17 +281,17 @@ let DataGridCellLayoutPanel = /*@__PURE__*/ (() => {
|
|
|
281
281
|
af.s.modelUpdated(af);
|
|
282
282
|
if (ai && y.b) {
|
|
283
283
|
let aq = y.a;
|
|
284
|
-
aq.
|
|
284
|
+
aq.ac();
|
|
285
285
|
if (af.l.d != 0 && this.f.b2) {
|
|
286
|
-
aq.
|
|
286
|
+
aq.aj(this.ax(af.l.d));
|
|
287
287
|
}
|
|
288
288
|
let ar = af.s.nativeCell;
|
|
289
289
|
ar.b6(aq, y.c, y.d, af.c8, af.c9, z);
|
|
290
|
-
aq.
|
|
290
|
+
aq.ab();
|
|
291
291
|
}
|
|
292
|
-
af.
|
|
292
|
+
af.l3();
|
|
293
293
|
if (m) {
|
|
294
|
-
af.
|
|
294
|
+
af.ia = n;
|
|
295
295
|
if (!ai) {
|
|
296
296
|
aj.setRawStyleProperty("z-index", x.toString());
|
|
297
297
|
}
|
|
@@ -302,7 +302,7 @@ let DataGridCellLayoutPanel = /*@__PURE__*/ (() => {
|
|
|
302
302
|
}
|
|
303
303
|
this.m = false;
|
|
304
304
|
if (y.a != null && this.q != 1) {
|
|
305
|
-
y.a.
|
|
305
|
+
y.a.ab();
|
|
306
306
|
}
|
|
307
307
|
this.an();
|
|
308
308
|
}
|
|
@@ -515,8 +515,8 @@ let DataGridCellLayoutPanel = /*@__PURE__*/ (() => {
|
|
|
515
515
|
y(a) {
|
|
516
516
|
let b = a.c8 < this.g.cn ? this.g.cn - a.c8 : 0;
|
|
517
517
|
let c = 0;
|
|
518
|
-
let d = this.g.cy == -1 ? a.
|
|
519
|
-
let e = a.
|
|
518
|
+
let d = this.g.cy == -1 ? a.h6 : (a.c8 + a.h6 > this.g.co) ? a.h6 - (a.c8 + a.h6 - this.g.co) : a.h6;
|
|
519
|
+
let e = a.f9;
|
|
520
520
|
return this.x(new Rect(0, b, c, d, e));
|
|
521
521
|
}
|
|
522
522
|
ah(a, b) {
|
|
@@ -12,6 +12,9 @@ export class DataGridLocaleEn {
|
|
|
12
12
|
this["Column_Move"] = "Move";
|
|
13
13
|
this["Column_Move_Left"] = "Left";
|
|
14
14
|
this["Column_Move_Right"] = "Right";
|
|
15
|
+
this["Column_Options_Analyze"] = "Analyze";
|
|
16
|
+
this["Column_Options_Sort_Ascending"] = "Sort Ascending";
|
|
17
|
+
this["Column_Options_Sort_Descending"] = "Sort Descending";
|
|
15
18
|
this["Column_Options_Summaries"] = "Summaries";
|
|
16
19
|
this["Column_Options_Summary_Average"] = "Average";
|
|
17
20
|
this["Column_Options_Summary_Count"] = "Count";
|
|
@@ -14,52 +14,52 @@ let DataGridScrollerKeyboardListener = /*@__PURE__*/ (() => {
|
|
|
14
14
|
this.a = a;
|
|
15
15
|
}
|
|
16
16
|
onDownArrow(a, b) {
|
|
17
|
-
return this.a.
|
|
17
|
+
return this.a.kv(a, b);
|
|
18
18
|
}
|
|
19
19
|
onEnd(a, b) {
|
|
20
|
-
return this.a.
|
|
20
|
+
return this.a.kw(a, b);
|
|
21
21
|
}
|
|
22
22
|
onHome(a, b) {
|
|
23
|
-
return this.a.
|
|
23
|
+
return this.a.k0(a, b);
|
|
24
24
|
}
|
|
25
25
|
onLeftArrow(a, b) {
|
|
26
|
-
return this.a.
|
|
26
|
+
return this.a.k2(a, b);
|
|
27
27
|
}
|
|
28
28
|
onPageDown(a, b) {
|
|
29
|
-
return this.a.
|
|
29
|
+
return this.a.k3(a, b);
|
|
30
30
|
}
|
|
31
31
|
onPageUp(a, b) {
|
|
32
|
-
return this.a.
|
|
32
|
+
return this.a.k4(a, b);
|
|
33
33
|
}
|
|
34
34
|
onRightArrow(a, b) {
|
|
35
|
-
return this.a.
|
|
35
|
+
return this.a.k5(a, b);
|
|
36
36
|
}
|
|
37
37
|
onTab(a, b) {
|
|
38
|
-
return this.a.
|
|
38
|
+
return this.a.k7(a, b);
|
|
39
39
|
}
|
|
40
40
|
onUpArrow(a, b) {
|
|
41
|
-
return this.a.
|
|
41
|
+
return this.a.k8(a, b);
|
|
42
42
|
}
|
|
43
43
|
onWheel() {
|
|
44
|
-
this.a.
|
|
44
|
+
this.a.yq();
|
|
45
45
|
}
|
|
46
46
|
onEnter(a, b) {
|
|
47
|
-
return this.a.
|
|
47
|
+
return this.a.kx(a, b);
|
|
48
48
|
}
|
|
49
49
|
onEscape() {
|
|
50
|
-
return this.a.
|
|
50
|
+
return this.a.ky();
|
|
51
51
|
}
|
|
52
52
|
onF2() {
|
|
53
|
-
return this.a.
|
|
53
|
+
return this.a.kz();
|
|
54
54
|
}
|
|
55
55
|
onSpace(a, b) {
|
|
56
|
-
return this.a.
|
|
56
|
+
return this.a.k6(a, b);
|
|
57
57
|
}
|
|
58
58
|
onKeyDown(a, b, c) {
|
|
59
|
-
return this.a.
|
|
59
|
+
return this.a.k1(a, b, c);
|
|
60
60
|
}
|
|
61
61
|
onGotFocus(a, b) {
|
|
62
|
-
this.a.
|
|
62
|
+
this.a.x0(a, b);
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
DataGridScrollerKeyboardListener.$t = /*@__PURE__*/ markType(DataGridScrollerKeyboardListener, 'DataGridScrollerKeyboardListener', Base.$, [IScrollerKeyboardListener_$type]);
|
|
@@ -743,7 +743,7 @@ let DataGridToolbar = /*@__PURE__*/ (() => {
|
|
|
743
743
|
this.s = 0;
|
|
744
744
|
this.t = 0;
|
|
745
745
|
for (let b = 0; b < a; b++) {
|
|
746
|
-
if (this.e.actualColumns._inner[b].
|
|
746
|
+
if (this.e.actualColumns._inner[b].j9 == true) {
|
|
747
747
|
this.s++;
|
|
748
748
|
}
|
|
749
749
|
if (this.e.actualColumns._inner[b].is == 1) {
|
|
@@ -21,22 +21,22 @@ let DateTimeCellPresenter = /*@__PURE__*/ (() => {
|
|
|
21
21
|
super.b(a);
|
|
22
22
|
let b = a;
|
|
23
23
|
if (a.a7) {
|
|
24
|
-
if (a.bc(DateTimeCellModel.
|
|
24
|
+
if (a.bc(DateTimeCellModel.od) || a.bc(DateTimeCellModel.oe) || a.bc(DateTimeCellModel.oc) || a.bc(DateTimeCellModel.gy) || a.bc(DateTimeCellModel.h3)) {
|
|
25
25
|
this.e(b);
|
|
26
|
-
this.d.c8(this.d.dx, b.
|
|
26
|
+
this.d.c8(this.d.dx, b.ky);
|
|
27
27
|
}
|
|
28
28
|
ContentCellModelHelper.a(this.a.am, b, this.a.ar, this.d.dx, this.a);
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
e(a) {
|
|
32
|
-
if (a.
|
|
33
|
-
a.
|
|
32
|
+
if (a.lu != null) {
|
|
33
|
+
a.ky = a.lu;
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
|
-
a.
|
|
37
|
-
if (a.
|
|
38
|
-
if (a.
|
|
39
|
-
a.
|
|
36
|
+
a.ky = a.op(a.ob);
|
|
37
|
+
if (a.ky == stringEmpty()) {
|
|
38
|
+
if (a.ig != null && !(typeCast(Date_$type, a.ig) !== null)) {
|
|
39
|
+
a.ky = a.ig.toString();
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
}
|
package/esm2015/lib/Dragger.js
CHANGED
|
@@ -110,8 +110,8 @@ let Dragger = /*@__PURE__*/ (() => {
|
|
|
110
110
|
let e = this.view.getWindowScrollPos();
|
|
111
111
|
c += e[0];
|
|
112
112
|
d += e[1];
|
|
113
|
-
NativeUI.
|
|
114
|
-
NativeUI.
|
|
113
|
+
NativeUI.x(this.cloneCell, a + d);
|
|
114
|
+
NativeUI.ah(this.cloneCell, b + c);
|
|
115
115
|
}
|
|
116
116
|
}
|
|
117
117
|
}
|
|
@@ -144,8 +144,8 @@ let Dragger = /*@__PURE__*/ (() => {
|
|
|
144
144
|
let j = this.view.getWindowScrollPos();
|
|
145
145
|
h += j[0];
|
|
146
146
|
i += j[1];
|
|
147
|
-
NativeUI.
|
|
148
|
-
NativeUI.
|
|
147
|
+
NativeUI.x(this.cloneCell, a + i);
|
|
148
|
+
NativeUI.ah(this.cloneCell, b + h);
|
|
149
149
|
}
|
|
150
150
|
}
|
|
151
151
|
}
|
|
@@ -22,45 +22,45 @@ let EditorCellPresenter = /*@__PURE__*/ (() => {
|
|
|
22
22
|
super.b(a);
|
|
23
23
|
let b = a;
|
|
24
24
|
if (b.a7) {
|
|
25
|
-
if (b.bc(EditorCellModel.
|
|
26
|
-
this.d.d3 = b.
|
|
27
|
-
this.d.ew = b.
|
|
28
|
-
this.d.e1 = b.
|
|
29
|
-
this.d.dx = b.
|
|
25
|
+
if (b.bc(EditorCellModel.ol) || b.bc(EditorCellModel.oj) || b.bc(EditorCellModel.ok) || b.bc(EditorCellModel.om)) {
|
|
26
|
+
this.d.d3 = b.n8;
|
|
27
|
+
this.d.ew = b.ov;
|
|
28
|
+
this.d.e1 = b.o4;
|
|
29
|
+
this.d.dx = b.n2;
|
|
30
30
|
}
|
|
31
|
-
if (b.bc(EditorCellModel.
|
|
32
|
-
this.d.dz = b.
|
|
31
|
+
if (b.bc(EditorCellModel.oh)) {
|
|
32
|
+
this.d.dz = b.n4;
|
|
33
33
|
}
|
|
34
|
-
if (b.bc(EditorCellModel.
|
|
35
|
-
this.d.ex = b.
|
|
34
|
+
if (b.bc(EditorCellModel.gy)) {
|
|
35
|
+
this.d.ex = b.ig;
|
|
36
36
|
}
|
|
37
|
-
if (b.bc(EditorCellModel.
|
|
38
|
-
this.d.fr(b.
|
|
37
|
+
if (b.bc(EditorCellModel.on)) {
|
|
38
|
+
this.d.fr(b.n6 == null);
|
|
39
39
|
}
|
|
40
|
-
if (b.bc(CellModel.
|
|
40
|
+
if (b.bc(CellModel.f7)) {
|
|
41
41
|
this.d.ee = b.aj;
|
|
42
42
|
}
|
|
43
|
-
if (b.bc(EditorCellModel.
|
|
44
|
-
if (stringIsNullOrWhiteSpace(b.
|
|
43
|
+
if (b.bc(EditorCellModel.oo)) {
|
|
44
|
+
if (stringIsNullOrWhiteSpace(b.o9)) {
|
|
45
45
|
this.d.el = false;
|
|
46
46
|
this.d.fe();
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
49
49
|
this.d.el = true;
|
|
50
|
-
this.d.fv(b.
|
|
50
|
+
this.d.fv(b.o9, b.c8, b.c9, b.h6, b.f9);
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
if (b.bc(EditorCellModel.fn)) {
|
|
54
|
-
this.d.ep = Rect.l_op_Equality(b.
|
|
54
|
+
this.d.ep = Rect.l_op_Equality(b.n0, Rect.empty) ? false : true;
|
|
55
55
|
}
|
|
56
|
-
if (b.bc(EditorCellModel.
|
|
57
|
-
this.d.e5 = b.
|
|
56
|
+
if (b.bc(EditorCellModel.oi)) {
|
|
57
|
+
this.d.e5 = b.o1;
|
|
58
58
|
}
|
|
59
|
-
if (b.bc(EditorCellModel.
|
|
60
|
-
this.d.eq = b.
|
|
59
|
+
if (b.bc(EditorCellModel.or)) {
|
|
60
|
+
this.d.eq = b.oe;
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
|
-
if (b.bc(EditorCellModel.
|
|
63
|
+
if (b.bc(EditorCellModel.op)) {
|
|
64
64
|
this.d.b9();
|
|
65
65
|
}
|
|
66
66
|
}
|
|
@@ -23,20 +23,20 @@ let FilterCellPresenter = /*@__PURE__*/ (() => {
|
|
|
23
23
|
e(a) {
|
|
24
24
|
let b = a;
|
|
25
25
|
if (a.a7) {
|
|
26
|
-
if (b.bc(FilterCellModel.
|
|
27
|
-
this.d.dy = b.
|
|
26
|
+
if (b.bc(FilterCellModel.oj)) {
|
|
27
|
+
this.d.dy = b.n6;
|
|
28
28
|
}
|
|
29
|
-
if (b.bc(CellModel.
|
|
29
|
+
if (b.bc(CellModel.f7)) {
|
|
30
30
|
this.d.ed = b.aj;
|
|
31
31
|
}
|
|
32
|
-
if (b.bc(FilterCellModel.
|
|
33
|
-
this.d.dx = b.
|
|
32
|
+
if (b.bc(FilterCellModel.om)) {
|
|
33
|
+
this.d.dx = b.n4;
|
|
34
34
|
}
|
|
35
|
-
if (b.bc(FilterCellModel.
|
|
36
|
-
this.d.d6 = b.
|
|
35
|
+
if (b.bc(FilterCellModel.ol)) {
|
|
36
|
+
this.d.d6 = b.oa;
|
|
37
37
|
}
|
|
38
|
-
if (b.bc(FilterCellModel.
|
|
39
|
-
if (b.
|
|
38
|
+
if (b.bc(FilterCellModel.on)) {
|
|
39
|
+
if (b.oc) {
|
|
40
40
|
this.d.e0();
|
|
41
41
|
}
|
|
42
42
|
else {
|
|
@@ -44,12 +44,12 @@ let FilterCellPresenter = /*@__PURE__*/ (() => {
|
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
if (b.bc(FilterCellModel.e5)) {
|
|
47
|
-
this.d.fl = b.
|
|
47
|
+
this.d.fl = b.nf;
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
if (a.bn || a.bs) {
|
|
51
|
-
if (b.bc(FilterCellModel.
|
|
52
|
-
this.d.fj(b.c8, b.c9, b.
|
|
51
|
+
if (b.bc(FilterCellModel.h8) || b.bc(FilterCellModel.h9) || b.bc(FilterCellModel.h7) || b.bc(FilterCellModel.ga)) {
|
|
52
|
+
this.d.fj(b.c8, b.c9, b.h6, b.f9);
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
55
|
}
|
|
@@ -255,8 +255,8 @@ let GridCellBase = /*@__PURE__*/ (() => {
|
|
|
255
255
|
a.svg = null;
|
|
256
256
|
a.svgPath = null;
|
|
257
257
|
a.b = null;
|
|
258
|
-
a.
|
|
259
|
-
a.
|
|
258
|
+
a.b2 = null;
|
|
259
|
+
a.bj = null;
|
|
260
260
|
let d = SvgIconRegistry.instance.getSvgPathString(this.bn, this.bo);
|
|
261
261
|
if (d != null) {
|
|
262
262
|
if (stringStartsWith(d, "<svg")) {
|
|
@@ -274,12 +274,12 @@ let GridCellBase = /*@__PURE__*/ (() => {
|
|
|
274
274
|
}
|
|
275
275
|
let f = SvgIconRegistry.instance.getDataURLString(this.bn, this.bo);
|
|
276
276
|
if (f != null) {
|
|
277
|
-
a.
|
|
277
|
+
a.b2 = f;
|
|
278
278
|
return;
|
|
279
279
|
}
|
|
280
280
|
let g = SvgIconRegistry.instance.getIconSource(this.bn, this.bo);
|
|
281
281
|
if (g != null) {
|
|
282
|
-
a.
|
|
282
|
+
a.bj = g;
|
|
283
283
|
}
|
|
284
284
|
}
|
|
285
285
|
get aj() {
|
|
@@ -595,8 +595,8 @@ let GridCellBase = /*@__PURE__*/ (() => {
|
|
|
595
595
|
this.ag = b;
|
|
596
596
|
this.k.d = (b);
|
|
597
597
|
}
|
|
598
|
-
let c = a.
|
|
599
|
-
let d = a.
|
|
598
|
+
let c = a.h6 * 0.2;
|
|
599
|
+
let d = a.f9 * 0.6;
|
|
600
600
|
if (this.ah >= c && this.ah <= d && !this.y) {
|
|
601
601
|
return;
|
|
602
602
|
}
|