@sd-angular/core 1.3.88 → 1.3.90

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

@@ -1872,11 +1872,11 @@
             this.exportTitle = 'Export';
             _loadCompleted.set(this, false);
             _initCellDef.set(this, function () {
-                var e_1, _2;
+                var e_1, _3;
                 _this.cellDef = {};
                 try {
-                    for (var _3 = __values(_this.sdCellDefs), _4 = _3.next(); !_4.done; _4 = _3.next()) {
-                        var cellDef = _4.value;
+                    for (var _4 = __values(_this.sdCellDefs), _5 = _4.next(); !_5.done; _5 = _4.next()) {
+                        var cellDef = _5.value;
                         if (cellDef.sdMaterialCellDef) {
                             _this.cellDef[cellDef.sdMaterialCellDef] = cellDef;
                         }
@@ -1885,35 +1885,35 @@
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (_4 && !_4.done && (_2 = _3.return)) _2.call(_3);
+                        if (_5 && !_5.done && (_3 = _4.return)) _3.call(_4);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
             });
             _initFilterDef.set(this, function () {
-                var e_2, _2;
+                var e_2, _3;
                 _this.filterDefs = [];
                 try {
-                    for (var _3 = __values(_this.sdFilterDefs), _4 = _3.next(); !_4.done; _4 = _3.next()) {
-                        var filterDef = _4.value;
+                    for (var _4 = __values(_this.sdFilterDefs), _5 = _4.next(); !_5.done; _5 = _4.next()) {
+                        var filterDef = _5.value;
                         _this.filterDefs.push(filterDef);
                     }
                 }
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (_4 && !_4.done && (_2 = _3.return)) _2.call(_3);
+                        if (_5 && !_5.done && (_3 = _4.return)) _3.call(_4);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
             });
             _initFooterDef.set(this, function () {
-                var e_3, _2;
+                var e_3, _3;
                 _this.footerDef = {};
                 _this.hasFooter = false;
                 try {
-                    for (var _3 = __values(_this.sdFooterDefs), _4 = _3.next(); !_4.done; _4 = _3.next()) {
-                        var footerDef = _4.value;
+                    for (var _4 = __values(_this.sdFooterDefs), _5 = _4.next(); !_5.done; _5 = _4.next()) {
+                        var footerDef = _5.value;
                         if (footerDef.sdMaterialFooterDef) {
                             _this.hasFooter = true;
                             _this.footerDef[footerDef.sdMaterialFooterDef] = footerDef;
@@ -1923,7 +1923,7 @@
                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
                 finally {
                     try {
-                        if (_4 && !_4.done && (_2 = _3.return)) _2.call(_3);
+                        if (_5 && !_5.done && (_3 = _4.return)) _3.call(_4);
                     }
                     finally { if (e_3) throw e_3.error; }
                 }
@@ -1955,7 +1955,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, _2;
+                    var e_4, _3;
                     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()) {
@@ -2014,7 +2014,7 @@
                                     var to = (_d = (_c = rawColumnFilter[field]) === null || _c === void 0 ? void 0 : _c.to) !== null && _d !== void 0 ? _d : rawColumnFilter[field];
                                     var fromDate = Date.begin(from);
                                     var toDate = Date.end(to);
-                                    if (fromDate && toDate) {
+                                    if (fromDate || toDate) {
                                         if (!columnValue) {
                                             return false;
                                         }
@@ -2035,7 +2035,7 @@
                     catch (e_4_1) { e_4 = { error: e_4_1 }; }
                     finally {
                         try {
-                            if (columns_1_1 && !columns_1_1.done && (_2 = columns_1.return)) _2.call(columns_1);
+                            if (columns_1_1 && !columns_1_1.done && (_3 = columns_1.return)) _3.call(columns_1);
                         }
                         finally { if (e_4) throw e_4.error; }
                     }
@@ -2093,28 +2093,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, _2, _3, error_2;
-                    return __generator(this, function (_4) {
-                        switch (_4.label) {
+                    var result, data, error_1, results, _3, _4, error_2;
+                    return __generator(this, function (_5) {
+                        switch (_5.label) {
                             case 0:
                                 this.isLoading = true;
                                 if (!(this.gridOption.type === 'server')) return [3 /*break*/, 6];
-                                _4.label = 1;
+                                _5.label = 1;
                             case 1:
-                                _4.trys.push([1, 3, 4, 5]);
+                                _5.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 = _4.sent();
+                                data = _5.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 = _4.sent();
+                                error_1 = _5.sent();
                                 console.error(error_1);
                                 this.notifyService.notify.warning('Có lỗi xảy ra');
                                 return [2 /*return*/, {
@@ -2128,20 +2128,20 @@
                             case 5: return [3 /*break*/, 14];
                             case 6:
                                 if (!force) return [3 /*break*/, 13];
-                                _4.label = 7;
+                                _5.label = 7;
                             case 7:
-                                _4.trys.push([7, 11, 12, 13]);
+                                _5.trys.push([7, 11, 12, 13]);
                                 results = this.gridOption.items();
                                 if (!(results instanceof Promise)) return [3 /*break*/, 9];
-                                _2 = __classPrivateFieldSet;
-                                _3 = [this, _localItems];
+                                _3 = __classPrivateFieldSet;
+                                _4 = [this, _localItems];
                                 return [4 /*yield*/, results];
                             case 8:
-                                _2.apply(void 0, _3.concat([(_4.sent()) || []]));
+                                _3.apply(void 0, _4.concat([(_5.sent()) || []]));
                                 return [3 /*break*/, 10];
                             case 9:
                                 __classPrivateFieldSet(this, _localItems, results || []);
-                                _4.label = 10;
+                                _5.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');
@@ -2149,7 +2149,7 @@
                                 }
                                 return [3 /*break*/, 13];
                             case 11:
-                                error_2 = _4.sent();
+                                error_2 = _5.sent();
                                 console.error(error_2);
                                 this.notifyService.notify.warning('Có lỗi xảy ra');
                                 __classPrivateFieldSet(this, _localItems, []);
@@ -2158,7 +2158,10 @@
                                 this.isLoading = false;
                                 this.ref.detectChanges();
                                 return [7 /*endfinally*/];
-                            case 13: return [2 /*return*/, __classPrivateFieldGet(this, _filterLocal).call(this, __classPrivateFieldGet(this, _localItems), filterReq)];
+                            case 13:
+                                this.isLoading = false;
+                                this.ref.detectChanges();
+                                return [2 /*return*/, __classPrivateFieldGet(this, _filterLocal).call(this, __classPrivateFieldGet(this, _localItems), filterReq)];
                             case 14: return [2 /*return*/];
                         }
                     });
@@ -2166,8 +2169,8 @@
             });
             _render.set(this, function (args) { return __awaiter(_this, void 0, void 0, function () {
                 var _a, _b, _c, _d;
-                return __generator(this, function (_2) {
-                    switch (_2.label) {
+                return __generator(this, function (_3) {
+                    switch (_3.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) || [];
@@ -2178,7 +2181,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:
-                            _2.sent();
+                            _3.sent();
                             this.isSelectAll = this.items.every(function (e) { return e.isSelected; });
                             __classPrivateFieldGet(this, _updateSelectedItems).call(this);
                             return [2 /*return*/];
@@ -2189,11 +2192,11 @@
                 if (force === void 0) { force = true; }
                 return __awaiter(_this, void 0, void 0, function () {
                     var data;
-                    return __generator(this, function (_2) {
-                        switch (_2.label) {
+                    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)];
                             case 1:
-                                data = _2.sent();
+                                data = _3.sent();
                                 __classPrivateFieldGet(this, _render).call(this, data);
                                 return [2 /*return*/];
                         }
@@ -2205,8 +2208,8 @@
                 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 (_2) {
-                        switch (_2.label) {
+                    return __generator(this, function (_3) {
+                        switch (_3.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));
@@ -2220,7 +2223,7 @@
                                     result = result.toPromise();
                                 }
                                 return [4 /*yield*/, result];
-                            case 1: return [2 /*return*/, _2.sent()];
+                            case 1: return [2 /*return*/, _3.sent()];
                             case 2:
                                 filterInfo = __classPrivateFieldGet(this, _filterExportInfo).call(this, pageNumber, pageSize);
                                 if (!(this.gridOption.type === 'server')) return [3 /*break*/, 4];
@@ -2229,7 +2232,7 @@
                                     result = result.toPromise();
                                 }
                                 return [4 /*yield*/, result];
-                            case 3: return [2 /*return*/, _2.sent()];
+                            case 3: return [2 /*return*/, _3.sent()];
                             case 4:
                                 exportedItems = [];
                                 if (!(typeof (this.gridOption.items) === 'function')) return [3 /*break*/, 8];
@@ -2237,15 +2240,15 @@
                                 if (!(results instanceof Promise)) return [3 /*break*/, 6];
                                 return [4 /*yield*/, results];
                             case 5:
-                                exportedItems = _2.sent();
+                                exportedItems = _3.sent();
                                 return [3 /*break*/, 7];
                             case 6:
                                 exportedItems = results;
-                                _2.label = 7;
+                                _3.label = 7;
                             case 7: return [3 /*break*/, 9];
                             case 8:
                                 exportedItems = this.gridOption.items;
-                                _2.label = 9;
+                                _3.label = 9;
                             case 9: return [2 /*return*/, __classPrivateFieldGet(this, _filterLocal).call(this, exportedItems, filterInfo)];
                         }
                     });
@@ -2285,13 +2288,13 @@
                 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, _2, _3, sheet, _4, _5, _6, e_5_1;
-                var e_5, _7;
+                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 _this = this;
-                return __generator(this, function (_8) {
-                    switch (_8.label) {
+                return __generator(this, function (_9) {
+                    switch (_9.label) {
                         case 0:
-                            _8.trys.push([0, , 20, 21]);
+                            _9.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;
@@ -2304,13 +2307,13 @@
                             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, _2, e_6, _3;
+                                var e_7, _3, e_6, _4;
                                 var _this = this;
-                                return __generator(this, function (_4) {
-                                    switch (_4.label) {
+                                return __generator(this, function (_5) {
+                                    switch (_5.label) {
                                         case 0: return [4 /*yield*/, Promise.all(promises_1)];
                                         case 1:
-                                            results = _4.sent();
+                                            results = _5.sent();
                                             promises_1 = [];
                                             exportItems_1 = [];
                                             try {
@@ -2328,7 +2331,7 @@
                                             catch (e_7_1) { e_7 = { error: e_7_1 }; }
                                             finally {
                                                 try {
-                                                    if (results_1_1 && !results_1_1.done && (_2 = results_1.return)) _2.call(results_1);
+                                                    if (results_1_1 && !results_1_1.done && (_3 = results_1.return)) _3.call(results_1);
                                                 }
                                                 finally { if (e_7) throw e_7.error; }
                                             }
@@ -2337,11 +2340,11 @@
                                             if (!(results_2 instanceof Promise)) return [3 /*break*/, 3];
                                             return [4 /*yield*/, results_2];
                                         case 2:
-                                            exportItems_1 = _4.sent();
+                                            exportItems_1 = _5.sent();
                                             return [3 /*break*/, 4];
                                         case 3:
                                             exportItems_1 = results_2;
-                                            _4.label = 4;
+                                            _5.label = 4;
                                         case 4:
                                             totalPage = total_1 / pageSize_1;
                                             percent = Math.round((pageNumber_1 - 1) * 100.0 / totalPage);
@@ -2350,15 +2353,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, _2;
-                                                return __generator(this, function (_3) {
-                                                    switch (_3.label) {
+                                                var e_8, _3;
+                                                return __generator(this, function (_4) {
+                                                    switch (_4.label) {
                                                         case 0:
                                                             obj = {};
                                                             handle = function (exportColumn) { return __awaiter(_this, void 0, void 0, function () {
-                                                                var _t, _u, column, exportedColumn, transform, _2, _3, date, transformDate, date, transformDate, date, transformDate, _4, _5;
-                                                                return __generator(this, function (_6) {
-                                                                    switch (_6.label) {
+                                                                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) {
                                                                         case 0:
                                                                             obj[exportColumn.field] = item[exportColumn.field];
                                                                             column = allColumns.find(function (e) { return e.field === exportColumn.field; });
@@ -2382,16 +2385,18 @@
                                                                                 isExport: true
                                                                             });
                                                                             if (!(transform instanceof Promise)) return [3 /*break*/, 2];
-                                                                            _2 = obj;
-                                                                            _3 = column.field;
+                                                                            _3 = obj;
+                                                                            _4 = column.field;
                                                                             return [4 /*yield*/, transform];
                                                                         case 1:
-                                                                            _2[_3] = _6.sent();
+                                                                            _3[_4] = _7.sent();
                                                                             return [3 /*break*/, 3];
                                                                         case 2:
                                                                             obj[column.field] = transform;
-                                                                            _6.label = 3;
-                                                                        case 3: return [3 /*break*/, 13];
+                                                                            _7.label = 3;
+                                                                        case 3:
+                                                                            obj[column.field] = (_t = obj[column.field]) !== null && _t !== void 0 ? _t : '';
+                                                                            return [3 /*break*/, 13];
                                                                         case 4:
                                                                             if (!(item[column.field] === undefined || item[column.field] === null || item[column.field] === '')) return [3 /*break*/, 5];
                                                                             obj[column.field] = '';
@@ -2405,10 +2410,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] = ((_t = column.option) === null || _t === void 0 ? void 0 : _t.displayOnTrue) || 'True';
+                                                                                obj[column.field] = ((_u = column.option) === null || _u === void 0 ? void 0 : _u.displayOnTrue) || 'True';
                                                                             }
                                                                             else if (obj[column.field] !== undefined && obj[column.field] !== null) {
-                                                                                obj[column.field] = ((_u = column.option) === null || _u === void 0 ? void 0 : _u.displayOnFalse) || 'False';
+                                                                                obj[column.field] = ((_v = column.option) === null || _v === void 0 ? void 0 : _v.displayOnFalse) || 'False';
                                                                             }
                                                                             return [3 /*break*/, 13];
                                                                         case 7:
@@ -2444,43 +2449,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
-                                                                            _4 = obj;
-                                                                            _5 = column.field;
+                                                                            _5 = obj;
+                                                                            _6 = 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
-                                                                            _4[_5] = _6.sent();
+                                                                            _5[_6] = _7.sent();
                                                                             return [3 /*break*/, 13];
                                                                         case 12:
                                                                             obj[column.field] = item[column.field];
-                                                                            _6.label = 13;
+                                                                            _7.label = 13;
                                                                         case 13: return [2 /*return*/];
                                                                     }
                                                                 });
                                                             }); };
-                                                            _3.label = 1;
+                                                            _4.label = 1;
                                                         case 1:
-                                                            _3.trys.push([1, 6, 7, 8]);
+                                                            _4.trys.push([1, 6, 7, 8]);
                                                             columns_3 = (e_8 = void 0, __values(columns_2)), columns_3_1 = columns_3.next();
-                                                            _3.label = 2;
+                                                            _4.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:
-                                                            _3.sent();
-                                                            _3.label = 4;
+                                                            _4.sent();
+                                                            _4.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 = _3.sent();
+                                                            e_8_1 = _4.sent();
                                                             e_8 = { error: e_8_1 };
                                                             return [3 /*break*/, 8];
                                                         case 7:
                                                             try {
-                                                                if (columns_3_1 && !columns_3_1.done && (_2 = columns_3.return)) _2.call(columns_3);
+                                                                if (columns_3_1 && !columns_3_1.done && (_3 = columns_3.return)) _3.call(columns_3);
                                                             }
                                                             finally { if (e_8) throw e_8.error; }
                                                             return [7 /*endfinally*/];
@@ -2490,29 +2495,29 @@
                                                     }
                                                 });
                                             };
-                                            _4.label = 5;
+                                            _5.label = 5;
                                         case 5:
-                                            _4.trys.push([5, 10, 11, 12]);
+                                            _5.trys.push([5, 10, 11, 12]);
                                             exportItems_2 = __values(exportItems_1), exportItems_2_1 = exportItems_2.next();
-                                            _4.label = 6;
+                                            _5.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:
-                                            _4.sent();
-                                            _4.label = 8;
+                                            _5.sent();
+                                            _5.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 = _4.sent();
+                                            e_6_1 = _5.sent();
                                             e_6 = { error: e_6_1 };
                                             return [3 /*break*/, 12];
                                         case 11:
                                             try {
-                                                if (exportItems_2_1 && !exportItems_2_1.done && (_3 = exportItems_2.return)) _3.call(exportItems_2);
+                                                if (exportItems_2_1 && !exportItems_2_1.done && (_4 = exportItems_2.return)) _4.call(exportItems_2);
                                             }
                                             finally { if (e_6) throw e_6.error; }
                                             return [7 /*endfinally*/];
@@ -2520,7 +2525,7 @@
                                     }
                                 });
                             }); };
-                            _8.label = 1;
+                            _9.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));
@@ -2530,14 +2535,14 @@
                             }
                             return [4 /*yield*/, handleData()];
                         case 2:
-                            _8.sent();
+                            _9.sent();
                             return [3 /*break*/, 1];
                         case 3:
                             if (!(promises_1.length > 0)) return [3 /*break*/, 5];
                             return [4 /*yield*/, handleData()];
                         case 4:
-                            _8.sent();
-                            _8.label = 5;
+                            _9.sent();
+                            _9.label = 5;
                         case 5:
                             if (!!(file === null || file === void 0 ? void 0 : file.filePath)) return [3 /*break*/, 18];
                             if (!isCSV) return [3 /*break*/, 7];
@@ -2547,19 +2552,19 @@
                                     fileName: (_m = (_l = this.gridOption) === null || _l === void 0 ? void 0 : _l.export) === null || _m === void 0 ? void 0 : _m.fileName
                                 })];
                         case 6:
-                            _8.sent();
+                            _9.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];
-                            _8.label = 8;
+                            _9.label = 8;
                         case 8:
-                            _8.trys.push([8, 14, 15, 16]);
-                            _2 = __values(this.gridOption.export.sheets), _3 = _2.next();
-                            _8.label = 9;
+                            _9.trys.push([8, 14, 15, 16]);
+                            _3 = __values(this.gridOption.export.sheets), _4 = _3.next();
+                            _9.label = 9;
                         case 9:
-                            if (!!_3.done) return [3 /*break*/, 13];
-                            sheet = _3.value;
+                            if (!!_4.done) return [3 /*break*/, 13];
+                            sheet = _4.value;
                             if (!(sheet.name && sheet.items && sheet.fields)) return [3 /*break*/, 12];
                             if (!Array.isArray(sheet.items)) return [3 /*break*/, 10];
                             sheets.push({
@@ -2569,27 +2574,27 @@
                             });
                             return [3 /*break*/, 12];
                         case 10:
-                            _5 = (_4 = sheets).push;
-                            _6 = {
+                            _6 = (_5 = sheets).push;
+                            _7 = {
                                 name: sheet.name
                             };
                             return [4 /*yield*/, sheet.items()];
                         case 11:
-                            _5.apply(_4, [(_6.items = _8.sent(),
-                                    _6.fields = sheet.fields,
-                                    _6)]);
-                            _8.label = 12;
+                            _6.apply(_5, [(_7.items = _9.sent(),
+                                    _7.fields = sheet.fields,
+                                    _7)]);
+                            _9.label = 12;
                         case 12:
-                            _3 = _2.next();
+                            _4 = _3.next();
                             return [3 /*break*/, 9];
                         case 13: return [3 /*break*/, 16];
                         case 14:
-                            e_5_1 = _8.sent();
+                            e_5_1 = _9.sent();
                             e_5 = { error: e_5_1 };
                             return [3 /*break*/, 16];
                         case 15:
                             try {
-                                if (_3 && !_3.done && (_7 = _2.return)) _7.call(_2);
+                                if (_4 && !_4.done && (_8 = _3.return)) _8.call(_3);
                             }
                             finally { if (e_5) throw e_5.error; }
                             return [7 /*endfinally*/];
@@ -2600,7 +2605,7 @@
                                 sheets: sheets
                             })];
                         case 17:
-                            _8.sent();
+                            _9.sent();
                             return [2 /*return*/];
                         case 18: return [4 /*yield*/, this.exportService.exportByTemplate({
                                 filePath: file.filePath,
@@ -2609,7 +2614,7 @@
                                 items: items_1
                             })];
                         case 19:
-                            _8.sent();
+                            _9.sent();
                             return [3 /*break*/, 21];
                         case 20:
                             this.isExporting = false;
@@ -2621,7 +2626,7 @@
                 });
             }); });
             this.onExport = function (args) { return __awaiter(_this, void 0, void 0, function () {
-                return __generator(this, function (_2) {
+                return __generator(this, function (_3) {
                     __classPrivateFieldGet(this, _onExport).call(this, args);
                     return [2 /*return*/];
                 });
@@ -2631,9 +2636,9 @@
                 _this.reload(false);
             };
             this.onExpand = function (rowData) { return __awaiter(_this, void 0, void 0, function () {
-                var _v, _w, _x, _y, _z, data;
-                return __generator(this, function (_2) {
-                    if ((_v = this.gridOption.subInformation) === null || _v === void 0 ? void 0 : _v.always) {
+                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) {
                         return [2 /*return*/];
                     }
                     if (rowData.isExpanding) {
@@ -2643,8 +2648,8 @@
                         rowData.isExpanded = false;
                         return [2 /*return*/];
                     }
-                    data = (_y = (_x = (_w = this.gridOption) === null || _w === void 0 ? void 0 : _w.subInformation) === null || _x === void 0 ? void 0 : _x.onExpand) === null || _y === void 0 ? void 0 : _y.call(_x, rowData);
-                    if (!((_z = this.gridOption.subInformation) === null || _z === void 0 ? void 0 : _z.multiple)) {
+                    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)) {
                         this.items.forEach(function (item) { return item.isExpanding = item.isExpanded = false; });
                     }
                     if (data instanceof Promise) {
@@ -2723,7 +2728,7 @@
             };
             this.onCreate = function () {
                 var _a, _b;
-                var _2 = _this.gridOption, type = _2.type, editor = _2.editor, columns = _2.columns;
+                var _3 = _this.gridOption, type = _3.type, editor = _3.editor, columns = _3.columns;
                 if (!(editor === null || editor === void 0 ? void 0 : editor.addable)) {
                     return;
                 }
@@ -2779,23 +2784,23 @@
             };
             this.onSave = function (item) { return __awaiter(_this, void 0, void 0, function () {
                 var editor, result, message, result, err_1;
-                return __generator(this, function (_2) {
-                    switch (_2.label) {
+                return __generator(this, function (_3) {
+                    switch (_3.label) {
                         case 0:
                             if (item.editorHandlerRow.saving) {
                                 return [2 /*return*/];
                             }
                             editor = this.gridOption.editor;
-                            _2.label = 1;
+                            _3.label = 1;
                         case 1:
-                            _2.trys.push([1, 7, 8, 9]);
+                            _3.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 = _2.sent();
+                            message = _3.sent();
                             if (message) {
                                 throw message;
                             }
@@ -2804,15 +2809,15 @@
                             if (result) {
                                 throw result;
                             }
-                            _2.label = 4;
+                            _3.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:
-                            _2.sent();
-                            _2.label = 6;
+                            _3.sent();
+                            _3.label = 6;
                         case 6:
                             if (item.editorStatus === 'create' && editor.type === 'popup') {
                                 if (this.gridOption.type === 'local') {
@@ -2823,7 +2828,7 @@
                             item.editorStatus = undefined;
                             return [3 /*break*/, 9];
                         case 7:
-                            err_1 = _2.sent();
+                            err_1 = _3.sent();
                             this.notifyService.notify.warning(err_1);
                             return [3 /*break*/, 9];
                         case 8:
@@ -2874,9 +2879,9 @@
                 _this.ref.detectChanges();
             };
             this.onRemove = function (item) { return __awaiter(_this, void 0, void 0, function () {
-                var _0, _1, editor, beforeRemove, result, idx2, idx1;
-                return __generator(this, function (_2) {
-                    switch (_2.label) {
+                var _1, _2, editor, beforeRemove, result, idx2, idx1;
+                return __generator(this, function (_3) {
+                    switch (_3.label) {
                         case 0:
                             editor = this.gridOption.editor;
                             if (!(editor === null || editor === void 0 ? void 0 : editor.beforeRemove)) return [3 /*break*/, 3];
@@ -2884,7 +2889,7 @@
                             if (!(beforeRemove instanceof Promise)) return [3 /*break*/, 2];
                             return [4 /*yield*/, beforeRemove];
                         case 1:
-                            result = _2.sent();
+                            result = _3.sent();
                             if (!result) {
                                 return [2 /*return*/];
                             }
@@ -2893,7 +2898,7 @@
                             if (!beforeRemove) {
                                 return [2 /*return*/];
                             }
-                            _2.label = 3;
+                            _3.label = 3;
                         case 3:
                             if (editor.type === 'inline') {
                                 if (this.gridOption.type === 'local') {
@@ -2905,10 +2910,10 @@
                                 this.items.splice(idx1, 1);
                                 this.items = __spread(this.items);
                                 if (this.gridOption.type === 'local') {
-                                    (_0 = editor === null || editor === void 0 ? void 0 : editor.onRemove) === null || _0 === void 0 ? void 0 : _0.call(editor, item, __classPrivateFieldGet(this, _localItems));
+                                    (_1 = editor === null || editor === void 0 ? void 0 : editor.onRemove) === null || _1 === void 0 ? void 0 : _1.call(editor, item, __classPrivateFieldGet(this, _localItems));
                                 }
                                 else {
-                                    (_1 = editor === null || editor === void 0 ? void 0 : editor.onRemove) === null || _1 === void 0 ? void 0 : _1.call(editor, item, this.items);
+                                    (_2 = editor === null || editor === void 0 ? void 0 : editor.onRemove) === null || _2 === void 0 ? void 0 : _2.call(editor, item, this.items);
                                 }
                                 this.ref.detectChanges();
                                 return [2 /*return*/];
@@ -3035,13 +3040,13 @@
                 return data.source === 'INITIALIZE';
             }), operators.switchMap(function (data) { return __awaiter(_this, void 0, void 0, function () {
                 var filterInfo, result;
-                return __generator(this, function (_2) {
-                    switch (_2.label) {
+                return __generator(this, function (_3) {
+                    switch (_3.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 = _2.sent();
+                            result = _3.sent();
                             __classPrivateFieldSet(this, _loadCompleted, true);
                             return [2 /*return*/, result];
                     }