@visactor/vtable 1.5.1 → 1.5.2-alpha.0

package/dist/vtable.js

@@ -44370,6 +44370,17 @@
     function isPromise(data) {
         return Boolean(data && typeof data.then === 'function');
     }
+    function getPromiseValue(value, callback) {
+        if (isPromise(value)) {
+            value.then(result => {
+                callback(result);
+            }).catch((err) => {
+            });
+        }
+        else {
+            callback(value);
+        }
+    }
     function isTouchEvent$2(e) {
         return !!e.changedTouches;
     }
@@ -64826,16 +64837,18 @@
                 }
             }
             const isCompleteEdit = table.editorManager?.completeEdit(e.nativeEvent);
-            if (isCompleteEdit === false) {
-                return;
-            }
-            stateManager.updateInteractionState(InteractionState.default);
-            eventManager.dealTableHover();
-            if (table.options.select?.outsideClickDeselect) {
-                const isHasSelected = !!stateManager.select.ranges?.length;
-                eventManager.dealTableSelect();
-                stateManager.endSelectCells(true, isHasSelected);
-            }
+            getPromiseValue(isCompleteEdit, (isCompleteEdit) => {
+                if (isCompleteEdit === false) {
+                    return;
+                }
+                stateManager.updateInteractionState(InteractionState.default);
+                eventManager.dealTableHover();
+                if (table.options.select?.outsideClickDeselect) {
+                    const isHasSelected = !!stateManager.select.ranges?.length;
+                    eventManager.dealTableSelect();
+                    stateManager.endSelectCells(true, isHasSelected);
+                }
+            });
         });
         table.scenegraph.tableGroup.addEventListener('pointerdown', (e) => {
             if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE)) {
@@ -64861,72 +64874,74 @@
                 stateManager.hideMenu();
             }
             const isCompleteEdit = table.editorManager?.completeEdit(e.nativeEvent);
