e-virt-table 1.4.0 → 1.4.1

package/dist/index.es.js

@@ -955,7 +955,11 @@ class ie extends ee {
         maxLineClamp: this.maxLineClamp,
         cacheTextKey: d,
         layoutCallback: (f) => {
-          this.ctx.emit("registerTextLayout", `${this.rowIndex}-${this.colIndex}`, f);
+          this.ctx.emit(
+            "registerTextLayout",
+            `${this.cellType}-${this.rowIndex}-${this.colIndex}`,
+            f
+          );
         }
       }
     ), this.ellipsis;
@@ -2521,6 +2525,9 @@ class Ae {
     if (!e) throw new Error("canvas context not found");
     this.ctx = e;
   }
+  getCtx() {
+    return this.ctx;
+  }
   clearTextCache() {
     this.textCacheMap.clear();
   }
@@ -4288,6 +4295,9 @@ class $e extends ee {
         cacheTextKey: o,
         textCallback: (n) => {
           this.textInfo = n;
+        },
+        layoutCallback: (n) => {
+          this.ctx.emit("registerTextLayout", `${this.cellType}-${this.colIndex}-${this.level}`, n);
         }
       }
     );
@@ -5310,7 +5320,7 @@ class Ze {
         this.ctx.disableHoverIconClick = !1;
       }, 0);
     }), this.ctx.on("cellHeaderHoverChange", (t) => {
-      this.ctx.mousedown && this.selectCols(t);
+      this.ctx.textSelecting || this.ctx.mousedown && this.selectCols(t);
     }), this.ctx.on("cellHoverChange", (t) => {
       this.ctx.textSelecting || this.ctx.mousedown && this.selectCols(t);
     }), this.ctx.on("cellHeaderMousedown", (t, e) => {
@@ -7080,8 +7090,6 @@ class ki {
         return;
       }
       if (t.key === "Enter" && !this.ctx.editing) {
-        if (this.isTextSelectionActive())
-          return;
         t.preventDefault(), this.startEdit();
         return;
       }
@@ -7120,9 +7128,9 @@ class ki {
         t.preventDefault();
         return;
       }
-      this.isTextSelectionActive() || this.startEdit(!0);
+      this.startEdit(!0);
     }), this.ctx.on("cellClick", (t) => {
-      if (this.ctx.stageElement.style.cursor === "pointer" || this.isTextSelectionActive() || !this.isInSelectorRange(t.rowIndex, t.colIndex))
+      if (this.ctx.stageElement.style.cursor === "pointer" || !this.isInSelectorRange(t.rowIndex, t.colIndex))
         return;
       const { xArr: e, yArr: i } = this.ctx.selector, s = JSON.stringify(e) + JSON.stringify(i);
       if (this.focusInput(), this.selectorArrStr === s && this.cellTarget) {
@@ -8071,48 +8079,56 @@ class Wi {
     r(this, "dragging", !1);
     this.ctx = t, this.init();
   }
+  /** 是否允许进行文字选择（开启配置且不在编辑/查找状态） */
+  get canSelect() {
+    return this.ctx.config.ENABLE_TEXT_SELECTION && !this.ctx.editing && !this.ctx.finding;
+  }
+  /**
+   * 在所有已注册的文字 layout（body/header/footer）中命中鼠标位置，返回命中的单元格 key 与字符索引。
+   * 由于固定列/表头会后绘制并覆盖普通单元格，这里取最后一个命中的 layout 作为最顶层结果。
+   */
+  hitTestLayouts(t) {
+    const { offsetX: e, offsetY: i } = this.ctx.getOffset(t);
+    let s = null;
+    for (const [o, n] of this.layouts) {
+      const a = this.hitTestText(n, e, i);
+      a !== null && (s = { cellKey: o, index: a });
+    }
+    return s;
+  }
+  /** 同步选中文本并触发重绘 */
+  syncSelection() {
+    this.ctx.textSelectionStr = this.getSelectedText(), this.ctx.emit("drawView");
+  }
   init() {
     this.ctx.on("registerTextLayout", (t, e) => {
       this.registerLayout(t, e);
     }), this.ctx.on("mousedown", (t) => {
-      if (!this.ctx.config.ENABLE_TEXT_SELECTION || !this.ctx.isTarget(t) || this.ctx.editing || this.ctx.finding)
-        return;
-      const e = this.ctx.focusCell;
-      if (!e || e.cellType !== "body") {
-        this.clearSelection();
+      if (!this.canSelect || !this.ctx.isTarget(t))
         return;
-      }
-      const i = this.getCellLayout(e);
-      if (!i) {
+      this.ctx.containerElement.contains(document.activeElement) || this.ctx.containerElement.focus({ preventScroll: !0 });
+      const e = this.hitTestLayouts(t);
+      if (!e) {
         this.clearSelection();
         return;
       }
-      const { offsetX: s, offsetY: o } = this.ctx.getOffset(t), n = this.hitTestText(i, s, o);
-      if (n === null) {
-        this.clearSelection();
-        return;
-      }
-      this.activeCellKey = this.getCellKey(e), this.selectionStart = n, this.selectionEnd = n, this.dragging = !0, this.ctx.textSelecting = !0, this.ctx.textSelectionStr = this.getSelectedText(), this.ctx.emit("drawView");
+      this.activeCellKey = e.cellKey, this.selectionStart = e.index, this.selectionEnd = e.index, this.dragging = !0, this.ctx.textSelecting = !0, this.syncSelection();
     }), this.ctx.on("mousemove", (t) => {
-      if (!this.ctx.config.ENABLE_TEXT_SELECTION || !this.dragging)
+      if (!this.canSelect || !this.dragging)
         return;
-      const e = this.ctx.focusCell;
+      const e = this.layouts.get(this.activeCellKey);
       if (!e)
         return;
-      const i = this.getCellLayout(e);
-      if (!i)
-        return;
-      const { offsetX: s, offsetY: o } = this.ctx.getOffset(t), n = this.hitTestText(i, s, o);
-      n !== null && (this.selectionEnd = n, this.ctx.textSelectionStr = this.getSelectedText(), this.ctx.emit("drawView"));
+      const { offsetX: i, offsetY: s } = this.ctx.getOffset(t), o = this.hitTestText(e, i, s);
+      o !== null && (this.selectionEnd = o, this.syncSelection());
     }), this.ctx.on("mouseup", () => {
       this.dragging = !1, this.ctx.textSelecting = !1, this.ctx.textSelectionStr = this.getSelectedText(), this.ctx.textSelectionStr && this.ctx.emit("drawView");
     }), this.ctx.on("keydown", (t) => {
-      if (this.ctx.config.ENABLE_TEXT_SELECTION && !(this.ctx.editing || this.ctx.finding) && (t.ctrlKey && t.code === "KeyC" || t.metaKey && t.code === "KeyC")) {
-        const e = this.getSelectedText();
-        if (!e)
-          return;
-        t.preventDefault(), navigator.clipboard && navigator.clipboard.writeText(e).catch((i) => console.error("Copy Failure:", i));
-      }
+      var i;
+      if (console.log("keydown"), !this.canSelect || !((t.ctrlKey || t.metaKey) && t.code === "KeyC"))
+        return;
+      const e = this.getSelectedText();
+      e && (t.preventDefault(), (i = navigator.clipboard) == null || i.writeText(e).catch((s) => console.error("Copy Failure:", s)));
     }), this.ctx.on("outsideMousedown", () => {
       this.clearSelection();
     });
@@ -8149,12 +8165,6 @@ class Wi {
     const e = this.layouts.get(this.activeCellKey);
     e && this.drawTextSelection(e, t);
   }
-  getCanvasCtx() {
-    const t = this.ctx.canvasElement.getContext("2d");
-    if (!t)
-      throw new Error("canvas context not found");
-    return t;
-  }
   /**
    * 绘制文字选中高亮
    */
@@ -8162,29 +8172,22 @@ class Wi {
     if (e.start >= e.end)
       return;
     const o = /* @__PURE__ */ new Map();
-    t.glyphs.forEach((a) => {
-      a.index < 0 || a.index < e.start || a.index >= e.end || (o.has(a.line) || o.set(a.line, []), o.get(a.line).push(a));
-    });
-    const n = this.getCanvasCtx();
-    n.save(), n.fillStyle = s, o.forEach((a) => {
+    for (const a of t.glyphs) {
+      if (a.index < e.start || a.index >= e.end)
+        continue;
+      const l = o.get(a.line);
+      l ? l.push(a) : o.set(a.line, [a]);
+    }
+    if (!o.size)
+      return;
+    const n = this.ctx.paint.getCtx();
+    n.save(), n.font = t.font, n.textBaseline = "top", n.textAlign = "left", o.forEach((a) => {
       const l = a[0], c = a[a.length - 1];
-      n.fillRect(l.x, l.y, c.x + c.width - l.x, l.height);
-    }), n.font = t.font, n.textBaseline = "top", n.textAlign = "left", n.fillStyle = i, t.lines.forEach((a) => {
-      const l = a.items.filter(
-        (g) => g.sourceIndex >= 0 && g.sourceIndex >= e.start && g.sourceIndex < e.end
-      );
-      if (!l.length)
-        return;
-      const c = l[0], d = a.items.indexOf(c), f = l.map((g) => g.char).join(""), u = a.items.slice(0, d).map((g) => g.char).join(""), x = a.drawX + n.measureText(u).width;
-      n.fillText(f, x, a.drawY);
+      n.fillStyle = s, n.fillRect(l.x, l.y, c.x + c.width - l.x, l.height), n.fillStyle = i;
+      for (const d of a)
+        n.fillText(d.char, d.x, d.y);
     }), n.restore();
   }
-  getCellKey(t) {
-    return `${t.rowIndex}-${t.colIndex}`;
-  }
-  getCellLayout(t) {
-    return this.layouts.get(this.getCellKey(t));
-  }
   getSelectionRange() {
     return this.selectionStart === null || this.selectionEnd === null ? null : {
       start: Math.min(this.selectionStart, this.selectionEnd),
@@ -8261,7 +8264,7 @@ const gt = class gt {
     };
   }
   doDraw(t = !1) {
-    this.header.update(), this.footer.update(), this.body.update(), this.ctx.paint.clear(), this.textSelector.clearLayouts(), this.body.draw(), this.textSelector.draw(), this.footer.draw(), this.header.draw(), this.body.drawDragRowTip(), this.scroller.draw(), this.empty.draw(), this.loading.draw(), t || this.overlayer.draw();
+    this.header.update(), this.footer.update(), this.body.update(), this.ctx.paint.clear(), this.textSelector.clearLayouts(), this.body.draw(), this.footer.draw(), this.header.draw(), this.textSelector.draw(), this.body.drawDragRowTip(), this.scroller.draw(), this.empty.draw(), this.loading.draw(), t || this.overlayer.draw();
   }
   draw(t = !1) {
     this.animationFrameId && cancelAnimationFrame(this.animationFrameId), this.animationFrameId = requestAnimationFrame(() => {