@visactor/vtable 1.17.4-alpha.5 → 1.17.4-alpha.7

package/dist/vtable.js

@@ -30668,9 +30668,6 @@
                     },
                     get selectionFillMode() {
                         return selectionStyle?.selectionFillMode ?? 'overlay';
-                    },
-                    get dynamicUpdateSelectionSize() {
-                        return selectionStyle?.dynamicUpdateSelectionSize ?? false;
                     }
                 };
             }
@@ -34516,36 +34513,32 @@
         const tableCornerRadius = table.theme.frameStyle.cornerRadius;
         if (table.theme.cellInnerBorder) {
             if (Array.isArray(tableCornerRadius)) {
-                const radius = [0, 0, 0, 0];
                 if (col === 0 && row === 0) {
-                    radius[0] = tableCornerRadius[0];
+                    return [tableCornerRadius[0], 0, 0, 0];
                 }
-                if (col === table.colCount - 1 && row === 0) {
-                    radius[1] = tableCornerRadius[1];
+                else if (col === table.colCount - 1 && row === 0) {
+                    return [0, tableCornerRadius[1], 0, 0];
                 }
-                if (col === 0 && row === table.rowCount - 1) {
-                    radius[3] = tableCornerRadius[3];
+                else if (col === 0 && row === table.rowCount - 1) {
+                    return [0, 0, 0, tableCornerRadius[3]];
                 }
-                if (col === table.colCount - 1 && row === table.rowCount - 1) {
-                    radius[2] = tableCornerRadius[2];
+                else if (col === table.colCount - 1 && row === table.rowCount - 1) {
+                    return [0, 0, tableCornerRadius[2], 0];
                 }
-                return radius;
             }
             else if (tableCornerRadius) {
-                const radius = [0, 0, 0, 0];
                 if (col === 0 && row === 0) {
-                    radius[0] = tableCornerRadius;
+                    return [tableCornerRadius, 0, 0, 0];
                 }
-                if (col === table.colCount - 1 && row === 0) {
-                    radius[1] = tableCornerRadius;
+                else if (col === table.colCount - 1 && row === 0) {
+                    return [0, tableCornerRadius, 0, 0];
                 }
-                if (col === 0 && row === table.rowCount - 1) {
-                    radius[3] = tableCornerRadius;
+                else if (col === 0 && row === table.rowCount - 1) {
+                    return [0, 0, 0, tableCornerRadius];
                 }
-                if (col === table.colCount - 1 && row === table.rowCount - 1) {
-                    radius[2] = tableCornerRadius;
+                else if (col === table.colCount - 1 && row === table.rowCount - 1) {
+                    return [0, 0, tableCornerRadius, 0];
                 }
-                return radius;
             }
         }
         return 0;
@@ -37613,7 +37606,6 @@
             customElementsGroup = customResult.elementsGroup;
             renderDefault = customResult.renderDefault;
         }
-        else if (range?.isCustom) ;
         else {
             let customRender;
             let customLayout;
@@ -41176,7 +41168,7 @@
     }
 
     const CHART_NUMBER_TYPE = genNumberType();
-    class Chart extends Group$2 {
+    class Chart extends Rect$2 {
         type = 'chart';
         chartInstance;
         activeChartInstance;
@@ -41398,11 +41390,11 @@
             y2: viewBox.y2 - viewBox.y1
         }, false, false);
         const chartStage = chartInstance.getStage();
-        const matrix = chart.globalTransMatrix.clone();
-        const stageMatrix = chart.stage.window.getViewBoxTransform();
-        matrix.multiply(stageMatrix.a, stageMatrix.b, stageMatrix.c, stageMatrix.d, stageMatrix.e, stageMatrix.f);
+        const matrix = chart.globalTransMatrix;
+        const stageMatrix = chart.stage.window.getViewBoxTransform().clone();
+        stageMatrix.multiply(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f);
         chartStage.window.setViewBoxTransform &&
-            chartStage.window.setViewBoxTransform(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f);
+            chartStage.window.setViewBoxTransform(stageMatrix.a, stageMatrix.b, stageMatrix.c, stageMatrix.d, stageMatrix.e, stageMatrix.f);
         const { table } = chart.getRootNode();
         let updateSpec = false;
         if (table.options.specFormat) {
@@ -41519,10 +41511,7 @@
         if (stage.releaseStatus === 'released') {
             return null;
         }
-        const matrix = stage.window.getViewBoxTransform();
         const window = renderToNewWindow(stage, fullImage, viewBox);
-        window.setViewBoxTransform(matrix.a, matrix.b, matrix.c, matrix.d, 0, 0);
-        stage.renderTo(window);
         const c = window.getNativeHandler();
         if (c.nativeCanvas) {
             return c.nativeCanvas;
@@ -41560,6 +41549,7 @@
                 title: ''
             });
         }
+        window.setViewBoxTransform(matrix.a, matrix.b, matrix.c, matrix.d, 0, 0);
         stage.renderTo(window);
         return window;
     }
@@ -43036,6 +43026,27 @@
         injectable()
     ], SuffixTextBeforeRenderContribution);
 
+    let VChartPicker = class VChartPicker {
+        type = 'chart';
+        numberType = CHART_NUMBER_TYPE;
+        contains(chart, point, params) {
+            const vChart = chart.activeChartInstance;
+            if (!vChart) {
+                return false;
+            }
+            const vchartStage = vChart.getStage();
+            vchartStage.dirtyBounds?.clear();
+            const pick = vchartStage.pick(point.x, point.y);
+            if (pick.graphic === null && pick.group.name === 'root') {
+                return false;
+            }
+            return pick;
+        }
+    };
+    VChartPicker = __decorate([
+        injectable()
+    ], VChartPicker);
+
     var splitModule = new ContainerModule((bind, unbind, isBound, rebind) => {
         if (isBound(SplitRectBeforeRenderContribution$1)) {
             rebind(SplitRectBeforeRenderContribution$1).to(SplitRectBeforeRenderContribution).inSingletonScope();
@@ -43054,6 +43065,8 @@
         bind(DefaultCanvasChartRender).toSelf().inSingletonScope();
         bind(ChartRender).to(DefaultCanvasChartRender);
         bind(GraphicRender).to(DefaultCanvasChartRender);
+        bind(VChartPicker).toSelf().inSingletonScope();
+        bind(CanvasPickerContribution).toService(VChartPicker);
         bind(BeforeImageRenderContribution).toSelf().inSingletonScope();
         bind(ImageRenderContribution).toService(BeforeImageRenderContribution);
         bind(AfterImageRenderContribution).toSelf().inSingletonScope();
@@ -45741,11 +45754,10 @@
                 isNearBottomColHeader = true;
             }
         }
-        const { dynamicUpdateSelectionSize } = table.theme.selectionStyle;
-        if ((isNearRowHeader && (selectComp.rect.attribute.stroke[3] || dynamicUpdateSelectionSize)) ||
-            (isNearRightRowHeader && (selectComp.rect.attribute.stroke[1] || dynamicUpdateSelectionSize)) ||
-            (isNearColHeader && (selectComp.rect.attribute.stroke[0] || dynamicUpdateSelectionSize)) ||
-            (isNearBottomColHeader && (selectComp.rect.attribute.stroke[2] || dynamicUpdateSelectionSize))) {
+        if ((isNearRowHeader && selectComp.rect.attribute.stroke[3]) ||
+            (isNearRightRowHeader && selectComp.rect.attribute.stroke[1]) ||
+            (isNearColHeader && selectComp.rect.attribute.stroke[0]) ||
+            (isNearBottomColHeader && selectComp.rect.attribute.stroke[2])) {
             if (isNearRowHeader && selectComp.rect.attribute.stroke[3]) {
                 scene.tableGroup.insertAfter(selectComp.rect, selectComp.role === 'columnHeader'
                     ? scene.cornerHeaderGroup
@@ -50045,8 +50057,10 @@
         if (prevHoverCellCol === col && prevHoverCellRow === row) {
             return;
         }
-        scenegraph.deactivateChart(prevHoverCellCol, prevHoverCellRow);
-        scenegraph.activateChart(col, row);
+        if (!state.table.options.customConfig?.disableBuildInChartActive) {
+            scenegraph.deactivateChart(prevHoverCellCol, prevHoverCellRow);
+            scenegraph.activateChart(col, row);
+        }
         let updateScenegraph = false;
         const { ranges, highlightScope: selectMode } = state.select;
         if (prevHoverCellCol !== -1 && prevHoverCellRow !== -1) {
@@ -51421,19 +51435,6 @@
             if (state.checkedState.has(dataIndex)) {
                 state.checkedState.get(dataIndex)[field] = checked;
             }
-            else if (dataIndex.includes(',')) {
-                const parentDataIndex = dataIndex.split(',').slice(0, -1).join(',');
-                if (state.checkedState.has(parentDataIndex) && state.checkedState.get(parentDataIndex)[field] === true) {
-                    state.checkedState.set(dataIndex, {
-                        [field]: true
-                    });
-                }
-                else {
-                    state.checkedState.set(dataIndex, {
-                        [field]: checked
-                    });
-                }
-            }
             else {
                 state.checkedState.set(dataIndex, {
                     [field]: checked
@@ -51619,8 +51620,6 @@
             target = table.isPivotTable() ? undefined : table.getRecordIndexByCell(0, targetIndex);
         }
         if (isNumber$4(source) && isNumber$4(target)) {
-            sourceIndex = source;
-            targetIndex = target;
             if (sourceIndex > targetIndex) {
                 const sourceRecord = checkedState.get(sourceIndex.toString());
                 for (let i = sourceIndex; i > targetIndex; i--) {
@@ -55338,13 +55337,10 @@
 
     function bindGroupTitleCheckboxChange(table) {
         table.on('checkbox_state_change', args => {
-            const { col, row, checked, field } = args;
-            if (field !== '_vtable_rowSeries_number' || table.internalProps.rowSeriesNumber?.enableTreeCheckbox !== true) {
-                return;
-            }
-            if (table.isHeader(col, row)) {
+            if (table.internalProps.rowSeriesNumber?.enableTreeCheckbox !== true) {
                 return;
             }
+            const { col, row, checked } = args;
             const record = table.getCellOriginRecord(col, row);
             const indexedData = table.dataSource.currentPagerIndexedData;
             const titleShowIndex = table.getRecordShowIndexByCell(col, row);
@@ -55352,9 +55348,9 @@
             if (isNumber$4(titleIndex)) {
                 titleIndex = [titleIndex];
             }
-            if (record.vtableMerge || record.children?.length) {
+            if (record.vtableMerge) {
                 if (checked) {
-                    if (getHierarchyState(table, col, row) === HierarchyState.collapse) {
+                    if (table.getHierarchyState(col, row) === HierarchyState.collapse) {
                         updateChildrenCheckboxState(true, titleIndex, table);
                     }
                     else {
@@ -55363,7 +55359,7 @@
                     updateGroupTitleCheckboxState(titleShowIndex, titleIndex, indexedData, table);
                 }
                 else {
-                    if (getHierarchyState(table, col, row) === HierarchyState.collapse) {
+                    if (table.getHierarchyState(col, row) === HierarchyState.collapse) {
                         updateChildrenCheckboxState(false, titleIndex, table);
                     }
                     else {
@@ -55412,23 +55408,7 @@
         const currentIndexLength = isArray$7(currentIndex) ? currentIndex.length : 1;
         let start = false;
         const result = [];
-        const keys = Array.from(checkedState.keys()).sort((a, b) => {
-            const aArr = a.split(',');
-            const bArr = b.split(',');
-            const maxLength = Math.max(aArr.length, bArr.length);
-            for (let i = 0; i < maxLength; i++) {
-                const a = Number(aArr[i]) ?? 0;
-                const b = Number(bArr[i]) ?? 0;
-                if (a !== b) {
-                    return a - b;
-                }
-            }
-            return 0;
-        });
-        const stateArr = keys.map(key => checkedState.get(key));
-        stateArr.forEach((state, i) => {
-            const index = keys[i];
-            const value = state;
+        checkedState.forEach((value, index) => {
             if (start) {
                 const indexData = index.split(',');
                 if (indexData.length === currentIndexLength) {
@@ -55460,35 +55440,19 @@
             setCellCheckboxStateByAttribute(col, row, 'indeterminate', table);
         }
     }
-    function updateChildrenCheckboxState(parentState, currentIndex, table) {
+    function updateChildrenCheckboxState(state, currentIndex, table) {
         const { checkedState } = table.stateManager;
         const key = currentIndex.toString();
         const currentIndexLength = isArray$7(currentIndex) ? currentIndex.length : 1;
         let start = false;
-        const keys = Array.from(checkedState.keys()).sort((a, b) => {
-            const aArr = a.split(',');
-            const bArr = b.split(',');
-            const maxLength = Math.max(aArr.length, bArr.length);
-            for (let i = 0; i < maxLength; i++) {
-                const a = Number(aArr[i]) ?? 0;
-                const b = Number(bArr[i]) ?? 0;
-                if (a !== b) {
-                    return a - b;
-                }
-            }
-            return 0;
-        });
-        const stateArr = keys.map(key => checkedState.get(key));
-        stateArr.forEach((state, i) => {
-            const index = keys[i];
-            const value = state;
+        checkedState.forEach((value, index) => {
             if (start) {
                 const indexData = index.split(',');
                 if (indexData.length === currentIndexLength) {
                     start = false;
                 }
                 else {
-                    value._vtable_rowSeries_number = parentState;
+                    value._vtable_rowSeries_number = state;
                 }
             }
             if (index === key) {
@@ -55496,33 +55460,6 @@
             }
         });
     }
-    function bindHeaderCheckboxChange(table) {
-        table.on('checkbox_state_change', args => {
-            const { col, row, checked, field } = args;
-            if (table.isHeader(col, row)) {
-                table.stateManager.setHeaderCheckedState(field, checked);
-                const cellType = table.getCellType(col, row);
-                if (cellType === 'checkbox') {
-                    table.scenegraph.updateCheckboxCellState(col, row, checked);
-                }
-            }
-            else {
-                table.stateManager.setCheckedState(col, row, field, checked);
-                const cellType = table.getCellType(col, row);
-                if (cellType === 'checkbox') {
-                    const oldHeaderCheckedState = table.stateManager.headerCheckedState[field];
-                    const newHeaderCheckedState = table.stateManager.updateHeaderCheckedState(field, col, row);
-                    if (oldHeaderCheckedState !== newHeaderCheckedState) {
-                        table.scenegraph.updateHeaderCheckboxCellState(col, row, newHeaderCheckedState);
-                    }
-                }
-            }
-        });
-    }
-    function getHierarchyState(table, col, row) {
-        const index = table.getRecordShowIndexByCell(col, row);
-        return table.dataSource.getHierarchyState(index);
-    }
 
     function bindButtonClickEvent(table) {
         table.on(TABLE_EVENT_TYPE.CLICK_CELL, (e) => {
@@ -55700,7 +55637,6 @@
             bindAxisClickEvent(this.table);
             bindAxisHoverEvent(this.table);
             bindGroupTitleCheckboxChange(this.table);
-            bindHeaderCheckboxChange(this.table);
             bindButtonClickEvent(this.table);
             rightButtonClickEvent(this.table);
         }
@@ -56012,7 +55948,6 @@
         _barMarkWidth;
         _barMarkPosition;
         _barRightToLeft;
-        _barMarkInBar;
         static get DEFAULT() {
             return defaultStyle$4 ? defaultStyle$4 : (defaultStyle$4 = new ProgressBarStyle());
         }
@@ -56034,7 +55969,6 @@
             this._barMarkWidth = style.barMarkWidth ?? 2;
             this._barMarkPosition = style.barMarkPosition ?? 'right';
             this._barRightToLeft = style.barRightToLeft ?? false;
-            this._barMarkInBar = style.barMarkInBar ?? true;
         }
         get showBar() {
             return this._showBar;
@@ -56126,12 +56060,6 @@
         set barRightToLeft(value) {
             this._barRightToLeft = value;
         }
-        get barMarkInBar() {
-            return this._barMarkInBar;
-        }
-        set barMarkInBar(value) {
-            this._barMarkInBar = value;
-        }
         clone() {
             return new ProgressBarStyle(this, null);
         }
@@ -60524,7 +60452,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.17.4-alpha.5";
+        version = "1.17.4-alpha.7";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -61193,8 +61121,6 @@
                         height - ((lineWidths[0] ?? 0) + (shadowWidths[0] ?? 0)) - ((lineWidths[2] ?? 0) + (shadowWidths[2] ?? 0));
                 }
             }
-            this._clearColRangeWidthsMap();
-            this._clearRowRangeHeightsMap();
         }
         updateViewBox(newViewBox) {
             const oldWidth = (this.options?.viewBox?.x2 ?? 0) - (this.options?.viewBox?.x1 ?? 0);
@@ -62369,8 +62295,7 @@
                         end: {
                             col: Math.min(customMerge.range.end.col, this.colCount - 1),
                             row: Math.min(customMerge.range.end.row, this.rowCount - 1)
-                        },
-                        isCustom: true
+                        }
                     };
                     return range;
                 }
@@ -62399,17 +62324,6 @@
                         }, styleClass, this.options.autoWrapText, this.theme);
                         customMerge.style = fullStyle;
                     }
-                    customMerge.range = {
-                        start: {
-                            col: Math.max(customMerge.range.start.col, 0),
-                            row: Math.max(customMerge.range.start.row, 0)
-                        },
-                        end: {
-                            col: Math.min(customMerge.range.end.col, this.colCount - 1),
-                            row: Math.min(customMerge.range.end.row, this.rowCount - 1)
-                        },
-                        isCustom: true
-                    };
                     return customMerge;
                 }
             }
@@ -66582,10 +66496,6 @@
                 if (this.table.internalProps.layoutMap?.isAggregation?.(col, row)) {
                     return;
                 }
-                const record = this.table.getCellRawRecord(col, row);
-                if (record?.vtableMerge) {
-                    return;
-                }
                 if (!this.editingEditor) {
                     this.editCell = { col, row };
                 }
@@ -68227,25 +68137,13 @@
                 this.stateManager.initLeftRecordsCheckState(this.records);
             }
             if (isValid$3(field)) {
-                const keys = Array.from(this.stateManager.checkedState.keys()).sort((a, b) => {
-                    const aArr = a.split(',');
-                    const bArr = b.split(',');
-                    const maxLength = Math.max(aArr.length, bArr.length);
-                    for (let i = 0; i < maxLength; i++) {
-                        const a = Number(aArr[i]) ?? 0;
-                        const b = Number(bArr[i]) ?? 0;
-                        if (a !== b) {
-                            return a - b;
-                        }
-                    }
-                    return 0;
-                });
+                const keys = Array.from(this.stateManager.checkedState.keys()).sort((a, b) => Number(a) - Number(b));
                 let stateArr = keys.map(key => this.stateManager.checkedState.get(key));
                 if (this.options.groupBy) {
                     stateArr = getGroupCheckboxState(this);
                 }
                 return Array.from(stateArr, (state) => {
-                    return state && state[field];
+                    return state[field];
                 });
             }
             return new Array(...this.stateManager.checkedState.values());
@@ -73879,7 +73777,7 @@
             height: contentHeight
         });
         percentCompleteBarGroup.name = 'progress-bar';
-        const { showBar, barColor, barBgColor, barPositiveColor, barNegativeColor, barAxisColor, barRightToLeft, showBarMark, barMarkPositiveColor, barMarkNegativeColor, barMarkWidth, barMarkPosition, barMarkInBar } = style;
+        const { showBar, barColor, barBgColor, barPositiveColor, barNegativeColor, barAxisColor, barRightToLeft, showBarMark, barMarkPositiveColor, barMarkNegativeColor, barMarkWidth, barMarkPosition } = style;
         let { barHeight, barBottom, barPadding } = style;
         if (barPadding.length === 1) {
             barPadding = [barPadding[0], barPadding[0], barPadding[0], barPadding[0]];
@@ -73902,13 +73800,9 @@
         });
         const borderWidth = getQuadProps(getProp('borderLineWidth', style, col, row, table));
         const barPaddingTop = Math.max(barPadding[0], Math.ceil(borderWidth[0] / 2));
-        let barPaddingRight = Math.max(barPadding[1], Math.floor(borderWidth[1] / 2));
+        const barPaddingRight = Math.max(barPadding[1], Math.floor(borderWidth[1] / 2));
         const barPaddingBottom = Math.max(barPadding[2], Math.floor(borderWidth[2] / 2));
-        let barPaddingLeft = Math.max(barPadding[3], Math.ceil(borderWidth[3] / 2));
-        if (showBarMark && barMarkWidth > 0 && barMarkPosition === 'right' && barMarkInBar === false) {
-            barPaddingRight += barMarkWidth;
-            barPaddingLeft += barMarkWidth;
-        }
+        const barPaddingLeft = Math.max(barPadding[3], Math.ceil(borderWidth[3] / 2));
         contentWidth -= barPaddingRight + barPaddingLeft;
         contentHeight -= barPaddingBottom + barPaddingTop;
         if (row === table.rowCount - 1 && [0, '0'].includes(barBottom)) {
@@ -74129,7 +74023,7 @@
                         if (barMarkPosition === 'right') {
                             const markLeft = barRightToLeft
                                 ? barRectPosi.left + barMarkWidth / 2
-                                : barRectPosi.left + barRectPosi.width + (barMarkInBar ? -barMarkWidth / 2 : barMarkWidth / 2);
+                                : barRectPosi.left + barRectPosi.width - barMarkWidth / 2;
                             points.push({ x: markLeft, y: barRectPosi.top });
                             points.push({ x: markLeft, y: barRectPosi.top + barRectPosi.height });
                         }
@@ -74573,9 +74467,7 @@
                 cornerRadius: buttonBorderRadius
             },
             state: {
-                text: {
-                    hover: {}
-                },
+                text: {},
                 panel: {
                     hover: {
                         fill: buttonHoverColor,
@@ -83204,7 +83096,7 @@
     }
 
     registerForVrender();
-    const version = "1.17.4-alpha.5";
+    const version = "1.17.4-alpha.7";
     function getIcons() {
         return get$2();
     }