@sd-angular/core 1.3.104 → 1.3.106

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

@@ -5,10 +5,11 @@ import { MatPaginator, MatPaginatorIntl, MatPaginatorModule } from '@angular/mat
 import { MatSort, MatSortModule } from '@angular/material/sort';
 import { trigger, state, style, transition, animate } from '@angular/animations';
 import { v4 } from 'uuid';
-import { Subscription, BehaviorSubject, Subject, isObservable, combineLatest } from 'rxjs';
+import { BehaviorSubject, Subscription, Subject, isObservable, combineLatest } from 'rxjs';
 import { SdNotifyService } from '@sd-angular/core/notify';
 import { moveItemInArray, DragDropModule } from '@angular/cdk/drag-drop';
-import { map, debounceTime, switchMap, startWith } from 'rxjs/operators';
+import { startWith, map, debounceTime, switchMap } from 'rxjs/operators';
+import { SdModal } from '@sd-angular/core/modal';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { SdLoadingService } from '@sd-angular/core/loading';
 import { SdTranslateService } from '@sd-angular/core/translate';
@@ -132,7 +133,7 @@ const DEFAULT_GRID_MATERIAL_CONFIG = {
 };
 const GRID_MATERIAL_CONFIG = new InjectionToken('sd-grid-material.configuration');
 
