Merge pull request #3784 from VisActor/3768-bug-updateoption-dataSource-error

3768 bug updateoption data source error

Author: fangsmile

common/changes/@visactor/vtable/3768-bug-updateoption-dataSource-error_2025-04-21-09-55.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: updateOption with dataSource object occor error #3768\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "892739385@qq.com"
+}

docs/assets/api/en/methods.md

@@ -6,12 +6,19 @@
 
 Update table configuration items, which will be automatically redrawn after being called.
 
+updateConfig parameter description:
+
+- keepData: When the new option does not pass in records or dataSource, whether to retain the original data. The default is false
+
 ```ts
   /**
    *Update options currently only support full updates
    * @param options
    */
-  updateOption(options: BaseTableConstructorOptions) => void
+  updateOption(options: BaseTableConstructorOptions,updateConfig?:{
+    //When the new option does not pass in records or dataSource, whether to retain the original data. The default is false
+    keepData?:boolean
+  }) => void
 ```
 
 If you need to update a single configuration item, please refer to the other `update**` interfaces below

docs/assets/api/zh/methods.md

@@ -4,14 +4,21 @@
 
 ## updateOption(Function)
 
-更新表格配置项，调用后会自动重绘
+更新表格配置项，调用后会自动重绘。
+
+updateConfig 参数说明：
+
+- keepData: 当新的option没有传入records或者dataSource时，是否保留原本的数据。默认为false
 
 ```ts
   /**
    * 更新options 目前只支持全量更新
    * @param options
    */
-  updateOption(options: BaseTableConstructorOptions) => void
+  updateOption(options: BaseTableConstructorOptions,updateConfig?:{
+    //当新的option没有传入records或者dataSource时，是否保留原本的数据
+    keepData?:boolean
+  }) => void
 ```
 
 如果需要更新单个配置项，请参考下面其他`update**`接口

packages/vtable/src/ListTable.ts

@@ -43,7 +43,7 @@ import { getGroupCheckboxState, setCellCheckboxState } from './state/checkbox/ch
 import type { IEmptyTipComponent } from './components/empty-tip/empty-tip';
 import { Factory } from './core/factory';
 import { getGroupByDataConfig } from './core/group-helper';
-import type { CachedDataSource } from './data';
+import { DataSource, type CachedDataSource } from './data';
 import {
   listTableAddRecord,
   listTableAddRecords,
@@ -478,7 +478,15 @@ export class ListTable extends BaseTable implements ListTableAPI {
     }
     return ifCan;
   }
-  updateOption(options: ListTableConstructorOptions) {
+  updateOption(
+    options: ListTableConstructorOptions,
+    updateConfig: {
+      //当新的option没有传入records或者dataSource时，是否保留原本的数据
+      keepData?: boolean;
+    } = {
+      keepData: false
+    }
+  ) {
     const internalProps = this.internalProps;
     super.updateOption(options);
     internalProps.frozenColDragHeaderMode =
@@ -515,21 +523,29 @@ export class ListTable extends BaseTable implements ListTableAPI {
     // this.hasMedia = null; // 避免重复绑定
     // 清空目前数据
     if (internalProps.releaseList) {
-      internalProps.releaseList.forEach(releaseObj => releaseObj?.release?.());
-      internalProps.releaseList = null;
+      for (let i = internalProps.releaseList.length - 1; i >= 0; i--) {
+        const releaseObj = internalProps.releaseList[i];
+        if (updateConfig.keepData && releaseObj instanceof DataSource) {
+          releaseObj.updateColumns(this.internalProps.columns);
+        } else {
+          releaseObj?.release?.();
+          internalProps.releaseList.splice(i, 1);
+        }
+      }
     }
     // // 恢复selection状态
     // internalProps.selection.range = range;
     // this._updateSize();
     // 传入新数据
-    if (options.dataSource) {
+    if (options.dataSource && this.dataSource !== options.dataSource) {
       // _setDataSource(this, options.dataSource);
       this.dataSource = options.dataSource;
     } else if (options.records) {
       this.setRecords(options.records as any, {
         sortState: options.sortState
       });
     } else {
+      this.refreshRowColCount();
       this._resetFrozenColCount();
       // 生成单元格场景树
       this.scenegraph.createSceneGraph();

packages/vtable/src/core/tableHelper.ts

@@ -86,7 +86,14 @@ function getHierarchyExpandLevel(table: ListTableAPI) {
 
 export function _setDataSource(table: BaseTableAPI, dataSource: DataSource): void {
   _dealWithUpdateDataSource(table, () => {
-    table.internalProps.dataSource && table.internalProps.dataSource.release?.();
+    if (table.internalProps.dataSource) {
+      table.internalProps.releaseList.forEach(releaseObj => {
+        if (releaseObj instanceof DataSource) {
+          releaseObj.release();
+          table.internalProps.releaseList.splice(table.internalProps.releaseList.indexOf(releaseObj), 1);
+        }
+      });
+    }
     if (dataSource) {
       if (dataSource instanceof DataSource) {
         table.internalProps.dataSource = dataSource;

packages/vtable/src/data/DataSource.ts

@@ -1285,6 +1285,9 @@ export class DataSource extends EventTarget implements DataSourceAPI {
   release(): void {
     super.release?.();
     this.lastFilterRules = null;
+    this.clearSortedMap();
+    this.clearCurrentIndexedData();
+    this.currentPagerIndexedData.length = 0;
   }
   clearSortedMap() {
     this.currentIndexedData && (this.currentIndexedData.length = 0);