@canvas-components/list-table 0.3.29 → 0.3.31

package/dist/index.cjs

@@ -24371,7 +24371,8 @@ function resolveExpandedRowHeight2(height, record, index) {
 // src/services/layout-service.ts
 var AUTO_ROW_HEIGHT_SAMPLE_COUNT = 200;
 function buildListTableRenderSnapshot(params) {
-  if (params.cache?.snapshot && params.cache.snapshot.groupIndex === params.cache.groupIndex && isSameRenderCacheInputs(params.cache.inputs, params)) {
+  if (params.cache?.snapshot && // 动画结束后的首帧必须重建，清除上一帧的位移、拖拽残影及插入线。
+  !params.cache.snapshot.swapAnimation && params.cache.snapshot.groupIndex === params.cache.groupIndex && isSameRenderCacheInputs(params.cache.inputs, params)) {
     const snapshotStartedAt2 = resolvePerformanceNow3();
     const cached = params.cache.snapshot;
     const snapshot2 = !cached.swapAnimation && cached.scroll.left === params.scroll.left && cached.scroll.top === params.scroll.top ? cached : updateListTableRenderSnapshotScroll({
@@ -34195,14 +34196,35 @@ var ListTablePersistenceController = class {
     __publicField(this, "revision", 0);
     __publicField(this, "pendingWrite");
     __publicField(this, "restoredStorageKey");
+    __publicField(this, "restoredQueryStorageKey");
     __publicField(this, "hasRestoredPreferences", false);
     __publicField(this, "restoring", false);
+    __publicField(this, "initialActions", []);
     this.options = options;
   }
+  /** 初始化期间的重置等待缓存恢复，避免将默认列和空排序写回缓存。 */
+  runAfterInitialRestore(run) {
+    const storageKey = this.options.getOptions().storageKey;
+    if (storageKey && this.needsInitialQueryRestore()) {
+      this.initialActions.push({ storageKey, run });
+    } else {
+      run();
+    }
+  }
+  /** 销毁时丢弃等待中的交互，避免已卸载表格再次写入缓存。 */
+  dispose() {
+    this.invalidate();
+    this.initialActions = [];
+  }
   /** 缓存恢复完成之前保留上一帧，避免默认配置先于缓存绘制。 */
   isRestoring() {
     return this.restoring;
   }
+  /** 首次缓存读取被配置更新打断时，后续读取仍需恢复该表的查询状态。 */
+  needsInitialQueryRestore() {
+    const storageKey = this.options.getOptions().storageKey;
+    return Boolean(storageKey && this.restoredQueryStorageKey !== storageKey);
+  }
   /** 使尚未完成的缓存恢复失效。 */
   invalidate() {
     this.revision += 1;
@@ -34211,6 +34233,9 @@ var ListTablePersistenceController = class {
   async loadStoredConfig(options = {}) {
     const { restoreQueryState = true } = options;
     const tableOptions = this.options.getOptions();
+    this.initialActions = this.initialActions.filter(
+      (action) => action.storageKey === tableOptions.storageKey
+    );
     const revision = ++this.revision;
     this.restoring = Boolean(tableOptions.storageKey);
     if (!this.restoring) return;
@@ -34222,6 +34247,14 @@ var ListTablePersistenceController = class {
       if (revision === this.revision) {
         this.restoring = false;
         if (this.options.getOptions().storageKey === tableOptions.storageKey) {
+          if (restoreQueryState) {
+            this.restoredQueryStorageKey = tableOptions.storageKey;
+            const actions = this.initialActions;
+            this.initialActions = [];
+            actions.forEach((action) => {
+              if (action.storageKey === tableOptions.storageKey) action.run();
+            });
+          }
           this.options.requestRender();
         }
       }
@@ -34242,6 +34275,9 @@ var ListTablePersistenceController = class {
       columns: tableOptions.columns
     });
     if (!stored || !isCurrent()) {
+      if (!stored && isCurrent() && restoreQueryState) {
+        this.restoredQueryStorageKey = storageKey;
+      }
       return;
     }
     this.restoredStorageKey = storageKey;
@@ -34252,6 +34288,7 @@ var ListTablePersistenceController = class {
     if (restoreQueryState && stored.filterState) {
       this.options.setFilterState(stored.filterState);
     }
+    if (restoreQueryState) this.restoredQueryStorageKey = storageKey;
     if (stored.zoom != null) {
       const nextZoom = normalizeContextMenuZoom(stored.zoom);
       this.options.setTableZoom(nextZoom);
@@ -34259,7 +34296,7 @@ var ListTablePersistenceController = class {
       this.options.canvasHost.setContentZoom(nextZoom);
     }
     let currentOptions = this.options.getOptions();
-    if (stored.scrollbar) {
+    if (stored.scrollbar && !isSameScrollbarOptions(currentOptions.scrollbar, stored.scrollbar)) {
       currentOptions = { ...currentOptions, scrollbar: stored.scrollbar };
       currentOptions.ui?.onScrollbarChange?.(stored.scrollbar);
     }
@@ -34308,16 +34345,19 @@ var ListTablePersistenceController = class {
     }
     this.options.refreshRuntimeColumns();
     currentOptions.ui?.onColumnSettingsChange?.(
-      cloneColumns(currentOptions.columns)
+      cloneColumns(currentOptions.columns),
+      "restore"
     );
   }
   persistColumnConfig() {
     this.invalidate();
     const tableOptions = this.options.getOptions();
     tableOptions.ui?.onColumnSettingsChange?.(
-      cloneColumns(tableOptions.columns)
+      cloneColumns(tableOptions.columns),
+      "persist"
     );
     this.restoredStorageKey = tableOptions.storageKey;
+    this.restoredQueryStorageKey = tableOptions.storageKey;
     this.hasRestoredPreferences = true;
     this.pendingWrite = Promise.resolve(
       persistListTableColumnConfig({
@@ -34335,6 +34375,22 @@ var ListTablePersistenceController = class {
     );
   }
 };
+function isSameScrollbarOptions(current, stored) {
+  if (current === stored) return true;
+  if (!current || !stored) return false;
+  const currentEntries = Object.entries(current);
+  if (currentEntries.length !== Object.keys(stored).length) return false;
+  return currentEntries.every(([key, value]) => {
+    const next = stored[key];
+    if (value && typeof value === "object" && next && typeof next === "object") {
+      const entries = Object.entries(value);
+      return entries.length === Object.keys(next).length && entries.every(
+        ([axisKey, axisValue]) => Object.is(axisValue, next[axisKey])
+      );
+    }
+    return Object.is(value, next);
+  });
+}
 
 // src/services/data-source-service.ts
 function getListTableBaseDisplayData(params) {
@@ -37624,10 +37680,14 @@ var ListTableCore = class {
     if (shouldPersistColumnConfig) {
       this.persistenceController.persistColumnConfig();
     } else {
-      this.persistenceController.loadStoredConfig({ restoreQueryState: false });
+      this.persistenceController.loadStoredConfig({
+        restoreQueryState: this.persistenceController.needsInitialQueryRestore()
+      });
     }
     this.renderController.render();
-    if (shouldPersistColumnConfig && haveVisibleLeafColumnsChanged(previousLeafColumns, host.leafColumns)) {
+    if (shouldPersistColumnConfig && (haveVisibleLeafColumnsChanged(previousLeafColumns, host.leafColumns) || previousLeafColumns.some(
+      (column, index) => column.key !== host.leafColumns[index]?.key
+    ))) {
       host.rowActionController.startColumnVisibilityAnimation({
         previousLeafColumns,
         previousSegments
@@ -37668,7 +37728,9 @@ var ListTableCore = class {
    * 重置排序状态。
    */
   resetSorter() {
-    this.headerActionController.resetSort();
+    this.persistenceController.runAfterInitialRestore(
+      () => this.headerActionController.resetSort()
+    );
   }
   /** 获取当前排序状态，供外部设置面板回显。 */
   getSortState() {
@@ -37682,7 +37744,9 @@ var ListTableCore = class {
    * 重置筛选状态。
    */
   resetFilter() {
-    this.headerActionController.resetFilters();
+    this.persistenceController.runAfterInitialRestore(
+      () => this.headerActionController.resetFilters()
+    );
   }
   /** 人工重试最近一次仍有效的本地查询失败。 */
   retryQuery() {
@@ -37707,7 +37771,7 @@ var ListTableCore = class {
    * 销毁实例。
    */
   destroy() {
-    this.persistenceController.invalidate();
+    this.persistenceController.dispose();
     this.eventController.destroy();
     this.selectionController.destroy();
     this.asAssemblyHost().rowDragController.destroy();

package/dist/index.d.cts

@@ -2130,7 +2130,7 @@ interface ListTableUiOptions<RecordType = unknown> {
     /** 恢复持久化滚动条配置后同步到适配层。 */
     onScrollbarChange?: (scrollbar: ListTableScrollbarOptions) => void;
     /** 同步恢复或内部修改后的列设置到适配层。 */
-    onColumnSettingsChange?: (columns: ListTableColumn<RecordType>[]) => void;
+    onColumnSettingsChange?: (columns: ListTableColumn<RecordType>[], source?: "restore" | "persist") => void;
     /** 同步列设置缓存开关。 */
     onColumnSettingsCacheChange?: (enabled: boolean) => void;
     /** 同步各类配置的缓存偏好。 */

package/dist/index.d.ts

@@ -2130,7 +2130,7 @@ interface ListTableUiOptions<RecordType = unknown> {
     /** 恢复持久化滚动条配置后同步到适配层。 */
     onScrollbarChange?: (scrollbar: ListTableScrollbarOptions) => void;
     /** 同步恢复或内部修改后的列设置到适配层。 */
-    onColumnSettingsChange?: (columns: ListTableColumn<RecordType>[]) => void;
+    onColumnSettingsChange?: (columns: ListTableColumn<RecordType>[], source?: "restore" | "persist") => void;
     /** 同步列设置缓存开关。 */
     onColumnSettingsCacheChange?: (enabled: boolean) => void;
     /** 同步各类配置的缓存偏好。 */

package/dist/index.js

@@ -24349,7 +24349,8 @@ function resolveExpandedRowHeight2(height, record, index) {
 // src/services/layout-service.ts
 var AUTO_ROW_HEIGHT_SAMPLE_COUNT = 200;
 function buildListTableRenderSnapshot(params) {
-  if (params.cache?.snapshot && params.cache.snapshot.groupIndex === params.cache.groupIndex && isSameRenderCacheInputs(params.cache.inputs, params)) {
+  if (params.cache?.snapshot && // 动画结束后的首帧必须重建，清除上一帧的位移、拖拽残影及插入线。
+  !params.cache.snapshot.swapAnimation && params.cache.snapshot.groupIndex === params.cache.groupIndex && isSameRenderCacheInputs(params.cache.inputs, params)) {
     const snapshotStartedAt2 = resolvePerformanceNow3();
     const cached = params.cache.snapshot;
     const snapshot2 = !cached.swapAnimation && cached.scroll.left === params.scroll.left && cached.scroll.top === params.scroll.top ? cached : updateListTableRenderSnapshotScroll({
@@ -34173,14 +34174,35 @@ var ListTablePersistenceController = class {
     __publicField(this, "revision", 0);
     __publicField(this, "pendingWrite");
     __publicField(this, "restoredStorageKey");
+    __publicField(this, "restoredQueryStorageKey");
     __publicField(this, "hasRestoredPreferences", false);
     __publicField(this, "restoring", false);
+    __publicField(this, "initialActions", []);
     this.options = options;
   }
+  /** 初始化期间的重置等待缓存恢复，避免将默认列和空排序写回缓存。 */
+  runAfterInitialRestore(run) {
+    const storageKey = this.options.getOptions().storageKey;
+    if (storageKey && this.needsInitialQueryRestore()) {
+      this.initialActions.push({ storageKey, run });
+    } else {
+      run();
+    }
+  }
+  /** 销毁时丢弃等待中的交互，避免已卸载表格再次写入缓存。 */
+  dispose() {
+    this.invalidate();
+    this.initialActions = [];
+  }
   /** 缓存恢复完成之前保留上一帧，避免默认配置先于缓存绘制。 */
   isRestoring() {
     return this.restoring;
   }
+  /** 首次缓存读取被配置更新打断时，后续读取仍需恢复该表的查询状态。 */
+  needsInitialQueryRestore() {
+    const storageKey = this.options.getOptions().storageKey;
+    return Boolean(storageKey && this.restoredQueryStorageKey !== storageKey);
+  }
   /** 使尚未完成的缓存恢复失效。 */
   invalidate() {
     this.revision += 1;
@@ -34189,6 +34211,9 @@ var ListTablePersistenceController = class {
   async loadStoredConfig(options = {}) {
     const { restoreQueryState = true } = options;
     const tableOptions = this.options.getOptions();
+    this.initialActions = this.initialActions.filter(
+      (action) => action.storageKey === tableOptions.storageKey
+    );
     const revision = ++this.revision;
     this.restoring = Boolean(tableOptions.storageKey);
     if (!this.restoring) return;
@@ -34200,6 +34225,14 @@ var ListTablePersistenceController = class {
       if (revision === this.revision) {
         this.restoring = false;
         if (this.options.getOptions().storageKey === tableOptions.storageKey) {
+          if (restoreQueryState) {
+            this.restoredQueryStorageKey = tableOptions.storageKey;
+            const actions = this.initialActions;
+            this.initialActions = [];
+            actions.forEach((action) => {
+              if (action.storageKey === tableOptions.storageKey) action.run();
+            });
+          }
           this.options.requestRender();
         }
       }
@@ -34220,6 +34253,9 @@ var ListTablePersistenceController = class {
       columns: tableOptions.columns
     });
     if (!stored || !isCurrent()) {
+      if (!stored && isCurrent() && restoreQueryState) {
+        this.restoredQueryStorageKey = storageKey;
+      }
       return;
     }
     this.restoredStorageKey = storageKey;
@@ -34230,6 +34266,7 @@ var ListTablePersistenceController = class {
     if (restoreQueryState && stored.filterState) {
       this.options.setFilterState(stored.filterState);
     }
+    if (restoreQueryState) this.restoredQueryStorageKey = storageKey;
     if (stored.zoom != null) {
       const nextZoom = normalizeContextMenuZoom(stored.zoom);
       this.options.setTableZoom(nextZoom);
@@ -34237,7 +34274,7 @@ var ListTablePersistenceController = class {
       this.options.canvasHost.setContentZoom(nextZoom);
     }
     let currentOptions = this.options.getOptions();
-    if (stored.scrollbar) {
+    if (stored.scrollbar && !isSameScrollbarOptions(currentOptions.scrollbar, stored.scrollbar)) {
       currentOptions = { ...currentOptions, scrollbar: stored.scrollbar };
       currentOptions.ui?.onScrollbarChange?.(stored.scrollbar);
     }
@@ -34286,16 +34323,19 @@ var ListTablePersistenceController = class {
     }
     this.options.refreshRuntimeColumns();
     currentOptions.ui?.onColumnSettingsChange?.(
-      cloneColumns(currentOptions.columns)
+      cloneColumns(currentOptions.columns),
+      "restore"
     );
   }
   persistColumnConfig() {
     this.invalidate();
     const tableOptions = this.options.getOptions();
     tableOptions.ui?.onColumnSettingsChange?.(
-      cloneColumns(tableOptions.columns)
+      cloneColumns(tableOptions.columns),
+      "persist"
     );
     this.restoredStorageKey = tableOptions.storageKey;
+    this.restoredQueryStorageKey = tableOptions.storageKey;
     this.hasRestoredPreferences = true;
     this.pendingWrite = Promise.resolve(
       persistListTableColumnConfig({
@@ -34313,6 +34353,22 @@ var ListTablePersistenceController = class {
     );
   }
 };
+function isSameScrollbarOptions(current, stored) {
+  if (current === stored) return true;
+  if (!current || !stored) return false;
+  const currentEntries = Object.entries(current);
+  if (currentEntries.length !== Object.keys(stored).length) return false;
+  return currentEntries.every(([key, value]) => {
+    const next = stored[key];
+    if (value && typeof value === "object" && next && typeof next === "object") {
+      const entries = Object.entries(value);
+      return entries.length === Object.keys(next).length && entries.every(
+        ([axisKey, axisValue]) => Object.is(axisValue, next[axisKey])
+      );
+    }
+    return Object.is(value, next);
+  });
+}
 
 // src/services/data-source-service.ts
 function getListTableBaseDisplayData(params) {
@@ -37602,10 +37658,14 @@ var ListTableCore = class {
     if (shouldPersistColumnConfig) {
       this.persistenceController.persistColumnConfig();
     } else {
-      this.persistenceController.loadStoredConfig({ restoreQueryState: false });
+      this.persistenceController.loadStoredConfig({
+        restoreQueryState: this.persistenceController.needsInitialQueryRestore()
+      });
     }
     this.renderController.render();
-    if (shouldPersistColumnConfig && haveVisibleLeafColumnsChanged(previousLeafColumns, host.leafColumns)) {
+    if (shouldPersistColumnConfig && (haveVisibleLeafColumnsChanged(previousLeafColumns, host.leafColumns) || previousLeafColumns.some(
+      (column, index) => column.key !== host.leafColumns[index]?.key
+    ))) {
       host.rowActionController.startColumnVisibilityAnimation({
         previousLeafColumns,
         previousSegments
@@ -37646,7 +37706,9 @@ var ListTableCore = class {
    * 重置排序状态。
    */
   resetSorter() {
-    this.headerActionController.resetSort();
+    this.persistenceController.runAfterInitialRestore(
+      () => this.headerActionController.resetSort()
+    );
   }
   /** 获取当前排序状态，供外部设置面板回显。 */
   getSortState() {
@@ -37660,7 +37722,9 @@ var ListTableCore = class {
    * 重置筛选状态。
    */
   resetFilter() {
-    this.headerActionController.resetFilters();
+    this.persistenceController.runAfterInitialRestore(
+      () => this.headerActionController.resetFilters()
+    );
   }
   /** 人工重试最近一次仍有效的本地查询失败。 */
   retryQuery() {
@@ -37685,7 +37749,7 @@ var ListTableCore = class {
    * 销毁实例。
    */
   destroy() {
-    this.persistenceController.invalidate();
+    this.persistenceController.dispose();
     this.eventController.destroy();
     this.selectionController.destroy();
     this.asAssemblyHost().rowDragController.destroy();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canvas-components/list-table",
-  "version": "0.3.29",
+  "version": "0.3.31",
   "description": "Framework-agnostic list table core engine.",
   "license": "MIT",
   "type": "module",
@@ -30,8 +30,8 @@
     "@canvas-components/barcode": "0.2.2",
     "@canvas-components/stats": "0.1.4",
     "@canvas-components/utils": "0.2.8",
-    "@canvas-components/qrcode": "0.2.2",
-    "@canvas-components/chart": "0.3.7"
+    "@canvas-components/chart": "0.3.7",
+    "@canvas-components/qrcode": "0.2.2"
   },
   "scripts": {
     "build": "tsup --config tsup.config.ts"