@sd-angular/core 1.3.103 → 1.3.105

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

@@ -539,7 +539,7 @@
                 _this.filterRegister.value.set({
                     columnFilter: _this.columnFilter,
                     externalFilter: _this.externalFilter,
-                    filterDef: _this.filterDef
+                    filterDef: _this.filterDef,
                 });
             };
             this.open = function () {
@@ -570,19 +570,20 @@
             enumerable: false,
             configurable: true
         });
-        ;
         SdGridFilter.prototype.ngAfterViewInit = function () {
             var _this = this;
             __classPrivateFieldGet(this, _subscription$1).add(this.filterRegister.configuration.observer.subscribe(function (configuration) {
-                _this.inlineColumn = configuration.inlineColumn;
-                _this.inlineExternal = configuration.inlineExternal;
-                _this.inlineFilterDef = configuration.inlineFilterDef;
+                var inlineColumn = configuration.inlineColumn, inlineExternal = configuration.inlineExternal, inlineFilterDef = configuration.inlineFilterDef;
+                _this.inlineColumn = inlineColumn;
+                _this.inlineExternal = inlineExternal;
+                _this.inlineFilterDef = inlineFilterDef;
                 _this.ref.markForCheck();
             }));
             __classPrivateFieldGet(this, _subscription$1).add(this.filterRegister.value.observer.subscribe(function (value) {
-                _this.columnFilter = value.columnFilter;
-                _this.externalFilter = value.externalFilter;
-                _this.filterDef = value.filterDef;
+                var columnFilter = value.columnFilter, externalFilter = value.externalFilter, filterDef = value.filterDef;
+                _this.columnFilter = columnFilter;
+                _this.externalFilter = externalFilter;
+                _this.filterDef = filterDef;
                 _this.ref.markForCheck();
             }));
         };
