@visactor/vtable 0.14.4-alpha.2 → 0.14.4-alpha.3

package/dist/vtable.js

@@ -33111,7 +33111,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)) {
@@ -37123,6 +37123,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();
             }
         }
@@ -41364,7 +41371,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();
@@ -41403,18 +41410,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);
@@ -41438,7 +41441,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();
         }
     }
 
@@ -42098,8 +42101,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) {
@@ -43389,6 +43392,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) {
@@ -43399,6 +43408,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) {
@@ -44986,18 +45004,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);
@@ -51046,7 +51065,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.14.4-alpha.2";
+        version = "0.14.4-alpha.3";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -54265,6 +54284,9 @@
         isEmpty(col, row) {
             return false;
         }
+        isAxisCell(col, row) {
+            return false;
+        }
         getChartAxes(col, row) {
             return [];
         }
@@ -56804,7 +56826,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) {
@@ -57026,7 +57066,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;
                         })
@@ -57051,7 +57091,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;
                         })
@@ -60449,7 +60489,7 @@
         return new Tag$1(params ? params.attribute : {});
     }
 
-    const version = "0.14.4-alpha.2";
+    const version = "0.14.4-alpha.3";
     function getIcons() {
         return get$1();
     }