@univerjs/sheets-formula 0.2.2 → 0.2.3

package/lib/types/controllers/formula-editor-show.controller.d.ts

@@ -1,7 +1,7 @@
 import { Workbook, Disposable, ICommandService, ThemeService } from '@univerjs/core';
 import { FormulaDataModel } from '@univerjs/engine-formula';
 import { IRenderContext, IRenderModule, IRenderManagerService } from '@univerjs/engine-render';
-import { IEditorBridgeService, ISelectionRenderService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
+import { IEditorBridgeService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
 
 export declare class FormulaEditorShowController extends Disposable implements IRenderModule {
     private readonly _context;
@@ -9,13 +9,17 @@ export declare class FormulaEditorShowController extends Disposable implements I
     private readonly _formulaDataModel;
     private readonly _themeService;
     private readonly _renderManagerService;
-    private readonly _selectionRenderService;
     private readonly _sheetSkeletonManagerService;
     private readonly _commandService;
     private _previousShape;
-    constructor(_context: IRenderContext<Workbook>, _editorBridgeService: IEditorBridgeService, _formulaDataModel: FormulaDataModel, _themeService: ThemeService, _renderManagerService: IRenderManagerService, _selectionRenderService: ISelectionRenderService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService);
+    constructor(_context: IRenderContext<Workbook>, _editorBridgeService: IEditorBridgeService, _formulaDataModel: FormulaDataModel, _themeService: ThemeService, _renderManagerService: IRenderManagerService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService);
     private _initInterceptorEditorStart;
     private _commandExecutedListener;
+    private _displayArrayFormulaRangeShape;
     private _createArrayFormulaRangeShape;
     private _removeArrayFormulaRangeShape;
+    private _refreshArrayFormulaRangeShape;
+    private _checkCurrentSheet;
+    private _refreshArrayFormulaRangeShapeByRanges;
+    private _refreshArrayFormulaRangeShapeByRow;
 }

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

@@ -6,6 +6,7 @@ import { BaseFunction, IFunctionInfo, IFunctionNames } from '@univerjs/engine-fo
 
 export interface IUniverSheetsFormulaConfig {
     menu: MenuConfig;
+    notExecuteFormula?: boolean;
     description: IFunctionInfo[];
     function: Array<[Ctor<BaseFunction>, IFunctionNames]>;
 }

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

@@ -2,8 +2,8 @@ import { Disposable, ICommandService, IContextService, IUniverInstanceService, T
 import { TextSelectionManagerService } from '@univerjs/docs';
 import { LexerTreeBuilder } from '@univerjs/engine-formula';
 import { IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';
-import { SelectionManagerService } from '@univerjs/sheets';
-import { EditorBridgeService, ISelectionRenderService } from '@univerjs/sheets-ui';
+import { SheetsSelectionsService } from '@univerjs/sheets';
+import { EditorBridgeService } from '@univerjs/sheets-ui';
 import { IContextMenuService, IEditorService } from '@univerjs/ui';
 import { IDescriptionService } from '../services/description.service';
 import { IFormulaPromptService } from '../services/prompt.service';
@@ -17,9 +17,9 @@ export declare class PromptController extends Disposable {
     private readonly _lexerTreeBuilder;
     private readonly _renderManagerService;
     private readonly _themeService;
-    private readonly _selectionManagerService;
+    private readonly _sheetsSelectionsService;
+    private readonly _refSelectionsService;
     private readonly _univerInstanceService;
-    private readonly _selectionRenderService;
     private readonly _descriptionService;
     private readonly _textSelectionManagerService;
     private readonly _contextMenuService;
@@ -38,7 +38,8 @@ 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, _contextMenuService: IContextMenuService, _editorService: IEditorService);
+    private get _selectionRenderService();
+    constructor(_commandService: ICommandService, _contextService: IContextService, _textSelectionRenderManager: ITextSelectionRenderManager, _editorBridgeService: EditorBridgeService, _formulaPromptService: IFormulaPromptService, _lexerTreeBuilder: LexerTreeBuilder, _renderManagerService: IRenderManagerService, _themeService: ThemeService, _sheetsSelectionsService: SheetsSelectionsService, _refSelectionsService: SheetsSelectionsService, _univerInstanceService: IUniverInstanceService, _descriptionService: IDescriptionService, _textSelectionManagerService: TextSelectionManagerService, _contextMenuService: IContextMenuService, _editorService: IEditorService);
     dispose(): void;
     private _resetTemp;
     private _initialize;
@@ -48,29 +49,29 @@ export declare class PromptController extends Disposable {
     private _initialExitEditor;
     private _initialChangeEditor;
     private _closeRangePrompt;
-    private _initialRefSelectionUpdateEvent;
-    private _selectionChanging;
-    private _initialRefSelectionInsertEvent;
+    private _initSelectionsEndListener;
+    private _updateSelecting;
+    private _selectionsChangeDisposables;
+    private _enableRefSelectionsRenderService;
+    private _disposeSelectionsChangeListeners;
+    private _insertControlSelections;
     private _initAcceptFormula;
     private _changeFunctionPanelState;
     private _changeHelpFunctionPanelState;
     private _hideFunctionPanel;
-    /**
-     * If the cursor is located at a formula token,
-     * it is necessary to prohibit the behavior of closing the editor by clicking on the canvas,
-     * in order to generate reference text for the formula.
-     */
-    private _changeKeepVisibleHideState;
+    private _checkShouldEnterSelectingMode;
     /**
      *
      * @returns Return the character under the current cursor in the editor.
      */
     private _getCurrentChar;
+    private _isSelectingMode;
+    private _enterSelectingMode;
     /**
      * Disable the ref string generation mode. In the ref string generation mode,
      * users can select a certain area using the mouse and arrow keys, and convert the area into a ref string.
      */
-    private _disableForceKeepVisible;
+    private _quitSelectingMode;
     private _getCurrentBodyDataStreamAndOffset;
     private _getFormulaAndCellEditorBody;
     private _editorModelUnitIds;
@@ -82,10 +83,6 @@ export declare class PromptController extends Disposable {
      */
     private _contextSwitch;
     private _getContextState;
-    /**
-     * Switch from formula selection state to regular selection state.
-     */
-    private _switchSelectionPlugin;
     /**
      * Highlight cell editor and formula bar editor.
      */
@@ -125,7 +122,7 @@ export declare class PromptController extends Disposable {
      * @param textRuns
      */
     private _updateEditorModel;
-    private _inertControlSelectionReplace;
+    private _insertControlSelectionReplace;
     /**
      * pro/issues/450
      * In range selection mode, certain measures are implemented to ensure that the selection behavior is processed correctly.
@@ -136,9 +133,8 @@ export declare class PromptController extends Disposable {
      * In range selection mode, certain measures are implemented to ensure that the selection behavior is processed correctly.
      */
     private _resetSequenceNodes;
-    private _inertControlSelection;
     private _updateRefSelectionStyle;
-    private _changeControlSelection;
+    private _onSelectionControlChange;
     private _refreshFormulaAndCellEditor;
     private _setRemainCapture;
     private _cursorStateListener;

package/lib/types/controllers/trigger-calculation.controller.d.ts

@@ -27,6 +27,10 @@ export declare class TriggerCalculationController extends Disposable {
     private _initialExecuteFormulaProcessListener;
     private _resetExecutingDirtyData;
     private _initialExecuteFormula;
+    /**
+     * The user manually stops the progress bar
+     */
+    private _initialProgressBar;
     /**
      * Update progress by completed count
      * @param completedCount

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

@@ -1,6 +1,6 @@
 import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
 import { FormulaDataModel, LexerTreeBuilder } from '@univerjs/engine-formula';
-import { SelectionManagerService, SheetInterceptorService } from '@univerjs/sheets';
+import { SheetInterceptorService, SheetsSelectionsService } from '@univerjs/sheets';
 import { Injector } from '@wendellhu/redi';
 import { IEditorService } from '@univerjs/ui';
 
@@ -24,7 +24,7 @@ export declare class UpdateFormulaController extends Disposable {
     private _selectionManagerService;
     private readonly _editorService;
     readonly _injector: Injector;
-    constructor(_univerInstanceService: IUniverInstanceService, _commandService: ICommandService, _lexerTreeBuilder: LexerTreeBuilder, _formulaDataModel: FormulaDataModel, _sheetInterceptorService: SheetInterceptorService, _selectionManagerService: SelectionManagerService, _editorService: IEditorService, _injector: Injector);
+    constructor(_univerInstanceService: IUniverInstanceService, _commandService: ICommandService, _lexerTreeBuilder: LexerTreeBuilder, _formulaDataModel: FormulaDataModel, _sheetInterceptorService: SheetInterceptorService, _selectionManagerService: SheetsSelectionsService, _editorService: IEditorService, _injector: Injector);
     private _initialize;
     private _commandExecutedListener;
     private _handleSetRangeValuesMutation;

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

@@ -63,21 +63,4 @@ 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

@@ -3,6 +3,14 @@ import { Injector } from '@wendellhu/redi';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { IUniverSheetsFormulaConfig } from './controllers/formula-ui.controller';
 
+export declare class UniverRemoteSheetsFormulaPlugin extends Plugin {
+    private readonly _config;
+    readonly _injector: Injector;
+    static pluginName: string;
+    static type: UniverInstanceType;
+    constructor(_config: {}, _injector: Injector);
+    onStarting(injector: Injector): void;
+}
 /**
  * The configuration of the formula UI plugin.
  */
@@ -15,8 +23,6 @@ export declare class UniverSheetsFormulaPlugin extends Plugin {
     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;

package/lib/types/index.d.ts

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { UniverSheetsFormulaPlugin, UniverSheetsFormulaMobilePlugin } from './formula-ui-plugin';
+export { UniverRemoteSheetsFormulaPlugin, 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';
 export type { IRegisterFunctionParams, IUnregisterFunctionParams } from './services/register-function.service';
 export { RegisterFunctionService } from './services/register-function.service';
 export { IRegisterFunctionService } from './services/register-function.service';
+export { IRemoteRegisterFunctionService, RemoteRegisterFunctionService } from './services/remote/remote-register-function.service';
 export { FormulaRefRangeService } from './services/formula-ref-range.service';
 export { RegisterOtherFormulaService } from './services/register-other-formula.service';
 export type { IFormulaInfo, IOtherFormulaResult } from './services/formula-common';

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

@@ -6435,11 +6435,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    number: {
                         name: string;
                         detail: string;
                     };
@@ -6563,11 +6559,15 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
+                    number: {
                         name: string;
                         detail: string;
                     };
-                    number2: {
+                    radix: {
+                        name: string;
+                        detail: string;
+                    };
+                    minLength: {
                         name: string;
                         detail: string;
                     };
@@ -6685,11 +6685,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    number: {
                         name: string;
                         detail: string;
                     };
@@ -6703,11 +6699,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    number: {
                         name: string;
                         detail: string;
                     };
@@ -6721,11 +6713,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    number: {
                         name: string;
                         detail: string;
                     };
@@ -6739,11 +6727,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    number: {
                         name: string;
                         detail: string;
                     };
@@ -6757,11 +6741,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    number: {
                         name: string;
                         detail: string;
                     };
@@ -7513,11 +7493,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    number: {
                         name: string;
                         detail: string;
                     };
@@ -7531,11 +7507,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    number: {
                         name: string;
                         detail: string;
                     };

package/lib/types/locale/function-list/array/vi-VN.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 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.
+ */
+declare const _default: {};
+export default _default;

package/lib/types/locale/function-list/array/zh-TW.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 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.
+ */
+declare const _default: {};
+export default _default;