@univerjs/sheets-formula 0.1.6 → 0.1.7

package/lib/types/controllers/update-formula.controller.d.ts

@@ -10,7 +10,7 @@ import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/c
  *
    2. Use refRange to offset the formula position and return undo/redo data to setRangeValues mutation
         - Redo data: Delete the old value at the old position on the match, and add the new value at the new position (the new value first checks whether the old position has offset content, if so, use the new offset content, if not, take the old value)
-        - Undo data: the old position on the match saves the old value, and the new position is left blank
+        - Undo data: the old position on the match saves the old value, and the new position delete value. Using undos when undoing will operate the data after the offset position.
 
    3. onCommandExecuted, before formula calculation, use the setRangeValues information to delete the old formulaData, ArrayFormula and ArrayFormulaCellData, and send the worker (complementary setRangeValues after collaborative conflicts, normal operation triggers formula update, undo/redo are captured and processed here)
  */
@@ -25,7 +25,6 @@ export declare class UpdateFormulaController extends Disposable {
     constructor(_currentUniverService: IUniverInstanceService, _commandService: ICommandService, _lexerTreeBuilder: LexerTreeBuilder, _formulaDataModel: FormulaDataModel, _sheetInterceptorService: SheetInterceptorService, _selectionManagerService: SelectionManagerService, _injector: Injector);
     private _initialize;
     private _commandExecutedListener;
-    private _handleRedoUndo;
     private _handleSetRangeValuesMutation;
     private _handleRemoveSheetMutation;
     private _handleInsertSheetMutation;
@@ -43,7 +42,6 @@ export declare class UpdateFormulaController extends Disposable {
     private _handleDeleteRangeMoveLeft;
     private _handleSetWorksheetName;
     private _handleRemoveWorksheet;
-    private _getUpdateFormulaMutations;
     private _getFormulaReferenceMoveInfo;
     private _getNewRangeByMoveParam;
     private _checkIsSameUnitAndSheet;

package/lib/types/controllers/utils/__tests__/ref-range-formula.spec.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export {};

package/lib/types/controllers/utils/offset-formula-data.d.ts

@@ -15,7 +15,11 @@ export interface IRefRangeWithPosition {
 export declare function offsetFormula<T>(formulaData: IFormulaDataGenerics<T>, command: ICommandInfo, unitId: string, sheetId: string, selections?: Readonly<Nullable<ISelectionWithStyle[]>>, formulaRangeData?: IFormulaDataGenerics<IRange>, refRanges?: IRefRangeWithPosition[]): IFormulaDataGenerics<T>;
 export declare function offsetArrayFormula(arrayFormulaRange: IArrayFormulaRangeType, command: ICommandInfo, unitId: string, sheetId: string): IArrayFormulaRangeType;
 export declare function checkFormulaDataNull<T>(formulaData: IFormulaDataGenerics<T>, unitId: string, sheetId: string): boolean;
-export declare function removeFormulaData<T>(formulaData: IFormulaDataGenerics<T>, unitId: string, sheetId: string): void;
+export declare function removeFormulaData<T>(formulaData: IFormulaDataGenerics<T>, unitId: string, sheetId: string): {
+    [x: string]: {
+        [x: string]: null;
+    };
+} | undefined;
 export declare function removeValueFormulaArray<T>(formulaRange: IRange, formulaMatrix: ObjectMatrix<T>): void;
 export declare function inFormulaRange(row: number, column: number, formulaMatrix?: ObjectMatrix<IRange>): boolean;
 export declare function moveRangeUpdateFormulaData<T>(fromRange: IRange, toRange: IRange, fromArrayFormulaCellDataMatrix: ObjectMatrix<T>, toArrayFormulaCellDataMatrix: ObjectMatrix<T>, arrayFormulaRangeMatrix?: ObjectMatrix<IRange>): void;

package/lib/types/controllers/utils/ref-range-formula.d.ts

@@ -1,5 +1,5 @@
-import { IFormulaData } from '@univerjs/engine-formula';
-import { IMutationInfo, IRange } from '@univerjs/core';
+import { IFormulaData, IFormulaDataItem } from '@univerjs/engine-formula';
+import { ICellData, IMutationInfo, IObjectMatrixPrimitiveType, IRange, Nullable } from '@univerjs/core';
 
 export declare enum FormulaReferenceMoveType {
     MoveRange = 0,// range
@@ -25,6 +25,18 @@ export interface IFormulaReferenceMoveParam {
     to?: IRange;
     sheetName?: string;
 }
+export declare function getFormulaReferenceMoveUndoRedo(oldFormulaData: IFormulaData, newFormulaData: IFormulaData, formulaReferenceMoveParam: IFormulaReferenceMoveParam): {
+    undos: IMutationInfo<object>[];
+    redos: IMutationInfo<object>[];
+};
+export declare function getFormulaReferenceSheet(oldFormulaData: IFormulaData, newFormulaData: IFormulaData): {
+    undos: IMutationInfo<object>[];
+    redos: IMutationInfo<object>[];
+};
+export declare function getFormulaReferenceRange(oldFormulaData: IFormulaData, newFormulaData: IFormulaData, formulaReferenceMoveParam: IFormulaReferenceMoveParam): {
+    undos: IMutationInfo<object>[];
+    redos: IMutationInfo<object>[];
+};
 /**
  * For different Command operations, it may be necessary to perform traversal in reverse or in forward order, so first determine the type of Command and then perform traversal.
  * @param oldFormulaData
@@ -33,6 +45,22 @@ export interface IFormulaReferenceMoveParam {
  * @returns
  */
 export declare function refRangeFormula(oldFormulaData: IFormulaData, newFormulaData: IFormulaData, formulaReferenceMoveParam: IFormulaReferenceMoveParam): {
-    redos: IMutationInfo<object>[];
-    undos: IMutationInfo<object>[];
-} | undefined;
+    redoFormulaData: IObjectMatrixPrimitiveType<Nullable<ICellData>>;
+    undoFormulaData: IObjectMatrixPrimitiveType<Nullable<ICellData>>;
+};
+/**
+ * Transfer the formulaDataItem to the cellData
+ * ┌────────────────────────────────┬─────────────────┐
+ * │        IFormulaDataItem        │     ICellData   │
+ * ├──────────────────┬─────┬───┬───┼───────────┬─────┤
+ * │ f                │ si  │ x │ y │ f         │ si  │
+ * ├──────────────────┼─────┼───┼───┼───────────┼─────┤
+ * │ =SUM(1)          │     │   │   │ =SUM(1)   │     │
+ * │                  │ id1 │   │   │           │ id1 │
+ * │ =SUM(1)          │ id1 │   │   │ =SUM(1)   │ id1 │
+ * │ =SUM(1)          │ id1 │ 0 │ 0 │ =SUM(1)   │ id1 │
+ * │ =SUM(1)          │ id1 │ 0 │ 1 │           │ id1 │
+ * └──────────────────┴─────┴───┴───┴───────────┴─────┘
+ */
+export declare function formulaDataItemToCellData(formulaDataItem: IFormulaDataItem): ICellData | null;
+export declare function isFormulaDataItem(cell: IFormulaDataItem): boolean;

package/lib/types/locale/en-US.d.ts

@@ -5425,11 +5425,23 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
+                    maxRange: {
                         name: string;
                         detail: string;
                     };
-                    number2: {
+                    criteriaRange1: {
+                        name: string;
+                        detail: string;
+                    };
+                    criteria1: {
+                        name: string;
+                        detail: string;
+                    };
+                    criteriaRange2: {
+                        name: string;
+                        detail: string;
+                    };
+                    criteria2: {
                         name: string;
                         detail: string;
                     };

package/lib/types/locale/function-list/statistical/en-US.d.ts

@@ -1102,11 +1102,23 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
+            maxRange: {
                 name: string;
                 detail: string;
             };
-            number2: {
+            criteriaRange1: {
+                name: string;
+                detail: string;
+            };
+            criteria1: {
+                name: string;
+                detail: string;
+            };
+            criteriaRange2: {
+                name: string;
+                detail: string;
+            };
+            criteria2: {
                 name: string;
                 detail: string;
             };

package/lib/types/locale/function-list/statistical/ja-JP.d.ts

@@ -1102,11 +1102,23 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
+            maxRange: {
                 name: string;
                 detail: string;
             };
-            number2: {
+            criteriaRange1: {
+                name: string;
+                detail: string;
+            };
+            criteria1: {
+                name: string;
+                detail: string;
+            };
+            criteriaRange2: {
+                name: string;
+                detail: string;
+            };
+            criteria2: {
                 name: string;
                 detail: string;
             };

package/lib/types/locale/function-list/statistical/zh-CN.d.ts

@@ -1102,11 +1102,23 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
+            maxRange: {
                 name: string;
                 detail: string;
             };
-            number2: {
+            criteriaRange1: {
+                name: string;
+                detail: string;
+            };
+            criteria1: {
+                name: string;
+                detail: string;
+            };
+            criteriaRange2: {
+                name: string;
+                detail: string;
+            };
+            criteria2: {
                 name: string;
                 detail: string;
             };

package/lib/types/locale/zh-CN.d.ts

@@ -5425,11 +5425,23 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
+                    maxRange: {
                         name: string;
                         detail: string;
                     };
-                    number2: {
+                    criteriaRange1: {
+                        name: string;
+                        detail: string;
+                    };
+                    criteria1: {
+                        name: string;
+                        detail: string;
+                    };
+                    criteriaRange2: {
+                        name: string;
+                        detail: string;
+                    };
+                    criteria2: {
                         name: string;
                         detail: string;
                     };