-var _filterRegister, _subscription;
+var _filterRegister;
 class SdPopupFilter {
     constructor(cdRef) {
         this.cdRef = cdRef;
@@ -146,8 +147,15 @@ class SdPopupFilter {
         this.filterDefs = [];
         this.filterDef = {};
         this.inlineFilterDef = {};
-        _subscription.set(this, new Subscription());
         this.open = () => {
+            const configuration = __classPrivateFieldGet(this, _filterRegister).configuration.get();
+            this.inlineColumn = JSON.parse(JSON.stringify(configuration.inlineColumn));
+            this.inlineExternal = JSON.parse(JSON.stringify(configuration.inlineExternal));
+            this.inlineFilterDef = JSON.parse(JSON.stringify(configuration.inlineFilterDef));
+            const filterValue = __classPrivateFieldGet(this, _filterRegister).value.get();
+            this.columnFilter = JSON.parse(JSON.stringify(filterValue.columnFilter));
+            this.externalFilter = JSON.parse(JSON.stringify(filterValue.externalFilter));
+            this.filterDef = JSON.parse(JSON.stringify(filterValue.filterDef));
             this.modal.open();
             this.cdRef.markForCheck();
         };
@@ -164,7 +172,7 @@ class SdPopupFilter {
             __classPrivateFieldGet(this, _filterRegister).value.set({
                 columnFilter: this.columnFilter,
                 externalFilter: this.externalFilter,
-                filterDef: this.filterDef
+                filterDef: this.filterDef,
             });
             this.modal.close();
             this.cdRef.markForCheck();
@@ -173,35 +181,19 @@ class SdPopupFilter {
     set filterRegister(value) {
         __classPrivateFieldSet(this, _filterRegister, value);
     }
-    ;
-    ngAfterViewInit() {
-        __classPrivateFieldGet(this, _subscription).add(__classPrivateFieldGet(this, _filterRegister).configuration.observer.subscribe(configuration => {
-            this.inlineColumn = JSON.parse(JSON.stringify(configuration.inlineColumn));
-            this.inlineExternal = JSON.parse(JSON.stringify(configuration.inlineExternal));
-            this.inlineFilterDef = JSON.parse(JSON.stringify(configuration.inlineFilterDef));
-            this.cdRef.markForCheck();
-        }));
-        __classPrivateFieldGet(this, _subscription).add(__classPrivateFieldGet(this, _filterRegister).value.observer.subscribe(filterValue => {
-            this.columnFilter = JSON.parse(JSON.stringify(filterValue.columnFilter));
-            this.externalFilter = JSON.parse(JSON.stringify(filterValue.externalFilter));
-            this.filterDef = JSON.parse(JSON.stringify(filterValue.filterDef));
-            this.cdRef.markForCheck();
-        }));
-    }
-    ngOnDestroy() {
-        __classPrivateFieldGet(this, _subscription).unsubscribe();
-    }
+    ngAfterViewInit() { }
+    ngOnDestroy() { }
     onClear() {
         __classPrivateFieldGet(this, _filterRegister).value.remove();
         this.modal.close();
         this.cdRef.markForCheck();
     }
 }
-_filterRegister = new WeakMap(), _subscription = new WeakMap();
+_filterRegister = new WeakMap();
 SdPopupFilter.decorators = [
     { type: Component, args: [{
                 selector: 'sd-popup-filter',
-                template: "<sd-modal width=\"500px\" [title]=\"'Filter' | sdTranslate\" #modal>\r\n  <sd-modal-body class=\"c-popup-filter\">\r\n    <ng-container *ngFor=\"let column of columns | sdFilterColumn\">\r\n      <div class=\"d-flex align-items-baseline\">\r\n        <ng-container>\r\n          <div *sdDesktop class=\"c-checkable\">\r\n            <mat-slide-toggle [(ngModel)]=\"inlineColumn[column.field]\" color=\"primary\"></mat-slide-toggle>\r\n          </div>\r\n        </ng-container>\r\n        <div class=\"c-filterable\">\r\n          <sd-input *ngIf=\"column.type === 'string'\" [label]=\"column.title\" type=\"text\"\r\n            [(model)]=\"columnFilter[column.field]\" appearance=\"outline\">\r\n          </sd-input>\r\n          <sd-input *ngIf=\"column.type === 'number'\" [label]=\"column.title\" type=\" number\"\r\n            [(model)]=\"columnFilter[column.field]\" appearance=\"outline\">\r\n          </sd-input>\r\n          <sd-select *ngIf=\"column.type === 'bool'\" [label]=\"column.title\" [items]=\"[{value:'1',display:column.trueValue || 'True' },\r\n              {value:'0',display:column.falseValue || 'False' }]\" valueField=\"value\" displayField=\"display\"\r\n            [(model)]=\"columnFilter[column.field]\" appearance=\"outline\">\r\n          </sd-select>\r\n          <sd-select *ngIf=\"column.type === 'values' && !column?.editor?.autocomplete\" [label]=\"column.title\"\r\n            [items]=\"column.option.items\" [valueField]=\"column.option.valueField\"\r\n            [displayField]=\"column.option.displayField\" [(model)]=\"columnFilter[column.field]\" appearance=\"outline\">\r\n          </sd-select>\r\n          <sd-autocomplete *ngIf=\"column.type === 'values' && column?.editor?.autocomplete\" [label]=\"column.title\"\r\n            [items]=\"column.option.items\" [valueField]=\"column.option.valueField\"\r\n            [displayField]=\"column.option.displayField\" [(model)]=\"columnFilter[column.field]\" appearance=\"outline\">\r\n          </sd-autocomplete>\r\n          <sd-date-time *ngIf=\"column.type ==='date' || column.type==='datetime' ||\r\n              column.type==='time'\" [label]=\"column.title\" [(model)]=\" columnFilter[column.field]\" type=\"date\"\r\n            appearance=\"outline\">\r\n          </sd-date-time>\r\n        </div>\r\n      </div>\r\n    </ng-container>\r\n    <ng-container *ngFor=\"let item of externalFilters | sdFilterExternal\">\r\n      <div class=\"d-flex align-items-baseline\">\r\n        <ng-container>\r\n          <div *sdDesktop class=\"c-checkable\">\r\n            <mat-slide-toggle [(ngModel)]=\"inlineExternal[item.field]\" color=\"primary\"></mat-slide-toggle>\r\n          </div>\r\n        </ng-container>\r\n        <div class=\"c-filterable\">\r\n          <sd-input [label]=\"item.title\" *ngIf=\"item.type === 'string'\" type=\"text\"\r\n            [(model)]=\"externalFilter[item.field]\" appearance=\"outline\">\r\n          </sd-input>\r\n          <sd-input-number [label]=\"item.title\" *ngIf=\"item.type === 'number'\" [(model)]=\"externalFilter[item.field]\"\r\n            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]\" appearance=\"outline\">\r\n          </sd-select>\r\n          <ng-container *ngIf=\"item.type === 'values'\">\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]\" 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\"\r\n              [displayField]=\"item.option.displayField\" appearance=\"outline\" [(model)]=\"externalFilter[item.field]\">\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\"\r\n              [displayField]=\"item.option.displayField\" appearance=\"outline\" [(model)]=\"externalFilter[item.field]\"\r\n              filtered=\"true\" multiple>\r\n            </sd-select>\r\n            <sd-select *ngIf=\"!item.option?.selection\" [label]=\"item.title\" [items]=\"item.values\"\r\n              [items]=\"item.option.items\" [valueField]=\"item.option.valueField\"\r\n              [displayField]=\"item.option.displayField\" appearance=\"outline\" [(model)]=\"externalFilter[item.field]\">\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\" 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\" appearance=\"outline\">\r\n          </sd-date-range>\r\n        </div>\r\n      </div>\r\n    </ng-container>\r\n    <ng-container *ngFor=\"let filter of filterDefs\">\r\n      <div class=\"d-flex align-items-baseline\">\r\n        <ng-container>\r\n          <div *sdDesktop class=\"c-checkable\">\r\n            <mat-slide-toggle [(ngModel)]=\"inlineFilterDef[filter.sdMaterialFilterDef]\" color=\"primary\">\r\n            </mat-slide-toggle>\r\n          </div>\r\n        </ng-container>\r\n        <div class=\"c-filterable\">\r\n          <ng-container *ngTemplateOutlet=\"filter.templateRef;context:{filterDef:filterDef}\">\r\n          </ng-container>\r\n        </div>\r\n      </div>\r\n    </ng-container>\r\n  </sd-modal-body>\r\n  <sd-modal-footer *sdDesktop>\r\n    <sd-button class=\"mr-auto\" (action)=\"onClear()\" icon=\"clear\" [title]=\"'Clear filter' | sdTranslate\" size=\"sm\">\r\n    </sd-button>\r\n    <sd-button (action)=\"onApply()\" icon=\"done\" [title]=\"'Apply' | sdTranslate\" color=\"primary\" size=\"sm\"></sd-button>\r\n  </sd-modal-footer>\r\n  <sd-modal-footer *sdMobileTablet>\r\n    <sd-button style=\"flex: 1; padding-right: 5px;\" (action)=\"onClear()\" icon=\"clear\"\r\n      [title]=\"'Clear filter' | sdTranslate\" width=\"100%\" size=\"sm\"></sd-button>\r\n    <sd-button style=\"flex: 1; padding-left: 5px;\" (action)=\"onApply()\" icon=\"done\" [title]=\"'Apply' | sdTranslate\"\r\n      color=\"primary\" width=\"100%\" size=\"sm\"></sd-button>\r\n  </sd-modal-footer>\r\n</sd-modal>",
+                template: "<sd-modal width=\"500px\" [title]=\"'Filter' | sdTranslate\">\r\n  <sd-modal-body class=\"c-popup-filter\">\r\n    <ng-container *ngFor=\"let column of columns | sdFilterColumn\">\r\n      <div class=\"d-flex align-items-baseline\">\r\n        <ng-container>\r\n          <div *sdDesktop class=\"c-checkable\">\r\n            <mat-slide-toggle [(ngModel)]=\"inlineColumn[column.field]\" color=\"primary\"></mat-slide-toggle>\r\n          </div>\r\n        </ng-container>\r\n        <div class=\"c-filterable\">\r\n          <sd-input\r\n            *ngIf=\"column.type === 'string'\"\r\n            [label]=\"column.title\"\r\n            type=\"text\"\r\n            [(model)]=\"columnFilter[column.field]\"\r\n            appearance=\"outline\">\r\n          </sd-input>\r\n          <sd-input\r\n            *ngIf=\"column.type === 'number'\"\r\n            [label]=\"column.title\"\r\n            type=\" number\"\r\n            [(model)]=\"columnFilter[column.field]\"\r\n            appearance=\"outline\">\r\n          </sd-input>\r\n          <sd-select\r\n            *ngIf=\"column.type === 'bool'\"\r\n            [label]=\"column.title\"\r\n            [items]=\"[\r\n              { value: '1', display: column.trueValue || 'True' },\r\n              { value: '0', display: column.falseValue || 'False' }\r\n            ]\"\r\n            valueField=\"value\"\r\n            displayField=\"display\"\r\n            [(model)]=\"columnFilter[column.field]\"\r\n            appearance=\"outline\">\r\n          </sd-select>\r\n          <sd-select\r\n            *ngIf=\"column.type === 'values' && !column?.editor?.autocomplete\"\r\n            [label]=\"column.title\"\r\n            [items]=\"column.option.items\"\r\n            [valueField]=\"column.option.valueField\"\r\n            [displayField]=\"column.option.displayField\"\r\n            [(model)]=\"columnFilter[column.field]\"\r\n            appearance=\"outline\">\r\n          </sd-select>\r\n          <sd-autocomplete\r\n            *ngIf=\"column.type === 'values' && column?.editor?.autocomplete\"\r\n            [label]=\"column.title\"\r\n            [items]=\"column.option.items\"\r\n            [valueField]=\"column.option.valueField\"\r\n            [displayField]=\"column.option.displayField\"\r\n            [(model)]=\"columnFilter[column.field]\"\r\n            appearance=\"outline\">\r\n          </sd-autocomplete>\r\n          <sd-date-time\r\n            *ngIf=\"column.type === 'date' || column.type === 'datetime' || column.type === 'time'\"\r\n            [label]=\"column.title\"\r\n            [(model)]=\"columnFilter[column.field]\"\r\n            type=\"date\"\r\n            appearance=\"outline\">\r\n          </sd-date-time>\r\n        </div>\r\n      </div>\r\n    </ng-container>\r\n    <ng-container *ngFor=\"let item of externalFilters | sdFilterExternal\">\r\n      <div class=\"d-flex align-items-baseline\">\r\n        <ng-container>\r\n          <div *sdDesktop class=\"c-checkable\">\r\n            <mat-slide-toggle [(ngModel)]=\"inlineExternal[item.field]\" color=\"primary\"></mat-slide-toggle>\r\n          </div>\r\n        </ng-container>\r\n        <div class=\"c-filterable\">\r\n          <sd-input\r\n            [label]=\"item.title\"\r\n            *ngIf=\"item.type === 'string'\"\r\n            type=\"text\"\r\n            [(model)]=\"externalFilter[item.field]\"\r\n            appearance=\"outline\">\r\n          </sd-input>\r\n          <sd-input-number [label]=\"item.title\" *ngIf=\"item.type === 'number'\" [(model)]=\"externalFilter[item.field]\" appearance=\"outline\">\r\n          </sd-input-number>\r\n          <sd-select\r\n            [label]=\"item.title\"\r\n            *ngIf=\"item.type === 'bool'\"\r\n            [items]=\"[\r\n              { value: '1', display: item.option?.displayOnTrue || 'True' },\r\n              { value: '0', display: item.option?.displayOnFalse || 'False' }\r\n            ]\"\r\n            valueField=\"value\"\r\n            displayField=\"display\"\r\n            [(model)]=\"externalFilter[item.field]\"\r\n            appearance=\"outline\">\r\n          </sd-select>\r\n          <ng-container *ngIf=\"item.type === 'values'\">\r\n            <sd-select\r\n              *ngIf=\"item.option?.selection === 'MULTIPLE'\"\r\n              [label]=\"item.title\"\r\n              [items]=\"item.option.items\"\r\n              [valueField]=\"item.option.valueField\"\r\n              [displayField]=\"item.option.displayField\"\r\n              [(model)]=\"externalFilter[item.field]\"\r\n              appearance=\"outline\"\r\n              multiple>\r\n            </sd-select>\r\n            <sd-autocomplete\r\n              *ngIf=\"item.option?.selection === 'AUTOCOMPLETE'\"\r\n              [label]=\"item.title\"\r\n              [items]=\"item.option.items\"\r\n              [valueField]=\"item.option.valueField\"\r\n              [displayField]=\"item.option.displayField\"\r\n              appearance=\"outline\"\r\n              [(model)]=\"externalFilter[item.field]\">\r\n            </sd-autocomplete>\r\n            <sd-select\r\n              *ngIf=\"item.option?.selection === 'MULTIPLEAUTOCOMPLETE'\"\r\n              [label]=\"item.title\"\r\n              [items]=\"item.option.items\"\r\n              [valueField]=\"item.option.valueField\"\r\n              [displayField]=\"item.option.displayField\"\r\n              appearance=\"outline\"\r\n              [(model)]=\"externalFilter[item.field]\"\r\n              filtered=\"true\"\r\n              multiple>\r\n            </sd-select>\r\n            <sd-select\r\n              *ngIf=\"!item.option?.selection\"\r\n              [label]=\"item.title\"\r\n              [items]=\"item.values\"\r\n              [items]=\"item.option.items\"\r\n              [valueField]=\"item.option.valueField\"\r\n              [displayField]=\"item.option.displayField\"\r\n              appearance=\"outline\"\r\n              [(model)]=\"externalFilter[item.field]\">\r\n            </sd-select>\r\n          </ng-container>\r\n          <sd-date-time\r\n            [label]=\"item.title\"\r\n            *ngIf=\"item.type === 'date' || item.type === 'datetime'\"\r\n            [(model)]=\"externalFilter[item.field]\"\r\n            [type]=\"item.type\"\r\n            appearance=\"outline\">\r\n          </sd-date-time>\r\n          <sd-date-range\r\n            [label]=\"item.title\"\r\n            *ngIf=\"item.type === 'daterange' && externalFilter[item.field]\"\r\n            [(from)]=\"externalFilter[item.field].from\"\r\n            [(to)]=\"externalFilter[item.field].to\"\r\n            [min]=\"item.minDate\"\r\n            [max]=\"item.maxDate\"\r\n            appearance=\"outline\">\r\n          </sd-date-range>\r\n        </div>\r\n      </div>\r\n    </ng-container>\r\n    <ng-container *ngFor=\"let filter of filterDefs\">\r\n      <div class=\"d-flex align-items-baseline\">\r\n        <ng-container>\r\n          <div *sdDesktop class=\"c-checkable\">\r\n            <mat-slide-toggle [(ngModel)]=\"inlineFilterDef[filter.sdMaterialFilterDef]\" color=\"primary\"> </mat-slide-toggle>\r\n          </div>\r\n        </ng-container>\r\n        <div class=\"c-filterable\">\r\n          <ng-container *ngTemplateOutlet=\"filter.templateRef; context: { filterDef: filterDef }\"> </ng-container>\r\n        </div>\r\n      </div>\r\n    </ng-container>\r\n  </sd-modal-body>\r\n  <sd-modal-footer *sdDesktop>\r\n    <sd-button class=\"mr-auto\" (action)=\"onClear()\" title=\"M\u1EB7c \u0111\u1ECBnh\" size=\"sm\" type=\"link\"> </sd-button>\r\n    <sd-button (action)=\"onApply()\" title=\"\u0110\u1ED3ng \u00FD\" color=\"primary\" size=\"sm\" type=\"fill\"></sd-button>\r\n  </sd-modal-footer>\r\n  <sd-modal-footer *sdMobileTablet>\r\n    <sd-button style=\"flex: 1; padding-right: 5px\" (action)=\"onClear()\" title=\"M\u1EB7c \u0111\u1ECBnh\" width=\"100%\" size=\"sm\" type=\"link\"></sd-button>\r\n    <sd-button\r\n      style=\"flex: 1; padding-left: 5px\"\r\n      (action)=\"onApply()\"\r\n      title=\"\u0110\u1ED3ng \u00FD\"\r\n      color=\"primary\"\r\n      width=\"100%\"\r\n      size=\"sm\"\r\n      type=\"fill\"></sd-button>\r\n  </sd-modal-footer>\r\n</sd-modal>\r\n",
                 changeDetection: ChangeDetectionStrategy.OnPush,
                 styles: [".c-checkable{width:50px}.c-filterable{flex:1}::ng-deep sd-modal-body.c-popup-filter .mat-form-field-wrapper{padding-bottom:0}"]
             },] }
@@ -210,14 +202,14 @@ SdPopupFilter.ctorParameters = () => [
     { type: ChangeDetectorRef }
 ];
 SdPopupFilter.propDecorators = {
-    modal: [{ type: ViewChild, args: ['modal',] }],
+    modal: [{ type: ViewChild, args: [SdModal,] }],
     filterRegister: [{ type: Input }],
     externalFilters: [{ type: Input }],
     columns: [{ type: Input }],
     filterDefs: [{ type: Input }]
 };
 
-var _subscription$1;
+var _subscription;
 class SdGridFilter {
     constructor(ref, deviceService) {
         this.ref = ref;
@@ -232,12 +224,12 @@ class SdGridFilter {
         this.inlineColumn = {};
         this.externalFilter = {};
         this.inlineExternal = {};
-        _subscription$1.set(this, new Subscription());
+        _subscription.set(this, new Subscription());
         this.onFilter = (item) => {
             this.filterRegister.value.set({
                 columnFilter: this.columnFilter,
                 externalFilter: this.externalFilter,
-                filterDef: this.filterDef
+                filterDef: this.filterDef,
             });
         };
         this.open = () => {
@@ -256,26 +248,31 @@ class SdGridFilter {
         this.filterRegister = value;
         this.filterRegisterChange.next(this.filterRegister);
     }
-    ;
     ngAfterViewInit() {
-        __classPrivateFieldGet(this, _subscription$1).add(this.filterRegister.configuration.observer.subscribe(configuration => {
-            this.inlineColumn = configuration.inlineColumn;
-            this.inlineExternal = configuration.inlineExternal;
-            this.inlineFilterDef = configuration.inlineFilterDef;
-            this.ref.markForCheck();
-        }));
-        __classPrivateFieldGet(this, _subscription$1).add(this.filterRegister.value.observer.subscribe(value => {
-            this.columnFilter = value.columnFilter;
-            this.externalFilter = value.externalFilter;
-            this.filterDef = value.filterDef;
-            this.ref.markForCheck();
+        __classPrivateFieldGet(this, _subscription).add(this.filterRegisterChange.pipe(startWith(this.filterRegister)).subscribe(filterRegister => {
+            if (this.filterRegister) {
+                __classPrivateFieldGet(this, _subscription).add(this.filterRegister.configuration.observer.subscribe(configuration => {
+                    const { inlineColumn, inlineExternal, inlineFilterDef } = configuration;
+                    this.inlineColumn = inlineColumn;
+                    this.inlineExternal = inlineExternal;
+                    this.inlineFilterDef = inlineFilterDef;
+                    this.ref.markForCheck();
+                }));
+                __classPrivateFieldGet(this, _subscription).add(this.filterRegister.value.observer.subscribe(value => {
+                    const { columnFilter, externalFilter, filterDef } = value;
+                    this.columnFilter = columnFilter;
+                    this.externalFilter = externalFilter;
+                    this.filterDef = filterDef;
+                    this.ref.markForCheck();
+                }));
+            }
         }));
     }
     ngOnDestroy() {
-        __classPrivateFieldGet(this, _subscription$1).unsubscribe();
+        __classPrivateFieldGet(this, _subscription).unsubscribe();
     }
 }
-_subscription$1 = new WeakMap();
+_subscription = new WeakMap();
 SdGridFilter.decorators = [
     { type: Component, args: [{
                 selector: 'sd-grid-filter',
@@ -1128,12 +1125,12 @@ SdEditorHandlerColumnPipe.ctorParameters = () => [
     { type: NgZone }
 ];
 
-var _filterConfiguration, _filterValue, _cache$2, _loadDefaultConfiguration, _loadDefaultValue;
+var _filterConfiguration, _filterValue, _cache$2, _defaultConfiguration, _defaultValue, _initConfiguration, _initValue;
 class SdGridFilterService {
     constructor(settingService) {
         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 = (key, args) => {
             let cacheSession = false;
@@ -1146,150 +1143,66 @@ class SdGridFilterService {
                 cacheSession = true; // Nếu không có key thì chỉ lưu theo session
             }
             if (!__classPrivateFieldGet(this, _cache$2)[key]) {
-                const t1 = this.settingService.create({
-                    prefix: __classPrivateFieldGet(this, _filterConfiguration),
-                    key,
-                }, {
-                    type: cacheSession ? "session" : undefined,
-                });
-                const defaultConfiguration = __classPrivateFieldGet(this, _loadDefaultConfiguration).call(this, args, t1.get());
-                const t2 = this.settingService.create({
-                    prefix: __classPrivateFieldGet(this, _filterValue),
-                    key,
-                }, {
-                    type: cacheSession ? "session" : undefined,
-                });
-                const defaultValue = __classPrivateFieldGet(this, _loadDefaultValue).call(this, args, t2.get());
+                // Setting của filter configuration
                 const filterConfiguration = this.settingService.create({
                     prefix: __classPrivateFieldGet(this, _filterConfiguration),
                     key,
                 }, {
-                    default: defaultConfiguration,
-                    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.set(__classPrivateFieldGet(this, _initConfiguration).call(this, args, filterConfiguration.get()));
+                // Setting của filter value
                 const filterValue = this.settingService.create({
                     prefix: __classPrivateFieldGet(this, _filterValue),
                     key,
                 }, {
-                    default: defaultValue,
-                    type: cacheSession ? "session" : undefined,
+                    default: __classPrivateFieldGet(this, _defaultValue).call(this, args),
+                    type: cacheSession ? 'session' : undefined,
                 });
-                const configurationGet = (configuration) => {
-                    var _a, _b, _c;
-                    const { columns, externalFilters, filterDefs } = args;
-                    const inlineColumn = {};
-                    const inlineExternal = {};
-                    const inlineFilterDef = {};
-                    // Filter column
-                    for (const item of columns || []) {
-                        inlineColumn[item.field] = (_a = configuration === null || configuration === void 0 ? void 0 : configuration.inlineColumn) === null || _a === void 0 ? void 0 : _a[item.field];
-                    }
-                    // Filter external
-                    for (const item of externalFilters || []) {
-                        inlineExternal[item.field] = (_b = configuration === null || configuration === void 0 ? void 0 : configuration.inlineExternal) === null || _b === void 0 ? void 0 : _b[item.field];
-                    }
-                    // Filter def
-                    for (const item of filterDefs || []) {
-                        inlineFilterDef[item.sdMaterialFilterDef] = (_c = configuration === null || configuration === void 0 ? void 0 : configuration.inlineFilterDef) === null || _c === void 0 ? void 0 : _c[item.sdMaterialFilterDef];
-                    }
-                    return {
-                        // Filter column
-                        inlineColumn,
-                        // Filter external
-                        inlineExternal,
-                        // Filter def
-                        inlineFilterDef,
-                    };
-                };
-                const valueGet = (value) => {
-                    var _a, _b, _c, _d, _e, _f, _g;
-                    const columnFilter = {};
-                    const externalFilter = {};
-                    const filterDef = {};
-                    const { columns, externalFilters, filterDefs } = args;
-                    // Filter column
-                    for (const item of columns || []) {
-                        columnFilter[item.field] = (_a = value === null || value === void 0 ? void 0 : value.columnFilter) === null || _a === void 0 ? void 0 : _a[item.field];
-                    }
-                    // Filter external
-                    for (const item of externalFilters || []) {
-                        if (item.type === "daterange") {
-                            externalFilter[item.field] = {
-                                from: (_c = (_b = value === null || value === void 0 ? void 0 : value.externalFilter) === null || _b === void 0 ? void 0 : _b[item.field]) === null || _c === void 0 ? void 0 : _c.from,
-                                to: (_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.to,
-                            };
-                        }
-                        else {
-                            externalFilter[item.field] = (_f = value === null || value === void 0 ? void 0 : value.externalFilter) === null || _f === void 0 ? void 0 : _f[item.field];
-                        }
-                    }
-                    // Filter def
-                    for (const item of filterDefs || []) {
-                        filterDef[item.sdMaterialFilterDef] = (_g = value === null || value === void 0 ? void 0 : value.filterDef) === null || _g === void 0 ? void 0 : _g[item.sdMaterialFilterDef];
-                    }
-                    return {
-                        // Filter column
-                        columnFilter,
-                        // Filter external
-                        externalFilter,
-                        // Filter def
-                        filterDef,
-                    };
-                };
+                // 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()));
                 __classPrivateFieldGet(this, _cache$2)[key] = {
                     configuration: {
                         get: () => {
-                            const configuration = filterConfiguration.get();
-                            return configurationGet(configuration);
+                            return filterConfiguration.get();
                         },
                         set: (configuration) => {
-                            const keys = Object.keys(configuration || {});
-                            const current = filterConfiguration.get();
-                            const { inlineColumn, inlineExternal, inlineFilterDef } = current;
-                            const 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,
+                            const { inlineColumn, inlineExternal, inlineFilterDef } = configuration;
+                            filterConfiguration.set({
+                                inlineColumn,
+                                inlineExternal,
+                                inlineFilterDef,
+                            });
+                            return {
+                                inlineColumn,
+                                inlineExternal,
+                                inlineFilterDef,
                             };
-                            filterConfiguration.set(updatedConfiguration);
-                            return updatedConfiguration;
                         },
                         remove: () => {
                             filterConfiguration.remove();
                         },
-                        observer: filterConfiguration.observer.pipe(map(configurationGet)),
+                        observer: filterConfiguration.observer.pipe(startWith(filterConfiguration.get()), 
+                        // Sử dụng mặc định nếu bị reset
+                        map(configuration => configuration || __classPrivateFieldGet(this, _defaultConfiguration).call(this, args))),
                     },
                     value: {
                         get: () => {
-                            const configuration = filterValue.get();
-                            return valueGet(configuration);
+                            return filterValue.get();
                         },
-                        set: (configuration) => {
-                            const keys = Object.keys(configuration || {});
+                        set: (value) => {
+                            const keys = Object.keys(value || {});
                             const current = filterValue.get();
                             const { columnFilter, externalFilter, filterDef } = current;
                             const updatedConfiguration = {
                                 // Filter column
-                                columnFilter: keys.includes("columnFilter")
-                                    ? (configuration === null || configuration === void 0 ? void 0 : configuration.columnFilter) || {}
-                                    : columnFilter,
+                                columnFilter: keys.includes('columnFilter') ? (value === null || value === void 0 ? void 0 : value.columnFilter) || {} : columnFilter,
                                 // Filter external
-                                externalFilter: keys.includes("externalFilter")
-                                    ? (configuration === null || configuration === void 0 ? void 0 : configuration.externalFilter) || {}
-                                    : externalFilter,
+                                externalFilter: keys.includes('externalFilter') ? (value === null || value === void 0 ? void 0 : value.externalFilter) || {} : externalFilter,
                                 // Filter def
-                                filterDef: keys.includes("filterDef")
-                                    ? (configuration === null || configuration === void 0 ? void 0 : configuration.filterDef) || {}
-                                    : filterDef,
+                                filterDef: keys.includes('filterDef') ? (value === null || value === void 0 ? void 0 : value.filterDef) || {} : filterDef,
                             };
                             filterValue.set(updatedConfiguration);
                             return updatedConfiguration;
@@ -1297,13 +1210,69 @@ class SdGridFilterService {
                         remove: () => {
                             filterValue.remove();
                         },
-                        observer: filterValue.observer.pipe(map(valueGet)),
+                        observer: filterValue.observer.pipe(debounceTime(200), startWith(filterValue.get()), 
+                        // Sử dụng mặc định nếu bị reset
+                        map(value => value || __classPrivateFieldGet(this, _defaultValue).call(this, args))),
                     },
                 };
             }
             return __classPrivateFieldGet(this, _cache$2)[key];
         };
-        _loadDefaultConfiguration.set(this, (args, configuration) => {
+        _defaultConfiguration.set(this, (args) => {
+            var _a;
+            const { columns, externalFilters, filterDefs } = args;
+            const inlineColumn = {};
+            const inlineExternal = {};
+            const inlineFilterDef = {};
+            // Filter column
+            for (const item of columns || []) {
+                inlineColumn[item.field] = (_a = item === null || item === void 0 ? void 0 : item.filter) === null || _a === void 0 ? void 0 : _a.defaultShowing;
+            }
+            // Filter external
+            for (const item of externalFilters || []) {
+                inlineExternal[item.field] = item === null || item === void 0 ? void 0 : item.defaultShowing;
+            }
+            // Filter def
+            for (const item of filterDefs || []) {
+                inlineFilterDef[item.sdMaterialFilterDef] = item === null || item === void 0 ? void 0 : item.defaultShowing;
+            }
+            return {
+                // Filter column
+                inlineColumn,
+                // Filter external
+                inlineExternal,
+                // Filter def
+                inlineFilterDef,
+            };
+        });
+        _defaultValue.set(this, (args) => {
+            var _a;
+            const columnFilter = {};
+            const externalFilter = {};
+            const filterDef = {};
+            const { columns, externalFilters, filterDefs } = args;
+            // Filter column
+            for (const item of columns || []) {
+                columnFilter[item.field] = (_a = item === null || item === void 0 ? void 0 : item.filter) === null || _a === void 0 ? void 0 : _a.default;
+            }
+            // Filter external
+            for (const item of externalFilters || []) {
+                externalFilter[item.field] = item === null || item === void 0 ? void 0 : item.default;
+            }
+            // Filter def
+            for (const item of filterDefs || []) {
+                filterDef[item.sdMaterialFilterDef] = undefined;
+            }
+            return {
+                // Filter column
+                columnFilter,
+                // Filter external
+                externalFilter,
+                // Filter def
+                filterDef,
+            };
+        });
+        _initConfiguration.set(this, (args, configuration) => {
             var _a, _b, _c, _d, _e, _f, _g;
             const { columns, externalFilters, filterDefs } = args;
             const inlineColumn = {};
@@ -1330,7 +1299,7 @@ class SdGridFilterService {
                 inlineFilterDef,
             };
         });
-        _loadDefaultValue.set(this, (args, value) => {
+        _initValue.set(this, (args, value) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
             const columnFilter = {};
             const externalFilter = {};
@@ -1342,7 +1311,7 @@ class SdGridFilterService {
             }
             // Filter external
             for (const item of externalFilters || []) {
-                if (item.type === "daterange") {
+                if (item.type === 'daterange') {
                     externalFilter[item.field] = {
                         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,
@@ -1367,7 +1336,7 @@ class 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: Injectable }
 ];
@@ -1375,7 +1344,7 @@ SdGridFilterService.ctorParameters = () => [
     { type: 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$1, _subcriptionFilterRegister, _reload, _loadCompleted, _initCellDef, _initFilterDef, _initFooterDef, _filterExportInfo, _initConfiguration$1, _loadFilterRegister, _filterLocal, _getFilter, _load$1, _render, _exportedItems, _allColumns, _allExportedColumns, _onExport, _updateSelectedItems;
 class SdGridMaterial {
     constructor(ref, configuration, gridConfigurationService, exportService, notifyService, columnValuesPipe, gridFilterService, editorHandlerColumnPipe) {
         this.ref = ref;
@@ -1411,11 +1380,12 @@ class SdGridMaterial {
         // Filter
         this.columnFilter = {};
         // Subcription
-        _subscription$2.set(this, new Subscription());
+        _subscription$1.set(this, new Subscription());
+        _subcriptionFilterRegister.set(this, new Subscription());
         _reload.set(this, new Subject());
         this.isExporting = false;
         this.isSelectAll = false;
-        this.exportTitle = "Export";
+        this.exportTitle = 'Export';
         _loadCompleted.set(this, false);
         _initCellDef.set(this, () => {
             this.cellDef = {};
@@ -1430,9 +1400,6 @@ class SdGridMaterial {
             for (const filterDef of this.sdFilterDefs) {
                 this.filterDefs.push(filterDef);
             }
-            // if (this.filterDefs?.length) {
-            //   this.#loadFilterRegister();
-            // }
         });
         _initFooterDef.set(this, () => {
             this.footerDef = {};
@@ -1451,14 +1418,14 @@ class SdGridMaterial {
                 rawColumnFilter: columnFilter || {},
                 rawExternalFilter: externalFilter || {},
                 rawFilterDef: filterDef || {},
-                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) || "",
+                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,
                 pageSize,
                 isExported: true,
             };
         });
-        _initConfiguration.set(this, (option) => {
+        _initConfiguration$1.set(this, (option) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
             // Init pagination
             option.paginate = {
@@ -1473,83 +1440,65 @@ class SdGridMaterial {
             var _a, _b, _c, _d, _e;
             // Init filter
             if (this.gridOption) {
-                const hasRegister = !!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, {
                     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,
                 });
-                if (!hasRegister) {
-                    __classPrivateFieldGet(this, _subscription$2).add(this.filterRegister.value.observer
-                        .pipe(debounceTime(500), map((filterValue) => {
-                        this.columnFilter = filterValue.columnFilter;
-                        __classPrivateFieldGet(this, _paginator).pageIndex = 0;
-                        __classPrivateFieldGet(this, _reload).next({
-                            force: false,
-                        });
-                    }))
-                        .subscribe());
-                }
-                else {
+                __classPrivateFieldGet(this, _subcriptionFilterRegister).unsubscribe();
+                __classPrivateFieldSet(this, _subcriptionFilterRegister, this.filterRegister.value.observer
+                    .pipe(debounceTime(500), map(filterValue => {
+                    const { columnFilter } = filterValue;
+                    this.columnFilter = columnFilter;
+                    __classPrivateFieldGet(this, _paginator).pageIndex = 0;
                     __classPrivateFieldGet(this, _reload).next({
-                        force: true,
+                        force: false,
                     });
-                }
+                }))
+                    .subscribe());
+                __classPrivateFieldGet(this, _subscription$1).add(__classPrivateFieldGet(this, _subcriptionFilterRegister));
             }
         });
         _filterLocal.set(this, (localItems, filterInfo) => {
             const { columns } = this.gridOption;
             const { rawColumnFilter, orderBy, orderDirection, pageSize, pageNumber } = filterInfo;
-            const items = localItems.filter((item) => {
+            const items = localItems.filter(item => {
                 var _a, _b, _c, _d;
                 for (const column of columns) {
                     const { field, type } = column;
-                    const filterValue = (rawColumnFilter[field] || "")
-                        .toString()
-                        .trim()
-                        .toLowerCase();
-                    const columnValue = (item[field] || "")
-                        .toString()
-                        .trim()
-                        .toLowerCase();
+                    const filterValue = (rawColumnFilter[field] || '').toString().trim().toLowerCase();
+                    const columnValue = (item[field] || '').toString().trim().toLowerCase();
                     if (filterValue) {
-                        if (!columnValue &&
-                            type !== "datetime" &&
-                            type !== "date" &&
-                            type !== "time") {
+                        if (!columnValue && type !== 'datetime' && type !== 'date' && type !== 'time') {
                             return false;
                         }
-                        if (type === "string") {
+                        if (type === 'string') {
                             if (columnValue.indexOf(filterValue) === -1) {
                                 return false;
                             }
                         }
-                        else if (type === "values") {
+                        else if (type === 'values') {
                             if (columnValue !== filterValue) {
                                 return false;
                             }
                         }
-                        else if (type === "number") {
-                            const fValue = +filterValue
-                                .replace(">=", "")
-                                .replace("<=", "")
-                                .replace(">", "")
-                                .replace("<", "");
+                        else if (type === 'number') {
+                            const fValue = +filterValue.replace('>=', '').replace('<=', '').replace('>', '').replace('<', '');
                             const cValue = +columnValue;
                             if (fValue || fValue === 0) {
                                 if (!cValue && cValue !== 0) {
                                     return false;
                                 }
-                                if (filterValue.indexOf(">=") > -1 && cValue < fValue) {
+                                if (filterValue.indexOf('>=') > -1 && cValue < fValue) {
                                     return false;
                                 }
-                                else if (filterValue.indexOf("<=") > -1 && cValue > fValue) {
+                                else if (filterValue.indexOf('<=') > -1 && cValue > fValue) {
                                     return false;
                                 }
-                                else if (filterValue.indexOf("<") > -1 && cValue >= fValue) {
+                                else if (filterValue.indexOf('<') > -1 && cValue >= fValue) {
                                     return false;
                                 }
-                                else if (filterValue.indexOf(">") > -1 && cValue <= fValue) {
+                                else if (filterValue.indexOf('>') > -1 && cValue <= fValue) {
                                     return false;
                                 }
                                 else if (cValue !== fValue) {
@@ -1557,21 +1506,15 @@ class SdGridMaterial {
                                 }
                             }
                         }
-                        else if (type === "bool") {
-                            if (filterValue === "1" &&
-                                columnValue !== "1" &&
-                                columnValue !== "true") {
+                        else if (type === 'bool') {
+                            if (filterValue === '1' && columnValue !== '1' && columnValue !== 'true') {
                                 return false;
                             }
-                            else if (filterValue === "0" &&
-                                columnValue !== "0" &&
-                                columnValue !== "false") {
+                            else if (filterValue === '0' && columnValue !== '0' && columnValue !== 'false') {
                                 return false;
                             }
                         }
-                        else if (type === "datetime" ||
-                            type === "date" ||
-                            type === "time") {
+                        else if (type === 'datetime' || type === 'date' || type === 'time') {
                             const from = (_b = (_a = rawColumnFilter[field]) === null || _a === void 0 ? void 0 : _a.from) !== null && _b !== void 0 ? _b : rawColumnFilter[field];
                             const to = (_d = (_c = rawColumnFilter[field]) === null || _c === void 0 ? void 0 : _c.to) !== null && _d !== void 0 ? _d : rawColumnFilter[field];
                             const fromDate = Date.begin(from);
@@ -1597,20 +1540,20 @@ class SdGridMaterial {
             });
             // Sort
             if (orderBy && orderDirection) {
-                const column = columns.find((e) => e.field === orderBy);
+                const column = columns.find(e => e.field === orderBy);
                 if (column) {
                     const { type, field } = column;
                     items.sort((current, next) => {
-                        if (type === "number") {
+                        if (type === 'number') {
                             return (current[field] || 0) - (next[field] || 0);
                         }
-                        if (type === "date" || type === "datetime" || type === "time") {
-                            const d1 = new Date(current[field] || "").getTime();
-                            const d2 = new Date(current[field] || "").getTime();
+                        if (type === 'date' || type === 'datetime' || type === 'time') {
+                            const d1 = new Date(current[field] || '').getTime();
+                            const d2 = new Date(current[field] || '').getTime();
                             return d1 - d2;
                         }
-                        const s1 = (current[field] || "").toString();
-                        const s2 = (next[field] || "").toString();
+                        const s1 = (current[field] || '').toString();
+                        const s2 = (next[field] || '').toString();
                         if (s1 > s2) {
                             return 1;
                         }
@@ -1619,14 +1562,14 @@ class SdGridMaterial {
                         }
                         return 0;
                     });
-                    if (orderDirection === "desc") {
+                    if (orderDirection === 'desc') {
                         items.reverse();
                     }
                 }
             }
             return {
                 items: items.filter((item, index) => {
-                    return (index >= pageNumber * pageSize && index < (pageNumber + 1) * pageSize);
+                    return index >= pageNumber * pageSize && index < (pageNumber + 1) * pageSize;
                 }),
                 total: items.length,
             };
@@ -1638,15 +1581,15 @@ class SdGridMaterial {
                 rawColumnFilter: columnFilter || {},
                 rawExternalFilter: externalFilter || {},
                 rawFilterDef: filterDef || {},
-                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) || "",
+                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,
             };
         });
         _load$1.set(this, (filterReq, force = true) => __awaiter(this, void 0, void 0, function* () {
             this.isLoading = true;
-            if (this.gridOption.type === "server") {
+            if (this.gridOption.type === 'server') {
                 try {
                     let result = this.gridOption.items(filterReq);
                     if (isObservable(result)) {
@@ -1660,7 +1603,7 @@ class SdGridMaterial {
                 }
                 catch (error) {
                     console.error(error);
-                    this.notifyService.notify.warning("Có lỗi xảy ra");
+                    this.notifyService.notify.warning('Có lỗi xảy ra');
                     return {
                         items: [],
                         total: 0,
@@ -1682,13 +1625,13 @@ class SdGridMaterial {
                             __classPrivateFieldSet(this, _localItems, results || []);
                         }
                         if (!Array.isArray(__classPrivateFieldGet(this, _localItems))) {
-                            this.notifyService.notify.warning("Dữ liệu không phải là một mảng");
+                            this.notifyService.notify.warning('Dữ liệu không phải là một mảng');
                             __classPrivateFieldSet(this, _localItems, []);
                         }
                     }
                     catch (error) {
                         console.error(error);
-                        this.notifyService.notify.warning("Có lỗi xảy ra");
+                        this.notifyService.notify.warning('Có lỗi xảy ra');
                         __classPrivateFieldSet(this, _localItems, []);
                     }
                     finally {
@@ -1711,7 +1654,7 @@ class SdGridMaterial {
                 item.originItem = Object.assign({}, item);
             });
             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));
-            this.isSelectAll = this.items.every((e) => e.isSelected);
+            this.isSelectAll = this.items.every(e => e.isSelected);
             __classPrivateFieldGet(this, _updateSelectedItems).call(this);
         }));
         this.reload = (force = true) => __awaiter(this, void 0, void 0, function* () {
@@ -1736,7 +1679,7 @@ class SdGridMaterial {
             }
             else {
                 const filterInfo = __classPrivateFieldGet(this, _filterExportInfo).call(this, pageNumber, pageSize);
-                if (this.gridOption.type === "server") {
+                if (this.gridOption.type === 'server') {
                     let result = this.gridOption.items(filterInfo);
                     if (isObservable(result)) {
                         result = result.toPromise();
@@ -1745,7 +1688,7 @@ class SdGridMaterial {
                 }
                 else {
                     let exportedItems = [];
-                    if (typeof this.gridOption.items === "function") {
+                    if (typeof this.gridOption.items === 'function') {
                         const results = this.gridOption.items();
                         if (results instanceof Promise) {
                             exportedItems = yield results;
@@ -1764,24 +1707,24 @@ class SdGridMaterial {
         _allColumns.set(this, () => {
             const columns = [];
             this.gridOption.columns
-                .filter((e) => { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); })
-                .forEach((column) => {
+                .filter(e => { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); })
+                .forEach(column => {
                 var _a, _b;
-                if (column.type === "image") {
+                if (column.type === 'image') {
                     return;
                 }
-                if (column.type === "children") {
-                    (_a = column.children) === null || _a === void 0 ? void 0 : _a.filter((e) => { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); }).forEach((childColumn) => {
-                        if (childColumn.type === "image") {
+                if (column.type === 'children') {
+                    (_a = column.children) === null || _a === void 0 ? void 0 : _a.filter(e => { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); }).forEach(childColumn => {
+                        if (childColumn.type === 'image') {
                             return;
                         }
                         columns.push(childColumn);
                     });
                     return;
                 }
-                if (column.type === "children-col") {
-                    (_b = column.children) === null || _b === void 0 ? void 0 : _b.filter((e) => { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); }).forEach((childColumn) => {
-                        if (childColumn.type === "image") {
+                if (column.type === 'children-col') {
+                    (_b = column.children) === null || _b === void 0 ? void 0 : _b.filter(e => { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); }).forEach(childColumn => {
+                        if (childColumn.type === 'image') {
                             return;
                         }
                         columns.push(childColumn);
@@ -1794,7 +1737,7 @@ class SdGridMaterial {
         });
         _allExportedColumns.set(this, () => {
             var _a, _b;
-            return (((_b = (_a = this.gridOption.export) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.filter((e) => { var _a; return !((_a = e.export) === null || _a === void 0 ? void 0 : _a.disabled); })) || []);
+            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;
@@ -1815,7 +1758,7 @@ class SdGridMaterial {
                     promises = [];
                     exportItems = [];
                     for (const result of results) {
-                        if ("items" in result) {
+                        if ('items' in result) {
                             exportItems = [...exportItems, ...result.items];
                             total = result.total;
                         }
@@ -1842,8 +1785,8 @@ class SdGridMaterial {
                         const handle = (exportColumn) => __awaiter(this, void 0, void 0, function* () {
                             var _t, _u, _v;
                             obj[exportColumn.field] = item[exportColumn.field];
-                            const column = allColumns.find((e) => e.field === exportColumn.field);
-                            const exportedColumn = allExportedColumns.find((e) => e.field === exportColumn.field);
+                            const column = allColumns.find(e => e.field === exportColumn.field);
+                            const exportedColumn = allExportedColumns.find(e => e.field === exportColumn.field);
                             if (exportedColumn === null || exportedColumn === void 0 ? void 0 : exportedColumn.transform) {
                                 obj[exportedColumn.field] = exportedColumn.transform(item[exportedColumn.field], item);
                                 return;
@@ -1851,11 +1794,11 @@ class SdGridMaterial {
                             if (!column) {
                                 return;
                             }
-                            if (column.type === "children" || column.type === "children-col") {
-                                column === null || column === void 0 ? void 0 : column.children.forEach((childColumn) => handle(childColumn));
+                            if (column.type === 'children' || column.type === 'children-col') {
+                                column === null || column === void 0 ? void 0 : column.children.forEach(childColumn => handle(childColumn));
                                 return;
                             }
-                            if (!columns.some((e) => e.field === column.field)) {
+                            if (!columns.some(e => e.field === column.field)) {
                                 return;
                             }
                             if (column.transform) {
@@ -1868,55 +1811,52 @@ class SdGridMaterial {
                                 else {
                                     obj[column.field] = transform;
                                 }
-                                obj[column.field] = (_t = obj[column.field]) !== null && _t !== void 0 ? _t : "";
+                                obj[column.field] = (_t = obj[column.field]) !== null && _t !== void 0 ? _t : '';
                             }
-                            else if (item[column.field] === undefined ||
-                                item[column.field] === null ||
-                                item[column.field] === "") {
-                                obj[column.field] = "";
+                            else if (item[column.field] === undefined || item[column.field] === null || item[column.field] === '') {
+                                obj[column.field] = '';
                             }
-                            else if (column.type === "string" || column.type === "number") {
+                            else if (column.type === 'string' || column.type === 'number') {
                                 // Nếu cell là string hoặc number thì gán bằng chính nó
                                 obj[column.field] = item[column.field];
                             }
-                            else if (column.type === "bool") {
+                            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] = ((_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] = ((_v = column.option) === null || _v === void 0 ? void 0 : _v.displayOnFalse) || "False";
+                                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';
                                 }
                             }
-                            else if (column.type === "date") {
+                            else if (column.type === 'date') {
                                 let date = item[column.field];
                                 const { transformDate } = column;
                                 if (transformDate) {
                                     date = transformDate(date, item);
                                 }
                                 // Nếu là date thì convert theo đúng format
-                                obj[column.field] = Date.toFormat(date, "dd/MM/yyyy");
+                                obj[column.field] = Date.toFormat(date, 'dd/MM/yyyy');
                             }
-                            else if (column.type === "datetime") {
+                            else if (column.type === 'datetime') {
                                 let date = item[column.field];
                                 const { transformDate } = column;
                                 if (transformDate) {
                                     date = transformDate(date, item);
                                 }
                                 // Nếu là datetime thì convert theo đúng format
-                                obj[column.field] = Date.toFormat(date, "dd/MM/yyyy HH:mm");
+                                obj[column.field] = Date.toFormat(date, 'dd/MM/yyyy HH:mm');
                             }
-                            else if (column.type === "time") {
+                            else if (column.type === 'time') {
                                 let date = item[column.field];
                                 const { transformDate } = column;
                                 if (transformDate) {
                                     date = transformDate(date, item);
                                 }
                                 // Nếu là time thì convert theo đúng format
-                                obj[column.field] = Date.toFormat(date, "HH:mm");
+                                obj[column.field] = Date.toFormat(date, 'HH:mm');
                             }
-                            else if (column.type === "values") {
+                            else if (column.type === 'values') {
                                 // Nếu là values thì lấy giá trị của value được chọn
                                 obj[column.field] = yield this.columnValuesPipe.transform(item[column.field], column);
                             }
@@ -1997,8 +1937,17 @@ class SdGridMaterial {
             __classPrivateFieldGet(this, _onExport).call(this, args);
         });
         this.onFilterChange = () => {
-            __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 = (rowData) => __awaiter(this, void 0, void 0, function* () {
             var _w, _x, _y, _z, _0;
@@ -2014,12 +1963,12 @@ class SdGridMaterial {
             }
             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)) {
-                this.items.forEach((item) => (item.isExpanding = item.isExpanded = false));
+                this.items.forEach(item => (item.isExpanding = item.isExpanded = false));
             }
             if (data instanceof Promise) {
                 rowData.isExpanding = true;
                 data
-                    .then((res) => {
+                    .then(res => {
                     rowData.expandDetail = res;
                     rowData.isExpanded = true;
                 })
@@ -2033,46 +1982,43 @@ class SdGridMaterial {
         this.onSelect = (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((e) => (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((e) => e.isSelected));
-                this.isSelectAll = this.items.every((e) => e.isSelected);
+                (_c = rowData === null || rowData === void 0 ? void 0 : rowData.sdGroup) === null || _c === void 0 ? void 0 : _c.items.forEach(e => (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(e => e.isSelected));
+                this.isSelectAll = this.items.every(e => e.isSelected);
                 __classPrivateFieldGet(this, _updateSelectedItems).call(this);
             }
             else {
                 if ((_f = this.gridOption.selection) === null || _f === void 0 ? void 0 : _f.single) {
-                    this.items
-                        .filter((e) => e !== rowData)
-                        .forEach((e) => (e.isSelected = false));
+                    this.items.filter(e => e !== rowData).forEach(e => (e.isSelected = false));
                     __classPrivateFieldGet(this, _updateSelectedItems).call(this);
                     return;
                 }
-                (_h = (_g = this.gridOption.selection) === null || _g === void 0 ? void 0 : _g.onSelect) === null || _h === void 0 ? void 0 : _h.call(_g, rowData, this.items.filter((e) => e.isSelected));
-                this.isSelectAll = this.items.every((e) => e.isSelected);
+                (_h = (_g = this.gridOption.selection) === null || _g === void 0 ? void 0 : _g.onSelect) === null || _h === void 0 ? void 0 : _h.call(_g, rowData, this.items.filter(e => e.isSelected));
+                this.isSelectAll = this.items.every(e => e.isSelected);
                 __classPrivateFieldGet(this, _updateSelectedItems).call(this);
             }
         };
         this.onSelectAll = () => {
             var _a, _b, _c;
-            (_a = this.items) === null || _a === void 0 ? void 0 : _a.forEach((e) => {
+            (_a = this.items) === null || _a === void 0 ? void 0 : _a.forEach(e => {
                 var _a, _b, _c, _d;
-                if (e.selectable &&
-                    (!((_c = (_b = (_a = this.gridOption) === null || _a === void 0 ? void 0 : _a.selection) === null || _b === void 0 ? void 0 : _b.actions) === null || _c === void 0 ? void 0 : _c.length) || ((_d = e.actions) === null || _d === void 0 ? void 0 : _d.length))) {
+                if (e.selectable && (!((_c = (_b = (_a = this.gridOption) === null || _a === void 0 ? void 0 : _a.selection) === null || _b === void 0 ? void 0 : _b.actions) === null || _c === void 0 ? void 0 : _c.length) || ((_d = e.actions) === null || _d === void 0 ? void 0 : _d.length))) {
                     e.isSelected = this.isSelectAll;
                 }
             });
-            (_c = (_b = this.gridOption.selection) === null || _b === void 0 ? void 0 : _b.onSelectAll) === null || _c === void 0 ? void 0 : _c.call(_b, this.items.filter((e) => e.isSelected));
+            (_c = (_b = this.gridOption.selection) === null || _b === void 0 ? void 0 : _b.onSelectAll) === null || _c === void 0 ? void 0 : _c.call(_b, this.items.filter(e => e.isSelected));
             __classPrivateFieldGet(this, _updateSelectedItems).call(this);
         };
         this.onClearSelection = (items) => {
             items = items || this.items;
             this.isSelectAll = false;
-            items === null || items === void 0 ? void 0 : items.forEach((e) => (e.isSelected = false));
+            items === null || items === void 0 ? void 0 : items.forEach(e => (e.isSelected = false));
             __classPrivateFieldGet(this, _updateSelectedItems).call(this);
         };
         _updateSelectedItems.set(this, () => {
             this.selectedItems = this.items
-                .filter((item) => item.isSelected)
-                .map((item) => {
+                .filter(item => item.isSelected)
+                .map(item => {
                 const { isSelected, isExpanded, isExpanding, expandDetail, editorErrorMessage, editorHandlerColumn, editorHandlerRow, editorStatus, originItem, sdId, sdVersion } = item, 
                 // Giữ lại các trường thông tin cho selectable (action, groupedAction, sdGroup, selectable)
                 result = __rest(item, ["isSelected", "isExpanded", "isExpanding", "expandDetail", "editorErrorMessage", "editorHandlerColumn", "editorHandlerRow", "editorStatus", "originItem", "sdId", "sdVersion"]);
@@ -2090,10 +2036,6 @@ class SdGridMaterial {
                 externalFilter,
                 filterDef,
             });
-            // if (this.gridOption?.filter?.inlineColumn && args?.columnFilter) {
-            //   this.columnFilter = args.columnFilter;
-            // }
-            // this.gridFilter?.setFilter(args);
         };
         this.onCreate = () => {
             var _a, _b;
@@ -2103,49 +2045,49 @@ class SdGridMaterial {
             }
             const item = {};
             // Gán giá trị mặc định
-            columns.forEach((column) => {
-                if (column.type === "values") {
-                    item[column.field] = "";
+            columns.forEach(column => {
+                if (column.type === 'values') {
+                    item[column.field] = '';
                 }
-                else if (column.type === "bool") {
+                else if (column.type === 'bool') {
                     item[column.field] = true;
                 }
-                else if (column.type === "number") {
+                else if (column.type === 'number') {
                     item[column.field] = null;
                 }
             });
-            if (type === "local") {
+            if (type === 'local') {
                 (_a = editor.onAdd) === null || _a === void 0 ? void 0 : _a.call(editor, item, __classPrivateFieldGet(this, _localItems));
             }
             else {
                 (_b = editor.onAdd) === null || _b === void 0 ? void 0 : _b.call(editor, item, this.items);
             }
             // Đưa item lên dòng đầu tiên nếu type khác popup
-            if (editor.type !== "popup") {
+            if (editor.type !== 'popup') {
                 if (editor.addToLast) {
-                    if (type === "local") {
+                    if (type === 'local') {
                         __classPrivateFieldSet(this, _localItems, [...__classPrivateFieldGet(this, _localItems), item]);
                     }
                     this.items = [...this.items, item];
                 }
                 else {
-                    if (type === "local") {
+                    if (type === 'local') {
                         __classPrivateFieldSet(this, _localItems, [item, ...__classPrivateFieldGet(this, _localItems)]);
                     }
                     this.items = [item, ...this.items];
                 }
             }
-            item.editorStatus = "create";
+            item.editorStatus = 'create';
             item.editorHandlerRow = {
                 temporary: Object.assign({}, item),
             };
         };
         this.onUpdate = (item) => {
             const { editor } = this.gridOption;
-            item.editorStatus = "update";
+            item.editorStatus = 'update';
             item.editorHandlerRow = Object.assign(Object.assign({}, item.editorHandlerRow), { temporary: Object.assign({}, item) });
             // this.generateEditorHanlder(item);
-            if (editor.type === "popup") {
+            if (editor.type === 'popup') {
                 // Xử lý case popup
                 // this.sdGridPopupEditor.open(item, columns, isModified);
             }
@@ -2178,8 +2120,8 @@ class SdGridMaterial {
                         yield result;
                     }
                 }
-                if (item.editorStatus === "create" && editor.type === "popup") {
-                    if (this.gridOption.type === "local") {
+                if (item.editorStatus === 'create' && editor.type === 'popup') {
+                    if (this.gridOption.type === 'local') {
                         this.items.splice(0, 0, item);
                     }
                     // this.viewItems.splice(0, 0, item);
@@ -2198,8 +2140,8 @@ class SdGridMaterial {
         this.onCancel = (item) => {
             var _a, _b;
             const { editor } = this.gridOption;
-            if (editor.type === "inline") {
-                if (this.gridOption.type === "local") {
+            if (editor.type === 'inline') {
+                if (this.gridOption.type === 'local') {
                     const idx2 = __classPrivateFieldGet(this, _localItems).indexOf(item);
                     __classPrivateFieldGet(this, _localItems).splice(idx2, 1);
                     __classPrivateFieldSet(this, _localItems, [...__classPrivateFieldGet(this, _localItems)]);
@@ -2207,7 +2149,7 @@ class SdGridMaterial {
                 const idx1 = this.items.indexOf(item);
                 this.items.splice(idx1, 1);
                 this.items = [...this.items];
-                if (this.gridOption.type === "local") {
+                if (this.gridOption.type === 'local') {
                     (_a = editor === null || editor === void 0 ? void 0 : editor.onCancel) === null || _a === void 0 ? void 0 : _a.call(editor, item, __classPrivateFieldGet(this, _localItems));
                 }
                 else {
@@ -2216,9 +2158,9 @@ class SdGridMaterial {
                 this.ref.detectChanges();
                 return;
             }
-            if (editor.type === "focus") {
-                if (item.editorStatus === "create") {
-                    if (this.gridOption.type === "local") {
+            if (editor.type === 'focus') {
+                if (item.editorStatus === 'create') {
+                    if (this.gridOption.type === 'local') {
                         const idx2 = __classPrivateFieldGet(this, _localItems).indexOf(item);
                         __classPrivateFieldGet(this, _localItems).splice(idx2, 1);
                         __classPrivateFieldSet(this, _localItems, [...__classPrivateFieldGet(this, _localItems)]);
@@ -2251,8 +2193,8 @@ class SdGridMaterial {
                     }
                 }
             }
-            if (editor.type === "inline") {
-                if (this.gridOption.type === "local") {
+            if (editor.type === 'inline') {
+                if (this.gridOption.type === 'local') {
                     const idx2 = __classPrivateFieldGet(this, _localItems).indexOf(item);
                     __classPrivateFieldGet(this, _localItems).splice(idx2, 1);
                     __classPrivateFieldSet(this, _localItems, [...__classPrivateFieldGet(this, _localItems)]);
@@ -2260,7 +2202,7 @@ class SdGridMaterial {
                 const idx1 = this.items.indexOf(item);
                 this.items.splice(idx1, 1);
                 this.items = [...this.items];
-                if (this.gridOption.type === "local") {
+                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));
                 }
                 else {
@@ -2315,13 +2257,9 @@ class SdGridMaterial {
     }
     set option(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,
-            // });
             const configuration = this.gridConfigurationService.init(this.key, this.gridOption);
             this.gridConfigurationObserver = configuration.observer;
             configuration.load();
@@ -2331,7 +2269,7 @@ class SdGridMaterial {
     set paginator(paginator) {
         if (paginator && __classPrivateFieldGet(this, _paginator) !== paginator) {
             __classPrivateFieldSet(this, _paginator, paginator);
-            __classPrivateFieldGet(this, _subscription$2).add(paginator.page
+            __classPrivateFieldGet(this, _subscription$1).add(paginator.page
                 .pipe(map(() => {
                 __classPrivateFieldGet(this, _reload).next({
                     force: false,
@@ -2343,7 +2281,7 @@ class SdGridMaterial {
     set sort(sort) {
         if (sort && __classPrivateFieldGet(this, _sort) !== sort) {
             __classPrivateFieldSet(this, _sort, sort);
-            __classPrivateFieldGet(this, _subscription$2).add(sort.sortChange
+            __classPrivateFieldGet(this, _subscription$1).add(sort.sortChange
                 .pipe(map(() => {
                 __classPrivateFieldGet(this, _reload).next({
                     force: false,
@@ -2356,52 +2294,55 @@ class SdGridMaterial {
         __classPrivateFieldGet(this, _initCellDef).call(this);
     }
     ngAfterViewInit() {
-        __classPrivateFieldGet(this, _subscription$2).add(__classPrivateFieldGet(this, _reload).pipe(debounceTime(200), switchMap((data) => __awaiter(this, void 0, void 0, function* () {
+        __classPrivateFieldGet(this, _subscription$1).add(__classPrivateFieldGet(this, _reload).pipe(debounceTime(200), switchMap((data) => __awaiter(this, void 0, void 0, function* () {
             const filterInfo = __classPrivateFieldGet(this, _getFilter).call(this);
             const result = yield __classPrivateFieldGet(this, _load$1).call(this, filterInfo, !__classPrivateFieldGet(this, _loadCompleted) || data.force);
             __classPrivateFieldSet(this, _loadCompleted, true);
             return result;
         })))
             .subscribe(__classPrivateFieldGet(this, _render)));
-        __classPrivateFieldGet(this, _subscription$2).add(this.sdCellDefs.changes.pipe(startWith([])).subscribe(__classPrivateFieldGet(this, _initCellDef)));
-        __classPrivateFieldGet(this, _subscription$2).add(this.sdFooterDefs.changes
-            .pipe(startWith([]))
-            .subscribe(__classPrivateFieldGet(this, _initFooterDef)));
-        __classPrivateFieldGet(this, _subscription$2).add(this.sdFilterDefs.changes
-            .pipe(startWith([]))
-            .subscribe(__classPrivateFieldGet(this, _initFilterDef)));
-        __classPrivateFieldGet(this, _subscription$2).add(combineLatest([
+        __classPrivateFieldGet(this, _subscription$1).add(this.sdCellDefs.changes.pipe(startWith([])).subscribe(__classPrivateFieldGet(this, _initCellDef)));
+        __classPrivateFieldGet(this, _subscription$1).add(this.sdFooterDefs.changes.pipe(startWith([])).subscribe(__classPrivateFieldGet(this, _initFooterDef)));
+        __classPrivateFieldGet(this, _subscription$1).add(this.sdFilterDefs.changes.pipe(startWith([])).subscribe(__classPrivateFieldGet(this, _initFilterDef)));
+        __classPrivateFieldGet(this, _subscription$1).add(combineLatest([
             __classPrivateFieldGet(this, _optionChanges).pipe(startWith(this.gridOption)),
             this.sdFilterDefs.changes.pipe(startWith(this.filterDefs)),
-        ]).subscribe((a) => {
+        ]).subscribe(() => {
             __classPrivateFieldGet(this, _loadFilterRegister).call(this);
         }));
+        __classPrivateFieldGet(this, _subscription$1).add(__classPrivateFieldGet(this, _optionChanges).subscribe(() => {
+            if (this.filterRegister) {
+                __classPrivateFieldGet(this, _reload).next({
+                    force: true,
+                });
+            }
+        }));
         this.ref.detectChanges();
     }
     ngOnDestroy() {
-        __classPrivateFieldGet(this, _subscription$2).unsubscribe();
+        __classPrivateFieldGet(this, _subscription$1).unsubscribe();
     }
     drop(event, columns) {
         moveItemInArray(columns, event.previousIndex, event.currentIndex);
     }
     get editedItems() {
         return this.items
-            .filter((item) => {
+            .filter(item => {
             if (!item.originItem) {
                 return true;
             }
-            if (Object.keys(item.originItem).some((key) => item.originItem[key] !== item[key])) {
+            if (Object.keys(item.originItem).some(key => item.originItem[key] !== item[key])) {
                 return true;
             }
             return false;
         })
-            .map((item) => {
+            .map(item => {
             const { editorStatus, editorHandlerRow, editorHandlerColumn, editorErrorMessage, expandDetail, isExpanded, isExpanding, isSelected, originItem, sdId, sdVersion, selectable, actions, groupedActions, sdGroup, temporary } = item, 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 });
         });
     }
     get gridItems() {
-        return this.items.map((item) => {
+        return this.items.map(item => {
             const { editorStatus, editorHandlerRow, editorHandlerColumn, expandDetail, isExpanded, isExpanding, isSelected, originItem, sdId, sdVersion, selectable, actions, groupedActions, sdGroup, temporary } = item, result = __rest(item, ["editorStatus", "editorHandlerRow", "editorHandlerColumn", "expandDetail", "isExpanded", "isExpanding", "isSelected", "originItem", "sdId", "sdVersion", "selectable", "actions", "groupedActions", "sdGroup", "temporary"]);
             return result;
         });
@@ -2410,25 +2351,25 @@ class SdGridMaterial {
         return __classPrivateFieldGet(this, _localItems);
     }
     get localGridItems() {
-        return __classPrivateFieldGet(this, _localItems).map((item) => {
+        return __classPrivateFieldGet(this, _localItems).map(item => {
             const { editorStatus, editorHandlerRow, editorHandlerColumn, expandDetail, isExpanded, isExpanding, isSelected, originItem, sdId, sdVersion, selectable, actions, groupedActions, sdGroup, temporary } = item, result = __rest(item, ["editorStatus", "editorHandlerRow", "editorHandlerColumn", "expandDetail", "isExpanded", "isExpanding", "isSelected", "originItem", "sdId", "sdVersion", "selectable", "actions", "groupedActions", "sdGroup", "temporary"]);
             return result;
         });
     }
     get isEditing() {
-        return this.items.some((e) => e.editorStatus !== undefined);
+        return this.items.some(e => e.editorStatus !== undefined);
     }
 }
-_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$1 = new WeakMap(), _subcriptionFilterRegister = 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: Component, args: [{
-                selector: "sd-grid-material",
+                selector: 'sd-grid-material',
                 template: "<ng-container *ngIf=\"gridConfigurationObserver | async as gridConfiguration\">\r\n  <ng-container *ngIf=\"\r\n      gridConfiguration\r\n        | sdGridConfigurationResult\r\n          : gridOption\r\n          : sdSubInformation as configuration\r\n    \">\r\n    <sd-grid-filter *ngIf=\"!gridOption.filter?.disabled && filterRegister\" [filterRegister]=\"filterRegister\" [filter]=\"gridOption?.filter\"\r\n      [columns]=\"configuration.firstColumns\" [externalFilters]=\"gridOption?.filter?.externalFilters\" [filterDefs]=\"filterDefs\" #gridFilter>\r\n    </sd-grid-filter>\r\n    <ng-container *ngIf=\"items | sdGroup:gridOption; $implicit as groupedItems\">\r\n      <div class=\"c-container {{ gridOption?.style?.grid }}\" [ngClass]=\"{ 'mat-elevation-z2': gridOption?.shadow }\">\r\n        <div class=\"c-loading\" *ngIf=\"isLoading\">\r\n          <mat-spinner *ngIf=\"isLoading\"></mat-spinner>\r\n        </div>\r\n        <ng-container>\r\n          <div class=\"c-table\" sdScroll [ngStyle]=\"{\r\n            'max-height': gridOption?.maxHeight,\r\n            'min-height': gridOption?.minHeight\r\n          }\">\r\n            <table *ngIf=\"items?.length; else elseEmpty\" mat-table [dataSource]=\"groupedItems\" matSort\r\n              [matSortDisabled]=\"!gridOption.sortable\" cdkDropList cdkDropListOrientation=\"horizontal\"\r\n              [cdkDropListDisabled]=\"!gridOption.dropDragColumnEnable\"\r\n              (cdkDropListDropped)=\"drop($event, configuration.displayedColumns)\" multiTemplateDataRows>\r\n\r\n              <ng-container matColumnDef=\"sdSubInformation\" sticky>\r\n                <td class=\"p-0\" mat-cell *matCellDef=\"let item\" [attr.colspan]=\"configuration.displayedColumns.length\">\r\n                  <ng-container *ngIf=\"sdSubInformation?.templateRef\">\r\n                    <ng-container *ngIf=\"gridOption?.subInformation?.always;else useExpandCollapse\">\r\n                      <ng-container *ngTemplateOutlet=\"\r\n                          sdSubInformation.templateRef;\r\n                          context: { item: item }\r\n                        \">\r\n                      </ng-container>\r\n                    </ng-container>\r\n                    <ng-template #useExpandCollapse>\r\n                      <div [@detailExpand]=\"item.isExpanded ? 'expanded' : 'collapsed'\">\r\n                        <ng-container *ngIf=\"item.isExpanded\">\r\n                          <ng-container *ngTemplateOutlet=\"\r\n                          sdSubInformation.templateRef;\r\n                          context: { item: item }\r\n                        \">\r\n                          </ng-container>\r\n                        </ng-container>\r\n                      </div>\r\n                    </ng-template>\r\n                  </ng-container>\r\n                </td>\r\n                <td mat-footer-cell *matFooterCellDef></td>\r\n              </ng-container>\r\n              <ng-container matColumnDef=\"sdSubInformationAction\" stickyEnd>\r\n                <th class=\"p-0\" mat-header-cell *matHeaderCellDef style=\"width: 1px\"\r\n                  [attr.rowspan]=\"configuration.multipleHeader ? 2 : 1\"></th>\r\n                <td mat-cell *matCellDef=\"let element\">\r\n                  <button *ngIf=\"!element.isExpanding && !gridOption?.subInformation?.always\" mat-icon-button\r\n                    aria-label=\"Expand & Collapse\" (click)=\"onExpand(element)\">\r\n                    <mat-icon *ngIf=\"!element.isExpanded\">expand_more</mat-icon>\r\n                    <mat-icon *ngIf=\"element.isExpanded\">expand_less</mat-icon>\r\n                  </button>\r\n                  <div *ngIf=\"element.isExpanding\" class=\"lds-ring\">\r\n                    <div></div>\r\n                    <div></div>\r\n                    <div></div>\r\n                    <div></div>\r\n                  </div>\r\n                </td>\r\n              </ng-container>\r\n              <ng-container matColumnDef=\"sdSelection\" sticky>\r\n                <th class=\"text-center px-15\" mat-header-cell *matHeaderCellDef style=\"min-width: 50px; max-width: 50px\"\r\n                  [attr.rowspan]=\"configuration.multipleHeader ? 2 : 1\">\r\n                  <ng-container *ngIf=\"items | selectionVisibleSelectAll: gridOption?.selection | async\">\r\n                    <mat-checkbox *ngIf=\"!gridOption.selection?.single\" class=\"c-selection\" color=\"primary\"\r\n                      [(ngModel)]=\"isSelectAll\" (change)=\"onSelectAll()\">\r\n                    </mat-checkbox>\r\n                  </ng-container>\r\n\r\n                </th>\r\n                <td class=\"text-center px-15\" mat-cell *matCellDef=\"let item\" style=\"min-width: 50px; max-width: 50px\">\r\n                  <ng-container *ngIf=\"item | selectionVisible:gridOption?.selection\">\r\n                    <mat-checkbox class=\"c-selection\" color=\"primary\" [(ngModel)]=\"item.isSelected\"\r\n                      (change)=\"onSelect(item)\" [disabled]=\"\r\n                    selectedItems | selectionDisable: item:gridOption?.selection\r\n                  \">\r\n                    </mat-checkbox>\r\n                  </ng-container>\r\n\r\n                </td>\r\n                <td mat-footer-cell *matFooterCellDef></td>\r\n              </ng-container>\r\n              <ng-container matColumnDef=\"sdEditorValidation\">\r\n                <th class=\"p-0\" mat-header-cell *matHeaderCellDef style=\"width: 2px\"\r\n                  [attr.rowspan]=\"configuration.multipleHeader ? 2 : 1\">\r\n                </th>\r\n                <td class=\"p-0 position-relative\" mat-cell *matCellDef=\"let item; index as idx\">\r\n                  <sd-desktop-editor-validation [sdId]=\"item.sdId\" [item]=\"item\" [items]=\"items\"\r\n                    [gridOption]=\"gridOption\">\r\n                  </sd-desktop-editor-validation>\r\n                </td>\r\n                <td mat-footer-cell *matFooterCellDef></td>\r\n              </ng-container>\r\n              <ng-container matColumnDef=\"sdEditor\">\r\n                <th class=\"px-8 py-8\" mat-header-cell *matHeaderCellDef style=\"width: 50px\"\r\n                  [attr.rowspan]=\"configuration.multipleHeader ? 2 : 1\">\r\n                  <button class=\"c-btn-add\"\r\n                    *ngIf=\"gridOption.editor?.addable && (!gridOption.editor.limit || gridOption.editor.limit > items.length)\"\r\n                    (click)=\"onCreate()\" aria-hidden=\"true\" mat-icon-button>\r\n                    <mat-icon class=\"c-icon-add\">add</mat-icon>\r\n                  </button>\r\n                </th>\r\n                <td class=\"px-8\" mat-cell *matCellDef=\"let item; index as idx\">\r\n                  <ng-container *sdLet=\"item.editorStatus | sdEditorHandlerRow:item:gridOption as editorHandler\">\r\n                    <div *ngIf=\"editorHandler\" class=\"d-flex align-items-center justify-content-center\">\r\n                      <button *ngIf=\"editorHandler.editable\" class=\"mx-2\" (click)=\"onUpdate(item)\" aria-hidden=\"true\"\r\n                        mat-icon-button>\r\n                        <mat-icon class=\"c-icon\">edit</mat-icon>\r\n                      </button>\r\n                      <button *ngIf=\"editorHandler.removable\" class=\"mx-2\" (click)=\"onRemove(item)\" aria-hidden=\"true\"\r\n                        mat-icon-button>\r\n                        <mat-icon class=\"c-icon\">delete</mat-icon>\r\n                      </button>\r\n                      <button *ngIf=\"editorHandler.savable\" class=\"mx-2\" (click)=\"onSave(item)\" aria-hidden=\"true\"\r\n                        mat-icon-button>\r\n                        <mat-icon class=\"c-icon\">save</mat-icon>\r\n                      </button>\r\n                      <button *ngIf=\"editorHandler.cancelable\" class=\"mx-2\" (click)=\"onCancel(item)\" aria-hidden=\"true\"\r\n                        mat-icon-button>\r\n                        <mat-icon class=\"c-icon\">close</mat-icon>\r\n                      </button>\r\n                    </div>\r\n                  </ng-container>\r\n                </td>\r\n                <td mat-footer-cell *matFooterCellDef></td>\r\n              </ng-container>\r\n              <ng-container matColumnDef=\"sdCommand\">\r\n                <th class=\"px-8 py-8\" mat-header-cell *matHeaderCellDef style=\"width: 50px\"\r\n                  [attr.rowspan]=\"configuration.multipleHeader ? 2 : 1\"></th>\r\n                <td class=\"px-8\" mat-cell *matCellDef=\"let item\">\r\n                  <sd-desktop-command [commands]=\"gridOption.commands\" [item]=\"item\"></sd-desktop-command>\r\n                </td>\r\n                <td mat-footer-cell *matFooterCellDef></td>\r\n              </ng-container>\r\n              <ng-container matColumnDef=\"sdGroup\">\r\n                <th mat-header-cell *matHeaderCellDef class=\"px-8 py-8\"\r\n                  [attr.rowspan]=\"configuration.multipleHeader ? 2 : 1\">\r\n                </th>\r\n                <td class=\"p-0\" mat-cell *matCellDef=\"let item\"\r\n                  [attr.colspan]=\"!item?.sdGroup ? 1 : configuration.displayedColumns.length\">\r\n                  <div [innerHtml]=\"item?.sdGroup?.htmlTemplate | safeHtml\">\r\n                  </div>\r\n                </td>\r\n                <td mat-footer-cell *matFooterCellDef></td>\r\n              </ng-container>\r\n              <ng-container *ngFor=\"let column of configuration.firstColumns; let i = index\"\r\n                [matColumnDef]=\"column.field\" [sticky]=\"configuration.fixedColumn[column.field]\">\r\n                <th mat-header-cell *matHeaderCellDef cdkDrag class=\"px-8 py-8 c-th\"\r\n                  [ngStyle]=\"{ 'min-width': configuration.firstColumns[i].width }\" [attr.rowspan]=\"\r\n                  configuration.multipleHeader && column.type !== 'children-col'\r\n                    ? 2\r\n                    : 1\r\n                \" [attr.colspan]=\"\r\n                  column.type === 'children-col' ? column.children?.length : 1\r\n                \">\r\n                  <div>\r\n                    <div aria-hidden=\"false\" role=\"presentation\" mat-sort-header [disabled]=\"\r\n                      !column.sortable || column.type === 'children-col'\r\n                    \" [class.text-right]=\"column.align === 'right' || (!column.align && column.type === 'number')\"\r\n                      [class.text-center]=\"column.align === 'center'\"\r\n                      [innerHTML]=\"configuration.firstColumns[i].titleHtml || configuration.firstColumns[i].title\">\r\n                    </div>\r\n                    <sd-column-inline-filter *ngIf=\"gridOption.filter?.inlineColumn\"\r\n                      [value]=\"columnFilter[column.field]\" [columnFilter]=\"columnFilter\" [column]=\"column\"\r\n                      (filterChange)=\"onFilterChange()\">\r\n                    </sd-column-inline-filter>\r\n                  </div>\r\n                </th>\r\n                <td class=\"c-td px-0\" mat-cell *matCellDef=\"let item\">\r\n                  <sd-desktop-cell class=\"d-block px-8\" *ngIf=\"!item?.sdGroup\" [sdId]=\"item.sdId\" [key]=\"key\"\r\n                    [value]=\"item[column.field]\" [column]=\"column\" [item]=\"item\" [idx]=\"i\" [cellDef]=\"cellDef\"\r\n                    [gridOption]=\"gridOption\">\r\n                  </sd-desktop-cell>\r\n                </td>\r\n                <td mat-footer-cell *matFooterCellDef>\r\n                  <ng-container *ngIf=\"footerDef[column.field]\">\r\n                    <ng-container *ngTemplateOutlet=\"\r\n                      footerDef[column.field].templateRef;\r\n                      context: { items: items, column: column }\r\n                    \">\r\n                    </ng-container>\r\n                  </ng-container>\r\n                </td>\r\n              </ng-container>\r\n              <ng-container *ngFor=\"let column of configuration.secondColumns; let i = index\"\r\n                [matColumnDef]=\"column.field\">\r\n                <th mat-header-cell *matHeaderCellDef mat-sort-header class=\"c-th px-8\"\r\n                  [ngStyle]=\"{ 'min-width': column.width }\">\r\n                  <div>\r\n                    <div [class.text-right]=\"column.align === 'right' || (!column.align && column.type === 'number')\"\r\n                      [class.text-center]=\"column.align === 'center'\" [innerHTML]=\"column.titleHtml || column.title\">\r\n                    </div>\r\n                    <sd-column-inline-filter *ngIf=\"gridOption.filter?.inlineColumn\"\r\n                      [value]=\"columnFilter[column.field]\" [columnFilter]=\"columnFilter\" [column]=\"column\"\r\n                      (filterChange)=\"onFilterChange()\">\r\n                    </sd-column-inline-filter>\r\n                  </div>\r\n                </th>\r\n                <td class=\"c-td px-0\" mat-cell *matCellDef=\"let item\">\r\n                  <sd-desktop-cell class=\"d-block px-8\" [sdId]=\"item.sdId\" [key]=\"key\" [value]=\"item[column.field]\"\r\n                    [column]=\"column\" [item]=\"item\" [idx]=\"i\" [cellDef]=\"cellDef\" [gridOption]=\"gridOption\">\r\n                  </sd-desktop-cell>\r\n                </td>\r\n                <td mat-footer-cell *matFooterCellDef>\r\n                  <ng-container *ngIf=\"footerDef[column.field]\">\r\n                    <ng-container *ngTemplateOutlet=\"\r\n                      footerDef[column.field].templateRef;\r\n                      context: { items: items, column: column }\r\n                    \">\r\n                    </ng-container>\r\n                  </ng-container>\r\n                </td>\r\n              </ng-container>\r\n              <tr class=\"c-first-header\" mat-header-row *matHeaderRowDef=\"configuration.firstHeaders; sticky: true\">\r\n              </tr>\r\n              <ng-container *ngIf=\"configuration.secondHeaders?.length\">\r\n                <tr class=\"c-second-header\" mat-header-row *matHeaderRowDef=\"configuration.secondHeaders; sticky: true\">\r\n                </tr>\r\n              </ng-container>\r\n              <tr mat-row *matRowDef=\"let row; columns: configuration.displayedColumns\" matRipple class=\"c-row\"\r\n                [class.selected]=\"row.isSelected\" [style]=\"row | sdStyleRowCss:gridOption\"></tr>\r\n\r\n              <tr mat-row *matRowDef=\"let row; columns: ['sdSubInformation']\" class=\"c-detail-row\"></tr>\r\n              <ng-container *ngIf=\"hasFooter && configuration.displayedFooters?.length\">\r\n                <tr mat-footer-row *matFooterRowDef=\"configuration.displayedFooters; sticky: true\"></tr>\r\n              </ng-container>\r\n            </table>\r\n            <ng-template #elseEmpty>\r\n              <table mat-table [dataSource]=\"[{}]\">\r\n                <ng-container matColumnDef=\"sdSelection\" sticky>\r\n                  <th class=\"px-15\" mat-header-cell *matHeaderCellDef style=\"min-width: 50px; max-width: 50px\"\r\n                    [attr.rowspan]=\"configuration.multipleHeader ? 2 : 1\"></th>\r\n                </ng-container>\r\n                <ng-container matColumnDef=\"sdEditorValidation\">\r\n                  <th class=\"p-0\" mat-header-cell *matHeaderCellDef style=\"width: 4px\"\r\n                    [attr.rowspan]=\"configuration.multipleHeader ? 2 : 1\">\r\n                  </th>\r\n                  <td class=\"p-0\" mat-cell *matCellDef=\"let item\">\r\n                  </td>\r\n                  <td mat-footer-cell *matFooterCellDef></td>\r\n                </ng-container>\r\n                <ng-container matColumnDef=\"sdEditor\">\r\n                  <th class=\"px-8 py-8\" mat-header-cell *matHeaderCellDef style=\"min-width: 50px; max-width: 50px\"\r\n                    [attr.rowspan]=\"configuration.multipleHeader ? 2 : 1\">\r\n                    <button class=\"c-btn-add\"\r\n                      *ngIf=\"gridOption.editor?.addable && (!gridOption.editor.limit || gridOption.editor.limit > items.length)\"\r\n                      (click)=\"onCreate()\" aria-hidden=\"true\" mat-icon-button>\r\n                      <mat-icon class=\"c-icon-add\">add</mat-icon>\r\n                    </button>\r\n                  </th>\r\n                </ng-container>\r\n                <ng-container matColumnDef=\"sdCommand\">\r\n                  <th class=\"px-8\" mat-header-cell *matHeaderCellDef style=\"min-width: 50px; max-width: 50px\"\r\n                    [attr.rowspan]=\"configuration.multipleHeader ? 2 : 1\"></th>\r\n                </ng-container>\r\n                <ng-container matColumnDef=\"sdSubInformationAction\">\r\n                  <th class=\"p-0\" mat-header-cell *matHeaderCellDef style=\"width: 1px\"\r\n                    [attr.rowspan]=\"configuration.multipleHeader ? 2 : 1\"></th>\r\n                </ng-container>\r\n                <ng-container matColumnDef=\"sdEmpty\">\r\n                  <td class=\"c-empty\" mat-cell *matCellDef=\"let item\"\r\n                    [attr.colspan]=\"configuration.displayedColumns.length\">\r\n                    <ng-container *ngIf=\"sdEmptyData?.templateRef; else sdEmptyDataNoRef\">\r\n                      <ng-container *ngTemplateOutlet=\"\r\n                        sdEmptyData.templateRef;\r\n                        context: { item: item }\r\n                      \">\r\n                      </ng-container>\r\n                    </ng-container>\r\n                    <ng-template #sdEmptyDataNoRef>\r\n                      <mat-icon fontSet=\"material-icons-outlined\">leaderboard</mat-icon>\r\n                    </ng-template>\r\n                  </td>\r\n                </ng-container>\r\n                <ng-container matColumnDef=\"sdGroup\">\r\n                  <th mat-header-cell *matHeaderCellDef class=\"px-8 py-8\"\r\n                    [attr.rowspan]=\"configuration.multipleHeader ? 2 : 1\">\r\n                  </th>\r\n                  <td class=\"p-0\" mat-cell *matCellDef=\"let item\">\r\n                  </td>\r\n                  <td mat-footer-cell *matFooterCellDef></td>\r\n                </ng-container>\r\n                <ng-container *ngFor=\"let column of configuration.columns\" [matColumnDef]=\"column.field\"\r\n                  [sticky]=\"configuration.fixedColumn[column.field]\">\r\n                  <th mat-header-cell *matHeaderCellDef class=\"c-th px-8 py-8\"\r\n                    [ngStyle]=\"{ 'min-width': column.width }\">\r\n                    <div [class.text-right]=\"column.align === 'right' || (!column.align && column.type === 'number')\"\r\n                      [class.text-center]=\"column.align === 'center'\" [innerHTML]=\"column.titleHtml || column.title\">\r\n                    </div>\r\n                  </th>\r\n                </ng-container>\r\n                <ng-container *ngFor=\"let column of configuration.firstColumns; let i = index\"\r\n                  [matColumnDef]=\"column.field\" [sticky]=\"configuration.fixedColumn[column.field]\">\r\n                  <th mat-header-cell *matHeaderCellDef class=\"c-th px-8 py-8\"\r\n                    [ngStyle]=\"{ 'min-width': configuration.firstColumns[i].width }\" [attr.rowspan]=\"\r\n                    configuration.multipleHeader &&\r\n                    column.type !== 'children-col'\r\n                      ? 2\r\n                      : 1\r\n                  \" [attr.colspan]=\"\r\n                    column.type === 'children-col' ? column.children?.length : 1\r\n                  \">\r\n                    <div>\r\n                      <div [class.text-right]=\"column.align === 'right' || (!column.align && column.type === 'number')\"\r\n                        [class.text-center]=\"column.align === 'center'\"\r\n                        [innerHTML]=\"configuration.firstColumns[i].titleHtml || configuration.firstColumns[i].title\">\r\n                      </div>\r\n                      <sd-column-inline-filter *ngIf=\"gridOption.filter?.inlineColumn\"\r\n                        [value]=\"columnFilter[column.field]\" [columnFilter]=\"columnFilter\" [column]=\"column\"\r\n                        (filterChange)=\"onFilterChange()\"></sd-column-inline-filter>\r\n                    </div>\r\n                  </th>\r\n                </ng-container>\r\n                <ng-container *ngFor=\"let column of configuration.secondColumns\" [matColumnDef]=\"column.field\">\r\n                  <th mat-header-cell *matHeaderCellDef class=\"c-th px-8 py-8\"\r\n                    [ngStyle]=\"{ 'min-width': column.width }\">\r\n                    <div>\r\n                      <div [class.text-right]=\"column.align === 'right' || (!column.align && column.type === 'number')\"\r\n                        [class.text-center]=\"column.align === 'center'\" [innerHTML]=\"column.titleHtml || column.title\">\r\n                      </div>\r\n                      <sd-column-inline-filter *ngIf=\"gridOption.filter?.inlineColumn\"\r\n                        [value]=\"columnFilter[column.field]\" [columnFilter]=\"columnFilter\" [column]=\"column\"\r\n                        (filterChange)=\"onFilterChange()\"></sd-column-inline-filter>\r\n                    </div>\r\n                  </th>\r\n                </ng-container>\r\n                <tr class=\"c-first-header\" mat-header-row *matHeaderRowDef=\"configuration.firstHeaders; sticky: true\">\r\n                </tr>\r\n                <tr class=\"c-second-header\" mat-header-row *matHeaderRowDef=\"configuration.secondHeaders; sticky: true\">\r\n                </tr>\r\n                <tr mat-row *matRowDef=\"let row; columns: ['sdEmpty']\"></tr>\r\n              </table>\r\n            </ng-template>\r\n          </div>\r\n        </ng-container>\r\n        <div class=\"c-paginator\">\r\n          <div class=\"c-action\">\r\n            <sd-button *ngIf=\"gridFilter && !gridOption.filter?.inlineColumn\r\n            \" class=\"mr-10\" [title]=\"'Filter' | sdTranslate\" icon=\"filter_alt\" size=\"sm\" (action)=\"gridFilter.open()\"\r\n              type=\"link\">\r\n            </sd-button>\r\n            <sd-button *ngIf=\"gridOption.reload?.visible\" class=\"mr-10\" [title]=\"'Reload' | sdTranslate\" icon=\"refresh\"\r\n              size=\"sm\" (action)=\"reload()\" [disabled]=\"!items?.length\" type=\"link\">\r\n            </sd-button>\r\n            <ng-container *ngIf=\"gridOption.export?.visible && items?.length\">\r\n              <ng-container *ngIf=\"isExporting; else unExporting\">\r\n                <sd-button class=\"mr-10\" [loading]=\"isExporting\" [title]=\"exportTitle | sdTranslate\" icon=\"get_app\"\r\n                  size=\"sm\" type=\"link\">\r\n                </sd-button>\r\n              </ng-container>\r\n              <ng-template #unExporting>\r\n                <sd-button class=\"mr-10\" [title]=\"exportTitle | sdTranslate\" icon=\"get_app\" size=\"sm\"\r\n                  [matMenuTriggerFor]=\"menu\" type=\"link\">\r\n                </sd-button>\r\n              </ng-template>\r\n\r\n              <mat-menu #menu=\"matMenu\">\r\n                <button *ngIf=\"gridOption.export?.visibleExcel !== false\" mat-menu-item\r\n                  (click)=\"sdPopupExport.exportDefault()\" type=\"button\">\r\n                  <mat-icon fontSet=\"material-icons-outlined\">file_download</mat-icon>\r\n                  <span> {{ \"Export excel\" | sdTranslate }}</span>\r\n                </button>\r\n                <button *ngIf=\"gridOption.export?.visibleCSV !== false\" mat-menu-item\r\n                  (click)=\"sdPopupExport.exportCSV()\" type=\"button\">\r\n                  <mat-icon fontSet=\"material-icons-outlined\">file_download</mat-icon>\r\n                  <span> {{ \"Export CSV\" | sdTranslate }}</span>\r\n                </button>\r\n                <button *ngIf=\"gridOption.export?.key\" mat-menu-item (click)=\"sdPopupExport.open()\" type=\"button\">\r\n                  <mat-icon fontSet=\"material-icons-outlined\">settings</mat-icon>\r\n                  <span> {{ \"Configure\" | sdTranslate }}</span>\r\n                </button>\r\n              </mat-menu>\r\n            </ng-container>\r\n            <sd-button *ngIf=\"gridOption.config?.visible\" class=\"mr-10\" [title]=\"'Configure' | sdTranslate\"\r\n              icon=\"settings\" size=\"sm\" (action)=\"popupGridConfiguration.open()\" type=\"link\">\r\n            </sd-button>\r\n          </div>\r\n          <mat-paginator [class.d-none]=\"gridOption.paginate?.hidden\" [length]=\"total\"\r\n            [pageSize]=\"gridOption.paginate?.pageSize\" [pageSizeOptions]=\"gridOption.paginate?.pages\"\r\n            [showFirstLastButtons]=\"gridOption.paginate?.showFirstLastButtons\"></mat-paginator>\r\n        </div>\r\n      </div>\r\n      <sd-grid-quick-action [gridOption]=\"gridOption\" [selectedItems]=\"selectedItems\"\r\n        (clear)=\"onClearSelection(groupedItems)\">\r\n      </sd-grid-quick-action>\r\n      <sd-popup-export *ngIf=\"gridOption.export?.visible\" [configuration]=\"configuration\" [gridOption]=\"gridOption\"\r\n        (export)=\"onExport($event)\" #sdPopupExport>\r\n      </sd-popup-export>\r\n      <sd-popup-grid-configuration [gridOption]=\"gridOption\" [key]=\"key\" #popupGridConfiguration>\r\n      </sd-popup-grid-configuration>\r\n    </ng-container>\r\n  </ng-container>\r\n</ng-container>",
                 animations: [
-                    trigger("detailExpand", [
-                        state("collapsed", style({ height: "0", minHeight: "0", visibility: "hidden" })),
-                        state("expanded", style({ height: "*", visibility: "visible" })),
-                        transition("expanded <=> collapsed", animate("225ms cubic-bezier(0.4, 0.0, 0.2, 1)")),
+                    trigger('detailExpand', [
+                        state('collapsed', style({ height: '0', minHeight: '0', visibility: 'hidden' })),
+                        state('expanded', style({ height: '*', visibility: 'visible' })),
+                        transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')),
                     ]),
                 ],
                 styles: [".text-black400{color:#757575}:host{display:flex;flex-direction:column;height:100%;overflow:auto}:host .c-container{display:flex;flex:1;flex-direction:column;min-height:200px;position:relative}:host .c-container .c-table{flex:1;min-height:300px;position:relative}:host .c-container .c-table table{border-collapse:separate;width:100%}:host .c-container .c-table table tr.c-first-header.mat-header-row,:host .c-container .c-table table tr.c-second-header.mat-header-row{height:40px}:host .c-container .c-table table tr.c-detail-row{height:0}:host .c-container .c-table table tr.c-row.activated{background-color:#e5ecff}:host .c-container .c-table table tr.c-row.selected{background-color:#eef2ff}:host .c-container .c-table table tr.c-row:not(.selected):not(.activated):hover{background-color:#f5f5f5}:host .c-container .c-table table tr.c-row td{border-bottom-width:0}:host .c-container .c-table table tr.c-row.c-expandable{cursor:pointer}:host .c-container .c-table table tr.c-row.c-expandable:hover{background:#f5f5f5}:host .c-container .c-table table th.mat-header-cell{background-color:#f2f3f4;border-bottom:0!important}:host .c-container .c-table table td.mat-cell,:host .c-container .c-table table td.mat-footer-cell,:host .c-container .c-table table th.mat-header-cell{border-bottom-color:#f2f2f2!important}:host .c-container .c-table .c-th{color:#212121;font-size:14px;font-weight:500;line-height:20px;vertical-align:middle}:host .c-container .c-table .c-td:first{padding-left:10px}:host .c-container .c-loading{align-items:center;background:rgba(0,0,0,.15);bottom:56px;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0;z-index:2}:host .c-container .c-paginator{align-items:center;background-color:#fff;display:flex;flex-direction:row;justify-content:space-between}:host .c-container .c-paginator .c-action{padding:5px}:host .c-container .c-empty{background-color:#fff;border:none!important;text-align:center}:host .c-container .c-empty mat-icon{font-size:150px;height:auto;margin-bottom:30px;margin-top:30px;opacity:.2;width:auto}:host button.c-btn-add{background-color:#fff;box-shadow:0 2px 4px rgba(47,49,54,.16)}:host mat-icon.c-icon{color:rgba(0,0,0,.54)!important}:host mat-icon.c-icon-add{color:#2962ff!important}:host .lds-ring{display:inline-block;height:40px;position:relative;width:40px}:host .lds-ring div{-webkit-animation:lds-ring 1.2s cubic-bezier(.5,0,.5,1) infinite;animation:lds-ring 1.2s cubic-bezier(.5,0,.5,1) infinite;border:4px solid transparent;border-radius:50%;border-top-color:#cef;box-sizing:border-box;display:block;height:32px;margin:4px;position:absolute;width:32px}:host .lds-ring div:first-child{-webkit-animation-delay:-.45s;animation-delay:-.45s}:host .lds-ring div:nth-child(2){-webkit-animation-delay:-.3s;animation-delay:-.3s}:host .lds-ring div:nth-child(3){-webkit-animation-delay:-.15s;animation-delay:-.15s}:host .style1 .mat-table{border:1px solid #dde0e5}:host .style1 .mat-table tr.mat-header-row{background:#f2f3f4}:host .style1 .mat-table th.mat-header-cell{padding:10px 0}:host .style1 .c-paginator{border:1px solid #dde0e5;border-top:none!important}:host .style1 .mat-form-field-wrapper{background:#fff;padding:0}@-webkit-keyframes lds-ring{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@keyframes lds-ring{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}:host ::ng-deep .mat-sort-header-content{display:block;text-align:left;width:100%}:host ::ng-deep .mat-select-arrow{color:#a6a6a6}:host ::ng-deep .mat-sort-header-disabled{background-image:none!important;cursor:default!important;padding-right:0!important}:host ::ng-deep .mat-sort-header-container{align-items:start!important}:host ::ng-deep .mat-sort-header-arrow{margin-top:4px!important}:host ::ng-deep .mat-sort-header{cursor:pointer}:host ::ng-deep .mat-sort-header[aria-sort]{background-position:center right 0;background-repeat:no-repeat;background-size:16px 16px;cursor:pointer;padding-right:24px}:host ::ng-deep .mat-sort-header[aria-sort=none]{background-image:url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' height='24px' viewBox='0 0 24 24' width='24px' fill='%23000000'%3E%3Cpath d='M0 0h24v24H0V0z' fill='none'/%3E%3Cpath fill='%237A7A7A' d='M12 5.83L15.17 9l1.41-1.41L12 3 7.41 7.59 8.83 9 12 5.83zm0 12.34L8.83 15l-1.41 1.41L12 21l4.59-4.59L15.17 15 12 18.17z'/%3E%3C/svg%3E\")}:host ::ng-deep .mat-sort-header[aria-sort=ascending]{background-image:url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' height='24px' viewBox='0 0 24 24' width='24px' fill='%23000000'%3E%3Cpath d='M0 0h24v24H0V0z' fill='none'/%3E%3Cpath fill='%237A7A7A' d='M4 12l1.41 1.41L11 7.83V20h2V7.83l5.58 5.59L20 12l-8-8-8 8z'/%3E%3C/svg%3E\")}:host ::ng-deep .mat-sort-header[aria-sort=descending]{background-image:url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' height='24px' viewBox='0 0 24 24' width='24px' fill='%23000000'%3E%3Cpath d='M0 0h24v24H0V0z' fill='none'/%3E%3Cpath fill='%237A7A7A' d='M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z'/%3E%3C/svg%3E\")}"]
@@ -3184,7 +3125,7 @@ SdGeneratedColumnService.ctorParameters = () => [
     { type: SdSettingService }
 ];
 
-var _subscription$3;
+var _subscription$2;
 class SdDynamicColumn {
     constructor(ref, generatedColumnService, notifyService, translateService, gridConfigurationService) {
         this.ref = ref;
@@ -3192,7 +3133,7 @@ class SdDynamicColumn {
         this.notifyService = notifyService;
         this.translateService = translateService;
         this.gridConfigurationService = gridConfigurationService;
-        _subscription$3.set(this, new Subscription());
+        _subscription$2.set(this, new Subscription());
         this.columnTypes = ['string', 'number', 'bool', 'date', 'datetime', 'time', 'values', 'children', 'children-col'];
         this.form = new FormGroup({});
         this.isDetail = false;
@@ -3236,22 +3177,22 @@ class SdDynamicColumn {
         const systemSetting = this.generatedColumnService.loadSystem(this.gridOption.config);
         const setting = this.generatedColumnService.load((_a = this.gridOption) === null || _a === void 0 ? void 0 : _a.config);
         if (systemSetting) {
-            (_b = __classPrivateFieldGet(this, _subscription$3)) === null || _b === void 0 ? void 0 : _b.add(systemSetting.observer.subscribe(columns => {
+            (_b = __classPrivateFieldGet(this, _subscription$2)) === null || _b === void 0 ? void 0 : _b.add(systemSetting.observer.subscribe(columns => {
                 this.systemColumns = columns;
             }));
         }
         if (setting) {
-            (_c = __classPrivateFieldGet(this, _subscription$3)) === null || _c === void 0 ? void 0 : _c.add(setting.observer.subscribe(columns => {
+            (_c = __classPrivateFieldGet(this, _subscription$2)) === null || _c === void 0 ? void 0 : _c.add(setting.observer.subscribe(columns => {
                 this.columns = columns;
             }));
         }
         this.originColumns = this.gridOption.columns.filter(e => e.type !== 'children' && e.type !== 'children-col');
     }
     ngOnDestroy() {
-        __classPrivateFieldGet(this, _subscription$3).unsubscribe();
+        __classPrivateFieldGet(this, _subscription$2).unsubscribe();
     }
 }
-_subscription$3 = new WeakMap();
+_subscription$2 = new WeakMap();
 SdDynamicColumn.decorators = [
     { type: Component, args: [{
                 selector: 'sd-dynamic-column',