@visactor/vtable 1.5.2-alpha.1 → 1.5.2

package/cjs/edit/edit-manager.d.ts

@@ -10,6 +10,7 @@ export declare class EditManeger {
     constructor(table: BaseTableAPI);
     bindEvent(): void;
     startEditCell(col: number, row: number): void;
-    completeEdit(e?: Event): boolean;
+    completeEdit(e?: Event): boolean | Promise<boolean>;
+    private doExit;
     cancelEdit(): void;
 }

package/cjs/edit/edit-manager.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.EditManeger = void 0;
 
-const TABLE_EVENT_TYPE_1 = require("../core/TABLE_EVENT_TYPE"), util_1 = require("../event/util");
+const TABLE_EVENT_TYPE_1 = require("../core/TABLE_EVENT_TYPE"), util_1 = require("../event/util"), helper_1 = require("../tools/helper");
 
 class EditManeger {
     constructor(table) {
@@ -63,25 +63,36 @@ class EditManeger {
         }
     }
     completeEdit(e) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b;
         if (!this.editingEditor) return !0;
         const target = null == e ? void 0 : e.target, {editingEditor: editor} = this;
         if (target) if (editor.targetIsOnEditor) {
             if (editor.targetIsOnEditor(target)) return !1;
         } else if (!editor.isEditorElement || editor.isEditorElement(target)) return !1;
-        if (this.editingEditor.getValue, !this.editingEditor.validateValue || (null === (_b = (_a = this.editingEditor).validateValue) || void 0 === _b ? void 0 : _b.call(_a))) {
-            const changedValue = null === (_d = (_c = this.editingEditor).getValue) || void 0 === _d ? void 0 : _d.call(_c), range = this.table.getCellRange(this.editCell.col, this.editCell.row), 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);
-            }
-            return this.table.changeCellValues(range.start.col, range.start.row, changedValues), 
-            this.editingEditor.exit, null === (_f = (_e = this.editingEditor).exit) || void 0 === _f || _f.call(_e), 
-            null === (_h = (_g = this.editingEditor).onEnd) || void 0 === _h || _h.call(_g), 
-            this.editingEditor = null, !0;
+        if (this.editingEditor.getValue, this.editingEditor.validateValue) {
+            const maybePromiseOrValue = null === (_b = (_a = this.editingEditor).validateValue) || void 0 === _b ? void 0 : _b.call(_a);
+            return (0, helper_1.isPromise)(maybePromiseOrValue) ? new Promise(((resolve, reject) => {
+                maybePromiseOrValue.then((result => {
+                    result ? (this.doExit(), resolve(!0)) : resolve(!1);
+                })).catch((err => {
+                    reject(err);
+                }));
+            })) : !!maybePromiseOrValue && (this.doExit(), !0);
+        }
+        return this.doExit(), !0;
+    }
+    doExit() {
+        var _a, _b, _c, _d, _e, _f;
+        const changedValue = null === (_b = (_a = this.editingEditor).getValue) || void 0 === _b ? void 0 : _b.call(_a), range = this.table.getCellRange(this.editCell.col, this.editCell.row), 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);
         }
-        return !1;
+        this.table.changeCellValues(range.start.col, range.start.row, changedValues), this.editingEditor.exit, 
+        null === (_d = (_c = this.editingEditor).exit) || void 0 === _d || _d.call(_c), 
+        null === (_f = (_e = this.editingEditor).onEnd) || void 0 === _f || _f.call(_e), 
+        this.editingEditor = null;
     }
     cancelEdit() {
         var _a, _b, _c, _d;
@@ -91,4 +102,5 @@ class EditManeger {
     }
 }
 
-exports.EditManeger = EditManeger;
+exports.EditManeger = EditManeger;
+//# sourceMappingURL=edit-manager.js.map