@@ -594,7 +595,7 @@
     _subscription$1 = new WeakMap();
     SdGridFilter.decorators = [
         { type: core.Component, args: [{
-                    selector: 'sd-grid-filter',
+                    selector: "sd-grid-filter",
                     template: "<ng-container *ngIf=\"!filter?.disabled\">\r\n  <ng-container *ngIf=\"filter?.enableCollapse;else noCollapse\">\r\n    <sd-group class=\"p-12\" [isExpanded]=\"false\" title=\"T\u00ECm ki\u1EBFm\" expandable>\r\n      <div sdGroupBody>\r\n        <ng-container *ngTemplateOutlet=\"noCollapse\"></ng-container>\r\n      </div>\r\n    </sd-group>\r\n  </ng-container>\r\n  <ng-template #noCollapse>\r\n    <div\r\n      *ngIf=\"!isMobileOrTablet && ((columns?.length && !filter?.inlineColumn) || externalFilters?.length || filterDefs?.length)\"\r\n      class=\"row mx-0\">\r\n      <ng-container *ngIf=\"filter?.sorts?.length\">\r\n        <ng-container *ngFor=\"let field of filter?.sorts\">\r\n          <ng-container *ngIf=\"columns?.length && !filter?.inlineColumn\">\r\n            <ng-container *ngFor=\"let item of columns | sdFilterColumn:field\">\r\n              <ng-container *ngTemplateOutlet=\"filterColumn; context: {item: item}\"></ng-container>\r\n            </ng-container>\r\n          </ng-container>\r\n          <ng-container *ngIf=\"externalFilters?.length\">\r\n            <ng-container *ngFor=\"let item of externalFilters | sdFilterExternal:field\">\r\n              <ng-container *ngTemplateOutlet=\"filterExternal; context: {item: item}\"></ng-container>\r\n            </ng-container>\r\n          </ng-container>\r\n          <ng-container *ngFor=\"let item of filterDefs\">\r\n            <div *ngIf=\"inlineFilterDef[item.sdMaterialFilterDef] && item.sdMaterialFilterDef === field\"\r\n              class=\"col-lg-2 col-md-3 col-sm-6 px-8\">\r\n              <ng-container *ngTemplateOutlet=\"item.templateRef;context:{filterDef:filterDef, isInline: true}\">\r\n              </ng-container>\r\n            </div>\r\n          </ng-container>\r\n        </ng-container>\r\n      </ng-container>\r\n      <ng-container *ngIf=\"!filter?.sorts?.length\">\r\n        <ng-container *ngIf=\"columns?.length && !filter?.inlineColumn\">\r\n          <ng-container *ngFor=\"let item of columns | sdFilterColumn\">\r\n            <ng-container *ngTemplateOutlet=\"filterColumn; context: {item: item}\"></ng-container>\r\n          </ng-container>\r\n        </ng-container>\r\n        <ng-container *ngIf=\"externalFilters?.length\">\r\n          <ng-container *ngFor=\"let item of externalFilters | sdFilterExternal\">\r\n            <ng-container *ngTemplateOutlet=\"filterExternal; context: {item: item}\"></ng-container>\r\n          </ng-container>\r\n        </ng-container>\r\n        <ng-container *ngFor=\"let item of filterDefs\">\r\n          <div *ngIf=\"inlineFilterDef[item.sdMaterialFilterDef]\" class=\"col-lg-2 col-md-3 col-sm-6 px-8\">\r\n            <ng-container *ngTemplateOutlet=\"item.templateRef;context:{filterDef:filterDef, isInline: true}\">\r\n            </ng-container>\r\n          </div>\r\n        </ng-container>\r\n      </ng-container>\r\n    </div>\r\n    <ng-template #filterColumn let-item=\"item\">\r\n      <div *ngIf=\"inlineColumn[item.field]\" class=\"col-lg-2 col-md-3 col-sm-6 px-8\">\r\n        <sd-input [label]=\"item.title\" *ngIf=\"item.type === 'string'\" type=\"text\" [(model)]=\"columnFilter[item.field]\"\r\n          (keyupEnter)=\"onFilter(item)\" appearance=\"outline\">\r\n        </sd-input>\r\n        <sd-input-number [label]=\"item.title\" *ngIf=\"item.type === 'number'\" [(model)]=\"columnFilter[item.field]\"\r\n          (keyupEnter)=\"onFilter(item)\" appearance=\"outline\">\r\n        </sd-input-number>\r\n        <sd-select [label]=\"item.title\" *ngIf=\"item.type === 'bool'\" [items]=\"[{value:'1',display:item.option?.displayOnTrue || 'True' },\r\n        {value:'0',display:item.option?.displayOnFalse || 'False' }]\" valueField=\"value\" displayField=\"display\"\r\n          [(model)]=\"columnFilter[item.field]\" (sdChange)=\"onFilter(item)\" appearance=\"outline\">\r\n        </sd-select>\r\n        <sd-select *ngIf=\"item.type === 'values' && item?.option?.selection !== 'AUTOCOMPLETE'\"\r\n          [items]=\"item.option?.items\" [valueField]=\"item.option?.valueField\" [displayField]=\"item.option.displayField\"\r\n          [(model)]=\"columnFilter[item.field]\" (sdChange)=\"onFilter(item)\" [disabled]=\"item.filter?.disabled\"\r\n          [multiple]=\"item?.option?.selection === 'MULTIPLE' || item?.item?.selection === 'MULTIPLEAUTOCOMPLETE'\"\r\n          [filtered]=\"item?.option?.selection === 'MULTIPLEAUTOCOMPLETE'\" appearance=\"outline\">\r\n        </sd-select>\r\n        <sd-autocomplete *ngIf=\"item.type === 'values' && item?.option?.selection === 'AUTOCOMPLETE'\"\r\n          [items]=\"item.option?.items\" [valueField]=\"item.option?.valueField\" [displayField]=\"item.option?.displayField\"\r\n          [(model)]=\"columnFilter[item.field]\" (sdChange)=\"onFilter(item)\" [disabled]=\"item.filter?.disabled\"\r\n          appearance=\"outline\">\r\n        </sd-autocomplete>\r\n        <sd-date-time *ngIf=\"item.type === 'date' || item.type === 'datetime' || item.type === 'time'\"\r\n          [label]=\"item.title\" [(model)]=\"columnFilter[item.field]\" [type]=\"item.type\" (sdChange)=\"onFilter(item)\"\r\n          appearance=\"outline\">\r\n        </sd-date-time>\r\n      </div>\r\n    </ng-template>\r\n    <ng-template #filterExternal let-item=\"item\">\r\n      <div *ngIf=\"inlineExternal[item.field]\" class=\"col-lg-2 col-md-3 col-sm-6 px-8\">\r\n        <sd-input [label]=\"item.title\" *ngIf=\"item.type === 'string'\" type=\"text\" [(model)]=\"externalFilter[item.field]\"\r\n          (keyupEnter)=\"onFilter(item)\" appearance=\"outline\">\r\n        </sd-input>\r\n        <sd-input-number [label]=\"item.title\" *ngIf=\"item.type === 'number'\" [(model)]=\"externalFilter[item.field]\"\r\n          (keyupEnter)=\"onFilter(item)\" appearance=\"outline\">\r\n        </sd-input-number>\r\n        <sd-select [label]=\"item.title\" *ngIf=\"item.type === 'bool'\" [items]=\"[{value:'1',display:item.option?.displayOnTrue || 'True' },\r\n        {value:'0',display:item.option?.displayOnFalse || 'False' }]\" valueField=\"value\" displayField=\"display\"\r\n          [(model)]=\"externalFilter[item.field]\" (sdChange)=\"onFilter(item)\" appearance=\"outline\">\r\n        </sd-select>\r\n        <ng-container *ngIf=\"item.type === 'values' && item.option\">\r\n          <sd-select *ngIf=\"item.option?.selection === 'MULTIPLE'\" [label]=\"item.title\" [items]=\"item.option.items\"\r\n            [valueField]=\"item.option.valueField\" [displayField]=\"item.option.displayField\"\r\n            [(model)]=\"externalFilter[item.field]\" (sdChange)=\"onFilter(item)\" [selectAll]=\"item.option.selectAll\"\r\n            appearance=\"outline\" multiple>\r\n          </sd-select>\r\n          <sd-autocomplete *ngIf=\"item.option?.selection === 'AUTOCOMPLETE'\" [label]=\"item.title\"\r\n            [items]=\"item.option.items\" [valueField]=\"item.option.valueField\" [displayField]=\"item.option.displayField\"\r\n            [(model)]=\"externalFilter[item.field]\" (sdChange)=\"onFilter(item)\" appearance=\"outline\">\r\n          </sd-autocomplete>\r\n          <sd-select *ngIf=\"item.option?.selection === 'MULTIPLEAUTOCOMPLETE'\" [label]=\"item.title\"\r\n            [items]=\"item.option.items\" [valueField]=\"item.option.valueField\" [displayField]=\"item.option.displayField\"\r\n            [(model)]=\"externalFilter[item.field]\" (sdChange)=\"onFilter(item)\" filtered=\"true\" appearance=\"outline\"\r\n            multiple>\r\n          </sd-select>\r\n          <sd-select *ngIf=\"!item.option?.selection\" [label]=\"item.title\" [items]=\"item.option.items\"\r\n            [valueField]=\"item.option.valueField\" [displayField]=\"item.option.displayField\"\r\n            [(model)]=\"externalFilter[item.field]\" (sdChange)=\"onFilter(item)\" appearance=\"outline\">\r\n          </sd-select>\r\n        </ng-container>\r\n        <sd-date-time [label]=\"item.title\" *ngIf=\"item.type ==='date' || item.type ==='datetime'\"\r\n          [(model)]=\"externalFilter[item.field]\" [type]=\"item.type\" (sdChange)=\"onFilter(item)\" appearance=\"outline\">\r\n        </sd-date-time>\r\n        <sd-date-range [label]=\"item.title\" *ngIf=\"item.type ==='daterange' && externalFilter[item.field]\"\r\n          [(from)]=\"externalFilter[item.field].from\" [(to)]=\"externalFilter[item.field].to\" [min]=\"item.minDate\"\r\n          [max]=\"item.maxDate\" (sdChange)=\"onFilter(item)\" appearance=\"outline\">\r\n        </sd-date-range>\r\n      </div>\r\n    </ng-template>\r\n    <sd-popup-filter [filterRegister]=\"filterRegister\" [columns]=\"columns\"\r\n      [externalFilters]=\"externalFilters\" [filterDefs]=\"filterDefs\">\r\n    </sd-popup-filter>\r\n  </ng-template>\r\n</ng-container>",
                     changeDetection: core.ChangeDetectionStrategy.OnPush,
                     styles: [":host{display:block;padding-bottom:10px;padding-left:0;padding-right:0}:host ::ng-deep .mat-form-field-wrapper{padding-bottom:0}"]
@@ -606,11 +607,11 @@
     ]; };
     SdGridFilter.propDecorators = {
         popupFilter: [{ type: core.ViewChild, args: [SdPopupFilter,] }],
-        _filter: [{ type: core.Input, args: ['filter',] }],
+        _filter: [{ type: core.Input, args: ["filter",] }],
         columns: [{ type: core.Input }],
-        _externalFilters: [{ type: core.Input, args: ['externalFilters',] }],
+        _externalFilters: [{ type: core.Input, args: ["externalFilters",] }],
         filterDefs: [{ type: core.Input }],
-        _filterRegister: [{ type: core.Input, args: ['filterRegister',] }]
+        _filterRegister: [{ type: core.Input, args: ["filterRegister",] }]
     };
 
     var _getExportableColumns, _getExportableGroups, _getExportColumns, _initTemplate;
@@ -1634,13 +1635,13 @@
         { type: core.NgZone }
     ]; };
 
