@visactor/vtable 0.15.0-alpha.4 → 0.15.0

package/dist/vtable.js

@@ -33497,7 +33497,7 @@
         return maybePromiseOrValue;
     }
     function getField(record, field, col, row, table, promiseCallBack) {
-        if (record === null) {
+        if (record === null || record === undefined) {
             return undefined;
         }
         if (isPromise$1(record)) {
@@ -34653,17 +34653,17 @@
         constructor(params) {
             super(params);
             if (this.attribute.visibleTime === 'mouseenter_cell' || this.attribute.visibleTime === 'click_cell') {
-                this.attribute.visible = false;
+                this.attribute.opacity = 0;
             }
             if (this.attribute.hoverImage) {
                 this.attribute.originImage = this.attribute.image;
             }
         }
         get backgroundWidth() {
-            return this.attribute.backgroundWidth ?? this.attribute.width;
+            return this.attribute.backgroundWidth ?? this.attribute.width ?? 0;
         }
         get backgroundHeight() {
-            return this.attribute.backgroundHeight ?? this.attribute.height;
+            return this.attribute.backgroundHeight ?? this.attribute.height ?? 0;
         }
     };
 
@@ -37559,6 +37559,13 @@
                 axis.overlap();
             }
             else if (table.internalProps.layoutMap.isEmpty(col, row)) {
+                cellGroup.setAttributes({
+                    fill: false,
+                    stroke: false
+                });
+                cellGroup.clear();
+            }
+            else if (table.internalProps.layoutMap.isAxisCell(col, row)) {
                 cellGroup.clear();
             }
         }
@@ -37627,6 +37634,17 @@
                 const hierarchyOffset = getHierarchyOffset(col, row, table);
                 const lineClamp = cellStyle.lineClamp;
                 const padding = getQuadProps(getProp('padding', cellStyle, col, row, table)) ?? [0, 0, 0, 0];
+                const textAlign = cellTheme.text.textAlign;
+                let x = 0;
+                if (textAlign === 'center') {
+                    x = padding[3] + (cellWidth - (padding[1] + padding[3])) / 2;
+                }
+                else if (textAlign === 'right') {
+                    x = padding[3] + cellWidth - (padding[1] + padding[3]);
+                }
+                else {
+                    x = padding[3];
+                }
                 const attribute = {
                     text: textArr.length === 1 && !autoWrapText ? textArr[0] : textArr,
                     maxLineWidth: cellWidth - (padding[1] + padding[3] + hierarchyOffset),
@@ -37636,7 +37654,8 @@
                     wordBreak: 'break-word',
                     heightLimit: cellHeight - (padding[0] + padding[2]),
                     pickable: false,
-                    dx: hierarchyOffset
+                    dx: hierarchyOffset,
+                    x
                 };
                 textMark.setAttributes(cellTheme.text ? Object.assign({}, cellTheme.text, attribute) : attribute);
             }
@@ -41801,7 +41820,7 @@
         containerGroup.setAttribute('height', heightMax);
     }
 
