@sd-angular/core 1.3.108 → 1.3.110

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

@@ -532,6 +532,14 @@
                     filterDef: _this.filterDef,
                 });
             };
+            this.updateFilter = function () {
+                _this.filterRegister.value.set({
+                    columnFilter: _this.columnFilter,
+                    externalFilter: _this.externalFilter,
+                    filterDef: _this.filterDef,
+                    notReload: true
+                });
+            };
             this.open = function () {
                 _this.popupFilter.open();
             };
@@ -1637,14 +1645,15 @@
             _filterConfiguration.set(this, 'GRID-FILTER-CONFIGURATION');
             _filterValue.set(this, 'GRID-FILTER-VALUE');
             _cache$2.set(this, {});
-            this.register = function (key, args) {
+            this.register = function (filter, args) {
                 var cacheSession = false;
+                var key = filter === null || filter === void 0 ? void 0 : filter.key;
                 if (!key) {
                     var id = args.id, columns = args.columns, externalFilters = args.externalFilters;
                     key = hash__default['default']({
                         id: id,
-                        columns: columns.map(function (e) { return e.field; }).filter(function (field) { return !!field; }),
-                        externalFilters: externalFilters.map(function (e) { return e.field; }).filter(function (field) { return !!field; }),
+                        columns: (columns === null || columns === void 0 ? void 0 : columns.map(function (e) { return e.field; }).filter(function (field) { return !!field; })) || [],
+                        externalFilters: (externalFilters === null || externalFilters === void 0 ? void 0 : externalFilters.map(function (e) { return e.field; }).filter(function (field) { return !!field; })) || [],
                     });
                     cacheSession = true; // Nếu không có key thì chỉ lưu theo session
                 }
@@ -1665,7 +1674,7 @@
                         key: key,
                     }, {
                         default: __classPrivateFieldGet(_this, _defaultValue).call(_this, args),
-                        type: cacheSession ? 'session' : undefined,
+                        type: cacheSession || !(filter === null || filter === void 0 ? void 0 : filter.cacheFilter) ? 'session' : undefined,
                     });
                     // Lấy giá trị value merge với giá trị default của args nếu như args có thay đổi
                     filterValue_1.set(__classPrivateFieldGet(_this, _initValue).call(_this, args, filterValue_1.get()));
