@hailin-zheng/editor-core 1.1.12 → 1.1.14

package/index.js

@@ -9016,7 +9016,7 @@ class ColumnPatchUtil {
         //要分割的列坐标
         const newLinePointMap = this.getLinePointMap(splitCols);
         const resArray = new Set();
-        const allPointMap = oldLinePointMap.concat(newLinePointMap);
+        const allPointMap = oldLinePointMap.concat(newLinePointMap).sort((a, b) => a.index - b.index);
         for (let i = 0; i < allPointMap.length; i++) {
             const part = allPointMap[i];
             resArray.add(part.offset);
@@ -9341,6 +9341,8 @@ class TableSplitCell {
         const splitCols = this.getSplitCols(colsWidth, cols);
         const [otherPacks, currPacks] = ColumnPatchUtil.getPatchPacks(hMergeCols, splitCols);
         this.applyHorSplitColumnPatchPacks(tb, focusRowIndex, 1, otherPacks);
+        //当前单元格执行补丁前，需要先还原单元格
+        TableUtil.restoreCell(ss);
         this.applyHorSplitColumnCurrPatchPacks(tb, focusRowIndex, focusCellIndex, rows, currPacks);
         tb.pubOnChange('to-child');
         tb.refreshView();
@@ -9404,7 +9406,6 @@ class TableSplitCell {
     static applyHorSplitColumnCurrPatchPacks(tb, focusRowIndex, focusColInex, splitRows, packs) {
         //获取当前列的合并行数
         let vMergeRows = this.getVMergeRowsCount(tb, focusRowIndex, focusColInex);
-        vMergeRows = vMergeRows === 1 ? 0 : vMergeRows;
         const startRow = tb.getChild(focusRowIndex);
         const endRow = tb.getChild(focusRowIndex + vMergeRows - 1);
         for (let i = 0; i < packs.length; i++) {
@@ -16943,6 +16944,9 @@ class ElementTrackManage {
      * 执行撤销
      */
     undo() {
+        if (!this.canUndo) {
+            return;
+        }
         suppressTracking(() => {
             this.index--;
             this.executeCommand('undo');
@@ -16964,6 +16968,9 @@ class ElementTrackManage {
      * 执行重做
      */
     redo() {
+        if (!this.canRedo) {
+            return;
+        }
         suppressTracking(() => {
             this.executeCommand('redo');
             this.index++;
@@ -18138,15 +18145,15 @@ class NodeEvent {
         canvas.addEventListener('wheel', evt => {
             this.setActiveAppContext(() => this.onWheelHandler(evt));
         });
+        canvas.addEventListener('click', evt => {
+            this.root.setInputFocus(true);
+        });
         canvas.addEventListener('dblclick', evt => {
             this.setActiveAppContext(() => this.onDblClickHandler(evt));
         });
         canvas.addEventListener('contextmenu', evt => {
             this.setActiveAppContext(() => this.onContextMenuHandler(evt));
         });
-        canvas.addEventListener('keydown', evt => {
-            this.setActiveAppContext(() => this.onKeydownHandler(evt));
-        });
         this.root.addEventListener('preGotFocus', (evt) => {
             this.invokeNodeFocusedEvent(this.prevNode, this.prevFocusNodes, evt.source);
         }, true);
@@ -19016,6 +19023,7 @@ class SurfaceView extends NodeItems {
             this.invokeKeydown(evt);
         });
         this.input.addEventListener('copy', evt => {
+            console.log('copy了');
             this.invokeClipboardEvent(evt, 'copy');
         });
         this.input.addEventListener('paste', evt => {
@@ -19074,6 +19082,7 @@ class SurfaceView extends NodeItems {
             return;
         }
         this.input.style.display = '';
+        this.input.readOnly = false;
         const left = Math.floor(x) + 'px';
         const top = Math.floor(y) + 'px';
         if (left !== this.input.style.left || top !== this.input.style.top) {
@@ -19087,9 +19096,10 @@ class SurfaceView extends NodeItems {
         state ? this.input.focus() : this.input.blur();
     }
     hiddenInput() {
-        this.input.style.display = 'none';
-        this.input.style.left = '0';
-        this.input.style.top = '0';
+        //this.input.style.display = 'none';
+        this.input.style.left = '-2px';
+        this.input.style.top = '-2px';
+        this.input.readOnly = true;
     }
     endInput() {
     }
@@ -20453,7 +20463,7 @@ class CanvasTextEditor extends AbsolutePanel {
      */
     setCursor() {
         const { startControl, startOffset } = this.selectionState;
-        if (!this.canSetCursor()) {
+        if (!this.canSetCursor() || !this.documentEvent.startHitInfo) {
             this.selectionState.editable = false;
             this.documentInput.setCursorVisibility(false);
             return false;