-    async function createGroupForFirstScreen(cornerHeaderGroup, colHeaderGroup, rowHeaderGroup, rightFrozenGroup, bottomFrozenGroup, bodyGroup, xOrigin, yOrigin, proxy) {
+    function createGroupForFirstScreen(cornerHeaderGroup, colHeaderGroup, rowHeaderGroup, rightFrozenGroup, bottomFrozenGroup, bodyGroup, xOrigin, yOrigin, proxy) {
         const { table } = proxy;
         const { leftBottomCornerGroup, rightTopCornerGroup, rightBottomCornerGroup } = table.scenegraph;
         proxy.setParamsForRow();
@@ -41840,18 +41859,14 @@
         createColGroup(colHeaderGroup, xOrigin, yOrigin, table.frozenColCount, distCol - table.rightFrozenColCount, 0, table.columnHeaderLevelCount - 1, 'columnHeader', table);
         createColGroup(rowHeaderGroup, xOrigin, yOrigin, 0, table.frozenColCount - 1, table.columnHeaderLevelCount, distRow - table.bottomFrozenRowCount, table.isListTable() && !table.internalProps.transpose ? 'body' : 'rowHeader', table);
         if (table.bottomFrozenRowCount > 0) {
-            if (!table.isPivotChart()) {
-                createColGroup(leftBottomCornerGroup, xOrigin, yOrigin, 0, table.frozenColCount - 1, table.rowCount - 1 - table.bottomFrozenRowCount + 1, table.rowCount - 1, table.isListTable() ? 'body' : 'rowHeader', table);
-            }
+            createColGroup(leftBottomCornerGroup, xOrigin, yOrigin, 0, table.frozenColCount - 1, table.rowCount - 1 - table.bottomFrozenRowCount + 1, table.rowCount - 1, table.isListTable() ? 'body' : 'rowHeader', table);
             createColGroup(bottomFrozenGroup, xOrigin, yOrigin, table.frozenColCount, distCol - table.rightFrozenColCount, table.rowCount - 1 - table.bottomFrozenRowCount + 1, table.rowCount - 1, table.isPivotChart() ? 'rowHeader' : 'body', table);
         }
         if (table.rightFrozenColCount > 0) {
-            if (!table.isPivotChart()) {
-                createColGroup(rightTopCornerGroup, xOrigin, yOrigin, table.colCount - 1 - table.rightFrozenColCount + 1, table.colCount - 1, 0, table.columnHeaderLevelCount - 1, 'columnHeader', table);
-            }
+            createColGroup(rightTopCornerGroup, xOrigin, yOrigin, table.colCount - 1 - table.rightFrozenColCount + 1, table.colCount - 1, 0, table.columnHeaderLevelCount - 1, 'columnHeader', table);
             createColGroup(rightFrozenGroup, xOrigin, yOrigin, table.colCount - 1 - table.rightFrozenColCount + 1, table.colCount - 1, table.columnHeaderLevelCount, distRow - table.bottomFrozenRowCount, table.isPivotChart() ? 'rowHeader' : 'body', table);
         }
-        if (table.bottomFrozenRowCount > 0 && table.rightFrozenColCount > 0 && !table.isPivotChart()) {
+        if (table.bottomFrozenRowCount > 0 && table.rightFrozenColCount > 0) {
             createColGroup(rightBottomCornerGroup, xOrigin, yOrigin, table.colCount - 1 - table.rightFrozenColCount + 1, table.colCount - 1, table.rowCount - 1 - table.bottomFrozenRowCount + 1, table.rowCount - 1, 'body', table);
         }
         createColGroup(bodyGroup, xOrigin, yOrigin, table.frozenColCount, distCol - table.rightFrozenColCount, table.columnHeaderLevelCount, distRow - table.bottomFrozenRowCount, 'body', table);
@@ -41875,7 +41890,7 @@
             proxy.colEnd = proxy.currentCol;
             proxy.colUpdatePos = proxy.colEnd + 1;
             proxy.referenceCol = proxy.colStart + Math.floor((proxy.colEnd - proxy.colStart) / 2);
-            await proxy.progress();
+            proxy.progress();
         }
     }
 
@@ -42535,8 +42550,8 @@
             this.firstScreenRowLimit = this.bodyTopRow + Math.min(this.rowLimit, Math.ceil(heightLimit / defaultRowHeight));
             this.rowUpdatePos = this.bodyBottomRow;
         }
