@visactor/vtable 0.21.3-alpha.1 → 0.21.3

package/dist/vtable.js

@@ -33840,11 +33840,20 @@
                 if (typeof field === 'string' || typeof field === 'number') {
                     const beforeChangedValue = this.beforeChangedRecordsMap[dataIndex][field];
                     const record = this.getOriginalRecord(dataIndex);
+                    let formatValue = value;
                     if (typeof beforeChangedValue === 'number' && isAllDigits(value)) {
-                        record[field] = parseFloat(value);
+                        formatValue = parseFloat(value);
+                    }
+                    if (isPromise(record)) {
+                        record
+                            .then(record => {
+                            record[field] = formatValue;
+                        })
+                            .catch((err) => {
+                        });
                     }
                     else {
-                        record[field] = value;
+                        record[field] = formatValue;
                     }
                 }
             }
@@ -36197,7 +36206,8 @@
         }
     }
     function getCellRange(cellGroup, table) {
-        if (isValid$3(cellGroup.mergeStartCol) &&
+        if (cellGroup.role === 'cell' &&
+            isValid$3(cellGroup.mergeStartCol) &&
             isValid$3(cellGroup.mergeEndCol) &&
             isValid$3(cellGroup.mergeStartRow) &&
             isValid$3(cellGroup.mergeEndRow)) {
@@ -38171,16 +38181,6 @@
         if (isPromise(value)) {
             value = table.getCellValue(col, row);
         }
-        let bgColorFunc;
-        if (table.internalProps?.dataConfig?.mappingRules && !table.isHeader(col, row)) {
-            table.internalProps?.dataConfig?.mappingRules?.forEach((mappingRule, i) => {
-                if (mappingRule.bgColor &&
-                    table.internalProps.layoutMap.getIndicatorKey(col, row) ===
-                        mappingRule.bgColor.indicatorKey) {
-                    bgColorFunc = mappingRule.bgColor.mapping;
-                }
-            });
-        }
         let cellGroup;
         if (type === 'text' || type === 'link') {
             if (type === 'link') {
@@ -38206,22 +38206,6 @@
                     }
                 }
             }
-            if (bgColorFunc) {
-                const cellValue = table.getCellOriginValue(col, row);
-                const bgColor = bgColorFunc(table, cellValue);
-                if (bgColor) {
-                    if (cellTheme) {
-                        cellTheme.group.fill = bgColor;
-                    }
-                    else {
-                        cellTheme = {
-                            group: {
-                                fill: bgColor
-                            }
-                        };
-                    }
-                }
-            }
             let customElementsGroup;
             let renderDefault = true;
             if (customResult) {
@@ -38423,16 +38407,6 @@
         const textAlign = cellTheme.text.textAlign;
         const textBaseline = cellTheme.text.textBaseline;
         let newCellGroup;
-        let bgColorFunc;
-        if (table.internalProps?.dataConfig?.mappingRules && !table.isHeader(col, row)) {
-            table.internalProps?.dataConfig?.mappingRules?.forEach((mappingRule, i) => {
-                if (mappingRule.bgColor &&
-                    table.internalProps.layoutMap.getIndicatorKey(col, row) ===
-                        mappingRule.bgColor.indicatorKey) {
-                    bgColorFunc = mappingRule.bgColor.mapping;
-                }
-            });
-        }
         let cellWidth;
         let cellHeight;
         if (range) {
@@ -38445,10 +38419,10 @@
         }
         if (isPromise(value)) {
             oldCellGroup.removeAllChild();
-            dealPromiseData(value, table, updateCellContent.bind(null, type, value, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, addNew, cellTheme, range, customResult));
+            dealPromiseData(value, table, updateCellContent.bind(null, type, value, define, table, col, row, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, addNew, cellTheme, range, customResult));
         }
         else {
-            newCellGroup = updateCellContent(type, value, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, addNew, cellTheme, range, customResult);
+            newCellGroup = updateCellContent(type, value, define, table, col, row, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, addNew, cellTheme, range, customResult);
         }
         if (isMerge) {
             const { width: contentWidth } = newCellGroup.attribute;
@@ -38459,7 +38433,7 @@
         }
         return newCellGroup;
     }
-    function updateCellContent(type, value, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, addNew, cellTheme, range, customResult) {
+    function updateCellContent(type, value, define, table, col, row, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, addNew, cellTheme, range, customResult) {
         if (isPromise(value)) {
             value = table.getCellValue(col, row);
         }
@@ -38498,10 +38472,10 @@
         for (let col = range.start.col; col <= range.end.col; col++) {
             for (let row = range.start.row; row <= range.end.row; row++) {
                 const cellGroup = table.scenegraph.getCell(col, row, true);
-                if (range.start.row !== range.end.row) {
+                if (cellGroup.role === 'cell' && range.start.row !== range.end.row && cellGroup.contentWidth !== cellWidth) {
                     updateCellContentHeight(cellGroup, cellHeight, cellHeight, table.heightMode === 'autoHeight', padding, textAlign, textBaseline);
                 }
-                if (range.start.col !== range.end.col) {
+                if (cellGroup.role === 'cell' && range.start.col !== range.end.col && cellGroup.contentHeight !== cellHeight) {
                     updateCellContentWidth(cellGroup, cellWidth, cellHeight, 0, table.heightMode === 'autoHeight', padding, textAlign, textBaseline, table.scenegraph);
                 }
                 cellGroup.contentWidth = cellWidth;
@@ -40102,6 +40076,14 @@
     }
 
     function getCellMergeRange(cellGroup, scene) {
+        if (!scene || !scene.proxy) {
+            return {
+                colStart: 0,
+                colEnd: 0,
+                rowStart: 0,
+                rowEnd: 0
+            };
+        }
         const { mergeStartCol, mergeEndCol, mergeStartRow, mergeEndRow, col, row } = cellGroup;
         const { colStart, colEnd, rowStart, rowEnd, bodyLeftCol, bodyRightCol, bodyTopRow, bodyBottomRow } = scene.proxy;
         let cellRangeColStart = mergeStartCol;
@@ -43637,12 +43619,12 @@
                 columnGroup.updateColumnRowNumber(row);
                 if (isMerge) {
                     const rangeHeight = table.getRowHeight(row);
-                    const rangeWidth = table.getColWidth(col);
+                    table.getColWidth(col);
                     const { width: contentWidth } = cellGroup.attribute;
                     const { height: contentHeight } = cellGroup.attribute;
                     cellGroup.contentWidth = contentWidth;
                     cellGroup.contentHeight = contentHeight;
-                    resizeCellGroup(cellGroup, rangeWidth, rangeHeight, range, table);
+                    dealWithMergeCellSize(range, contentWidth, contentHeight, padding, textAlign, textBaseline, table);
                     columnGroup.updateColumnHeight(rangeHeight);
                     y += rangeHeight;
                 }
@@ -44650,7 +44632,6 @@
             this.currentRow = endRow;
             this.rowEnd = endRow;
             this.rowUpdatePos = this.rowEnd;
-            this.referenceRow = this.rowStart + Math.floor((endRow - this.rowStart) / 2);
             this.table.scenegraph.updateContainer();
             this.table.scenegraph.updateBorderSizeAndPosition();
         }
@@ -44659,7 +44640,7 @@
             computeColsWidth(this.table, this.currentCol + 1, endCol);
             for (let row = 0; row < this.table.rowCount; row++) {
                 const cellGroup = this.highPerformanceGetCell(this.currentCol, row);
-                if (isNumber$4(cellGroup.mergeStartCol) && cellGroup.mergeStartCol > this.currentCol) {
+                if (cellGroup.role === 'cell' && isNumber$4(cellGroup.mergeStartCol) && cellGroup.mergeStartCol > this.currentCol) {
                     this.table.scenegraph.updateCellContent(cellGroup.col, cellGroup.row);
                 }
             }
@@ -44696,7 +44677,6 @@
             this.currentCol = endCol;
             this.colEnd = endCol;
             this.colUpdatePos = this.colEnd;
-            this.referenceCol = this.colStart + Math.floor((endCol - this.colStart) / 2);
             this.table.scenegraph.updateContainer();
             this.table.scenegraph.updateBorderSizeAndPosition();
         }
@@ -45398,6 +45378,22 @@
             scene.createCellSelectBorder(columnHeaderStartCol, columnHeaderStartRow, columnHeaderEndCol, columnHeaderEndRow, 'body', `${startCol}${startRow}${endCol}${endRow}`, strokeArray);
         }
     }
+    function hideCellSelectBorder(scene) {
+        scene.selectingRangeComponents.forEach((selectComp, key) => {
+            selectComp.rect.setAttribute('visible', false);
+        });
+        scene.selectedRangeComponents.forEach((selectComp, key) => {
+            selectComp.rect.setAttribute('visible', false);
+        });
+    }
+    function restoreCellSelectBorder(scene) {
+        scene.selectingRangeComponents.forEach((selectComp, key) => {
+            selectComp.rect.setAttribute('visible', false);
+        });
+        scene.selectedRangeComponents.forEach((selectComp, key) => {
+            selectComp.rect.setAttribute('visible', false);
+        });
+    }
 
     function createCellSelectBorder(scene, start_Col, start_Row, end_Col, end_Row, selectRangeType, selectId, strokes) {
         const startCol = Math.min(start_Col, end_Col);
@@ -46836,7 +46832,8 @@
     }
     function updateCellRangeIcon(col, row, filter, dealer, scene) {
         const cellGroup = scene.getCell(col, row);
-        if (isValid$3(cellGroup.mergeStartCol) &&
+        if (cellGroup.role === 'cell' &&
+            isValid$3(cellGroup.mergeStartCol) &&
             isValid$3(cellGroup.mergeStartRow) &&
             isValid$3(cellGroup.mergeEndCol) &&
             isValid$3(cellGroup.mergeEndRow)) {
@@ -48486,7 +48483,8 @@
 
     function updateCell(scenegraph, col, row) {
         const cellGroup = scenegraph.highPerformanceGetCell(col, row);
-        if (isValid$3(cellGroup.mergeStartCol) &&
+        if (cellGroup.role === 'cell' &&
+            isValid$3(cellGroup.mergeStartCol) &&
             isValid$3(cellGroup.mergeStartRow) &&
             isValid$3(cellGroup.mergeEndCol) &&
             isValid$3(cellGroup.mergeEndRow)) {
@@ -55207,7 +55205,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.21.3-alpha.1";
+        version = "0.21.3";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -56970,6 +56968,16 @@
                 }
                 return cacheStyle;
             }
+            let bgColorFunc;
+            if (this.internalProps?.dataConfig?.mappingRules && !this.isHeader(col, row)) {
+                this.internalProps?.dataConfig?.mappingRules?.forEach((mappingRule, i) => {
+                    if (mappingRule.bgColor &&
+                        this.internalProps.layoutMap.getIndicatorKey(col, row) ===
+                            mappingRule.bgColor.indicatorKey) {
+                        bgColorFunc = mappingRule.bgColor.mapping;
+                    }
+                });
+            }
             let cacheKey;
             const cellType = this.getCellType(col, row);
             if ((this.isListTable() && !this.transpose) ||
@@ -57007,6 +57015,9 @@
                 dataValue: this.getCellOriginValue(col, row),
                 cellHeaderPaths: this.getCellHeaderPaths(col, row)
             }, styleClass, this.options.autoWrapText, this.theme);
+            if (bgColorFunc) {
+                cacheStyle = mergeStyle(cacheStyle, { bgColor: bgColorFunc });
+            }
             if (!isFunction$3(style)) {
                 if (layoutMap.isBottomFrozenRow(row)) {
                     this.bodyBottomStyleCache.set(cacheKey, cacheStyle);
@@ -57294,7 +57305,7 @@
                                     const copyCellValue = getCopyCellValue(c, r, range);
                                     if (typeof Promise !== 'undefined' && copyCellValue instanceof Promise) ;
                                     else {
-                                        const strCellValue = `${copyCellValue}`;
+                                        const strCellValue = isValid$3(copyCellValue) ? `${copyCellValue}` : '';
                                         if (/^\[object .*\]$/.exec(strCellValue)) ;
                                         else {
                                             copyValue += strCellValue;
@@ -57468,11 +57479,20 @@
                 this.scrollToCell({ col, row });
             }
             const cellRect = this.getCellRelativeRect(col, row);
+            if (this.stateManager.select?.ranges?.length > 0) {
+                hideCellSelectBorder(this.scenegraph);
+            }
+            const { col: hoverCol, row: hoverRow } = this.stateManager.hover.cellPos;
+            this.stateManager.updateHoverPos(-1, -1);
             const c = this.scenegraph.stage.toCanvas(false, new AABBBounds$1().set(cellRect.left + this.tableX + 1, cellRect.top + this.tableY + 1, cellRect.right + this.tableX, cellRect.bottom + this.tableY));
             if (!isInView) {
                 this.setScrollTop(scrollTop);
                 this.setScrollLeft(scrollLeft);
             }
+            if (this.stateManager.select?.ranges?.length > 0) {
+                restoreCellSelectBorder(this.scenegraph);
+            }
+            this.stateManager.updateHoverPos(hoverCol, hoverRow);
             return c.toDataURL();
         }
         exportCellRangeImg(cellRange) {
@@ -62675,7 +62695,7 @@
                                     dimension.indicatorKey === rowDimension.indicatorKey &&
                                     (!rowDimension.value || dimension.value === rowDimension.value))) {
                                 rowArr = dimension.children;
-                                if (needLowestLevel && !rowArr) {
+                                if (needLowestLevel && (!rowArr || rowArr.some(row => row.dimensionKey === 'axis'))) {
                                     rowDimensionFinded = dimension;
                                 }
                                 else if (!needLowestLevel) {
@@ -66795,7 +66815,7 @@
     }
 
     registerForVrender();
-    const version = "0.21.3-alpha.1";
+    const version = "0.21.3";
     function getIcons() {
         return get$2();
     }