@univerjs/sheets-formula-ui 0.4.1 → 0.4.2

package/lib/es/index.js

@@ -2,14 +2,14 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
-import { CommandType, ICommandService, createIdentifier, IContextService, IUniverInstanceService, Rectangle, DEFAULT_EMPTY_DOCUMENT_VALUE, isRealNum, CellValueType, getCellValueType, toDisposable, DisposableCollection, RANGE_TYPE, Inject, Injector, ThemeService, useDependency, ColorKit, UniverInstanceType, debounce, LocaleService, createInternalEditorID, generateRandomId, isFormulaString, isFormulaId, FOCUSING_DOC, FOCUSING_UNIVER_EDITOR, FOCUSING_UNIVER_EDITOR_STANDALONE_SINGLE_MODE, Disposable, isICellData, Tools, Direction, ObjectMatrix, ILogService, RxDisposable, InterceptorEffectEnum, useInjector, useObservable, connectInjector, FORMULA_EDITOR_ACTIVATED, FOCUSING_EDITOR_INPUT_FORMULA, AbsoluteRefType, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, Plugin, DependentOn, IConfigService } from "@univerjs/core";
-import { SheetPasteCommand, PREDEFINED_HOOK_NAME, BaseSelectionRenderService, getCoordByOffset, checkInHeaderRanges, getAllSelection, attachSelectionWithCoord, getSheetObject, SheetSkeletonManagerService, attachRangeWithCoord, IEditorBridgeService, RANGE_SELECTOR_SYMBOLS, SetCellEditVisibleOperation, CellAlertType, HoverManagerService, CellAlertManagerService, DATA_TYPE, APPLY_TYPE, IAutoFillService, COPY_TYPE, ISheetClipboardService, ISheetSelectionRenderService, SelectionShape, SELECTION_SHAPE_DEPTH, useActiveWorkbook, getCurrentRangeDisable$, PASTE_SPECIAL_MENU_ID, whenFormulaEditorActivated, isRangeSelector, getEditorObject, MoveSelectionCommand, JumpOver, ExpandSelectionCommand, RANGE_SELECTOR_COMPONENT_KEY } from "@univerjs/sheets-ui";
-import { sequenceNodeType, serializeRange, matchToken, LexerTreeBuilder, deserializeRangeWithSheet, serializeRangeWithSheet, ERROR_TYPE_SET, ErrorType, FormulaDataModel, SetFormulaCalculationResultMutation, SetArrayFormulaDataMutation, FunctionType, matchRefDrawToken, compareToken, normalizeSheetName, serializeRangeToRefString, generateStringWithSequence, getAbsoluteRefTypeWitString, UniverFormulaEnginePlugin } from "@univerjs/engine-formula";
+import { CommandType, ICommandService, createIdentifier, IContextService, IUniverInstanceService, Rectangle, DEFAULT_EMPTY_DOCUMENT_VALUE, isRealNum, CellValueType, getCellValueType, toDisposable, DisposableCollection, RANGE_TYPE, Inject, Injector, ThemeService, useDependency, ColorKit, UniverInstanceType, debounce, LocaleService, createInternalEditorID, generateRandomId, isFormulaString, isFormulaId, FOCUSING_DOC, FOCUSING_UNIVER_EDITOR, FOCUSING_UNIVER_EDITOR_STANDALONE_SINGLE_MODE, Disposable, isICellData, Tools, Direction, ObjectMatrix, ILogService, RxDisposable, InterceptorEffectEnum, useObservable, useInjector, connectInjector, FORMULA_EDITOR_ACTIVATED, FOCUSING_EDITOR_INPUT_FORMULA, AbsoluteRefType, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, Plugin, DependentOn, IConfigService } from "@univerjs/core";
+import { SheetPasteCommand, PREDEFINED_HOOK_NAME, BaseSelectionRenderService, getCoordByOffset, checkInHeaderRanges, getAllSelection, attachSelectionWithCoord, getSheetObject, SheetSkeletonManagerService, attachRangeWithCoord, IEditorBridgeService, RANGE_SELECTOR_SYMBOLS, SetCellEditVisibleOperation, CellAlertType, HoverManagerService, CellAlertManagerService, DATA_TYPE, APPLY_TYPE, IAutoFillService, COPY_TYPE, ISheetClipboardService, ISheetSelectionRenderService, SelectionShape, SELECTION_SHAPE_DEPTH, useActiveWorkbook, getCurrentRangeDisable$, PASTE_SPECIAL_MENU_ID, whenFormulaEditorActivated, SheetsUIPart, isRangeSelector, getEditorObject, MoveSelectionCommand, JumpOver, ExpandSelectionCommand, RANGE_SELECTOR_COMPONENT_KEY } from "@univerjs/sheets-ui";
+import { sequenceNodeType, serializeRange, matchToken, LexerTreeBuilder, deserializeRangeWithSheet, serializeRangeWithSheet, ERROR_TYPE_SET, ErrorType, FormulaDataModel, SetFormulaCalculationResultMutation, SetArrayFormulaDataMutation, SetFormulaCalculationStopMutation, FunctionType, matchRefDrawToken, compareToken, normalizeSheetName, serializeRangeToRefString, generateStringWithSequence, getAbsoluteRefTypeWitString, UniverFormulaEnginePlugin } from "@univerjs/engine-formula";
 import { Subject, merge, map, distinctUntilChanged, throttleTime as throttleTime$1, combineLatestWith, switchMap, of, Observable, filter, distinctUntilKeyChanged } from "rxjs";
 import { IEditorService, VIEWPORT_KEY, DocBackScrollRenderController, DocSelectionRenderService, ReplaceContentCommand, MoveCursorOperation } from "@univerjs/docs-ui";
 import { SheetsSelectionsService, getSheetCommandTarget, getCellAtRowCol, SetSelectionsOperation, SelectionMoveType, convertSelectionDataToRange, getNormalSelectionStyle, IRefSelectionsService, setEndForRange, DISABLE_NORMAL_SELECTIONS, SetWorksheetActiveOperation, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, SetWorksheetRowAutoHeightMutation, INTERCEPTOR_POINT, SheetInterceptorService, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellValuePermission, RangeProtectionPermissionEditPoint, getPrimaryForRange } from "@univerjs/sheets";