-    var _filterConfiguration, _filterValue, _cache$2, _loadDefaultConfiguration, _loadDefaultValue;
+    var _filterConfiguration, _filterValue, _cache$2, _defaultConfiguration, _defaultValue, _initConfiguration, _initValue;
     var SdGridFilterService = /** @class */ (function () {
         function SdGridFilterService(settingService) {
             var _this = this;
             this.settingService = settingService;
-            _filterConfiguration.set(this, 'GRID-FILTER-CONFIGURATION');
-            _filterValue.set(this, 'GRID-FILTER-VALUE');
+            _filterConfiguration.set(this, "GRID-FILTER-CONFIGURATION");
+            _filterValue.set(this, "GRID-FILTER-VALUE");
             _cache$2.set(this, {});
             this.register = function (key, args) {
                 var cacheSession = false;
@@ -1648,69 +1649,57 @@
                     var columns = args.columns, externalFilters = args.externalFilters;
                     key = hash__default['default']({
                         columns: columns,
-                        externalFilters: externalFilters
+                        externalFilters: externalFilters,
                     });
                     cacheSession = true; // Nếu không có key thì chỉ lưu theo session
                 }
                 if (!__classPrivateFieldGet(_this, _cache$2)[key]) {
+                    // Setting của filter configuration
                     var filterConfiguration_1 = _this.settingService.create({
                         prefix: __classPrivateFieldGet(_this, _filterConfiguration),
-                        key: key
+                        key: key,
                     }, {
-                        default: __classPrivateFieldGet(_this, _loadDefaultConfiguration).call(_this, args),
-                        type: cacheSession ? 'session' : undefined
+                        default: __classPrivateFieldGet(_this, _defaultConfiguration).call(_this, args),
+                        type: cacheSession ? "session" : undefined,
                     });
+                    // Lấy giá trị configuration merge với giá trị defaultShowing của args nếu như args có thay đổi
+                    filterConfiguration_1.set(__classPrivateFieldGet(_this, _initConfiguration).call(_this, args, filterConfiguration_1.get()));
+                    // Setting của filter value
                     var filterValue_1 = _this.settingService.create({
                         prefix: __classPrivateFieldGet(_this, _filterValue),
-                        key: key
+                        key: key,
                     }, {
-                        default: __classPrivateFieldGet(_this, _loadDefaultValue).call(_this, args),
-                        type: cacheSession ? 'session' : undefined
+                        default: __classPrivateFieldGet(_this, _defaultValue).call(_this, args),
+                        type: cacheSession ? "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()));
                     __classPrivateFieldGet(_this, _cache$2)[key] = {
                         configuration: {
                             get: function () {
-                                var configuration = filterConfiguration_1.get();
-                                return {
-                                    // Filter column
-                                    inlineColumn: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineColumn) || {},
-                                    // Filter external
-                                    inlineExternal: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineExternal) || {},
-                                    // Filter def
-                                    inlineFilterDef: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineFilterDef) || {},
-                                };
+                                return filterConfiguration_1.get();
                             },
                             set: function (configuration) {
-                                var keys = Object.keys(configuration || {});
-                                var current = filterConfiguration_1.get();
-                                var inlineColumn = current.inlineColumn, inlineExternal = current.inlineExternal, inlineFilterDef = current.inlineFilterDef;
-                                var updatedConfiguration = {
-                                    // Filter column
-                                    inlineColumn: keys.includes('inlineColumn') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.inlineColumn) || {}) : inlineColumn,
-                                    // Filter external
-                                    inlineExternal: keys.includes('inlineExternal') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.inlineExternal) || {}) : inlineExternal,
-                                    // Filter def
-                                    inlineFilterDef: keys.includes('inlineFilterDef') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.inlineFilterDef) || {}) : inlineFilterDef,
+                                var inlineColumn = configuration.inlineColumn, inlineExternal = configuration.inlineExternal, inlineFilterDef = configuration.inlineFilterDef;
+                                filterConfiguration_1.set({
+                                    inlineColumn: inlineColumn,
+                                    inlineExternal: inlineExternal,
+                                    inlineFilterDef: inlineFilterDef,
+                                });
+                                return {
+                                    inlineColumn: inlineColumn,
+                                    inlineExternal: inlineExternal,
+                                    inlineFilterDef: inlineFilterDef,
                                 };
-                                filterConfiguration_1.set(updatedConfiguration);
-                                return updatedConfiguration;
                             },
                             remove: function () {
                                 filterConfiguration_1.remove();
                             },
-                            observer: filterConfiguration_1.observer
+                            observer: filterConfiguration_1.observer.pipe(operators.startWith(filterConfiguration_1.get())),
                         },
                         value: {
                             get: function () {
-                                var configuration = filterValue_1.get();
-                                return {
-                                    // Filter column
-                                    columnFilter: (configuration === null || configuration === void 0 ? void 0 : configuration.columnFilter) || {},
-                                    // Filter external
-                                    externalFilter: (configuration === null || configuration === void 0 ? void 0 : configuration.externalFilter) || {},
-                                    // Filter def
-                                    filterDef: (configuration === null || configuration === void 0 ? void 0 : configuration.filterDef) || {}
-                                };
+                                return filterValue_1.get();
                             },
                             set: function (configuration) {
                                 var keys = Object.keys(configuration || {});
@@ -1718,11 +1707,17 @@
                                 var columnFilter = current.columnFilter, externalFilter = current.externalFilter, filterDef = current.filterDef;
                                 var updatedConfiguration = {
                                     // Filter column
-                                    columnFilter: keys.includes('columnFilter') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.columnFilter) || {}) : columnFilter,
+                                    columnFilter: keys.includes("columnFilter")
+                                        ? (configuration === null || configuration === void 0 ? void 0 : configuration.columnFilter) || {}
+                                        : columnFilter,
                                     // Filter external
-                                    externalFilter: keys.includes('externalFilter') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.externalFilter) || {}) : externalFilter,
+                                    externalFilter: keys.includes("externalFilter")
+                                        ? (configuration === null || configuration === void 0 ? void 0 : configuration.externalFilter) || {}
+                                        : externalFilter,
                                     // Filter def
-                                    filterDef: keys.includes('filterDef') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.filterDef) || {}) : filterDef,
+                                    filterDef: keys.includes("filterDef")
+                                        ? (configuration === null || configuration === void 0 ? void 0 : configuration.filterDef) || {}
+                                        : filterDef,
                                 };
                                 filterValue_1.set(updatedConfiguration);
                                 return updatedConfiguration;
@@ -1730,121 +1725,256 @@
                             remove: function () {
                                 filterValue_1.remove();
                             },
-                            observer: filterValue_1.observer
-                        }
+                            observer: filterValue_1.observer.pipe(operators.startWith(filterValue_1.get())),
+                        },
                     };
                 }
                 return __classPrivateFieldGet(_this, _cache$2)[key];
             };
