@univerjs/sheets-formula 0.1.15 → 0.1.17

package/lib/locale/en-US.json

@@ -3278,7 +3278,7 @@
         }
       },
       "AVERAGEA": {
-        "description": "Returns the average of its arguments, including numbers, text, and logical values",
+        "description": "Returns the average of its arguments, including numbers, text, and logical values.",
         "abstract": "Returns the average of its arguments, including numbers, text, and logical values",
         "links": [
           {
@@ -3287,13 +3287,13 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "value1": {
+            "name": "value1",
+            "detail": "The first number, cell reference, or range for which you want the average."
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "value2": {
+            "name": "value2",
+            "detail": "Additional numbers, cell references or ranges for which you want the average, up to a maximum of 255."
           }
         }
       },
@@ -5522,7 +5522,7 @@
         }
       },
       "CHOOSE": {
-        "description": "Chooses a value from a list of values",
+        "description": "Chooses a value from a list of values.",
         "abstract": "Chooses a value from a list of values",
         "links": [
           {
@@ -5531,13 +5531,17 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "indexNum": {
+            "name": "index_num",
+            "detail": "Specifies which value argument is selected. Index_num must be a number between 1 and 254, or a formula or reference to a cell containing a number between 1 and 254.\nIf index_num is 1, CHOOSE returns value1; if it is 2, CHOOSE returns value2; and so on.\nIf index_num is less than 1 or greater than the number of the last value in the list, CHOOSE returns the #VALUE! error value.\nIf index_num is a fraction, it is truncated to the lowest integer before being used."
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "value1": {
+            "name": "value1",
+            "detail": "CHOOSE selects a value or an action to perform based on index_num. The arguments can be numbers, cell references, defined names, formulas, functions, or text."
+          },
+          "value2": {
+            "name": "value2",
+            "detail": "1 to 254 value arguments."
           }
         }
       },
@@ -6635,7 +6639,7 @@
       },
       "CONCAT": {
         "description": "Combines the text from multiple ranges and/or strings, but it doesn't provide the delimiter or IgnoreEmpty arguments.",
-        "abstract": "Combines the text from multiple ranges and/or strings, but it doesn't provide the delimiter or IgnoreEmpty arguments.",
+        "abstract": "Combines the text from multiple ranges and/or strings, but it doesn't provide the delimiter or IgnoreEmpty arguments",
         "links": [
           {
             "title": "Instruction",
@@ -6643,13 +6647,13 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "text1": {
+            "name": "text1",
+            "detail": "Text item to be joined. A string, or array of strings, such as a range of cells."
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "text2": {
+            "name": "text2",
+            "detail": "Additional text items to be joined. There can be a maximum of 253 text arguments for the text items. Each can be a string, or array of strings, such as a range of cells."
           }
         }
       },

package/lib/locale/ru-RU.json

@@ -3278,7 +3278,7 @@
         }
       },
       "AVERAGEA": {
-        "description": "Returns the average of its arguments, including numbers, text, and logical values",
+        "description": "Returns the average of its arguments, including numbers, text, and logical values.",
         "abstract": "Returns the average of its arguments, including numbers, text, and logical values",
         "links": [
           {
@@ -3287,13 +3287,13 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "value1": {
+            "name": "value1",
+            "detail": "The first number, cell reference, or range for which you want the average."
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "value2": {
+            "name": "value2",
+            "detail": "Additional numbers, cell references or ranges for which you want the average, up to a maximum of 255."
           }
         }
       },
@@ -5522,7 +5522,7 @@
         }
       },
       "CHOOSE": {
-        "description": "Chooses a value from a list of values",
+        "description": "Chooses a value from a list of values.",
         "abstract": "Chooses a value from a list of values",
         "links": [
           {
@@ -5531,13 +5531,17 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "indexNum": {
+            "name": "index_num",
+            "detail": "Specifies which value argument is selected. Index_num must be a number between 1 and 254, or a formula or reference to a cell containing a number between 1 and 254.\nIf index_num is 1, CHOOSE returns value1; if it is 2, CHOOSE returns value2; and so on.\nIf index_num is less than 1 or greater than the number of the last value in the list, CHOOSE returns the #VALUE! error value.\nIf index_num is a fraction, it is truncated to the lowest integer before being used."
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "value1": {
+            "name": "value1",
+            "detail": "CHOOSE selects a value or an action to perform based on index_num. The arguments can be numbers, cell references, defined names, formulas, functions, or text."
+          },
+          "value2": {
+            "name": "value2",
+            "detail": "1 to 254 value arguments."
           }
         }
       },
@@ -6643,13 +6647,13 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "первый"
+          "text1": {
+            "name": "текст1",
+            "detail": "Элемент текста, который нужно присоединить. Строка или массив строк, например диапазон ячеек."
           },
-          "number2": {
-            "name": "number2",
-            "detail": "второй"
+          "text2": {
+            "name": "текст2",
+            "detail": "Дополнительные текстовые элементы для объединения. Для текстовых элементов можно указать до 253 аргументов. Каждый из них может быть строкой или массивом строк, например диапазоном ячеек."
           }
         }
       },

package/lib/locale/zh-CN.json

@@ -3278,7 +3278,7 @@
         }
       },
       "AVERAGEA": {
-        "description": "返回其参数的平均值，包括数字、文本和逻辑值",
+        "description": "返回其参数的平均值，包括数字、文本和逻辑值。",
         "abstract": "返回其参数的平均值，包括数字、文本和逻辑值",
         "links": [
           {
@@ -3287,13 +3287,13 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "value1": {
+            "name": "值 1",
+            "detail": "要计算平均值的第一个数字、单元格引用或单元格区域。"
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "value2": {
+            "name": "值 2",
+            "detail": "要计算平均值的其他数字、单元格引用或单元格区域，最多可包含 255 个。"
           }
         }
       },
@@ -5522,7 +5522,7 @@
         }
       },
       "CHOOSE": {
-        "description": "从值的列表中选择值",
+        "description": "从值的列表中选择值。",
         "abstract": "从值的列表中选择值",
         "links": [
           {
@@ -5531,13 +5531,17 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "indexNum": {
+            "name": "索引",
+            "detail": "用于指定所选定的数值参数。 index_num 必须是介于 1 到 254 之间的数字，或是包含 1 到 254 之间的数字的公式或单元格引用。\n如果 index_num 为 1，则 CHOOSE 返回 value1；如果为 2，则 CHOOSE 返回 value2，以此类推。\n如果 index_num 小于 1 或大于列表中最后一个值的索引号，则 CHOOSE 返回 #VALUE! 错误值。\n如果 index_num 为小数，则在使用前将被截尾取整。"
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "value1": {
+            "name": "值 1",
+            "detail": "CHOOSE 将根据 index_num 从中选择一个数值或一项要执行的操作。 参数可以是数字、单元格引用、定义的名称、公式、函数或文本。"
+          },
+          "value2": {
+            "name": "值 2",
+            "detail": "1 到 254 个值参数。"
           }
         }
       },
@@ -6635,7 +6639,7 @@
       },
       "CONCAT": {
         "description": "将多个区域和/或字符串的文本组合起来，但不提供分隔符或 IgnoreEmpty 参数。",
-        "abstract": "将多个区域和/或字符串的文本组合起来，但不提供分隔符或 IgnoreEmpty 参数。",
+        "abstract": "将多个区域和/或字符串的文本组合起来，但不提供分隔符或 IgnoreEmpty 参数",
         "links": [
           {
             "title": "教学",
@@ -6643,13 +6647,13 @@
           }
         ],
         "functionParameter": {
-          "number1": {
-            "name": "number1",
-            "detail": "first"
+          "text1": {
+            "name": "文本 1",
+            "detail": "要联接的文本项。 字符串或字符串数组，如单元格区域。"
           },
-          "number2": {
-            "name": "number2",
-            "detail": "second"
+          "text2": {
+            "name": "文本 2",
+            "detail": "要联接的其他文本项。 文本项最多可以有 253 个文本参数。 每个参数可以是一个字符串或字符串数组，如单元格区域。"
           }
         }
       },

package/lib/types/commands/commands/formula-clipboard.command.d.ts

@@ -1,4 +1,3 @@
 import { ICommand } from '@univerjs/core';
 
-export declare const SPECIAL_PASTE_FORMULA = "special-paste-formula";
 export declare const SheetOnlyPasteFormulaCommand: ICommand;

package/lib/types/controllers/active-dirty.controller.d.ts

@@ -17,6 +17,7 @@ export declare class ActiveDirtyController extends Disposable {
     private _getSetRangeValuesMutationDirtyRange;
     private _getMoveRangeMutationDirtyRange;
     private _getMoveRowsMutationDirtyRange;
+    private _getReorderRangeMutationDirtyRange;
     private _getDeleteRangeMutationDirtyRange;
     private _getRemoveRowOrColumnMutation;
     private _getRemoveSheetMutation;

package/lib/types/controllers/formula-alert-render.controller.d.ts

@@ -0,0 +1,13 @@
+import { Workbook, Disposable, LocaleService } from '@univerjs/core';
+import { CellAlertManagerService, HoverManagerService } from '@univerjs/sheets-ui';
+import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
+
+export declare class FormulaAlertRenderController extends Disposable implements IRenderModule {
+    private readonly _context;
+    private readonly _hoverManagerService;
+    private readonly _cellAlertManagerService;
+    private readonly _localeService;
+    constructor(_context: IRenderContext<Workbook>, _hoverManagerService: HoverManagerService, _cellAlertManagerService: CellAlertManagerService, _localeService: LocaleService);
+    private _init;
+    private _initCellAlertPopup;
+}

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

@@ -1,6 +1,6 @@
 import { IMutationInfo, Disposable, IUniverInstanceService, ObjectMatrix } from '@univerjs/core';
-import { LexerTreeBuilder } from '@univerjs/engine-formula';
-import { COPY_TYPE, ISheetClipboardService, ICellDataWithSpanInfo, IDiscreteRange } from '@univerjs/sheets-ui';
+import { FormulaDataModel, LexerTreeBuilder } from '@univerjs/engine-formula';
+import { COPY_TYPE, ISheetClipboardService, ICellDataWithSpanInfo, IDiscreteRange, ISheetDiscreteRangeLocation } from '@univerjs/sheets-ui';
 import { IAccessor, Injector } from '@wendellhu/redi';
 
 export declare const DEFAULT_PASTE_FORMULA = "default-paste-formula";
@@ -9,7 +9,8 @@ export declare class FormulaClipboardController extends Disposable {
     private readonly _lexerTreeBuilder;
     private readonly _sheetClipboardService;
     private readonly _injector;
-    constructor(_currentUniverSheet: IUniverInstanceService, _lexerTreeBuilder: LexerTreeBuilder, _sheetClipboardService: ISheetClipboardService, _injector: Injector);
+    private readonly _formulaDataModel;
+    constructor(_currentUniverSheet: IUniverInstanceService, _lexerTreeBuilder: LexerTreeBuilder, _sheetClipboardService: ISheetClipboardService, _injector: Injector, _formulaDataModel: FormulaDataModel);
     private _initialize;
     private _registerClipboardHook;
     private _pasteFormulaHook;
@@ -20,7 +21,7 @@ export declare function getSetCellFormulaMutations(unitId: string, subUnitId: st
     copyType: COPY_TYPE;
     copyRange?: IDiscreteRange;
     pasteType: string;
-}, lexerTreeBuilder: LexerTreeBuilder, isSpecialPaste?: boolean): {
+}, lexerTreeBuilder: LexerTreeBuilder, formulaDataModel: FormulaDataModel, isSpecialPaste: boolean | undefined, pasteFrom: ISheetDiscreteRangeLocation | null): {
     undos: IMutationInfo<object>[];
     redos: IMutationInfo<object>[];
 };

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

@@ -25,5 +25,5 @@ export declare class FormulaUIController extends Disposable {
     private _registerCommands;
     private _registerShortcuts;
     private _registerComponents;
-    private _registerRenderControllers;
+    private _registerRenderModules;
 }

package/lib/types/controllers/prompt.controller.d.ts

@@ -1,5 +1,5 @@
 import { Disposable, ICommandService, IContextService, IUniverInstanceService, ThemeService } from '@univerjs/core';
-import { DocViewModelManagerService, TextSelectionManagerService } from '@univerjs/docs';
+import { TextSelectionManagerService } from '@univerjs/docs';
 import { LexerTreeBuilder } from '@univerjs/engine-formula';
 import { IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';
 import { SelectionManagerService } from '@univerjs/sheets';
@@ -22,7 +22,6 @@ export declare class PromptController extends Disposable {
     private readonly _selectionRenderService;
     private readonly _descriptionService;
     private readonly _textSelectionManagerService;
-    private readonly _docViewModelManagerService;
     private readonly _contextMenuService;
     private readonly _editorService;
     private _formulaRefColors;
@@ -39,7 +38,7 @@ export declare class PromptController extends Disposable {
     private _userCursorMove;
     private _previousEditorUnitId;
     private _existsSequenceNode;
-    constructor(_commandService: ICommandService, _contextService: IContextService, _textSelectionRenderManager: ITextSelectionRenderManager, _editorBridgeService: EditorBridgeService, _formulaPromptService: IFormulaPromptService, _lexerTreeBuilder: LexerTreeBuilder, _renderManagerService: IRenderManagerService, _themeService: ThemeService, _selectionManagerService: SelectionManagerService, _univerInstanceService: IUniverInstanceService, _selectionRenderService: ISelectionRenderService, _descriptionService: IDescriptionService, _textSelectionManagerService: TextSelectionManagerService, _docViewModelManagerService: DocViewModelManagerService, _contextMenuService: IContextMenuService, _editorService: IEditorService);
+    constructor(_commandService: ICommandService, _contextService: IContextService, _textSelectionRenderManager: ITextSelectionRenderManager, _editorBridgeService: EditorBridgeService, _formulaPromptService: IFormulaPromptService, _lexerTreeBuilder: LexerTreeBuilder, _renderManagerService: IRenderManagerService, _themeService: ThemeService, _selectionManagerService: SelectionManagerService, _univerInstanceService: IUniverInstanceService, _selectionRenderService: ISelectionRenderService, _descriptionService: IDescriptionService, _textSelectionManagerService: TextSelectionManagerService, _contextMenuService: IContextMenuService, _editorService: IEditorService);
     dispose(): void;
     private _resetTemp;
     private _initialize;

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

@@ -63,4 +63,21 @@ export declare function refRangeFormula(oldFormulaData: IFormulaData, newFormula
  * └──────────────────┴─────┴───┴───┴───────────┴─────┘
  */
 export declare function formulaDataItemToCellData(formulaDataItem: Nullable<IFormulaDataItem>): Nullable<ICellData>;
+/**
+ * Transfer the formulaDataItem to the cellData, contains formula
+ * ┌────────────────────────────────┬─────────────────┐
+ * │        IFormulaDataItem        │     ICellData   │
+ * ├──────────────────┬─────┬───┬───┼───────────┬─────┤
+ * │ f                │ si  │ x │ y │ f         │ si  │
+ * ├──────────────────┼─────┼───┼───┼───────────┼─────┤
+ * │ =SUM(1)          │     │   │   │ =SUM(1)   │     │
+ * │                  │ id1 │   │   │           │ id1 │
+ * │ =SUM(1)          │ id1 │   │   │ =SUM(1)   │     │
+ * │ =SUM(1)          │ id1 │ 0 │ 0 │ =SUM(1)   │     │
+ * │ =SUM(1)          │ id1 │ 0 │ 1 │ =SUM(1)   │     │
+ * └──────────────────┴─────┴───┴───┴───────────┴─────┘
+ *
+ * The fifth case: The value f of the formula is already the result value. If the formula content of si contains #REF, it cannot be obtained from the formula offset of si, and the result value must be stored directly
+ */
+export declare function formulaDataItemToCellDataFormula(formulaDataItem: Nullable<IFormulaDataItem>): Nullable<ICellData>;
 export declare function isFormulaDataItem(cell: IFormulaDataItem): boolean;

package/lib/types/formula-ui-plugin.d.ts

@@ -1,5 +1,6 @@
-import { LocaleService, Plugin, UniverInstanceType } from '@univerjs/core';
+import { Plugin, UniverInstanceType } from '@univerjs/core';
 import { Injector } from '@wendellhu/redi';
+import { IRenderManagerService } from '@univerjs/engine-render';
 import { IUniverSheetsFormulaConfig } from './controllers/formula-ui.controller';
 
 /**
@@ -8,10 +9,21 @@ import { IUniverSheetsFormulaConfig } from './controllers/formula-ui.controller'
 export declare class UniverSheetsFormulaPlugin extends Plugin {
     private readonly _config;
     readonly _injector: Injector;
-    private readonly _localeService;
+    private readonly _renderManagerService;
     static pluginName: string;
     static type: UniverInstanceType;
-    constructor(_config: Partial<IUniverSheetsFormulaConfig>, _injector: Injector, _localeService: LocaleService);
+    constructor(_config: Partial<IUniverSheetsFormulaConfig>, _injector: Injector, _renderManagerService: IRenderManagerService);
+    onStarting(): void;
+    onRendered(): void;
+    private _registerRenderModules;
+    _init(): void;
+}
+export declare class UniverSheetsFormulaMobilePlugin extends Plugin {
+    private readonly _config;
+    readonly _injector: Injector;
+    static pluginName: string;
+    static type: UniverInstanceType;
+    constructor(_config: Partial<IUniverSheetsFormulaConfig>, _injector: Injector);
     onStarting(): void;
     _init(): void;
 }

package/lib/types/index.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { UniverSheetsFormulaPlugin } from './formula-ui-plugin';
+export { UniverSheetsFormulaPlugin, UniverSheetsFormulaMobilePlugin } from './formula-ui-plugin';
 export { IDescriptionService } from './services/description.service';
 export { DescriptionService } from './services/description.service';
 export { FormulaCustomFunctionService, IFormulaCustomFunctionService, } from './services/formula-custom-function.service';
@@ -21,6 +21,5 @@ export type { IRegisterFunctionParams, IUnregisterFunctionParams } from './servi
 export { RegisterFunctionService } from './services/register-function.service';
 export { IRegisterFunctionService } from './services/register-function.service';
 export { FormulaRefRangeService } from './services/formula-ref-range.service';
-export { SPECIAL_PASTE_FORMULA } from './commands/commands/formula-clipboard.command';
 export { RegisterOtherFormulaService } from './services/register-other-formula.service';
 export type { IFormulaInfo, IOtherFormulaResult } from './services/formula-common';

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

@@ -2661,11 +2661,11 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
+                    text1: {
                         name: string;
                         detail: string;
                     };
-                    number2: {
+                    text2: {
                         name: string;
                         detail: string;
                     };
@@ -3651,11 +3651,15 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
+                    indexNum: {
                         name: string;
                         detail: string;
                     };
-                    number2: {
+                    value1: {
+                        name: string;
+                        detail: string;
+                    };
+                    value2: {
                         name: string;
                         detail: string;
                     };
@@ -4369,11 +4373,11 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
+                    value1: {
                         name: string;
                         detail: string;
                     };
-                    number2: {
+                    value2: {
                         name: string;
                         detail: string;
                     };

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

@@ -70,11 +70,15 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
+            indexNum: {
                 name: string;
                 detail: string;
             };
-            number2: {
+            value1: {
+                name: string;
+                detail: string;
+            };
+            value2: {
                 name: string;
                 detail: string;
             };

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

@@ -70,11 +70,15 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
+            indexNum: {
                 name: string;
                 detail: string;
             };
-            number2: {
+            value1: {
+                name: string;
+                detail: string;
+            };
+            value2: {
                 name: string;
                 detail: string;
             };

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

@@ -70,11 +70,15 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
+            indexNum: {
                 name: string;
                 detail: string;
             };
-            number2: {
+            value1: {
+                name: string;
+                detail: string;
+            };
+            value2: {
                 name: string;
                 detail: string;
             };

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

@@ -58,11 +58,11 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
+            value1: {
                 name: string;
                 detail: string;
             };
-            number2: {
+            value2: {
                 name: string;
                 detail: string;
             };

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

@@ -58,11 +58,11 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
+            value1: {
                 name: string;
                 detail: string;
             };
-            number2: {
+            value2: {
                 name: string;
                 detail: string;
             };

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

@@ -58,11 +58,11 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
+            value1: {
                 name: string;
                 detail: string;
             };
-            number2: {
+            value2: {
                 name: string;
                 detail: string;
             };

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

@@ -130,11 +130,11 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
+            text1: {
                 name: string;
                 detail: string;
             };
-            number2: {
+            text2: {
                 name: string;
                 detail: string;
             };

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

@@ -130,11 +130,11 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
+            text1: {
                 name: string;
                 detail: string;
             };
-            number2: {
+            text2: {
                 name: string;
                 detail: string;
             };

package/lib/types/locale/function-list/text/ru-RU.d.ts

@@ -130,11 +130,11 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
+            text1: {
                 name: string;
                 detail: string;
             };
-            number2: {
+            text2: {
                 name: string;
                 detail: string;
             };

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

@@ -130,11 +130,11 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
+            text1: {
                 name: string;
                 detail: string;
             };
-            number2: {
+            text2: {
                 name: string;
                 detail: string;
             };