e-virt-table 1.1.6 → 1.1.8

package/dist/index.es.js

@@ -583,27 +583,27 @@ var Rt = vt(), nt = /* @__PURE__ */ function() {
         v === void 0 && (v = []);
         var O = Array.isArray(v) ? v : [v];
         !h.suppressWarning && O.length && a.warning("async-validator:", O), O.length && y.message !== void 0 && (O = [].concat(y.message));
-        var L = O.map(Nt(y, n));
-        if (h.first && L.length)
-          return p[y.field] = 1, w(L);
+        var S = O.map(Nt(y, n));
+        if (h.first && S.length)
+          return p[y.field] = 1, w(S);
         if (!E)
-          w(L);
+          w(S);
         else {
           if (y.required && !u.value)
-            return y.message !== void 0 ? L = [].concat(y.message).map(Nt(y, n)) : h.error && (L = [h.error(y, D(h.messages.required, y.field))]), w(L);
+            return y.message !== void 0 ? S = [].concat(y.message).map(Nt(y, n)) : h.error && (S = [h.error(y, D(h.messages.required, y.field))]), w(S);
           var I = {};
-          y.defaultField && Object.keys(u.value).map(function(S) {
-            I[S] = y.defaultField;
+          y.defaultField && Object.keys(u.value).map(function(L) {
+            I[L] = y.defaultField;
           }), I = G({}, I, u.rule.fields);
           var R = {};
-          Object.keys(I).forEach(function(S) {
-            var M = I[S], T = Array.isArray(M) ? M : [M];
-            R[S] = T.map(m.bind(null, S));
+          Object.keys(I).forEach(function(L) {
+            var M = I[L], T = Array.isArray(M) ? M : [M];
+            R[L] = T.map(m.bind(null, L));
           });
           var A = new a(R);
-          A.messages(h.messages), u.rule.options && (u.rule.options.messages = h.messages, u.rule.options.error = h.error), A.validate(u.value, u.rule.options || h, function(S) {
+          A.messages(h.messages), u.rule.options && (u.rule.options.messages = h.messages, u.rule.options.error = h.error), A.validate(u.value, u.rule.options || h, function(L) {
             var M = [];
-            L && L.length && M.push.apply(M, L), S && S.length && M.push.apply(M, S), w(M.length ? M : null);
+            S && S.length && M.push.apply(M, S), L && L.length && M.push.apply(M, L), w(M.length ? M : null);
           });
         }
       }
@@ -1050,14 +1050,14 @@ class Tt extends se {
     if (this.cellType === "footer") {
       let b = n, v = o;
       if (typeof r == "function") {
-        const O = r, { backgroundColor: L, color: I } = O({
+        const O = r, { backgroundColor: S, color: I } = O({
           row: this.row,
           rowIndex: this.rowIndex,
           colIndex: this.colIndex,
           column: this.column,
           value: this.getValue()
         }) || {};
-        L && (b = L), I && (v = I);
+        S && (b = S), I && (v = I);
       }
       this.drawCellSkyBgColor = "transparent", this.drawCellBgColor = b, this.drawTextColor = v;
       return;
@@ -1247,7 +1247,7 @@ class Tt extends se {
     this.ellipsis = r;
     const { placeholder: o } = this.column;
     let n = this.displayText, h = this.drawTextColor;
-    return o && ["", null, void 0].includes(this.text) && this.cellType === "body" && (n = o, h = s), this.ctx.paint.drawText(n, this.drawTextX, this.drawTextY, this.visibleWidth, this.visibleHeight, {
+    return !this.ctx.database.getReadonly(this.rowKey, this.key) && o && ["", null, void 0].includes(this.text) && this.cellType === "body" && !(this.rowspan === 0 || this.colspan === 0) && (n = o, h = s), this.ctx.paint.drawText(n, this.drawTextX, this.drawTextY, this.visibleWidth, this.visibleHeight, {
       font: i,
       padding: e,
       align: this.align,
@@ -2153,29 +2153,29 @@ class ni {
           }
         ]
       };
-    let w = e, y = e, E = n, m = n, C = [], b = 0, v = 0, O = 0, L = 0;
+    let w = e, y = e, E = n, m = n, C = [], b = 0, v = 0, O = 0, S = 0;
     if (d !== 1 && p) {
-      L = x;
+      S = x;
       const I = h.reduce((R, A) => {
-        const S = this.getItemValue(s, A) ?? "";
-        return `${R}${S}`;
+        const L = this.getItemValue(s, A) ?? "";
+        return `${R}${L}`;
       }, "");
       for (let R = e - 1; R >= 0; R--) {
-        const A = this.rowIndexRowKeyMap.get(R) || "", S = h.reduce((M, T) => {
+        const A = this.rowIndexRowKeyMap.get(R) || "", L = h.reduce((M, T) => {
           const N = this.getItemValue(A, T) ?? "";
           return `${M}${N}`;
         }, "");
-        if (I === S)
+        if (I === L)
           w = R;
         else
           break;
       }
       for (let R = e; R <= this.ctx.maxRowIndex; R++) {
-        const A = this.rowIndexRowKeyMap.get(R) || "", S = h.reduce((M, T) => {
+        const A = this.rowIndexRowKeyMap.get(R) || "", L = h.reduce((M, T) => {
           const N = this.getItemValue(A, T) ?? "";
           return `${M}${N}`;
         }, "");
-        if (I === S)
+        if (I === L)
           y = R;
         else
           break;
@@ -2187,9 +2187,9 @@ class ni {
       for (let R = w; R <= y; R++) {
         const { height: A } = this.positions[R];
         O += A;
-        const S = this.rowIndexRowKeyMap.get(R) || "", { item: M } = this.rowKeyMap.get(S), T = this.getItemValue(S, i);
+        const L = this.rowIndexRowKeyMap.get(R) || "", { item: M } = this.rowKeyMap.get(L), T = this.getItemValue(L, i);
         C.push({
-          rowKey: S,
+          rowKey: L,
           key: i,
           value: T,
           row: M
@@ -2202,8 +2202,8 @@ class ni {
         const R = this.getColumnByColIndex(I);
         if (!R)
           break;
-        const A = this.getItemValue(s, i), S = this.getItemValue(s, R.key);
-        if (A === S && c.includes(R.key))
+        const A = this.getItemValue(s, i), L = this.getItemValue(s, R.key);
+        if (A === L && c.includes(R.key))
           E = I;
         else
           break;
@@ -2212,8 +2212,8 @@ class ni {
         const R = this.getColumnByColIndex(I);
         if (!R)
           break;
-        const A = this.getItemValue(s, i), S = this.getItemValue(s, R.key);
-        if (A === S && c.includes(R.key))
+        const A = this.getItemValue(s, i), L = this.getItemValue(s, R.key);
+        if (A === L && c.includes(R.key))
           m = I;
         else
           break;
@@ -2228,7 +2228,7 @@ class ni {
         const R = this.getColumnByColIndex(I);
         if (!R)
           break;
-        L += R.width || 100, C.push({
+        S += R.width || 100, C.push({
           rowKey: s,
           key: R.key,
           value: this.getItemValue(s, R.key),
@@ -2242,7 +2242,7 @@ class ni {
       rowspan: d,
       colspan: g,
       height: O,
-      width: L,
+      width: S,
       offsetTop: b,
       offsetLeft: v,
       dataList: C
@@ -2370,7 +2370,7 @@ class li {
     this.ctx.emit("resetHeader", t), this.ctx.emit("resize", t);
   }
   handleMouseDown(t) {
-    t.button === 0 && (this.ctx.mousedown = !0), this.ctx.emit("mousedown", t);
+    t.button === 0 && (this.ctx.mousedown = !0), this.ctx.containerElement.focus(), this.ctx.emit("mousedown", t);
   }
   handleMousemove(t) {
     this.ctx.emit("mousemove", t);
@@ -2659,7 +2659,7 @@ class Wt {
     l(this, "FOOTER_FIXED", !0);
     l(this, "FOOTER_POSITION", "bottom");
     l(this, "CELL_FOOTER_HEIGHT", 36);
-    l(this, "ENABLE_SELECTOR", !1);
+    l(this, "ENABLE_SELECTOR", !0);
     l(this, "ENABLE_EDIT_SINGLE_CLICK", !1);
     // 启用单点击立马编辑
     l(this, "ENABLE_EDIT_CLICK_SELECTOR", !0);
@@ -3870,6 +3870,7 @@ class wi {
     l(this, "visibleRows", []);
     l(this, "visibleHeight", 0);
     l(this, "visibleWidth", 0);
+    l(this, "containerRect");
     l(this, "data", []);
     this.ctx = t, this.init(), this.initResizeRow();
   }
@@ -3894,41 +3895,46 @@ class wi {
       return;
     this.x = 0, x === "top" && r ? this.y = e.height + i.height : this.y = e.height;
     const { data: g, sumHeight: p } = s.getData();
-    this.height = p, this.data = g;
-    const { top: u } = t.getBoundingClientRect();
-    this.width = e.width, this.visibleWidth = this.ctx.stageWidth - o;
-    const w = this.ctx.footer.height;
-    !this.data.length && !n ? this.height = h : !this.data.length && n && (this.height = n - e.height - w - o);
-    const y = this.data.length ? "not-empty" : "empty";
+    this.height = p, this.data = g, this.width = e.width, this.visibleWidth = this.ctx.stageWidth - o;
+    const u = this.ctx.footer.height;
+    !this.data.length && !n ? this.height = h : !this.data.length && n && (this.height = n - e.height - u - o);
+    const w = this.data.length ? "not-empty" : "empty";
     this.ctx.emit("emptyChange", {
-      isEmpty: y,
-      type: y,
+      isEmpty: w,
+      type: w,
       headerHeight: e.height,
       bodyHeight: this.height,
-      footerHeight: w,
+      footerHeight: u,
       width: this.width,
-      height: this.data.length ? 0 : h + w
+      height: this.data.length ? 0 : h + u
     });
-    let E = this.height + e.height + o;
-    E += w;
-    let m = 0;
-    this.data.length && d ? (m = window.innerHeight - u - f, m < 0 && (m = 32, console.error(
-      "There is an error in the height calculation ENABLE_OFFSET_HEIGHT and OFFSET_HEIGHT are invalid"
-    ))) : this.data.length && n ? m = n : this.data.length && c && E > c ? m = c : m = E, m > 0 && (this.ctx.stageHeight = Math.floor(m), this.ctx.stageElement.style.height = `${this.ctx.stageHeight - 0.5}px`);
-    let C = this.ctx.stageHeight - e.height - o;
-    r ? this.visibleHeight = C - w : this.visibleHeight = C, this.ctx.body.x = this.x, this.ctx.body.y = this.y, this.ctx.body.width = this.width, this.ctx.body.height = this.height, this.ctx.body.visibleWidth = this.visibleWidth, this.ctx.body.visibleHeight = this.visibleHeight, this.ctx.body.data = g;
-    const b = window.devicePixelRatio || 1, v = this.ctx.stageWidth * b, O = this.ctx.stageHeight * b;
-    t.width = Math.floor(v), t.height = Math.floor(O), this.ctx.canvasElement.setAttribute(
+    let y = this.height + e.height + o;
+    y += u;
+    let E = y;
+    const m = window.innerHeight, { top: C } = this.containerRect || this.ctx.containerElement.getBoundingClientRect();
+    if (this.data.length && m > C && d && !n) {
+      const R = m - C - f;
+      R > e.height + o ? E = R : y > c && (E = c);
+    } else this.data.length && n ? E = n : this.data.length && c && y > c && (E = c);
+    E > 0 && (this.ctx.stageHeight = Math.floor(E), this.ctx.stageElement.style.height = `${this.ctx.stageHeight - 0.5}px`);
+    let b = this.ctx.stageHeight - e.height - o;
+    r ? this.visibleHeight = b - u : this.visibleHeight = b, this.ctx.body.x = this.x, this.ctx.body.y = this.y, this.ctx.body.width = this.width, this.ctx.body.height = this.height, this.ctx.body.visibleWidth = this.visibleWidth, this.ctx.body.visibleHeight = this.visibleHeight, this.ctx.body.data = g;
+    const v = window.devicePixelRatio || 1, O = this.ctx.stageWidth * v, S = this.ctx.stageHeight * v;
+    t.width = Math.floor(O), t.height = Math.floor(S), this.ctx.canvasElement.setAttribute(
       "style",
       ` height:${this.ctx.stageHeight}px;width:${this.ctx.stageWidth}px;`
-    ), this.ctx.paint.scale(b);
+    ), this.ctx.paint.scale(v);
   }
   // 调整行的高度
   initResizeRow() {
     const {
       config: { ENABLE_RESIZE_ROW: t }
     } = this.ctx;
-    t && (this.ctx.on("mouseup", () => {
+    t && (this.ctx.on("resize", () => {
+      this.containerRect = this.ctx.containerElement.getBoundingClientRect();
+    }), this.ctx.on("resizeObserver", () => {
+      this.containerRect = this.ctx.containerElement.getBoundingClientRect();
+    }), this.ctx.on("mouseup", () => {
       this.isMouseDown = !1, this.resizeDiff !== 0 && this.resizeTarget && this.resizeRow(this.resizeTarget, this.resizeDiff), this.resizeTarget = null, this.resizeDiff = 0, this.isResizing = !1, setTimeout(() => {
         this.ctx.rowResizing = !1;
       }, 0), this.clientY = 0;
@@ -4650,9 +4656,9 @@ class yi {
     const { drawX: u, drawY: w, width: y, height: E, fixed: m } = i, C = r - u + 1, b = i.drawX + y - (e - s) + 1;
     let v = o.height - w, O = E;
     O > h.visibleHeight && (O = h.visibleHeight);
-    let L = 0;
-    x && (g === "top" ? v = o.height + n.height - w : L = n.visibleHeight);
-    const I = w + O - (t - L - f);
+    let S = 0;
+    x && (g === "top" ? v = o.height + n.height - w : S = n.visibleHeight);
+    const I = w + O - (t - S - f);
     let R = c, A = d;
     b > 0 && !m ? R = Math.floor(c + b) : C > 0 && !m && (R = Math.floor(c - C)), v > 0 ? A = Math.floor(d - v) : I > 0 && (A = Math.floor(d + I)), (Math.abs(c - R) > 2 || Math.abs(d - A) > 2) && (this.ctx.adjustPositioning = !0, this.ctx.setScroll(R, A), this.ctx.emit("adjustBoundaryPosition", i));
   }
@@ -4725,14 +4731,14 @@ class mi {
       o = [Math.max(p, E), Math.min(u, m)], n = [Math.max(w, C), Math.min(y, b)];
       const { BEFORE_SET_AUTOFILL_METHOD: v } = this.ctx.config;
       if (typeof v == "function") {
-        const L = v({
+        const S = v({
           focusCell: this.ctx.focusCell,
           xArr: o,
           yArr: n
         });
-        if (!L)
+        if (!S)
           return;
-        o = L.xArr, n = L.yArr;
+        o = S.xArr, n = S.yArr;
       }
       this.ctx.autofill.xArr = o, this.ctx.autofill.yArr = n, this.ctx.emit("setAutofill", this.ctx.autofill), this.ctx.emit("draw");
     }
@@ -5086,7 +5092,7 @@ const Si = (a) => ({
     }, g = Ht(s), p = Mt(g), u = await o.getDimensions(c), w = g === "y", y = w ? "top" : "left", E = w ? "bottom" : "right", m = w ? "clientHeight" : "clientWidth", C = r.reference[p] + r.reference[g] - x[g] - r.floating[p], b = x[g] - r.reference[g], v = await (o.getOffsetParent == null ? void 0 : o.getOffsetParent(c));
     let O = v ? v[m] : 0;
     (!O || !await (o.isElement == null ? void 0 : o.isElement(v))) && (O = n.floating[m] || r.floating[p]);
-    const L = C / 2 - b / 2, I = O / 2 - u[p] / 2 - 1, R = rt(f[y], I), A = rt(f[E], I), S = R, M = O - u[p] - A, T = O / 2 - u[p] / 2 + L, N = _t(S, T, M), Y = !h.arrow && lt(s) != null && T !== N && r.reference[p] / 2 - (T < S ? R : A) - u[p] / 2 < 0, B = Y ? T < S ? T - S : T - M : 0;
+    const S = C / 2 - b / 2, I = O / 2 - u[p] / 2 - 1, R = rt(f[y], I), A = rt(f[E], I), L = R, M = O - u[p] - A, T = O / 2 - u[p] / 2 + S, N = _t(L, T, M), Y = !h.arrow && lt(s) != null && T !== N && r.reference[p] / 2 - (T < L ? R : A) - u[p] / 2 < 0, B = Y ? T < L ? T - L : T - M : 0;
     return {
       [g]: x[g] + B,
       data: {
@@ -5125,17 +5131,17 @@ const Si = (a) => ({
         return {};
       const y = q(s), E = J(n), m = q(n) === n, C = await (h.isRTL == null ? void 0 : h.isRTL(c.floating)), b = x || (m || !u ? [xt(n)] : vi(n)), v = p !== "none";
       !x && v && b.push(...Ii(n, u, p, C));
-      const O = [n, ...b], L = await le(t, w), I = [];
+      const O = [n, ...b], S = await le(t, w), I = [];
       let R = ((i = r.flip) == null ? void 0 : i.overflows) || [];
-      if (d && I.push(L[y]), f) {
+      if (d && I.push(S[y]), f) {
         const T = bi(s, o, C);
-        I.push(L[T[0]], L[T[1]]);
+        I.push(S[T[0]], S[T[1]]);
       }
       if (R = [...R, {
         placement: s,
         overflows: I
       }], !I.every((T) => T <= 0)) {
-        var A, S;
+        var A, L;
         const T = (((A = r.flip) == null ? void 0 : A.index) || 0) + 1, N = O[T];
         if (N)
           return {
@@ -5147,7 +5153,7 @@ const Si = (a) => ({
               placement: N
             }
           };
-        let Y = (S = R.filter((B) => B.overflows[0] <= 0).sort((B, W) => B.overflows[1] - W.overflows[1])[0]) == null ? void 0 : S.placement;
+        let Y = (L = R.filter((B) => B.overflows[0] <= 0).sort((B, W) => B.overflows[1] - W.overflows[1])[0]) == null ? void 0 : L.placement;
         if (!Y)
           switch (g) {
             case "bestFit": {
@@ -5818,7 +5824,7 @@ class Zi {
     }), this.ctx.on("hoverIconClick", (t) => {
       t.editorType !== "none" && this.editCell(t.rowIndex, t.colIndex);
     }), this.ctx.on("keydown", (t) => {
-      if (!this.ctx.isTarget(t))
+      if (!this.ctx.isTarget(t) || !this.ctx.focusCell)
         return;
       if (t.code === "Escape" && this.ctx.editing) {
         this.cancel = !0;
@@ -5907,7 +5913,7 @@ class Zi {
   }
   initTextEditor() {
     this.inputEl = document.createElement("textarea"), this.inputEl.setAttribute("rows", "1"), this.inputEl.addEventListener("input", this.autoSize.bind(this)), this.inputEl.addEventListener("blur", () => {
-      this.doneEdit(), this.cellTarget = null;
+      this.doneEdit();
     }), this.editorEl = this.ctx.editorElement, this.inputEl.className = "e-virt-table-editor-textarea", this.editorEl.appendChild(this.inputEl), this.ctx.containerElement.appendChild(this.editorEl);
   }
   autoSize() {
@@ -5952,13 +5958,13 @@ class Zi {
     if (!e)
       return;
     const i = this.ctx.focusCell;
-    if (!i || ["index", "index-selection", "selection"].includes(i.type) || this.enable)
+    if (!i || ["index", "index-selection", "selection"].includes(i.type) || this.enable || !(i.isVerticalVisible() && i.isHorizontalVisible()))
       return;
-    const { rowKey: s, key: r, editorType: o } = i;
-    if (o === "none")
+    const { rowKey: r, key: o, editorType: n } = i;
+    if (n === "none")
       return;
-    const n = this.ctx.database.getReadonly(s, r);
-    i && !n && (this.enable = !0, this.ctx.editing = !0, this.cellTarget = i, this.startEditByInput(this.cellTarget, t), this.ctx.emit("startEdit", this.cellTarget));
+    const h = this.ctx.database.getReadonly(r, o);
+    i && !h && (this.enable = !0, this.ctx.editing = !0, this.cellTarget = i, this.startEditByInput(this.cellTarget, t), this.ctx.emit("startEdit", this.cellTarget));
   }
   editCell(t, e) {
     const i = this.ctx.body.renderRows.find((c) => c.rowIndex === t);
@@ -5978,7 +5984,7 @@ class Zi {
     this.enable && (this.doneEditByInput(), this.ctx.emit("doneEdit", this.cellTarget), this.enable = !1, this.ctx.editing = !1, this.ctx.containerElement.focus(), this.editorEl.style.display = "none", this.ctx.emit("drawView"));
   }
   clearEditor() {
-    this.doneEdit(), this.cellTarget = null, this.selectorArrStr = "", this.ctx.clearSelector(), this.ctx.emit("drawView");
+    this.doneEdit(), this.cellTarget = null, this.selectorArrStr = "", this.ctx.clearSelector(), this.ctx.focusCell = void 0, this.ctx.emit("drawView");
   }
   destroy() {
     var t;
@@ -6414,7 +6420,7 @@ class ss {
     });
   }
   async validate(t = !0) {
-    return this.editor.doneEdit(), new Promise(async (e, i) => {
+    return new Promise(async (e, i) => {
       try {
         const s = await this.getValidations();
         e(s);