@@ -1701,7 +1710,7 @@
                             set: function (value) {
                                 var keys = Object.keys(value || {});
                                 var current = filterValue_1.get();
-                                var columnFilter = current.columnFilter, externalFilter = current.externalFilter, filterDef = current.filterDef;
+                                var columnFilter = current.columnFilter, externalFilter = current.externalFilter, filterDef = current.filterDef, notReload = current.notReload;
                                 var updatedFilter = {
                                     // Filter column
                                     columnFilter: keys.includes('columnFilter') ? (value === null || value === void 0 ? void 0 : value.columnFilter) || {} : columnFilter,
@@ -1709,6 +1718,8 @@
                                     externalFilter: keys.includes('externalFilter') ? (value === null || value === void 0 ? void 0 : value.externalFilter) || {} : externalFilter,
                                     // Filter def
                                     filterDef: keys.includes('filterDef') ? (value === null || value === void 0 ? void 0 : value.filterDef) || {} : filterDef,
+                                    // Force
+                                    force: !!notReload,
                                 };
                                 filterValue_1.set(updatedFilter);
                                 return updatedFilter;
@@ -2020,11 +2031,11 @@
             this.exportTitle = 'Export';
             _loadCompleted.set(this, false);
             _initCellDef.set(this, function () {
-                var e_1, _3;
+                var e_1, _4;
                 _this.cellDef = {};
                 try {
-                    for (var _4 = __values(_this.sdCellDefs), _5 = _4.next(); !_5.done; _5 = _4.next()) {
-                        var cellDef = _5.value;
+                    for (var _5 = __values(_this.sdCellDefs), _6 = _5.next(); !_6.done; _6 = _5.next()) {
+                        var cellDef = _6.value;
                         if (cellDef.sdMaterialCellDef) {
                             _this.cellDef[cellDef.sdMaterialCellDef] = cellDef;
                         }
@@ -2033,35 +2044,35 @@
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (_5 && !_5.done && (_3 = _4.return)) _3.call(_4);
+                        if (_6 && !_6.done && (_4 = _5.return)) _4.call(_5);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
             });
             _initFilterDef.set(this, function () {
-                var e_2, _3;
+                var e_2, _4;
                 _this.filterDefs = [];
                 try {
-                    for (var _4 = __values(_this.sdFilterDefs), _5 = _4.next(); !_5.done; _5 = _4.next()) {
-                        var filterDef = _5.value;
+                    for (var _5 = __values(_this.sdFilterDefs), _6 = _5.next(); !_6.done; _6 = _5.next()) {
+                        var filterDef = _6.value;
                         _this.filterDefs.push(filterDef);
                     }
                 }
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (_5 && !_5.done && (_3 = _4.return)) _3.call(_4);
+                        if (_6 && !_6.done && (_4 = _5.return)) _4.call(_5);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
             });
             _initFooterDef.set(this, function () {
-                var e_3, _3;
+                var e_3, _4;
                 _this.footerDef = {};
                 _this.hasFooter = false;
                 try {
-                    for (var _4 = __values(_this.sdFooterDefs), _5 = _4.next(); !_5.done; _5 = _4.next()) {
-                        var footerDef = _5.value;
+                    for (var _5 = __values(_this.sdFooterDefs), _6 = _5.next(); !_6.done; _6 = _5.next()) {
+                        var footerDef = _6.value;
                         if (footerDef.sdMaterialFooterDef) {
                             _this.hasFooter = true;
                             _this.footerDef[footerDef.sdMaterialFooterDef] = footerDef;
@@ -2071,14 +2082,14 @@
                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
                 finally {
                     try {
-                        if (_5 && !_5.done && (_3 = _4.return)) _3.call(_4);
+                        if (_6 && !_6.done && (_4 = _5.return)) _4.call(_5);
                     }
                     finally { if (e_3) throw e_3.error; }
                 }
             });
             _filterExportInfo.set(this, function (pageNumber, pageSize) {
                 var _a, _b;
-                var _3 = _this.filterRegister.value.get(), columnFilter = _3.columnFilter, externalFilter = _3.externalFilter, filterDef = _3.filterDef;
+                var _4 = _this.filterRegister.value.get(), columnFilter = _4.columnFilter, externalFilter = _4.externalFilter, filterDef = _4.filterDef;
                 return {
                     rawColumnFilter: columnFilter || {},
                     rawExternalFilter: externalFilter || {},
@@ -2102,25 +2113,28 @@
                 return option;
             });
             _loadFilterRegister.set(this, function () {
-                var _a, _b, _c, _d, _e;
+                var _a, _b, _c, _d;
                 // Init filter
                 if (_this.gridOption) {
                     if (!_this.filterRegister) {
-                        _this.filterRegister = _this.gridFilterService.register((_b = (_a = _this.gridOption) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.key, {
+                        _this.filterRegister = _this.gridFilterService.register((_a = _this.gridOption) === null || _a === void 0 ? void 0 : _a.filter, {
                             id: __classPrivateFieldGet(_this, _gridId),
-                            columns: (_c = _this.gridOption) === null || _c === void 0 ? void 0 : _c.columns,
-                            externalFilters: (_e = (_d = _this.gridOption) === null || _d === void 0 ? void 0 : _d.filter) === null || _e === void 0 ? void 0 : _e.externalFilters,
+                            columns: (_b = _this.gridOption) === null || _b === void 0 ? void 0 : _b.columns,
+                            externalFilters: (_d = (_c = _this.gridOption) === null || _c === void 0 ? void 0 : _c.filter) === null || _d === void 0 ? void 0 : _d.externalFilters,
                             filterDefs: _this.filterDefs,
                         });
                         __classPrivateFieldGet(_this, _subscription$1).add(_this.filterRegister.value.observer
                             .pipe(operators.debounceTime(500), operators.map(function (filterValue) {
-                            var columnFilter = filterValue.columnFilter;
+                            var columnFilter = filterValue.columnFilter, notReload = filterValue.notReload;
                             _this.columnFilter = columnFilter;
-                            __classPrivateFieldGet(_this, _paginator).pageIndex = 0;
-                            __classPrivateFieldGet(_this, _reload).next({
-                                force: false,
-                            });
-                        })).subscribe());
+                            if (!notReload) {
+                                __classPrivateFieldGet(_this, _paginator).pageIndex = 0;
+                                __classPrivateFieldGet(_this, _reload).next({
+                                    force: false,
+                                });
+                            }
+                        }))
+                            .subscribe());
                     }
                 }
             });
@@ -2128,7 +2142,7 @@
                 var columns = _this.gridOption.columns;
                 var rawColumnFilter = filterInfo.rawColumnFilter, orderBy = filterInfo.orderBy, orderDirection = filterInfo.orderDirection, pageSize = filterInfo.pageSize, pageNumber = filterInfo.pageNumber;
                 var items = localItems.filter(function (item) {
-                    var e_4, _3;
+                    var e_4, _4;
                     var _a, _b, _c, _d;
                     try {
                         for (var columns_1 = __values(columns), columns_1_1 = columns_1.next(); !columns_1_1.done; columns_1_1 = columns_1.next()) {
@@ -2208,7 +2222,7 @@
                     catch (e_4_1) { e_4 = { error: e_4_1 }; }
                     finally {
                         try {
-                            if (columns_1_1 && !columns_1_1.done && (_3 = columns_1.return)) _3.call(columns_1);
+                            if (columns_1_1 && !columns_1_1.done && (_4 = columns_1.return)) _4.call(columns_1);
                         }
                         finally { if (e_4) throw e_4.error; }
                     }
@@ -2252,7 +2266,7 @@
             });
             _getFilter.set(this, function () {
                 var _a, _b, _c, _d, _e, _f;
-                var _3 = _this.filterRegister.value.get(), columnFilter = _3.columnFilter, externalFilter = _3.externalFilter, filterDef = _3.filterDef;
+                var _4 = _this.filterRegister.value.get(), columnFilter = _4.columnFilter, externalFilter = _4.externalFilter, filterDef = _4.filterDef;
                 return {
                     rawColumnFilter: columnFilter || {},
                     rawExternalFilter: externalFilter || {},
@@ -2266,28 +2280,28 @@
             _load$1.set(this, function (filterReq, force) {
                 if (force === void 0) { force = true; }
                 return __awaiter(_this, void 0, void 0, function () {
-                    var result, data, error_1, results, _3, _4, error_2;
-                    return __generator(this, function (_5) {
-                        switch (_5.label) {
+                    var result, data, error_1, results, _4, _5, error_2;
+                    return __generator(this, function (_6) {
+                        switch (_6.label) {
                             case 0:
                                 this.isLoading = true;
                                 if (!(this.gridOption.type === 'server')) return [3 /*break*/, 6];
-                                _5.label = 1;
+                                _6.label = 1;
                             case 1:
-                                _5.trys.push([1, 3, 4, 5]);
+                                _6.trys.push([1, 3, 4, 5]);
                                 result = this.gridOption.items(filterReq);
                                 if (rxjs.isObservable(result)) {
                                     result = result.toPromise();
                                 }
                                 return [4 /*yield*/, result];
                             case 2:
-                                data = _5.sent();
+                                data = _6.sent();
                                 return [2 /*return*/, {
                                         items: (data === null || data === void 0 ? void 0 : data.items) || [],
                                         total: (data === null || data === void 0 ? void 0 : data.total) || 0,
                                     }];
                             case 3:
-                                error_1 = _5.sent();
+                                error_1 = _6.sent();
                                 console.error(error_1);
                                 this.notifyService.notify.warning('Có lỗi xảy ra');
                                 return [2 /*return*/, {
@@ -2301,20 +2315,20 @@
                             case 5: return [3 /*break*/, 14];
                             case 6:
                                 if (!force) return [3 /*break*/, 13];
-                                _5.label = 7;
+                                _6.label = 7;
                             case 7:
-                                _5.trys.push([7, 11, 12, 13]);
+                                _6.trys.push([7, 11, 12, 13]);
                                 results = this.gridOption.items();
                                 if (!(results instanceof Promise)) return [3 /*break*/, 9];
-                                _3 = __classPrivateFieldSet;
-                                _4 = [this, _localItems];
+                                _4 = __classPrivateFieldSet;
+                                _5 = [this, _localItems];
                                 return [4 /*yield*/, results];
                             case 8:
-                                _3.apply(void 0, _4.concat([(_5.sent()) || []]));
+                                _4.apply(void 0, _5.concat([(_6.sent()) || []]));
                                 return [3 /*break*/, 10];
                             case 9:
                                 __classPrivateFieldSet(this, _localItems, results || []);
-                                _5.label = 10;
+                                _6.label = 10;
                             case 10:
                                 if (!Array.isArray(__classPrivateFieldGet(this, _localItems))) {
                                     this.notifyService.notify.warning('Dữ liệu không phải là một mảng');
@@ -2322,7 +2336,7 @@
                                 }
                                 return [3 /*break*/, 13];
                             case 11:
-                                error_2 = _5.sent();
+                                error_2 = _6.sent();
                                 console.error(error_2);
                                 this.notifyService.notify.warning('Có lỗi xảy ra');
                                 __classPrivateFieldSet(this, _localItems, []);
@@ -2342,8 +2356,8 @@
             });
             _render.set(this, function (args) { return __awaiter(_this, void 0, void 0, function () {
                 var _a, _b, _c, _d;
-                return __generator(this, function (_3) {
-                    switch (_3.label) {
+                return __generator(this, function (_4) {
+                    switch (_4.label) {
                         case 0:
                             (_a = this.sdScroll) === null || _a === void 0 ? void 0 : _a.scrollTop();
                             this.items = (args === null || args === void 0 ? void 0 : args.items) || [];
@@ -2354,7 +2368,7 @@
                             });
                             return [4 /*yield*/, ((_d = (_c = (_b = this.gridOption) === null || _b === void 0 ? void 0 : _b.reload) === null || _c === void 0 ? void 0 : _c.onReload) === null || _d === void 0 ? void 0 : _d.call(_c, this.items))];
                         case 1:
-                            _3.sent();
+                            _4.sent();
                             this.isSelectAll = this.items.every(function (e) { return e.isSelected; });
                             __classPrivateFieldGet(this, _updateSelectedItems).call(this);
                             return [2 /*return*/];
@@ -2364,12 +2378,16 @@
             this.reload = function (force) {
                 if (force === void 0) { force = true; }
                 return __awaiter(_this, void 0, void 0, function () {
-                    var data;
-                    return __generator(this, function (_3) {
-                        switch (_3.label) {
-                            case 0: return [4 /*yield*/, __classPrivateFieldGet(this, _load$1).call(this, __classPrivateFieldGet(this, _getFilter).call(this), force)];
+                    var _e, data;
+                    return __generator(this, function (_4) {
+                        switch (_4.label) {
+                            case 0:
+                                if ((_e = this.gridFilter) === null || _e === void 0 ? void 0 : _e.updateFilter) {
+                                    this.gridFilter.updateFilter();
+                                }
+                                return [4 /*yield*/, __classPrivateFieldGet(this, _load$1).call(this, __classPrivateFieldGet(this, _getFilter).call(this), force)];
                             case 1:
-                                data = _3.sent();
+                                data = _4.sent();
                                 __classPrivateFieldGet(this, _render).call(this, data);
                                 return [2 /*return*/];
                         }
@@ -2380,12 +2398,12 @@
                 if (pageNumber === void 0) { pageNumber = 0; }
                 if (pageSize === void 0) { pageSize = 10000; }
                 return __awaiter(_this, void 0, void 0, function () {
-                    var _e, _f, result, filterInfo, result, exportedItems, results;
-                    return __generator(this, function (_3) {
-                        switch (_3.label) {
+                    var _f, _g, result, filterInfo, result, exportedItems, results;
+                    return __generator(this, function (_4) {
+                        switch (_4.label) {
                             case 0:
-                                if (!((_e = this.gridOption.export) === null || _e === void 0 ? void 0 : _e.items)) return [3 /*break*/, 2];
-                                result = (_f = this.gridOption.export) === null || _f === void 0 ? void 0 : _f.items(__classPrivateFieldGet(this, _filterExportInfo).call(this, pageNumber, pageSize));
+                                if (!((_f = this.gridOption.export) === null || _f === void 0 ? void 0 : _f.items)) return [3 /*break*/, 2];
+                                result = (_g = this.gridOption.export) === null || _g === void 0 ? void 0 : _g.items(__classPrivateFieldGet(this, _filterExportInfo).call(this, pageNumber, pageSize));
                                 if (Array.isArray(result)) {
                                     return [2 /*return*/, result];
                                 }
@@ -2396,7 +2414,7 @@
                                     result = result.toPromise();
                                 }
                                 return [4 /*yield*/, result];
-                            case 1: return [2 /*return*/, _3.sent()];
+                            case 1: return [2 /*return*/, _4.sent()];
                             case 2:
                                 filterInfo = __classPrivateFieldGet(this, _filterExportInfo).call(this, pageNumber, pageSize);
                                 if (!(this.gridOption.type === 'server')) return [3 /*break*/, 4];
@@ -2405,7 +2423,7 @@
                                     result = result.toPromise();
                                 }
                                 return [4 /*yield*/, result];
-                            case 3: return [2 /*return*/, _3.sent()];
+                            case 3: return [2 /*return*/, _4.sent()];
                             case 4:
                                 exportedItems = [];
                                 if (!(typeof this.gridOption.items === 'function')) return [3 /*break*/, 8];
@@ -2413,15 +2431,15 @@
                                 if (!(results instanceof Promise)) return [3 /*break*/, 6];
                                 return [4 /*yield*/, results];
                             case 5:
-                                exportedItems = _3.sent();
+                                exportedItems = _4.sent();
                                 return [3 /*break*/, 7];
                             case 6:
                                 exportedItems = results;
-                                _3.label = 7;
+                                _4.label = 7;
                             case 7: return [3 /*break*/, 9];
                             case 8:
                                 exportedItems = this.gridOption.items;
-                                _3.label = 9;
+                                _4.label = 9;
                             case 9: return [2 /*return*/, __classPrivateFieldGet(this, _filterLocal).call(this, exportedItems, filterInfo)];
                         }
                     });
@@ -2463,17 +2481,17 @@
                 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); })) || [];
             });
             _onExport.set(this, function (args) { return __awaiter(_this, void 0, void 0, function () {
-                var _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, file, isCSV, columns_2, pageSize_1, batch, total_1, pageNumber_1, exportItems_1, items_1, promises_1, handleData, sheets, _3, _4, sheet, _5, _6, _7, e_5_1;
-                var e_5, _8;
+                var _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, file, isCSV, columns_2, pageSize_1, batch, total_1, pageNumber_1, exportItems_1, items_1, promises_1, handleData, sheets, _4, _5, sheet, _6, _7, _8, e_5_1;
+                var e_5, _9;
                 var _this = this;
-                return __generator(this, function (_9) {
-                    switch (_9.label) {
+                return __generator(this, function (_10) {
+                    switch (_10.label) {
                         case 0:
-                            _9.trys.push([0, , 20, 21]);
+                            _10.trys.push([0, , 20, 21]);
                             file = args.file, isCSV = args.isCSV;
                             columns_2 = args.columns;
-                            pageSize_1 = ((_h = (_g = this.gridOption) === null || _g === void 0 ? void 0 : _g.export) === null || _h === void 0 ? void 0 : _h.maxItemsPerRequest) || 1000;
-                            batch = ((_k = (_j = this.gridOption) === null || _j === void 0 ? void 0 : _j.export) === null || _k === void 0 ? void 0 : _k.batch) || 1;
+                            pageSize_1 = ((_j = (_h = this.gridOption) === null || _h === void 0 ? void 0 : _h.export) === null || _j === void 0 ? void 0 : _j.maxItemsPerRequest) || 1000;
+                            batch = ((_l = (_k = this.gridOption) === null || _k === void 0 ? void 0 : _k.export) === null || _l === void 0 ? void 0 : _l.batch) || 1;
                             total_1 = this.total;
                             pageNumber_1 = 0;
                             exportItems_1 = [];
@@ -2481,14 +2499,14 @@
                             items_1 = [];
                             promises_1 = [];
                             handleData = function () { return __awaiter(_this, void 0, void 0, function () {
-                                var _s, results, results_1, results_1_1, result, results_2, totalPage, percent, allColumns, allExportedColumns, _loop_1, exportItems_2, exportItems_2_1, item, e_6_1;
-                                var e_7, _3, e_6, _4;
+                                var _t, results, results_1, results_1_1, result, results_2, totalPage, percent, allColumns, allExportedColumns, _loop_1, exportItems_2, exportItems_2_1, item, e_6_1;
+                                var e_7, _4, e_6, _5;
                                 var _this = this;
-                                return __generator(this, function (_5) {
-                                    switch (_5.label) {
+                                return __generator(this, function (_6) {
+                                    switch (_6.label) {
                                         case 0: return [4 /*yield*/, Promise.all(promises_1)];
                                         case 1:
-                                            results = _5.sent();
+                                            results = _6.sent();
                                             promises_1 = [];
                                             exportItems_1 = [];
                                             try {
@@ -2506,20 +2524,20 @@
                                             catch (e_7_1) { e_7 = { error: e_7_1 }; }
                                             finally {
                                                 try {
-                                                    if (results_1_1 && !results_1_1.done && (_3 = results_1.return)) _3.call(results_1);
+                                                    if (results_1_1 && !results_1_1.done && (_4 = results_1.return)) _4.call(results_1);
                                                 }
                                                 finally { if (e_7) throw e_7.error; }
                                             }
-                                            if (!((_s = this.gridOption.export) === null || _s === void 0 ? void 0 : _s.mapping)) return [3 /*break*/, 4];
+                                            if (!((_t = this.gridOption.export) === null || _t === void 0 ? void 0 : _t.mapping)) return [3 /*break*/, 4];
                                             results_2 = this.gridOption.export.mapping(exportItems_1);
                                             if (!(results_2 instanceof Promise)) return [3 /*break*/, 3];
                                             return [4 /*yield*/, results_2];
                                         case 2:
-                                            exportItems_1 = _5.sent();
+                                            exportItems_1 = _6.sent();
                                             return [3 /*break*/, 4];
                                         case 3:
                                             exportItems_1 = results_2;
-                                            _5.label = 4;
+                                            _6.label = 4;
                                         case 4:
                                             totalPage = total_1 / pageSize_1;
                                             percent = Math.round(((pageNumber_1 - 1) * 100.0) / totalPage);
@@ -2528,15 +2546,15 @@
                                             allExportedColumns = __classPrivateFieldGet(this, _allExportedColumns).call(this);
                                             _loop_1 = function (item) {
                                                 var obj, handle, columns_3, columns_3_1, exportColumn, e_8_1;
-                                                var e_8, _3;
-                                                return __generator(this, function (_4) {
-                                                    switch (_4.label) {
+                                                var e_8, _4;
+                                                return __generator(this, function (_5) {
+                                                    switch (_5.label) {
                                                         case 0:
                                                             obj = {};
                                                             handle = function (exportColumn) { return __awaiter(_this, void 0, void 0, function () {
-                                                                var _t, _u, _v, column, exportedColumn, transform, _3, _4, date, transformDate, date, transformDate, date, transformDate, _5, _6;
-                                                                return __generator(this, function (_7) {
-                                                                    switch (_7.label) {
+                                                                var _u, _v, _w, column, exportedColumn, transform, _4, _5, date, transformDate, date, transformDate, date, transformDate, _6, _7;
+                                                                return __generator(this, function (_8) {
+                                                                    switch (_8.label) {
                                                                         case 0:
                                                                             obj[exportColumn.field] = item[exportColumn.field];
                                                                             column = allColumns.find(function (e) { return e.field === exportColumn.field; });
@@ -2560,17 +2578,17 @@
                                                                                 isExport: true,
                                                                             });
                                                                             if (!(transform instanceof Promise)) return [3 /*break*/, 2];
-                                                                            _3 = obj;
-                                                                            _4 = column.field;
+                                                                            _4 = obj;
+                                                                            _5 = column.field;
                                                                             return [4 /*yield*/, transform];
                                                                         case 1:
-                                                                            _3[_4] = _7.sent();
+                                                                            _4[_5] = _8.sent();
                                                                             return [3 /*break*/, 3];
                                                                         case 2:
                                                                             obj[column.field] = transform;
-                                                                            _7.label = 3;
+                                                                            _8.label = 3;
                                                                         case 3:
-                                                                            obj[column.field] = (_t = obj[column.field]) !== null && _t !== void 0 ? _t : '';
+                                                                            obj[column.field] = (_u = obj[column.field]) !== null && _u !== void 0 ? _u : '';
                                                                             return [3 /*break*/, 13];
                                                                         case 4:
                                                                             if (!(item[column.field] === undefined || item[column.field] === null || item[column.field] === '')) return [3 /*break*/, 5];
@@ -2585,10 +2603,10 @@
                                                                             if (!(column.type === 'bool')) return [3 /*break*/, 7];
                                                                             // Nếu là bool thì gán bằng giá trị trueValue và falseValue (nếu có), mặc định là TRUE/FALSE
                                                                             if (item[column.field]) {
-                                                                                obj[column.field] = ((_u = column.option) === null || _u === void 0 ? void 0 : _u.displayOnTrue) || 'True';
+                                                                                obj[column.field] = ((_v = column.option) === null || _v === void 0 ? void 0 : _v.displayOnTrue) || 'True';
                                                                             }
                                                                             else if (obj[column.field] !== undefined && obj[column.field] !== null) {
-                                                                                obj[column.field] = ((_v = column.option) === null || _v === void 0 ? void 0 : _v.displayOnFalse) || 'False';
+                                                                                obj[column.field] = ((_w = column.option) === null || _w === void 0 ? void 0 : _w.displayOnFalse) || 'False';
                                                                             }
                                                                             return [3 /*break*/, 13];
                                                                         case 7:
@@ -2624,43 +2642,43 @@
                                                                         case 10:
                                                                             if (!(column.type === 'values')) return [3 /*break*/, 12];
                                                                             // Nếu là values thì lấy giá trị của value được chọn
-                                                                            _5 = obj;
-                                                                            _6 = column.field;
+                                                                            _6 = obj;
+                                                                            _7 = column.field;
                                                                             return [4 /*yield*/, this.columnValuesPipe.transform(item[column.field], column)];
                                                                         case 11:
                                                                             // Nếu là values thì lấy giá trị của value được chọn
-                                                                            _5[_6] = _7.sent();
+                                                                            _6[_7] = _8.sent();
                                                                             return [3 /*break*/, 13];
                                                                         case 12:
                                                                             obj[column.field] = item[column.field];
-                                                                            _7.label = 13;
+                                                                            _8.label = 13;
                                                                         case 13: return [2 /*return*/];
                                                                     }
                                                                 });
                                                             }); };
-                                                            _4.label = 1;
+                                                            _5.label = 1;
                                                         case 1:
-                                                            _4.trys.push([1, 6, 7, 8]);
+                                                            _5.trys.push([1, 6, 7, 8]);
                                                             columns_3 = (e_8 = void 0, __values(columns_2)), columns_3_1 = columns_3.next();
-                                                            _4.label = 2;
+                                                            _5.label = 2;
                                                         case 2:
                                                             if (!!columns_3_1.done) return [3 /*break*/, 5];
                                                             exportColumn = columns_3_1.value;
                                                             return [4 /*yield*/, handle(exportColumn)];
                                                         case 3:
-                                                            _4.sent();
-                                                            _4.label = 4;
+                                                            _5.sent();
+                                                            _5.label = 4;
                                                         case 4:
                                                             columns_3_1 = columns_3.next();
                                                             return [3 /*break*/, 2];
                                                         case 5: return [3 /*break*/, 8];
                                                         case 6:
-                                                            e_8_1 = _4.sent();
+                                                            e_8_1 = _5.sent();
                                                             e_8 = { error: e_8_1 };
                                                             return [3 /*break*/, 8];
                                                         case 7:
                                                             try {
-                                                                if (columns_3_1 && !columns_3_1.done && (_3 = columns_3.return)) _3.call(columns_3);
+                                                                if (columns_3_1 && !columns_3_1.done && (_4 = columns_3.return)) _4.call(columns_3);
                                                             }
                                                             finally { if (e_8) throw e_8.error; }
                                                             return [7 /*endfinally*/];
@@ -2670,29 +2688,29 @@
                                                     }
                                                 });
                                             };
-                                            _5.label = 5;
+                                            _6.label = 5;
                                         case 5:
-                                            _5.trys.push([5, 10, 11, 12]);
+                                            _6.trys.push([5, 10, 11, 12]);
                                             exportItems_2 = __values(exportItems_1), exportItems_2_1 = exportItems_2.next();
-                                            _5.label = 6;
+                                            _6.label = 6;
                                         case 6:
                                             if (!!exportItems_2_1.done) return [3 /*break*/, 9];
                                             item = exportItems_2_1.value;
                                             return [5 /*yield**/, _loop_1(item)];
                                         case 7:
-                                            _5.sent();
-                                            _5.label = 8;
+                                            _6.sent();
+                                            _6.label = 8;
                                         case 8:
                                             exportItems_2_1 = exportItems_2.next();
                                             return [3 /*break*/, 6];
                                         case 9: return [3 /*break*/, 12];
                                         case 10:
-                                            e_6_1 = _5.sent();
+                                            e_6_1 = _6.sent();
                                             e_6 = { error: e_6_1 };
                                             return [3 /*break*/, 12];
                                         case 11:
                                             try {
-                                                if (exportItems_2_1 && !exportItems_2_1.done && (_4 = exportItems_2.return)) _4.call(exportItems_2);
+                                                if (exportItems_2_1 && !exportItems_2_1.done && (_5 = exportItems_2.return)) _5.call(exportItems_2);
                                             }
                                             finally { if (e_6) throw e_6.error; }
                                             return [7 /*endfinally*/];
@@ -2700,7 +2718,7 @@
                                     }
                                 });
                             }); };
-                            _9.label = 1;
+                            _10.label = 1;
                         case 1:
                             if (!(pageNumber_1 * pageSize_1 < total_1)) return [3 /*break*/, 3];
                             promises_1.push(__classPrivateFieldGet(this, _exportedItems).call(this, pageNumber_1, pageSize_1));
@@ -2710,36 +2728,36 @@
                             }
                             return [4 /*yield*/, handleData()];
                         case 2:
-                            _9.sent();
+                            _10.sent();
                             return [3 /*break*/, 1];
                         case 3:
                             if (!(promises_1.length > 0)) return [3 /*break*/, 5];
                             return [4 /*yield*/, handleData()];
                         case 4:
-                            _9.sent();
-                            _9.label = 5;
+                            _10.sent();
+                            _10.label = 5;
                         case 5:
                             if (!!(file === null || file === void 0 ? void 0 : file.filePath)) return [3 /*break*/, 18];
                             if (!isCSV) return [3 /*break*/, 7];
                             return [4 /*yield*/, this.exportService.exportCSV({
                                     columns: columns_2,
                                     items: items_1,
-                                    fileName: (_m = (_l = this.gridOption) === null || _l === void 0 ? void 0 : _l.export) === null || _m === void 0 ? void 0 : _m.fileName,
+                                    fileName: (_o = (_m = this.gridOption) === null || _m === void 0 ? void 0 : _m.export) === null || _o === void 0 ? void 0 : _o.fileName,
                                 })];
                         case 6:
-                            _9.sent();
+                            _10.sent();
                             return [2 /*return*/];
                         case 7:
                             sheets = [];
-                            if (!Array.isArray((_p = (_o = this.gridOption) === null || _o === void 0 ? void 0 : _o.export) === null || _p === void 0 ? void 0 : _p.sheets)) return [3 /*break*/, 16];
-                            _9.label = 8;
+                            if (!Array.isArray((_q = (_p = this.gridOption) === null || _p === void 0 ? void 0 : _p.export) === null || _q === void 0 ? void 0 : _q.sheets)) return [3 /*break*/, 16];
+                            _10.label = 8;
                         case 8:
-                            _9.trys.push([8, 14, 15, 16]);
-                            _3 = __values(this.gridOption.export.sheets), _4 = _3.next();
-                            _9.label = 9;
+                            _10.trys.push([8, 14, 15, 16]);
+                            _4 = __values(this.gridOption.export.sheets), _5 = _4.next();
+                            _10.label = 9;
                         case 9:
-                            if (!!_4.done) return [3 /*break*/, 13];
-                            sheet = _4.value;
+                            if (!!_5.done) return [3 /*break*/, 13];
+                            sheet = _5.value;
                             if (!(sheet.name && sheet.items && sheet.fields)) return [3 /*break*/, 12];
                             if (!Array.isArray(sheet.items)) return [3 /*break*/, 10];
                             sheets.push({
@@ -2749,38 +2767,38 @@
                             });
                             return [3 /*break*/, 12];
                         case 10:
-                            _6 = (_5 = sheets).push;
-                            _7 = {
+                            _7 = (_6 = sheets).push;
+                            _8 = {
                                 name: sheet.name
                             };
                             return [4 /*yield*/, sheet.items()];
                         case 11:
-                            _6.apply(_5, [(_7.items = _9.sent(),
-                                    _7.fields = sheet.fields,
-                                    _7)]);
-                            _9.label = 12;
+                            _7.apply(_6, [(_8.items = _10.sent(),
+                                    _8.fields = sheet.fields,
+                                    _8)]);
+                            _10.label = 12;
                         case 12:
-                            _4 = _3.next();
+                            _5 = _4.next();
                             return [3 /*break*/, 9];
                         case 13: return [3 /*break*/, 16];
                         case 14:
-                            e_5_1 = _9.sent();
+                            e_5_1 = _10.sent();
                             e_5 = { error: e_5_1 };
                             return [3 /*break*/, 16];
                         case 15:
                             try {
-                                if (_4 && !_4.done && (_8 = _3.return)) _8.call(_3);
+                                if (_5 && !_5.done && (_9 = _4.return)) _9.call(_4);
                             }
                             finally { if (e_5) throw e_5.error; }
                             return [7 /*endfinally*/];
                         case 16: return [4 /*yield*/, this.exportService.export({
                                 columns: columns_2,
                                 items: items_1,
-                                fileName: (_r = (_q = this.gridOption) === null || _q === void 0 ? void 0 : _q.export) === null || _r === void 0 ? void 0 : _r.fileName,
+                                fileName: (_s = (_r = this.gridOption) === null || _r === void 0 ? void 0 : _r.export) === null || _s === void 0 ? void 0 : _s.fileName,
                                 sheets: sheets,
                             })];
                         case 17:
-                            _9.sent();
+                            _10.sent();
                             return [2 /*return*/];
                         case 18: return [4 /*yield*/, this.exportService.exportByTemplate({
                                 filePath: file.filePath,
@@ -2789,7 +2807,7 @@
                                 items: items_1,
                             })];
                         case 19:
-                            _9.sent();
+                            _10.sent();
                             return [3 /*break*/, 21];
                         case 20:
                             this.isExporting = false;
@@ -2801,7 +2819,7 @@
                 });
             }); });
             this.onExport = function (args) { return __awaiter(_this, void 0, void 0, function () {
-                return __generator(this, function (_3) {
+                return __generator(this, function (_4) {
                     __classPrivateFieldGet(this, _onExport).call(this, args);
                     return [2 /*return*/];
                 });
@@ -2820,9 +2838,9 @@
                 }
             };
             this.onExpand = function (rowData) { return __awaiter(_this, void 0, void 0, function () {
-                var _w, _x, _y, _z, _0, data;
-                return __generator(this, function (_3) {
-                    if ((_w = this.gridOption.subInformation) === null || _w === void 0 ? void 0 : _w.always) {
+                var _x, _y, _z, _0, _1, data;
+                return __generator(this, function (_4) {
+                    if ((_x = this.gridOption.subInformation) === null || _x === void 0 ? void 0 : _x.always) {
                         return [2 /*return*/];
                     }
                     if (rowData.isExpanding) {
@@ -2832,8 +2850,8 @@
                         rowData.isExpanded = false;
                         return [2 /*return*/];
                     }
-                    data = (_z = (_y = (_x = this.gridOption) === null || _x === void 0 ? void 0 : _x.subInformation) === null || _y === void 0 ? void 0 : _y.onExpand) === null || _z === void 0 ? void 0 : _z.call(_y, rowData);
-                    if (!((_0 = this.gridOption.subInformation) === null || _0 === void 0 ? void 0 : _0.multiple)) {
+                    data = (_0 = (_z = (_y = this.gridOption) === null || _y === void 0 ? void 0 : _y.subInformation) === null || _z === void 0 ? void 0 : _z.onExpand) === null || _0 === void 0 ? void 0 : _0.call(_z, rowData);
+                    if (!((_1 = this.gridOption.subInformation) === null || _1 === void 0 ? void 0 : _1.multiple)) {
                         this.items.forEach(function (item) { return (item.isExpanding = item.isExpanded = false); });
                     }
                     if (data instanceof Promise) {
@@ -2903,7 +2921,7 @@
                 _this.filterRegister.value.remove();
             };
             this.setFilter = function (args) {
-                var _3 = args || {}, columnFilter = _3.columnFilter, externalFilter = _3.externalFilter, filterDef = _3.filterDef;
+                var _4 = args || {}, columnFilter = _4.columnFilter, externalFilter = _4.externalFilter, filterDef = _4.filterDef;
                 _this.filterRegister.value.set({
                     columnFilter: columnFilter,
                     externalFilter: externalFilter,
@@ -2912,7 +2930,7 @@
             };
             this.onCreate = function () {
                 var _a, _b;
-                var _3 = _this.gridOption, type = _3.type, editor = _3.editor, columns = _3.columns;
+                var _4 = _this.gridOption, type = _4.type, editor = _4.editor, columns = _4.columns;
                 if (!(editor === null || editor === void 0 ? void 0 : editor.addable)) {
                     return;
                 }
@@ -2968,23 +2986,23 @@
             };
             this.onSave = function (item) { return __awaiter(_this, void 0, void 0, function () {
                 var editor, result, message, result, err_1;
-                return __generator(this, function (_3) {
-                    switch (_3.label) {
+                return __generator(this, function (_4) {
+                    switch (_4.label) {
                         case 0:
                             if (item.editorHandlerRow.saving) {
                                 return [2 /*return*/];
                             }
                             editor = this.gridOption.editor;
-                            _3.label = 1;
+                            _4.label = 1;
                         case 1:
-                            _3.trys.push([1, 7, 8, 9]);
+                            _4.trys.push([1, 7, 8, 9]);
                             item.editorHandlerRow.saving = true;
                             if (!editor.validate) return [3 /*break*/, 4];
                             result = editor.validate(item, this.items.indexOf(item));
                             if (!(result instanceof Promise)) return [3 /*break*/, 3];
                             return [4 /*yield*/, result];
                         case 2:
-                            message = _3.sent();
+                            message = _4.sent();
                             if (message) {
                                 throw message;
                             }
@@ -2993,15 +3011,15 @@
                             if (result) {
                                 throw result;
                             }
-                            _3.label = 4;
+                            _4.label = 4;
                         case 4:
                             if (!editor.onSave) return [3 /*break*/, 6];
                             result = editor.onSave(item);
                             if (!(result instanceof Promise)) return [3 /*break*/, 6];
                             return [4 /*yield*/, result];
                         case 5:
-                            _3.sent();
-                            _3.label = 6;
+                            _4.sent();
+                            _4.label = 6;
                         case 6:
                             if (item.editorStatus === 'create' && editor.type === 'popup') {
                                 if (this.gridOption.type === 'local') {
@@ -3012,7 +3030,7 @@
                             item.editorStatus = undefined;
                             return [3 /*break*/, 9];
                         case 7:
-                            err_1 = _3.sent();
+                            err_1 = _4.sent();
                             this.notifyService.notify.warning(err_1);
                             return [3 /*break*/, 9];
                         case 8:
@@ -3063,9 +3081,9 @@
                 _this.ref.detectChanges();
             };
             this.onRemove = function (item) { return __awaiter(_this, void 0, void 0, function () {
-                var _1, _2, editor, beforeRemove, result, idx2, idx1;
-                return __generator(this, function (_3) {
-                    switch (_3.label) {
+                var _2, _3, editor, beforeRemove, result, idx2, idx1;
+                return __generator(this, function (_4) {
+                    switch (_4.label) {
                         case 0:
                             editor = this.gridOption.editor;
                             if (!(editor === null || editor === void 0 ? void 0 : editor.beforeRemove)) return [3 /*break*/, 3];
@@ -3073,7 +3091,7 @@
                             if (!(beforeRemove instanceof Promise)) return [3 /*break*/, 2];
                             return [4 /*yield*/, beforeRemove];
                         case 1:
-                            result = _3.sent();
+                            result = _4.sent();
                             if (!result) {
                                 return [2 /*return*/];
                             }
@@ -3082,7 +3100,7 @@
                             if (!beforeRemove) {
                                 return [2 /*return*/];
                             }
-                            _3.label = 3;
+                            _4.label = 3;
                         case 3:
                             if (editor.type === 'inline') {
                                 if (this.gridOption.type === 'local') {
@@ -3094,10 +3112,10 @@
                                 this.items.splice(idx1, 1);
                                 this.items = __spread(this.items);
                                 if (this.gridOption.type === 'local') {
-                                    (_1 = editor === null || editor === void 0 ? void 0 : editor.onRemove) === null || _1 === void 0 ? void 0 : _1.call(editor, item, __classPrivateFieldGet(this, _localItems));
+                                    (_2 = editor === null || editor === void 0 ? void 0 : editor.onRemove) === null || _2 === void 0 ? void 0 : _2.call(editor, item, __classPrivateFieldGet(this, _localItems));
                                 }
                                 else {
-                                    (_2 = editor === null || editor === void 0 ? void 0 : editor.onRemove) === null || _2 === void 0 ? void 0 : _2.call(editor, item, this.items);
+                                    (_3 = editor === null || editor === void 0 ? void 0 : editor.onRemove) === null || _3 === void 0 ? void 0 : _3.call(editor, item, this.items);
                                 }
                                 this.ref.detectChanges();
                                 return [2 /*return*/];
@@ -3209,13 +3227,13 @@
             var _this = this;
             __classPrivateFieldGet(this, _subscription$1).add(__classPrivateFieldGet(this, _reload).pipe(operators.debounceTime(200), operators.switchMap(function (data) { return __awaiter(_this, void 0, void 0, function () {
                 var filterInfo, result;
-                return __generator(this, function (_3) {
-                    switch (_3.label) {
+                return __generator(this, function (_4) {
+                    switch (_4.label) {
                         case 0:
                             filterInfo = __classPrivateFieldGet(this, _getFilter).call(this);
                             return [4 /*yield*/, __classPrivateFieldGet(this, _load$1).call(this, filterInfo, !__classPrivateFieldGet(this, _loadCompleted) || data.force)];
                         case 1:
-                            result = _3.sent();
+                            result = _4.sent();
                             __classPrivateFieldSet(this, _loadCompleted, true);
                             return [2 /*return*/, result];
                     }