@sd-angular/core 1.2.81 → 1.2.84

package/bundles/sd-angular-core-grid-material.umd.js

@@ -842,39 +842,7 @@
             this.export = new core.EventEmitter();
             this.form = new forms.FormGroup({});
             _getExportableColumns.set(this, function () {
-                var _a, _b;
-                var columns = [];
-                _this.gridOption.columns.filter(function (e) { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); }).forEach(function (column) {
-                    var _a, _b;
-                    if (column.type === 'image') {
-                        return;
-                    }
-                    if (column.type === 'children') {
-                        (_a = column.children) === null || _a === void 0 ? void 0 : _a.filter(function (e) { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); }).forEach(function (childColumn) {
-                            if (childColumn.type === 'image') {
-                                return;
-                            }
-                            columns.push(childColumn);
-                        });
-                        return;
-                    }
-                    if (column.type === 'children-col') {
-                        (_b = column.children) === null || _b === void 0 ? void 0 : _b.filter(function (e) { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); }).forEach(function (childColumn) {
-                            if (childColumn.type === 'image') {
-                                return;
-                            }
-                            columns.push(childColumn);
-                        });
-                        return;
-                    }
-                    columns.push(column);
-                });
-                return __spread(columns, (((_b = (_a = _this.gridOption.export) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.filter(function (e) { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); })) || [])).map(function (e) { return ({
-                    field: e.field,
-                    title: e.title,
-                    description: e.description,
-                    width: e.width
-                }); });
+                return __spread(_this.gridColumns, _this.additionalColumns);
             });
             _getExportableGroups.set(this, function () {
                 var _a, _b, _c;
@@ -907,6 +875,7 @@
             }); };
             _getExportColumns.set(this, function () {
                 if (_this.configuration) {
+                    var columns_1 = __spread(_this.gridColumns);
                     var _x = _this.configuration, firstColumns = _x.firstColumns, secondColumns = _x.secondColumns;
                     var displayColumns = __spread(firstColumns, secondColumns).reduce(function (first, next) {
                         var column = _this.gridOption.columns.find(function (e) { return e.field === next.field; });
@@ -919,8 +888,9 @@
                         var children = column.children.filter(function (e1) { return e1.type !== 'image'; });
                         return __spread(first, children);
                     }, []);
-                    return displayColumns.map(function (e) { return (Object.assign(Object.assign({}, e), { data: _this.columns.find(function (e1) { return e1.field === e.field; }) })); }).filter(function (e) { return !!e.data; })
+                    var results = displayColumns.map(function (e) { return (Object.assign(Object.assign({}, e), { data: columns_1.find(function (e1) { return e1.field === e.field; }) })); }).filter(function (e) { return !!e.data; })
                         .map(function (e) { return e.data; });
+                    return __spread(results, _this.additionalColumns);
                 }
                 else {
                     return _this.columns;
@@ -1230,6 +1200,57 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(SdPopupExport.prototype, "gridColumns", {
+            get: function () {
+                var columns = [];
+                this.gridOption.columns.filter(function (e) { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); }).forEach(function (column) {
+                    var _a, _b;
+                    if (column.type === 'image') {
+                        return;
+                    }
+                    if (column.type === 'children') {
+                        (_a = column.children) === null || _a === void 0 ? void 0 : _a.filter(function (e) { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); }).forEach(function (childColumn) {
+                            if (childColumn.type === 'image') {
+                                return;
+                            }
+                            columns.push(childColumn);
+                        });
+                        return;
+                    }
+                    if (column.type === 'children-col') {
+                        (_b = column.children) === null || _b === void 0 ? void 0 : _b.filter(function (e) { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); }).forEach(function (childColumn) {
+                            if (childColumn.type === 'image') {
+                                return;
+                            }
+                            columns.push(childColumn);
+                        });
+                        return;
+                    }
+                    columns.push(column);
+                });
+                return columns.map(function (e) { return ({
+                    field: e.field,
+                    title: e.title,
+                    description: e.description,
+                    width: e.width
+                }); });
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(SdPopupExport.prototype, "additionalColumns", {
+            get: function () {
+                var _a, _b;
+                return (((_b = (_a = this.gridOption.export) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.filter(function (e) { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); })) || []).map(function (e) { return ({
+                    field: e.field,
+                    title: e.title,
+                    description: e.description,
+                    width: e.width
+                }); });
+            },
+            enumerable: false,
+            configurable: true
+        });
         SdPopupExport.prototype.ngOnInit = function () {
         };
         SdPopupExport.prototype.ngAfterViewInit = function () {
@@ -2378,7 +2399,7 @@
                                                                                 date = transformDate(date, item);
                                                                             }
                                                                             // Nếu là datetime thì convert theo đúng format
-                                                                            obj[column.field] = Date.toFormat(date, 'dd/MM/yyyy HH:mm:ss');
+                                                                            obj[column.field] = Date.toFormat(date, 'dd/MM/yyyy HH:mm');
                                                                             return [3 /*break*/, 13];
                                                                         case 9:
                                                                             if (!(column.type === 'time')) return [3 /*break*/, 10];
@@ -2388,7 +2409,7 @@
                                                                                 date = transformDate(date, item);
                                                                             }
                                                                             // Nếu là time thì convert theo đúng format
-                                                                            obj[column.field] = Date.toFormat(date, 'HH:mm:ss');
+                                                                            obj[column.field] = Date.toFormat(date, 'HH:mm');
                                                                             return [3 /*break*/, 13];
                                                                         case 10:
                                                                             if (!(column.type === 'values')) return [3 /*break*/, 12];
@@ -4556,7 +4577,7 @@
         SdCellViewPipe.prototype.transform = function (value, rowData, column, gridOption, key) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var displayOnEmpty, align, click, tooltip, htmlTemplate, transform, result, transformDate, val, _b, option, seconds, _c, option, values, display, emptyValues;
+                var displayOnEmpty, align, click, tooltip, htmlTemplate, transform, result, transformDate, val, _b, option, seconds, date, time, dateTime, _c, option, values, display, emptyValues;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -4619,11 +4640,17 @@
                                     result.tooltip = Date.toFormat(value, column.type === 'date' ? 'dd/MM/yyyy' : 'dd/MM/yyyy HH:mm');
                                 }
                                 else {
-                                    result.display.value = Date.toFormat(value, column.type === 'date' ? 'dd/MM/yyyy' : 'dd/MM/yyyy HH:mm');
-                                    if (column.type === 'datetime' && result.display.value) {
+                                    date = Date.toFormat(value, 'dd/MM/yyyy');
+                                    time = Date.toFormat(value, 'HH:mm');
+                                    dateTime = Date.toFormat(value, 'HH:mm');
+                                    if (column.type === 'datetime' && time && time !== '00:00') {
+                                        result.display.value = dateTime;
                                         result.display.hasHtml = true;
                                         result.display.html = "<span class=\"d-block T14R text-black400\">" + Date.toFormat(value, 'HH:mm') + "</span><span class=\"d-block T14R\">" + Date.toFormat(value, 'dd/MM/yyyy') + "</span>";
                                     }
+                                    else {
+                                        result.display.value = date;
+                                    }
                                 }
                             }
                             if (column.type === 'time') {