@visactor/vtable 0.22.2-alpha.2 → 0.22.2

package/dist/vtable.js

@@ -24122,9 +24122,9 @@
     };
 
     function getProp$1(obj, superObj, names, defNames) {
-        return (getChainSafe(obj, ...names) ||
-            getChainSafe(superObj, ...names) ||
-            (defNames && getChainSafe(obj, ...defNames)) ||
+        return (getChainSafe(obj, ...names) ??
+            getChainSafe(superObj, ...names) ??
+            (defNames && getChainSafe(obj, ...defNames)) ??
             (defNames && getChainSafe(superObj, ...defNames)));
     }
     class TableTheme {
@@ -24166,7 +24166,7 @@
         }
         get cellInnerBorder() {
             const { obj, superTheme } = this.internalTheme;
-            return !!getProp$1(obj, superTheme, ['cellInnerBorder']);
+            return getProp$1(obj, superTheme, ['cellInnerBorder']) ?? true;
         }
         get cellBorderClipDirection() {
             const { obj, superTheme } = this.internalTheme;
@@ -36162,11 +36162,12 @@
     }
 
     function getCellBorderStrokeWidth(col, row, cellTheme, table) {
+        const frameBorderLineWidths = style.toBoxArray(table.internalProps.theme.frameStyle?.borderLineWidth ?? [null]);
         let strokeArrayWidth = cellTheme?.group?.strokeArrayWidth ?? undefined;
-        if (!table.theme.cellInnerBorder) {
+        if (table.theme.cellInnerBorder) {
             return strokeArrayWidth;
         }
-        if (col === 0) {
+        if (col === 0 && frameBorderLineWidths[3]) {
             strokeArrayWidth = strokeArrayWidth ?? [
                 cellTheme?.group?.lineWidth,
                 cellTheme?.group?.lineWidth,
@@ -36175,7 +36176,7 @@
             ];
             strokeArrayWidth[3] = 0;
         }
-        if (col === table.colCount - 1) {
+        if (col === table.colCount - 1 && frameBorderLineWidths[1]) {
             strokeArrayWidth = strokeArrayWidth ?? [
                 cellTheme?.group?.lineWidth,
                 cellTheme?.group?.lineWidth,
@@ -36184,7 +36185,7 @@
             ];
             strokeArrayWidth[1] = 0;
         }
-        if (row === 0) {
+        if (row === 0 && frameBorderLineWidths[0]) {
             strokeArrayWidth = strokeArrayWidth ?? [
                 cellTheme?.group?.lineWidth,
                 cellTheme?.group?.lineWidth,
@@ -36193,7 +36194,7 @@
             ];
             strokeArrayWidth[0] = 0;
         }
-        if (row === table.rowCount - 1) {
+        if (row === table.rowCount - 1 && frameBorderLineWidths[2]) {
             strokeArrayWidth = strokeArrayWidth ?? [
                 cellTheme?.group?.lineWidth,
                 cellTheme?.group?.lineWidth,
@@ -36470,8 +36471,24 @@
             dataValue = table.getCellOriginRecord(col, row)?.[progressBarDefine.dependField] ?? dataValue;
         }
         progressBarDefine.barType = progressBarDefine.barType ?? 'default';
-        progressBarDefine.min = progressBarDefine.min ?? 0;
-        progressBarDefine.max = progressBarDefine.max ?? progressBarDefine.min + 100;
+        progressBarDefine.min =
+            getOrApply(progressBarDefine.min, {
+                col,
+                row,
+                table,
+                value,
+                dataValue,
+                cellHeaderPaths: undefined
+            }) ?? 0;
+        progressBarDefine.max =
+            getOrApply(progressBarDefine.max, {
+                col,
+                row,
+                table,
+                value,
+                dataValue,
+                cellHeaderPaths: undefined
+            }) ?? progressBarDefine.min + 100;
         const height = table.getRowHeight(row);
         let contentWidth = width;
         let contentHeight = height;
@@ -37690,9 +37707,9 @@
                 textConfig[0].textAlign = textAlign;
                 const text = new RichText({
                     width: autoColWidth ? 0 : cellWidth - (padding[1] + padding[3]) - leftIconWidth - rightIconWidth,
-                    height: autoRowHeight ? 0 : cellHeight - (padding[0] + padding[2]),
+                    height: autoRowHeight && autoWrapText ? 0 : Math.ceil(cellHeight - (padding[0] + padding[2])),
                     textConfig,
-                    verticalDirection: autoRowHeight ? 'top' : textBaseline,
+                    verticalDirection: autoRowHeight && autoWrapText ? 'top' : textBaseline,
                     ellipsis: textOption.ellipsis
                 });
                 text.name = 'text';
@@ -37898,7 +37915,7 @@
             cellContent.updateWidth(distWidth - leftIconWidth - rightIconHeight - (padding[1] + padding[3]));
             contentHeight = cellContent.AABBBounds.height();
         }
-        const oldCellHeight = Math.max(leftIconHeight, rightIconHeight, oldTextHeight) + padding[0] + padding[2];
+        const oldCellHeight = Math.round(Math.max(leftIconHeight, rightIconHeight, oldTextHeight) + padding[0] + padding[2]);
         cellGroup.forEachChildren((child) => {
             if (child.role === 'icon-left') ;
             else if (child.role === 'icon-right') {
@@ -40225,26 +40242,42 @@
                 }
             }
             else if (iconInlineFront.length || iconInlineEnd.length) {
-                const textOption = Object.assign({
-                    text: cellValue?.toString(),
-                    fontFamily,
-                    fontSize,
-                    fontStyle,
-                    fontWeight,
-                    lineHeight
-                });
-                textOption.textBaseline = 'middle';
-                const textConfig = [
-                    ...iconInlineFront.map(icon => dealWithRichTextIcon(icon)),
-                    textOption,
-                    ...iconInlineEnd.map(icon => dealWithRichTextIcon(icon))
-                ];
-                utilRichTextMark.setAttributes({
-                    width: cellWidth - (padding[1] + padding[3]) - iconWidth,
-                    height: 0,
-                    textConfig
-                });
-                maxHeight = utilRichTextMark.AABBBounds.height();
+                if (autoWrapText) {
+                    const textOption = Object.assign({
+                        text: cellValue?.toString(),
+                        fontFamily,
+                        fontSize,
+                        fontStyle,
+                        fontWeight,
+                        lineHeight
+                    });
+                    textOption.textBaseline = 'middle';
+                    const textConfig = [
+                        ...iconInlineFront.map(icon => dealWithRichTextIcon(icon)),
+                        textOption,
+                        ...iconInlineEnd.map(icon => dealWithRichTextIcon(icon))
+                    ];
+                    utilRichTextMark.setAttributes({
+                        width: cellWidth - (padding[1] + padding[3]) - iconWidth,
+                        height: 0,
+                        textConfig
+                    });
+                    maxHeight = utilRichTextMark.AABBBounds.height();
+                }
+                else {
+                    maxHeight = 0;
+                    lines.forEach((line, index) => {
+                        if (index === 0 && iconInlineFront.length) {
+                            maxHeight += Math.max(lineHeight, iconInlineFrontHeight);
+                        }
+                        else if (index === lines.length - 1 && iconInlineEnd.length) {
+                            maxHeight += Math.max(lineHeight, iconInlineEndHeight);
+                        }
+                        else {
+                            maxHeight += lineHeight;
+                        }
+                    });
+                }
             }
             else if (autoWrapText) {
                 const maxLineWidth = cellWidth - (padding[1] + padding[3]) - iconWidth;
@@ -41626,7 +41659,7 @@
                 this.frozenShadowLine.setAttributes({
                     visible: true,
                     x: colX,
-                    height: this.table.getRowsHeight(0, this.table.rowCount - 1)
+                    height: this.table.tableNoFrameHeight
                 });
             }
         }
@@ -51090,7 +51123,7 @@
                             target: { col: eventArgsSet.eventArgs.col, row: eventArgsSet.eventArgs.row },
                             source: {
                                 col: table.stateManager.columnMove.colSource,
-                                row: table.stateManager.columnMove.colSource
+                                row: table.stateManager.columnMove.rowSource
                             }
                         });
                     }
@@ -52189,6 +52222,14 @@
                             !state.table.transpose) {
                             state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1, state.columnResize.isRightFrozen);
                         }
+                        const colWidths = [];
+                        for (let col = 0; col < this.table.colCount; col++) {
+                            colWidths.push(this.table.getColWidth(col));
+                        }
+                        this.table.fireListeners(TABLE_EVENT_TYPE.RESIZE_COLUMN_END, {
+                            col: resizeCol.col,
+                            colWidths
+                        });
                     }
                 }
             });
