@fileverse-dev/dsheet 4.0.2-a → 4.0.2-b

package/dist/{executeStringFunction-BQvE7aeV.js → executeStringFunction-BhJfh6Uc.js}

@@ -549,12 +549,12 @@ function Zp(e, t) {
     l
   );
   const o = e.luckysheetfile.length - 1, i = e.luckysheetfile[o], u = i.id;
-  (c = i.calcChain) != null && c.length && (i.calcChain = i.calcChain.map(
-    (g) => ({
-      ...g,
-      id: u
-    })
-  )), (f = i.dynamicArray) != null && f.length && (i.dynamicArray = i.dynamicArray.map(
+  (c = i.calcChain) != null && c.length && (i.calcChain = i.calcChain.filter(
+    (g) => g != null && typeof g.r == "number" && typeof g.c == "number"
+  ).map((g) => ({
+    ...g,
+    id: u
+  }))), (f = i.dynamicArray) != null && f.length && (i.dynamicArray = i.dynamicArray.map(
     (g) => g && typeof g == "object" && "id" in g ? { ...g, id: u } : g
   )), (m = i.dynamicArray_compute) != null && m.length && (i.dynamicArray_compute = i.dynamicArray_compute.map(
     (g) => g && typeof g == "object" && "id" in g ? { ...g, id: u } : g
@@ -18443,7 +18443,7 @@ function pd(e, t, n) {
     const a = Ko(r);
     let l = !1;
     (o = r.calcChain) == null || o.forEach((i) => {
-      if (l) return;
+      if (l || i == null) return;
       const u = i.id ?? r.id, s = Or(
         e,
         u,
@@ -18462,6 +18462,7 @@ function gd(e, t, n, r) {
   const a = n.calcChain;
   if (!(a != null && a.length)) return !0;
   for (const l of a) {
+    if (l == null) continue;
     const o = l.id ?? t, i = Or(
       e,
       o,
@@ -18483,6 +18484,7 @@ function yd(e, t) {
     typeof u != "string" || !u.startsWith("=") || Sa(e, u).forEach((s) => n.add(s));
   };
   return gd(e, t, a, l) || (i = a.calcChain) == null || i.forEach((u) => {
+    if (u == null) return;
     const s = u.id ?? t, c = Or(
       e,
       s,
@@ -24133,14 +24135,28 @@ function Qt(e, t) {
   if (!n)
     return hs(e, t), t;
   for (let r = 0; r < t.length; r += 1) {
-    const a = t[r].row[0], l = t[r].row[1], o = t[r].column[0], i = t[r].column[1];
-    let u, s;
-    if (h.isNil(t[r].row_focus) ? u = a : u = t[r].row_focus, h.isNil(t[r].column_focus) ? s = o : s = t[r].column_focus, h.isNil(u) || h.isNil(s))
+    const a = t[r], l = a.row[0], o = a.row[1], i = a.column[0], u = a.column[1];
+    let s, c;
+    if (h.isNil(a.row_focus) ? s = l : s = a.row_focus, h.isNil(a.column_focus) ? c = i : c = a.column_focus, h.isNil(s) || h.isNil(c))
       return console.error("normalizeSelection: rf and cf is nil"), e.primaryCellActive = null, t;
-    const c = e.visibledatarow[l], f = a - 1 === -1 ? 0 : e.visibledatarow[a - 1], m = e.visibledatacolumn[i], d = o - 1 === -1 ? 0 : e.visibledatacolumn[o - 1];
-    let p = e.visibledatarow[u], g = u - 1 === -1 ? 0 : e.visibledatarow[u - 1], y = e.visibledatacolumn[s], b = s - 1 === -1 ? 0 : e.visibledatacolumn[s - 1];
-    const w = _n(e, n, u, s);
-    w && ([g, p] = w.row, [b, y] = w.column), t[r].row = [a, l], t[r].column = [o, i], t[r].row_focus = u, t[r].column_focus = s, t[r].left = b, t[r].width = y - b <= 0 ? 0 : y - b - 1, t[r].top = g, t[r].height = p - g <= 0 ? 0 : p - g - 1, t[r].left_move = d, t[r].width_move = m - d <= 0 ? 0 : m - d - 1, t[r].top_move = f, t[r].height_move = c - f <= 0 ? 0 : c - f - 1;
+    const f = e.visibledatarow[o], m = l - 1 === -1 ? 0 : e.visibledatarow[l - 1], d = e.visibledatacolumn[u], p = i - 1 === -1 ? 0 : e.visibledatacolumn[i - 1];
+    let g = e.visibledatarow[s], y = s - 1 === -1 ? 0 : e.visibledatarow[s - 1], b = e.visibledatacolumn[c], w = c - 1 === -1 ? 0 : e.visibledatacolumn[c - 1];
+    const v = _n(e, n, s, c);
+    v && ([y, g] = v.row, [w, b] = v.column), t[r] = {
+      ...a,
+      row: [l, o],
+      column: [i, u],
+      row_focus: s,
+      column_focus: c,
+      left: w,
+      width: b - w <= 0 ? 0 : b - w - 1,
+      top: y,
+      height: g - y <= 0 ? 0 : g - y - 1,
+      left_move: p,
+      width_move: d - p <= 0 ? 0 : d - p - 1,
+      top_move: m,
+      height_move: f - m <= 0 ? 0 : f - m - 1
+    };
   }
   return hs(e, t), t;
 }

package/dist/formula.js

@@ -1,5 +1,5 @@
 import { FLVURL as r } from "@fileverse-dev/formulajs";
-import { e as t, f } from "./executeStringFunction-BQvE7aeV.js";
+import { e as t, f } from "./executeStringFunction-BhJfh6Uc.js";
 export {
   r as FLVURL,
   t as executeStringFunction,