@visactor/vtable 0.16.2 → 0.16.3

package/dist/vtable.js

@@ -36,6 +36,7 @@
     var AggregationType;
     (function (AggregationType) {
         AggregationType["RECORD"] = "RECORD";
+        AggregationType["NONE"] = "NONE";
         AggregationType["SUM"] = "SUM";
         AggregationType["MIN"] = "MIN";
         AggregationType["MAX"] = "MAX";
@@ -48997,11 +48998,11 @@
         tickData;
         scale;
         component;
-        constructor(option, width, height, padding, chartSpecTheme, table) {
+        constructor(option, width, height, padding, table) {
             this.table = table;
             this.orient = option.orient ?? 'left';
             this.type = option.type ?? 'band';
-            this.option = merge$1({}, getCommonAxis(chartSpecTheme), getTableAxisTheme(this.orient, table.theme), getChartSpecAxisTheme(this.orient, this.type, chartSpecTheme), option);
+            this.option = merge$1({}, getCommonAxis(option.__vtableChartTheme), getTableAxisTheme(this.orient, table.theme), getChartSpecAxisTheme(this.orient, this.type, option.__vtableChartTheme), option);
             if (this.orient === 'left' || this.orient === 'right') {
                 this.width = width;
                 this.height = height - padding[2];
@@ -50654,8 +50655,9 @@
         }
     };
 
-    function dealWithCustom(customLayout, customRender, col, row, width, height, autoWidth, autoHeight, table) {
+    function dealWithCustom(customLayout, customRender, col, row, width, height, autoWidth, autoHeight, padding, table) {
         let renderDefault = true;
+        let enableCellPadding = false;
         let expectedWidth;
         let expectedHeight;
         let customElements;
@@ -50685,6 +50687,7 @@
                 elementsGroup.name = 'custom-container';
             }
             renderDefault = customRenderObj.renderDefault;
+            enableCellPadding = customRenderObj.enableCellPadding;
         }
         else if (typeof customRender === 'function') {
             const arg = {
@@ -50720,6 +50723,14 @@
             const value = table.getCellValue(col, row);
             elementsGroup = adjustElementToGroup(customElements, autoWidth ? expectedWidth : width, autoHeight ? expectedHeight : height, value);
         }
+        if (enableCellPadding) {
+            elementsGroup.setAttributes({
+                x: padding[3],
+                y: padding[0],
+                width: width - padding[1] - padding[3],
+                height: height - padding[0] - padding[2]
+            });
+        }
         dealPercentCalc(elementsGroup, width, height);
         return {
             elementsGroup,
@@ -52414,13 +52425,13 @@
         static temp = 1;
         deactivate() {
             this.active = false;
-            this.activeChartInstance.updateViewBox({
+            this.activeChartInstance?.updateViewBox({
                 x1: -1000,
                 x2: -800,
                 y1: -1000,
                 y2: -800
             }, false, false);
-            this.activeChartInstance.release();
+            this.activeChartInstance?.release();
             this.activeChartInstance = null;
         }
         updateData(data) {
@@ -53545,15 +53556,14 @@
                 customLayout = define?.customLayout;
             }
             if (customLayout || customRender) {
-                const customResult = dealWithCustom(customLayout, customRender, col, row, cellWidth, cellHeight, false, table.heightMode === 'autoHeight', table);
+                const customResult = dealWithCustom(customLayout, customRender, col, row, cellWidth, cellHeight, false, table.heightMode === 'autoHeight', padding, table);
                 customElementsGroup = customResult.elementsGroup;
                 renderDefault = customResult.renderDefault;
             }
             cellGroup = createCellGroup(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, customElementsGroup, renderDefault, cellTheme);
             const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(col, row);
             if (axisConfig) {
-                const spec = table.internalProps.layoutMap.getRawChartSpec(col, row);
-                const axis = new CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, padding, spec?.theme, table);
+                const axis = new CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, padding, table);
                 cellGroup.clear();
                 cellGroup.appendChild(axis.component);
                 axis.overlap();
@@ -54240,7 +54250,7 @@
                 if (!axisRange) {
                     return;
                 }
-                const { range, ticks, axisOption, isZeroAlign } = axisRange;
+                const { range, ticks, axisOption, isZeroAlign, theme } = axisRange;
                 if (isZeroAlign) {
                     const subAxisRange = getRange$1('bottom', col, row + 1, col, layout.columnHeaderLevelCount - 1, col, row, 0, layout);
                     if (subAxisRange) {
@@ -54272,7 +54282,8 @@
                     label: {
                         flush: true
                     },
-                    __ticksForVTable: ticks
+                    __ticksForVTable: ticks,
+                    __vtableChartTheme: theme
                 });
             }
             else if (row === layout.rowCount - layout.bottomFrozenRowCount &&
@@ -54290,7 +54301,7 @@
                 if (!axisRange) {
                     return;
                 }
-                const { range, ticks, axisOption, isZeroAlign } = axisRange;
+                const { range, ticks, axisOption, isZeroAlign, theme } = axisRange;
                 if (isZeroAlign) {
                     const subAxisRange = getRange$1('top', col, row - 1, col, row, col, row, 1, layout);
                     if (subAxisRange) {
@@ -54326,7 +54337,8 @@
                     label: {
                         flush: true
                     },
-                    __ticksForVTable: ticks
+                    __ticksForVTable: ticks,
+                    __vtableChartTheme: theme
                 });
             }
             else if (col === layout.rowHeaderLevelCount - 1 &&
@@ -54339,7 +54351,7 @@
                 const data = layout.dataset.collectedValues[rowDimensionKey] ?? [];
                 const rowPath = layout.getRowKeysPath(col, row);
                 const domain = data[rowPath ?? ''] ?? [];
-                const { axisOption, isPercent } = getAxisOption(col + 1, row, 'left', layout);
+                const { axisOption, isPercent, theme } = getAxisOption(col + 1, row, 'left', layout);
                 if (axisOption?.visible === false) {
                     return;
                 }
@@ -54350,7 +54362,8 @@
                     }
                 }, axisOption, {
                     orient: 'left',
-                    type: 'band'
+                    type: 'band',
+                    __vtableChartTheme: theme
                 });
             }
         }
@@ -54370,7 +54383,7 @@
                 if (!axisRange) {
                     return;
                 }
-                const { range, ticks, axisOption, isZeroAlign } = axisRange;
+                const { range, ticks, axisOption, isZeroAlign, theme } = axisRange;
                 if (isZeroAlign) {
                     const subAxisRange = getRange$1('right', col + 1, row, col, row, col, row, 1, layout);
                     if (subAxisRange) {
@@ -54407,7 +54420,8 @@
                     label: {
                         flush: true
                     },
-                    __ticksForVTable: ticks
+                    __ticksForVTable: ticks,
+                    __vtableChartTheme: theme
                 });
             }
             else if (col === layout.colCount - layout.rightFrozenColCount &&
@@ -54417,7 +54431,7 @@
                 if (!axisRange) {
                     return;
                 }
-                const { range, ticks, axisOption, isZeroAlign } = axisRange;
+                const { range, ticks, axisOption, isZeroAlign, theme } = axisRange;
                 if (isZeroAlign) {
                     const subAxisRange = getRange$1('left', col - 1, row, layout.rowHeaderLevelCount - 1, row, col, row, 0, layout);
                     if (subAxisRange) {
@@ -54452,7 +54466,8 @@
                     label: {
                         flush: true
                     },
-                    __ticksForVTable: ticks
+                    __ticksForVTable: ticks,
+                    __vtableChartTheme: theme
                 });
             }
             else if (row === layout.rowCount - layout.bottomFrozenRowCount &&
@@ -54465,7 +54480,7 @@
                 const data = layout.dataset.collectedValues[columnDimensionKey] ?? [];
                 const colPath = layout.getColKeysPath(col, row);
                 const domain = data?.[colPath ?? ''] ?? [];
-                const { axisOption, isPercent } = getAxisOption(col, row - 1, 'bottom', layout);
+                const { axisOption, isPercent, theme } = getAxisOption(col, row - 1, 'bottom', layout);
                 if (axisOption?.visible === false) {
                     return;
                 }
@@ -54473,7 +54488,8 @@
                     domain: Array.from(domain)
                 }, axisOption, {
                     orient: 'bottom',
-                    type: 'band'
+                    type: 'band',
+                    __vtableChartTheme: theme
                 });
             }
         }
