@visactor/vtable-gantt 1.17.3-alpha.13 → 1.17.3-alpha.15

package/cjs/index.d.ts

@@ -5,5 +5,5 @@ import { Gantt } from './Gantt';
 import * as tools from './tools';
 import * as VRender from './vrender';
 import * as VTable from './vtable';
-export declare const version = "1.17.3-alpha.13";
+export declare const version = "1.17.3-alpha.15";
 export { TYPES, GanttConstructorOptions, Gantt, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType, tools, VRender, VTable };

package/cjs/index.js

@@ -52,5 +52,5 @@ exports.VRender = VRender;
 
 const VTable = __importStar(require("./vtable"));
 
-exports.VTable = VTable, exports.version = "1.17.3-alpha.13";
+exports.VTable = VTable, exports.version = "1.17.3-alpha.15";
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAuBlC,sBAAK;AATP,mCAAgC;AAW9B,sFAXO,aAAK,OAWP;AAVP,+CAAiC;AAsB/B,sBAAK;AArBP,mDAAqC;AAsBnC,0BAAO;AArBT,iDAAmC;AAsBjC,wBAAM;AArBK,QAAA,OAAO,GAAG,iBAAiB,CAAC","file":"index.js","sourcesContent":["import type { GanttConstructorOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType\n} from '@visactor/vtable';\nimport { Gantt } from './Gantt';\nimport * as tools from './tools';\nimport * as VRender from './vrender';\nimport * as VTable from './vtable';\nexport const version = \"1.17.3-alpha.13\";\n/**\n * @namespace VTable\n */\nexport {\n  TYPES,\n  GanttConstructorOptions,\n  Gantt,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  tools,\n  VRender,\n  VTable\n};\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAuBlC,sBAAK;AATP,mCAAgC;AAW9B,sFAXO,aAAK,OAWP;AAVP,+CAAiC;AAsB/B,sBAAK;AArBP,mDAAqC;AAsBnC,0BAAO;AArBT,iDAAmC;AAsBjC,wBAAM;AArBK,QAAA,OAAO,GAAG,iBAAiB,CAAC","file":"index.js","sourcesContent":["import type { GanttConstructorOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType\n} from '@visactor/vtable';\nimport { Gantt } from './Gantt';\nimport * as tools from './tools';\nimport * as VRender from './vrender';\nimport * as VTable from './vtable';\nexport const version = \"1.17.3-alpha.15\";\n/**\n * @namespace VTable\n */\nexport {\n  TYPES,\n  GanttConstructorOptions,\n  Gantt,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  tools,\n  VRender,\n  VTable\n};\n"]}

package/dist/vtable-gantt.js

@@ -42330,18 +42330,9 @@
         var _a;
         const vChart = chart.activeChartInstance;
         if (!vChart) return !1;
-        const matrix = chart.parent.globalTransMatrix.clone(),
-          stageMatrix = chart.stage.window.getViewBoxTransform();
-        matrix.multiply(stageMatrix.a, stageMatrix.b, stageMatrix.c, stageMatrix.d, stageMatrix.e, stageMatrix.f);
-        const nextP = {
-          x: 0,
-          y: 0
-        };
-        matrix.getInverse().transformPoint(point, nextP);
         const vchartStage = vChart.getStage();
         null === (_a = vchartStage.dirtyBounds) || void 0 === _a || _a.clear();
-        vchartStage.window.getViewBoxTransform().transformPoint(nextP, nextP);
-        const pick = vchartStage.pick(nextP.x, nextP.y);
+        const pick = vchartStage.pick(point.x, point.y);
         return (null !== pick.graphic || "root" !== pick.group.name) && pick;
       }
     };
