e-virt-table 1.2.19 → 1.2.20

package/dist/index.es.js

@@ -11,6 +11,8 @@ class te {
     const e = [], { column: i, row: s, key: o, rowKey: r, colIndex: l, rowIndex: a, value: h, field: d, fieldValue: f } = t;
     Array.isArray(this.rules) || (this.rules = [this.rules]);
     for (const x of this.rules) {
+      if (!x.required && (h == null || h === ""))
+        return e;
       if (x.validator) {
         const u = {
           field: d,
@@ -468,7 +470,7 @@ class ut extends Dt {
     if (this.cellType === "footer") {
       let _ = h, S = a;
       if (typeof o == "function") {
-        const v = o, { backgroundColor: b, color: O } = v({
+        const I = o, { backgroundColor: b, color: O } = I({
           row: this.row,
           rowIndex: this.rowIndex,
           colIndex: this.colIndex,
@@ -481,16 +483,16 @@ class ut extends Dt {
       return;
     }
     let w = "transparent";
-    const E = this.ctx.hoverCell, m = this.ctx.currentCell;
-    let y = this.rowIndex, R = this.rowIndex;
+    const E = this.ctx.hoverCell, y = this.ctx.currentCell;
+    let m = this.rowIndex, R = this.rowIndex;
     if (this.rowspan !== 1 && (x || d)) {
       const _ = this.getSpanInfo(), { yArr: S } = _;
-      y = S[0], R = S[1];
+      m = S[0], R = S[1];
     }
-    x && E && (E.rowKey === this.rowKey && (w = u), E.rowIndex >= y && E.rowIndex <= R && (w = u)), d && m && (m.rowKey === this.rowKey && (w = f), m.rowIndex >= y && m.rowIndex <= R && (w = f)), this.drawCellSkyBgColor = w;
-    let C = e, I = l;
-    if (this.ctx.database.getReadonly(this.rowKey, this.key) || (C = i, I = r), p && (this.rowIndex % 2 ? C = g : C = e), typeof s == "function") {
-      const _ = s, { backgroundColor: S, color: v } = _({
+    x && E && (E.rowKey === this.rowKey && (w = u), E.rowIndex >= m && E.rowIndex <= R && (w = u)), d && y && (y.rowKey === this.rowKey && (w = f), y.rowIndex >= m && y.rowIndex <= R && (w = f)), this.drawCellSkyBgColor = w;
+    let C = e, v = l;
+    if (this.ctx.database.getReadonly(this.rowKey, this.key) || (C = i, v = r), p && (this.rowIndex % 2 ? C = g : C = e), typeof s == "function") {
+      const _ = s, { backgroundColor: S, color: I } = _({
         row: this.row,
         rowIndex: this.rowIndex,
         colIndex: this.colIndex,
@@ -498,9 +500,9 @@ class ut extends Dt {
         isHasChanged: this.isHasChanged,
         value: this.getValue()
       }) || {};
-      S && (C = S), v && (I = v);
+      S && (C = S), I && (v = I);
     }
-    this.drawCellBgColor = C, this.drawTextColor = I;
+    this.drawCellBgColor = C, this.drawTextColor = v;
   }
   updateSelection() {
     const { visibleWidth: e, visibleHeight: i, rowspan: s, colspan: o, cellType: r, type: l, rowIndex: a, rowKey: h } = this;
@@ -530,8 +532,8 @@ class ut extends Dt {
       if (l.rowKey === this.rowKey && (a = this.drawX + this.width - s - o, h = this.drawY + (this.height - s) / 2), this.rowspan !== 1 && r) {
         const f = this.getSpanInfo(), { yArr: x } = f, u = x[0], p = x[1];
         if (l.rowIndex >= u && l.rowIndex <= p) {
-          const { width: g, height: w, offsetTop: E, offsetLeft: m } = f;
-          a = this.drawX - m + g - s - o, h = this.drawY - E + (w - s) / 2;
+          const { width: g, height: w, offsetTop: E, offsetLeft: y } = f;
+          a = this.drawX - y + g - s - o, h = this.drawY - E + (w - s) / 2;
         }
       }
       const d = this.ctx.icons.get(this.hoverIconName);
@@ -760,10 +762,10 @@ class ut extends Dt {
   drawBorder(e) {
     const { drawX: i, drawY: s, rowIndex: o, colIndex: r, height: l, width: a } = this;
     let h = i, d = s;
-    const { xArr: f, yArr: x, lineDash: u = [], borderWidth: p = 1, borderColor: g, fillColor: w } = e, E = f[0], m = f[1], y = x[0], R = x[1];
-    if (r >= E && r <= m && o === y) {
-      const C = r === m ? 1 : 0, I = r === E ? 1 : 0;
-      this.ctx.paint.drawLine([h + I, d + 1, h + a - C, d + 1], {
+    const { xArr: f, yArr: x, lineDash: u = [], borderWidth: p = 1, borderColor: g, fillColor: w } = e, E = f[0], y = f[1], m = x[0], R = x[1];
+    if (r >= E && r <= y && o === m) {
+      const C = r === y ? 1 : 0, v = r === E ? 1 : 0;
+      this.ctx.paint.drawLine([h + v, d + 1, h + a - C, d + 1], {
         borderColor: g,
         fillColor: w,
         borderWidth: p,
@@ -772,9 +774,9 @@ class ut extends Dt {
         lineDash: u
       });
     }
-    if (r === m && o >= y && o <= R) {
-      const C = o === y ? 1 : 0, I = o === R ? 1 : 0;
-      this.ctx.paint.drawLine([h + a - 1, d + C, h + a - 1, d + l - I], {
+    if (r === y && o >= m && o <= R) {
+      const C = o === m ? 1 : 0, v = o === R ? 1 : 0;
+      this.ctx.paint.drawLine([h + a - 1, d + C, h + a - 1, d + l - v], {
         borderColor: g,
         fillColor: w,
         borderWidth: p,
@@ -783,9 +785,9 @@ class ut extends Dt {
         lineDash: u
       });
     }
-    if (r >= E && r <= m && o === R) {
-      const C = r === m ? 1 : 0, I = r === E ? 1 : 0;
-      this.ctx.paint.drawLine([h + I, d + l - 1, h + a - C, d + l - 1], {
+    if (r >= E && r <= y && o === R) {
+      const C = r === y ? 1 : 0, v = r === E ? 1 : 0;
+      this.ctx.paint.drawLine([h + v, d + l - 1, h + a - C, d + l - 1], {
         borderColor: g,
         fillColor: w,
         borderWidth: p,
@@ -794,9 +796,9 @@ class ut extends Dt {
         lineDash: u
       });
     }
-    if (r === E && o >= y && o <= R) {
-      const C = o === R ? 1 : 0, I = o === y ? 1 : 0;
-      this.ctx.paint.drawLine([h + 1, d + I, h + 1, d + l - C], {
+    if (r === E && o >= m && o <= R) {
+      const C = o === R ? 1 : 0, v = o === m ? 1 : 0;
+      this.ctx.paint.drawLine([h + 1, d + v, h + 1, d + l - C], {
         borderColor: g,
         fillColor: w,
         borderWidth: p,
@@ -871,12 +873,12 @@ class ae {
       const u = s._height || a, p = s._readonly;
       let g = !0;
       if (typeof h == "function" && (g = h), d) {
-        const m = s[d];
-        if (this.checkboxKeyMap.has(m)) {
-          const y = this.checkboxKeyMap.get(m) || [];
-          y.push(x), this.checkboxKeyMap.set(m, y);
+        const y = s[d];
+        if (this.checkboxKeyMap.has(y)) {
+          const m = this.checkboxKeyMap.get(y) || [];
+          m.push(x), this.checkboxKeyMap.set(y, m);
         } else
-          this.checkboxKeyMap.set(m, [x]);
+          this.checkboxKeyMap.set(y, [x]);
       }
       this.selectionMap.set(x, {
         key: d ? s[d] : x,
@@ -1100,56 +1102,54 @@ class ae {
    * @param history
    * @returns
    */
-  async batchSetItemValue(t, e = !1, i = !0) {
-    let s = [];
-    const o = /* @__PURE__ */ new Set();
-    let r = [], l = t.map((d) => {
-      const { rowKey: f, key: x } = d;
-      let u = d.value, p = u;
-      const g = this.getRowDataItemForRowKey(f), w = this.getItemValue(f, x), E = this.getVirtualBodyCellByKey(f, x);
-      return (E == null ? void 0 : E.type) === "number" && (["", void 0, null].includes(u) ? p = null : /^-?\d+(\.\d+)?$/.test(`${u}`) ? p = Number(u) : (p = w, r.push({
-        ...d,
-        value: p,
-        oldValue: w,
-        row: g
+  async batchSetItemValue(t, e = !1, i = !0, s = "none") {
+    let o = [], r = i;
+    const l = /* @__PURE__ */ new Set();
+    let a = [], h = t.map((u) => {
+      const { rowKey: p, key: g } = u;
+      let w = u.value, E = w;
+      const y = this.getRowDataItemForRowKey(p), m = this.getItemValue(p, g), R = this.getVirtualBodyCellByKey(p, g);
+      return (R == null ? void 0 : R.type) === "number" && (["", void 0, null].includes(w) ? E = null : /^-?\d+(\.\d+)?$/.test(`${w}`) ? E = Number(w) : (E = m, a.push({
+        ...u,
+        value: E,
+        oldValue: m,
+        row: y
       }))), {
-        ...d,
-        value: p,
-        oldValue: w,
-        row: g
+        ...u,
+        value: E,
+        oldValue: m,
+        row: y
       };
     });
-    if (l = l.filter((d) => !r.some((f) => d.rowKey === f.rowKey && d.key === f.key)), r.length) {
-      const d = {
+    if (h = h.filter((u) => !a.some((p) => u.rowKey === p.rowKey && u.key === p.key)), a.length) {
+      const u = {
         code: "ERR_BATCH_SET_NUMBER_VALUE",
         message: "Assignment failed, not a numeric type",
-        data: r
+        data: a
       };
-      this.ctx.emit("error", d);
+      this.ctx.emit("error", u);
     }
-    if (!l.length)
+    if (!h.length)
       return;
-    const { BEFORE_VALUE_CHANGE_METHOD: a } = this.ctx.config;
-    typeof a == "function" && (l = await a(l)), l.forEach((d) => {
-      const { value: f, rowKey: x, key: u, oldValue: p } = d;
-      o.add(x), this.setItemValue(x, u, f, !1, !1, !1, i), s.push({
-        rowKey: x,
-        key: u,
-        oldValue: p,
-        newValue: f
+    const { BEFORE_VALUE_CHANGE_METHOD: d } = this.ctx.config;
+    s === "none" && typeof d == "function" && (h = await d(h), r = !1), h.forEach((u) => {
+      const { value: p, rowKey: g, key: w } = u, E = this.getItemValue(g, w);
+      l.add(g), this.setItemValue(g, w, p, !1, !1, !1, r), o.push({
+        rowKey: g,
+        key: w,
+        oldValue: E,
+        newValue: p
       });
     });
-    let h = [];
-    if (o.forEach((d) => {
-      h.push(this.ctx.database.getRowDataItemForRowKey(d));
-    }), i) {
-      const d = l.map(({ rowKey: f, key: x }) => this.getValidator(f, x));
-      Promise.all(d).then(() => {
-        this.validationErrorMap.size === 0 && this.changedDataMap.size > 0 && this.ctx.emit("validateChangedData", this.getChangedData());
-      }), this.ctx.emit("change", l, h);
-    }
-    e && this.ctx.history.pushState({
-      changeList: s,
+    let f = [];
+    l.forEach((u) => {
+      f.push(this.ctx.database.getRowDataItemForRowKey(u));
+    });
+    const x = h.map(({ rowKey: u, key: p }) => this.getValidator(u, p));
+    Promise.all(x).then(() => {
+      this.validationErrorMap.size === 0 && this.changedDataMap.size > 0 && this.ctx.emit("validateChangedData", this.getChangedData());
+    }), this.ctx.emit("change", h, f), e && this.ctx.history.pushState({
+      changeList: o,
       scrollX: this.ctx.scrollX,
       scrollY: this.ctx.scrollY,
       type: "multiple"
@@ -1189,7 +1189,7 @@ class ae {
           d = Number(i);
         else {
           d = h;
-          const E = {
+          const w = {
             code: "ERR_SET_NUMBER_VALUE",
             message: "Assignment failed, not a numeric type",
             data: [
@@ -1202,37 +1202,23 @@ class ae {
               }
             ]
           };
-          this.ctx.emit("error", E);
+          this.ctx.emit("error", w);
         }
       if (d === h)
         return {
           oldValue: h,
           newValue: h
         };
-      const { BEFORE_VALUE_CHANGE_METHOD: g } = this.ctx.config;
-      if (typeof g == "function") {
-        const m = await g([
-          {
-            rowKey: t,
-            key: e,
-            value: d,
-            oldValue: a[e],
-            row: u
-          }
-        ]);
-        m && m.length && (d = m[0].value);
-      }
-      this.changedDataMap.set(f, d), a[e] = d;
-      const w = {
-        rowKey: t,
-        key: e,
-        oldValue: h,
-        value: d,
-        row: u
-      };
-      l && (this.getValidator(t, e).then(() => {
-        this.validationErrorMap.size === 0 && this.changedDataMap.size > 0 && this.ctx.emit("validateChangedData", this.getChangedData());
-      }), this.ctx.emit("change", [w], [u])), this.ctx.emit("editChange", {
+      let g = [
+        {
+          rowKey: t,
+          key: e,
+          value: d,
+          oldValue: h,
+          row: u
+        }
+      ];
+      this.batchSetItemValue(g, s, !1), this.ctx.emit("editChange", {
         rowKey: t,
         key: e,
         oldValue: h,
@@ -1249,18 +1235,6 @@ class ae {
       value: d,
       originalValue: this.originalDataMap.get(f),
       row: u
-    }), s && this.ctx.history.pushState({
-      type: "single",
-      scrollX: this.ctx.scrollX,
-      scrollY: this.ctx.scrollY,
-      changeList: [
-        {
-          rowKey: t,
-          key: e,
-          oldValue: h,
-          newValue: d
-        }
-      ]
     }), o && this.ctx.emit("draw"), {
       oldValue: h,
       newValue: d
@@ -1588,29 +1562,29 @@ class ae {
           }
         ]
       };
-    let w = e, E = e, m = l, y = l, R = [], C = 0, I = 0, _ = 0, S = 0;
+    let w = e, E = e, y = l, m = l, R = [], C = 0, v = 0, _ = 0, S = 0;
     if (d !== 1 && p) {
       S = x;
-      const v = a.reduce((b, O) => {
+      const I = a.reduce((b, O) => {
         const L = this.getItemValue(s, O) ?? "";
         return `${b}${L}`;
       }, "");
       for (let b = e - 1; b >= 0; b--) {
         const O = this.rowIndexRowKeyMap.get(b) || "", L = a.reduce((M, T) => {
-          const X = this.getItemValue(O, T) ?? "";
-          return `${M}${X}`;
+          const k = this.getItemValue(O, T) ?? "";
+          return `${M}${k}`;
         }, "");
-        if (v === L)
+        if (I === L)
           w = b;
         else
           break;
       }
       for (let b = e; b <= this.ctx.maxRowIndex; b++) {
         const O = this.rowIndexRowKeyMap.get(b) || "", L = a.reduce((M, T) => {
-          const X = this.getItemValue(O, T) ?? "";
-          return `${M}${X}`;
+          const k = this.getItemValue(O, T) ?? "";
+          return `${M}${k}`;
         }, "");
-        if (v === L)
+        if (I === L)
           E = b;
         else
           break;
@@ -1633,34 +1607,34 @@ class ae {
     }
     if (u !== 1 && g) {
       _ = f;
-      for (let v = l - 1; v >= 0; v--) {
-        const b = this.getColumnByColIndex(v);
+      for (let I = l - 1; I >= 0; I--) {
+        const b = this.getColumnByColIndex(I);
         if (!b)
           break;
         const O = this.getItemValue(s, i), L = this.getItemValue(s, b.key);
         if (O === L && h.includes(b.key))
-          m = v;
+          y = I;
         else
           break;
       }
-      for (let v = l; v <= this.ctx.maxColIndex; v++) {
-        const b = this.getColumnByColIndex(v);
+      for (let I = l; I <= this.ctx.maxColIndex; I++) {
+        const b = this.getColumnByColIndex(I);
         if (!b)
           break;
         const O = this.getItemValue(s, i), L = this.getItemValue(s, b.key);
         if (O === L && h.includes(b.key))
-          y = v;
+          m = I;
         else
           break;
       }
-      for (let v = m; v < l; v++) {
-        const b = this.getColumnByColIndex(v);
+      for (let I = y; I < l; I++) {
+        const b = this.getColumnByColIndex(I);
         if (!b)
           break;
-        I += b.width || 100;
+        v += b.width || 100;
       }
-      for (let v = m; v <= y; v++) {
-        const b = this.getColumnByColIndex(v);
+      for (let I = y; I <= m; I++) {
+        const b = this.getColumnByColIndex(I);
         if (!b)
           break;
         S += b.width || 100, R.push({
@@ -1672,14 +1646,14 @@ class ae {
       }
     }
     return {
-      xArr: [m, y],
+      xArr: [y, m],
       yArr: [w, E],
       rowspan: d,
       colspan: u,
       height: _,
       width: S,
       offsetTop: C,
-      offsetLeft: I,
+      offsetLeft: v,
       dataList: R
     };
   }
@@ -1778,7 +1752,7 @@ class he {
         value: o.oldValue,
         row: {}
       }));
-      this.ctx.setScroll(e, i), this.ctx.database.batchSetItemValue(s, !1, !1), this.historyIndex -= 1;
+      this.ctx.setScroll(e, i), this.ctx.database.batchSetItemValue(s, !1, !1, "back"), this.historyIndex -= 1;
     }
   }
   // 前进
@@ -1791,7 +1765,7 @@ class he {
         value: i.newValue,
         row: {}
       }));
-      this.ctx.database.batchSetItemValue(e, !1, !1);
+      this.ctx.database.batchSetItemValue(e, !1, !1, "forward");
     }
   }
   // 清空历史
@@ -2452,7 +2426,7 @@ class xe {
     return this.icons.get(t);
   }
 }
-class Xt extends Dt {
+class kt extends Dt {
   constructor(e, i, s, o, r, l, a) {
     super(e, s, o, r, l, "header", a.fixed);
     n(this, "align");
@@ -2672,7 +2646,7 @@ class ue {
    */
   selectionClick(t) {
     if (["selection", "index-selection"].includes(t.type) && this.ctx.isPointer)
-      if (t instanceof Xt)
+      if (t instanceof kt)
         t.drawImageName === "checkbox-uncheck" || t.drawImageName === "checkbox-indeterminate" ? this.ctx.database.toggleAllSelection() : t.drawImageName === "checkbox-check" && this.ctx.database.clearSelection(!0);
       else {
         if (!this.ctx.database.getRowSelectable(t.rowKey))
@@ -3357,7 +3331,7 @@ class pe {
       const l = t[r], a = o * (l.rowspan || 0), h = o * (l.level || 0);
       let { minWidth: d, maxWidth: f } = l, x = l.width || 100;
       d && x < d && (x = d), f && x > f && (x = f), l.children && (x = et(l.children).reduce((g, w) => g + ((w == null ? void 0 : w.width) || 100), 0));
-      const u = new Xt(this.ctx, this.columnIndex, s, h, x, a, l);
+      const u = new kt(this.ctx, this.columnIndex, s, h, x, a, l);
       this.ctx.database.setHeader(l.key, u), this.allCellHeaders.push(u), l.children || (this.leafCellHeaders.push(u), u.column.widthFillDisable || this.resizeNum++), l.fixed === "left" ? this.fixedLeftCellHeaders.push(u) : l.fixed === "right" ? this.fixedRightCellHeaders.push(u) : this.centerCellHeaders.push(u), !l.children && this.columnIndex++, l.children && this.render(l.children, s), s += x;
     }
   }
@@ -3431,7 +3405,7 @@ class pe {
     }), this.drawTipLine(), this.drawBottomLine();
   }
 }
-class Bt {
+class Xt {
   constructor(t, e, i = 0, s = 0, o = 0, r = 0, l, a = "body") {
     n(this, "ctx");
     n(this, "x", 0);
@@ -3540,16 +3514,16 @@ class Ee {
     let w = this.height + e.height + r;
     w += g;
     let E = w;
-    const m = window.innerHeight, { top: y } = this.containerRect || this.ctx.containerElement.getBoundingClientRect();
-    if (m > y && d && !l) {
-      const L = m - y - f;
+    const y = window.innerHeight, { top: m } = this.containerRect || this.ctx.containerElement.getBoundingClientRect();
+    if (y > m && d && !l) {
+      const L = y - m - f;
       L > e.height + r ? E = L : w > h && (E = h);
     } else this.data.length && l ? E = l : this.data.length && h && w > h && (E = h);
     E > 0 && (this.ctx.stageHeight = Math.floor(E), this.ctx.stageElement.style.height = `${this.ctx.stageHeight}px`);
     let R = this.ctx.stageHeight - e.height - r;
     o ? this.visibleHeight = R - g : this.visibleHeight = R, this.data.length || (this.height = this.visibleHeight), 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 = u;
-    const C = window.devicePixelRatio || 1, I = this.ctx.stageWidth * C, _ = this.ctx.stageHeight * C;
-    t.width = Math.round(I), t.height = Math.round(_);
+    const C = window.devicePixelRatio || 1, v = this.ctx.stageWidth * C, _ = this.ctx.stageHeight * C;
+    t.width = Math.round(v), t.height = Math.round(_);
     const S = this.data.length ? "not-empty" : "empty";
     this.ctx.emit("emptyChange", {
       isEmpty: S,
@@ -3560,8 +3534,8 @@ class Ee {
       width: this.width,
       height: this.data.length ? 0 : a + g
     });
-    const v = Math.round(t.width / C * 1e4) / 1e4, b = Math.round(t.height / C * 1e4) / 1e4;
-    this.ctx.canvasElement.setAttribute("style", `height:${b}px;width:${v}px;`), this.ctx.paint.scale(C);
+    const I = Math.round(t.width / C * 1e4) / 1e4, b = Math.round(t.height / C * 1e4) / 1e4;
+    this.ctx.canvasElement.setAttribute("style", `height:${b}px;width:${I}px;`), this.ctx.paint.scale(C);
   }
   // 调整行的高度
   initResizeRow() {
@@ -3687,7 +3661,7 @@ class Ee {
     this.headIndex = Math.max(0, a), this.tailIndex = Math.min(this.ctx.maxRowIndex, h + 1), this.visibleRows = r.slice(this.headIndex, this.tailIndex + 1), this.ctx.body.headIndex = this.headIndex, this.ctx.body.tailIndex = this.tailIndex, this.ctx.body.visibleRows = this.visibleRows;
     const d = [];
     for (let f = 0; f < this.visibleRows.length; f++) {
-      const x = this.headIndex + f, u = this.visibleRows[f], { height: p, top: g } = this.ctx.database.getPositionForRowIndex(x), w = new Bt(this.ctx, x, 0, g + this.y, t.width, p, u);
+      const x = this.headIndex + f, u = this.visibleRows[f], { height: p, top: g } = this.ctx.database.getPositionForRowIndex(x), w = new Xt(this.ctx, x, 0, g + this.y, t.width, p, u);
       d.push(w);
     }
     this.renderRows = d, this.ctx.body.renderRows = d;
@@ -3759,7 +3733,7 @@ class me {
     let e = this.y;
     const i = [];
     this.data.forEach((s, o) => {
-      const r = new Bt(this.ctx, o, 0, e, this.width, t, s, "footer");
+      const r = new Xt(this.ctx, o, 0, e, this.width, t, s, "footer");
       e += t, i.push(r);
     }), this.renderRows = i, this.ctx.footer.renderRows = this.renderRows;
   }
@@ -3908,14 +3882,14 @@ class ye {
         SELECTOR_AREA_MAX_X_OFFSET: f,
         SELECTOR_AREA_MAX_Y_OFFSET: x
       } = this.ctx.config, u = l, p = a || this.ctx.maxColIndex - f, g = h, w = d || this.ctx.maxRowIndex - x;
-      let [E, m] = o, [y, R] = r;
-      if (E < u || m > p || y < g || R > w)
+      let [E, y] = o, [m, R] = r;
+      if (E < u || y > p || m < g || R > w)
         return;
       if (this.ctx.stageElement.focus({ preventScroll: !0 }), this.ctx.config.ENABLE_MERGE_CELL_LINK) {
-        const I = this.adjustMergeCells(o, r);
-        y = I.yArr[0], R = I.yArr[1], E = I.xArr[0], m = I.xArr[1], this.ctx.onlyMergeCell = I.onlyMergeCell;
+        const v = this.adjustMergeCells(o, r);
+        m = v.yArr[0], R = v.yArr[1], E = v.xArr[0], y = v.xArr[1], this.ctx.onlyMergeCell = v.onlyMergeCell;
       }
-      E === m && y === R ? this.ctx.selectOnlyOne = !0 : this.ctx.selectOnlyOne = !1, o = [Math.max(u, E), Math.min(p, m)], r = [Math.max(g, y), Math.min(w, R)];
+      E === y && m === R ? this.ctx.selectOnlyOne = !0 : this.ctx.selectOnlyOne = !1, o = [Math.max(u, E), Math.min(p, y)], r = [Math.max(g, m), Math.min(w, R)];
       const { BEFORE_SET_SELECTOR_METHOD: C } = this.ctx.config;
       if (typeof C == "function") {
         const _ = C({
@@ -3936,13 +3910,13 @@ class ye {
     let l = [], a = [];
     for (let g = 0; g <= e[1] - e[0]; g++)
       for (let w = 0; w <= t[1] - t[0]; w++) {
-        const E = g + e[0], m = w + t[0], y = this.ctx.database.getVirtualBodyCell(E, m);
-        y && ((E === i || E === s) && l.push(y), (m === o || m === r) && a.push(y));
+        const E = g + e[0], y = w + t[0], m = this.ctx.database.getVirtualBodyCell(E, y);
+        m && ((E === i || E === s) && l.push(m), (y === o || y === r) && a.push(m));
       }
     const h = l.reduce(
       (g, w) => {
-        const { yArr: E } = w.getSpanInfo(), [m, y] = E;
-        return g.minY = Math.min(g.minY, m), g.maxY = Math.max(g.maxY, y), g;
+        const { yArr: E } = w.getSpanInfo(), [y, m] = E;
+        return g.minY = Math.min(g.minY, y), g.maxY = Math.max(g.maxY, m), g;
       },
       {
         minY: i,
@@ -3950,8 +3924,8 @@ class ye {
       }
     ), d = a.reduce(
       (g, w) => {
-        const { xArr: E } = w.getSpanInfo(), [m, y] = E;
-        return g.minX = Math.min(g.minX, m), g.maxX = Math.max(g.maxX, y), g;
+        const { xArr: E } = w.getSpanInfo(), [y, m] = E;
+        return g.minX = Math.min(g.minX, y), g.maxX = Math.max(g.maxX, m), g;
       },
       {
         minX: o,
@@ -4153,23 +4127,23 @@ class ye {
         });
         const g = r.length === 1 && r[0].length === 1;
         if (this.ctx.config.ENABLE_MERGE_CELL_LINK && this.ctx.database.hasMergeCell(l, a) && !g) {
-          const y = {
+          const m = {
             code: "ERR_MERGED_CELLS_PASTE",
             message: "Merged cells cannot span paste data"
           };
-          this.ctx.hasEvent("error") ? this.ctx.emit("error", y) : alert(y.message);
+          this.ctx.hasEvent("error") ? this.ctx.emit("error", m) : alert(m.message);
           return;
         }
         let w = [];
-        for (let y = 0; y <= r.length - 1; y++) {
-          const R = r[y].length;
+        for (let m = 0; m <= r.length - 1; m++) {
+          const R = r[m].length;
           for (let C = 0; C <= R - 1; C++) {
-            const I = y + e, _ = C + i, S = r[y][C], v = this.ctx.database.getItemValueForRowIndexAndColIndex(
-              I,
+            const v = m + e, _ = C + i, S = r[m][C], I = this.ctx.database.getItemValueForRowIndexAndColIndex(
+              v,
               _
             );
-            if (v) {
-              const { rowKey: b, key: O } = v;
+            if (I) {
+              const { rowKey: b, key: O } = I;
               this.ctx.database.getReadonly(b, O) || (s.add(b), w.push({
                 rowKey: b,
                 key: O,
@@ -4181,13 +4155,13 @@ class ye {
           }
         }
         if (this.isCut) {
-          const y = this.clearSelectedData(
+          const m = this.clearSelectedData(
             this.ctx.selector.xArrCopy,
             this.ctx.selector.yArrCopy,
             !0
             // 忽略设置，只返回数据，用于cut，实现历史回退需要返回两次问题
           ), R = w.map((C) => `${C.rowKey}-${C.key}`);
-          y.forEach((C) => {
+          m.forEach((C) => {
             R.includes(`${C.rowKey}-${C.key}`) || w.unshift(C);
           }), this.isCut = !1;
         }
@@ -4195,21 +4169,21 @@ class ye {
           return;
         const { BEFORE_PASTE_DATA_METHOD: E } = this.ctx.config;
         if (typeof E == "function") {
-          const y = E, R = w.map((C) => ({
+          const m = E, R = w.map((C) => ({
             rowKey: C.rowKey,
             key: C.key,
             value: C.value,
             oldValue: this.ctx.database.getItemValue(C.rowKey, C.key),
             row: this.ctx.database.getRowDataItemForRowKey(C.rowKey)
           }));
-          if (w = await y(R, l, a, r), w && !w.length)
+          if (w = await m(R, l, a, r), w && !w.length)
             return;
         }
         this.clearCopyLine(), this.ctx.batchSetItemValueByEditor(w, !0);
-        let m = [];
-        s.forEach((y) => {
-          m.push(this.ctx.database.getRowDataItemForRowKey(y));
-        }), this.ctx.emit("pasteChange", w, m);
+        let y = [];
+        s.forEach((m) => {
+          y.push(this.ctx.database.getRowDataItemForRowKey(m));
+        }), this.ctx.emit("pasteChange", w, y);
       }).catch((o) => {
         console.error("Failed to get the clipboard content:", o);
       });
@@ -4303,14 +4277,14 @@ class ye {
     if (!i)
       return;
     p && this.ctx.onlyMergeCell && i.updateSpanInfo();
-    const { drawX: g, drawY: w, width: E, height: m, fixed: y } = i, R = o - g + 1, C = i.drawX + E - (e - s) + 1;
-    let I = r.height - w, _ = m;
+    const { drawX: g, drawY: w, width: E, height: y, fixed: m } = i, R = o - g + 1, C = i.drawX + E - (e - s) + 1;
+    let v = r.height - w, _ = y;
     _ > a.visibleHeight && (_ = a.visibleHeight);
     let S = 0;
-    x && (u === "top" ? I = r.height + l.height - w : S = l.visibleHeight);
-    const v = w + _ - (t - S - f);
+    x && (u === "top" ? v = r.height + l.height - w : S = l.visibleHeight);
+    const I = w + _ - (t - S - f);
     let b = h, O = d;
-    C > 0 && !y ? b = Math.floor(h + C) : R > 0 && !y && (b = Math.floor(h - R)), I > 0 ? O = Math.floor(d - I) : v > 0 && (O = Math.floor(d + v)), (Math.abs(h - b) > 2 || Math.abs(d - O) > 2) && (this.ctx.adjustPositioning = !0, this.ctx.setScroll(b, O), this.ctx.emit("adjustBoundaryPosition", i));
+    C > 0 && !m ? b = Math.floor(h + C) : R > 0 && !m && (b = Math.floor(h - R)), v > 0 ? O = Math.floor(d - v) : I > 0 && (O = Math.floor(d + I)), (Math.abs(h - b) > 2 || Math.abs(d - O) > 2) && (this.ctx.adjustPositioning = !0, this.ctx.setScroll(b, O), this.ctx.emit("adjustBoundaryPosition", i));
   }
   destroy() {
     this.timerX && (clearTimeout(this.timerX), this.timerX = 0), this.timerY && (clearTimeout(this.timerY), this.timerY = 0);
@@ -4375,13 +4349,13 @@ class Ce {
         SELECTOR_AREA_MAX_X_OFFSET: x,
         SELECTOR_AREA_MAX_Y_OFFSET: u
       } = this.ctx.config, p = a, g = h || this.ctx.maxColIndex - x, w = d, E = f || this.ctx.maxRowIndex - u;
-      let [m, y] = r, [R, C] = l;
-      if (m < p || R < w)
+      let [y, m] = r, [R, C] = l;
+      if (y < p || R < w)
         return;
-      r = [Math.max(p, m), Math.min(g, y)], l = [Math.max(w, R), Math.min(E, C)];
-      const { BEFORE_SET_AUTOFILL_METHOD: I } = this.ctx.config;
-      if (typeof I == "function") {
-        const S = I({
+      r = [Math.max(p, y), Math.min(g, m)], l = [Math.max(w, R), Math.min(E, C)];
+      const { BEFORE_SET_AUTOFILL_METHOD: v } = this.ctx.config;
+      if (typeof v == "function") {
+        const S = v({
           focusCell: this.ctx.focusCell,
           xArr: r,
           yArr: l
@@ -4415,9 +4389,9 @@ class Ce {
     let d = [];
     for (let u = 0; u <= a[1] - a[0]; u++)
       for (let p = 0; p <= l[1] - l[0]; p++) {
-        const g = p + l[0], w = u + a[0], E = s[u % r][p % o], m = this.ctx.database.getItemValueForRowIndexAndColIndex(w, g), y = `${w}-${g}`;
-        if (m && !i.has(y)) {
-          const { rowKey: R, key: C } = m;
+        const g = p + l[0], w = u + a[0], E = s[u % r][p % o], y = this.ctx.database.getItemValueForRowIndexAndColIndex(w, g), m = `${w}-${g}`;
+        if (y && !i.has(m)) {
+          const { rowKey: R, key: C } = y;
           this.ctx.database.getReadonly(R, C) || (t.add(R), d.push({
             rowKey: R,
             key: C,
@@ -4459,7 +4433,7 @@ class Ce {
   destroy() {
   }
 }
-const Z = Math.min, z = Math.max, it = Math.round, V = (c) => ({
+const Z = Math.min, z = Math.max, it = Math.round, W = (c) => ({
   x: c,
   y: c
 }), be = {
@@ -4483,7 +4457,7 @@ function P(c) {
 function Q(c) {
   return c.split("-")[1];
 }
-function kt(c) {
+function Bt(c) {
   return c === "x" ? "y" : "x";
 }
 function gt(c) {
@@ -4493,15 +4467,15 @@ function G(c) {
   return ["top", "bottom"].includes(P(c)) ? "y" : "x";
 }
 function wt(c) {
-  return kt(G(c));
+  return Bt(G(c));
 }
-function ve(c, t, e) {
+function Ie(c, t, e) {
   e === void 0 && (e = !1);
   const i = Q(c), s = wt(c), o = gt(s);
   let r = s === "x" ? i === (e ? "end" : "start") ? "right" : "left" : i === "start" ? "bottom" : "top";
   return t.reference[o] > t.floating[o] && (r = st(r)), [r, st(r)];
 }
-function Ie(c) {
+function ve(c) {
   const t = st(c);
   return [ct(c), t, ct(t)];
 }
@@ -4564,7 +4538,7 @@ function ot(c) {
     y: e
   };
 }
-function vt(c, t, e) {
+function It(c, t, e) {
   let {
     reference: i,
     floating: s
@@ -4626,14 +4600,14 @@ const Le = async (c, t, e) => {
   }), {
     x: d,
     y: f
-  } = vt(h, i, a), x = i, u = {}, p = 0;
+  } = It(h, i, a), x = i, u = {}, p = 0;
   for (let g = 0; g < l.length; g++) {
     const {
       name: w,
       fn: E
     } = l[g], {
-      x: m,
-      y,
+      x: y,
+      y: m,
       data: R,
       reset: C
     } = await E({
@@ -4650,7 +4624,7 @@ const Le = async (c, t, e) => {
         floating: t
       }
     });
-    d = m ?? d, f = y ?? f, u = {
+    d = y ?? d, f = m ?? f, u = {
       ...u,
       [w]: {
         ...u[w],
@@ -4663,7 +4637,7 @@ const Le = async (c, t, e) => {
     }) : C.rects), {
       x: d,
       y: f
-    } = vt(h, x, a)), g = -1);
+    } = It(h, x, a)), g = -1);
   }
   return {
     x: d,
@@ -4694,12 +4668,12 @@ async function Nt(c, t) {
     boundary: h,
     rootBoundary: d,
     strategy: a
-  })), m = f === "floating" ? {
+  })), y = f === "floating" ? {
     x: i,
     y: s,
     width: r.floating.width,
     height: r.floating.height
-  } : r.reference, y = await (o.getOffsetParent == null ? void 0 : o.getOffsetParent(l.floating)), R = await (o.isElement == null ? void 0 : o.isElement(y)) ? await (o.getScale == null ? void 0 : o.getScale(y)) || {
+  } : r.reference, m = await (o.getOffsetParent == null ? void 0 : o.getOffsetParent(l.floating)), R = await (o.isElement == null ? void 0 : o.isElement(m)) ? await (o.getScale == null ? void 0 : o.getScale(m)) || {
     x: 1,
     y: 1
   } : {
@@ -4707,10 +4681,10 @@ async function Nt(c, t) {
     y: 1
   }, C = ot(o.convertOffsetParentRelativeRectToViewportRelativeRect ? await o.convertOffsetParentRelativeRectToViewportRelativeRect({
     elements: l,
-    rect: m,
-    offsetParent: y,
+    rect: y,
+    offsetParent: m,
     strategy: a
-  }) : m);
+  }) : y);
   return {
     top: (E.top - C.top + p.top) / R.y,
     bottom: (C.bottom - E.bottom + p.bottom) / R.y,
@@ -4739,17 +4713,17 @@ const Te = (c) => ({
     const f = Kt(d), x = {
       x: e,
       y: i
-    }, u = wt(s), p = gt(u), g = await r.getDimensions(h), w = u === "y", E = w ? "top" : "left", m = w ? "bottom" : "right", y = w ? "clientHeight" : "clientWidth", R = o.reference[p] + o.reference[u] - x[u] - o.floating[p], C = x[u] - o.reference[u], I = await (r.getOffsetParent == null ? void 0 : r.getOffsetParent(h));
-    let _ = I ? I[y] : 0;
-    (!_ || !await (r.isElement == null ? void 0 : r.isElement(I))) && (_ = l.floating[y] || o.floating[p]);
-    const S = R / 2 - C / 2, v = _ / 2 - g[p] / 2 - 1, b = Z(f[E], v), O = Z(f[m], v), L = b, M = _ - g[p] - O, T = _ / 2 - g[p] / 2 + S, X = ht(L, T, M), K = !a.arrow && Q(s) != null && T !== X && o.reference[p] / 2 - (T < L ? b : O) - g[p] / 2 < 0, B = K ? T < L ? T - L : T - M : 0;
+    }, u = wt(s), p = gt(u), g = await r.getDimensions(h), w = u === "y", E = w ? "top" : "left", y = w ? "bottom" : "right", m = w ? "clientHeight" : "clientWidth", R = o.reference[p] + o.reference[u] - x[u] - o.floating[p], C = x[u] - o.reference[u], v = await (r.getOffsetParent == null ? void 0 : r.getOffsetParent(h));
+    let _ = v ? v[m] : 0;
+    (!_ || !await (r.isElement == null ? void 0 : r.isElement(v))) && (_ = l.floating[m] || o.floating[p]);
+    const S = R / 2 - C / 2, I = _ / 2 - g[p] / 2 - 1, b = Z(f[E], I), O = Z(f[y], I), L = b, M = _ - g[p] - O, T = _ / 2 - g[p] / 2 + S, k = ht(L, T, M), K = !a.arrow && Q(s) != null && T !== k && o.reference[p] / 2 - (T < L ? b : O) - g[p] / 2 < 0, X = K ? T < L ? T - L : T - M : 0;
     return {
-      [u]: x[u] + B,
+      [u]: x[u] + X,
       data: {
-        [u]: X,
-        centerOffset: T - X - B,
+        [u]: k,
+        centerOffset: T - k - X,
         ...K && {
-          alignmentOffset: B
+          alignmentOffset: X
         }
       },
       reset: K
@@ -4779,45 +4753,45 @@ const Te = (c) => ({
       } = J(c, t);
       if ((e = o.arrow) != null && e.alignmentOffset)
         return {};
-      const E = P(s), m = G(l), y = P(l) === l, R = await (a.isRTL == null ? void 0 : a.isRTL(h.floating)), C = x || (y || !g ? [st(l)] : Ie(l)), I = p !== "none";
-      !x && I && C.push(...Oe(l, g, p, R));
-      const _ = [l, ...C], S = await Nt(t, w), v = [];
+      const E = P(s), y = G(l), m = P(l) === l, R = await (a.isRTL == null ? void 0 : a.isRTL(h.floating)), C = x || (m || !g ? [st(l)] : ve(l)), v = p !== "none";
+      !x && v && C.push(...Oe(l, g, p, R));
+      const _ = [l, ...C], S = await Nt(t, w), I = [];
       let b = ((i = o.flip) == null ? void 0 : i.overflows) || [];
-      if (d && v.push(S[E]), f) {
-        const T = ve(s, r, R);
-        v.push(S[T[0]], S[T[1]]);
+      if (d && I.push(S[E]), f) {
+        const T = Ie(s, r, R);
+        I.push(S[T[0]], S[T[1]]);
       }
       if (b = [...b, {
         placement: s,
-        overflows: v
-      }], !v.every((T) => T <= 0)) {
+        overflows: I
+      }], !I.every((T) => T <= 0)) {
         var O, L;
-        const T = (((O = o.flip) == null ? void 0 : O.index) || 0) + 1, X = _[T];
-        if (X)
+        const T = (((O = o.flip) == null ? void 0 : O.index) || 0) + 1, k = _[T];
+        if (k)
           return {
             data: {
               index: T,
               overflows: b
             },
             reset: {
-              placement: X
+              placement: k
             }
           };
-        let K = (L = b.filter((B) => B.overflows[0] <= 0).sort((B, Y) => B.overflows[1] - Y.overflows[1])[0]) == null ? void 0 : L.placement;
+        let K = (L = b.filter((X) => X.overflows[0] <= 0).sort((X, Y) => X.overflows[1] - Y.overflows[1])[0]) == null ? void 0 : L.placement;
         if (!K)
           switch (u) {
             case "bestFit": {
               var M;
-              const B = (M = b.filter((Y) => {
-                if (I) {
+              const X = (M = b.filter((Y) => {
+                if (v) {
                   const F = G(Y.placement);
-                  return F === m || // Create a bias to the `y` side axis due to horizontal
+                  return F === y || // Create a bias to the `y` side axis due to horizontal
                   // reading directions favoring greater width.
                   F === "y";
                 }
                 return !0;
               }).map((Y) => [Y.placement, Y.overflows.filter((F) => F > 0).reduce((F, qt) => F + qt, 0)]).sort((Y, F) => Y[1] - F[1])[0]) == null ? void 0 : M[0];
-              B && (K = B);
+              X && (K = X);
               break;
             }
             case "initialPlacement":
@@ -4900,11 +4874,11 @@ const He = function(c) {
           fn: (w) => {
             let {
               x: E,
-              y: m
+              y
             } = w;
             return {
               x: E,
-              y: m
+              y
             };
           }
         },
@@ -4912,15 +4886,15 @@ const He = function(c) {
       } = J(c, t), h = {
         x: e,
         y: i
-      }, d = await Nt(t, a), f = G(P(s)), x = kt(f);
+      }, d = await Nt(t, a), f = G(P(s)), x = Bt(f);
       let u = h[x], p = h[f];
       if (o) {
-        const w = x === "y" ? "top" : "left", E = x === "y" ? "bottom" : "right", m = u + d[w], y = u - d[E];
-        u = ht(m, u, y);
+        const w = x === "y" ? "top" : "left", E = x === "y" ? "bottom" : "right", y = u + d[w], m = u - d[E];
+        u = ht(y, u, m);
       }
       if (r) {
-        const w = f === "y" ? "top" : "left", E = f === "y" ? "bottom" : "right", m = p + d[w], y = p - d[E];
-        p = ht(m, p, y);
+        const w = f === "y" ? "top" : "left", E = f === "y" ? "bottom" : "right", y = p + d[w], m = p - d[E];
+        p = ht(y, p, m);
       }
       const g = l.fn({
         ...t,
@@ -4961,10 +4935,10 @@ function Yt(c) {
 function H(c) {
   return rt() ? c instanceof Element || c instanceof A(c).Element : !1;
 }
-function k(c) {
+function B(c) {
   return rt() ? c instanceof HTMLElement || c instanceof A(c).HTMLElement : !1;
 }
-function It(c) {
+function vt(c) {
   return !rt() || typeof ShadowRoot > "u" ? !1 : c instanceof ShadowRoot || c instanceof A(c).ShadowRoot;
 }
 function tt(c) {
@@ -4976,7 +4950,7 @@ function tt(c) {
   } = D(c);
   return /auto|scroll|overlay|hidden|clip/.test(t + i + e) && !["inline", "contents"].includes(s);
 }
-function Xe(c) {
+function ke(c) {
   return ["table", "td", "th"].includes(j(c));
 }
 function nt(c) {
@@ -4992,14 +4966,14 @@ function pt(c) {
   const t = Et(), e = H(c) ? D(c) : c;
   return e.transform !== "none" || e.perspective !== "none" || (e.containerType ? e.containerType !== "normal" : !1) || !t && (e.backdropFilter ? e.backdropFilter !== "none" : !1) || !t && (e.filter ? e.filter !== "none" : !1) || ["transform", "perspective", "filter"].some((i) => (e.willChange || "").includes(i)) || ["paint", "layout", "strict", "content"].some((i) => (e.contain || "").includes(i));
 }
-function Be(c) {
-  let t = W(c);
-  for (; k(t) && !U(t); ) {
+function Xe(c) {
+  let t = V(c);
+  for (; B(t) && !U(t); ) {
     if (pt(t))
       return t;
     if (nt(t))
       return null;
-    t = W(t);
+    t = V(t);
   }
   return null;
 }
@@ -5021,21 +4995,21 @@ function lt(c) {
     scrollTop: c.scrollY
   };
 }
-function W(c) {
+function V(c) {
   if (j(c) === "html")
     return c;
   const t = (
     // Step into the shadow DOM of the parent of a slotted node.
     c.assignedSlot || // DOM Element detected.
     c.parentNode || // ShadowRoot detected.
-    It(c) && c.host || // Fallback.
+    vt(c) && c.host || // Fallback.
     N(c)
   );
-  return It(t) ? t.host : t;
+  return vt(t) ? t.host : t;
 }
 function Ft(c) {
-  const t = W(c);
-  return U(t) ? c.ownerDocument ? c.ownerDocument.body : c.body : k(t) && tt(t) ? t : Ft(t);
+  const t = V(c);
+  return U(t) ? c.ownerDocument ? c.ownerDocument.body : c.body : B(t) && tt(t) ? t : Ft(t);
 }
 function dt(c, t, e) {
   var i;
@@ -5050,38 +5024,38 @@ function dt(c, t, e) {
 function ft(c) {
   return c.parent && Object.getPrototypeOf(c.parent) ? c.frameElement : null;
 }
-function Vt(c) {
+function Wt(c) {
   const t = D(c);
   let e = parseFloat(t.width) || 0, i = parseFloat(t.height) || 0;
-  const s = k(c), o = s ? c.offsetWidth : e, r = s ? c.offsetHeight : i, l = it(e) !== o || it(i) !== r;
+  const s = B(c), o = s ? c.offsetWidth : e, r = s ? c.offsetHeight : i, l = it(e) !== o || it(i) !== r;
   return l && (e = o, i = r), {
     width: e,
     height: i,
     $: l
   };
 }
-function Wt(c) {
+function Vt(c) {
   return H(c) ? c : c.contextElement;
 }
 function $(c) {
-  const t = Wt(c);
-  if (!k(t))
-    return V(1);
+  const t = Vt(c);
+  if (!B(t))
+    return W(1);
   const e = t.getBoundingClientRect(), {
     width: i,
     height: s,
     $: o
-  } = Vt(t);
+  } = Wt(t);
   let r = (o ? it(e.width) : e.width) / i, l = (o ? it(e.height) : e.height) / s;
   return (!r || !Number.isFinite(r)) && (r = 1), (!l || !Number.isFinite(l)) && (l = 1), {
     x: r,
     y: l
   };
 }
-const ke = /* @__PURE__ */ V(0);
+const Be = /* @__PURE__ */ W(0);
 function Pt(c) {
   const t = A(c);
-  return !Et() || !t.visualViewport ? ke : {
+  return !Et() || !t.visualViewport ? Be : {
     x: t.visualViewport.offsetLeft,
     y: t.visualViewport.offsetTop
   };
@@ -5091,17 +5065,17 @@ function Ke(c, t, e) {
 }
 function q(c, t, e, i) {
   t === void 0 && (t = !1), e === void 0 && (e = !1);
-  const s = c.getBoundingClientRect(), o = Wt(c);
-  let r = V(1);
+  const s = c.getBoundingClientRect(), o = Vt(c);
+  let r = W(1);
   t && (i ? H(i) && (r = $(i)) : r = $(c));
-  const l = Ke(o, e, i) ? Pt(o) : V(0);
+  const l = Ke(o, e, i) ? Pt(o) : W(0);
   let a = (s.left + l.x) / r.x, h = (s.top + l.y) / r.y, d = s.width / r.x, f = s.height / r.y;
   if (o) {
     const x = A(o), u = i && H(i) ? A(i) : i;
     let p = x, g = ft(p);
     for (; g && i && u !== p; ) {
-      const w = $(g), E = g.getBoundingClientRect(), m = D(g), y = E.left + (g.clientLeft + parseFloat(m.paddingLeft)) * w.x, R = E.top + (g.clientTop + parseFloat(m.paddingTop)) * w.y;
-      a *= w.x, h *= w.y, d *= w.x, f *= w.y, a += y, h += R, p = A(g), g = ft(p);
+      const w = $(g), E = g.getBoundingClientRect(), y = D(g), m = E.left + (g.clientLeft + parseFloat(y.paddingLeft)) * w.x, R = E.top + (g.clientTop + parseFloat(y.paddingTop)) * w.y;
+      a *= w.x, h *= w.y, d *= w.x, f *= w.y, a += m, h += R, p = A(g), g = ft(p);
     }
   }
   return ot({
@@ -5124,9 +5098,9 @@ function Ne(c) {
   let a = {
     scrollLeft: 0,
     scrollTop: 0
-  }, h = V(1);
-  const d = V(0), f = k(i);
-  if ((f || !f && !o) && ((j(i) !== "body" || tt(r)) && (a = lt(i)), k(i))) {
+  }, h = W(1);
+  const d = W(0), f = B(i);
+  if ((f || !f && !o) && ((j(i) !== "body" || tt(r)) && (a = lt(i)), B(i))) {
     const x = q(i);
     h = $(i), d.x = x.x + i.clientLeft, d.y = x.y + i.clientTop;
   }
@@ -5155,7 +5129,7 @@ function Fe(c) {
     y: l
   };
 }
-function Ve(c, t) {
+function We(c, t) {
   const e = A(c), i = N(c), s = e.visualViewport;
   let o = i.clientWidth, r = i.clientHeight, l = 0, a = 0;
   if (s) {
@@ -5170,8 +5144,8 @@ function Ve(c, t) {
     y: a
   };
 }
-function We(c, t) {
-  const e = q(c, !0, t === "fixed"), i = e.top + c.clientTop, s = e.left + c.clientLeft, o = k(c) ? $(c) : V(1), r = c.clientWidth * o.x, l = c.clientHeight * o.y, a = s * o.x, h = i * o.y;
+function Ve(c, t) {
+  const e = q(c, !0, t === "fixed"), i = e.top + c.clientTop, s = e.left + c.clientLeft, o = B(c) ? $(c) : W(1), r = c.clientWidth * o.x, l = c.clientHeight * o.y, a = s * o.x, h = i * o.y;
   return {
     width: r,
     height: l,
@@ -5182,11 +5156,11 @@ function We(c, t) {
 function _t(c, t, e) {
   let i;
   if (t === "viewport")
-    i = Ve(c, e);
+    i = We(c, e);
   else if (t === "document")
     i = Fe(N(c));
   else if (H(t))
-    i = We(t, e);
+    i = Ve(t, e);
   else {
     const s = Pt(c);
     i = {
@@ -5198,7 +5172,7 @@ function _t(c, t, e) {
   return ot(i);
 }
 function zt(c, t) {
-  const e = W(c);
+  const e = V(c);
   return e === t || !H(e) || U(e) ? !1 : D(e).position === "fixed" || zt(e, t);
 }
 function Pe(c, t) {
@@ -5207,10 +5181,10 @@ function Pe(c, t) {
     return e;
   let i = dt(c, [], !1).filter((l) => H(l) && j(l) !== "body"), s = null;
   const o = D(c).position === "fixed";
-  let r = o ? W(c) : c;
+  let r = o ? V(c) : c;
   for (; H(r) && !U(r); ) {
     const l = D(r), a = pt(r);
-    !a && l.position === "fixed" && (s = null), (o ? !a && !s : !a && l.position === "static" && !!s && ["absolute", "fixed"].includes(s.position) || tt(r) && !a && zt(c, r)) ? i = i.filter((d) => d !== r) : s = l, r = W(r);
+    !a && l.position === "fixed" && (s = null), (o ? !a && !s : !a && l.position === "static" && !!s && ["absolute", "fixed"].includes(s.position) || tt(r) && !a && zt(c, r)) ? i = i.filter((d) => d !== r) : s = l, r = V(r);
   }
   return t.set(c, i), i;
 }
@@ -5236,19 +5210,19 @@ function $e(c) {
   const {
     width: t,
     height: e
-  } = Vt(c);
+  } = Wt(c);
   return {
     width: t,
     height: e
   };
 }
 function Ge(c, t, e) {
-  const i = k(t), s = N(t), o = e === "fixed", r = q(c, !0, o, t);
+  const i = B(t), s = N(t), o = e === "fixed", r = q(c, !0, o, t);
   let l = {
     scrollLeft: 0,
     scrollTop: 0
   };
-  const a = V(0);
+  const a = W(0);
   if (i || !i && !o)
     if ((j(t) !== "body" || tt(s)) && (l = lt(t)), i) {
       const u = q(t, !0, o, t);
@@ -5272,7 +5246,7 @@ function at(c) {
   return D(c).position === "static";
 }
 function Ot(c, t) {
-  if (!k(c) || D(c).position === "fixed")
+  if (!B(c) || D(c).position === "fixed")
     return null;
   if (t)
     return t(c);
@@ -5283,19 +5257,19 @@ function $t(c, t) {
   const e = A(c);
   if (nt(c))
     return e;
-  if (!k(c)) {
-    let s = W(c);
+  if (!B(c)) {
+    let s = V(c);
     for (; s && !U(s); ) {
       if (H(s) && !at(s))
         return s;
-      s = W(s);
+      s = V(s);
     }
     return e;
   }
   let i = Ot(c, t);
-  for (; i && Xe(i) && at(i); )
+  for (; i && ke(i) && at(i); )
     i = Ot(i, t);
-  return i && U(i) && at(i) && !pt(i) ? e : i || Be(c) || e;
+  return i && U(i) && at(i) && !pt(i) ? e : i || Xe(c) || e;
 }
 const Ue = async function(c) {
   const t = this.getOffsetParent || $t, e = this.getDimensions, i = await e(c.floating);
@@ -6040,14 +6014,14 @@ class ri {
   editCell(t, e) {
     this.editor.editCell(t, e);
   }
-  setItemValue(t, e, i, s = !0, o = !0, r = !1, l = !0) {
-    this.ctx.database.setItemValue(t, e, i, s, o, r, l);
+  setItemValue(t, e, i, s = !0, o = !0, r = !1) {
+    this.ctx.database.setItemValue(t, e, i, s, o, r);
   }
-  batchSetItemValue(t, e = !0, i = !0) {
-    this.ctx.database.batchSetItemValue(t, e, i);
+  batchSetItemValue(t, e = !0) {
+    this.ctx.database.batchSetItemValue(t, e);
   }
-  setItemValueByEditor(t, e, i, s = !0, o = !0, r = !0) {
-    this.ctx.setItemValueByEditor(t, e, i, s, o, r), this.editor.doneEdit();
+  setItemValueByEditor(t, e, i, s = !0, o = !0) {
+    this.ctx.setItemValueByEditor(t, e, i, s, o), this.editor.doneEdit();
   }
   clearEditableData(t = null) {
     const e = [0, this.ctx.maxColIndex], i = [0, this.ctx.maxRowIndex];