@@ -54498,7 +54514,8 @@
                     axisOption,
                     isPercent: spec.percent,
                     isZeroAlign: checkZeroAlign(spec, orient, layout),
-                    seriesIndice
+                    seriesIndice,
+                    theme: spec.theme
                 };
             }
         }
@@ -54508,7 +54525,8 @@
         return {
             axisOption,
             isPercent: false,
-            isZeroAlign: checkZeroAlign(spec, orient, layout)
+            isZeroAlign: checkZeroAlign(spec, orient, layout),
+            theme: spec.theme
         };
     }
     function checkZeroAlign(spec, orient, layout) {
@@ -54588,7 +54606,7 @@
         return range;
     }
     function getRange$1(position, colForAxisOption, rowForAxisOption, colForIndicatorKey, rowForIndicatorKey, col, row, defaultSeriesIndice, layout) {
-        const { axisOption, isPercent, isZeroAlign, seriesIndice } = getAxisOption(colForAxisOption, rowForAxisOption, position, layout);
+        const { axisOption, isPercent, isZeroAlign, seriesIndice, theme } = getAxisOption(colForAxisOption, rowForAxisOption, position, layout);
         if (axisOption?.visible === false) {
             return undefined;
         }
@@ -54627,7 +54645,8 @@
             axisOption,
             isZeroAlign,
             range,
-            ticks
+            ticks,
+            theme
         };
     }
     function isTopOrBottomAxis(col, row, layout) {
@@ -55023,6 +55042,7 @@
                 }
                 actualHeight += rowHeight;
             }
