@sd-angular/core 1.0.59 → 1.0.60
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/sd-angular-core-grid-material.umd.js +27 -11
- package/bundles/sd-angular-core-grid-material.umd.js.map +1 -1
- package/bundles/sd-angular-core-grid-material.umd.min.js +1 -1
- package/bundles/sd-angular-core-grid-material.umd.min.js.map +1 -1
- package/esm2015/grid-material/src/lib/grid-material.component.js +16 -4
- package/esm2015/grid-material/src/lib/models/grid-column.model.js +1 -1
- package/esm2015/grid-material/src/lib/pipes/cell-view.pipe.js +7 -5
- package/fesm2015/sd-angular-core-grid-material.js +21 -7
- package/fesm2015/sd-angular-core-grid-material.js.map +1 -1
- package/grid-material/src/lib/models/grid-column.model.d.ts +1 -0
- package/package.json +1 -1
- package/{sd-angular-core-1.0.59.tgz → sd-angular-core-1.0.60.tgz} +0 -0
|
@@ -2175,7 +2175,7 @@
|
|
|
2175
2175
|
case 0:
|
|
2176
2176
|
obj = {};
|
|
2177
2177
|
handle = function (exportColumn) { return __awaiter(_this, void 0, void 0, function () {
|
|
2178
|
-
var _q, _r, column, exportedColumn, date, date, date, _v, _w;
|
|
2178
|
+
var _q, _r, column, exportedColumn, date, transformDate, date, transformDate, date, transformDate, _v, _w;
|
|
2179
2179
|
return __generator(this, function (_x) {
|
|
2180
2180
|
switch (_x.label) {
|
|
2181
2181
|
case 0:
|
|
@@ -2220,17 +2220,32 @@
|
|
|
2220
2220
|
return [3 /*break*/, 10];
|
|
2221
2221
|
case 4:
|
|
2222
2222
|
if (!(column.type === 'date')) return [3 /*break*/, 5];
|
|
2223
|
-
date =
|
|
2223
|
+
date = item[column.field];
|
|
2224
|
+
transformDate = column.transformDate;
|
|
2225
|
+
if (transformDate) {
|
|
2226
|
+
date = transformDate(date, item);
|
|
2227
|
+
}
|
|
2228
|
+
// Nếu là date thì convert theo đúng format
|
|
2224
2229
|
obj[column.field] = Date.toFormat(date, 'dd/MM/yyyy');
|
|
2225
2230
|
return [3 /*break*/, 10];
|
|
2226
2231
|
case 5:
|
|
2227
2232
|
if (!(column.type === 'datetime')) return [3 /*break*/, 6];
|
|
2228
|
-
date =
|
|
2233
|
+
date = item[column.field];
|
|
2234
|
+
transformDate = column.transformDate;
|
|
2235
|
+
if (transformDate) {
|
|
2236
|
+
date = transformDate(date, item);
|
|
2237
|
+
}
|
|
2238
|
+
// Nếu là datetime thì convert theo đúng format
|
|
2229
2239
|
obj[column.field] = Date.toFormat(date, 'dd/MM/yyyy HH:mm:ss');
|
|
2230
2240
|
return [3 /*break*/, 10];
|
|
2231
2241
|
case 6:
|
|
2232
2242
|
if (!(column.type === 'time')) return [3 /*break*/, 7];
|
|
2233
|
-
date =
|
|
2243
|
+
date = item[column.field];
|
|
2244
|
+
transformDate = column.transformDate;
|
|
2245
|
+
if (transformDate) {
|
|
2246
|
+
date = transformDate(date, item);
|
|
2247
|
+
}
|
|
2248
|
+
// Nếu là time thì convert theo đúng format
|
|
2234
2249
|
obj[column.field] = Date.toFormat(date, 'HH:mm:ss');
|
|
2235
2250
|
return [3 /*break*/, 10];
|
|
2236
2251
|
case 7:
|
|
@@ -4311,7 +4326,7 @@
|
|
|
4311
4326
|
SdCellViewPipe.prototype.transform = function (value, rowData, column, gridOption, key) {
|
|
4312
4327
|
var _a;
|
|
4313
4328
|
return __awaiter(this, void 0, void 0, function () {
|
|
4314
|
-
var displayOnEmpty, align, click, tooltip, htmlTemplate, transform, result, val, _b, option, seconds, _c, option;
|
|
4329
|
+
var displayOnEmpty, align, click, tooltip, htmlTemplate, transform, result, transformDate, val, _b, option, seconds, _c, option;
|
|
4315
4330
|
return __generator(this, function (_d) {
|
|
4316
4331
|
switch (_d.label) {
|
|
4317
4332
|
case 0:
|
|
@@ -4331,6 +4346,12 @@
|
|
|
4331
4346
|
result.display.html = htmlTemplate(value, rowData, __classPrivateFieldGet(this, _isMobileOrTablet$1));
|
|
4332
4347
|
return [3 /*break*/, 10];
|
|
4333
4348
|
case 1:
|
|
4349
|
+
if (column.type === 'datetime' || column.type === 'date' || column.type === 'time') {
|
|
4350
|
+
transformDate = column.transformDate;
|
|
4351
|
+
if (transformDate) {
|
|
4352
|
+
value = transformDate(value, rowData);
|
|
4353
|
+
}
|
|
4354
|
+
}
|
|
4334
4355
|
if (!(typeof (transform) === 'function')) return [3 /*break*/, 5];
|
|
4335
4356
|
val = transform(value, rowData);
|
|
4336
4357
|
if (!(val instanceof Promise)) return [3 /*break*/, 3];
|
|
@@ -4342,12 +4363,7 @@
|
|
|
4342
4363
|
case 3:
|
|
4343
4364
|
result.display.value = val;
|
|
4344
4365
|
_d.label = 4;
|
|
4345
|
-
case 4:
|
|
4346
|
-
if (column.type === 'datetime' && result.display.value) {
|
|
4347
|
-
result.display.hasHtml = true;
|
|
4348
|
-
result.display.html = "<span class=\"d-block T14R text-black400\">" + Date.toFormat(result.display.value, 'HH:mm') + "</span><span class=\"d-block T14R\">" + Date.toFormat(result.display.value, 'dd/MM/yyyy') + "</span>";
|
|
4349
|
-
}
|
|
4350
|
-
return [3 /*break*/, 9];
|
|
4366
|
+
case 4: return [3 /*break*/, 9];
|
|
4351
4367
|
case 5:
|
|
4352
4368
|
if (column.type === 'date' || column.type === 'datetime') {
|
|
4353
4369
|
option = column.option;
|