-        async createGroupForFirstScreen(cornerHeaderGroup, colHeaderGroup, rowHeaderGroup, rightFrozenGroup, bottomFrozenGroup, bodyGroup, xOrigin, yOrigin) {
-            await createGroupForFirstScreen(cornerHeaderGroup, colHeaderGroup, rowHeaderGroup, rightFrozenGroup, bottomFrozenGroup, bodyGroup, xOrigin, yOrigin, this);
+        createGroupForFirstScreen(cornerHeaderGroup, colHeaderGroup, rowHeaderGroup, rightFrozenGroup, bottomFrozenGroup, bodyGroup, xOrigin, yOrigin) {
+            createGroupForFirstScreen(cornerHeaderGroup, colHeaderGroup, rowHeaderGroup, rightFrozenGroup, bottomFrozenGroup, bodyGroup, xOrigin, yOrigin, this);
         }
         async progress() {
             if (this.isProgressing) {
@@ -42735,7 +42750,7 @@
             cellGroup.needUpdateForAutoRowHeight = true;
         }
         updateCellGroupContent(cellGroup) {
-            if (!cellGroup.needUpdate) {
+            if (!cellGroup.needUpdate || cellGroup.role !== 'cell') {
                 return cellGroup;
             }
             const newCellGroup = this.table.scenegraph.updateCellContent(cellGroup.col, cellGroup.row);
@@ -43325,7 +43340,7 @@
             updateAfter = updateAfter || needUpdateAfter;
             scene.table.rowHeightsMap.adjustOrder(row, row + 1, scene.table.rowHeightsMap.count() - row);
         });
-        const newTotalHeight = resetRowNumberAndY(scene);
+        resetRowNumberAndY(scene);
         updateCells.forEach(cell => {
             if (!cell) {
                 return;
@@ -43364,6 +43379,7 @@
             scene.proxy.updateCellGroups(scene.proxy.screenRowCount * 2);
             scene.proxy.progress();
         }
+        const newTotalHeight = table.getRowsHeight(table.frozenRowCount, table.rowCount - 1);
         scene.updateContainerHeight(scene.table.frozenRowCount, newTotalHeight - scene.bodyGroup.attribute.height);
     }
     function removeRow(row, scene) {
@@ -43829,6 +43845,12 @@
             scene.leftBottomCornerGroup.appendChild(column);
             scene.leftBottomCornerGroup.setAttribute('width', scene.leftBottomCornerGroup.attribute.width + column.attribute.width);
             scene.bottomFrozenGroup.setAttribute('width', scene.bottomFrozenGroup.attribute.width - column.attribute.width);
+            column.forEachChildren((child) => {
+                child.setAttributes({
+                    stroke: false,
+                    fill: false
+                });
+            });
         }
     }
     function moveColumnFromLeftBottomCornerToBottom(scene) {
@@ -43839,6 +43861,15 @@
             insertBefore(scene.bottomFrozenGroup, column, scene.bottomFrozenGroup.firstChild);
             scene.bottomFrozenGroup.setAttribute('width', scene.bottomFrozenGroup.attribute.width + column.attribute.width);
             scene.leftBottomCornerGroup.setAttribute('width', scene.leftBottomCornerGroup.attribute.width - column.attribute.width);
+            column.forEachChildren((child) => {
+                const cellStyle = scene.table._getCellStyle(child.col, child.row);
+                const range = scene.table.getCellRange(child.col, child.row);
+                const cellTheme = getStyleTheme(cellStyle, scene.table, range ? range.start.col : child.col, range ? range.start.row : child.row, getProp).theme;
+                child.setAttributes({
+                    fill: cellTheme?.group?.fill ?? undefined,
+                    stroke: cellTheme?.group?.stroke ?? undefined
+                });
+            });
         }
     }
     function dealRightFrozen(distRightFrozenCol, scene) {
@@ -44366,7 +44397,7 @@
             return;
         }
         updateCellRangeIcon(col, row, (icon) => icon.attribute.visibleTime === 'mouseenter_cell', (icon) => {
-            icon.setAttribute('visible', false);
+            icon.setAttribute('opacity', 0);
         }, scene);
         scene.updateNextFrame();
     }
@@ -44375,7 +44406,7 @@
             return;
         }
         updateCellRangeIcon(col, row, (icon) => icon.attribute.visibleTime === 'mouseenter_cell', (icon) => {
-            icon.setAttribute('visible', true);
+            icon.setAttribute('opacity', 1);
         }, scene);
         scene.updateNextFrame();
     }