-            _loadDefaultConfiguration.set(this, function (args) {
-                var e_1, _m, e_2, _o, e_3, _p;
-                var _a, _b, _c, _d;
+            _defaultConfiguration.set(this, function (args) {
+                var e_1, _r, e_2, _s, e_3, _t;
+                var _a;
                 var columns = args.columns, externalFilters = args.externalFilters, filterDefs = args.filterDefs;
                 var inlineColumn = {};
                 var inlineExternal = {};
                 var inlineFilterDef = {};
                 try {
                     // Filter column
-                    for (var _q = __values((columns || [])), _r = _q.next(); !_r.done; _r = _q.next()) {
-                        var item = _r.value;
-                        inlineColumn[item.field] = (_a = inlineColumn[item.field]) !== null && _a !== void 0 ? _a : (_b = item === null || item === void 0 ? void 0 : item.filter) === null || _b === void 0 ? void 0 : _b.defaultShowing;
+                    for (var _u = __values(columns || []), _v = _u.next(); !_v.done; _v = _u.next()) {
+                        var item = _v.value;
+                        inlineColumn[item.field] = (_a = item === null || item === void 0 ? void 0 : item.filter) === null || _a === void 0 ? void 0 : _a.defaultShowing;
                     }
                 }
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (_r && !_r.done && (_m = _q.return)) _m.call(_q);
+                        if (_v && !_v.done && (_r = _u.return)) _r.call(_u);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
                 try {
                     // Filter external
-                    for (var _s = __values((externalFilters || [])), _t = _s.next(); !_t.done; _t = _s.next()) {
-                        var item = _t.value;
-                        inlineExternal[item.field] = (_c = inlineExternal[item.field]) !== null && _c !== void 0 ? _c : item === null || item === void 0 ? void 0 : item.defaultShowing;
+                    for (var _w = __values(externalFilters || []), _x = _w.next(); !_x.done; _x = _w.next()) {
+                        var item = _x.value;
+                        inlineExternal[item.field] = item === null || item === void 0 ? void 0 : item.defaultShowing;
                     }
                 }
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (_t && !_t.done && (_o = _s.return)) _o.call(_s);
+                        if (_x && !_x.done && (_s = _w.return)) _s.call(_w);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
                 try {
                     // Filter def
-                    for (var _u = __values((filterDefs || [])), _v = _u.next(); !_v.done; _v = _u.next()) {
-                        var item = _v.value;
-                        inlineFilterDef[item.sdMaterialFilterDef] = (_d = inlineFilterDef[item.sdMaterialFilterDef]) !== null && _d !== void 0 ? _d : item === null || item === void 0 ? void 0 : item.defaultShowing;
+                    for (var _y = __values(filterDefs || []), _z = _y.next(); !_z.done; _z = _y.next()) {
+                        var item = _z.value;
+                        inlineFilterDef[item.sdMaterialFilterDef] = item === null || item === void 0 ? void 0 : item.defaultShowing;
                     }
                 }
                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
                 finally {
                     try {
-                        if (_v && !_v.done && (_p = _u.return)) _p.call(_u);
+                        if (_z && !_z.done && (_t = _y.return)) _t.call(_y);
                     }
                     finally { if (e_3) throw e_3.error; }
                 }
                 return {
+                    // Filter column
                     inlineColumn: inlineColumn,
+                    // Filter external
                     inlineExternal: inlineExternal,
+                    // Filter def
                     inlineFilterDef: inlineFilterDef,
                 };
             });
-            _loadDefaultValue.set(this, function (args) {
-                var e_4, _m, e_5, _o;
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-                var columns = args.columns, externalFilters = args.externalFilters, filterDefs = args.filterDefs;
+            _defaultValue.set(this, function (args) {
+                var e_4, _r, e_5, _s, e_6, _t;
+                var _a;
                 var columnFilter = {};
                 var externalFilter = {};
                 var filterDef = {};
+                var columns = args.columns, externalFilters = args.externalFilters, filterDefs = args.filterDefs;
                 try {
                     // Filter column
-                    for (var _p = __values((columns || [])), _q = _p.next(); !_q.done; _q = _p.next()) {
-                        var item = _q.value;
-                        columnFilter[item.field] = (_a = columnFilter[item.field]) !== null && _a !== void 0 ? _a : (_b = item === null || item === void 0 ? void 0 : item.filter) === null || _b === void 0 ? void 0 : _b.default;
+                    for (var _u = __values(columns || []), _v = _u.next(); !_v.done; _v = _u.next()) {
+                        var item = _v.value;
+                        columnFilter[item.field] = (_a = item === null || item === void 0 ? void 0 : item.filter) === null || _a === void 0 ? void 0 : _a.default;
                     }
                 }
                 catch (e_4_1) { e_4 = { error: e_4_1 }; }
                 finally {
                     try {
-                        if (_q && !_q.done && (_m = _p.return)) _m.call(_p);
+                        if (_v && !_v.done && (_r = _u.return)) _r.call(_u);
                     }
                     finally { if (e_4) throw e_4.error; }
                 }
                 try {
                     // Filter external
-                    for (var _r = __values((externalFilters || [])), _s = _r.next(); !_s.done; _s = _r.next()) {
-                        var item = _s.value;
-                        if (item.type === 'daterange') {
+                    for (var _w = __values(externalFilters || []), _x = _w.next(); !_x.done; _x = _w.next()) {
+                        var item = _x.value;
+                        externalFilter[item.field] = item === null || item === void 0 ? void 0 : item.default;
+                    }
+                }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                finally {
+                    try {
+                        if (_x && !_x.done && (_s = _w.return)) _s.call(_w);
+                    }
+                    finally { if (e_5) throw e_5.error; }
+                }
+                try {
+                    // Filter def
+                    for (var _y = __values(filterDefs || []), _z = _y.next(); !_z.done; _z = _y.next()) {
+                        var item = _z.value;
+                        filterDef[item.sdMaterialFilterDef] = undefined;
+                    }
+                }
+                catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                finally {
+                    try {
+                        if (_z && !_z.done && (_t = _y.return)) _t.call(_y);
+                    }
+                    finally { if (e_6) throw e_6.error; }
+                }
+                return {
+                    // Filter column
+                    columnFilter: columnFilter,
+                    // Filter external
+                    externalFilter: externalFilter,
+                    // Filter def
+                    filterDef: filterDef,
+                };
+            });
+            _initConfiguration.set(this, function (args, configuration) {
+                var e_7, _r, e_8, _s, e_9, _t;
+                var _a, _b, _c, _d, _e, _f, _g;
+                var columns = args.columns, externalFilters = args.externalFilters, filterDefs = args.filterDefs;
+                var inlineColumn = {};
+                var inlineExternal = {};
+                var inlineFilterDef = {};
+                try {
+                    // Filter column
+                    for (var _u = __values(columns || []), _v = _u.next(); !_v.done; _v = _u.next()) {
+                        var item = _v.value;
+                        inlineColumn[item.field] = (_b = (_a = configuration === null || configuration === void 0 ? void 0 : configuration.inlineColumn) === null || _a === void 0 ? void 0 : _a[item.field]) !== null && _b !== void 0 ? _b : (_c = item === null || item === void 0 ? void 0 : item.filter) === null || _c === void 0 ? void 0 : _c.defaultShowing;
+                    }
+                }
+                catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                finally {
+                    try {
+                        if (_v && !_v.done && (_r = _u.return)) _r.call(_u);
+                    }
+                    finally { if (e_7) throw e_7.error; }
+                }
+                try {
+                    // Filter external
+                    for (var _w = __values(externalFilters || []), _x = _w.next(); !_x.done; _x = _w.next()) {
+                        var item = _x.value;
+                        inlineExternal[item.field] = (_e = (_d = configuration === null || configuration === void 0 ? void 0 : configuration.inlineExternal) === null || _d === void 0 ? void 0 : _d[item.field]) !== null && _e !== void 0 ? _e : item === null || item === void 0 ? void 0 : item.defaultShowing;
+                    }
+                }
+                catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                finally {
+                    try {
+                        if (_x && !_x.done && (_s = _w.return)) _s.call(_w);
+                    }
+                    finally { if (e_8) throw e_8.error; }
+                }
+                try {
+                    // Filter def
+                    for (var _y = __values(filterDefs || []), _z = _y.next(); !_z.done; _z = _y.next()) {
+                        var item = _z.value;
+                        inlineFilterDef[item.sdMaterialFilterDef] = (_g = (_f = configuration === null || configuration === void 0 ? void 0 : configuration.inlineFilterDef) === null || _f === void 0 ? void 0 : _f[item.sdMaterialFilterDef]) !== null && _g !== void 0 ? _g : item === null || item === void 0 ? void 0 : item.defaultShowing;
+                    }
+                }
+                catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                finally {
+                    try {
+                        if (_z && !_z.done && (_t = _y.return)) _t.call(_y);
+                    }
+                    finally { if (e_9) throw e_9.error; }
+                }
+                return {
+                    // Filter column
+                    inlineColumn: inlineColumn,
+                    // Filter external
+                    inlineExternal: inlineExternal,
+                    // Filter def
+                    inlineFilterDef: inlineFilterDef,
+                };
+            });
+            _initValue.set(this, function (args, value) {
+                var e_10, _r, e_11, _s, e_12, _t;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+                var columnFilter = {};
+                var externalFilter = {};
+                var filterDef = {};
+                var columns = args.columns, externalFilters = args.externalFilters, filterDefs = args.filterDefs;
+                try {
+                    // Filter column
+                    for (var _u = __values(columns || []), _v = _u.next(); !_v.done; _v = _u.next()) {
+                        var item = _v.value;
+                        columnFilter[item.field] = (_b = (_a = value === null || value === void 0 ? void 0 : value.columnFilter) === null || _a === void 0 ? void 0 : _a[item.field]) !== null && _b !== void 0 ? _b : (_c = item === null || item === void 0 ? void 0 : item.filter) === null || _c === void 0 ? void 0 : _c.default;
+                    }
+                }
+                catch (e_10_1) { e_10 = { error: e_10_1 }; }
+                finally {
+                    try {
+                        if (_v && !_v.done && (_r = _u.return)) _r.call(_u);
+                    }
+                    finally { if (e_10) throw e_10.error; }
+                }
+                try {
+                    // Filter external
+                    for (var _w = __values(externalFilters || []), _x = _w.next(); !_x.done; _x = _w.next()) {
+                        var item = _x.value;
+                        if (item.type === "daterange") {
                             externalFilter[item.field] = {
-                                from: (_f = (_d = (_c = externalFilter[item.field]) === null || _c === void 0 ? void 0 : _c.from) !== null && _d !== void 0 ? _d : (_e = item.default) === null || _e === void 0 ? void 0 : _e.from) !== null && _f !== void 0 ? _f : undefined,
-                                to: (_k = (_h = (_g = externalFilter[item.field]) === null || _g === void 0 ? void 0 : _g.to) !== null && _h !== void 0 ? _h : (_j = item.default) === null || _j === void 0 ? void 0 : _j.to) !== null && _k !== void 0 ? _k : undefined
+                                from: (_f = (_e = (_d = value === null || value === void 0 ? void 0 : value.externalFilter) === null || _d === void 0 ? void 0 : _d[item.field]) === null || _e === void 0 ? void 0 : _e.from) !== null && _f !== void 0 ? _f : (_g = item.default) === null || _g === void 0 ? void 0 : _g.from,
+                                to: (_k = (_j = (_h = value === null || value === void 0 ? void 0 : value.externalFilter) === null || _h === void 0 ? void 0 : _h[item.field]) === null || _j === void 0 ? void 0 : _j.to) !== null && _k !== void 0 ? _k : (_l = item.default) === null || _l === void 0 ? void 0 : _l.to,
                             };
                         }
                         else {
-                            externalFilter[item.field] = (_l = externalFilter[item.field]) !== null && _l !== void 0 ? _l : item.default;
+                            externalFilter[item.field] = (_o = (_m = value === null || value === void 0 ? void 0 : value.externalFilter) === null || _m === void 0 ? void 0 : _m[item.field]) !== null && _o !== void 0 ? _o : item === null || item === void 0 ? void 0 : item.default;
                         }
                     }
                 }
-                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                catch (e_11_1) { e_11 = { error: e_11_1 }; }
                 finally {
                     try {
-                        if (_s && !_s.done && (_o = _r.return)) _o.call(_r);
+                        if (_x && !_x.done && (_s = _w.return)) _s.call(_w);
                     }
-                    finally { if (e_5) throw e_5.error; }
+                    finally { if (e_11) throw e_11.error; }
+                }
+                try {
+                    // Filter def
+                    for (var _y = __values(filterDefs || []), _z = _y.next(); !_z.done; _z = _y.next()) {
+                        var item = _z.value;
+                        filterDef[item.sdMaterialFilterDef] = (_q = (_p = value === null || value === void 0 ? void 0 : value.filterDef) === null || _p === void 0 ? void 0 : _p[item.sdMaterialFilterDef]) !== null && _q !== void 0 ? _q : undefined;
+                    }
+                }
+                catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                finally {
+                    try {
+                        if (_z && !_z.done && (_t = _y.return)) _t.call(_y);
+                    }
+                    finally { if (e_12) throw e_12.error; }
                 }
-                // Filter def
                 return {
+                    // Filter column
                     columnFilter: columnFilter,
+                    // Filter external
                     externalFilter: externalFilter,
+                    // Filter def
                     filterDef: filterDef,
                 };
             });
         }
         return SdGridFilterService;
     }());
-    _filterConfiguration = new WeakMap(), _filterValue = new WeakMap(), _cache$2 = new WeakMap(), _loadDefaultConfiguration = new WeakMap(), _loadDefaultValue = new WeakMap();
+    _filterConfiguration = new WeakMap(), _filterValue = new WeakMap(), _cache$2 = new WeakMap(), _defaultConfiguration = new WeakMap(), _defaultValue = new WeakMap(), _initConfiguration = new WeakMap(), _initValue = new WeakMap();
     SdGridFilterService.decorators = [
         { type: core.Injectable }
     ];
@@ -1852,7 +1982,7 @@
         { type: setting.SdSettingService }
     ]; };
 
-    var _optionChanges, _localItems, _paginator, _sort, _subscription$2, _reload, _loadCompleted, _initCellDef, _initFilterDef, _initFooterDef, _filterExportInfo, _initConfiguration, _loadFilterRegister, _filterLocal, _getFilter, _load$1, _render, _exportedItems, _allColumns, _allExportedColumns, _onExport, _updateSelectedItems;
+    var _optionChanges, _localItems, _paginator, _sort, _subscription$2, _reload, _loadCompleted, _initCellDef, _initFilterDef, _initFooterDef, _filterExportInfo, _initConfiguration$1, _loadFilterRegister, _filterLocal, _getFilter, _load$1, _render, _exportedItems, _allColumns, _allExportedColumns, _onExport, _updateSelectedItems;
     var SdGridMaterial = /** @class */ (function () {
         function SdGridMaterial(ref, configuration, gridConfigurationService, exportService, notifyService, columnValuesPipe, gridFilterService, editorHandlerColumnPipe) {
             var _this = this;
@@ -1930,9 +2060,6 @@
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
-                // if (this.filterDefs?.length) {
-                //   this.#loadFilterRegister();
-                // }
             });
             _initFooterDef.set(this, function () {
                 var e_3, _3;
@@ -1966,17 +2093,17 @@
                     orderDirection: ((_b = __classPrivateFieldGet(_this, _sort)) === null || _b === void 0 ? void 0 : _b.direction) || '',
                     pageNumber: pageNumber,
                     pageSize: pageSize,
-                    isExported: true
+                    isExported: true,
                 };
             });
-            _initConfiguration.set(this, function (option) {
+            _initConfiguration$1.set(this, function (option) {
                 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
                 // Init pagination
                 option.paginate = {
                     hidden: (_a = option === null || option === void 0 ? void 0 : option.paginate) === null || _a === void 0 ? void 0 : _a.hidden,
                     pageSize: (_f = (_c = (_b = option === null || option === void 0 ? void 0 : option.paginate) === null || _b === void 0 ? void 0 : _b.pageSize) !== null && _c !== void 0 ? _c : (_e = (_d = _this.configuration) === null || _d === void 0 ? void 0 : _d.paginate) === null || _e === void 0 ? void 0 : _e.pageSize) !== null && _f !== void 0 ? _f : (_g = DEFAULT_GRID_MATERIAL_CONFIG.paginate) === null || _g === void 0 ? void 0 : _g.pageSize,
                     pages: (_m = (_j = (_h = option === null || option === void 0 ? void 0 : option.paginate) === null || _h === void 0 ? void 0 : _h.pages) !== null && _j !== void 0 ? _j : (_l = (_k = _this.configuration) === null || _k === void 0 ? void 0 : _k.paginate) === null || _l === void 0 ? void 0 : _l.pages) !== null && _m !== void 0 ? _m : (_o = DEFAULT_GRID_MATERIAL_CONFIG.paginate) === null || _o === void 0 ? void 0 : _o.pages,
-                    showFirstLastButtons: (_q = (_p = option === null || option === void 0 ? void 0 : option.paginate) === null || _p === void 0 ? void 0 : _p.showFirstLastButtons) !== null && _q !== void 0 ? _q : false
+                    showFirstLastButtons: (_q = (_p = option === null || option === void 0 ? void 0 : option.paginate) === null || _p === void 0 ? void 0 : _p.showFirstLastButtons) !== null && _q !== void 0 ? _q : false,
                 };
                 return option;
             });
@@ -1988,16 +2115,24 @@
                     _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, {
                         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,
-                        filterDefs: _this.filterDefs
+                        filterDefs: _this.filterDefs,
                     });
                     if (!hasRegister) {
-                        __classPrivateFieldGet(_this, _subscription$2).add(_this.filterRegister.value.observer.pipe(operators.debounceTime(500), operators.map(function (filterValue) {
-                            _this.columnFilter = filterValue.columnFilter;
+                        __classPrivateFieldGet(_this, _subscription$2).add(_this.filterRegister.value.observer
+                            .pipe(operators.debounceTime(500), operators.map(function (filterValue) {
+                            var columnFilter = filterValue.columnFilter;
+                            _this.columnFilter = columnFilter;
                             __classPrivateFieldGet(_this, _paginator).pageIndex = 0;
                             __classPrivateFieldGet(_this, _reload).next({
                                 force: false,
                             });
-                        })).subscribe());
+                        }))
+                            .subscribe());
+                    }
+                    else {
+                        __classPrivateFieldGet(_this, _reload).next({
+                            force: true,
+                        });
                     }
                 }
             });
@@ -2122,10 +2257,9 @@
                 }
                 return {
                     items: items.filter(function (item, index) {
-                        return index >= pageNumber * pageSize
-                            && index < (pageNumber + 1) * pageSize;
+                        return index >= pageNumber * pageSize && index < (pageNumber + 1) * pageSize;
                     }),
-                    total: items.length
+                    total: items.length,
                 };
             });
             _getFilter.set(this, function () {
@@ -2138,7 +2272,7 @@
                     orderBy: ((_a = __classPrivateFieldGet(_this, _sort)) === null || _a === void 0 ? void 0 : _a.active) || '',
                     orderDirection: ((_b = __classPrivateFieldGet(_this, _sort)) === null || _b === void 0 ? void 0 : _b.direction) || '',
                     pageNumber: ((_c = __classPrivateFieldGet(_this, _paginator)) === null || _c === void 0 ? void 0 : _c.pageIndex) || 0,
-                    pageSize: ((_d = __classPrivateFieldGet(_this, _paginator)) === null || _d === void 0 ? void 0 : _d.pageSize) || ((_f = (_e = _this.gridOption) === null || _e === void 0 ? void 0 : _e.paginate) === null || _f === void 0 ? void 0 : _f.pageSize) || 50
+                    pageSize: ((_d = __classPrivateFieldGet(_this, _paginator)) === null || _d === void 0 ? void 0 : _d.pageSize) || ((_f = (_e = _this.gridOption) === null || _e === void 0 ? void 0 : _e.paginate) === null || _f === void 0 ? void 0 : _f.pageSize) || 50,
                 };
             });
             _load$1.set(this, function (filterReq, force) {
@@ -2162,7 +2296,7 @@
                                 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
+                                        total: (data === null || data === void 0 ? void 0 : data.total) || 0,
                                     }];
                             case 3:
                                 error_1 = _5.sent();
