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

package/dist/vtable-calendar.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);
@@ -46138,7 +46135,7 @@
           if (cellStyle.customStyleId === customStyleId) if (cellPos.range) for (let col = Math.max(0, cellPos.range.start.col); col <= Math.min(this.table.colCount - 1, cellPos.range.end.col); col++) for (let row = Math.max(0, cellPos.range.start.row); row <= Math.min(this.table.rowCount - 1, cellPos.range.end.row); row++) this.table.scenegraph.updateCellContent(col, row);else this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row);
         }), this.table.scenegraph.updateNextFrame();
       }
-      arrangeCustomCellStyle(cellPos, customStyleId) {
+      arrangeCustomCellStyle(cellPos, customStyleId, forceFastUpdate) {
         var _a;
         const index = this.customCellStyleArrangement.findIndex(style => style.cellPosition.range && cellPos.range ? style.cellPosition.range.start.col === cellPos.range.start.col && style.cellPosition.range.start.row === cellPos.range.start.row && style.cellPosition.range.end.col === cellPos.range.end.col && style.cellPosition.range.end.row === cellPos.range.end.row : style.cellPosition.col === cellPos.col && style.cellPosition.row === cellPos.row);
         if (-1 === index && !customStyleId) return;
@@ -46154,7 +46151,6 @@
           customStyleId ? this.customCellStyleArrangement[index].customStyleId = customStyleId : this.customCellStyleArrangement.splice(index, 1);
         }
         const style = null === (_a = this.getCustomCellStyleOption(customStyleId)) || void 0 === _a ? void 0 : _a.style;
-        let forceFastUpdate;
         if (style) {
           forceFastUpdate = !0;
           for (const key in style) if (-1 === cellStyleKeys.indexOf(key)) {
@@ -46326,7 +46322,7 @@
       constructor(container) {
         let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.13.1-alpha.2", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
+        if (super(), this.showFrozenIcon = !0, this.version = "1.13.1-alpha.4", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         const {
           frozenColCount = 0,
           frozenRowCount: frozenRowCount,
@@ -48021,9 +48017,9 @@
         var _a;
         null === (_a = this.customCellStylePlugin) || void 0 === _a || _a.registerCustomCellStyle(customStyleId, customStyle);
       }
-      arrangeCustomCellStyle(cellPos, customStyleId) {
+      arrangeCustomCellStyle(cellPos, customStyleId, forceFastUpdate) {
         var _a;
-        null === (_a = this.customCellStylePlugin) || void 0 === _a || _a.arrangeCustomCellStyle(cellPos, customStyleId);
+        null === (_a = this.customCellStylePlugin) || void 0 === _a || _a.arrangeCustomCellStyle(cellPos, customStyleId, forceFastUpdate);
       }
       isSeriesNumber(col, row) {
         return this.internalProps.layoutMap.isSeriesNumber(col, row);
@@ -49510,7 +49506,7 @@
       }
     }
 
-    class EditManeger {
+    class EditManager {
       constructor(table) {
         this.isValidatingValue = !1, this.table = table, this.bindEvent();
       }
@@ -49586,14 +49582,16 @@
         } else if (!editor.isEditorElement || editor.isEditorElement(target)) return !1;
         if (this.editingEditor.getValue, this.editingEditor.validateValue) {
           this.isValidatingValue = !0;
-          const maybePromiseOrValue = null === (_b = (_a = this.editingEditor).validateValue) || void 0 === _b ? void 0 : _b.call(_a);
+          const newValue = this.editingEditor.getValue(),
+            oldValue = this.table.getCellOriginValue(this.editCell.col, this.editCell.row),
+            maybePromiseOrValue = null === (_b = (_a = this.editingEditor).validateValue) || void 0 === _b ? void 0 : _b.call(_a, newValue, oldValue, this.editCell, this.table);
           return isPromise(maybePromiseOrValue) ? new Promise((resolve, reject) => {
             maybePromiseOrValue.then(result => {
-              result ? (this.doExit(), resolve(!0)) : (this.isValidatingValue = !1, resolve(!1));
+              dealWithValidateValue(result, this, oldValue, resolve);
             }).catch(err => {
               this.isValidatingValue = !1, reject(err);
             });
-          }) : !!maybePromiseOrValue && (this.doExit(), !0);
+          }) : dealWithValidateValue(maybePromiseOrValue, this, oldValue);
         }
         return this.doExit(), !0;
       }
@@ -49614,6 +49612,9 @@
         this.editingEditor && (null === (_b = (_a = this.editingEditor).exit) || void 0 === _b || _b.call(_a), null === (_d = (_c = this.editingEditor).onEnd) || void 0 === _d || _d.call(_c), this.editingEditor = null);
       }
     }
+    function dealWithValidateValue(validateValue, editManager, oldValue, resolve) {
+      return editManager.isValidatingValue = !1, "validate-return" === validateValue ? (editManager.doExit(), null == resolve || resolve(!0), !0) : "invalidate-return" === validateValue ? (editManager.editingEditor.setValue(oldValue), editManager.doExit(), null == resolve || resolve(!0), !0) : "validate-not-return" === validateValue || "invalidate-not-return" === validateValue ? (null == resolve || resolve(!1), !1) : !0 === validateValue ? (editManager.doExit(), null == resolve || resolve(!0), !0) : (null == resolve || resolve(!1), !1);
+    }
 
     function getGroupByDataConfig(groupByOption) {
       if (isString$2(groupByOption)) return {
@@ -49698,7 +49699,7 @@
               oldValue = oldValues[i][j],
               value = rowValues[j],
               maybePromiseOrValue = null === (_b = null === (_a = null == editor ? void 0 : editor.validateValue) || void 0 === _a ? void 0 : _a.call(editor, value, oldValue)) || void 0 === _b || _b;
-            isCanChange = !!isPromise(maybePromiseOrValue) || maybePromiseOrValue;
+            isCanChange = !!isPromise(maybePromiseOrValue) || !0 === maybePromiseOrValue || "validate-return" === maybePromiseOrValue || "invalidate-return" === maybePromiseOrValue;
           }
           if (isCanChange) {
             const value = rowValues[j],
@@ -50074,11 +50075,11 @@
         proxy = table.scenegraph.proxy,
         {
           rowStart: rowStart,
-          rowLimit: rowLimit
+          rowLimit: rowLimit,
+          bodyBottomRow: bodyBottomRow
         } = proxy;
       let {
-          rowEnd: rowEnd,
-          bodyBottomRow: bodyBottomRow
+          rowEnd: rowEnd
         } = proxy,
         updateRow = 1 / 0;
       for (let i = 0; i < addCellPositions.length; i++) {
@@ -50093,11 +50094,11 @@
       for (let i = 0; i < removeCellPositions.length; i++) {
         const {
           row: cellRow
-        } = removeCellPositions[removeCellPositions.length - i - 1];
-        cellRow < rowStart || cellRow > rowEnd ? bodyBottomRow-- : rowEnd === bodyBottomRow ? (removeCells.push({
+        } = removeCellPositions[i];
+        cellRow < rowStart || cellRow > rowEnd || (rowEnd === bodyBottomRow ? removeCells.push({
           col: col,
           row: cellRow
-        }), updateRow--) : (updateRow = Math.min(updateRow, cellRow), bodyBottomRow--);
+        }) : updateRow = Math.min(updateRow, cellRow));
       }
       if (updateRow !== 1 / 0) for (let i = updateRow; i <= rowEnd; i++) updateCells.push({
         col: col,
@@ -50115,7 +50116,7 @@
         var _a, _b, _c, _d, _e, _f;
         "node" === Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, container = container.container ? container.container : null), super(container, options), this.showHeader = !0;
         const internalProps = this.internalProps;
-        if (internalProps.frozenColDragHeaderMode = options.frozenColDragHeaderMode, this.pagination = options.pagination, internalProps.sortState = options.sortState, internalProps.multipleSort = !!options.multipleSort, internalProps.dataConfig = options.groupBy ? getGroupByDataConfig(options.groupBy) : {}, internalProps.columns = options.columns ? cloneDeepSpec(options.columns, ["children"]) : options.header ? cloneDeepSpec(options.header, ["children"]) : [], generateAggregationForColumn(this), internalProps.enableTreeNodeMerge = null !== (_b = null !== (_a = options.enableTreeNodeMerge) && void 0 !== _a ? _a : isValid$1(options.groupBy)) && void 0 !== _b && _b, this.internalProps.headerHelper.setTableColumnsEditor(), this.showHeader = null === (_c = options.showHeader) || void 0 === _c || _c, this.transpose = null !== (_d = options.transpose) && void 0 !== _d && _d, "node" !== Env.mode && (this.editorManager = new EditManeger(this)), this.refreshHeader(), this.internalProps.useOneRowHeightFillAll = !1, options.dataSource ? _setDataSource(this, options.dataSource) : options.records ? this.setRecords(options.records, {
+        if (internalProps.frozenColDragHeaderMode = options.frozenColDragHeaderMode, this.pagination = options.pagination, internalProps.sortState = options.sortState, internalProps.multipleSort = !!options.multipleSort, internalProps.dataConfig = options.groupBy ? getGroupByDataConfig(options.groupBy) : {}, internalProps.columns = options.columns ? cloneDeepSpec(options.columns, ["children"]) : options.header ? cloneDeepSpec(options.header, ["children"]) : [], generateAggregationForColumn(this), internalProps.enableTreeNodeMerge = null !== (_b = null !== (_a = options.enableTreeNodeMerge) && void 0 !== _a ? _a : isValid$1(options.groupBy)) && void 0 !== _b && _b, this.internalProps.headerHelper.setTableColumnsEditor(), this.showHeader = null === (_c = options.showHeader) || void 0 === _c || _c, this.transpose = null !== (_d = options.transpose) && void 0 !== _d && _d, "node" !== Env.mode && (this.editorManager = new EditManager(this)), this.refreshHeader(), this.internalProps.useOneRowHeightFillAll = !1, options.dataSource ? _setDataSource(this, options.dataSource) : options.records ? this.setRecords(options.records, {
           sortState: internalProps.sortState
         }) : this.setRecords([]), options.title) {
           const Title = Factory.getComponent("title");