@visactor/vtable 0.12.1 → 0.12.3-alpha.0

package/dist/vtable.js

@@ -3043,7 +3043,8 @@
         LEGEND_CHANGE: 'legend_change',
         MOUSEENTER_AXIS: 'mouseenter_axis',
         MOUSELEAVE_AXIS: 'mouseleave_axis',
-        AFTER_STAGE_RENDER: 'after_stage_render'
+        AFTER_RENDER: 'after_render',
+        INITIALIZED: 'initialized'
     };
 
     const judgeType = (value) => {
@@ -3704,7 +3705,7 @@
             hoverBgColor: '#EEE'
         },
         selectionStyle: {
-            cellBgColor: '#29364D',
+            cellBgColor: 'rgba(255, 255, 255, 0.1)',
             cellBorderColor: '#4284FF',
             cellBorderLineWidth: 2
         }
@@ -4024,7 +4025,7 @@
             lineColor: '#416EFF',
             bgColor: '#D9E2FF'
         },
-        selectionStyle: { cellBorderColor: '#FD5', cellBgColor: '#6FA8DC' }
+        selectionStyle: { cellBorderColor: '#FD5', cellBgColor: 'rgba(111, 168, 220, 0.1)' }
     };
 
     const themes$2 = {};
@@ -43948,7 +43949,7 @@
             }
         }
     }
-    function checkFirstColMerge(col, scrolling, proxy) {
+    function checkFirstColMerge(col, proxy) {
         for (let row = 0; row < proxy.table.rowCount; row++) {
             if ((row >= proxy.table.columnHeaderLevelCount && row < proxy.rowStart) ||
                 (row > proxy.rowEnd && row < proxy.table.rowCount - proxy.table.bottomFrozenRowCount)) {
@@ -43964,6 +43965,11 @@
                 newCellGroup.col = col;
                 newCellGroup.row = row;
                 newCellGroup.setAttribute('x', proxy.table.getColsWidth(proxy.table.rowHeaderLevelCount, range.start.col - 1) - oldCellGroup.parent.attribute.x);
+                newCellGroup.setAttributes({
+                    x: proxy.table.getColsWidth(proxy.table.rowHeaderLevelCount, range.start.col - 1) -
+                        oldCellGroup.parent.attribute.x,
+                    y: proxy.table.getRowsHeight(0, range.start.row - 1) - oldCellGroup.parent.attribute.y
+                });
                 oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);
                 oldCellGroup.parent.removeChild(oldCellGroup);
                 oldCellGroup.needUpdate = false;
@@ -43982,7 +43988,8 @@
                 cellGroup.setAttributes({
                     width: 0,
                     height: proxy.table.getRowHeight(cellGroup.row),
-                    y: proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, cellGroup.row - 1)
+                    y: proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, cellGroup.row - 1),
+                    x: 0
                 });
                 cellGroup.clear();
             }
