@visactor/vtable 0.16.3-alpha.0 → 0.16.3

package/dist/vtable.js

@@ -50655,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;
@@ -50686,6 +50687,7 @@
                 elementsGroup.name = 'custom-container';
             }
             renderDefault = customRenderObj.renderDefault;
+            enableCellPadding = customRenderObj.enableCellPadding;
         }
         else if (typeof customRender === 'function') {
             const arg = {
@@ -50721,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,
@@ -53546,7 +53556,7 @@
                 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;
             }
@@ -55032,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++) {
@@ -55209,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;
@@ -55229,6 +55241,7 @@
                     customLayoutObj.rootContainer.setStage(table.scenegraph.stage);
                     height = customLayoutObj.rootContainer.AABBBounds.height() ?? 0;
                     renderDefault = customLayoutObj.renderDefault;
+                    enableCellPadding = customLayoutObj.enableCellPadding;
                 }
                 else {
                     height = 0;
@@ -55243,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
@@ -55480,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;
                 }
@@ -55745,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;
@@ -57155,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 {
@@ -57849,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;
@@ -57869,6 +57907,7 @@
                     customLayoutObj.rootContainer.setStage(table.scenegraph.stage);
                     width = customLayoutObj.rootContainer.AABBBounds.width() ?? 0;
                     renderDefault = customLayoutObj.renderDefault;
+                    enableCellPadding = customLayoutObj.enableCellPadding;
                 }
                 else {
                     width = 0;
@@ -57883,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
@@ -59407,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);
@@ -61445,6 +61512,7 @@
         frozenRowCount;
         clear;
         mergeMap;
+        _dealAutoFillHeightOriginRowsHeight;
         constructor(table) {
             this.table = table;
             this.hasFrozen = false;
@@ -61906,7 +61974,7 @@
             if (this.table.heightMode === 'adaptive') {
                 this.recalculateRowHeights();
             }
-            else if (this.table.autoFillHeight && this.table.tableNoFrameHeight >= this.table.getAllRowsHeight()) {
+            else if (this.table.autoFillHeight) {
                 this.dealHeightMode();
             }
             this.resetFrozen();
@@ -62190,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;
@@ -68481,7 +68550,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.16.3-alpha.0";
+        version = "0.16.3";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -73242,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,
@@ -73428,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);
@@ -73459,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);
@@ -73634,7 +73709,9 @@
                         define: {
                             dimensionKey: '维度名称',
                             id,
-                            value: dimensionKey
+                            value: dimensionKey,
+                            disableHeaderHover: !!this.cornerSetting.disableHeaderHover,
+                            disableHeaderSelect: !!this.cornerSetting.disableHeaderSelect
                         },
                         dropDownMenu: dimensionInfo?.cornerDropDownMenu,
                         pivotInfo: {
@@ -73675,7 +73752,9 @@
                     define: {
                         dimensionKey: '维度名称',
                         id,
-                        value: ''
+                        value: '',
+                        disableHeaderHover: !!this.cornerSetting.disableHeaderHover,
+                        disableHeaderSelect: !!this.cornerSetting.disableHeaderSelect
                     }
                 };
                 results[id] = cell;
@@ -74474,7 +74553,9 @@
                     define: {
                         field: '',
                         headerType: 'text',
-                        cellType: 'text'
+                        cellType: 'text',
+                        disableHeaderHover: !!this.columnHeaderTitle.disableHeaderHover,
+                        disableHeaderSelect: !!this.columnHeaderTitle.disableHeaderSelect
                     }
                 };
                 this.rowHeaderObjs.push(cell);
@@ -78946,7 +79027,7 @@
         return new Tag$1(params ? params.attribute : {});
     }
 
-    const version = "0.16.3-alpha.0";
+    const version = "0.16.3";
     function getIcons() {
         return get$2();
     }