@smartbit4all/ng-client 3.3.113 → 3.3.115
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/esm2020/lib/smart-grid/api/grid-api/model/gridColumnMeta.mjs +1 -1
- package/esm2020/lib/smart-grid/api/grid-api/model/gridModel.mjs +1 -1
- package/esm2020/lib/smart-grid/api/grid-api/model/gridServerModel.mjs +1 -1
- package/esm2020/lib/smart-grid/smart-grid.component.mjs +16 -6
- package/esm2020/lib/view-context/smart-ui-action/ui-action-toolbar.component.mjs +6 -4
- package/fesm2015/smartbit4all-ng-client.mjs +21 -9
- package/fesm2015/smartbit4all-ng-client.mjs.map +1 -1
- package/fesm2020/smartbit4all-ng-client.mjs +20 -8
- package/fesm2020/smartbit4all-ng-client.mjs.map +1 -1
- package/lib/smart-grid/api/grid-api/model/gridColumnMeta.d.ts +4 -0
- package/lib/smart-grid/api/grid-api/model/gridModel.d.ts +2 -0
- package/lib/smart-grid/api/grid-api/model/gridServerModel.d.ts +2 -0
- package/package.json +1 -1
- package/smartbit4all-ng-client-3.3.115.tgz +0 -0
- package/smartbit4all-ng-client-3.3.113.tgz +0 -0
|
@@ -5035,10 +5035,12 @@ class UiActionToolbarComponent {
|
|
|
5035
5035
|
setUp() {
|
|
5036
5036
|
return __awaiter(this, void 0, void 0, function* () {
|
|
5037
5037
|
if (this.uiActionModels) {
|
|
5038
|
-
|
|
5038
|
+
let uiActionModelsWithDescriptions = [];
|
|
5039
|
+
for (const uiActionModel of this.uiActionModels) {
|
|
5039
5040
|
uiActionModel.descriptor = yield this.manager.getActionDescriptor(uiActionModel.uiAction);
|
|
5040
|
-
|
|
5041
|
-
}
|
|
5041
|
+
uiActionModelsWithDescriptions.push(uiActionModel);
|
|
5042
|
+
}
|
|
5043
|
+
this.uiActionModelsWithDescriptions = uiActionModelsWithDescriptions;
|
|
5042
5044
|
}
|
|
5043
5045
|
});
|
|
5044
5046
|
}
|
|
@@ -10388,7 +10390,7 @@ class SmartGridComponent {
|
|
|
10388
10390
|
})));
|
|
10389
10391
|
}
|
|
10390
10392
|
yield Promise.all(this.smartGrid.gridModel.view.orderedColumnNames.map((propertyName) => __awaiter(this, void 0, void 0, function* () {
|
|
10391
|
-
var _j, _k, _l, _m, _o, _p;
|
|
10393
|
+
var _j, _k, _l, _m, _o, _p, _q, _r, _s;
|
|
10392
10394
|
let descColumn = this.smartGrid.gridModel.view.descriptor.columns.find((colDescriptor) => colDescriptor.propertyName === propertyName);
|
|
10393
10395
|
let customTableHeader = (_k = (_j = this.smartGrid.tableConfig) === null || _j === void 0 ? void 0 : _j.customSmartTableHeaders) === null || _k === void 0 ? void 0 : _k.find((header) => header.propertyName === propertyName);
|
|
10394
10396
|
if (descColumn) {
|
|
@@ -10415,16 +10417,26 @@ class SmartGridComponent {
|
|
|
10415
10417
|
}
|
|
10416
10418
|
let properties = customTableHeader === null || customTableHeader === void 0 ? void 0 : customTableHeader.properties;
|
|
10417
10419
|
if (!properties) {
|
|
10418
|
-
if (descColumn.typeClass === 'java.time.OffsetDateTime'
|
|
10420
|
+
if (descColumn.typeClass === 'java.time.OffsetDateTime' ||
|
|
10421
|
+
descColumn.typeClass === 'java.time.LocalDateTime') {
|
|
10422
|
+
let dateFormat = (_q = descColumn.typeFormat) !== null && _q !== void 0 ? _q : 'yyyy.MM.dd H:mm';
|
|
10419
10423
|
properties = {
|
|
10420
10424
|
type: SmartTableHeaderPropertyType.DATETIME,
|
|
10421
|
-
dateFormat
|
|
10425
|
+
dateFormat,
|
|
10422
10426
|
};
|
|
10423
10427
|
}
|
|
10424
|
-
else if (descColumn.typeClass === 'java.time.
|
|
10428
|
+
else if (descColumn.typeClass === 'java.time.LocalDate') {
|
|
10429
|
+
let dateFormat = (_r = descColumn.typeFormat) !== null && _r !== void 0 ? _r : 'yyyy.MM.dd';
|
|
10425
10430
|
properties = {
|
|
10426
|
-
type: SmartTableHeaderPropertyType.
|
|
10427
|
-
dateFormat
|
|
10431
|
+
type: SmartTableHeaderPropertyType.DATE,
|
|
10432
|
+
dateFormat,
|
|
10433
|
+
};
|
|
10434
|
+
}
|
|
10435
|
+
else if (descColumn.typeClass === 'java.time.LocalTime') {
|
|
10436
|
+
let dateFormat = (_s = descColumn.typeFormat) !== null && _s !== void 0 ? _s : 'H:mm';
|
|
10437
|
+
properties = {
|
|
10438
|
+
type: SmartTableHeaderPropertyType.TIME,
|
|
10439
|
+
dateFormat,
|
|
10428
10440
|
};
|
|
10429
10441
|
}
|
|
10430
10442
|
}
|