@univerjs/sheets-formula 0.1.0-alpha.2 → 0.1.0-alpha.3

package/lib/index.css

@@ -1 +1 @@
-.univer-formula-error-function{position:absolute}.univer-formula-help-function{-webkit-user-select:none;user-select:none;box-sizing:border-box;width:250px;margin:0;line-height:20px;list-style:none;background-color:rgb(var(--bg-color-secondary));border:1px solid rgb(var(--border-color));border-radius:var(--border-radius-lg);outline:none;box-shadow:var(--box-shadow-base)}.univer-formula-help-function-title{display:flex;align-items:center;justify-content:space-between;box-sizing:border-box;padding:var(--padding-base) var(--padding-lg);font-size:var(--font-size-xs);font-weight:500;color:rgb(var(--text-color));border-bottom:1px solid rgb(var(--border-color))}.univer-formula-help-function-title-icons{display:flex}.univer-formula-help-function-title-icon{cursor:pointer;display:flex;align-items:center;justify-content:center;width:24px;height:24px;margin-left:var(--margin-xs);padding:0;font-size:var(--font-size-lg);color:rgb(var(--text-color-secondary));background-color:transparent;border:none;border-radius:var(--border-radius-base);outline:none;transition:background-color .2s}.univer-formula-help-function-title-icon:hover{background-color:rgb(var(--bg-color-hover))}.univer-formula-help-function-content{overflow-y:auto;box-sizing:border-box;max-height:350px;padding:0 var(--padding-lg) var(--padding-base) var(--padding-lg)}.univer-formula-help-function-content-inner{margin-top:var(--margin-sm)}.univer-formula-help-function-content-params{margin:var(--margin-xs) 0}.univer-formula-help-function-content-params-title{margin-bottom:var(--margin-xs);font-size:var(--font-size-xs);font-weight:500;color:rgb(var(--text-color))}.univer-formula-help-function-content-params-detail{font-size:var(--font-size-xxs);font-weight:400;color:rgb(var(--text-color-secondary))}.univer-formula-help-function-active{color:rgb(var(--primary-color))}.univer-formula-help-decorator{cursor:pointer;position:fixed;z-index:10;display:flex;align-items:center;justify-content:center;padding:var(--padding-xs)}.univer-formula-search-function{overflow-y:auto;box-sizing:border-box;width:250px;max-height:400px;margin:0;padding:var(--padding-sm);line-height:20px;list-style:none;background-color:rgb(var(--bg-color-secondary));border:1px solid rgb(var(--border-color));border-radius:var(--border-radius-lg);outline:none;box-shadow:var(--box-shadow-base)}.univer-formula-search-function-item{cursor:pointer;box-sizing:border-box;padding:var(--padding-xs) var(--padding-sm);color:rgb(var(--text-color));border-radius:var(--border-radius-base);transition:background .2s}.univer-formula-search-function-item-name{font-size:var(--font-size-xs)}.univer-formula-search-function-item-name-light{color:rgb(var(--error-color))}.univer-formula-search-function-item-desc{display:block;font-size:var(--font-size-xxs)}.univer-formula-search-function-item-active{background-color:rgb(var(--bg-color-hover))}.univer-formula-more-functions{display:flex;flex-direction:column;justify-content:space-between;height:100%;line-height:20px}.univer-formula-more-functions-operation{display:flex;justify-content:flex-end}.univer-formula-more-functions-operation>button{margin:0 0 var(--margin-lg) var(--margin-base)}.univer-formula-function-params{margin:var(--margin-xs) 0;font-size:var(--font-size-xxs)}.univer-formula-function-params-title{font-weight:500;color:rgb(var(--text-color-secondary))}.univer-formula-function-params-detail{font-weight:400;color:rgb(var(--text-color))}.univer-formula-input-params-list{overflow-y:auto;height:364px}.univer-formula-input-params-list-item-name{font-size:var(--font-size-sm)}.univer-formula-input-params-list-item-selector{margin:var(--margin-xxs) 0 var(--margin-xs) 0}.univer-formula-select-function-select{display:flex;gap:10%;align-items:center;justify-content:space-between}.univer-formula-select-function-result{-webkit-user-select:none;user-select:none;overflow-y:auto;box-sizing:border-box;width:100%;height:364px;margin:0;margin-top:var(--margin-xs);padding:var(--padding-base);list-style:none;border:1px solid rgb(var(--border-color));border-radius:var(--border-radius-base);outline:none}.univer-formula-select-function-result-item{cursor:pointer;position:relative;box-sizing:border-box;padding:var(--padding-xs) 28px;font-size:var(--font-size-xs);color:rgb(var(--text-color));border-radius:var(--border-radius-base);transition:background .2s}.univer-formula-select-function-result-item-name-light{color:rgb(var(--error-color))}.univer-formula-select-function-result-item-selected{position:absolute;top:50%;left:6px;transform:translateY(-50%);display:inline-flex;font-size:var(--font-size-lg);color:rgb(var(--success-color))}.univer-formula-select-function-result-item-active{background-color:rgb(var(--bg-color-hover))}.univer-formula-select-function-content{overflow-y:auto}
+.univer-formula-error-function{position:absolute}.univer-formula-help-function{-webkit-user-select:none;user-select:none;box-sizing:border-box;width:250px;margin:0;line-height:20px;list-style:none;background-color:rgb(var(--bg-color-secondary));border:1px solid rgb(var(--border-color));border-radius:var(--border-radius-lg);outline:none;box-shadow:var(--box-shadow-base)}.univer-formula-help-function-title{display:flex;align-items:center;justify-content:space-between;box-sizing:border-box;padding:var(--padding-base) var(--padding-lg);font-size:var(--font-size-xs);font-weight:500;color:rgb(var(--text-color));border-bottom:1px solid rgb(var(--border-color))}.univer-formula-help-function-title-icons{display:flex}.univer-formula-help-function-title-icon{cursor:pointer;display:flex;align-items:center;justify-content:center;width:24px;height:24px;margin-left:var(--margin-xs);padding:0;font-size:var(--font-size-lg);color:rgb(var(--text-color-secondary));background-color:transparent;border:none;border-radius:var(--border-radius-base);outline:none;transition:background-color .2s}.univer-formula-help-function-title-icon:hover{background-color:rgb(var(--bg-color-hover))}.univer-formula-help-function-content{overflow-y:auto;box-sizing:border-box;max-height:350px;padding:0 var(--padding-lg) var(--padding-base) var(--padding-lg)}.univer-formula-help-function-content-inner{margin-top:var(--margin-sm)}.univer-formula-help-function-content-params{margin:var(--margin-xs) 0}.univer-formula-help-function-content-params-title{margin-bottom:var(--margin-xs);font-size:var(--font-size-xs);font-weight:500;color:rgb(var(--text-color))}.univer-formula-help-function-content-params-detail{font-size:var(--font-size-xxs);font-weight:400;color:rgb(var(--text-color-secondary))}.univer-formula-help-function-active{color:rgb(var(--primary-color))}.univer-formula-help-decorator{cursor:pointer;position:fixed;z-index:10;display:flex;align-items:center;justify-content:center;padding:var(--padding-xs)}.univer-formula-search-function{overflow-y:auto;box-sizing:border-box;width:250px;max-height:400px;margin:0;padding:var(--padding-sm);line-height:20px;list-style:none;background-color:rgb(var(--bg-color-secondary));border:1px solid rgb(var(--border-color));border-radius:var(--border-radius-lg);outline:none;box-shadow:var(--box-shadow-base)}.univer-formula-search-function-item{cursor:pointer;box-sizing:border-box;padding:var(--padding-xs) var(--padding-sm);color:rgb(var(--text-color));border-radius:var(--border-radius-base);transition:background .2s}.univer-formula-search-function-item-name{font-size:var(--font-size-xs)}.univer-formula-search-function-item-name-light{color:rgb(var(--error-color))}.univer-formula-search-function-item-desc{display:block;font-size:var(--font-size-xxs)}.univer-formula-search-function-item-active{background-color:rgb(var(--bg-color-hover))}.univer-formula-more-functions{display:flex;flex-direction:column;justify-content:space-between;height:100%;line-height:20px}.univer-formula-more-functions-operation{display:flex;justify-content:flex-end}.univer-formula-more-functions-operation>button{margin:0 0 var(--margin-lg) var(--margin-base)}.univer-formula-function-params{margin-bottom:var(--margin-xs);font-size:var(--font-size-xxs)}.univer-formula-function-params-title{font-weight:500;color:rgb(var(--text-color-secondary))}.univer-formula-function-params-detail{font-weight:400;color:rgb(var(--text-color))}.univer-formula-input-params-list{overflow-y:auto;height:364px}.univer-formula-input-params-list-item-name{font-size:var(--font-size-sm)}.univer-formula-input-params-list-item-selector{margin:var(--margin-xxs) 0 var(--margin-xs) 0}.univer-formula-select-function-select{display:flex;gap:10%;align-items:center;justify-content:space-between}.univer-formula-select-function-result{-webkit-user-select:none;user-select:none;overflow-y:auto;box-sizing:border-box;width:100%;height:364px;margin:0;margin-top:var(--margin-xs);padding:var(--padding-base);list-style:none;border:1px solid rgb(var(--border-color));border-radius:var(--border-radius-base);outline:none}.univer-formula-select-function-result-item{cursor:pointer;position:relative;box-sizing:border-box;padding:var(--padding-xs) 28px;font-size:var(--font-size-xs);color:rgb(var(--text-color));border-radius:var(--border-radius-base);transition:background .2s}.univer-formula-select-function-result-item-name-light{color:rgb(var(--error-color))}.univer-formula-select-function-result-item-selected{position:absolute;top:50%;left:6px;transform:translateY(-50%);display:inline-flex;font-size:var(--font-size-lg);color:rgb(var(--success-color))}.univer-formula-select-function-result-item-active{background-color:rgb(var(--bg-color-hover))}.univer-formula-select-function-content{overflow-y:auto;max-height:307px;margin:var(--margin-xs) 0}

