@xiriframework/xiri-ng 0.2.19 → 0.2.20

package/fesm2022/xiriframework-xiri-ng.mjs

@@ -3362,6 +3362,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.2", ngImpor
         }], propDecorators: { settings: [{ type: i0.Input, args: [{ isSignal: true, alias: "settings", required: true }] }], buttonResult: [{ type: i0.Output, args: ["buttonResult"] }] } });
 
 class XiriTableComponent {
+    tableStateKey() {
+        return this.options.saveStateId ? this.options.saveStateId + ':table' : null;
+    }
     // Inline edit signals delegated to inlineEdit service
     get editingCell() { return this.inlineEdit.editingCell; }
     get editingChipsValues() { return this.inlineEdit.editingChipsValues; }
@@ -3500,8 +3503,8 @@ class XiriTableComponent {
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe(data => {
             this._displayeddata = data || [];
-            if (this.options.saveState && this._firstData === false) {
-                this.sessionStorageService.set(this.options.saveStateId, {
+            if (this.options.saveState && this._firstData === false && this.tableStateKey()) {
+                this.sessionStorageService.set(this.tableStateKey(), {
                     pageIndex: this.paginator()?.pageIndex,
                     pageSize: this.paginator()?.pageSize,
                     filter: this.searchText,
@@ -3630,8 +3633,8 @@ class XiriTableComponent {
         this._alldata.set(data);
         if (this._firstData) {
             this._firstData = false;
-            if (this.options.saveState) {
-                let data = this.sessionStorageService.getTimeout(this.options.saveStateId, 3600);
+            if (this.options.saveState && this.tableStateKey()) {
+                let data = this.sessionStorageService.getTimeout(this.tableStateKey(), 3600);
                 if (!data)
                     return;
                 if (data.filter !== undefined) {
@@ -4211,20 +4214,23 @@ class XiriQueryComponent {
         this.filterData = signal(null, ...(ngDevMode ? [{ debugName: "filterData" }] : /* istanbul ignore next */ []));
         this.loading = signal(false, ...(ngDevMode ? [{ debugName: "loading" }] : /* istanbul ignore next */ []));
     }
+    get effectiveSaveKey() {
+        return this.saveStateId ? this.saveStateId + ':filter' : null;
+    }
     ngOnInit() {
         let settings = this.settings();
         if (settings.dyn !== undefined && settings.dyn !== null && settings.dyn.length != 0)
             this.dynData.data = settings.dyn;
         this.saveState = settings.saveState === undefined ? false : settings.saveState;
         this.saveStateId = settings.saveStateId === undefined ? null : settings.saveStateId;
-        this.formFields.set(this.formService.loadState(settings.saveStateId, settings.fields));
+        this.formFields.set(this.formService.loadState(this.effectiveSaveKey, settings.fields));
         this.extra = settings.extra || null;
         this.waiter.pipe(debounceTime(300), takeUntilDestroyed(this.destroyRef)).subscribe(event => {
             if (event.valid) {
                 this.dynData.filterData = this.filterData();
                 this.change.emit(this.filterData());
                 if (this.saveState)
-                    this.formService.saveState(this.saveStateId, event.value);
+                    this.formService.saveState(this.effectiveSaveKey, event.value);
                 if (this.settings().url)
                     this.load();
             }
@@ -4252,7 +4258,7 @@ class XiriQueryComponent {
             this.dynData.filterData = this.filterData();
             this.change.emit(this.filterData());
             if (this.saveState)
-                this.formService.saveState(this.saveStateId, event.value);
+                this.formService.saveState(this.effectiveSaveKey, event.value);
             if (this.settings().url)
                 this.load();
         }