package/cjs/edit/edit-manager.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/edit/edit-manager.ts"],"names":[],"mappings":"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","file":"edit-manager.js","sourcesContent":["import type { IEditor } from '@visactor/vtable-editors';\nimport { TABLE_EVENT_TYPE } from '../core/TABLE_EVENT_TYPE';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport type { ListTableAPI, ListTableConstructorOptions } from '../ts-types';\nimport { getCellEventArgsSet } from '../event/util';\nimport type { SimpleHeaderLayoutMap } from '../layout';\n\nexport class EditManeger {\n  table: BaseTableAPI;\n  editingEditor: IEditor;\n  editCell: { col: number; row: number };\n\n  constructor(table: BaseTableAPI) {\n    this.table = table;\n    this.bindEvent();\n  }\n\n  bindEvent() {\n    const handler = this.table.internalProps.handler;\n    this.table.on(TABLE_EVENT_TYPE.DBLCLICK_CELL, e => {\n      if (\n        !(this.table.options as ListTableConstructorOptions).editCellTrigger || //默认为双击\n        (this.table.options as ListTableConstructorOptions).editCellTrigger === 'doubleclick'\n      ) {\n        const { col, row } = e;\n\n        //取双击自动列宽逻辑\n        const eventArgsSet = getCellEventArgsSet(e.federatedEvent);\n        const resizeCol = this.table.scenegraph.getResizeColAt(\n          eventArgsSet.abstractPos.x,\n          eventArgsSet.abstractPos.y,\n          eventArgsSet.eventArgs?.targetCell\n        );\n        if (this.table._canResizeColumn(resizeCol.col, resizeCol.row) && resizeCol.col >= 0) {\n          // 判断同双击自动列宽的时间监听的DBLCLICK_CELL\n          // 如果是双击自动列宽 则编辑不开启\n          return;\n        }\n        this.startEditCell(col, row);\n      }\n    });\n\n    this.table.on(TABLE_EVENT_TYPE.CLICK_CELL, e => {\n      if ((this.table.options as ListTableConstructorOptions).editCellTrigger === 'click') {\n        const { col, row } = e;\n        this.startEditCell(col, row);\n      }\n    });\n\n    handler.on(this.table.getElement(), 'wheel', (e: WheelEvent) => {\n      this.completeEdit();\n    });\n    handler.on(this.table.getElement(), 'resize', (e: Event) => {\n      if (this.table.autoFillWidth || this.table.autoFillHeight) {\n        this.completeEdit();\n      }\n    });\n  }\n\n  startEditCell(col: number, row: number) {\n    const editor = (this.table as ListTableAPI).getEditor(col, row);\n    if (editor) {\n      // //自定义内容单元格不允许编辑\n      // if (this.table.getCustomRender(col, row) || this.table.getCustomLayout(col, row)) {\n      //   console.warn(\"VTable Warn: cell has config custom render or layout, can't be edited\");\n      //   return;\n      // }\n      // if (!this.table.isHeader(col, row)) {\n      //   const range = this.table.getCellRange(col, row);\n      //   const isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n      //   if (isMerge) {\n      //     console.warn(\"VTable Warn: this is merge cell, can't be edited\");\n      //     return;\n      //   }\n      // }\n      if ((this.table.internalProps.layoutMap as SimpleHeaderLayoutMap)?.isAggregation?.(col, row)) {\n        console.warn(\"VTable Warn: this is aggregation value, can't be edited\");\n        return;\n      }\n\n      if (!this.editingEditor) {\n        this.editCell = { col, row };\n      }\n      this.editingEditor = editor;\n      const dataValue = this.table.getCellOriginValue(col, row);\n      const rect = this.table.getCellRangeRelativeRect(this.table.getCellRange(col, row));\n      const referencePosition = { rect: { left: rect.left, top: rect.top, width: rect.width, height: rect.height } };\n\n      editor.beginEditing && console.warn('VTable Warn: `beginEditing` is deprecated, please use `onStart` instead.');\n      editor.beginEditing?.(this.table.getElement(), referencePosition, dataValue);\n\n      if (editor.bindSuccessCallback) {\n        console.warn('VTable Warn: `bindSuccessCallback` is deprecated, please use `onStart` instead.');\n      }\n      editor.bindSuccessCallback?.(() => {\n        this.completeEdit();\n      });\n      editor.onStart?.({\n        value: dataValue,\n        endEdit: () => {\n          this.completeEdit();\n        },\n        referencePosition,\n        container: this.table.getElement(),\n        col,\n        row\n      });\n    }\n  }\n\n  /** 如果是事件触发调用该接口 请传入原始事件对象 将判断事件对象是否在编辑器本身上面  来处理是否结束编辑  返回值如果为false说明没有退出编辑状态*/\n  completeEdit(e?: Event): boolean {\n    if (!this.editingEditor) {\n      return true;\n    }\n\n    const target = e?.target as HTMLElement | undefined;\n    const { editingEditor: editor } = this;\n\n    if (target) {\n      if (editor.targetIsOnEditor) {\n        console.warn('VTable Warn: `targetIsOnEditor` is deprecated, please use `isEditorElement` instead.');\n\n        if (editor.targetIsOnEditor(target)) {\n          return false;\n        }\n      } else if (!editor.isEditorElement || editor.isEditorElement(target)) {\n        return false;\n      }\n    }\n\n    if (!this.editingEditor.getValue) {\n      console.warn('VTable Warn: `getValue` is not provided, did you forget to implement it?');\n    }\n    if (!this.editingEditor.validateValue || this.editingEditor.validateValue?.()) {\n      const changedValue = this.editingEditor.getValue?.();\n      const range = this.table.getCellRange(this.editCell.col, this.editCell.row);\n      const changedValues: any[] = [];\n      for (let row = range.start.row; row <= range.end.row; row++) {\n        const rowChangedValues = [];\n        for (let col = range.start.col; col <= range.end.col; col++) {\n          rowChangedValues.push(changedValue);\n        }\n        changedValues.push(rowChangedValues);\n      }\n      (this.table as ListTableAPI).changeCellValues(range.start.col, range.start.row, changedValues);\n      this.editingEditor.exit && console.warn('VTable Warn: `exit` is deprecated, please use `onEnd` instead.');\n      this.editingEditor.exit?.();\n      this.editingEditor.onEnd?.();\n      this.editingEditor = null;\n      return true;\n    }\n    return false;\n  }\n\n  cancelEdit() {\n    if (this.editingEditor) {\n      // TODO: 添加开发时弃用警告\n      this.editingEditor.exit?.();\n      this.editingEditor.onEnd?.();\n      this.editingEditor = null;\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/edit/edit-manager.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,wCAAoD;AAEpD,4CAA4C;AAE5C,MAAa,WAAW;IAKtB,YAAY,KAAmB;QAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,SAAS;QACP,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC;QACjD,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,mCAAgB,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE;;YAChD,IACE,CAAE,IAAI,CAAC,KAAK,CAAC,OAAuC,CAAC,eAAe;gBACnE,IAAI,CAAC,KAAK,CAAC,OAAuC,CAAC,eAAe,KAAK,aAAa,EACrF;gBACA,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;gBAGvB,MAAM,YAAY,GAAG,IAAA,0BAAmB,EAAC,CAAC,CAAC,cAAc,CAAC,CAAC;gBAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,CACpD,YAAY,CAAC,WAAW,CAAC,CAAC,EAC1B,YAAY,CAAC,WAAW,CAAC,CAAC,EAC1B,MAAA,YAAY,CAAC,SAAS,0CAAE,UAAU,CACnC,CAAC;gBACF,IAAI,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC,EAAE;oBAGnF,OAAO;iBACR;gBACD,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aAC9B;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,mCAAgB,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE;YAC7C,IAAK,IAAI,CAAC,KAAK,CAAC,OAAuC,CAAC,eAAe,KAAK,OAAO,EAAE;gBACnF,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;gBACvB,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aAC9B;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,CAAa,EAAE,EAAE;YAC7D,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAQ,EAAE,EAAE;YACzD,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;gBACzD,IAAI,CAAC,YAAY,EAAE,CAAC;aACrB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,GAAW,EAAE,GAAW;;QACpC,MAAM,MAAM,GAAI,IAAI,CAAC,KAAsB,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAChE,IAAI,MAAM,EAAE;YAcV,IAAI,MAAA,MAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,SAAmC,0CAAE,aAAa,mDAAG,GAAG,EAAE,GAAG,CAAC,EAAE;gBAC5F,OAAO,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;gBACxE,OAAO;aACR;YAED,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACvB,IAAI,CAAC,QAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;aAC9B;YACD,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;YAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACpF,MAAM,iBAAiB,GAAG,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;YAE/G,MAAM,CAAC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;YAChH,MAAA,MAAM,CAAC,YAAY,uDAAG,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAC;YAE7E,IAAI,MAAM,CAAC,mBAAmB,EAAE;gBAC9B,OAAO,CAAC,IAAI,CAAC,iFAAiF,CAAC,CAAC;aACjG;YACD,MAAA,MAAM,CAAC,mBAAmB,uDAAG,GAAG,EAAE;gBAChC,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,CAAC,CAAC,CAAC;YACH,MAAA,MAAM,CAAC,OAAO,uDAAG;gBACf,KAAK,EAAE,SAAS;gBAChB,OAAO,EAAE,GAAG,EAAE;oBACZ,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,CAAC;gBACD,iBAAiB;gBACjB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;gBAClC,GAAG;gBACH,GAAG;aACJ,CAAC,CAAC;SACJ;IACH,CAAC;IAID,YAAY,CAAC,CAAS;;QACpB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,OAAO,IAAI,CAAC;SACb;QAED,MAAM,MAAM,GAAG,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,MAAiC,CAAC;QACpD,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAEvC,IAAI,MAAM,EAAE;YACV,IAAI,MAAM,CAAC,gBAAgB,EAAE;gBAC3B,OAAO,CAAC,IAAI,CAAC,sFAAsF,CAAC,CAAC;gBAErG,IAAI,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE;oBACnC,OAAO,KAAK,CAAC;iBACd;aACF;iBAAM,IAAI,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE;gBACpE,OAAO,KAAK,CAAC;aACd;SACF;QAED,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;YAChC,OAAO,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;SAC1F;QACD,IAAI,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE;YACpC,MAAM,mBAAmB,GAAG,MAAA,MAAA,IAAI,CAAC,aAAa,EAAC,aAAa,kDAAI,CAAC;YACjE,IAAI,IAAA,kBAAS,EAAC,mBAAmB,CAAC,EAAE;gBAClC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACrC,mBAAmB;yBAChB,IAAI,CAAC,MAAM,CAAC,EAAE;wBACb,IAAI,MAAM,EAAE;4BACV,IAAI,CAAC,MAAM,EAAE,CAAC;4BACd,OAAO,CAAC,IAAI,CAAC,CAAC;yBACf;6BAAM;4BACL,OAAO,CAAC,KAAK,CAAC,CAAC;yBAChB;oBACH,CAAC,CAAC;yBACD,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;wBACpB,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;wBACpC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACd,CAAC,CAAC,CAAC;gBACP,CAAC,CAAC,CAAC;aACJ;iBAAM,IAAI,mBAAmB,EAAE;gBAC9B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,OAAO,IAAI,CAAC;aACb;YACD,OAAO,KAAK,CAAC;SACd;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,MAAM;;QACZ,MAAM,YAAY,GAAG,MAAA,MAAA,IAAI,CAAC,aAAa,EAAC,QAAQ,kDAAI,CAAC;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5E,MAAM,aAAa,GAAU,EAAE,CAAC;QAChC,KAAK,IAAI,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC3D,MAAM,gBAAgB,GAAG,EAAE,CAAC;YAC5B,KAAK,IAAI,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC3D,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;aACrC;YACD,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACtC;QACA,IAAI,CAAC,KAAsB,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAC/F,IAAI,CAAC,aAAa,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAC;QAC1G,MAAA,MAAA,IAAI,CAAC,aAAa,EAAC,IAAI,kDAAI,CAAC;QAC5B,MAAA,MAAA,IAAI,CAAC,aAAa,EAAC,KAAK,kDAAI,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,UAAU;;QACR,IAAI,IAAI,CAAC,aAAa,EAAE;YAEtB,MAAA,MAAA,IAAI,CAAC,aAAa,EAAC,IAAI,kDAAI,CAAC;YAC5B,MAAA,MAAA,IAAI,CAAC,aAAa,EAAC,KAAK,kDAAI,CAAC;YAC7B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;SAC3B;IACH,CAAC;CACF;AAtLD,kCAsLC","file":"edit-manager.js","sourcesContent":["import type { IEditor } from '@visactor/vtable-editors';\nimport { TABLE_EVENT_TYPE } from '../core/TABLE_EVENT_TYPE';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport type { ListTableAPI, ListTableConstructorOptions } from '../ts-types';\nimport { getCellEventArgsSet } from '../event/util';\nimport type { SimpleHeaderLayoutMap } from '../layout';\nimport { isPromise } from '../tools/helper';\n\nexport class EditManeger {\n  table: BaseTableAPI;\n  editingEditor: IEditor;\n  editCell: { col: number; row: number };\n\n  constructor(table: BaseTableAPI) {\n    this.table = table;\n    this.bindEvent();\n  }\n\n  bindEvent() {\n    const handler = this.table.internalProps.handler;\n    this.table.on(TABLE_EVENT_TYPE.DBLCLICK_CELL, e => {\n      if (\n        !(this.table.options as ListTableConstructorOptions).editCellTrigger || //默认为双击\n        (this.table.options as ListTableConstructorOptions).editCellTrigger === 'doubleclick'\n      ) {\n        const { col, row } = e;\n\n        //取双击自动列宽逻辑\n        const eventArgsSet = getCellEventArgsSet(e.federatedEvent);\n        const resizeCol = this.table.scenegraph.getResizeColAt(\n          eventArgsSet.abstractPos.x,\n          eventArgsSet.abstractPos.y,\n          eventArgsSet.eventArgs?.targetCell\n        );\n        if (this.table._canResizeColumn(resizeCol.col, resizeCol.row) && resizeCol.col >= 0) {\n          // 判断同双击自动列宽的时间监听的DBLCLICK_CELL\n          // 如果是双击自动列宽 则编辑不开启\n          return;\n        }\n        this.startEditCell(col, row);\n      }\n    });\n\n    this.table.on(TABLE_EVENT_TYPE.CLICK_CELL, e => {\n      if ((this.table.options as ListTableConstructorOptions).editCellTrigger === 'click') {\n        const { col, row } = e;\n        this.startEditCell(col, row);\n      }\n    });\n\n    handler.on(this.table.getElement(), 'wheel', (e: WheelEvent) => {\n      this.completeEdit();\n    });\n    handler.on(this.table.getElement(), 'resize', (e: Event) => {\n      if (this.table.autoFillWidth || this.table.autoFillHeight) {\n        this.completeEdit();\n      }\n    });\n  }\n\n  startEditCell(col: number, row: number) {\n    const editor = (this.table as ListTableAPI).getEditor(col, row);\n    if (editor) {\n      // //自定义内容单元格不允许编辑\n      // if (this.table.getCustomRender(col, row) || this.table.getCustomLayout(col, row)) {\n      //   console.warn(\"VTable Warn: cell has config custom render or layout, can't be edited\");\n      //   return;\n      // }\n      // if (!this.table.isHeader(col, row)) {\n      //   const range = this.table.getCellRange(col, row);\n      //   const isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n      //   if (isMerge) {\n      //     console.warn(\"VTable Warn: this is merge cell, can't be edited\");\n      //     return;\n      //   }\n      // }\n      if ((this.table.internalProps.layoutMap as SimpleHeaderLayoutMap)?.isAggregation?.(col, row)) {\n        console.warn(\"VTable Warn: this is aggregation value, can't be edited\");\n        return;\n      }\n\n      if (!this.editingEditor) {\n        this.editCell = { col, row };\n      }\n      this.editingEditor = editor;\n      const dataValue = this.table.getCellOriginValue(col, row);\n      const rect = this.table.getCellRangeRelativeRect(this.table.getCellRange(col, row));\n      const referencePosition = { rect: { left: rect.left, top: rect.top, width: rect.width, height: rect.height } };\n\n      editor.beginEditing && console.warn('VTable Warn: `beginEditing` is deprecated, please use `onStart` instead.');\n      editor.beginEditing?.(this.table.getElement(), referencePosition, dataValue);\n\n      if (editor.bindSuccessCallback) {\n        console.warn('VTable Warn: `bindSuccessCallback` is deprecated, please use `onStart` instead.');\n      }\n      editor.bindSuccessCallback?.(() => {\n        this.completeEdit();\n      });\n      editor.onStart?.({\n        value: dataValue,\n        endEdit: () => {\n          this.completeEdit();\n        },\n        referencePosition,\n        container: this.table.getElement(),\n        col,\n        row\n      });\n    }\n  }\n\n  /** 如果是鼠标事件触发调用该接口 请传入原始事件对象 将判断事件对象是否在编辑器本身上面  来处理是否结束编辑\n   * 返回值如果为false说明没有退出编辑状态  validateValue接口返回false 说明校验失败不退出编辑 */\n  completeEdit(e?: Event): boolean | Promise<boolean> {\n    if (!this.editingEditor) {\n      return true;\n    }\n\n    const target = e?.target as HTMLElement | undefined;\n    const { editingEditor: editor } = this;\n\n    if (target) {\n      if (editor.targetIsOnEditor) {\n        console.warn('VTable Warn: `targetIsOnEditor` is deprecated, please use `isEditorElement` instead.');\n\n        if (editor.targetIsOnEditor(target)) {\n          return false;\n        }\n      } else if (!editor.isEditorElement || editor.isEditorElement(target)) {\n        return false;\n      }\n    }\n\n    if (!this.editingEditor.getValue) {\n      console.warn('VTable Warn: `getValue` is not provided, did you forget to implement it?');\n    }\n    if (this.editingEditor.validateValue) {\n      const maybePromiseOrValue = this.editingEditor.validateValue?.();\n      if (isPromise(maybePromiseOrValue)) {\n        return new Promise((resolve, reject) => {\n          maybePromiseOrValue\n            .then(result => {\n              if (result) {\n                this.doExit();\n                resolve(true);\n              } else {\n                resolve(false);\n              }\n            })\n            .catch((err: Error) => {\n              console.error('VTable Error:', err);\n              reject(err);\n            });\n        });\n      } else if (maybePromiseOrValue) {\n        this.doExit();\n        return true;\n      }\n      return false;\n    }\n    this.doExit();\n    return true;\n  }\n\n  private doExit() {\n    const changedValue = this.editingEditor.getValue?.();\n    const range = this.table.getCellRange(this.editCell.col, this.editCell.row);\n    const changedValues: any[] = [];\n    for (let row = range.start.row; row <= range.end.row; row++) {\n      const rowChangedValues = [];\n      for (let col = range.start.col; col <= range.end.col; col++) {\n        rowChangedValues.push(changedValue);\n      }\n      changedValues.push(rowChangedValues);\n    }\n    (this.table as ListTableAPI).changeCellValues(range.start.col, range.start.row, changedValues);\n    this.editingEditor.exit && console.warn('VTable Warn: `exit` is deprecated, please use `onEnd` instead.');\n    this.editingEditor.exit?.();\n    this.editingEditor.onEnd?.();\n    this.editingEditor = null;\n  }\n\n  cancelEdit() {\n    if (this.editingEditor) {\n      // TODO: 添加开发时弃用警告\n      this.editingEditor.exit?.();\n      this.editingEditor.onEnd?.();\n      this.editingEditor = null;\n    }\n  }\n}\n"]}

package/cjs/event/event.js

@@ -200,5 +200,4 @@ class EventManager {
     }
 }
 
-exports.EventManager = EventManager;
-//# sourceMappingURL=event.js.map
+exports.EventManager = EventManager;

package/cjs/event/listener/table-group.js

@@ -117,7 +117,7 @@ function bindTableGroupListener(eventManager) {
             event: e.nativeEvent
         });
     })), table.scenegraph.tableGroup.addEventListener("pointerupoutside", (e => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const eventArgsSet = (0, util_1.getCellEventArgsSet)(e);
         if (stateManager.menu.isShow && (null === (_a = eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target) !== (null === (_b = stateManager.residentHoverIcon) || void 0 === _b ? void 0 : _b.icon) && setTimeout((() => {
             table.internalProps.menuHandler.pointInMenuElement(e.page.x, e.page.y) || stateManager.menu.isShow && stateManager.hideMenu();
@@ -145,13 +145,17 @@ function bindTableGroupListener(eventManager) {
                 cellsEvent.cells = table.getSelectedCellInfos(), table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.DRAG_SELECT_END, cellsEvent);
             }
         }
-        if (!1 !== (null === (_j = table.editorManager) || void 0 === _j ? void 0 : _j.completeEdit(e.nativeEvent)) && (stateManager.updateInteractionState(ts_types_1.InteractionState.default), 
-        eventManager.dealTableHover(), null === (_k = table.options.select) || void 0 === _k ? void 0 : _k.outsideClickDeselect)) {
-            const isHasSelected = !!(null === (_l = stateManager.select.ranges) || void 0 === _l ? void 0 : _l.length);
-            eventManager.dealTableSelect(), stateManager.endSelectCells(!0, isHasSelected);
-        }
+        const isCompleteEdit = null === (_j = table.editorManager) || void 0 === _j ? void 0 : _j.completeEdit(e.nativeEvent);
+        (0, helper_1.getPromiseValue)(isCompleteEdit, (isCompleteEdit => {
+            var _a, _b;
+            if (!1 !== isCompleteEdit && (stateManager.updateInteractionState(ts_types_1.InteractionState.default), 
+            eventManager.dealTableHover(), null === (_a = table.options.select) || void 0 === _a ? void 0 : _a.outsideClickDeselect)) {
+                const isHasSelected = !!(null === (_b = stateManager.select.ranges) || void 0 === _b ? void 0 : _b.length);
+                eventManager.dealTableSelect(), stateManager.endSelectCells(!0, isHasSelected);
+            }
+        }));
     })), table.scenegraph.tableGroup.addEventListener("pointerdown", (e => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d;
         if (table.hasListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEDOWN_TABLE) && table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEDOWN_TABLE, {
             event: e.nativeEvent
         }), table.eventManager.isDown = !0, table.eventManager.LastBodyPointerXY = {
@@ -165,29 +169,33 @@ function bindTableGroupListener(eventManager) {
         if (eventManager.downIcon = void 0, stateManager.interactionState !== ts_types_1.InteractionState.default) return;
         table.isPivotChart() && "chart" !== (null === (_a = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target.type) && table.scenegraph.updateChartState(null), 
         (null === (_b = eventArgsSet.eventArgs) || void 0 === _b ? void 0 : _b.target) !== (null === (_c = stateManager.residentHoverIcon) || void 0 === _c ? void 0 : _c.icon) && stateManager.hideMenu();
-        if (!1 === (null === (_d = table.editorManager) || void 0 === _d ? void 0 : _d.completeEdit(e.nativeEvent))) return;
-        const hitIcon = (null === (_g = null === (_f = null === (_e = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _e ? void 0 : _e.target) || void 0 === _f ? void 0 : _f.role) || void 0 === _g ? void 0 : _g.startsWith("icon")) ? eventArgsSet.eventArgs.target : (null === (_h = e.target.role) || void 0 === _h ? void 0 : _h.startsWith("icon")) ? e.target : void 0;
-        if (eventManager.downIcon = hitIcon, hitIcon && !1 !== hitIcon.attribute.interactive) hitIcon.attribute.funcType === ts_types_1.IconFuncTypeEnum.dragReorder && (stateManager.startMoveCol(eventArgsSet.eventArgs.col, eventArgsSet.eventArgs.row, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y), 
-        stateManager.updateInteractionState(ts_types_1.InteractionState.grabing)); else if ("touch" === e.pointerType) eventManager.touchEnd = !1, 
-        eventManager.touchSetTimeout = setTimeout((() => {
-            eventManager.isTouchdown = !1, eventManager.touchMove = !0, (eventManager.touchEnd || !eventManager.checkColumnResize(eventArgsSet, !0) && !eventManager.checkRowResize(eventArgsSet, !0)) && (eventManager.touchEnd || !eventManager.chechColumnMover(eventArgsSet)) ? eventManager.dealTableSelect(eventArgsSet) && !eventManager.touchEnd && stateManager.updateInteractionState(ts_types_1.InteractionState.grabing) : stateManager.updateInteractionState(ts_types_1.InteractionState.grabing);
-        }), 500), eventManager.dealTableHover(eventArgsSet); else {
-            if (!eventManager.checkCellFillhandle(eventArgsSet) && (eventManager.checkColumnResize(eventArgsSet, !0) || eventManager.checkRowResize(eventArgsSet, !0))) return table.scenegraph.updateChartState(null), 
-            void stateManager.updateInteractionState(ts_types_1.InteractionState.grabing);
-            if (eventManager.chechColumnMover(eventArgsSet)) return void stateManager.updateInteractionState(ts_types_1.InteractionState.grabing);
-            if (eventManager.checkCellFillhandle(eventArgsSet, !0) && eventManager.dealFillSelect(eventArgsSet)) return void stateManager.updateInteractionState(ts_types_1.InteractionState.grabing);
-            eventManager.dealTableSelect(eventArgsSet) && stateManager.updateInteractionState(ts_types_1.InteractionState.grabing);
-        }
-        if (table.hasListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEDOWN_CELL)) {
-            const eventArgsSet = (0, util_1.getCellEventArgsSet)(e);
-            eventArgsSet.eventArgs && table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEDOWN_CELL, {
-                col: eventArgsSet.eventArgs.col,
-                row: eventArgsSet.eventArgs.row,
-                event: e.nativeEvent,
-                target: null === (_j = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _j ? void 0 : _j.target,
-                mergeCellInfo: eventArgsSet.eventArgs.mergeInfo
-            });
-        }
+        const isCompleteEdit = null === (_d = table.editorManager) || void 0 === _d ? void 0 : _d.completeEdit(e.nativeEvent);
+        (0, helper_1.getPromiseValue)(isCompleteEdit, (isCompleteEdit => {
+            var _a, _b, _c, _d, _e;
+            if (!1 === isCompleteEdit) return;
+            const hitIcon = (null === (_c = null === (_b = null === (_a = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target) || void 0 === _b ? void 0 : _b.role) || void 0 === _c ? void 0 : _c.startsWith("icon")) ? eventArgsSet.eventArgs.target : (null === (_d = e.target.role) || void 0 === _d ? void 0 : _d.startsWith("icon")) ? e.target : void 0;
+            if (eventManager.downIcon = hitIcon, hitIcon && !1 !== hitIcon.attribute.interactive) hitIcon.attribute.funcType === ts_types_1.IconFuncTypeEnum.dragReorder && (stateManager.startMoveCol(eventArgsSet.eventArgs.col, eventArgsSet.eventArgs.row, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y), 
+            stateManager.updateInteractionState(ts_types_1.InteractionState.grabing)); else if ("touch" === e.pointerType) eventManager.touchEnd = !1, 
+            eventManager.touchSetTimeout = setTimeout((() => {
+                eventManager.isTouchdown = !1, eventManager.touchMove = !0, (eventManager.touchEnd || !eventManager.checkColumnResize(eventArgsSet, !0) && !eventManager.checkRowResize(eventArgsSet, !0)) && (eventManager.touchEnd || !eventManager.chechColumnMover(eventArgsSet)) ? eventManager.dealTableSelect(eventArgsSet) && !eventManager.touchEnd && stateManager.updateInteractionState(ts_types_1.InteractionState.grabing) : stateManager.updateInteractionState(ts_types_1.InteractionState.grabing);
+            }), 500), eventManager.dealTableHover(eventArgsSet); else {
+                if (!eventManager.checkCellFillhandle(eventArgsSet) && (eventManager.checkColumnResize(eventArgsSet, !0) || eventManager.checkRowResize(eventArgsSet, !0))) return table.scenegraph.updateChartState(null), 
+                void stateManager.updateInteractionState(ts_types_1.InteractionState.grabing);
+                if (eventManager.chechColumnMover(eventArgsSet)) return void stateManager.updateInteractionState(ts_types_1.InteractionState.grabing);
+                if (eventManager.checkCellFillhandle(eventArgsSet, !0) && eventManager.dealFillSelect(eventArgsSet)) return void stateManager.updateInteractionState(ts_types_1.InteractionState.grabing);
+                eventManager.dealTableSelect(eventArgsSet) && stateManager.updateInteractionState(ts_types_1.InteractionState.grabing);
+            }
+            if (table.hasListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEDOWN_CELL)) {
+                const eventArgsSet = (0, util_1.getCellEventArgsSet)(e);
+                eventArgsSet.eventArgs && table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEDOWN_CELL, {
+                    col: eventArgsSet.eventArgs.col,
+                    row: eventArgsSet.eventArgs.row,
+                    event: e.nativeEvent,
+                    target: null === (_e = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _e ? void 0 : _e.target,
+                    mergeCellInfo: eventArgsSet.eventArgs.mergeInfo
+                });
+            }
+        }));
     })), table.scenegraph.tableGroup.addEventListener("pointerup", (e => {
         var _a, _b, _c, _d;
         if (0 === e.button) {
@@ -297,20 +305,24 @@ function bindTableGroupListener(eventManager) {
             }
         }
     })), table.scenegraph.stage.addEventListener("pointerdown", (e => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const eventArgsSet = (0, util_1.getCellEventArgsSet)(e);
         (null === (_a = eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target) !== (null === (_b = stateManager.residentHoverIcon) || void 0 === _b ? void 0 : _b.icon) && stateManager.hideMenu();
-        if (!1 === (null === (_c = table.editorManager) || void 0 === _c ? void 0 : _c.completeEdit(e.nativeEvent))) return;
-        const hitIcon = (null === (_d = e.target.role) || void 0 === _d ? void 0 : _d.startsWith("icon")) ? e.target : void 0;
-        if (eventManager.downIcon = hitIcon, hitIcon || eventManager.checkCellFillhandle(eventArgsSet) || stateManager.columnResize.resizing || !eventManager.checkColumnResize(eventArgsSet, !0)) ; else {
-            table.scenegraph.updateChartState(null), stateManager.updateInteractionState(ts_types_1.InteractionState.grabing);
-            const {eventArgs: eventArgs} = eventArgsSet;
-            if (!(null == eventArgs ? void 0 : eventArgs.targetCell)) {
-                table.getCellAt(eventArgsSet.abstractPos.x - global_1.ResizeColumnHotSpotSize / 2, eventArgsSet.abstractPos.y) && table.hasListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEDOWN_TABLE) && table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEDOWN_TABLE, {
-                    event: e.nativeEvent
-                });
+        const isCompleteEdit = null === (_c = table.editorManager) || void 0 === _c ? void 0 : _c.completeEdit(e.nativeEvent);
+        (0, helper_1.getPromiseValue)(isCompleteEdit, (isCompleteEdit => {
+            var _a;
+            if (!1 === isCompleteEdit) return;
+            const hitIcon = (null === (_a = e.target.role) || void 0 === _a ? void 0 : _a.startsWith("icon")) ? e.target : void 0;
+            if (eventManager.downIcon = hitIcon, hitIcon || eventManager.checkCellFillhandle(eventArgsSet) || stateManager.columnResize.resizing || !eventManager.checkColumnResize(eventArgsSet, !0)) ; else {
+                table.scenegraph.updateChartState(null), stateManager.updateInteractionState(ts_types_1.InteractionState.grabing);
+                const {eventArgs: eventArgs} = eventArgsSet;
+                if (!(null == eventArgs ? void 0 : eventArgs.targetCell)) {
+                    table.getCellAt(eventArgsSet.abstractPos.x - global_1.ResizeColumnHotSpotSize / 2, eventArgsSet.abstractPos.y) && table.hasListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEDOWN_TABLE) && table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEDOWN_TABLE, {
+                        event: e.nativeEvent
+                    });
+                }
             }
-        }
+        }));
     })), table.scenegraph.stage.addEventListener("pointerup", (e => {
         "grabing" === stateManager.interactionState && (stateManager.updateInteractionState(ts_types_1.InteractionState.default), 
         stateManager.isResizeCol() && endResizeCol(table));