package/lib/types/common/selection.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ThemeService } from '@univerjs/core';
+import { type ThemeService } from '@univerjs/core';
 import type { ISelectionStyle } from '@univerjs/sheets';
 export declare const FORMULA_REF_SELECTION_PLUGIN_NAME = "formula_reference_selection_plugin_name";
 export declare function getFormulaRefSelectionStyle(themeService: ThemeService, refColor: string, id: string): ISelectionStyle;

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

@@ -32,7 +32,7 @@ export declare class FormulaClipboardController extends Disposable {
     private _pasteFormulaHook;
     private _pasteWithFormulaHook;
 }
-export declare function getSetCellFormulaMutations(workbookId: string, worksheetId: string, range: IRange, matrix: ObjectMatrix<ICellDataWithSpanInfo>, accessor: IAccessor, copyInfo: {
+export declare function getSetCellFormulaMutations(unitId: string, subUnitId: string, range: IRange, matrix: ObjectMatrix<ICellDataWithSpanInfo>, accessor: IAccessor, copyInfo: {
     copyType: COPY_TYPE;
     copyRange?: IRange;
 }, lexerTreeBuilder: LexerTreeBuilder, isSpecialPaste?: boolean): {

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

@@ -16,6 +16,7 @@
 import { Disposable, ICommandService, ThemeService } from '@univerjs/core';
 import { FormulaDataModel, LexerTreeBuilder } from '@univerjs/engine-formula';
 import { IRenderManagerService } from '@univerjs/engine-render';
+import { SheetInterceptorService } from '@univerjs/sheets';
 import { IEditorBridgeService, ISelectionRenderService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
 export declare class FormulaEditorShowController extends Disposable {
     private _editorBridgeService;
@@ -26,9 +27,11 @@ export declare class FormulaEditorShowController extends Disposable {
     private readonly _selectionRenderService;
     private readonly _sheetSkeletonManagerService;
     private readonly _commandService;
+    private _sheetInterceptorService;
     private _previousShape;
-    constructor(_editorBridgeService: IEditorBridgeService, _formulaDataModel: FormulaDataModel, _lexerTreeBuilder: LexerTreeBuilder, _themeService: ThemeService, _renderManagerService: IRenderManagerService, _selectionRenderService: ISelectionRenderService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService);
+    constructor(_editorBridgeService: IEditorBridgeService, _formulaDataModel: FormulaDataModel, _lexerTreeBuilder: LexerTreeBuilder, _themeService: ThemeService, _renderManagerService: IRenderManagerService, _selectionRenderService: ISelectionRenderService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _commandService: ICommandService, _sheetInterceptorService: SheetInterceptorService);
     private _initInterceptorEditorStart;
+    private _initInterceptorCell;
     private _commandExecutedListener;
     private _createArrayFormulaRangeShape;
     private _removeArrayFormulaRangeShape;

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

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import { Disposable, ICommandService } from '@univerjs/core';
+import { TextSelectionManagerService } from '@univerjs/docs';
 import { LexerTreeBuilder } from '@univerjs/engine-formula';
 import { IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';
 import type { EditorBridgeService } from '@univerjs/sheets-ui';
@@ -25,8 +26,9 @@ export declare class FormulaInputController extends Disposable {
     private readonly _lexerTreeBuilder;
     private readonly _renderManagerService;
     private readonly _formulaInputService;
+    private readonly _textSelectionManagerService;
     private _userCursorMove;
-    constructor(_commandService: ICommandService, _textSelectionRenderManager: ITextSelectionRenderManager, _editorBridgeService: EditorBridgeService, _lexerTreeBuilder: LexerTreeBuilder, _renderManagerService: IRenderManagerService, _formulaInputService: IFormulaInputService);
+    constructor(_commandService: ICommandService, _textSelectionRenderManager: ITextSelectionRenderManager, _editorBridgeService: EditorBridgeService, _lexerTreeBuilder: LexerTreeBuilder, _renderManagerService: IRenderManagerService, _formulaInputService: IFormulaInputService, _textSelectionManagerService: TextSelectionManagerService);
     private _initialize;
     private _initialEditorInputChange;
     private _userMouseListener;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Disposable, ICommandService, IContextService, IUniverInstanceService, LocaleService, ThemeService } from '@univerjs/core';
+import { Disposable, ICommandService, IContextService, IUniverInstanceService, ThemeService } from '@univerjs/core';
 import { DocViewModelManagerService, TextSelectionManagerService } from '@univerjs/docs';
 import { LexerTreeBuilder } from '@univerjs/engine-formula';
 import { IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';
@@ -25,7 +25,6 @@ import { IFormulaInputService } from '../services/formula-input.service';
 import { IFormulaPromptService } from '../services/prompt.service';
 export declare class PromptController extends Disposable {
     private readonly _commandService;
-    private readonly _localeService;
     private readonly _contextService;
     private readonly _textSelectionRenderManager;
     private readonly _editorBridgeService;
@@ -54,7 +53,7 @@ export declare class PromptController extends Disposable {
     private _numberColor;
     private _insertSelections;
     private _inputPanelState;
-    constructor(_commandService: ICommandService, _localeService: LocaleService, _contextService: IContextService, _textSelectionRenderManager: ITextSelectionRenderManager, _editorBridgeService: EditorBridgeService, _formulaPromptService: IFormulaPromptService, _lexerTreeBuilder: LexerTreeBuilder, _renderManagerService: IRenderManagerService, _themeService: ThemeService, _selectionManagerService: SelectionManagerService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _currentUniverService: IUniverInstanceService, _selectionRenderService: ISelectionRenderService, _descriptionService: IDescriptionService, _textSelectionManagerService: TextSelectionManagerService, _formulaInputService: IFormulaInputService, _docViewModelManagerService: DocViewModelManagerService);
+    constructor(_commandService: ICommandService, _contextService: IContextService, _textSelectionRenderManager: ITextSelectionRenderManager, _editorBridgeService: EditorBridgeService, _formulaPromptService: IFormulaPromptService, _lexerTreeBuilder: LexerTreeBuilder, _renderManagerService: IRenderManagerService, _themeService: ThemeService, _selectionManagerService: SelectionManagerService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _currentUniverService: IUniverInstanceService, _selectionRenderService: ISelectionRenderService, _descriptionService: IDescriptionService, _textSelectionManagerService: TextSelectionManagerService, _formulaInputService: IFormulaInputService, _docViewModelManagerService: DocViewModelManagerService);
     dispose(): void;
     private _resetTemp;
     private _initialize;

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

@@ -19,6 +19,7 @@ export declare class TriggerCalculationController extends Disposable {
     private readonly _commandService;
     private readonly _activeDirtyManagerService;
     private _waitingCommandQueue;
+    private _executingCommandQueue;
     private _setTimeoutKey;
     private _startExecutionTime;
     constructor(_commandService: ICommandService, _activeDirtyManagerService: IActiveDirtyManagerService);

package/lib/types/controllers/utils.d.ts

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ICommandInfo, Nullable, ObjectMatrixPrimitiveType } from '@univerjs/core';
+import type { ICommandInfo, IObjectMatrixPrimitiveType, Nullable } from '@univerjs/core';
 import type { IArrayFormulaRangeType } from '@univerjs/engine-formula';
 import type { ISelectionWithStyle } from '@univerjs/sheets';
 interface IFormulaDataGenerics<T> {
     [unitId: string]: {
-        [sheetId: string]: ObjectMatrixPrimitiveType<T>;
+        [sheetId: string]: IObjectMatrixPrimitiveType<T>;
     };
 }
 export declare function offsetFormula<T>(formulaData: IFormulaDataGenerics<T>, command: ICommandInfo, unitId: string, sheetId: string, selections?: Readonly<Nullable<ISelectionWithStyle[]>>): IFormulaDataGenerics<T>;