@visactor/vtable 1.13.1-alpha.2 → 1.13.1-alpha.4

package/dist/vtable.js

@@ -12229,10 +12229,7 @@
         const {
           context: context
         } = drawContext;
-        context.highPerformanceSave();
-        const t1 = graphic.parent.globalTransMatrix,
-          t2 = graphic.stage.window.getViewBoxTransform().clone().multiply(t1.a, t1.b, t1.c, t1.d, t1.e, t1.f);
-        if (graphic.parent && context.setTransformFromMatrix(t2, !0), drawContribution.dirtyBounds && drawContribution.backupDirtyBounds) {
+        if (context.highPerformanceSave(), context.transformFromMatrix(graphic.transMatrix, !0), drawContribution.dirtyBounds && drawContribution.backupDirtyBounds) {
           tempDirtyBounds.copy(drawContribution.dirtyBounds), tempBackupDirtyBounds.copy(drawContribution.backupDirtyBounds);
           const m = graphic.globalTransMatrix.getInverse();
           drawContribution.dirtyBounds.copy(drawContribution.backupDirtyBounds).transformWithMatrix(m), drawContribution.backupDirtyBounds.copy(drawContribution.dirtyBounds);
@@ -57995,7 +57992,7 @@
             });
             this.table.scenegraph.updateNextFrame();
         }