-            if (isCompleteEdit === false) {
-                return;
-            }
-            const hitIcon = eventArgsSet?.eventArgs?.target?.role?.startsWith('icon')
-                ? eventArgsSet.eventArgs.target
-                : e.target.role?.startsWith('icon')
-                    ? e.target
-                    : undefined;
-            eventManager.downIcon = hitIcon;
-            if (!hitIcon || hitIcon.attribute.interactive === false) {
-                if (e.pointerType === 'touch') {
-                    eventManager.touchEnd = false;
-                    eventManager.touchSetTimeout = setTimeout(() => {
-                        eventManager.isTouchdown = false;
-                        eventManager.touchMove = true;
-                        if (!eventManager.touchEnd &&
+            getPromiseValue(isCompleteEdit, (isCompleteEdit) => {
+                if (isCompleteEdit === false) {
+                    return;
+                }
+                const hitIcon = eventArgsSet?.eventArgs?.target?.role?.startsWith('icon')
+                    ? eventArgsSet.eventArgs.target
+                    : e.target.role?.startsWith('icon')
+                        ? e.target
+                        : undefined;
+                eventManager.downIcon = hitIcon;
+                if (!hitIcon || hitIcon.attribute.interactive === false) {
+                    if (e.pointerType === 'touch') {
+                        eventManager.touchEnd = false;
+                        eventManager.touchSetTimeout = setTimeout(() => {
+                            eventManager.isTouchdown = false;
+                            eventManager.touchMove = true;
+                            if (!eventManager.touchEnd &&
+                                (eventManager.checkColumnResize(eventArgsSet, true) || eventManager.checkRowResize(eventArgsSet, true))) {
+                                stateManager.updateInteractionState(InteractionState.grabing);
+                                return;
+                            }
+                            if (!eventManager.touchEnd && eventManager.chechColumnMover(eventArgsSet)) {
+                                stateManager.updateInteractionState(InteractionState.grabing);
+                                return;
+                            }
+                            if (eventManager.dealTableSelect(eventArgsSet) && !eventManager.touchEnd) {
+                                stateManager.updateInteractionState(InteractionState.grabing);
+                            }
+                        }, 500);
+                        eventManager.dealTableHover(eventArgsSet);
+                    }
+                    else {
+                        if (!eventManager.checkCellFillhandle(eventArgsSet) &&
                             (eventManager.checkColumnResize(eventArgsSet, true) || eventManager.checkRowResize(eventArgsSet, true))) {
+                            table.scenegraph.updateChartState(null);
                             stateManager.updateInteractionState(InteractionState.grabing);
                             return;
                         }
-                        if (!eventManager.touchEnd && eventManager.chechColumnMover(eventArgsSet)) {
+                        if (eventManager.chechColumnMover(eventArgsSet)) {
                             stateManager.updateInteractionState(InteractionState.grabing);
                             return;
                         }
-                        if (eventManager.dealTableSelect(eventArgsSet) && !eventManager.touchEnd) {
+                        if (eventManager.checkCellFillhandle(eventArgsSet, true) && eventManager.dealFillSelect(eventArgsSet)) {
+                            stateManager.updateInteractionState(InteractionState.grabing);
+                            return;
+                        }
+                        if (eventManager.dealTableSelect(eventArgsSet)) {
                             stateManager.updateInteractionState(InteractionState.grabing);
                         }
-                    }, 500);
-                    eventManager.dealTableHover(eventArgsSet);
-                }
-                else {
-                    if (!eventManager.checkCellFillhandle(eventArgsSet) &&
-                        (eventManager.checkColumnResize(eventArgsSet, true) || eventManager.checkRowResize(eventArgsSet, true))) {
-                        table.scenegraph.updateChartState(null);
-                        stateManager.updateInteractionState(InteractionState.grabing);
-                        return;
-                    }
-                    if (eventManager.chechColumnMover(eventArgsSet)) {
-                        stateManager.updateInteractionState(InteractionState.grabing);
-                        return;
-                    }
-                    if (eventManager.checkCellFillhandle(eventArgsSet, true) && eventManager.dealFillSelect(eventArgsSet)) {
-                        stateManager.updateInteractionState(InteractionState.grabing);
-                        return;
-                    }
-                    if (eventManager.dealTableSelect(eventArgsSet)) {
-                        stateManager.updateInteractionState(InteractionState.grabing);
                     }
                 }
-            }
-            else if (hitIcon.attribute.funcType === IconFuncTypeEnum.dragReorder) {
-                stateManager.startMoveCol(eventArgsSet.eventArgs.col, eventArgsSet.eventArgs.row, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y);
-                stateManager.updateInteractionState(InteractionState.grabing);
-            }
-            if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEDOWN_CELL)) {
-                const eventArgsSet = getCellEventArgsSet(e);
-                if (eventArgsSet.eventArgs) {
-                    table.fireListeners(TABLE_EVENT_TYPE.MOUSEDOWN_CELL, {
-                        col: eventArgsSet.eventArgs.col,
-                        row: eventArgsSet.eventArgs.row,
-                        event: e.nativeEvent,
-                        target: eventArgsSet?.eventArgs?.target,
-                        mergeCellInfo: eventArgsSet.eventArgs.mergeInfo
-                    });
+                else if (hitIcon.attribute.funcType === IconFuncTypeEnum.dragReorder) {
+                    stateManager.startMoveCol(eventArgsSet.eventArgs.col, eventArgsSet.eventArgs.row, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y);
+                    stateManager.updateInteractionState(InteractionState.grabing);
                 }
-            }
+                if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEDOWN_CELL)) {
+                    const eventArgsSet = getCellEventArgsSet(e);
+                    if (eventArgsSet.eventArgs) {
+                        table.fireListeners(TABLE_EVENT_TYPE.MOUSEDOWN_CELL, {
+                            col: eventArgsSet.eventArgs.col,
+                            row: eventArgsSet.eventArgs.row,
+                            event: e.nativeEvent,
+                            target: eventArgsSet?.eventArgs?.target,
+                            mergeCellInfo: eventArgsSet.eventArgs.mergeInfo
+                        });
+                    }
+                }
+            });
         });
         table.scenegraph.tableGroup.addEventListener('pointerup', (e) => {
             if (e.button !== 0) {
@@ -65089,30 +65104,32 @@
                 stateManager.hideMenu();
             }
             const isCompleteEdit = table.editorManager?.completeEdit(e.nativeEvent);
-            if (isCompleteEdit === false) {
-                return;
-            }
-            const hitIcon = e.target.role?.startsWith('icon') ? e.target : undefined;
-            eventManager.downIcon = hitIcon;
-            if (!hitIcon &&
-                !eventManager.checkCellFillhandle(eventArgsSet) &&
-                !stateManager.columnResize.resizing &&
-                eventManager.checkColumnResize(eventArgsSet, true)) {
-                table.scenegraph.updateChartState(null);
-                stateManager.updateInteractionState(InteractionState.grabing);
-                const { eventArgs } = eventArgsSet;
-                if (!eventArgs?.targetCell) {
-                    const cell = table.getCellAt(eventArgsSet.abstractPos.x - ResizeColumnHotSpotSize / 2, eventArgsSet.abstractPos.y);
-                    if (cell) {
-                        if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE)) {
-                            table.fireListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE, {
-                                event: e.nativeEvent
-                            });
+            getPromiseValue(isCompleteEdit, (isCompleteEdit) => {
+                if (isCompleteEdit === false) {
+                    return;
+                }
+                const hitIcon = e.target.role?.startsWith('icon') ? e.target : undefined;
+                eventManager.downIcon = hitIcon;
+                if (!hitIcon &&
+                    !eventManager.checkCellFillhandle(eventArgsSet) &&
+                    !stateManager.columnResize.resizing &&
+                    eventManager.checkColumnResize(eventArgsSet, true)) {
+                    table.scenegraph.updateChartState(null);
+                    stateManager.updateInteractionState(InteractionState.grabing);
+                    const { eventArgs } = eventArgsSet;
+                    if (!eventArgs?.targetCell) {
+                        const cell = table.getCellAt(eventArgsSet.abstractPos.x - ResizeColumnHotSpotSize / 2, eventArgsSet.abstractPos.y);
+                        if (cell) {
+                            if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE)) {
+                                table.fireListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE, {
+                                    event: e.nativeEvent
+                                });
+                            }
                         }
                     }
+                    return;
                 }
-                return;
-            }
+            });
         });
         table.scenegraph.stage.addEventListener('pointerup', (e) => {
             if (stateManager.interactionState === 'grabing') {
@@ -70205,7 +70222,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.5.1";
+        version = "1.5.2-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -75345,25 +75362,50 @@
                 }
             }
             if (!this.editingEditor.getValue) ;
-            if (!this.editingEditor.validateValue || this.editingEditor.validateValue?.()) {
-                const changedValue = this.editingEditor.getValue?.();
-                const range = this.table.getCellRange(this.editCell.col, this.editCell.row);
-                const changedValues = [];
-                for (let row = range.start.row; row <= range.end.row; row++) {
-                    const rowChangedValues = [];
-                    for (let col = range.start.col; col <= range.end.col; col++) {
-                        rowChangedValues.push(changedValue);
-                    }
-                    changedValues.push(rowChangedValues);
-                }
-                this.table.changeCellValues(range.start.col, range.start.row, changedValues);
-                this.editingEditor.exit && (void 0);
-                this.editingEditor.exit?.();
-                this.editingEditor.onEnd?.();
-                this.editingEditor = null;
-                return true;
+            if (this.editingEditor.validateValue) {
+                const maybePromiseOrValue = this.editingEditor.validateValue?.();
+                if (isPromise(maybePromiseOrValue)) {
+                    return new Promise((resolve, reject) => {
+                        maybePromiseOrValue
+                            .then(result => {
+                            if (result) {
+                                this.doExit();
+                                resolve(true);
+                            }
+                            else {
+                                resolve(false);
+                            }
+                        })
+                            .catch((err) => {
+                            reject(err);
+                        });
+                    });
+                }
+                else if (maybePromiseOrValue) {
+                    this.doExit();
+                    return true;
+                }
+                return false;
             }
-            return false;
+            this.doExit();
+            return true;
+        }
+        doExit() {
+            const changedValue = this.editingEditor.getValue?.();
+            const range = this.table.getCellRange(this.editCell.col, this.editCell.row);
+            const changedValues = [];
+            for (let row = range.start.row; row <= range.end.row; row++) {
+                const rowChangedValues = [];
+                for (let col = range.start.col; col <= range.end.col; col++) {
+                    rowChangedValues.push(changedValue);
+                }
+                changedValues.push(rowChangedValues);
+            }
+            this.table.changeCellValues(range.start.col, range.start.row, changedValues);
+            this.editingEditor.exit && (void 0);
+            this.editingEditor.exit?.();
+            this.editingEditor.onEnd?.();
+            this.editingEditor = null;
         }
         cancelEdit() {
             if (this.editingEditor) {
@@ -88573,7 +88615,7 @@
     }
 
     registerForVrender();
-    const version = "1.5.1";
+    const version = "1.5.2-alpha.0";
     function getIcons() {
         return get$2();
     }