@univerjs/engine-formula 0.5.0-alpha.0 → 0.5.0-beta.0

package/lib/es/index.js

@@ -2463,6 +2463,13 @@ let Vs = class extends Oe {
       sheetNameMap: this._sheetIdToNameMap[e]
     };
   }
+  getSheetRowColumnCount(a, e) {
+    const t = this._univerInstanceService.getUnit(a), r = t == null ? void 0 : t.getSheetBySheetId(e), n = r == null ? void 0 : r.getSnapshot();
+    if (!n)
+      return { rowCount: 0, columnCount: 0 };
+    const { rowCount: s, columnCount: o } = n;
+    return { rowCount: s, columnCount: o };
+  }
   load(a) {
     if (a.allUnitData && a.unitSheetNameMap && a.unitStylesData)
       this._unitData = a.allUnitData, this._unitStylesData = a.unitStylesData, this._sheetNameMap = a.unitSheetNameMap;
@@ -7627,7 +7634,10 @@ class Ff extends Qe {
   }
   _setRefInfo() {
     const { currentUnitId: a, currentSubUnitId: e, currentRow: t, currentColumn: r } = this._runtimeService;
-    this._functionExecutor.setRefInfo(a, e, t, r);
+    if (this._functionExecutor.setRefInfo(a, e, t, r), this._functionExecutor.needsSheetRowColumnCount) {
+      const { rowCount: n, columnCount: s } = this._currentConfigService.getSheetRowColumnCount(a, e);
+      this._functionExecutor.setSheetRowColumnCount(n, s);
+    }
   }
   _setRefData(a) {
     if (!a.isReferenceObject())
@@ -10059,6 +10069,8 @@ class V {
     A(this, "_sheetOrder");
     A(this, "_sheetNameMap");
     A(this, "_formulaDataModel");
+    A(this, "_rowCount", -1);
+    A(this, "_columnCount", -1);
     /**
      * Whether the function needs to expand the parameters
      */
@@ -10079,6 +10091,10 @@ class V {
      * Whether the function needs function methods in FormulaDataModel
      */
     A(this, "needsFormulaDataModel", !1);
+    /**
+     * Whether the function needs the number of rows and columns in the sheet
+     */
+    A(this, "needsSheetRowColumnCount", !1);
     /**
      * Minimum number of parameters
      */
@@ -10141,6 +10157,9 @@ class V {
   setFormulaDataModel(a) {
     this._formulaDataModel = a;
   }
+  setSheetRowColumnCount(a, e) {
+    this._rowCount = a, this._columnCount = e;
+  }
   isAsync() {
     return !1;
   }
@@ -23088,6 +23107,7 @@ class FC extends V {
     super(...arguments);
     A(this, "minParams", 0);
     A(this, "maxParams", 5);
+    A(this, "needsSheetRowColumnCount", !0);
   }
   calculate(e, t, r, n, s) {
     if (e != null && e.isError())
@@ -23186,21 +23206,26 @@ class FC extends V {
       return {
         errorObject: g.create(h.CALC)
       };
-    if (o < 0 || u < 0)
+    const c = this._rowCount - this.row, l = this._columnCount - this.column;
+    if (o < 0 || u < 0 || o * u > 10 ** 7)
       return {
         errorObject: g.create(h.VALUE)
       };
-    const c = +r.getValue(), l = +n.getValue(), f = +s.getValue();
-    return c > l ? {
+    if (o > c || u > l)
+      return {
+        errorObject: g.create(h.REF)
+      };
+    const f = +r.getValue(), m = +n.getValue(), d = +s.getValue();
+    return f > m ? {
       errorObject: g.create(h.VALUE)
-    } : f && (!Number.isInteger(c) || !Number.isInteger(l)) ? {
+    } : d && (!Number.isInteger(f) || !Number.isInteger(m)) ? {
       errorObject: g.create(h.VALUE)
     } : {
       rowsValue: o,
       columnsValue: u,
-      minValue: c,
-      maxValue: l,
-      wholeNumberValue: f
+      minValue: f,
+      maxValue: m,
+      wholeNumberValue: d
     };
   }
 }
@@ -23372,6 +23397,7 @@ class qC extends V {
     super(...arguments);
     A(this, "minParams", 1);
     A(this, "maxParams", 4);
+    A(this, "needsSheetRowColumnCount", !0);
   }
   calculate(e, t, r, n) {
     let s = e, o = t != null ? t : y.create(1), u = r != null ? r : y.create(1), c = n != null ? n : y.create(1);
@@ -23397,17 +23423,20 @@ class qC extends V {
     if (u)
       return c;
     const [f, m, d, C] = l, _ = Math.floor(+f.getValue()), E = Math.floor(+m.getValue()), b = +d.getValue(), R = +C.getValue();
-    if (_ < 0 || E < 0)
+    if (_ < 0 || E < 0 || _ * E > 10 ** 7)
       return g.create(h.VALUE);
     if (_ === 0 || E === 0)
       return g.create(h.CALC);
-    const p = [];
-    for (let N = 0; N < _; N++) {
-      p[N] = [];
-      for (let M = 0; M < E; M++)
-        p[N][M] = b + (N * E + M) * R;
+    const p = this._rowCount - this.row, N = this._columnCount - this.column;
+    if (_ > p || E > N)
+      return g.create(h.REF);
+    const M = [];
+    for (let D = 0; D < _; D++) {
+      M[D] = [];
+      for (let w = 0; w < E; w++)
+        M[D][w] = b + (D * E + w) * R;
     }
-    return s > 1 || o > 1 ? y.create(p[0][0]) : K.createByArray(p);
+    return s > 1 || o > 1 ? y.create(M[0][0]) : K.createByArray(M);
   }
 }
 class XC extends V {

package/lib/types/functions/base-function.d.ts

@@ -18,6 +18,8 @@ export declare class BaseFunction {
     private _sheetOrder;
     private _sheetNameMap;
     protected _formulaDataModel: Nullable<FormulaDataModel>;
+    protected _rowCount: number;
+    protected _columnCount: number;
     /**
      * Whether the function needs to expand the parameters
      */
@@ -38,6 +40,10 @@ export declare class BaseFunction {
      * Whether the function needs function methods in FormulaDataModel
      */
     needsFormulaDataModel: boolean;
+    /**
+     * Whether the function needs the number of rows and columns in the sheet
+     */
+    needsSheetRowColumnCount: boolean;
     /**
      * Minimum number of parameters
      */
@@ -76,6 +82,7 @@ export declare class BaseFunction {
         };
     }): void;
     setFormulaDataModel(_formulaDataModel: FormulaDataModel): void;
+    setSheetRowColumnCount(rowCount: number, columnCount: number): void;
     isAsync(): boolean;
     isAddress(): boolean;
     isCustom(): boolean;

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

@@ -4,6 +4,7 @@ import { BaseFunction } from '../../base-function';
 export declare class Randarray extends BaseFunction {
     minParams: number;
     maxParams: number;
+    needsSheetRowColumnCount: boolean;
     calculate(rows?: BaseValueObject, columns?: BaseValueObject, min?: BaseValueObject, max?: BaseValueObject, wholeNumber?: BaseValueObject): BaseValueObject | ArrayValueObject;
     private _calculateResult;
     private _calculateSingleCell;

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

@@ -1,8 +1,9 @@
-import { BaseFunction } from '../../base-function';
 import { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { BaseFunction } from '../../base-function';
 export declare class Sequence extends BaseFunction {
     minParams: number;
     maxParams: number;
+    needsSheetRowColumnCount: boolean;
     calculate(rows: BaseValueObject, columns?: BaseValueObject, start?: BaseValueObject, step?: BaseValueObject): BaseValueObject;
     private _getResult;
 }

package/lib/types/services/current-data.service.d.ts

@@ -45,6 +45,10 @@ export interface IFormulaCurrentConfigService {
             [sheetId: string]: string;
         };
     };
+    getSheetRowColumnCount(unitId: string, sheetId: string): {
+        rowCount: number;
+        columnCount: number;
+    };
 }
 export declare class FormulaCurrentConfigService extends Disposable implements IFormulaCurrentConfigService {
     private readonly _univerInstanceService;
@@ -94,6 +98,10 @@ export declare class FormulaCurrentConfigService extends Disposable implements I
             [sheetId: string]: string;
         };
     };
+    getSheetRowColumnCount(unitId: string, sheetId: string): {
+        rowCount: number;
+        columnCount: number;
+    };
     load(config: IFormulaDatasetConfig): void;
     getDirtyData(): IFormulaDirtyData;
     loadDirtyRangesAndExcludedCell(dirtyRanges: IUnitRange[], excludedCell?: IUnitExcludedCell): void;