@@ -2170,7 +2304,7 @@
                                 this.notifyService.notify.warning('Có lỗi xảy ra');
                                 return [2 /*return*/, {
                                         items: [],
-                                        total: 0
+                                        total: 0,
                                     }];
                             case 4:
                                 this.isLoading = false;
@@ -2286,7 +2420,7 @@
                             case 3: return [2 /*return*/, _3.sent()];
                             case 4:
                                 exportedItems = [];
-                                if (!(typeof (this.gridOption.items) === 'function')) return [3 /*break*/, 8];
+                                if (!(typeof this.gridOption.items === 'function')) return [3 /*break*/, 8];
                                 results = this.gridOption.items();
                                 if (!(results instanceof Promise)) return [3 /*break*/, 6];
                                 return [4 /*yield*/, results];
@@ -2307,7 +2441,9 @@
             });
             _allColumns.set(this, function () {
                 var columns = [];
-                _this.gridOption.columns.filter(function (e) { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); }).forEach(function (column) {
+                _this.gridOption.columns
+                    .filter(function (e) { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); })
+                    .forEach(function (column) {
                     var _a, _b;
                     if (column.type === 'image') {
                         return;
@@ -2398,7 +2534,7 @@
                                             _5.label = 4;
                                         case 4:
                                             totalPage = total_1 / pageSize_1;
-                                            percent = Math.round((pageNumber_1 - 1) * 100.0 / totalPage);
+                                            percent = Math.round(((pageNumber_1 - 1) * 100.0) / totalPage);
                                             this.exportTitle = "Exporting..." + percent + "%";
                                             allColumns = __classPrivateFieldGet(this, _allColumns).call(this);
                                             allExportedColumns = __classPrivateFieldGet(this, _allExportedColumns).call(this);
@@ -2433,7 +2569,7 @@
                                                                             }
                                                                             if (!column.transform) return [3 /*break*/, 4];
                                                                             transform = column.transform(item[column.field], item, {
-                                                                                isExport: true
+                                                                                isExport: true,
                                                                             });
                                                                             if (!(transform instanceof Promise)) return [3 /*break*/, 2];
                                                                             _3 = obj;
@@ -2600,7 +2736,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: (_m = (_l = this.gridOption) === null || _l === void 0 ? void 0 : _l.export) === null || _m === void 0 ? void 0 : _m.fileName,
                                 })];
                         case 6:
                             _9.sent();
@@ -2621,7 +2757,7 @@
                             sheets.push({
                                 name: sheet.name,
                                 items: sheet.items,
-                                fields: sheet.fields
+                                fields: sheet.fields,
                             });
                             return [3 /*break*/, 12];
                         case 10:
@@ -2653,7 +2789,7 @@
                                 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,
-                                sheets: sheets
+                                sheets: sheets,
                             })];
                         case 17:
                             _9.sent();