+            table.scenegraph._dealAutoFillHeightOriginRowsHeight = actualHeight;
             if (actualHeight < canvasHeight && actualHeight - actualHeaderHeight > 0) {
                 const factor = (canvasHeight - actualHeaderHeight) / (actualHeight - actualHeaderHeight);
                 for (let row = table.frozenRowCount; row < table.rowCount - table.bottomFrozenRowCount; row++) {
@@ -55200,6 +55220,7 @@
             let spanRow = 1;
             let height = 0;
             let renderDefault = false;
+            let enableCellPadding = false;
             if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row)?.mergeCell) {
                 const cellRange = table.getCellRange(col, row);
                 spanRow = cellRange.end.row - cellRange.start.row + 1;
@@ -55220,6 +55241,7 @@
                     customLayoutObj.rootContainer.setStage(table.scenegraph.stage);
                     height = customLayoutObj.rootContainer.AABBBounds.height() ?? 0;
                     renderDefault = customLayoutObj.renderDefault;
+                    enableCellPadding = customLayoutObj.enableCellPadding;
                 }
                 else {
                     height = 0;
@@ -55234,6 +55256,11 @@
                 height = customRender?.expectedHeight ?? 0;
                 renderDefault = customRender?.renderDefault;
             }
+            if (enableCellPadding) {
+                const actStyle = table._getCellStyle(col, row);
+                const padding = getQuadProps(getProp('padding', actStyle, col, row, table));
+                height += padding[0] + padding[2];
+            }
             return {
                 height: height / spanRow,
                 renderDefault
@@ -55471,7 +55498,9 @@
                     customLayout = define?.customLayout;
                 }
                 if (customLayout || customRender) {
-                    const customResult = dealWithCustom(customLayout, customRender, col, row, cell.attribute.width, cell.attribute.height, false, scene.table.heightMode === 'autoHeight', scene.table);
+                    const style = scene.table._getCellStyle(col, row);
+                    const padding = getQuadProps(getProp('padding', style, col, row, scene.table));
+                    const customResult = dealWithCustom(customLayout, customRender, col, row, cell.attribute.width, cell.attribute.height, false, scene.table.heightMode === 'autoHeight', padding, scene.table);
                     customElementsGroup = customResult.elementsGroup;
                     renderDefault = customResult.renderDefault;
                 }