-        arrangeCustomCellStyle(cellPos, customStyleId) {
+        arrangeCustomCellStyle(cellPos, customStyleId, forceFastUpdate) {
             const index = this.customCellStyleArrangement.findIndex(style => {
                 if (style.cellPosition.range && cellPos.range) {
                     return (style.cellPosition.range.start.col === cellPos.range.start.col &&
@@ -58028,7 +58025,6 @@
                 this.customCellStyleArrangement.splice(index, 1);
             }
             const style = this.getCustomCellStyleOption(customStyleId)?.style;
-            let forceFastUpdate;
             if (style) {
                 forceFastUpdate = true;
                 for (const key in style) {
@@ -58340,7 +58336,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.13.1-alpha.2";
+        version = "1.13.1-alpha.4";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -60904,8 +60900,8 @@
         registerCustomCellStyle(customStyleId, customStyle) {
             this.customCellStylePlugin?.registerCustomCellStyle(customStyleId, customStyle);
         }
-        arrangeCustomCellStyle(cellPos, customStyleId) {
-            this.customCellStylePlugin?.arrangeCustomCellStyle(cellPos, customStyleId);
+        arrangeCustomCellStyle(cellPos, customStyleId, forceFastUpdate) {
+            this.customCellStylePlugin?.arrangeCustomCellStyle(cellPos, customStyleId, forceFastUpdate);
         }
         isSeriesNumber(col, row) {
             return this.internalProps.layoutMap.isSeriesNumber(col, row);
@@ -63405,7 +63401,7 @@
         }
     }
 
-    class EditManeger {
+    class EditManager {
         table;
         editingEditor;
         isValidatingValue = false;
@@ -63500,19 +63496,14 @@
             if (!this.editingEditor.getValue) ;
             if (this.editingEditor.validateValue) {
                 this.isValidatingValue = true;
-                const maybePromiseOrValue = this.editingEditor.validateValue?.();
+                const newValue = this.editingEditor.getValue();
+                const oldValue = this.table.getCellOriginValue(this.editCell.col, this.editCell.row);
+                const maybePromiseOrValue = this.editingEditor.validateValue?.(newValue, oldValue, this.editCell, this.table);
                 if (isPromise(maybePromiseOrValue)) {
                     return new Promise((resolve, reject) => {
                         maybePromiseOrValue
                             .then(result => {
-                            if (result) {
-                                this.doExit();
-                                resolve(true);
-                            }
-                            else {
-                                this.isValidatingValue = false;
-                                resolve(false);
-                            }
+                            dealWithValidateValue(result, this, oldValue, resolve);
                         })
                             .catch((err) => {
                             this.isValidatingValue = false;
@@ -63520,11 +63511,7 @@
                         });
                     });
                 }
-                else if (maybePromiseOrValue) {
-                    this.doExit();
-                    return true;
-                }
-                return false;
+                return dealWithValidateValue(maybePromiseOrValue, this, oldValue);
             }
             this.doExit();
             return true;
@@ -63555,6 +63542,35 @@
             }
         }
     }
+    function dealWithValidateValue(validateValue, editManager, oldValue, resolve) {
+        editManager.isValidatingValue = false;
+        if (validateValue === 'validate-return') {
+            editManager.doExit();
+            resolve?.(true);
+            return true;
+        }
+        else if (validateValue === 'invalidate-return') {
+            editManager.editingEditor.setValue(oldValue);
+            editManager.doExit();
+            resolve?.(true);
+            return true;
+        }
+        else if (validateValue === 'validate-not-return') {
+            resolve?.(false);
+            return false;
+        }
+        else if (validateValue === 'invalidate-not-return') {
+            resolve?.(false);
+            return false;
+        }
+        else if (validateValue === true) {
+            editManager.doExit();
+            resolve?.(true);
+            return true;
+        }
+        resolve?.(false);
+        return false;
+    }
 
     function getGroupByDataConfig(groupByOption) {
         if (isString$2(groupByOption)) {
@@ -63695,7 +63711,10 @@
                             isCanChange = true;
                         }
                         else {
-                            isCanChange = maybePromiseOrValue;
+                            isCanChange =
+                                maybePromiseOrValue === true ||
+                                    maybePromiseOrValue === 'validate-return' ||
+                                    maybePromiseOrValue === 'invalidate-return';
                         }
                     }
                 }
@@ -64249,8 +64268,8 @@
         const removeCells = [];
         const { addCellPositions, removeCellPositions } = diffPositions;
         const proxy = table.scenegraph.proxy;
-        const { rowStart, rowLimit } = proxy;
-        let { rowEnd, bodyBottomRow } = proxy;
+        const { rowStart, rowLimit, bodyBottomRow } = proxy;
+        let { rowEnd } = proxy;
         let updateRow = Infinity;
         for (let i = 0; i < addCellPositions.length; i++) {
             const { row: cellRow } = addCellPositions[i];
@@ -64268,20 +64287,18 @@
             }
         }
         for (let i = 0; i < removeCellPositions.length; i++) {
-            const { row: cellRow } = removeCellPositions[removeCellPositions.length - i - 1];
+            const { row: cellRow } = removeCellPositions[i];
             if (cellRow < rowStart || cellRow > rowEnd) {
-                bodyBottomRow--;
+                continue;
             }
             else if (rowEnd === bodyBottomRow) {
                 removeCells.push({
                     col,
                     row: cellRow
                 });
-                updateRow--;
             }
             else {
                 updateRow = Math.min(updateRow, cellRow);
-                bodyBottomRow--;
             }
         }
         if (updateRow !== Infinity) {
@@ -64335,7 +64352,7 @@
             this.showHeader = options.showHeader ?? true;
             this.transpose = options.transpose ?? false;
             if (Env.mode !== 'node') {
-                this.editorManager = new EditManeger(this);
+                this.editorManager = new EditManager(this);
             }
             this.refreshHeader();
             this.internalProps.useOneRowHeightFillAll = false;
@@ -75780,7 +75797,7 @@
                     this.pivotSortState = options.pivotSortState;
                 }
                 if (Env.mode !== 'node') {
-                    this.editorManager = new EditManeger(this);
+                    this.editorManager = new EditManager(this);
                 }
                 this.refreshHeader();
                 this.internalProps.useOneRowHeightFillAll = false;
@@ -78816,7 +78833,7 @@
     }
 
     registerForVrender();
-    const version = "1.13.1-alpha.2";
+    const version = "1.13.1-alpha.4";
     function getIcons() {
         return get$2();
     }