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

package/dist/vtable.js

@@ -23984,6 +23984,9 @@
                     get borderLineDash() {
                         return frameStyle.borderLineDash;
                     },
+                    get innerBorder() {
+                        return frameStyle.innerBorder;
+                    },
                     get shadowBlur() {
                         return frameStyle.shadowBlur;
                     },
@@ -38923,10 +38926,18 @@
             rectAttributes.y = borderTop / 2;
             rectAttributes.pickable = false;
             if (isTableGroup) {
-                rectAttributes.x = group.attribute.x - borderLeft / 2;
-                rectAttributes.y = group.attribute.y - borderTop / 2;
-                rectAttributes.width = group.attribute.width + borderLeft / 2 + borderRight / 2;
-                rectAttributes.height = group.attribute.height + borderTop / 2 + borderBottom / 2;
+                if (frameTheme.innerBorder) {
+                    rectAttributes.x = group.attribute.x + borderLeft / 2;
+                    rectAttributes.y = group.attribute.y + borderTop / 2;
+                    rectAttributes.width = group.attribute.width - borderLeft / 2 - borderRight / 2;
+                    rectAttributes.height = group.attribute.height - borderTop / 2 - borderBottom / 2;
+                }
+                else {
+                    rectAttributes.x = group.attribute.x - borderLeft / 2;
+                    rectAttributes.y = group.attribute.y - borderTop / 2;
+                    rectAttributes.width = group.attribute.width + borderLeft / 2 + borderRight / 2;
+                    rectAttributes.height = group.attribute.height + borderTop / 2 + borderBottom / 2;
+                }
                 let shadowRect;
                 let borderRect;
                 if (hasShadow) {
@@ -38956,7 +38967,12 @@
                     borderRect = createRect(rectAttributes);
                     borderRect.name = 'table-border-rect';
                 }
-                group.parent.insertBefore(borderRect, group);
+                if (frameTheme.innerBorder && !hasShadow) {
+                    group.parent.insertAfter(borderRect, group);
+                }
+                else {
+                    group.parent.insertBefore(borderRect, group);
+                }
                 group.border = borderRect;
             }
             else {
@@ -39426,10 +39442,20 @@
             hoverMode = 'cellBgColor';
         }
         else if (highlightScope === HighlightScope.column && cellPos.col === col) {
-            hoverMode = 'inlineColumnBgColor';
+            if (cellPos.col === col && cellPos.row === row) {
+                hoverMode = 'cellBgColor';
+            }
+            else {
+                hoverMode = 'inlineColumnBgColor';
+            }
         }
         else if (highlightScope === HighlightScope.row && cellPos.row === row) {
-            hoverMode = 'inlineRowBgColor';
+            if (cellPos.col === col && cellPos.row === row) {
+                hoverMode = 'cellBgColor';
+            }
+            else {
+                hoverMode = 'inlineRowBgColor';
+            }
         }
         else if (highlightScope === HighlightScope.cross) {
             if (cellPos.col === col && cellPos.row === row) {
@@ -44661,26 +44687,52 @@
                     Math.max(this.leftBottomCornerGroup.attribute.height, this.bottomFrozenGroup.attribute.height, this.rightBottomCornerGroup.attribute.height, 0))
             });
             if (this.tableGroup.border && this.tableGroup.border.type === 'rect') {
-                this.tableGroup.border.setAttributes({
-                    x: this.table.tableX - this.tableGroup.border.attribute.lineWidth / 2,
-                    y: this.table.tableY - this.tableGroup.border.attribute.lineWidth / 2,
-                    width: this.tableGroup.attribute.width + this.tableGroup.border.attribute.lineWidth,
-                    height: this.tableGroup.attribute.height + this.tableGroup.border.attribute.lineWidth
-                });
+                if (this.table.theme.frameStyle?.innerBorder) {
+                    this.tableGroup.border.setAttributes({
+                        x: this.table.tableX + this.tableGroup.border.attribute.lineWidth / 2,
+                        y: this.table.tableY + this.tableGroup.border.attribute.lineWidth / 2,
+                        width: this.tableGroup.attribute.width - this.tableGroup.border.attribute.lineWidth,
+                        height: this.tableGroup.attribute.height - this.tableGroup.border.attribute.lineWidth
+                    });
+                }
+                else {
+                    this.tableGroup.border.setAttributes({
+                        x: this.table.tableX - this.tableGroup.border.attribute.lineWidth / 2,
+                        y: this.table.tableY - this.tableGroup.border.attribute.lineWidth / 2,
+                        width: this.tableGroup.attribute.width + this.tableGroup.border.attribute.lineWidth,
+                        height: this.tableGroup.attribute.height + this.tableGroup.border.attribute.lineWidth
+                    });
+                }
             }
             else if (this.tableGroup.border && this.tableGroup.border.type === 'group') {
-                this.tableGroup.border.setAttributes({
-                    x: this.table.tableX - this.tableGroup.border.attribute.lineWidth / 2,
-                    y: this.table.tableY - this.tableGroup.border.attribute.lineWidth / 2,
-                    width: this.tableGroup.attribute.width + this.tableGroup.border.attribute.lineWidth,
-                    height: this.tableGroup.attribute.height + this.tableGroup.border.attribute.lineWidth
-                });
-                this.tableGroup.border.firstChild?.setAttributes({
-                    x: this.tableGroup.border.attribute.lineWidth / 2,
-                    y: this.tableGroup.border.attribute.lineWidth / 2,
-                    width: this.tableGroup.attribute.width,
-                    height: this.tableGroup.attribute.height
-                });
+                if (this.table.theme.frameStyle?.innerBorder) {
+                    this.tableGroup.border.setAttributes({
+                        x: this.table.tableX + this.tableGroup.border.attribute.lineWidth / 2,
+                        y: this.table.tableY + this.tableGroup.border.attribute.lineWidth / 2,
+                        width: this.tableGroup.attribute.width - this.tableGroup.border.attribute.lineWidth,
+                        height: this.tableGroup.attribute.height - this.tableGroup.border.attribute.lineWidth
+                    });
+                    this.tableGroup.border.firstChild?.setAttributes({
+                        x: 0,
+                        y: 0,
+                        width: this.tableGroup.attribute.width - this.tableGroup.border.attribute.lineWidth,
+                        height: this.tableGroup.attribute.height - this.tableGroup.border.attribute.lineWidth
+                    });
+                }
+                else {
+                    this.tableGroup.border.setAttributes({
+                        x: this.table.tableX - this.tableGroup.border.attribute.lineWidth / 2,
+                        y: this.table.tableY - this.tableGroup.border.attribute.lineWidth / 2,
+                        width: this.tableGroup.attribute.width + this.tableGroup.border.attribute.lineWidth,
+                        height: this.tableGroup.attribute.height + this.tableGroup.border.attribute.lineWidth
+                    });
+                    this.tableGroup.border.firstChild?.setAttributes({
+                        x: this.tableGroup.border.attribute.lineWidth / 2,
+                        y: this.tableGroup.border.attribute.lineWidth / 2,
+                        width: this.tableGroup.attribute.width,
+                        height: this.tableGroup.attribute.height
+                    });
+                }
             }
             if (this.table.bottomFrozenRowCount > 0) {
                 this.bottomFrozenGroup.setAttribute('y', this.tableGroup.attribute.height - this.bottomFrozenGroup.attribute.height);
@@ -46764,7 +46816,15 @@
             this.menu.dropDownMenuHighlight = cells;
             for (let i = 0; i < cells.length; i++) {
                 const { col, row } = cells[i];
-                this.table.scenegraph.updateCellContent(col, row);
+                const range = this.table.getCellRange(col, row);
+                if (!range) {
+                    continue;
+                }
+                for (let col = range.start.col; col <= range.end.col; col++) {
+                    for (let row = range.start.row; row <= range.end.row; row++) {
+                        this.table.scenegraph.updateCellContent(col, row);
+                    }
+                }
             }
         }
         dropDownMenuIsHighlight(colNow, rowNow, index) {
@@ -47195,7 +47255,7 @@
         else {
             const layoutMap = table.internalProps.layoutMap;
             hasSparkLine = layoutMap.columnObjects.some(column => {
-                return column.cellType === 'sparkline';
+                return column.cellType === 'sparkline' || typeof column.cellType === 'function';
             });
         }
         if (!hasSparkLine) {
@@ -47311,10 +47371,10 @@
             }
             const cellGoup = e.path.find(node => node.role === 'cell');
             if (table.hasListeners(TABLE_EVENT_TYPE.MOUSELEAVE_CELL)) {
-                if (cellGoup?.role === 'cell' &&
-                    table.stateManager.hover.cellPos.col !== -1 &&
+                if (table.stateManager.hover.cellPos.col !== -1 &&
                     table.stateManager.hover.cellPos.row !== -1 &&
-                    (cellGoup.col !== table.stateManager.hover.cellPos.col || cellGoup.row !== table.stateManager.hover.cellPos.row)) {
+                    (cellGoup?.col !== table.stateManager.hover.cellPos.col ||
+                        cellGoup?.row !== table.stateManager.hover.cellPos.row)) {
                     table.fireListeners(TABLE_EVENT_TYPE.MOUSELEAVE_CELL, {
                         col: table.stateManager.hover.cellPos.col,
                         row: table.stateManager.hover.cellPos.row,
@@ -47416,6 +47476,21 @@
                 stateManager.updateInteractionState(InteractionState.default);
                 stateManager.updateCursor();
             }
+            if (table.hasListeners(TABLE_EVENT_TYPE.MOUSELEAVE_CELL)) {
+                if (table.stateManager.hover.cellPos.col !== -1 && table.stateManager.hover.cellPos.row !== -1) {
+                    table.fireListeners(TABLE_EVENT_TYPE.MOUSELEAVE_CELL, {
+                        col: table.stateManager.hover.cellPos.col,
+                        row: table.stateManager.hover.cellPos.row,
+                        cellRange: table.getCellRangeRelativeRect({
+                            col: table.stateManager.hover.cellPos.col,
+                            row: table.stateManager.hover.cellPos.row
+                        }),
+                        scaleRatio: table.canvas.getBoundingClientRect().width / table.canvas.offsetWidth,
+                        event: e.nativeEvent,
+                        target: undefined
+                    });
+                }
+            }
             eventManager.dealTableHover();
             const target = e.target;
             if (target && !target.isDescendantsOf(table.scenegraph.tableGroup)) {
@@ -47745,15 +47820,15 @@
             };
             if (table.isHeader(col, row)) {
                 table.stateManager.setHeaderCheckedState(cellInfo.field, e.detail.checked);
-                const define = table.getBodyColumnDefine(col, row);
-                if (define.cellType === 'checkbox') {
+                const cellType = table.getCellType(col, row);
+                if (cellType === 'checkbox') {
                     table.scenegraph.updateCheckboxCellState(col, row, e.detail.checked);
                 }
             }
             else {
                 table.stateManager.setCheckedState(col, row, cellInfo.field, e.detail.checked);
-                const define = table.getBodyColumnDefine(col, row);
-                if (define.headerType === 'checkbox') {
+                const cellType = table.getCellType(col, row);
+                if (cellType === 'checkbox') {
                     const oldHeaderCheckedState = table.stateManager.headerCheckedState[cellInfo.field];
                     const newHeaderCheckedState = table.stateManager.updateHeaderCheckedState(cellInfo.field);
                     if (oldHeaderCheckedState !== newHeaderCheckedState) {
@@ -48930,6 +49005,7 @@
                 case 'checkbox':
                     return CheckboxStyle$1;
             }
+            return TextStyle;
         }
         getCellIconFromRecordValue(icon, col, row) {
             if (Array.isArray(icon)) {
@@ -51738,7 +51814,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.19.2-alpha.2";
+        version = "0.19.2-alpha.3";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -52151,12 +52227,20 @@
             if (this.internalProps.theme?.frameStyle) {
                 const lineWidths = toBoxArray(this.internalProps.theme.frameStyle?.borderLineWidth ?? [null]);
                 const shadowWidths = toBoxArray(this.internalProps.theme.frameStyle?.shadowBlur ?? [0]);
-                this.tableX = (lineWidths[3] ?? 0) + (shadowWidths[3] ?? 0);
-                this.tableY = (lineWidths[0] ?? 0) + (shadowWidths[0] ?? 0);
-                this.tableNoFrameWidth =
-                    width - ((lineWidths[1] ?? 0) + (shadowWidths[1] ?? 0)) - ((lineWidths[3] ?? 0) + (shadowWidths[3] ?? 0));
-                this.tableNoFrameHeight =
-                    height - ((lineWidths[0] ?? 0) + (shadowWidths[0] ?? 0)) - ((lineWidths[2] ?? 0) + (shadowWidths[2] ?? 0));
+                if (this.theme.frameStyle?.innerBorder) {
+                    this.tableX = 0;
+                    this.tableY = 0;
+                    this.tableNoFrameWidth = width - (shadowWidths[1] ?? 0);
+                    this.tableNoFrameHeight = height - (shadowWidths[2] ?? 0);
+                }
+                else {
+                    this.tableX = (lineWidths[3] ?? 0) + (shadowWidths[3] ?? 0);
+                    this.tableY = (lineWidths[0] ?? 0) + (shadowWidths[0] ?? 0);
+                    this.tableNoFrameWidth =
+                        width - ((lineWidths[1] ?? 0) + (shadowWidths[1] ?? 0)) - ((lineWidths[3] ?? 0) + (shadowWidths[3] ?? 0));
+                    this.tableNoFrameHeight =
+                        height - ((lineWidths[0] ?? 0) + (shadowWidths[0] ?? 0)) - ((lineWidths[2] ?? 0) + (shadowWidths[2] ?? 0));
+                }
             }
         }
         get rowHierarchyType() {
@@ -53285,7 +53369,7 @@
                     return customMerge.range;
                 }
             }
-            return this.internalProps.layoutMap.getCellRange(col, row);
+            return this.internalProps.layoutMap?.getCellRange(col, row);
         }
         hasCustomMerge() {
             return !!this.internalProps.customMergeCell;
@@ -53378,7 +53462,7 @@
                     field: this.getHeaderField(col, row),
                     cellHeaderPaths: this.internalProps.layoutMap.getCellHeaderPaths(col, row),
                     title: colDef?.title,
-                    cellType: colDef?.cellType ? (typeof colDef.cellType === 'string' ? colDef.cellType : 'progressbar') : 'text',
+                    cellType: this.getCellType(col, row),
                     originData: this.getCellOriginRecord(col, row),
                     cellRange: this.getCellRangeRelativeRect({ col, row }),
                     value: this.getCellValue(col, row),
@@ -53495,12 +53579,13 @@
                 return cacheStyle;
             }
             let cacheKey;
+            const cellType = this.getCellType(col, row);
             if ((this.isListTable() && !this.transpose) ||
                 (this.isPivotTable() && this.internalProps.layoutMap.indicatorsAsCol)) {
-                cacheKey = col;
+                cacheKey = col + cellType;
             }
             else {
-                cacheKey = row;
+                cacheKey = row + cellType;
             }
             let cacheStyle;
             if (layoutMap.isBottomFrozenRow(row)) {
@@ -53513,7 +53598,7 @@
                 return cacheStyle;
             }
             const column = layoutMap.getBody(col, row);
-            const styleClass = this.internalProps.bodyHelper.getStyleClass(column.cellType);
+            const styleClass = this.internalProps.bodyHelper.getStyleClass(this.getCellType(col, row));
             const style = column?.style;
             cacheStyle = of$2(style, layoutMap.isBottomFrozenRow(row) && this.theme.bottomFrozenStyle
                 ? this.theme.bottomFrozenStyle
@@ -56555,7 +56640,7 @@
         getCellCheckboxState(col, row) {
             const define = this.getBodyColumnDefine(col, row);
             const field = define?.field;
-            const cellType = define?.cellType;
+            const cellType = this.getCellType(col, row);
             if (isValid$1(field) && cellType === 'checkbox') {
                 const dataIndex = this.dataSource.getIndexKey(this.getRecordShowIndexByCell(col, row));
                 return this.stateManager.checkedState[dataIndex][field];
@@ -63169,7 +63254,7 @@
     }
 
     registerForVrender();
-    const version = "0.19.2-alpha.2";
+    const version = "0.19.2-alpha.3";
     function getIcons() {
         return get$1();
     }