@@ -55706,8 +55735,7 @@
             const cellStyle = scene.table._getCellStyle(col, row);
             const padding = getQuadProps(getProp('padding', cellStyle, col, row, scene.table));
             if (axisConfig) {
-                const spec = scene.table.internalProps.layoutMap.getRawChartSpec(col, row);
-                const axis = new CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, padding, spec?.theme, scene.table);
+                const axis = new CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, padding, scene.table);
                 cellGroup.clear();
                 cellGroup.appendChild(axis.component);
                 axis.overlap();
@@ -55737,7 +55765,9 @@
                     customLayout = define?.customLayout;
                 }
                 if (customLayout || customRender) {
-                    const customResult = dealWithCustom(customLayout, customRender, col, row, cellGroup.attribute.width, cellGroup.attribute.height, false, scene.table.heightMode === 'autoHeight', scene.table);
+                    const style = scene.table._getCellStyle(col, row);
+                    const padding = getQuadProps(getProp('padding', style, col, row, scene.table));
+                    const customResult = dealWithCustom(customLayout, customRender, col, row, cellGroup.attribute.width, cellGroup.attribute.height, false, scene.table.heightMode === 'autoHeight', padding, scene.table);
                     customElementsGroup = customResult.elementsGroup;
                     renderDefault = customResult.renderDefault;
                     isHeightChange = true;
@@ -57147,27 +57177,42 @@
         if (isHeader && disableHeader) {
             return undefined;
         }
+        let hoverMode;
         if (highlightScope === HighlightScope.single && cellPos.col === col && cellPos.row === row) {
-            return 'cellBgColor';
+            hoverMode = 'cellBgColor';
         }
         else if (highlightScope === HighlightScope.column && cellPos.col === col) {
-            return 'inlineColumnBgColor';
+            hoverMode = 'inlineColumnBgColor';
         }
         else if (highlightScope === HighlightScope.row && cellPos.row === row) {
-            return 'inlineRowBgColor';
+            hoverMode = 'inlineRowBgColor';
         }
         else if (highlightScope === HighlightScope.cross) {
             if (cellPos.col === col && cellPos.row === row) {
-                return 'cellBgColor';
+                hoverMode = 'cellBgColor';
             }
             else if (cellPos.col === col) {
-                return 'inlineColumnBgColor';
+                hoverMode = 'inlineColumnBgColor';
             }
             else if (cellPos.row === row) {
-                return 'inlineRowBgColor';
+                hoverMode = 'inlineRowBgColor';
             }
         }
-        return undefined;
+        if (hoverMode) {
+            let cellDisable;
+            if (isHeader) {
+                const define = table.getHeaderDefine(col, row);
+                cellDisable = define.disableHeaderHover;
+            }
+            else {
+                const define = table.getBodyColumnDefine(col, row);
+                cellDisable = define.disableHover;
+            }
+            if (cellDisable) {
+                hoverMode = undefined;
+            }
+        }
+        return hoverMode;
     }
 
     let SplitGroupBeforeRenderContribution = class SplitGroupBeforeRenderContribution {
@@ -57841,6 +57886,7 @@
             let spanCol = 1;
             let width = 0;
             let renderDefault = false;
+            let enableCellPadding = false;
             if (table.isHeader(col, row) || table.getBodyColumnDefine(col, row)?.mergeCell) {
                 const cellRange = table.getCellRange(col, row);
                 spanCol = cellRange.end.col - cellRange.start.col + 1;
@@ -57861,6 +57907,7 @@
                     customLayoutObj.rootContainer.setStage(table.scenegraph.stage);
                     width = customLayoutObj.rootContainer.AABBBounds.width() ?? 0;
                     renderDefault = customLayoutObj.renderDefault;
+                    enableCellPadding = customLayoutObj.enableCellPadding;
                 }
                 else {
                     width = 0;
@@ -57875,6 +57922,11 @@
                 width = customRender?.expectedWidth ?? 0;
                 renderDefault = customRender?.renderDefault;
             }
+            if (enableCellPadding) {
+                const actStyle = table._getCellStyle(col, row);
+                const padding = getQuadProps(getProp('padding', actStyle, col, row, table));
+                width += padding[1] + padding[3];
+            }
             return {
                 width: width / spanCol,
                 renderDefault
@@ -59399,6 +59451,29 @@
                                             ? scene.bottomFrozenGroup
                                             : scene.rightBottomCornerGroup);
         }
