@visactor/vtable 0.21.4-alpha.4 → 0.22.0

package/cjs/ListTable.d.ts

@@ -34,9 +34,7 @@ export declare class ListTable extends BaseTable implements ListTableAPI {
     getCellOriginRecord(col: number, row: number): MaybePromiseOrUndefined;
     getCellRawRecord(col: number, row: number): MaybePromiseOrUndefined;
     _canResizeColumn(col: number, row: number): boolean;
-    updateOption(options: ListTableConstructorOptions & {
-        restoreHierarchyState?: boolean;
-    }): Promise<unknown>;
+    updateOption(options: ListTableConstructorOptions): Promise<unknown>;
     updatePagination(pagination: IPagination): void;
     refreshHeader(): void;
     refreshRowColCount(): void;
@@ -49,6 +47,7 @@ export declare class ListTable extends BaseTable implements ListTableAPI {
         targetSize: number;
         moveType: "row" | "column";
     };
+    changeRecordOrder(sourceIndex: number, targetIndex: number): void;
     getCellAddress(findTargetRecord: any | ((record: any) => boolean), field: FieldDef): CellAddress;
     getCellRangeByField(field: FieldDef, index: number): CellRange | null;
     getHierarchyState(col: number, row: number): HierarchyState;
@@ -62,7 +61,6 @@ export declare class ListTable extends BaseTable implements ListTableAPI {
     getCheckboxState(field?: string | number): boolean[] | Record<string | number, boolean>[];
     getCellCheckboxState(col: number, row: number): boolean;
     setRecords(records: Array<any>, option?: {
-        restoreHierarchyState?: boolean;
         sortState?: SortState | SortState[];
     }): void;
     setRecordChildren(records: any[], col: number, row: number): void;

package/cjs/ListTable.js

@@ -107,6 +107,14 @@ class ListTable extends core_1.BaseTable {
         const customMergeText = this.getCustomMergeValue(col, row);
         if (customMergeText) return customMergeText;
         const table = this;
+        if (table.internalProps.layoutMap.isSeriesNumber(col, row)) {
+            if (table.internalProps.layoutMap.isSeriesNumberInHeader(col, row)) {
+                const {title: title} = table.internalProps.layoutMap.getSeriesNumberHeader(col, row);
+                return title;
+            }
+            const {format: format} = table.internalProps.layoutMap.getSeriesNumberBody(col, row);
+            return "function" == typeof format ? format(col, row, this) : row - this.columnHeaderLevelCount + 1;
+        }
         if (table.internalProps.layoutMap.isHeader(col, row)) {
             const {title: title} = table.internalProps.layoutMap.getHeader(col, row);
             return "function" == typeof title ? title() : title;
@@ -127,6 +135,14 @@ class ListTable extends core_1.BaseTable {
     getCellOriginValue(col, row) {
         if (-1 === col || -1 === row) return null;
         const table = this;
+        if (table.internalProps.layoutMap.isSeriesNumber(col, row)) {
+            if (table.internalProps.layoutMap.isSeriesNumberInHeader(col, row)) {
+                const {title: title} = table.internalProps.layoutMap.getSeriesNumberHeader(col, row);
+                return title;
+            }
+            const {format: format} = table.internalProps.layoutMap.getSeriesNumberBody(col, row);
+            return "function" == typeof format ? format(col, row, this) : row - this.columnHeaderLevelCount;
+        }
         if (table.internalProps.layoutMap.isHeader(col, row)) {
             const {title: title} = table.internalProps.layoutMap.getHeader(col, row);
             return "function" == typeof title ? title() : title;
@@ -207,7 +223,6 @@ class ListTable extends core_1.BaseTable {
             var _a;
             return null === (_a = null == releaseObj ? void 0 : releaseObj.release) || void 0 === _a ? void 0 : _a.call(releaseObj);
         })), internalProps.releaseList = null), options.dataSource ? (0, tableHelper_1._setDataSource)(this, options.dataSource) : options.records ? this.setRecords(options.records, {
-            restoreHierarchyState: options.restoreHierarchyState,
             sortState: options.sortState
         }) : (this._resetFrozenColCount(), this.scenegraph.createSceneGraph(), this.render()), 
         options.title && (internalProps.title = new title_1.Title(options.title, this), 
@@ -234,24 +249,24 @@ class ListTable extends core_1.BaseTable {
         this.refreshRowColCount();
     }
     refreshRowColCount() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         const table = this, {layoutMap: layoutMap} = table.internalProps;
         layoutMap && (layoutMap.recordsCount = (null !== (_b = null === (_a = table.internalProps.dataSource) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0) + layoutMap.hasAggregationOnTopCount + layoutMap.hasAggregationOnBottomCount, 
         table.transpose ? (table.rowCount = null !== (_c = layoutMap.rowCount) && void 0 !== _c ? _c : 0, 
-        table.colCount = layoutMap.recordsCount * layoutMap.bodyRowSpanCount + layoutMap.headerLevelCount, 
-        table.frozenRowCount = 0, this.internalProps.frozenColCount = null !== (_d = layoutMap.headerLevelCount) && void 0 !== _d ? _d : 0, 
-        table.bottomFrozenRowCount !== (null !== (_e = this.options.bottomFrozenRowCount) && void 0 !== _e ? _e : 0) && (table.bottomFrozenRowCount = null !== (_f = this.options.bottomFrozenRowCount) && void 0 !== _f ? _f : 0), 
-        table.rightFrozenColCount !== (null !== (_g = this.options.rightFrozenColCount) && void 0 !== _g ? _g : 0) && (table.rightFrozenColCount = null !== (_h = this.options.rightFrozenColCount) && void 0 !== _h ? _h : 0)) : (table.colCount = null !== (_j = layoutMap.colCount) && void 0 !== _j ? _j : 0, 
+        table.colCount = null !== (_d = layoutMap.colCount) && void 0 !== _d ? _d : 0, table.frozenRowCount = 0, 
+        this.internalProps.frozenColCount = Math.max((null !== (_e = layoutMap.headerLevelCount) && void 0 !== _e ? _e : 0) + layoutMap.leftRowSeriesNumberColumnCount, null !== (_f = this.options.frozenColCount) && void 0 !== _f ? _f : 0), 
+        table.bottomFrozenRowCount !== (null !== (_g = this.options.bottomFrozenRowCount) && void 0 !== _g ? _g : 0) && (table.bottomFrozenRowCount = null !== (_h = this.options.bottomFrozenRowCount) && void 0 !== _h ? _h : 0), 
+        table.rightFrozenColCount !== (null !== (_j = this.options.rightFrozenColCount) && void 0 !== _j ? _j : 0) && (table.rightFrozenColCount = null !== (_k = this.options.rightFrozenColCount) && void 0 !== _k ? _k : 0)) : (table.colCount = null !== (_l = layoutMap.colCount) && void 0 !== _l ? _l : 0, 
         table.rowCount = layoutMap.recordsCount * layoutMap.bodyRowSpanCount + layoutMap.headerLevelCount, 
-        this.internalProps.frozenColCount = null !== (_k = this.options.frozenColCount) && void 0 !== _k ? _k : 0, 
-        table.frozenRowCount = layoutMap.headerLevelCount, table.bottomFrozenRowCount !== (null !== (_l = this.options.bottomFrozenRowCount) && void 0 !== _l ? _l : 0) && (table.bottomFrozenRowCount = null !== (_m = this.options.bottomFrozenRowCount) && void 0 !== _m ? _m : 0), 
-        table.rightFrozenColCount !== (null !== (_o = this.options.rightFrozenColCount) && void 0 !== _o ? _o : 0) && (table.rightFrozenColCount = null !== (_p = this.options.rightFrozenColCount) && void 0 !== _p ? _p : 0)), 
+        this.internalProps.frozenColCount = null !== (_m = this.options.frozenColCount) && void 0 !== _m ? _m : 0, 
+        table.frozenRowCount = layoutMap.headerLevelCount, table.bottomFrozenRowCount !== (null !== (_o = this.options.bottomFrozenRowCount) && void 0 !== _o ? _o : 0) && (table.bottomFrozenRowCount = null !== (_p = this.options.bottomFrozenRowCount) && void 0 !== _p ? _p : 0), 
+        table.rightFrozenColCount !== (null !== (_q = this.options.rightFrozenColCount) && void 0 !== _q ? _q : 0) && (table.rightFrozenColCount = null !== (_r = this.options.rightFrozenColCount) && void 0 !== _r ? _r : 0)), 
         this.stateManager.setFrozenCol(this.internalProps.frozenColCount));
     }
     getFieldData(field, col, row) {
         if (null === field) return null;
         if (this.internalProps.layoutMap.isHeader(col, row)) return null;
-        const index = this.getRecordShowIndexByCell(col, row);
+        const index = this.getRecordShowIndexByCell(this.transpose ? col - this.internalProps.layoutMap.leftRowSeriesNumberColumnCount : col, row);
         return this.internalProps.dataSource.getField(index, field, col, row, this);
     }
     getRawFieldData(field, col, row) {
@@ -262,10 +277,10 @@ class ListTable extends core_1.BaseTable {
     }
     _moveHeaderPosition(source, target) {
         var _a, _b;
-        const moveContext = this.internalProps.layoutMap.moveHeaderPosition(source, target);
+        const sourceCellRange = this.getCellRange(source.col, source.row), targetCellRange = this.getCellRange(target.col, target.row), moveContext = this.internalProps.layoutMap.moveHeaderPosition(source, target);
         if (moveContext) {
             if ("column" === moveContext.moveType) {
-                if (this.colWidthsMap.adjustOrder(moveContext.sourceIndex, moveContext.targetIndex, moveContext.sourceSize), 
+                if (this.colWidthsMap.exchangeOrder(sourceCellRange.start.col, sourceCellRange.end.col - sourceCellRange.start.col + 1, targetCellRange.start.col, targetCellRange.end.col - targetCellRange.start.col + 1, moveContext.targetIndex), 
                 !this.transpose) {
                     this.colWidthsLimit = {};
                     for (let col = 0; col < this.internalProps.layoutMap.columnWidths.length; col++) {
@@ -274,16 +289,15 @@ class ListTable extends core_1.BaseTable {
                         maxWidth && ("number" == typeof maxWidth && maxWidth > 0 || "string" == typeof maxWidth) && this.setMaxColWidth(col, maxWidth);
                     }
                 }
-                const colStart = Math.min(moveContext.sourceIndex, moveContext.targetIndex), colEnd = Math.max(moveContext.sourceIndex, moveContext.targetIndex);
-                for (let col = colStart; col <= colEnd; col++) this._clearColRangeWidthsMap(col);
-            } else {
-                const rowStart = Math.min(moveContext.sourceIndex, moveContext.targetIndex), rowEnd = Math.max(moveContext.sourceIndex, moveContext.targetIndex);
-                for (let row = rowStart; row <= rowEnd; row++) this._clearRowRangeHeightsMap(row);
-            }
+            } else moveContext.targetIndex > moveContext.sourceIndex ? this.rowHeightsMap.exchangeOrder(moveContext.sourceIndex, moveContext.sourceSize, moveContext.targetIndex + moveContext.sourceSize - moveContext.targetSize, moveContext.targetSize, moveContext.targetIndex) : this.rowHeightsMap.exchangeOrder(moveContext.sourceIndex, moveContext.sourceSize, moveContext.targetIndex, moveContext.targetSize, moveContext.targetIndex);
             return moveContext;
         }
         return null;
     }
+    changeRecordOrder(sourceIndex, targetIndex) {
+        this.transpose ? (sourceIndex = this.getRecordShowIndexByCell(sourceIndex, 0), targetIndex = this.getRecordShowIndexByCell(targetIndex, 0)) : (sourceIndex = this.getRecordShowIndexByCell(0, sourceIndex), 
+        targetIndex = this.getRecordShowIndexByCell(0, targetIndex)), this.dataSource.reorderRecord(sourceIndex, targetIndex);
+    }
     getCellAddress(findTargetRecord, field) {
         let targetRecordIndex;
         for (let i = 0; i < this.internalProps.records.length; i++) {
@@ -419,7 +433,7 @@ class ListTable extends core_1.BaseTable {
         }
     }
     setRecords(records, option) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a;
         let sort;
         Array.isArray(option) || (null == option ? void 0 : option.order) ? sort = option : option ? sort = option.sortState : null === option && (sort = null);
         "undefined" != typeof window && window.performance.now();
@@ -427,23 +441,18 @@ class ListTable extends core_1.BaseTable {
             col: this.stateManager.hover.cellPos.col,
             row: this.stateManager.hover.cellPos.row
         };
-        this.scenegraph.clearCells(), void 0 !== sort && (this.internalProps.sortState = sort, 
-        this.stateManager.setSortState(this.sortState));
-        const currentPagerIndexedData = null === (_a = this.dataSource) || void 0 === _a ? void 0 : _a._currentPagerIndexedData, currentIndexedData = null === (_b = this.dataSource) || void 0 === _b ? void 0 : _b.currentIndexedData, treeDataHierarchyState = null === (_c = this.dataSource) || void 0 === _c ? void 0 : _c.treeDataHierarchyState, oldRecordLength = null !== (_e = null === (_d = this.records) || void 0 === _d ? void 0 : _d.length) && void 0 !== _e ? _e : 0;
-        if (records) {
+        if (this.scenegraph.clearCells(), void 0 !== sort && (this.internalProps.sortState = sort, 
+        this.stateManager.setSortState(this.sortState)), records) {
             if ((0, tableHelper_1._setRecords)(this, records), this.sortState) {
                 let order, field;
-                if (Array.isArray(this.sortState) ? 0 !== this.sortState.length && ({order: order, field: field} = null === (_f = this.sortState) || void 0 === _f ? void 0 : _f[0]) : ({order: order, field: field} = this.sortState), 
+                if (Array.isArray(this.sortState) ? 0 !== this.sortState.length && ({order: order, field: field} = null === (_a = this.sortState) || void 0 === _a ? void 0 : _a[0]) : ({order: order, field: field} = this.sortState), 
                 order && field && "normal" !== order) {
                     const sortFunc = this._getSortFuncFromHeaderOption(void 0, field), hd = this.internalProps.layoutMap.headerObjects.find((col => col && col.field === field));
                     !1 !== hd.define.sort && this.dataSource.sort(hd.field, order, null != sortFunc ? sortFunc : util_1.defaultOrderFn);
                 }
             }
-            (null == option ? void 0 : option.restoreHierarchyState) && oldRecordLength === (null === (_g = this.records) || void 0 === _g ? void 0 : _g.length) && (this.dataSource._currentPagerIndexedData = currentPagerIndexedData, 
-            this.dataSource.currentIndexedData = currentIndexedData, this.dataSource.treeDataHierarchyState = treeDataHierarchyState), 
             this.refreshRowColCount();
-        } else (0, tableHelper_1._setRecords)(this, records), (null == option ? void 0 : option.restoreHierarchyState) && oldRecordLength === (null === (_h = this.records) || void 0 === _h ? void 0 : _h.length) && (this.dataSource._currentPagerIndexedData = currentPagerIndexedData, 
-        this.dataSource.currentIndexedData = currentIndexedData, this.dataSource.treeDataHierarchyState = treeDataHierarchyState);
+        } else (0, tableHelper_1._setRecords)(this, records);
         this.stateManager.initCheckedState(records), this.clearCellStyleCache(), this.scenegraph.createSceneGraph(), 
         this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row), this.internalProps.title && !this.internalProps.title.isReleased && (this._updateSize(), 
         this.internalProps.title.resize(), this.scenegraph.resize()), this.render();