-import { InsertFunctionCommand, IDescriptionService, UniverSheetsFormulaPlugin } from "@univerjs/sheets-formula";
-import { ISidebarService, IShortcutService, IContextMenuService, IZenZoneService, ILayoutService, MenuItemType, getMenuHiddenObservable, IClipboardInterfaceService, RibbonStartGroup, KeyCode, MetaKeys, BuiltInUIPart, ComponentManager, IMenuManagerService, IUIPartsService, UNI_DISABLE_CHANGING_FOCUS_KEY, SetEditorResizeOperation } from "@univerjs/ui";
+import { InsertFunctionCommand, IDescriptionService, TriggerCalculationController, UniverSheetsFormulaPlugin } from "@univerjs/sheets-formula";
+import { ISidebarService, IShortcutService, IContextMenuService, IZenZoneService, ProgressBar, ILayoutService, MenuItemType, getMenuHiddenObservable, IClipboardInterfaceService, RibbonStartGroup, KeyCode, MetaKeys, BuiltInUIPart, ComponentManager, IMenuManagerService, IUIPartsService, UNI_DISABLE_CHANGING_FOCUS_KEY, SetEditorResizeOperation } from "@univerjs/ui";
 import require$$0, { forwardRef, useRef, createElement, useEffect, useState, useMemo, useLayoutEffect, useCallback } from "react";
 import { Tooltip, Dialog, Button, Input, Popup, Select } from "@univerjs/design";
 import { ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2, IRenderManagerService, ScrollBar, DeviceInputEventType } from "@univerjs/engine-render";
@@ -1081,14 +1081,14 @@ function RangeSelector(props) {
     }
   }, [editor]), useEffect(() => {
     const d1 = commandService.beforeCommandExecuted((info) => {
-      info.id === SetWorksheetActiveOperation.id && (isFocusSet(!1), onBlur(), sequenceNodesSet((pre) => [...pre]));
+      info.id === SetWorksheetActiveOperation.id && !isSupportAcrossSheet && (isFocusSet(!1), onBlur(), sequenceNodesSet((pre) => [...pre]));
     }), d2 = commandService.onCommandExecuted((info) => {
       info.id === SetCellEditVisibleOperation.id && (rangeDialogVisibleSet(!1), onRangeSelectorDialogVisibleChange(!1), isFocusSet(!1), onBlur());
     });
     return () => {
       d1.dispose(), d2.dispose();
     };
-  }, []), useEffect(() => {
+  }, [isSupportAcrossSheet]), useEffect(() => {
     isFocusSet(_isFocus);
   }, [_isFocus]), useEffect(() => {
     if (editor && rangeDialogVisible) {
@@ -1802,6 +1802,15 @@ FormulaRenderManagerController = __decorateClass$3([
   __decorateParam$3(0, Inject(SheetInterceptorService)),
   __decorateParam$3(1, Inject(FormulaDataModel))
 ], FormulaRenderManagerController);
+function FormulaProgressBar() {
+  const triggerCalculationController = useDependency(TriggerCalculationController), commandService = useDependency(ICommandService), progress = useObservable(triggerCalculationController.progress$), terminateCalculation = useCallback(() => {
+    commandService.executeCommand(SetFormulaCalculationStopMutation.id);
+  }, [commandService]), clearProgress = useCallback(() => {
+    triggerCalculationController.clearProgress();
+  }, [triggerCalculationController]);
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(ProgressBar, { progress, onTerminate: terminateCalculation, onClearProgress: clearProgress });
+}
+__name(FormulaProgressBar, "FormulaProgressBar");
 function getFunctionTypeValues(enumObj, localeService) {
   return Object.keys(enumObj).filter((key) => isNaN(Number(key)) && key !== "DefinedName").map((key) => ({
     label: localeService.t(`formula.functionType.${key.toLocaleLowerCase()}`),
@@ -2509,9 +2518,7 @@ let FormulaUIController = (_a8 = class extends Disposable {
     });
   }
   _registerComponents() {
-    this.disposeWithMe(
-      this._uiPartsService.registerComponent(BuiltInUIPart.CONTENT, () => connectInjector(RenderFormulaPromptContent, this._injector))
-    ), this._componentManager.register(MORE_FUNCTIONS_COMPONENT, MoreFunctions);
+    this.disposeWithMe(this._uiPartsService.registerComponent(BuiltInUIPart.CONTENT, () => connectInjector(RenderFormulaPromptContent, this._injector))), this.disposeWithMe(this._uiPartsService.registerComponent(SheetsUIPart.FORMULA_AUX, () => connectInjector(FormulaProgressBar, this._injector))), this._componentManager.register(MORE_FUNCTIONS_COMPONENT, MoreFunctions);
   }
   _registerRenderModules() {
     this.disposeWithMe(this._renderManagerService.registerRenderModule(UniverInstanceType.UNIVER_SHEET, [FormulaEditorShowController]));