@@ -2662,7 +2798,7 @@
                                 filePath: file.filePath,
                                 fileName: file.fileName,
                                 columns: columns_2,
-                                items: items_1
+                                items: items_1,
                             })];
                         case 19:
                             _9.sent();
@@ -2683,8 +2819,17 @@
                 });
             }); };
             this.onFilterChange = function () {
-                __classPrivateFieldGet(_this, _paginator).pageIndex = 0;
-                _this.reload(false);
+                var _a, _b;
+                // this.#paginator.pageIndex = 0;
+                // this.reload(false);
+                if ((_b = (_a = _this.gridOption) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.inlineColumn) {
+                    _this.filterRegister.value.set({
+                        columnFilter: _this.columnFilter,
+                    });
+                }
+                else {
+                    _this.filterRegister.value.set({});
+                }
             };
             this.onExpand = function (rowData) { return __awaiter(_this, void 0, void 0, function () {
                 var _w, _x, _y, _z, _0, data;
@@ -2701,14 +2846,16 @@
                     }
                     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; });
+                        this.items.forEach(function (item) { return (item.isExpanding = item.isExpanded = false); });
                     }
                     if (data instanceof Promise) {
                         rowData.isExpanding = true;
-                        data.then(function (res) {
+                        data
+                            .then(function (res) {
                             rowData.expandDetail = res;
                             rowData.isExpanded = true;
-                        }).finally(function () { return rowData.isExpanding = false; });
+                        })
+                            .finally(function () { return (rowData.isExpanding = false); });
                     }
                     else {
                         rowData.expandDetail = data;
@@ -2720,14 +2867,14 @@
             this.onSelect = function (rowData) {
                 var _a, _b, _c, _d, _e, _f, _g, _h;
                 if ((_b = (_a = rowData === null || rowData === void 0 ? void 0 : rowData.sdGroup) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.length) {
-                    (_c = rowData === null || rowData === void 0 ? void 0 : rowData.sdGroup) === null || _c === void 0 ? void 0 : _c.items.forEach(function (e) { return e.isSelected = rowData.isSelected; });
+                    (_c = rowData === null || rowData === void 0 ? void 0 : rowData.sdGroup) === null || _c === void 0 ? void 0 : _c.items.forEach(function (e) { return (e.isSelected = rowData.isSelected); });
                     (_e = (_d = _this.gridOption.selection) === null || _d === void 0 ? void 0 : _d.onSelect) === null || _e === void 0 ? void 0 : _e.call(_d, rowData, _this.items.filter(function (e) { return e.isSelected; }));
                     _this.isSelectAll = _this.items.every(function (e) { return e.isSelected; });
                     __classPrivateFieldGet(_this, _updateSelectedItems).call(_this);
                 }
                 else {
                     if ((_f = _this.gridOption.selection) === null || _f === void 0 ? void 0 : _f.single) {
-                        _this.items.filter(function (e) { return e !== rowData; }).forEach(function (e) { return e.isSelected = false; });
+                        _this.items.filter(function (e) { return e !== rowData; }).forEach(function (e) { return (e.isSelected = false); });
                         __classPrivateFieldGet(_this, _updateSelectedItems).call(_this);
                         return;
                     }
@@ -2750,11 +2897,12 @@
             this.onClearSelection = function (items) {
                 items = items || _this.items;
                 _this.isSelectAll = false;
-                items === null || items === void 0 ? void 0 : items.forEach(function (e) { return e.isSelected = false; });
+                items === null || items === void 0 ? void 0 : items.forEach(function (e) { return (e.isSelected = false); });
                 __classPrivateFieldGet(_this, _updateSelectedItems).call(_this);
             };
             _updateSelectedItems.set(this, function () {
-                _this.selectedItems = _this.items.filter(function (item) { return item.isSelected; })
+                _this.selectedItems = _this.items
+                    .filter(function (item) { return item.isSelected; })
                     .map(function (item) {
                     var isSelected = item.isSelected, isExpanded = item.isExpanded, isExpanding = item.isExpanding, expandDetail = item.expandDetail, editorErrorMessage = item.editorErrorMessage, editorHandlerColumn = item.editorHandlerColumn, editorHandlerRow = item.editorHandlerRow, editorStatus = item.editorStatus, originItem = item.originItem, sdId = item.sdId, sdVersion = item.sdVersion, 
                     // Giữ lại các trường thông tin cho selectable (action, groupedAction, sdGroup, selectable)
@@ -2771,12 +2919,8 @@
                 _this.filterRegister.value.set({
                     columnFilter: columnFilter,
                     externalFilter: externalFilter,
-                    filterDef: filterDef
+                    filterDef: filterDef,
                 });
-                // if (this.gridOption?.filter?.inlineColumn && args?.columnFilter) {
-                //   this.columnFilter = args.columnFilter;
-                // }
-                // this.gridFilter?.setFilter(args);
             };
             this.onCreate = function () {
                 var _a, _b;
@@ -2820,7 +2964,7 @@
                 }
                 item.editorStatus = 'create';
                 item.editorHandlerRow = {
-                    temporary: Object.assign({}, item)
+                    temporary: Object.assign({}, item),
                 };
             };
             this.onUpdate = function (item) {
@@ -3024,13 +3168,9 @@
         Object.defineProperty(SdGridMaterial.prototype, "option", {
             set: function (option) {
                 if (option) {
-                    option = __classPrivateFieldGet(this, _initConfiguration).call(this, option);
+                    option = __classPrivateFieldGet(this, _initConfiguration$1).call(this, option);
                     this.gridOption = option;
-                    // this.#loadFilterRegister();
                     __classPrivateFieldSet(this, _loadCompleted, false);
-                    // this.#reload.next({
-                    //   force: true,
-                    // });
                     var configuration = this.gridConfigurationService.init(this.key, this.gridOption);
                     this.gridConfigurationObserver = configuration.observer;
                     configuration.load();
@@ -3045,11 +3185,13 @@
                 var _this = this;
                 if (paginator && __classPrivateFieldGet(this, _paginator) !== paginator) {
                     __classPrivateFieldSet(this, _paginator, paginator);
-                    __classPrivateFieldGet(this, _subscription$2).add(paginator.page.pipe(operators.map(function () {
+                    __classPrivateFieldGet(this, _subscription$2).add(paginator.page
+                        .pipe(operators.map(function () {
                         __classPrivateFieldGet(_this, _reload).next({
-                            force: false
+                            force: false,
                         });
-                    })).subscribe());
+                    }))
+                        .subscribe());
                 }
             },
             enumerable: false,
@@ -3060,11 +3202,13 @@
                 var _this = this;
                 if (sort && __classPrivateFieldGet(this, _sort) !== sort) {
                     __classPrivateFieldSet(this, _sort, sort);
-                    __classPrivateFieldGet(this, _subscription$2).add(sort.sortChange.pipe(operators.map(function () {
+                    __classPrivateFieldGet(this, _subscription$2).add(sort.sortChange
+                        .pipe(operators.map(function () {
                         __classPrivateFieldGet(_this, _reload).next({
-                            force: false
+                            force: false,
                         });
-                    })).subscribe());
+                    }))
+                        .subscribe());
                 }
             },
             enumerable: false,
@@ -3088,14 +3232,15 @@
                             return [2 /*return*/, result];
                     }
                 });
-            }); })).subscribe(__classPrivateFieldGet(this, _render)));
+            }); }))
+                .subscribe(__classPrivateFieldGet(this, _render)));
             __classPrivateFieldGet(this, _subscription$2).add(this.sdCellDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initCellDef)));
             __classPrivateFieldGet(this, _subscription$2).add(this.sdFooterDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initFooterDef)));
             __classPrivateFieldGet(this, _subscription$2).add(this.sdFilterDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initFilterDef)));
             __classPrivateFieldGet(this, _subscription$2).add(rxjs.combineLatest([
                 __classPrivateFieldGet(this, _optionChanges).pipe(operators.startWith(this.gridOption)),
-                this.sdFilterDefs.changes.pipe(operators.startWith(this.filterDefs))
-            ]).subscribe(function (a) {
+                this.sdFilterDefs.changes.pipe(operators.startWith(this.filterDefs)),
+            ]).subscribe(function () {
                 __classPrivateFieldGet(_this, _loadFilterRegister).call(_this);
             }));
             this.ref.detectChanges();