@@ -55565,7 +55606,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.22.2-alpha.2";
+        version = "0.22.2";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -56778,14 +56819,20 @@
         }
         getBottomFrozenRowsHeight() {
             if (this.bottomFrozenRowCount > 0) {
-                const height = this.getRowsHeight(this.rowCount - this.bottomFrozenRowCount, this.rowCount - 1);
+                let height = 0;
+                for (let row = this.rowCount - this.bottomFrozenRowCount; row <= this.rowCount - 1; row++) {
+                    height += this.getRowHeight(row);
+                }
                 return height;
             }
             return 0;
         }
         getRightFrozenColsWidth() {
             if (this.rightFrozenColCount > 0) {
-                const width = this.getColsWidth(this.colCount - this.rightFrozenColCount, this.colCount - 1);
+                let width = 0;
+                for (let col = this.colCount - this.rightFrozenColCount; col <= this.colCount - 1; col++) {
+                    width += this.getColWidth(col);
+                }
                 return width;
             }
             return 0;
@@ -60366,8 +60413,10 @@
                 if (this.table.internalProps.layoutMap?.isAggregation?.(col, row)) {
                     return;
                 }
+                if (!this.editingEditor) {
+                    this.editCell = { col, row };
+                }
                 this.editingEditor = editor;
-                this.editCell = { col, row };
                 const dataValue = this.table.getCellOriginValue(col, row);
                 const rect = this.table.getCellRangeRelativeRect(this.table.getCellRange(col, row));
                 const referencePosition = { rect: { left: rect.left, top: rect.top, width: rect.width, height: rect.height } };
@@ -60406,12 +60455,14 @@
                 }
             }
             if (!this.editingEditor.getValue) ;