@@ -44384,7 +44415,7 @@
             return;
         }
         updateCellRangeIcon(col, row, (icon) => icon.attribute.visibleTime === 'click_cell', (icon) => {
-            icon.setAttribute('visible', false);
+            icon.setAttribute('opacity', 0);
         }, scene);
         scene.updateNextFrame();
     }
@@ -44393,7 +44424,7 @@
             return;
         }
         updateCellRangeIcon(col, row, (icon) => icon.attribute.visibleTime === 'click_cell', (icon) => {
-            icon.setAttribute('visible', true);
+            icon.setAttribute('opacity', 1);
         }, scene);
         scene.updateNextFrame();
     }
@@ -45426,18 +45457,19 @@
         updateContainerAttrWidthAndX() {
             const cornerX = updateContainerChildrenX(this.cornerHeaderGroup, 0);
             const rowHeaderX = updateContainerChildrenX(this.rowHeaderGroup, 0);
-            const colHeaderX = this.colHeaderGroup.hasChildNodes()
+            const colHeaderX = this.colHeaderGroup.hasChildNodes() && this.colHeaderGroup.firstChild
                 ? updateContainerChildrenX(this.colHeaderGroup, this.colHeaderGroup.firstChild.col > 0
                     ? this.table.getColsWidth(this.table.frozenColCount ?? 0, this.colHeaderGroup.firstChild.col - 1)
                     : 0)
                 : 0;
-            const bodyX = this.bodyGroup.hasChildNodes()
+            const bodyX = this.bodyGroup.hasChildNodes() && this.bodyGroup.firstChild
                 ? updateContainerChildrenX(this.bodyGroup, this.bodyGroup.firstChild.col > 0
                     ? this.table.getColsWidth(this.table.frozenColCount ?? 0, this.bodyGroup.firstChild.col - 1)
                     : 0)
                 : 0;
             const rightX = updateContainerChildrenX(this.rightFrozenGroup, 0);
             this.bottomFrozenGroup.hasChildNodes() &&
+                this.bottomFrozenGroup.firstChild &&
                 updateContainerChildrenX(this.bottomFrozenGroup, this.bottomFrozenGroup.firstChild.col > 0
                     ? this.table.getColsWidth(this.table.frozenColCount ?? 0, this.bottomFrozenGroup.firstChild.col - 1)
                     : 0);
@@ -51540,7 +51572,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.15.0-alpha.4";
+        version = "0.15.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -52397,6 +52429,11 @@
         }
         renderAsync() {
             this.scenegraph.updateNextFrame();
+            return new Promise((resolve, reject) => {
+                setTimeout(() => {
+                    resolve();
+                }, 0);
+            });
         }
         _toRelativeRect(absoluteRect) {
             const rect = absoluteRect.copy();
@@ -54777,6 +54814,9 @@
         isEmpty(col, row) {
             return false;
         }
+        isAxisCell(col, row) {
+            return false;
+        }
         getChartAxes(col, row) {
             return [];
         }
@@ -54946,13 +54986,22 @@
         bindEvent() {
             const handler = this.table.internalProps.handler;
             this.table.on(TABLE_EVENT_TYPE.DBLCLICK_CELL, e => {
-                const { col, row } = e;
-                const eventArgsSet = getCellEventArgsSet(e.federatedEvent);
-                const resizeCol = this.table.scenegraph.getResizeColAt(eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y, eventArgsSet.eventArgs?.targetCell);
-                if (this.table._canResizeColumn(resizeCol.col, resizeCol.row) && resizeCol.col >= 0) {
-                    return;
+                if (!this.table.options.editCellTrigger ||
+                    this.table.options.editCellTrigger === 'doubleclick') {
+                    const { col, row } = e;
+                    const eventArgsSet = getCellEventArgsSet(e.federatedEvent);
+                    const resizeCol = this.table.scenegraph.getResizeColAt(eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y, eventArgsSet.eventArgs?.targetCell);
+                    if (this.table._canResizeColumn(resizeCol.col, resizeCol.row) && resizeCol.col >= 0) {
+                        return;
+                    }
+                    this.startEditCell(col, row);
+                }
+            });
+            this.table.on(TABLE_EVENT_TYPE.CLICK_CELL, e => {
+                if (this.table.options.editCellTrigger === 'click') {
+                    const { col, row } = e;
+                    this.startEditCell(col, row);
                 }
-                this.startEditCell(col, row);
             });
             document.body.addEventListener('pointerdown', (e) => {
                 const target = e.target;
@@ -55583,14 +55632,22 @@
             this.dataSource.setRecord(record, index);
         }
         startEditCell(col, row) {
-            this.editorManager.startEditCell(col, row);
+            if (isValid$6(col) && isValid$6(row)) {
+                this.editorManager.startEditCell(col, row);
+            }
+            else if (this.stateManeger.select?.cellPos) {
+                const { col, row } = this.stateManeger.select.cellPos;
+                if (isValid$6(col) && isValid$6(row)) {
+                    this.editorManager.startEditCell(col, row);
+                }
+            }
         }
         completeEditCell() {
             this.editorManager.completeEdit();
         }
         getEditor(col, row) {
             const define = this.getBodyColumnDefine(col, row);
-            const editorDefine = define?.editor ?? this.options.editor;
+            let editorDefine = define?.editor ?? this.options.editor;
             if (typeof editorDefine === 'function') {
                 const arg = {
                     col,
@@ -55599,9 +55656,9 @@
                     value: this.getCellValue(col, row) || '',
                     table: this
                 };
-                return editorDefine(arg);
+                editorDefine = editorDefine(arg);
             }
-            else if (typeof editorDefine === 'string') {
+            if (typeof editorDefine === 'string') {
                 return get(editorDefine);
             }
             return editorDefine;
@@ -57606,7 +57663,25 @@
             if (!this._table.isPivotChart()) {
                 return false;
             }
-            if (col > this.colCount - this.rightFrozenColCount - 1 || row > this.rowCount - this.bottomFrozenRowCount - 1) {
+            if (this.isLeftBottomCorner(col, row)) {
+                return true;
+            }
+            if (this.isRightBottomCorner(col, row)) {
+                return true;
+            }
+            if (this.isRightTopCorner(col, row)) {
+                return true;
+            }
+            return false;
+        }
+        isAxisCell(col, row) {
+            if (!this._table.isPivotChart()) {
+                return false;
+            }
+            if (this.isBottomFrozenRow(col, row) || this.isRightFrozenColumn(col, row)) {
+                return true;
+            }
+            if (this.isRowHeader(col, row) && col === this.rowHeaderLevelCount - 1) {
                 return true;
             }
             if (this.hasTwoIndicatorAxes && this.indicatorsAsCol && row === this.columnHeaderLevelCount - 1) {
@@ -57828,7 +57903,7 @@
             for (const key in this.dataset.collectValuesBy) {
                 if (this.dataset.collectValuesBy[key].type === 'yField' && !this.dataset.collectValuesBy[key].range) {
                     collectedValues =
-                        this.dataset.collectedValues[key][path
+                        this.dataset.collectedValues[key]?.[path
                             .map(pathObj => {
                             return pathObj.value;
                         })
@@ -57853,7 +57928,7 @@
             for (const key in this.dataset.collectValuesBy) {
                 if (this.dataset.collectValuesBy[key].type === 'xField' && !this.dataset.collectValuesBy[key].range) {
                     collectedValues =
-                        this.dataset.collectedValues[key][path
+                        this.dataset.collectedValues[key]?.[path
                             .map(pathObj => {
                             return pathObj.value;
                         })
@@ -61336,7 +61411,7 @@
         return new Tag$1(params ? params.attribute : {});
     }
 
-    const version = "0.15.0-alpha.4";
+    const version = "0.15.0";
     function getIcons() {
         return get$2();
     }