@@ -43991,12 +43998,13 @@
     function clearHadMergedColumn(colStart, colEnd, row, proxy) {
         for (let col = colStart; col <= colEnd; col++) {
             const cellGroup = proxy.highPerformanceGetCell(col, row, true);
-            if (cellGroup.role !== 'shadow-cell' && cellGroup.role !== 'empty' && cellGroup.row !== colStart) {
+            if (cellGroup.role !== 'shadow-cell' && cellGroup.role !== 'empty' && cellGroup.col !== colStart) {
                 cellGroup.role = 'shadow-cell';
                 cellGroup.setAttributes({
                     width: 0,
                     height: proxy.table.getRowHeight(cellGroup.row),
-                    y: proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, cellGroup.row - 1)
+                    y: proxy.table.getRowsHeight(0, cellGroup.row - 1),
+                    x: 0
                 });
                 cellGroup.clear();
             }
@@ -44120,8 +44128,8 @@
             const syncRightCol = distEndCol;
             proxy.colStart = direction === 'left' ? proxy.colStart + count : proxy.colStart - count;
             proxy.colEnd = direction === 'left' ? proxy.colEnd + count : proxy.colEnd - count;
-            checkFirstColMerge(distStartCol, true, proxy);
             updateColContent(syncLeftCol, syncRightCol, proxy);
+            checkFirstColMerge(distStartCol, proxy);
             updateAutoColumn(syncLeftCol, syncRightCol, proxy.table, direction);
             const colGroup = proxy.table.scenegraph.getColGroup(screenLeftCol);
             const deltaX = screenLeftX - (colGroup.attribute.x + proxy.table.getFrozenColsWidth() + proxy.table.scenegraph.proxy.deltaX);
@@ -44143,8 +44151,8 @@
             const syncRightCol = distEndCol;
             proxy.colStart = distStartCol;
             proxy.colEnd = distEndCol;
-            checkFirstColMerge(distStartCol, false, proxy);
             updateColContent(syncLeftCol, syncRightCol, proxy);
+            checkFirstColMerge(distStartCol, proxy);
             updateAutoColumn(syncLeftCol, syncRightCol, proxy.table, distEndCol > proxy.bodyRightCol - (proxy.colEnd - proxy.colStart + 1) ? 'right' : 'left');
             proxy.table.scenegraph.proxy.deltaX = 0;
             proxy.currentCol = direction === 'left' ? proxy.currentCol + count : proxy.currentCol - count;
@@ -44576,7 +44584,7 @@
             }
         }
         setParamsForColumn() {
-            this.bodyLeftCol = this.table.rowHeaderLevelCount;
+            this.bodyLeftCol = this.table.frozenColCount;
             this.bodyRightCol = this.table.colCount - 1 - this.table.rightFrozenColCount;
             const totalActualBodyColCount = Math.min(this.colLimit, this.bodyRightCol - this.bodyLeftCol + 1);
             this.totalCol = this.bodyLeftCol + totalActualBodyColCount - 1;
@@ -44658,11 +44666,11 @@
         createRowCellGroup(onceCount) {
             const endRow = Math.min(this.totalRow, this.currentRow + onceCount);
             computeRowsHeight(this.table, this.currentRow + 1, endRow, false);
-            if (this.table.rowHeaderLevelCount) {
+            if (this.table.frozenColCount) {
                 let maxHeight = 0;
-                for (let col = 0; col < this.table.rowHeaderLevelCount; col++) {
+                for (let col = 0; col < this.table.frozenColCount; col++) {
                     const colGroup = this.table.scenegraph.getColGroup(col);
-                    const cellLocation = 'rowHeader';
+                    const cellLocation = this.table.isListTable() ? 'body' : 'rowHeader';
                     const { height } = createComplexColumn(colGroup, col, colGroup.attribute.width, this.currentRow + 1, endRow, this.table.scenegraph.mergeMap, this.table.internalProps.defaultRowHeight, this.table, cellLocation);
                     maxHeight = Math.max(maxHeight, height);
                     this.table.scenegraph.rowHeaderGroup.setAttribute('height', maxHeight);
@@ -44672,7 +44680,7 @@
                 let maxHeight = 0;
                 for (let col = this.table.colCount - this.table.rightFrozenColCount; col < this.table.colCount; col++) {
                     const colGroup = this.table.scenegraph.getColGroup(col);
-                    const cellLocation = 'rowHeader';
+                    const cellLocation = this.table.isListTable() ? 'body' : 'rowHeader';
                     const { height } = createComplexColumn(colGroup, col, colGroup.attribute.width, this.currentRow + 1, endRow, this.table.scenegraph.mergeMap, this.table.internalProps.defaultRowHeight, this.table, cellLocation);
                     maxHeight = Math.max(maxHeight, height);
                     this.table.scenegraph.rightFrozenGroup.setAttribute('height', maxHeight);
@@ -44681,6 +44689,9 @@
             let maxHeight = 0;
             for (let col = this.bodyLeftCol; col <= this.bodyRightCol; col++) {
                 const colGroup = this.table.scenegraph.getColGroup(col);
+                if (!colGroup) {
+                    continue;
+                }
                 const cellLocation = 'body';
                 const { height } = createComplexColumn(colGroup, col, colGroup.attribute.width, this.currentRow + 1, endRow, this.table.scenegraph.mergeMap, this.table.internalProps.defaultRowHeight, this.table, cellLocation);
                 maxHeight = Math.max(maxHeight, height);
@@ -45350,6 +45361,9 @@
         const colEnd = table.getAllColsWidth() > table.tableNoFrameWidth
             ? table.getColAt(scrollLeft + table.tableNoFrameWidth - 1).col
             : table.colCount - 1;
+        if (colEnd < 0 || rowEnd < 0) {
+            return;
+        }
         for (let row = 0; row < frozenRowCount; row++) {
             for (let col = colStart; col <= colEnd; col++) {
                 if (table._getCellStyle(col, row)?.textStick) {
@@ -46149,7 +46163,7 @@
                 enableLayout: true,
                 pluginList: table.isPivotChart() ? ['poptipForText'] : undefined,
                 afterRender: () => {
-                    this.table.fireListeners('after_stage_render', null);
+                    this.table.fireListeners('after_render', null);
                 }
             });
             this.stage.defaultLayer.setTheme({
@@ -49843,11 +49857,6 @@
             }
             const { eventArgs } = eventArgsSet;
             if (eventArgs) {
-                if (!this.table.isPivotChart() &&
-                    eventArgsSet?.eventArgs?.target.type !== 'chart' &&
-                    eventArgs.event.pointerType !== 'touch') {
-                    this.table.stateManeger.updateHoverPos(-1, -1);
-                }
                 if (this.table.isPivotChart() &&
                     (eventArgsSet?.eventArgs?.target.name === 'axis-label' || eventArgsSet?.eventArgs?.target.type === 'chart')) {
                     this.table.stateManeger.updateSelectPos(-1, -1);
@@ -52720,7 +52729,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.12.1";
+        version = "0.12.3-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -53548,6 +53557,9 @@
         render() {
             this.scenegraph.renderSceneGraph();
         }
+        renderAsync() {
+            this.scenegraph.updateNextFrame();
+        }
         _toRelativeRect(absoluteRect) {
             const rect = absoluteRect.copy();
             const visibleRect = this.getVisibleRect();
@@ -55976,6 +55988,9 @@
                 internalProps.title = new Title(options.title, this);
                 this.scenegraph.resize();
             }
+            setTimeout(() => {
+                this.fireListeners(TABLE_EVENT_TYPE.INITIALIZED, null);
+            }, 0);
         }
         isListTable() {
             return true;
@@ -55997,7 +56012,7 @@
             this.headerStyleCache = new Map();
             this.bodyStyleCache = new Map();
             this.scenegraph.createSceneGraph();
-            this.render();
+            this.renderAsync();
         }
         get header() {
             return this.internalProps.columns;
@@ -56006,9 +56021,7 @@
             this.internalProps.columns = header;
             this.options.header = header;
             this.refreshHeader();
-            setTimeout(() => {
-                this.render();
-            }, 0);
+            this.renderAsync();
         }
         get transpose() {
             return this.internalProps.transpose ?? false;
@@ -56023,10 +56036,13 @@
                 this.internalProps.layoutMap.transpose = transpose;
                 this.refreshRowColCount();
                 this._resetFrozenColCount();
-                this.render();
+                this.renderAsync();
             }
         }
         getCellValue(col, row) {
+            if (col === -1 || row === -1) {
+                return null;
+            }
             const table = this;
             if (table.internalProps.layoutMap.isHeader(col, row)) {
                 const { title } = table.internalProps.layoutMap.getHeader(col, row);
@@ -56036,6 +56052,9 @@
             return table.getFieldData(fieldFormat || field, col, row);
         }
         getCellOriginValue(col, row) {
+            if (col === -1 || row === -1) {
+                return null;
+            }
             const table = this;
             if (table.internalProps.layoutMap.isHeader(col, row)) {
                 const { title } = table.internalProps.layoutMap.getHeader(col, row);
@@ -56114,7 +56133,7 @@
                 this.dataSource.updatePagination(this.pagination);
                 this.refreshRowColCount();
                 this.scenegraph.createSceneGraph();
-                this.render();
+                this.renderAsync();
             }
         }
         refreshHeader() {
@@ -60331,7 +60350,7 @@
                     }
                     return keys;
                 }, []) ?? [];
-                this.dataset = new Dataset(this.internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, options.indicators, options.indicatorsAsCol ?? true, options.records, options.rowHierarchyType);
+                this.dataset = new Dataset(this.internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, options.indicatorsAsCol ?? true, options.records, options.rowHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree);
             }
             this.refreshHeader();
             this.pivotSortState = [];
@@ -60429,7 +60448,7 @@
                     }
                     return keys;
                 }, []);
-                this.dataset = new Dataset(internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, options.indicators, options.indicatorsAsCol ?? true, options.records, options.rowHierarchyType);
+                this.dataset = new Dataset(internalProps.dataConfig, rowKeys, columnKeys, indicatorKeys, this.internalProps.indicators, options.indicatorsAsCol ?? true, options.records, options.rowHierarchyType, this.internalProps.columnTree, this.internalProps.rowTree);
             }
             this.refreshHeader();
             if (internalProps.releaseList) {
@@ -62421,7 +62440,7 @@
         return new Tag(params ? params.attribute : {});
     }
 
-    const version = "0.12.1";
+    const version = "0.12.3-alpha.0";
     function getIcons() {
         return get$1();
     }