+        const diffSize = Math.ceil(selectComp.rect.attribute.lineWidth / 2);
+        if (endCol === scene.table.colCount - 1) {
+            selectComp.rect.setAttributes({
+                width: selectComp.rect.attribute.width - diffSize
+            });
+        }
+        if (startCol === 0) {
+            selectComp.rect.setAttributes({
+                x: selectComp.rect.attribute.x + diffSize,
+                width: selectComp.rect.attribute.width - diffSize
+            });
+        }
+        if (endRow === scene.table.rowCount - 1) {
+            selectComp.rect.setAttributes({
+                height: selectComp.rect.attribute.height - diffSize
+            });
+        }
+        if (startRow === 0) {
+            selectComp.rect.setAttributes({
+                y: selectComp.rect.attribute.y + diffSize,
+                height: selectComp.rect.attribute.height - diffSize
+            });
+        }
     }
     function updateCellSelectBorder(scene, newStartCol, newStartRow, newEndCol, newEndRow) {
         let startCol = Math.min(newEndCol, newStartCol);
@@ -60570,8 +60645,7 @@
                             const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(cell.col, cell.row);
                             const cellStyle = table._getCellStyle(cell.col, cell.row);
                             const padding = getQuadProps(getProp('padding', cellStyle, cell.col, cell.row, table));
-                            const spec = table.internalProps.layoutMap.getRawChartSpec(cell.col, cell.row);
-                            const axis = new CartesianAxis(axisConfig, cell.attribute.width, cell.attribute.height, padding, spec?.theme, table);
+                            const axis = new CartesianAxis(axisConfig, cell.attribute.width, cell.attribute.height, padding, table);
                             cell.clear();
                             cell.appendChild(axis.component);
                             axis.overlap();
@@ -61438,6 +61512,7 @@
         frozenRowCount;
         clear;
         mergeMap;
+        _dealAutoFillHeightOriginRowsHeight;
         constructor(table) {
             this.table = table;
             this.hasFrozen = false;
@@ -61896,9 +61971,12 @@
                     this.dealWidthMode();
                 }
             }
-            if (this.table.heightMode === 'adaptive' || this.table.autoFillHeight) {
+            if (this.table.heightMode === 'adaptive') {
                 this.recalculateRowHeights();
             }
+            else if (this.table.autoFillHeight) {
+                this.dealHeightMode();
+            }
             this.resetFrozen();
             this.updateTableSize();
             this.updateBorderSizeAndPosition();
@@ -62180,7 +62258,8 @@
                     }
                     actualHeight += rowHeight;
                 }