@@ -3108,7 +3253,8 @@
         };
         Object.defineProperty(SdGridMaterial.prototype, "editedItems", {
             get: function () {
-                return this.items.filter(function (item) {
+                return this.items
+                    .filter(function (item) {
                     if (!item.originItem) {
                         return true;
                     }
@@ -3116,7 +3262,8 @@
                         return true;
                     }
                     return false;
-                }).map(function (item) {
+                })
+                    .map(function (item) {
                     var editorStatus = item.editorStatus, editorHandlerRow = item.editorHandlerRow, editorHandlerColumn = item.editorHandlerColumn, editorErrorMessage = item.editorErrorMessage, expandDetail = item.expandDetail, isExpanded = item.isExpanded, isExpanding = item.isExpanding, isSelected = item.isSelected, originItem = item.originItem, sdId = item.sdId, sdVersion = item.sdVersion, selectable = item.selectable, actions = item.actions, groupedActions = item.groupedActions, sdGroup = item.sdGroup, temporary = item.temporary, result = __rest(item, ["editorStatus", "editorHandlerRow", "editorHandlerColumn", "editorErrorMessage", "expandDetail", "isExpanded", "isExpanding", "isSelected", "originItem", "sdId", "sdVersion", "selectable", "actions", "groupedActions", "sdGroup", "temporary"]);
                     return Object.assign(Object.assign({}, result), { editorErrorMessage: editorErrorMessage });
                 });
@@ -3160,7 +3307,7 @@
         });
         return SdGridMaterial;
     }());
