@univerjs/engine-formula 0.9.1-nightly.202507071607 → 0.9.1-nightly.202507081607

package/lib/es/index.js

@@ -3340,7 +3340,7 @@ function Aa(i) {
   return a;
 }
 /*!
- *  decimal.js v10.5.0
+ *  decimal.js v10.6.0
  *  An arbitrary-precision Decimal type for JavaScript.
  *  https://github.com/MikeMcl/decimal.js
  *  Copyright (c) 2025 Michael Mclaughlin <M8ch88l@gmail.com>
@@ -24580,6 +24580,7 @@ class p_ extends V {
     A(this, "maxParams", 255);
     A(this, "needsReferenceObject", !0);
     A(this, "needsFilteredOutRows", !0);
+    A(this, "needsFormulaDataModel", !0);
   }
   calculate(e, ...t) {
     return e.isError() ? e : e.isReferenceObject() ? e.toArrayValueObject().mapValue((r) => this._handleSingleObject(r, ...t)) : this._handleSingleObject(e, ...t);
@@ -24745,24 +24746,33 @@ class p_ extends V {
     return r.isError() ? r : this._isBlankArrayObject(r) ? g.create(m.DIV_BY_ZERO) : r.var();
   }
   _flattenRefArray(e, ...t) {
+    var n, s;
     const r = [];
     r[0] = [];
-    for (let n = 0; n < t.length; n++) {
-      const s = t[n];
-      if (s.isError())
-        return s;
-      if (!s.isReferenceObject())
+    for (let o = 0; o < t.length; o++) {
+      const u = t[o];
+      if (u.isError())
+        return u;
+      if (!u.isReferenceObject())
         return g.create(m.VALUE);
-      const o = s.getFilteredOutRows(), u = s.getRowData();
-      let c;
-      if (s.iterator((l, f) => {
-        if (o.includes(f) || e && this._isRowHidden(u, f) || l == null || l.isNull() || l.isString() || l.isBoolean())
+      const c = u.getFilteredOutRows(), l = u.getRowData(), f = u.getUnitId(), h = u.getSheetId(), _ = (s = (n = u.getUnitData()[f]) == null ? void 0 : n[h]) == null ? void 0 : s.cellData;
+      let C;
+      if (u.iterator((E, b, R) => {
+        if (c.includes(b) || e && this._isRowHidden(l, b))
           return !0;
-        if (l.isError())
-          return c = l, !1;
-        r[0].push(l);
-      }), c != null && c.isError())
-        return c;
+        const p = _.getValue(b, R);
+        if (p != null && p.f || p != null && p.si) {
+          const N = this._formulaDataModel.getFormulaStringByCell(b, R, h, f);
+          if (N && N.indexOf(`${this.name}(`) > -1)
+            return !0;
+        }
+        if (E == null || E.isNull() || E.isString() || E.isBoolean())
+          return !0;
+        if (E.isError())
+          return C = E, !1;
+        r[0].push(E);
+      }), C != null && C.isError())
+        return C;
     }
     return Nr(r, 1, r[0].length);
   }

package/lib/index.js

@@ -3340,7 +3340,7 @@ function Aa(i) {
   return a;
 }
 /*!
- *  decimal.js v10.5.0
+ *  decimal.js v10.6.0
  *  An arbitrary-precision Decimal type for JavaScript.
  *  https://github.com/MikeMcl/decimal.js
  *  Copyright (c) 2025 Michael Mclaughlin <M8ch88l@gmail.com>
@@ -24580,6 +24580,7 @@ class p_ extends V {
     A(this, "maxParams", 255);
     A(this, "needsReferenceObject", !0);
     A(this, "needsFilteredOutRows", !0);
+    A(this, "needsFormulaDataModel", !0);
   }
   calculate(e, ...t) {
     return e.isError() ? e : e.isReferenceObject() ? e.toArrayValueObject().mapValue((r) => this._handleSingleObject(r, ...t)) : this._handleSingleObject(e, ...t);
@@ -24745,24 +24746,33 @@ class p_ extends V {
     return r.isError() ? r : this._isBlankArrayObject(r) ? g.create(m.DIV_BY_ZERO) : r.var();
   }
   _flattenRefArray(e, ...t) {
+    var n, s;
     const r = [];
     r[0] = [];
-    for (let n = 0; n < t.length; n++) {
-      const s = t[n];
-      if (s.isError())
-        return s;
-      if (!s.isReferenceObject())
+    for (let o = 0; o < t.length; o++) {
+      const u = t[o];
+      if (u.isError())
+        return u;
+      if (!u.isReferenceObject())
         return g.create(m.VALUE);
-      const o = s.getFilteredOutRows(), u = s.getRowData();
-      let c;
-      if (s.iterator((l, f) => {
-        if (o.includes(f) || e && this._isRowHidden(u, f) || l == null || l.isNull() || l.isString() || l.isBoolean())
+      const c = u.getFilteredOutRows(), l = u.getRowData(), f = u.getUnitId(), h = u.getSheetId(), _ = (s = (n = u.getUnitData()[f]) == null ? void 0 : n[h]) == null ? void 0 : s.cellData;
+      let C;
+      if (u.iterator((E, b, R) => {
+        if (c.includes(b) || e && this._isRowHidden(l, b))
           return !0;
-        if (l.isError())
-          return c = l, !1;
-        r[0].push(l);
-      }), c != null && c.isError())
-        return c;
+        const p = _.getValue(b, R);
+        if (p != null && p.f || p != null && p.si) {
+          const N = this._formulaDataModel.getFormulaStringByCell(b, R, h, f);
+          if (N && N.indexOf(`${this.name}(`) > -1)
+            return !0;
+        }
+        if (E == null || E.isNull() || E.isString() || E.isBoolean())
+          return !0;
+        if (E.isError())
+          return C = E, !1;
+        r[0].push(E);
+      }), C != null && C.isError())
+        return C;
     }
     return Nr(r, 1, r[0].length);
   }

package/lib/types/functions/math/subtotal/index.d.ts

@@ -5,6 +5,7 @@ export declare class Subtotal extends BaseFunction {
     maxParams: number;
     needsReferenceObject: boolean;
     needsFilteredOutRows: boolean;
+    needsFormulaDataModel: boolean;
     calculate(functionNum: FunctionVariantType, ...refs: FunctionVariantType[]): FunctionVariantType;
     private _handleSingleObject;
     private _getIndexNumValue;