@visactor/vtable 1.7.1 → 1.7.3

package/dist/vtable.js

@@ -30642,7 +30642,7 @@
             else {
                 map.set(value, children.length);
                 children.push({
-                    vTableMerge: true,
+                    vtableMerge: true,
                     vtableMergeName: value,
                     children: [],
                     map: new Map()
@@ -30656,7 +30656,7 @@
             oldGroupMap = new Map();
             for (let i = 0; i < oldSource.length; i++) {
                 const record = oldSource[i];
-                if (record.vTableMerge) {
+                if (record.vtableMerge) {
                     oldGroupMap.set(record.vtableMergeName, i);
                 }
             }
@@ -30665,7 +30665,7 @@
             newGroupMap = new Map();
             for (let i = 0; i < newSource.length; i++) {
                 const record = newSource[i];
-                if (record.vTableMerge) {
+                if (record.vtableMerge) {
                     newGroupMap.set(record.vtableMergeName, i);
                 }
             }
@@ -33997,7 +33997,7 @@
             isAsync = true;
         }
         let cellGroup;
-        if (type === 'text' || type === 'link') {
+        if (type === 'text' || type === 'link' || customResult) {
             if (type === 'link') {
                 const cellValue = value;
                 const headerStyle = table._getCellStyle(col, row);
@@ -34150,9 +34150,11 @@
             range = table.getCellRange(col, row);
             isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;
         }
+        let isvtableMerge = false;
         if (table.internalProps.enableTreeNodeMerge && isMerge) {
-            const { vtableMergeName, vTableMerge } = table.getCellRawRecord(range.start.col, range.start.row);
-            if (vTableMerge) {
+            const { vtableMergeName, vtableMerge } = table.getCellRawRecord(range.start.col, range.start.row);
+            isvtableMerge = vtableMerge;
+            if (vtableMerge) {
                 mayHaveIcon = true;
                 if (table.options.groupTitleCustomLayout) {
                     customResult = dealWithCustom(table.options.groupTitleCustomLayout, undefined, range.start.col, range.start.row, table.getColsWidth(range.start.col, range.end.col), table.getRowsHeight(range.start.row, range.end.row), false, table.isAutoRowHeight(row), [0, 0, 0, 0], range, table);
@@ -34247,9 +34249,11 @@
         if (!addNew && oldCellGroup.role === 'empty') {
             return undefined;
         }
-        const type = table.isHeader(col, row)
-            ? table._getHeaderLayoutMap(col, row).headerType
-            : table.getBodyColumnType(col, row);
+        const type = isvtableMerge
+            ? 'text'
+            : table.isHeader(col, row)
+                ? table._getHeaderLayoutMap(col, row).headerType
+                : table.getBodyColumnType(col, row);
         const padding = cellTheme._vtable.padding;
         const textAlign = cellTheme.text.textAlign;
         const textBaseline = cellTheme.text.textBaseline;
@@ -35413,9 +35417,12 @@
         }
         cell.needUpdateHeight = false;
         cell.setAttribute('height', distHeight);
-        const type = scene.table.isHeader(col, row)
-            ? scene.table._getHeaderLayoutMap(col, row).headerType
-            : scene.table.getBodyColumnType(col, row);
+        const isvtableMerge = scene.table.getCellRawRecord(col, row)?.vtableMerge;
+        const type = isvtableMerge
+            ? 'text'
+            : scene.table.isHeader(col, row)
+                ? scene.table._getHeaderLayoutMap(col, row).headerType
+                : scene.table.getBodyColumnType(col, row);
         if (type === 'progressbar') {
             const columnDefine = scene.table.getBodyColumnDefine(col, row);
             const style = scene.table._getCellStyle(col, row);
@@ -35477,8 +35484,8 @@
                     let customRender;
                     let customLayout;
                     const cellLocation = scene.table.getCellLocation(col, row);
-                    const { vTableMerge } = scene.table.getCellRawRecord(col, row);
-                    if (vTableMerge && scene.table.options.groupTitleCustomLayout) {
+                    const { vtableMerge } = scene.table.getCellRawRecord(col, row);
+                    if (vtableMerge && scene.table.options.groupTitleCustomLayout) {
                         customLayout = scene.table.options.groupTitleCustomLayout;
                     }
                     else if (cellLocation !== 'body') {
@@ -35751,9 +35758,12 @@
             return false;
         }
         const autoRowHeight = scene.table.isAutoRowHeight(row);
-        const type = scene.table.isHeader(col, row)
-            ? scene.table._getHeaderLayoutMap(col, row).headerType
-            : scene.table.getBodyColumnType(col, row);
+        const isvtableMerge = scene.table.getCellRawRecord(col, row)?.vtableMerge;
+        const type = isvtableMerge
+            ? 'text'
+            : scene.table.isHeader(col, row)
+                ? scene.table._getHeaderLayoutMap(col, row).headerType
+                : scene.table.getBodyColumnType(col, row);
         let isHeightChange = false;
         if (type === 'progressbar') {
             const columnDefine = scene.table.getBodyColumnDefine(col, row);
@@ -35829,8 +35839,8 @@
                     let customRender;
                     let customLayout;
                     const cellType = scene.table.getCellLocation(col, row);
-                    const { vTableMerge } = scene.table.getCellRawRecord(col, row);
-                    if (vTableMerge && scene.table.options.groupTitleCustomLayout) {
+                    const { vtableMerge } = scene.table.getCellRawRecord(col, row);
+                    if (vtableMerge && scene.table.options.groupTitleCustomLayout) {
                         customLayout = scene.table.options.groupTitleCustomLayout;
                     }
                     else if (cellType !== 'body') {
@@ -37276,10 +37286,13 @@
                     });
                     borderRect.addChild(shadowRect);
                     const hackRect = createRect({
-                        width: 1,
-                        height: 1,
+                        x: borderLeft / 2,
+                        y: borderTop / 2,
+                        width: group.attribute.width,
+                        height: group.attribute.height,
                         fill: 'transparent',
-                        pickable: false
+                        pickable: false,
+                        globalCompositeOperation: 'source-over'
                     });
                     borderRect.addChild(hackRect);
                 }
@@ -38167,7 +38180,11 @@
         else if (state.table.theme.selectionStyle.selectionFillMode === 'replace') {
             for (let i = 0; i < ranges.length; i++) {
                 const range = ranges[i];
-                if (range.start.col <= col && range.start.row <= row && range.end.col >= col && range.end.row >= row) {
+                const rangeColStart = Math.min(range.start.col, range.end.col);
+                const rangeColEnd = Math.max(range.start.col, range.end.col);
+                const rangeRowStart = Math.min(range.start.row, range.end.row);
+                const rangeRowEnd = Math.max(range.start.row, range.end.row);
+                if (rangeColStart <= col && rangeRowStart <= row && rangeColEnd >= col && rangeRowEnd >= row) {
                     selectMode = 'cellBgColor';
                     break;
                 }
@@ -39787,9 +39804,11 @@
                     cellHeight = mergeSize.cellHeight;
                 }
             }
+            let isvtableMerge = false;
             if (table.internalProps.enableTreeNodeMerge && isMerge) {
-                const { vtableMergeName, vTableMerge } = table.getCellRawRecord(range.start.col, range.start.row);
-                if (vTableMerge) {
+                const { vtableMergeName, vtableMerge } = table.getCellRawRecord(range.start.col, range.start.row);
+                isvtableMerge = vtableMerge;
+                if (vtableMerge) {
                     mayHaveIcon = true;
                     if (table.options.groupTitleCustomLayout) {
                         customResult = dealWithCustom(table.options.groupTitleCustomLayout, undefined, range.start.col, range.start.row, table.getColsWidth(range.start.col, range.end.col), table.getRowsHeight(range.start.row, range.end.row), false, table.isAutoRowHeight(row), [0, 0, 0, 0], range, table);
@@ -39816,9 +39835,11 @@
             if (cellLocation !== 'body' && !cellTheme.group.fill) {
                 cellTheme.group.fill = '#fff';
             }
-            const type = (table.isHeader(col, row)
-                ? table._getHeaderLayoutMap(col, row).headerType
-                : table.getBodyColumnType(col, row)) || 'text';
+            const type = isvtableMerge
+                ? 'text'
+                : (table.isHeader(col, row)
+                    ? table._getHeaderLayoutMap(col, row).headerType
+                    : table.getBodyColumnType(col, row)) || 'text';
             if (isPromise(value)) {
                 createEmptyCellGroup(col, row, 0, y, cellWidth, cellHeight, columnGroup);
                 dealPromiseData(value, table, createCell.bind(null, type, value, define, table, col, row, colWidth, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, cellTheme, range, customResult));
@@ -44387,7 +44408,7 @@
                 this.bodyGroup.children?.forEach((columnGroup) => {
                     columnGroup
                         .getChildAt(row)
-                        .getChildren()
+                        ?.getChildren()
                         .forEach((node) => {
                         if (node.name === 'checkbox') {
                             node.setAttribute('checked', checked);
@@ -44397,7 +44418,7 @@
             }
             else {
                 const columnGroup = this.getColGroup(col);
-                columnGroup.children?.forEach((cellNode) => {
+                columnGroup?.children?.forEach((cellNode) => {
                     cellNode.getChildren().find(node => {
                         if (node.name === 'checkbox') {
                             node.setAttribute('checked', checked);
@@ -45032,9 +45053,12 @@
             this.updateNextFrame();
         }
         updateCellContentWhileResize(col, row) {
-            const type = this.table.isHeader(col, row)
-                ? this.table._getHeaderLayoutMap(col, row).headerType
-                : this.table.getBodyColumnType(col, row);
+            const isvtableMerge = this.table.getCellRawRecord(col, row)?.vtableMerge;
+            const type = isvtableMerge
+                ? 'text'
+                : this.table.isHeader(col, row)
+                    ? this.table._getHeaderLayoutMap(col, row).headerType
+                    : this.table.getBodyColumnType(col, row);
             const cellGroup = this.getCell(col, row);
             if (type === 'image' || type === 'video') {
                 updateImageCellContentWhileResize(cellGroup, col, row, 0, 0, this.table);
@@ -45059,10 +45083,15 @@
                 const drawRange = this.table.getDrawRange();
                 if (abstractY >= drawRange.top && abstractY <= drawRange.bottom) {
                     cell = this.table.getCellAtRelativePosition(abstractX - offset, abstractY);
-                    return cell;
+                    if (cell.col === this.table.colCount - 1) {
+                        return cell;
+                    }
                 }
                 return { col: -1, row: -1 };
             }
+            if (!cellGroup.stage) {
+                return { col: -1, row: -1 };
+            }
             if (abstractX < cellGroup.globalAABBBounds.x1 + offset) {
                 cell = { col: cellGroup.col - 1, row: cellGroup.row, x: cellGroup.globalAABBBounds.x1 };
             }
@@ -45071,7 +45100,7 @@
             }
             if (cell &&
                 this.table.rightFrozenColCount > 0 &&
-                cell.col === this.table.colCount - this.table.rightFrozenColCount - 1 &&
+                cell.col >= this.table.colCount - this.table.rightFrozenColCount - 1 &&
                 this.table.tableNoFrameWidth -
                     this.table.getFrozenColsWidth() -
                     this.table.getRightFrozenColsWidth() +
@@ -45097,7 +45126,7 @@
                 }
                 if (cell &&
                     this.table.bottomFrozenRowCount > 0 &&
-                    cell.row === this.table.rowCount - this.table.bottomFrozenRowCount - 1 &&
+                    cell.row >= this.table.rowCount - this.table.bottomFrozenRowCount - 1 &&
                     this.table.tableNoFrameHeight -
                         this.table.getFrozenRowsHeight() -
                         this.table.getBottomFrozenRowsHeight() +
@@ -46351,14 +46380,14 @@
             !state.table.transpose) {
             state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1, state.columnResize.isRightFrozen);
         }
-        else if (state.columnResize.col >= state.table.colCount - state.table.rightFrozenColCount &&
+        else if (state.table.options.frozenColCount) {
+            state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1);
+        }
+        if (state.columnResize.col >= state.table.colCount - state.table.rightFrozenColCount &&
             !state.table.isPivotTable() &&
             !state.table.transpose) {
             state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount);
         }
-        else if (state.table.options.frozenColCount) {
-            state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1);
-        }
         else if (state.table.options.rightFrozenColCount) {
             state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount);
         }
@@ -48040,11 +48069,11 @@
             state.showVerticalScrollBar(true);
         }
         isWheelEvent && state.resetInteractionState();
-        if (event.cancelable &&
+        if (event.nativeEvent.cancelable &&
             (state.table.internalProps.overscrollBehavior === 'none' ||
                 (Math.abs(deltaY) >= Math.abs(deltaX) && deltaY !== 0 && isVerticalScrollable(deltaY, state)) ||
                 (Math.abs(deltaY) <= Math.abs(deltaX) && deltaX !== 0 && isHorizontalScrollable(deltaX, state)))) {
-            event.preventDefault();
+            event.nativeEvent.preventDefault();
         }
     }
     function optimizeScrollXY(x, y, ratio) {
@@ -49246,7 +49275,7 @@
                     }
                 }
             }
-            else {
+            else if (!(e.ctrlKey || e.metaKey || e.shiftKey)) {
                 const editCellTrigger = table.options.editCellTrigger;
                 if ((editCellTrigger === 'keydown' || (Array.isArray(editCellTrigger) && editCellTrigger.includes('keydown'))) &&
                     !table.editorManager?.editingEditor) {
@@ -52413,6 +52442,9 @@
                     customStyleId: customStyleId
                 });
             }
+            else if (this.customCellStyleArrangement[index].customStyleId === customStyleId) {
+                return;
+            }
             else {
                 this.customCellStyleArrangement[index].customStyleId = customStyleId;
             }
@@ -54284,7 +54316,7 @@
         let cacheKey;
         const cellType = table.getCellType(col, row);
         const rawRecord = table.getCellOriginRecord(col, row);
-        if (rawRecord?.vTableMerge) {
+        if (rawRecord?.vtableMerge) {
             cacheKey = 'merge-title';
         }
         else if (table.isSeriesNumberInBody(col, row)) {
@@ -54298,7 +54330,7 @@
             cacheKey = row + cellType;
         }
         let cacheStyle;
-        if (rawRecord?.vTableMerge) {
+        if (rawRecord?.vtableMerge) {
             cacheStyle = table.bodyMergeTitleCache.get(cacheKey);
         }
         else if (layoutMap.isBottomFrozenRow(row)) {
@@ -54316,7 +54348,7 @@
         const column = layoutMap.getBody(col, row);
         const styleClass = table.internalProps.bodyHelper.getStyleClass(table.getCellType(col, row));
         const style = column?.style;
-        cacheStyle = of$2(style, rawRecord?.vTableMerge && table.theme.groupTitleStyle
+        cacheStyle = of$2(style, rawRecord?.vtableMerge && table.theme.groupTitleStyle
             ? table.theme.groupTitleStyle
             : layoutMap.isBottomFrozenRow(row) && table.theme.bottomFrozenStyle
                 ? table.theme.bottomFrozenStyle
@@ -54380,7 +54412,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.7.1";
+        version = "1.7.3";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -58129,7 +58161,7 @@
             return;
         }
         const cellRecord = layout._table.getCellRawRecord(col, row);
-        if (cellRecord?.vTableMerge) {
+        if (cellRecord?.vtableMerge) {
             cellRange.start.col = layout.rowHeaderLevelCount;
             cellRange.end.col = layout.colCount - 1;
             cellRange.start.row = cellRange.end.row = row;
@@ -73263,7 +73295,7 @@
     }
 
     registerForVrender();
-    const version = "1.7.1";
+    const version = "1.7.3";
     function getIcons() {
         return get$2();
     }