@acorex/platform 21.0.0-next.45 → 21.0.0-next.47

package/fesm2022/acorex-platform-themes-default.mjs

@@ -30,7 +30,7 @@ import { AXPAuthModule, AXPSessionService, AXPSessionStatus, AXPAuthGuard } from
 import { AXPRefreshEvent, AXPSettingsService, AXPCommonSettings, AXP_PLATFORM_CONFIG_TOKEN, AXPMenuService, AXPMenuVisibilityService, AXPCommonModule } from '@acorex/platform/common';
 import * as i1$3 from '@acorex/platform/core';
 import { AXPDeviceService, AXHighlightService, AXPComponentSlotModule, AXPPlatformScope, AXPBroadcastEventService, AXPContextStore } from '@acorex/platform/core';
-import { AXP_CATEGORY_TREE_ROOT_TITLE_I18N_KEY, AXPEntityDefinitionRegistryService, AXPCategoryTreeService, AXPEntityListViewColumnViewModel, restoreEntityListExpandedRows, AXP_ENTITY_CONFIG_TOKEN } from '@acorex/platform/layout/entity';
+import { AXP_CATEGORY_TREE_ROOT_TITLE_I18N_KEY, AXPEntityDefinitionRegistryService, AXPCategoryTreeService, AXPEntityListViewColumnViewModel, getDataSourcePageIndex, restoreEntityListExpandedRows, AXP_ENTITY_CONFIG_TOKEN } from '@acorex/platform/layout/entity';
 import * as i7$1 from '@acorex/platform/layout/widget-core';
 import { AXPWidgetCoreModule } from '@acorex/platform/layout/widget-core';
 import { AXPWidgetsModule } from '@acorex/platform/layout/widgets';
@@ -1273,7 +1273,10 @@ class AXPEntityMasterToolbarViewComponent {
         this.sortQueries = computed(() => this.vm
             .sortedFields()
             .filter((s) => !!s.dir)
-            .map((s) => ({ name: s.name, dir: s.dir })), ...(ngDevMode ? [{ debugName: "sortQueries" }] : /* istanbul ignore next */ []));
+            .map((s) => ({
+            name: s.name,
+            dir: s.dir,
+        })), ...(ngDevMode ? [{ debugName: "sortQueries" }] : /* istanbul ignore next */ []));
         this.sortDefinitions = computed(() => this.vm.sortableFields().map((s) => ({
             name: s.name,
             title: s.title,
@@ -1284,6 +1287,7 @@ class AXPEntityMasterToolbarViewComponent {
         // Prefer saved settings (view/columns/sorts/filters) if available, then apply
         await this.loadSettings();
         await this.vm.setView();
+        await this.vm.ensureListPagingResolved();
         this.filtersDefinitions.set(this.vm.filtersDef);
         this.isInitializing = true;
         // this.pendingInitialFilters = true;
@@ -1375,6 +1379,9 @@ class AXPEntityMasterToolbarViewComponent {
             const byKey = new Map(prev.map((c) => [keyOf(c), c]));
             return columns.map((newColumn) => {
                 const existing = byKey.get(keyOf(newColumn));
+                if (!existing) {
+                    return null;
+                }
                 return new AXPEntityListViewColumnViewModel(existing.property, {
                     ...existing.column,
                     options: {
@@ -1382,7 +1389,7 @@ class AXPEntityMasterToolbarViewComponent {
                         visible: newColumn.visible,
                     },
                 });
-            });
+            }).filter((c) => c != null);
         });
         // Persist column order/visibility
         this.vm.onColumnsChanged(this.vm.columns());
@@ -1465,9 +1472,16 @@ class AXPEntityMasterListViewComponent extends AXPPageLayoutBaseComponent {
                     this.updateParentHasChildAfterRefresh(refreshTargetId);
                 }
                 else {
+                    if (!resetPagination) {
+                        await this.vm.ensureListPagingResolved();
+                        this.vm.applyPagingToDataSourceWithoutLoad();
+                    }
                     this.grid()?.refresh({
                         reset: resetPagination,
                     });
+                    if (!resetPagination) {
+                        this.scheduleSyncGridPagerUi();
+                    }
                     this.scheduleRestoreExpandedRows();
                 }
             }
@@ -1533,11 +1547,8 @@ class AXPEntityMasterListViewComponent extends AXPPageLayoutBaseComponent {
         }
     }
     onPageChanged(e) {
-        if (e.isUserInteraction) {
-            const pageSizeChanged = e.take != this.vm.dataSource.pageSize;
-            if (pageSizeChanged) {
-                this.vm.saveSettings('pageSize', e.take);
-            }
+        if (e.isUserInteraction && !this.vm.skipListPagingPersistence) {
+            this.vm.saveListPaging(e.take, e.skip);
         }
         this.scheduleRestoreExpandedRows();
     }
@@ -1700,6 +1711,35 @@ class AXPEntityMasterListViewComponent extends AXPPageLayoutBaseComponent {
             }
         });
     }
+    scheduleSyncGridPagerUi() {
+        queueMicrotask(() => {
+            this.syncGridPagerUi();
+        });
+    }
+    syncGridPagerUi() {
+        const gridRef = this.grid();
+        if (!gridRef) {
+            return;
+        }
+        const pageIndex = getDataSourcePageIndex(this.vm.dataSource);
+        const take = this.vm.dataSource.config.pageSize;
+        const pagerPage = pageIndex + 1;
+        const grid = gridRef;
+        this.vm.skipListPagingPersistence = true;
+        try {
+            if (grid.page() !== pageIndex) {
+                grid.page.set(pageIndex);
+            }
+            grid.pageSize.set(take);
+            const pager = grid.dataPager;
+            if (pager && pager.value !== pagerPage) {
+                pager.goToPage(pagerPage);
+            }
+        }
+        finally {
+            this.vm.skipListPagingPersistence = false;
+        }
+    }
     scheduleRestoreExpandedRows() {
         if (!this.vm.parentKey() || this.restoreExpandedRowsScheduled) {
             return;