@sd-angular/core 1.3.108 → 1.3.110

package/fesm2015/sd-angular-core-grid-material.js

@@ -232,6 +232,14 @@ class SdGridFilter {
                 filterDef: this.filterDef,
             });
         };
+        this.updateFilter = () => {
+            this.filterRegister.value.set({
+                columnFilter: this.columnFilter,
+                externalFilter: this.externalFilter,
+                filterDef: this.filterDef,
+                notReload: true
+            });
+        };
         this.open = () => {
             this.popupFilter.open();
         };
@@ -1132,14 +1140,15 @@ class SdGridFilterService {
         _filterConfiguration.set(this, 'GRID-FILTER-CONFIGURATION');
         _filterValue.set(this, 'GRID-FILTER-VALUE');
         _cache$2.set(this, {});
-        this.register = (key, args) => {
+        this.register = (filter, args) => {
             let cacheSession = false;
+            let key = filter === null || filter === void 0 ? void 0 : filter.key;
             if (!key) {
                 const { id, columns, externalFilters } = args;
                 key = hash({
                     id,
-                    columns: columns.map(e => e.field).filter(field => !!field),
-                    externalFilters: externalFilters.map(e => e.field).filter(field => !!field),
+                    columns: (columns === null || columns === void 0 ? void 0 : columns.map(e => e.field).filter(field => !!field)) || [],
+                    externalFilters: (externalFilters === null || externalFilters === void 0 ? void 0 : externalFilters.map(e => e.field).filter(field => !!field)) || [],
                 });
                 cacheSession = true; // Nếu không có key thì chỉ lưu theo session
             }
@@ -1160,7 +1169,7 @@ class SdGridFilterService {
                     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.set(__classPrivateFieldGet(this, _initValue).call(this, args, filterValue.get()));
@@ -1196,7 +1205,7 @@ class SdGridFilterService {
                         set: (value) => {
                             const keys = Object.keys(value || {});
                             const current = filterValue.get();
-                            const { columnFilter, externalFilter, filterDef } = current;
+                            const { columnFilter, externalFilter, filterDef, notReload } = current;
                             const updatedFilter = {
                                 // Filter column
                                 columnFilter: keys.includes('columnFilter') ? (value === null || value === void 0 ? void 0 : value.columnFilter) || {} : columnFilter,
@@ -1204,6 +1213,8 @@ class SdGridFilterService {
                                 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.set(updatedFilter);
                             return updatedFilter;
@@ -1438,25 +1449,28 @@ class SdGridMaterial {
             return option;
         });
         _loadFilterRegister.set(this, () => {
-            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(debounceTime(500), map(filterValue => {
-                        const { columnFilter } = filterValue;
+                        const { columnFilter, notReload } = filterValue;
                         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());
                 }
             }
         });
@@ -1659,14 +1673,18 @@ class SdGridMaterial {
             __classPrivateFieldGet(this, _updateSelectedItems).call(this);
         }));
         this.reload = (force = true) => __awaiter(this, void 0, void 0, function* () {
+            var _e;
+            if ((_e = this.gridFilter) === null || _e === void 0 ? void 0 : _e.updateFilter) {
+                this.gridFilter.updateFilter();
+            }
             const data = yield __classPrivateFieldGet(this, _load$1).call(this, __classPrivateFieldGet(this, _getFilter).call(this), force);
             __classPrivateFieldGet(this, _render).call(this, data);
         });
         _exportedItems.set(this, (pageNumber = 0, pageSize = 10000) => __awaiter(this, void 0, void 0, function* () {
-            var _e, _f;
-            if ((_e = this.gridOption.export) === null || _e === void 0 ? void 0 : _e.items) {
+            var _f, _g;
+            if ((_f = this.gridOption.export) === null || _f === void 0 ? void 0 : _f.items) {
                 // const exportedItems = this.gridOption.export?.items(this.#filterExportInfo(pageNumber, pageSize));
-                let result = (_f = this.gridOption.export) === null || _f === void 0 ? void 0 : _f.items(__classPrivateFieldGet(this, _filterExportInfo).call(this, pageNumber, pageSize));
+                let 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 result;
                 }
@@ -1741,12 +1759,12 @@ class SdGridMaterial {
             return ((_b = (_a = this.gridOption.export) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.filter(e => { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); })) || [];
         });
         _onExport.set(this, (args) => __awaiter(this, void 0, void 0, function* () {
-            var _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+            var _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
             try {
                 const { file, isCSV } = args;
                 let { columns } = args;
-                const pageSize = ((_h = (_g = this.gridOption) === null || _g === void 0 ? void 0 : _g.export) === null || _h === void 0 ? void 0 : _h.maxItemsPerRequest) || 1000;
-                const batch = ((_k = (_j = this.gridOption) === null || _j === void 0 ? void 0 : _j.export) === null || _k === void 0 ? void 0 : _k.batch) || 1;
+                const pageSize = ((_j = (_h = this.gridOption) === null || _h === void 0 ? void 0 : _h.export) === null || _j === void 0 ? void 0 : _j.maxItemsPerRequest) || 1000;
+                const batch = ((_l = (_k = this.gridOption) === null || _k === void 0 ? void 0 : _k.export) === null || _l === void 0 ? void 0 : _l.batch) || 1;
                 let total = this.total;
                 let pageNumber = 0;
                 let exportItems = [];
@@ -1754,7 +1772,7 @@ class SdGridMaterial {
                 const items = [];
                 let promises = [];
                 const handleData = () => __awaiter(this, void 0, void 0, function* () {
-                    var _s;
+                    var _t;
                     const results = yield Promise.all(promises);
                     promises = [];
                     exportItems = [];
@@ -1767,7 +1785,7 @@ class SdGridMaterial {
                             exportItems = [...exportItems, ...result];
                         }
                     }
-                    if ((_s = this.gridOption.export) === null || _s === void 0 ? void 0 : _s.mapping) {
+                    if ((_t = this.gridOption.export) === null || _t === void 0 ? void 0 : _t.mapping) {
                         const results = this.gridOption.export.mapping(exportItems);
                         if (results instanceof Promise) {
                             exportItems = yield results;
@@ -1784,7 +1802,7 @@ class SdGridMaterial {
                     for (const item of exportItems) {
                         const obj = {};
                         const handle = (exportColumn) => __awaiter(this, void 0, void 0, function* () {
-                            var _t, _u, _v;
+                            var _u, _v, _w;
                             obj[exportColumn.field] = item[exportColumn.field];
                             const column = allColumns.find(e => e.field === exportColumn.field);
                             const exportedColumn = allExportedColumns.find(e => e.field === exportColumn.field);
@@ -1812,7 +1830,7 @@ class SdGridMaterial {
                                 else {
                                     obj[column.field] = transform;
                                 }
-                                obj[column.field] = (_t = obj[column.field]) !== null && _t !== void 0 ? _t : '';
+                                obj[column.field] = (_u = obj[column.field]) !== null && _u !== void 0 ? _u : '';
                             }
                             else if (item[column.field] === undefined || item[column.field] === null || item[column.field] === '') {
                                 obj[column.field] = '';
@@ -1824,10 +1842,10 @@ class SdGridMaterial {
                             else if (column.type === 'bool') {
                                 // 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';
                                 }
                             }
                             else if (column.type === 'date') {
@@ -1888,12 +1906,12 @@ class SdGridMaterial {
                         yield this.exportService.exportCSV({
                             columns,
                             items,
-                            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,
                         });
                         return;
                     }
                     const sheets = [];
-                    if (Array.isArray((_p = (_o = this.gridOption) === null || _o === void 0 ? void 0 : _o.export) === null || _p === void 0 ? void 0 : _p.sheets)) {
+                    if (Array.isArray((_q = (_p = this.gridOption) === null || _p === void 0 ? void 0 : _p.export) === null || _q === void 0 ? void 0 : _q.sheets)) {
                         for (const sheet of this.gridOption.export.sheets) {
                             if (sheet.name && sheet.items && sheet.fields) {
                                 if (Array.isArray(sheet.items)) {
@@ -1916,7 +1934,7 @@ class SdGridMaterial {
                     yield this.exportService.export({
                         columns,
                         items,
-                        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,
                     });
                     return;
@@ -1951,8 +1969,8 @@ class SdGridMaterial {
             }
         };
         this.onExpand = (rowData) => __awaiter(this, void 0, void 0, function* () {
-            var _w, _x, _y, _z, _0;
-            if ((_w = this.gridOption.subInformation) === null || _w === void 0 ? void 0 : _w.always) {
+            var _x, _y, _z, _0, _1;
+            if ((_x = this.gridOption.subInformation) === null || _x === void 0 ? void 0 : _x.always) {
                 return;
             }
             if (rowData.isExpanding) {
@@ -1962,8 +1980,8 @@ class SdGridMaterial {
                 rowData.isExpanded = false;
                 return;
             }
-            const 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)) {
+            const 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(item => (item.isExpanding = item.isExpanded = false));
             }
             if (data instanceof Promise) {
@@ -2178,7 +2196,7 @@ class SdGridMaterial {
             this.ref.detectChanges();
         };
         this.onRemove = (item) => __awaiter(this, void 0, void 0, function* () {
-            var _1, _2;
+            var _2, _3;
             const { editor } = this.gridOption;
             if (editor === null || editor === void 0 ? void 0 : editor.beforeRemove) {
                 const beforeRemove = editor === null || editor === void 0 ? void 0 : editor.beforeRemove(item);
@@ -2204,10 +2222,10 @@ class SdGridMaterial {
                 this.items.splice(idx1, 1);
                 this.items = [...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;