@@ -48979,15 +48970,15 @@
       handler.on(table.getElement(), "blur", e => {
         eventManager.dealTableHover();
       }), handler.on(table.getElement(), "keydown", e => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
         if ("a" === e.key && (e.ctrlKey || e.metaKey)) (null === (_a = table.keyboardOptions) || void 0 === _a ? void 0 : _a.selectAllOnCtrlA) && (e.preventDefault(), eventManager.deelTableSelectAll());else if (stateManager.select.cellPos.col >= 0 && stateManager.select.cellPos.row >= 0 && ("ArrowUp" === e.key || "ArrowDown" === e.key || "ArrowLeft" === e.key || "ArrowRight" === e.key)) {
           if ((null === (_c = null === (_b = table.options.keyboardOptions) || void 0 === _b ? void 0 : _b.moveEditCellOnArrowKeys) || void 0 === _c || !_c) && (null === (_d = table.editorManager) || void 0 === _d ? void 0 : _d.editingEditor) || !1 === (null === (_e = table.options.keyboardOptions) || void 0 === _e ? void 0 : _e.moveSelectedCellOnArrowKeys)) return;
           let targetCol, targetRow;
           if (e.preventDefault(), e.stopPropagation(), "ArrowUp" === e.key ? e.ctrlKey || e.metaKey ? (targetCol = stateManager.select.cellPos.col, targetRow = 0) : (e.shiftKey, targetCol = stateManager.select.cellPos.col, targetRow = Math.min(table.rowCount - 1, Math.max(0, stateManager.select.cellPos.row - 1))) : "ArrowDown" === e.key ? e.ctrlKey || e.metaKey ? (targetCol = stateManager.select.cellPos.col, targetRow = table.rowCount - 1) : (e.shiftKey, targetCol = stateManager.select.cellPos.col, targetRow = Math.min(table.rowCount - 1, Math.max(0, stateManager.select.cellPos.row + 1))) : "ArrowLeft" === e.key ? e.ctrlKey || e.metaKey ? (targetCol = 0, targetRow = stateManager.select.cellPos.row) : (e.shiftKey, targetRow = stateManager.select.cellPos.row, targetCol = Math.min(table.colCount - 1, Math.max(0, stateManager.select.cellPos.col - 1))) : "ArrowRight" === e.key && (e.ctrlKey || e.metaKey ? (targetCol = table.colCount - 1, targetRow = stateManager.select.cellPos.row) : (e.shiftKey, targetRow = stateManager.select.cellPos.row, targetCol = Math.min(table.colCount - 1, Math.max(0, stateManager.select.cellPos.col + 1)))), isCellDisableSelect(table, targetCol, targetRow)) return;
-          table.selectCell(targetCol, targetRow, e.shiftKey), null !== (_g = null === (_f = table.options.keyboardOptions) || void 0 === _f ? void 0 : _f.moveEditCellOnArrowKeys) && void 0 !== _g && _g && (null === (_h = table.editorManager) || void 0 === _h ? void 0 : _h.editingEditor) && (table.editorManager.completeEdit(), table.getElement().focus(), table.getEditor(targetCol, targetRow) && table.editorManager.startEditCell(targetCol, targetRow));
-        } else if ("Escape" === e.key) null === (_j = table.editorManager) || void 0 === _j || _j.cancelEdit(), table.getElement().focus();else if ("Enter" === e.key) {
-          if (null === (_k = table.editorManager) || void 0 === _k ? void 0 : _k.editingEditor) {
-            if (handleKeydownListener(e), table.editorManager.completeEdit(), table.getElement().focus(), !0 === (null === (_l = table.options.keyboardOptions) || void 0 === _l ? void 0 : _l.moveFocusCellOnEnter)) {
+          table.selectCell(targetCol, targetRow, e.shiftKey), null !== (_g = null === (_f = table.options.keyboardOptions) || void 0 === _f ? void 0 : _f.moveEditCellOnArrowKeys) && void 0 !== _g && _g && (null === (_h = table.editorManager) || void 0 === _h ? void 0 : _h.editingEditor) && (null === (_j = table.editorManager) || void 0 === _j || _j.completeEdit(), table.getElement().focus(), table.getEditor(targetCol, targetRow) && (null === (_k = table.editorManager) || void 0 === _k || _k.startEditCell(targetCol, targetRow)));
+        } else if ("Escape" === e.key) null === (_l = table.editorManager) || void 0 === _l || _l.cancelEdit(), table.getElement().focus();else if ("Enter" === e.key) {
+          if (null === (_m = table.editorManager) || void 0 === _m ? void 0 : _m.editingEditor) {
+            if (handleKeydownListener(e), null === (_o = table.editorManager) || void 0 === _o || _o.completeEdit(), table.getElement().focus(), !0 === (null === (_p = table.options.keyboardOptions) || void 0 === _p ? void 0 : _p.moveFocusCellOnEnter)) {
               const targetCol = stateManager.select.cellPos.col,
                 targetRow = Math.min(table.rowCount - 1, Math.max(0, stateManager.select.cellPos.row + 1));
               if (isCellDisableSelect(table, targetCol, targetRow)) return;
@@ -48995,30 +48986,30 @@
             }
             return;
           }
-          if (!0 === (null === (_m = table.options.keyboardOptions) || void 0 === _m ? void 0 : _m.moveFocusCellOnEnter)) {
+          if (!0 === (null === (_q = table.options.keyboardOptions) || void 0 === _q ? void 0 : _q.moveFocusCellOnEnter)) {
             const targetCol = stateManager.select.cellPos.col,
               targetRow = Math.min(table.rowCount - 1, Math.max(0, stateManager.select.cellPos.row + 1));
             if (isCellDisableSelect(table, targetCol, targetRow)) return;
             table.selectCell(targetCol, targetRow, e.shiftKey);
-          } else if ((null === (_p = null === (_o = table.options.keyboardOptions) || void 0 === _o ? void 0 : _o.editCellOnEnter) || void 0 === _p || _p) && 1 === (null !== (_r = null === (_q = table.stateManager.select.ranges) || void 0 === _q ? void 0 : _q.length) && void 0 !== _r ? _r : 0)) {
+          } else if ((null === (_s = null === (_r = table.options.keyboardOptions) || void 0 === _r ? void 0 : _r.editCellOnEnter) || void 0 === _s || _s) && 1 === (null !== (_u = null === (_t = table.stateManager.select.ranges) || void 0 === _t ? void 0 : _t.length) && void 0 !== _u ? _u : 0)) {
             const startCol = table.stateManager.select.ranges[0].start.col,
               startRow = table.stateManager.select.ranges[0].start.row,
               endCol = table.stateManager.select.ranges[0].end.col,
               endRow = table.stateManager.select.ranges[0].end.row;
-            startCol === endCol && startRow === endRow && table.getEditor(startCol, startRow) && table.editorManager.startEditCell(startCol, startRow);
+            startCol === endCol && startRow === endRow && table.getEditor(startCol, startRow) && (null === (_v = table.editorManager) || void 0 === _v || _v.startEditCell(startCol, startRow));
           }
         } else if ("Tab" === e.key) {
-          if ((null === (_t = null === (_s = table.options.keyboardOptions) || void 0 === _s ? void 0 : _s.moveFocusCellOnTab) || void 0 === _t || _t) && stateManager.select.cellPos.col >= 0 && stateManager.select.cellPos.row >= 0) {
+          if ((null === (_x = null === (_w = table.options.keyboardOptions) || void 0 === _w ? void 0 : _w.moveFocusCellOnTab) || void 0 === _x || _x) && stateManager.select.cellPos.col >= 0 && stateManager.select.cellPos.row >= 0) {
             if (stateManager.select.cellPos.col === table.colCount - 1 && stateManager.select.cellPos.row === table.rowCount - 1) return;
             let targetCol, targetRow;
             if (e.preventDefault(), stateManager.select.cellPos.col === table.colCount - 1 ? (targetRow = Math.min(table.rowCount - 1, stateManager.select.cellPos.row + 1), targetCol = table.rowHeaderLevelCount) : (targetRow = stateManager.select.cellPos.row, targetCol = stateManager.select.cellPos.col + 1), isCellDisableSelect(table, targetCol, targetRow)) return;
-            table.selectCell(targetCol, targetRow), (null === (_u = table.editorManager) || void 0 === _u ? void 0 : _u.editingEditor) && (table.editorManager.completeEdit(), table.getElement().focus(), table.getEditor(targetCol, targetRow) && table.editorManager.startEditCell(targetCol, targetRow));
+            table.selectCell(targetCol, targetRow), (null === (_y = table.editorManager) || void 0 === _y ? void 0 : _y.editingEditor) && (null === (_z = table.editorManager) || void 0 === _z || _z.completeEdit(), table.getElement().focus(), table.getEditor(targetCol, targetRow) && (null === (_0 = table.editorManager) || void 0 === _0 || _0.startEditCell(targetCol, targetRow)));
           }
         } else if (!(e.ctrlKey || e.metaKey || e.shiftKey)) {
           const editCellTrigger = table.options.editCellTrigger;
-          if (("keydown" === editCellTrigger || Array.isArray(editCellTrigger) && editCellTrigger.includes("keydown")) && !(null === (_v = table.editorManager) || void 0 === _v ? void 0 : _v.editingEditor)) {
+          if (("keydown" === editCellTrigger || Array.isArray(editCellTrigger) && editCellTrigger.includes("keydown")) && !(null === (_1 = table.editorManager) || void 0 === _1 ? void 0 : _1.editingEditor)) {
             const allowedKeys = /^[a-zA-Z0-9+\-*\/%=.,\s]$/;
-            e.key.match(allowedKeys) && table.editorManager.startEditCell(stateManager.select.cellPos.col, stateManager.select.cellPos.row, "");
+            e.key.match(allowedKeys) && (table.editorManager && (table.editorManager.beginTriggerEditCellMode = "keydown"), null === (_2 = table.editorManager) || void 0 === _2 || _2.startEditCell(stateManager.select.cellPos.col, stateManager.select.cellPos.row, ""));
           }
         }
         handleKeydownListener(e);
@@ -49196,7 +49187,9 @@
         callback: globalPointerdownCallback
       }), document.body.addEventListener("pointerdown", globalPointerdownCallback);
       const globalPointerupCallback = e => {
-        if (e.target !== table.canvas && (e => {
+        var _a, _b;
+        const target = e.target;
+        if (target !== table.canvas && (e => {
           var _a, _b;
           if (stateManager.menu.isShow && setTimeout(() => {
             table.internalProps.menuHandler.pointInMenuElement(e.clientX, e.clientY) || stateManager.menu.isShow && stateManager.hideMenu();
@@ -49221,6 +49214,11 @@
         })(e), table.eventManager.LastBodyPointerXY = null, table.eventManager.isDown = !1, table.eventManager.isDraging = !1, table.eventManager.inertiaScroll.endInertia(), "grabing" === stateManager.interactionState && stateManager.isResizeCol()) endResizeCol(table);else if ("grabing" === stateManager.interactionState && stateManager.isResizeRow()) endResizeRow(table);else if (stateManager.isMoveCol()) {
           const endMoveColSuccess = table.stateManager.endMoveCol();
           fireMoveColEventListeners(table, endMoveColSuccess, e);
+        } else if ((null === (_a = table.editorManager) || void 0 === _a ? void 0 : _a.editingEditor) && !table.getElement().contains(target)) {
+          const isCompleteEdit = null === (_b = table.editorManager) || void 0 === _b ? void 0 : _b.completeEdit(e);
+          getPromiseValue(isCompleteEdit, isCompleteEdit => {
+            !1 !== isCompleteEdit && (stateManager.updateInteractionState(InteractionState.default), eventManager.dealTableHover());
+          });
         }
       };
       eventManager.globalEventListeners.push({
@@ -52359,7 +52357,7 @@
       constructor(container) {
         let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.17.3-alpha.13", 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.17.3-alpha.15", 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");
         !1 === (null === (_a = options.customConfig) || void 0 === _a ? void 0 : _a.imageAnonymous) && (vglobal.isImageAnonymous = !1);
         const {
           frozenColCount = 0,
@@ -65391,7 +65389,7 @@
         themes: themes$1
     });
 
-    const version = "1.17.3-alpha.13";
+    const version = "1.17.3-alpha.15";
 
     exports.Gantt = Gantt;
     exports.TYPES = index$3;