-            const changedValue = this.editingEditor.getValue?.();
-            this.table.changeCellValue(this.editCell.col, this.editCell.row, changedValue);
-            this.editingEditor.exit && (void 0);
-            this.editingEditor.exit?.();
-            this.editingEditor.onEnd?.();
-            this.editingEditor = null;
+            if (!this.editingEditor.validateValue || this.editingEditor.validateValue?.()) {
+                const changedValue = this.editingEditor.getValue?.();
+                this.table.changeCellValue(this.editCell.col, this.editCell.row, changedValue);
+                this.editingEditor.exit && (void 0);
+                this.editingEditor.exit?.();
+                this.editingEditor.onEnd?.();
+                this.editingEditor = null;
+            }
         }
         cancelEdit() {
             if (this.editingEditor) {
@@ -61092,6 +61143,9 @@
             return undefined;
         }
         setRecords(records, option) {
+            this.internalProps.dataSource?.release();
+            this.internalProps.releaseList = this.internalProps.releaseList?.filter((item) => !item.dataSourceObj);
+            this.internalProps.dataSource = null;
             let sort;
             if (Array.isArray(option) || option?.order) {
                 sort = option;
@@ -67662,7 +67716,7 @@
     }
 
     registerForVrender();
-    const version = "0.22.2-alpha.2";
+    const version = "0.22.2";
     function getIcons() {
         return get$2();
     }