-                if (actualHeight < canvasHeight && actualHeight - actualHeaderHeight > 0) {
+                if ((this._dealAutoFillHeightOriginRowsHeight ?? actualHeight) < canvasHeight &&
+                    actualHeight - actualHeaderHeight > 0) {
                     const factor = (canvasHeight - actualHeaderHeight) / (actualHeight - actualHeaderHeight);
                     for (let row = table.frozenRowCount; row < table.rowCount - table.bottomFrozenRowCount; row++) {
                         let rowHeight;
@@ -68471,7 +68550,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.16.2";
+        version = "0.16.3";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -70249,6 +70328,9 @@
                     return false;
                 }
                 const define = this.getHeaderDefine(col, row);
+                if (!define) {
+                    return false;
+                }
                 if (define.dragHeader === undefined) {
                     if (this.internalProps.dragHeaderMode === 'all') {
                         return true;
@@ -73229,7 +73311,9 @@
                 imageAutoSizing: dimensionInfo?.imageAutoSizing,
                 headerCustomRender: dimensionInfo?.headerCustomRender,
                 headerCustomLayout: dimensionInfo?.headerCustomLayout,
-                dragHeader: dimensionInfo?.dragHeader
+                dragHeader: dimensionInfo?.dragHeader,
+                disableHeaderHover: !!dimensionInfo?.disableHeaderHover,
+                disableHeaderSelect: !!dimensionInfo?.disableHeaderSelect
             }),
             fieldFormat: dimensionInfo?.headerFormat,
             dropDownMenu: dimensionInfo?.dropDownMenu,
@@ -73415,7 +73499,9 @@
                     headerType: this.columnHeaderTitle.headerType ?? 'text',
                     style: this.columnHeaderTitle.headerStyle,
                     define: {
-                        id
+                        id,
+                        disableHeaderHover: !!this.columnHeaderTitle.disableHeaderHover,
+                        disableHeaderSelect: !!this.columnHeaderTitle.disableHeaderSelect
                     }
                 };
                 this.columnHeaderObjs.push(cell);
@@ -73446,7 +73532,9 @@
                     headerType: this.rowHeaderTitle.headerType ?? 'text',
                     style: this.rowHeaderTitle.headerStyle,
                     define: {
-                        id
+                        id,
+                        disableHeaderHover: !!this.columnHeaderTitle.disableHeaderHover,
+                        disableHeaderSelect: !!this.columnHeaderTitle.disableHeaderSelect
                     }
                 };
                 this.rowHeaderObjs.push(cell);
@@ -73621,7 +73709,9 @@
                         define: {
                             dimensionKey: '维度名称',
                             id,
-                            value: dimensionKey
+                            value: dimensionKey,
+                            disableHeaderHover: !!this.cornerSetting.disableHeaderHover,
+                            disableHeaderSelect: !!this.cornerSetting.disableHeaderSelect
                         },
                         dropDownMenu: dimensionInfo?.cornerDropDownMenu,
                         pivotInfo: {
@@ -73662,7 +73752,9 @@
                     define: {
                         dimensionKey: '维度名称',
                         id,
-                        value: ''
+                        value: '',
+                        disableHeaderHover: !!this.cornerSetting.disableHeaderHover,
+                        disableHeaderSelect: !!this.cornerSetting.disableHeaderSelect
                     }
                 };
                 results[id] = cell;
@@ -74461,7 +74553,9 @@
                     define: {
                         field: '',
                         headerType: 'text',
-                        cellType: 'text'
+                        cellType: 'text',
+                        disableHeaderHover: !!this.columnHeaderTitle.disableHeaderHover,
+                        disableHeaderSelect: !!this.columnHeaderTitle.disableHeaderSelect
                     }
                 };
                 this.rowHeaderObjs.push(cell);
@@ -75536,6 +75630,24 @@
             this.records = [];
         }
     }
+    class NoneAggregator extends Aggregator {
+        type = AggregationType.NONE;
+        isRecord = true;
+        fieldValue;
+        push(record) {
+            if (this.isRecord) {
+                this.records = [record];
+            }
+            this.fieldValue = record[this.field];
+        }
+        value() {
+            return this.fieldValue;
+        }
+        reset() {
+            this.records = [];
+            this.fieldValue = undefined;
+        }
+    }
     class SumAggregator extends Aggregator {
         type = AggregationType.SUM;
         sum = 0;
@@ -75974,6 +76086,7 @@
             this.registerAggregator(AggregationType.MAX, MaxAggregator);
             this.registerAggregator(AggregationType.MIN, MinAggregator);
             this.registerAggregator(AggregationType.AVG, AvgAggregator);
+            this.registerAggregator(AggregationType.NONE, NoneAggregator);
         }
         processCollectedValuesWithSumBy() {
             for (const field in this.collectedValues) {
@@ -78914,7 +79027,7 @@
         return new Tag$1(params ? params.attribute : {});
     }
 
-    const version = "0.16.2";
+    const version = "0.16.3";
     function getIcons() {
         return get$2();
     }