e-virt-table 1.3.21 → 1.3.22

package/dist/index.es.js

@@ -3735,8 +3735,6 @@ class Me {
     // 拖拽表头中
     n(this, "finding", !1);
     // 查找中
-    n(this, "adjustPositioning", !1);
-    // 调整位置中
     n(this, "contextMenuIng", !1);
     // 右键菜单中
     n(this, "editing", !1);
@@ -5006,6 +5004,8 @@ class Be {
         }
         this.isMultipleRow || this.mouseenter();
       }
+    }), this.ctx.on("cellClick", () => {
+      this.adjustBoundaryPosition();
     }), this.ctx.on("cellMousedown", (t, e) => {
       if (!this.ctx.isTarget(e) || this.ctx.stageElement.style.cursor === "pointer" || this.ctx.isPointer || this.ctx.stageElement.style.cursor === "crosshair")
         return;
@@ -5015,7 +5015,7 @@ class Be {
       }
       window.getComputedStyle(e.target).userSelect !== "text" && e.preventDefault(), this.isMultipleRow = !1, this.click(e.shiftKey), this.ctx.emit("selectorClick", t);
     }), this.ctx.on("mouseup", () => {
-      this.ctx.selectorMove = !1, this.ctx.stopAdjustPosition(), this.ctx.adjustPositioning = !1, setTimeout(() => {
+      this.ctx.selectorMove = !1, this.ctx.stopAdjustPosition(), setTimeout(() => {
         this.ctx.disableHoverIconClick = !1;
       }, 0);
     }), this.ctx.on("cellHeaderHoverChange", (t) => {
@@ -5073,7 +5073,7 @@ class Be {
     }), this.ctx.on("contextMenuCut", () => {
       this.isCut = !0, this.copy();
     }), this.ctx.on("setSelectorCell", (t) => {
-      this.ctx.setFocusCell(t), this.click();
+      this.ctx.setFocusCell(t), this.click(), this.adjustBoundaryPosition();
     }), this.ctx.on("selectCols", (t) => {
       this.selectCols(t);
     });
@@ -5239,7 +5239,7 @@ class Be {
       } else {
         this.ctx.emit("cellSelectedClick", e);
         const s = [e.colIndex, e.colIndex], o = [e.rowIndex, e.rowIndex];
-        this.setSelector(s, o), this.adjustBoundaryPosition();
+        this.setSelector(s, o);
       }
   }
   clearCopyLine() {
@@ -5474,7 +5474,7 @@ class Be {
     u && (x === "top" ? R = r.height + a.height - w : O = a.visibleHeight);
     const v = w + S - (t - O - f);
     let I = h, _ = d;
-    C > 0 && !y ? I = Math.floor(h + C) : b > 0 && !y && (I = Math.floor(h - b)), R > 0 ? _ = Math.floor(d - R) : v > 0 && (_ = Math.floor(d + v)), (Math.abs(h - I) > 2 || Math.abs(d - _) > 2) && (this.ctx.adjustPositioning = !0, this.ctx.emit("adjustBoundaryPosition", i), this.ctx.setScroll(I, _));
+    C > 0 && !y ? I = Math.floor(h + C) : b > 0 && !y && (I = Math.floor(h - b)), R > 0 ? _ = Math.floor(d - R) : v > 0 && (_ = Math.floor(d + v)), (Math.abs(h - I) > 2.5 || Math.abs(d - _) > 2.5) && this.ctx.setScroll(I, _);
   }
   destroy() {
   }
@@ -6743,7 +6743,7 @@ class Oi {
     }), this.ctx.on("moveFocus", (t) => {
       this.cellTarget = t, this.resetEditorStyle();
       const { xArr: e, yArr: i } = this.ctx.selector;
-      this.selectorArrStr = JSON.stringify(e) + JSON.stringify(i);
+      this.selectorArrStr = JSON.stringify(e) + JSON.stringify(i), this.focusInput();
     }), this.ctx.on("onScroll", () => {
       this.enable && this.doneEdit();
     }), this.ctx.on("hoverIconClick", (t) => {
@@ -6821,11 +6821,11 @@ class Oi {
         return;
       }
       this.startEdit(!0);
-    }), this.ctx.on("cellMouseup", (t) => {
+    }), this.ctx.on("cellClick", (t) => {
       if (this.ctx.isPointer || !this.isInSelectorRange(t.rowIndex, t.colIndex))
         return;
       const { xArr: e, yArr: i } = this.ctx.selector, s = JSON.stringify(e) + JSON.stringify(i);
-      if (this.selectorArrStr === s && this.cellTarget) {
+      if (this.focusInput(), this.selectorArrStr === s && this.cellTarget) {
         if (this.ctx.config.ENABLE_MERGE_CELL_LINK && this.ctx.onlyMergeCell) {
           this.startEdit();
           return;
@@ -6835,15 +6835,13 @@ class Oi {
           return;
         }
       }
-      if (this.selectorArrStr = s, this.doneEdit(), this.cellTarget = t, this.ctx.selectOnlyOne && this.inputEl.focus({ preventScroll: !0 }), this.resetEditorStyle(), this.ctx.config.ENABLE_EDIT_SINGLE_CLICK) {
+      if (this.selectorArrStr = s, this.doneEdit(), this.cellTarget = t, this.resetEditorStyle(), this.ctx.config.ENABLE_EDIT_SINGLE_CLICK) {
         if (this.ctx.config.ENABLE_MERGE_CELL_LINK && this.ctx.onlyMergeCell) {
           this.startEdit();
           return;
         }
         this.ctx.selectOnlyOne && this.startEdit();
       }
-    }), this.ctx.on("mousedownBodyOutside", () => {
-      this.clearEditor();
     });
   }
   isInSelectorRange(t, e) {
@@ -6888,6 +6886,9 @@ class Oi {
       s !== i && !(s === "" && i === null) && !this.cancel && this.ctx.setItemValueByEditor(t, e, s, !0);
     }
   }
+  focusInput() {
+    this.ctx.selectOnlyOne && document.activeElement !== this.inputEl && this.inputEl.focus({ preventScroll: !0 });
+  }
   startEdit(t = !1) {
     this.cancel = !1;
     const { ENABLE_EDIT_CLICK_SELECTOR: e } = this.ctx.config;
@@ -6915,7 +6916,7 @@ class Oi {
   }
   doneEdit() {
     this.enable && (this.doneEditByInput(), this.ctx.emit("cellHideTooltip"), this.ctx.emit("doneEdit", this.cellTarget), this.enable = !1, this.ctx.editing = !1, this.resetEditorStyle(), setTimeout(() => {
-      this.inputEl.focus({ preventScroll: !0 });
+      this.focusInput();
     }, 0), this.ctx.emit("draw"));
   }
   resetEditorStyle() {