-    _optionChanges = new WeakMap(), _localItems = new WeakMap(), _paginator = new WeakMap(), _sort = new WeakMap(), _subscription$2 = new WeakMap(), _reload = new WeakMap(), _loadCompleted = new WeakMap(), _initCellDef = new WeakMap(), _initFilterDef = new WeakMap(), _initFooterDef = new WeakMap(), _filterExportInfo = new WeakMap(), _initConfiguration = new WeakMap(), _loadFilterRegister = new WeakMap(), _filterLocal = new WeakMap(), _getFilter = new WeakMap(), _load$1 = new WeakMap(), _render = new WeakMap(), _exportedItems = new WeakMap(), _allColumns = new WeakMap(), _allExportedColumns = new WeakMap(), _onExport = new WeakMap(), _updateSelectedItems = new WeakMap();
+    _optionChanges = new WeakMap(), _localItems = new WeakMap(), _paginator = new WeakMap(), _sort = new WeakMap(), _subscription$2 = new WeakMap(), _reload = new WeakMap(), _loadCompleted = new WeakMap(), _initCellDef = new WeakMap(), _initFilterDef = new WeakMap(), _initFooterDef = new WeakMap(), _filterExportInfo = new WeakMap(), _initConfiguration$1 = new WeakMap(), _loadFilterRegister = new WeakMap(), _filterLocal = new WeakMap(), _getFilter = new WeakMap(), _load$1 = new WeakMap(), _render = new WeakMap(), _exportedItems = new WeakMap(), _allColumns = new WeakMap(), _allExportedColumns = new WeakMap(), _onExport = new WeakMap(), _updateSelectedItems = new WeakMap();
     SdGridMaterial.decorators = [
         { type: core.Component, args: [{
                     selector: 'sd-grid-material',