@univerjs/sheets-formula 0.1.17 → 0.2.0

package/lib/es/index.js

@@ -1,25 +1,25 @@
 var ja = Object.defineProperty;
 var Qa = (a, e, t) => e in a ? ja(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
 var x = (a, e, t) => Qa(a, typeof e != "symbol" ? e + "" : e, t);
-import { Disposable as re, ObjectMatrix as Q, Dimension as Sn, OnLifecycle as Le, LifecycleStages as Ae, IUniverInstanceService as Pe, CellValueType as He, ThemeService as fn, ICommandService as fe, isFormulaString as Ee, isFormulaId as Ne, Tools as ie, Direction as X, UniverInstanceType as G, DEFAULT_EMPTY_DOCUMENT_VALUE as jn, toDisposable as Z, ColorKit as Qn, CommandType as Se, Rectangle as ge, isRealNum as za, getCellValueType as Za, LocaleService as we, FOCUSING_DOC as Ja, FOCUSING_UNIVER_EDITOR as ei, FOCUSING_UNIVER_EDITOR_STANDALONE_SINGLE_MODE as ti, FOCUSING_EDITOR_INPUT_FORMULA as pt, DisposableCollection as zn, RANGE_TYPE as xe, getCellInfoInMergeData as ni, AbsoluteRefType as J, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as ai, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as ii, IContextService as ri, throttle as In, cellToRange as ui, isICellData as oi, RxDisposable as mi, Plugin as Zn, DependentOn as ci } from "@univerjs/core";
-import { Inject as y, Injector as mt, createIdentifier as yt } from "@wendellhu/redi";
-import { SetDefinedNameMutation as Nn, RemoveDefinedNameMutation as Rn, FormulaDataModel as Ge, IActiveDirtyManagerService as sn, IDefinedNamesService as Jn, SetArrayFormulaDataMutation as Ct, stripErrorMargin as ea, LexerTreeBuilder as Xe, ErrorType as K, SetFormulaCalculationResultMutation as ta, sequenceNodeType as me, serializeRange as ot, FUNCTION_NAMES_COMPATIBILITY as F, FunctionType as r, FUNCTION_NAMES_CUBE as _e, FUNCTION_NAMES_DATABASE as oe, FUNCTION_NAMES_DATE as w, FUNCTION_NAMES_ENGINEERING as M, FUNCTION_NAMES_FINANCIAL as O, FUNCTION_NAMES_INFORMATION as j, FUNCTION_NAMES_LOGICAL as z, FUNCTION_NAMES_LOOKUP as B, FUNCTION_NAMES_MATH as S, FUNCTION_NAMES_STATISTICAL as P, FUNCTION_NAMES_TEXT as v, FUNCTION_NAMES_WEB as Xt, isReferenceStrings as fi, functionArray as si, functionCompatibility as li, functionCube as di, functionDatabase as pi, functionDate as Li, functionEngineering as Ai, functionFinancial as Pi, functionInformation as bi, functionLogical as Ti, functionLookup as Ei, functionMath as Si, functionMeta as Ii, functionStatistical as Ni, functionText as Ri, functionUniver as Ci, functionWeb as hi, IFunctionService as na, ERROR_TYPE_SET as _i, matchToken as Ue, matchRefDrawToken as Cn, compareToken as Yt, deserializeRangeWithSheet as qe, normalizeSheetName as Oi, serializeRangeToRefString as St, generateStringWithSequence as ln, getAbsoluteRefTypeWitString as Mi, SetFormulaCalculationStartMutation as hn, SetFormulaCalculationNotificationMutation as Di, FormulaExecuteStageType as Wt, FormulaExecutedStateType as Be, SetFormulaDataMutation as Lt, initSheetFormulaData as _n, RegisterFunctionMutation as gi, UnregisterFunctionMutation as xi, serializeRangeWithSpreadsheet as vi, serializeRangeWithSheet as qi, SetOtherFormulaMutation as yi, RemoveOtherFormulaMutation as Fi, UniverFormulaEnginePlugin as Ui } from "@univerjs/engine-formula";
-import { IRenderManagerService as Ft, DeviceInputEventType as de, ITextSelectionRenderManager as Bi } from "@univerjs/engine-render";
-import { SetRangeValuesMutation as pe, SetStyleCommand as dn, MoveRangeMutation as On, MoveRowsMutation as Mn, MoveColsMutation as Dn, ReorderRangeMutation as gn, RemoveRowMutation as xn, RemoveColMutation as vn, RemoveSheetMutation as nn, InsertSheetMutation as an, SetDefinedNameCommand as rn, INTERCEPTOR_POINT as pn, SheetInterceptorService as Ut, SetRangeValuesUndoMutationFactory as Vi, SetRangeValuesCommand as Hi, SelectionManagerService as Ln, getSheetCommandTarget as wi, getCellAtRowCol as Gi, SetSelectionsOperation as Xi, NORMAL_SELECTION_PLUGIN_NAME as De, WorkbookEditablePermission as aa, WorksheetEditPermission as ia, WorksheetSetCellValuePermission as ra, RangeProtectionPermissionEditPoint as ua, convertSelectionDataToRange as Kt, getNormalSelectionStyle as Yi, setEndForRange as Wi, getPrimaryForRange as Ki, SetBorderCommand as oa, ClearSelectionFormatCommand as ma, INumfmtService as ki, handleMoveRange as ca, EffectRefRangId as k, runRefRangeMutations as $, handleMoveRows as fa, handleMoveCols as sa, handleInsertRow as la, handleInsertCol as da, handleIRemoveRow as pa, handleIRemoveCol as La, handleDeleteRangeMoveLeft as Aa, handleDeleteRangeMoveUp as Pa, handleInsertRangeMoveDown as ba, handleInsertRangeMoveRight as Ta, RemoveSheetCommand as $i, SetWorksheetNameCommand as ji, DeleteRangeMoveLeftCommand as Qi, DeleteRangeMoveUpCommand as zi, RemoveColCommand as Zi, RemoveRowCommand as Ji, InsertRangeMoveDownCommand as er, InsertRangeMoveRightCommand as tr, InsertColCommand as nr, InsertRowCommand as ar, MoveColsCommand as ir, MoveRowsCommand as rr, MoveRangeCommand as ur, SetWorksheetActiveOperation as or, InsertDefinedNameCommand as mr, RemoveDefinedNameCommand as cr, RefRangeService as fr, handleDefaultRangeChangeWithEffectRefCommands as sr } from "@univerjs/sheets";
-import { DATA_TYPE as qn, APPLY_TYPE as lr, IAutoFillService as dr, PREDEFINED_HOOK_NAME as Ve, COPY_TYPE as Ea, ISheetClipboardService as pr, SelectionShape as Lr, IEditorBridgeService as Sa, SheetSkeletonManagerService as Ia, ISelectionRenderService as Na, SheetPasteCommand as Ar, useActiveWorkbook as Pr, getCurrentRangeDisable$ as Ra, PASTE_SPECIAL_MENU_ID as br, whenFormulaEditorActivated as ct, getEditorObject as yn, MoveSelectionCommand as Fn, JumpOver as Un, ExpandSelectionCommand as Bn, CellAlertType as Tr, HoverManagerService as Er, CellAlertManagerService as Sr } from "@univerjs/sheets-ui";
-import { IEditorService as ft, ISidebarService as Ir, MenuGroup as Nr, MenuItemType as An, MenuPosition as Rr, getMenuHiddenObservable as Cr, IClipboardInterfaceService as Vn, KeyCode as H, MetaKeys as Re, ComponentManager as hr, BuiltInUIPart as _r, IMenuService as Or, IShortcutService as Mr, IUIPartsService as Dr, SetEditorResizeOperation as gr, IContextMenuService as xr, IProgressService as vr } from "@univerjs/ui";
-import { useDependency as le, connectInjector as qr } from "@wendellhu/redi/react-bindings";
-import { Subject as ve, combineLatestWith as yr, map as Ze, switchMap as Fr, of as Hn, Observable as Ur, merge as wn, bufferTime as Br, filter as Vr } from "rxjs";
-import Hr, { forwardRef as st, useRef as Ca, createElement as lt, useState as Y, useEffect as ht } from "react";
-import { Popup as ha, Select as wr, Input as Gr, Button as kt } from "@univerjs/design";
-import { ReplaceContentCommand as Xr, DocSkeletonManagerService as Yr, MoveCursorOperation as Wr, TextSelectionManagerService as Kr } from "@univerjs/docs";
-const Pn = "formula-ui";
-var kr = Object.defineProperty, $r = Object.getOwnPropertyDescriptor, jr = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? $r(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+import { Disposable as re, ObjectMatrix as Q, Dimension as In, OnLifecycle as Le, LifecycleStages as Ae, IUniverInstanceService as Pe, CellValueType as Rt, ThemeService as sn, ICommandService as fe, isFormulaString as Ie, isFormulaId as ye, Tools as ie, Direction as X, UniverInstanceType as G, DEFAULT_EMPTY_DOCUMENT_VALUE as jn, toDisposable as Z, ColorKit as Qn, CommandType as Te, Rectangle as De, isRealNum as za, getCellValueType as Za, LocaleService as He, FOCUSING_DOC as Ja, FOCUSING_UNIVER_EDITOR as ei, FOCUSING_UNIVER_EDITOR_STANDALONE_SINGLE_MODE as ti, FOCUSING_EDITOR_INPUT_FORMULA as dt, DisposableCollection as zn, RANGE_TYPE as ge, getCellInfoInMergeData as ni, AbsoluteRefType as J, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as ai, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as ii, IContextService as ri, throttle as Nn, cellToRange as ui, isICellData as oi, RxDisposable as mi, Plugin as Zn, DependentOn as ci } from "@univerjs/core";
+import { Inject as q, Injector as ot, createIdentifier as qt } from "@wendellhu/redi";
+import { SetDefinedNameMutation as Rn, RemoveDefinedNameMutation as Cn, FormulaDataModel as we, IActiveDirtyManagerService as ln, IDefinedNamesService as Jn, SetArrayFormulaDataMutation as Ct, stripErrorMargin as fi, LexerTreeBuilder as mt, ErrorType as K, SetFormulaCalculationResultMutation as ea, sequenceNodeType as me, serializeRange as ut, FUNCTION_NAMES_COMPATIBILITY as F, FunctionType as r, FUNCTION_NAMES_CUBE as he, FUNCTION_NAMES_DATABASE as oe, FUNCTION_NAMES_DATE as w, FUNCTION_NAMES_ENGINEERING as M, FUNCTION_NAMES_FINANCIAL as O, FUNCTION_NAMES_INFORMATION as j, FUNCTION_NAMES_LOGICAL as z, FUNCTION_NAMES_LOOKUP as B, FUNCTION_NAMES_MATH as S, FUNCTION_NAMES_STATISTICAL as P, FUNCTION_NAMES_TEXT as v, FUNCTION_NAMES_WEB as Gt, isReferenceStrings as si, functionArray as li, functionCompatibility as di, functionCube as pi, functionDatabase as Li, functionDate as Ai, functionEngineering as Pi, functionFinancial as bi, functionInformation as Ti, functionLogical as Ei, functionLookup as Si, functionMath as Ii, functionMeta as Ni, functionStatistical as Ri, functionText as Ci, functionUniver as hi, functionWeb as _i, IFunctionService as ta, ERROR_TYPE_SET as Oi, matchToken as Ue, matchRefDrawToken as hn, compareToken as Xt, deserializeRangeWithSheet as ve, normalizeSheetName as Mi, serializeRangeToRefString as Et, generateStringWithSequence as dn, getAbsoluteRefTypeWitString as Di, SetFormulaCalculationStartMutation as Yt, SetFormulaCalculationStopMutation as gi, SetFormulaCalculationNotificationMutation as xi, FormulaExecuteStageType as Wt, FormulaExecutedStateType as Be, SetFormulaDataMutation as pt, initSheetFormulaData as _n, RegisterFunctionMutation as vi, UnregisterFunctionMutation as yi, serializeRangeWithSpreadsheet as qi, serializeRangeWithSheet as Fi, SetOtherFormulaMutation as Ui, RemoveOtherFormulaMutation as Bi, UniverFormulaEnginePlugin as Vi } from "@univerjs/engine-formula";
+import { IRenderManagerService as Ft, DeviceInputEventType as de, ITextSelectionRenderManager as Hi } from "@univerjs/engine-render";
+import { SetRangeValuesMutation as pe, SetStyleCommand as pn, MoveRangeMutation as On, MoveRowsMutation as Mn, MoveColsMutation as Dn, ReorderRangeMutation as gn, RemoveRowMutation as xn, RemoveColMutation as vn, RemoveSheetMutation as nn, InsertSheetMutation as an, SetDefinedNameCommand as rn, INTERCEPTOR_POINT as na, SheetInterceptorService as Ln, SetRangeValuesUndoMutationFactory as wi, SetRangeValuesCommand as Gi, SelectionManagerService as An, getSheetCommandTarget as Xi, getCellAtRowCol as Yi, SetSelectionsOperation as Wi, NORMAL_SELECTION_PLUGIN_NAME as Me, WorkbookEditablePermission as aa, WorksheetEditPermission as ia, WorksheetSetCellValuePermission as ra, RangeProtectionPermissionEditPoint as ua, convertSelectionDataToRange as Kt, getNormalSelectionStyle as Ki, setEndForRange as ki, getPrimaryForRange as $i, SetBorderCommand as oa, ClearSelectionFormatCommand as ma, INumfmtService as ji, handleMoveRange as ca, EffectRefRangId as k, runRefRangeMutations as $, handleMoveRows as fa, handleMoveCols as sa, handleInsertRow as la, handleInsertCol as da, handleIRemoveRow as pa, handleIRemoveCol as La, handleDeleteRangeMoveLeft as Aa, handleDeleteRangeMoveUp as Pa, handleInsertRangeMoveDown as ba, handleInsertRangeMoveRight as Ta, RemoveSheetCommand as Qi, SetWorksheetNameCommand as zi, DeleteRangeMoveLeftCommand as Zi, DeleteRangeMoveUpCommand as Ji, RemoveColCommand as er, RemoveRowCommand as tr, InsertRangeMoveDownCommand as nr, InsertRangeMoveRightCommand as ar, InsertColCommand as ir, InsertRowCommand as rr, MoveColsCommand as ur, MoveRowsCommand as or, MoveRangeCommand as mr, SetWorksheetActiveOperation as cr, InsertDefinedNameCommand as fr, RemoveDefinedNameCommand as sr, RefRangeService as lr, handleDefaultRangeChangeWithEffectRefCommands as dr } from "@univerjs/sheets";
+import { DATA_TYPE as yn, APPLY_TYPE as pr, IAutoFillService as Lr, PREDEFINED_HOOK_NAME as Ve, COPY_TYPE as Ea, ISheetClipboardService as Ar, SelectionShape as Pr, IEditorBridgeService as Sa, SheetSkeletonManagerService as Ia, ISelectionRenderService as Na, SheetPasteCommand as br, useActiveWorkbook as Tr, getCurrentRangeDisable$ as Ra, PASTE_SPECIAL_MENU_ID as Er, whenFormulaEditorActivated as ct, getEditorObject as qn, MoveSelectionCommand as Fn, JumpOver as Un, ExpandSelectionCommand as Bn, CellAlertType as Sr, HoverManagerService as Ir, CellAlertManagerService as Nr } from "@univerjs/sheets-ui";
+import { IEditorService as Ge, ISidebarService as Rr, MenuGroup as Cr, MenuItemType as Pn, MenuPosition as hr, getMenuHiddenObservable as _r, IClipboardInterfaceService as Vn, KeyCode as H, MetaKeys as Ne, ComponentManager as Or, BuiltInUIPart as Mr, IMenuService as Dr, IShortcutService as gr, IUIPartsService as xr, SetEditorResizeOperation as vr, IContextMenuService as yr, IProgressService as qr } from "@univerjs/ui";
+import { useDependency as le, connectInjector as Fr } from "@wendellhu/redi/react-bindings";
+import { Subject as xe, combineLatestWith as Ur, map as ze, switchMap as Br, of as Hn, Observable as Vr, merge as wn, filter as un, bufferTime as Hr } from "rxjs";
+import wr, { forwardRef as ft, useRef as Ca, createElement as st, useState as Y, useEffect as ht } from "react";
+import { Popup as ha, Select as Gr, Input as Xr, Button as kt } from "@univerjs/design";
+import { ReplaceContentCommand as Yr, DocSkeletonManagerService as Wr, MoveCursorOperation as Kr, TextSelectionManagerService as kr } from "@univerjs/docs";
+const bn = "formula-ui";
+var $r = Object.defineProperty, jr = Object.getOwnPropertyDescriptor, Qr = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? jr(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
-  return n && i && kr(e, t, i), i;
-}, At = (a, e) => (t, n) => e(t, n, a);
-let Je = class extends re {
+  return n && i && $r(e, t, i), i;
+}, Lt = (a, e) => (t, n) => e(t, n, a);
+let Ze = class extends re {
   constructor(a, e, t, n) {
     super(), this._activeDirtyManagerService = a, this._univerInstanceService = e, this._formulaDataModel = t, this._definedNamesService = n, this._initialize();
   }
@@ -31,7 +31,7 @@ let Je = class extends re {
       commandId: pe.id,
       getDirtyData: (a) => {
         const e = a.params;
-        return e.trigger === dn.id ? {} : {
+        return e.trigger === pn.id ? {} : {
           dirtyRanges: this._getSetRangeValuesMutationDirtyRange(e)
         };
       }
@@ -107,14 +107,14 @@ let Je = class extends re {
     });
   }
   _initialDefinedName() {
-    this._activeDirtyManagerService.register(Nn.id, {
-      commandId: Nn.id,
+    this._activeDirtyManagerService.register(Rn.id, {
+      commandId: Rn.id,
       getDirtyData: (a) => {
         const e = a.params;
         return { dirtyDefinedNameMap: this._getDefinedNameMutation(e) };
       }
-    }), this._activeDirtyManagerService.register(Rn.id, {
-      commandId: Rn.id,
+    }), this._activeDirtyManagerService.register(Cn.id, {
+      commandId: Cn.id,
       getDirtyData: (a) => {
         const e = a.params;
         return { dirtyDefinedNameMap: this._getDefinedNameMutation(e) };
@@ -149,37 +149,37 @@ let Je = class extends re {
   }
   _getDeleteRangeMutationDirtyRange(a) {
     const { subUnitId: e, unitId: t, range: n, shiftDimension: i } = a, u = [], o = this._univerInstanceService.getUniverSheetInstance(t), m = o == null ? void 0 : o.getSheetBySheetId(e), c = (m == null ? void 0 : m.getLastRowWithContent()) || 0, f = (m == null ? void 0 : m.getLastColumnWithContent()) || 0, d = new Q();
-    let s = null;
-    const { startRow: l, startColumn: L, endRow: A, endColumn: E } = n;
-    i === Sn.ROWS ? s = this._rangeToMatrix({
-      startRow: l,
+    let l = null;
+    const { startRow: s, startColumn: L, endRow: A, endColumn: E } = n;
+    i === In.ROWS ? l = this._rangeToMatrix({
+      startRow: s,
       startColumn: L,
       endRow: c,
       endColumn: E
-    }) : i === Sn.COLUMNS && (s = this._rangeToMatrix({
-      startRow: l,
+    }) : i === In.COLUMNS && (l = this._rangeToMatrix({
+      startRow: s,
       startColumn: L,
       endRow: A,
       endColumn: f
-    })), s != null && d.merge(s);
+    })), l != null && d.merge(l);
     const b = d.getData();
     return u.push(...this._getDirtyRangesByCellValue(t, e, b)), u.push(...this._getDirtyRangesForArrayFormula(t, e, b)), u;
   }
   _getRemoveRowOrColumnMutation(a, e = !0) {
     const { subUnitId: t, unitId: n, range: i } = a, u = [], o = this._univerInstanceService.getUniverSheetInstance(n), m = o == null ? void 0 : o.getSheetBySheetId(t), c = (m == null ? void 0 : m.getRowCount()) || 0, f = (m == null ? void 0 : m.getColumnCount()) || 0, d = new Q();
-    let s = null;
-    const { startRow: l, endRow: L, startColumn: A, endColumn: E } = i;
-    e === !0 ? s = this._rangeToMatrix({
-      startRow: l,
+    let l = null;
+    const { startRow: s, endRow: L, startColumn: A, endColumn: E } = i;
+    e === !0 ? l = this._rangeToMatrix({
+      startRow: s,
       startColumn: 0,
       endRow: L,
       endColumn: f - 1
-    }) : s = this._rangeToMatrix({
+    }) : l = this._rangeToMatrix({
       startRow: 0,
       startColumn: A,
       endRow: c,
       endColumn: E
-    }), s != null && d.merge(s);
+    }), l != null && d.merge(l);
     const b = d.getData();
     return u.push(...this._getDirtyRangesByCellValue(n, t, b)), u.push(...this._getDirtyRangesForArrayFormula(n, t, b)), u;
   }
@@ -217,7 +217,7 @@ let Je = class extends re {
     if ((o = u == null ? void 0 : u[a]) != null && o[e]) {
       const c = new Q((m = u == null ? void 0 : u[a]) == null ? void 0 : m[e]);
       i.forValue((f, d) => {
-        c.forValue((s, l, L) => {
+        c.forValue((l, s, L) => {
           if (L == null)
             return !0;
           const { startRow: A, startColumn: E, endRow: b, endColumn: C } = L;
@@ -237,19 +237,19 @@ let Je = class extends re {
     return n;
   }
 };
-Je = jr([
-  Le(Ae.Ready, Je),
-  At(0, sn),
-  At(1, Pe),
-  At(2, y(Ge)),
-  At(3, Jn)
-], Je);
-var Qr = Object.defineProperty, zr = Object.getOwnPropertyDescriptor, Zr = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? zr(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+Ze = Qr([
+  Le(Ae.Ready, Ze),
+  Lt(0, ln),
+  Lt(1, Pe),
+  Lt(2, q(we)),
+  Lt(3, Jn)
+], Ze);
+var zr = Object.defineProperty, Zr = Object.getOwnPropertyDescriptor, Jr = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? Zr(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
-  return n && i && Qr(e, t, i), i;
-}, Pt = (a, e) => (t, n) => e(t, n, a);
-let et = class extends re {
+  return n && i && zr(e, t, i), i;
+}, At = (a, e) => (t, n) => e(t, n, a);
+let Je = class extends re {
   constructor(a, e, t, n) {
     super(), this._commandService = a, this._sheetInterceptorService = e, this._formulaDataModel = t, this._themeService = n, this._initialize();
   }
@@ -271,40 +271,40 @@ let et = class extends re {
   }
   _initInterceptorCellContent() {
     this.disposeWithMe(
-      this._sheetInterceptorService.intercept(pn.CELL_CONTENT, {
+      this._sheetInterceptorService.intercept(na.CELL_CONTENT, {
         priority: 100,
         handler: (a, e, t) => {
-          var f, d, s;
-          const { unitId: n, subUnitId: i, row: u, col: o } = e, m = this._formulaDataModel.getArrayFormulaCellData(), c = (s = (d = (f = m == null ? void 0 : m[n]) == null ? void 0 : f[i]) == null ? void 0 : d[u]) == null ? void 0 : s[o];
+          var f, d, l;
+          const { unitId: n, subUnitId: i, row: u, col: o } = e, m = this._formulaDataModel.getArrayFormulaCellData(), c = (l = (d = (f = m == null ? void 0 : m[n]) == null ? void 0 : f[i]) == null ? void 0 : d[u]) == null ? void 0 : l[o];
           return c == null ? t(a) : c.v == null && c.t == null ? t({
             ...a,
             ...c,
             v: 0,
             // Default value for empty cell
-            t: He.NUMBER
-          }) : (a == null ? void 0 : a.t) === He.NUMBER && typeof (a == null ? void 0 : a.v) == "number" ? t({
+            t: Rt.NUMBER
+          }) : (a == null ? void 0 : a.t) === Rt.NUMBER && typeof (a == null ? void 0 : a.v) == "number" ? t({
             ...a,
             ...c,
-            v: ea(a.v)
+            v: fi(a.v)
           }) : t({ ...a, ...c });
         }
       })
     );
   }
 };
-et = Zr([
-  Le(Ae.Ready, et),
-  Pt(0, fe),
-  Pt(1, y(Ut)),
-  Pt(2, y(Ge)),
-  Pt(3, y(fn))
-], et);
-var Jr = Object.defineProperty, eu = Object.getOwnPropertyDescriptor, tu = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? eu(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+Je = Jr([
+  Le(Ae.Ready, Je),
+  At(0, fe),
+  At(1, q(Ln)),
+  At(2, q(we)),
+  At(3, q(sn))
+], Je);
+var eu = Object.defineProperty, tu = Object.getOwnPropertyDescriptor, nu = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? tu(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
-  return n && i && Jr(e, t, i), i;
+  return n && i && eu(e, t, i), i;
 }, Gn = (a, e) => (t, n) => e(t, n, a);
-let It = class extends re {
+let St = class extends re {
   constructor(a, e) {
     super(), this._autoFillService = a, this._lexerTreeBuilder = e, this._initialize();
   }
@@ -313,12 +313,12 @@ let It = class extends re {
   }
   _registerAutoFill() {
     const a = {
-      type: qn.FORMULA,
+      type: yn.FORMULA,
       priority: 1001,
-      match: (e) => Ee(e == null ? void 0 : e.f) || Ne(e == null ? void 0 : e.si),
-      isContinue: (e, t) => e.type === qn.FORMULA,
+      match: (e) => Ie(e == null ? void 0 : e.f) || ye(e == null ? void 0 : e.si),
+      isContinue: (e, t) => e.type === yn.FORMULA,
       applyFunctions: {
-        [lr.COPY]: (e, t, n, i) => {
+        [pr.COPY]: (e, t, n, i) => {
           const { data: u, index: o } = e;
           return this._fillCopyFormula(u, t, n, o, i);
         }
@@ -328,39 +328,39 @@ let It = class extends re {
   }
   _fillCopyFormula(a, e, t, n, i) {
     var c, f;
-    const u = au(i), o = [], m = /* @__PURE__ */ new Map();
+    const u = iu(i), o = [], m = /* @__PURE__ */ new Map();
     for (let d = 1; d <= e; d++) {
-      const s = (d - 1) % a.length, l = ie.deepClone(a[s]);
-      if (l) {
-        const L = ((c = a[s]) == null ? void 0 : c.f) || "", A = ((f = a[s]) == null ? void 0 : f.si) || "", E = Ee(L);
-        if (Ne(A))
-          l.si = A, l.f = null, l.v = null, l.p = null, t === X.DOWN || t === X.RIGHT ? o.push(l) : o.unshift(l);
+      const l = (d - 1) % a.length, s = ie.deepClone(a[l]);
+      if (s) {
+        const L = ((c = a[l]) == null ? void 0 : c.f) || "", A = ((f = a[l]) == null ? void 0 : f.si) || "", E = Ie(L);
+        if (ye(A))
+          s.si = A, s.f = null, s.v = null, s.p = null, s.t = null, t === X.DOWN || t === X.RIGHT ? o.push(s) : o.unshift(s);
         else if (E) {
-          let C = m.get(s);
+          let C = m.get(l);
           if (C)
-            l.si = C, l.f = null, l.v = null, l.p = null;
+            s.si = C, s.f = null, s.v = null, s.p = null, s.t = null;
           else {
-            C = ie.generateRandomId(6), m.set(s, C);
-            const { offsetX: T, offsetY: p } = nu(u, t), h = this._lexerTreeBuilder.moveFormulaRefOffset(
+            C = ie.generateRandomId(6), m.set(l, C);
+            const { offsetX: T, offsetY: p } = au(u, t), h = this._lexerTreeBuilder.moveFormulaRefOffset(
               L,
               T,
               p
             );
-            l.si = C, l.f = h, l.v = null, l.p = null;
+            s.si = C, s.f = h, s.v = null, s.p = null, s.t = null;
           }
-          t === X.DOWN || t === X.RIGHT ? o.push(l) : o.unshift(l);
+          t === X.DOWN || t === X.RIGHT ? o.push(s) : o.unshift(s);
         }
       }
     }
     return o;
   }
 };
-It = tu([
-  Le(Ae.Ready, It),
-  Gn(0, dr),
-  Gn(1, y(Xe))
-], It);
-function nu(a, e) {
+St = nu([
+  Le(Ae.Ready, St),
+  Gn(0, Lr),
+  Gn(1, q(mt))
+], St);
+function au(a, e) {
   let t = 0, n = 0;
   switch (e) {
     case X.UP:
@@ -378,7 +378,7 @@ function nu(a, e) {
   }
   return { offsetX: t, offsetY: n };
 }
-function au(a) {
+function iu(a) {
   let e = 0;
   for (const t in a)
     a[t].forEach((n) => {
@@ -386,13 +386,13 @@ function au(a) {
     });
   return e;
 }
-var iu = Object.defineProperty, ru = Object.getOwnPropertyDescriptor, uu = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? ru(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var ru = Object.defineProperty, uu = Object.getOwnPropertyDescriptor, ou = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? uu(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
-  return n && i && iu(e, t, i), i;
-}, ke = (a, e) => (t, n) => e(t, n, a);
-const ou = "default-paste-formula";
-let tt = class extends re {
+  return n && i && ru(e, t, i), i;
+}, Ke = (a, e) => (t, n) => e(t, n, a);
+const mu = "default-paste-formula";
+let et = class extends re {
   constructor(a, e, t, n, i) {
     super(), this._currentUniverSheet = a, this._lexerTreeBuilder = e, this._sheetClipboardService = t, this._injector = n, this._formulaDataModel = i, this._initialize();
   }
@@ -412,13 +412,13 @@ let tt = class extends re {
   }
   _pasteWithFormulaHook() {
     return {
-      id: ou,
+      id: mu,
       priority: 10,
       onPasteCells: (a, e, t, n) => this._onPasteCells(a, e, t, n, !1)
     };
   }
   _onPasteCells(a, e, t, n, i) {
-    var l;
+    var s;
     const u = n.pasteType;
     if (u === Ve.SPECIAL_PASTE_VALUE || u === Ve.SPECIAL_PASTE_FORMAT || u === Ve.SPECIAL_PASTE_COL_WIDTH)
       return {
@@ -429,13 +429,13 @@ let tt = class extends re {
       copyType: n.copyType || Ea.COPY,
       copyRange: a == null ? void 0 : a.range,
       pasteType: n.pasteType
-    }, m = e.range, c = t, f = this._currentUniverSheet.getCurrentUnitForType(G.UNIVER_SHEET), d = e.unitId || f.getUnitId(), s = e.subUnitId || ((l = f.getActiveSheet()) == null ? void 0 : l.getSheetId());
-    return !d || !s ? {
+    }, m = e.range, c = t, f = this._currentUniverSheet.getCurrentUnitForType(G.UNIVER_SHEET), d = e.unitId || f.getUnitId(), l = e.subUnitId || ((s = f.getActiveSheet()) == null ? void 0 : s.getSheetId());
+    return !d || !l ? {
       undos: [],
       redos: []
-    } : this._injector.invoke((L) => mu(
+    } : this._injector.invoke((L) => cu(
       d,
-      s,
+      l,
       m,
       c,
       L,
@@ -447,73 +447,73 @@ let tt = class extends re {
     ));
   }
 };
-tt = uu([
-  Le(Ae.Ready, tt),
-  ke(0, Pe),
-  ke(1, y(Xe)),
-  ke(2, pr),
-  ke(3, y(mt)),
-  ke(4, y(Ge))
-], tt);
-function mu(a, e, t, n, i, u, o, m, c = !1, f) {
-  const d = [], s = [], l = new Q(), L = /* @__PURE__ */ new Map();
+et = ou([
+  Le(Ae.Ready, et),
+  Ke(0, Pe),
+  Ke(1, q(mt)),
+  Ke(2, Ar),
+  Ke(3, q(ot)),
+  Ke(4, q(we))
+], et);
+function cu(a, e, t, n, i, u, o, m, c = !1, f) {
+  const d = [], l = [], s = new Q(), L = /* @__PURE__ */ new Map();
   let A = 0, E = 0;
   if (u && u.copyRange) {
     const { copyType: T, copyRange: p } = u;
     T === Ea.COPY && p && (A = p.rows.length, E = p.cols.length);
   }
   n.forValue((T, p, h) => {
-    var q, D, U, I;
+    var y, D, U, I;
     const _ = h.f || "", V = h.si || "";
     let R = {};
     if (c && (R = ie.deepClone(h), R.s = null), !(!A || !E)) {
-      if (Ne(V)) {
+      if (ye(V)) {
         const { unitId: g = "", subUnitId: te = "", range: W } = f || {};
         if ((g && a !== g || te && e !== te) && (W != null && W.rows) && (W != null && W.cols)) {
-          const ne = m.getFormulaStringByCell(W.rows[T], W.cols[p], te, g), Ce = T % A, se = p % E, We = u != null && u.copyRange ? (q = u == null ? void 0 : u.copyRange) == null ? void 0 : q.cols[se] : se, ue = u != null && u.copyRange ? (D = u == null ? void 0 : u.copyRange) == null ? void 0 : D.rows[Ce] : Ce, Ke = t.cols[p] - We, he = t.rows[T] - ue, Ht = o.moveFormulaRefOffset(ne || "", Ke, he);
-          R.si = null, R.f = Ht, R.v = null, R.p = null;
+          const ne = m.getFormulaStringByCell(W.rows[T], W.cols[p], te, g), Re = T % A, se = p % E, Ye = u != null && u.copyRange ? (y = u == null ? void 0 : u.copyRange) == null ? void 0 : y.cols[se] : se, ue = u != null && u.copyRange ? (D = u == null ? void 0 : u.copyRange) == null ? void 0 : D.rows[Re] : Re, We = t.cols[p] - Ye, Ce = t.rows[T] - ue, Vt = o.moveFormulaRefOffset(ne || "", We, Ce);
+          R.si = null, R.f = Vt, R.v = null, R.p = null;
         } else
           R.si = V, R.f = null, R.v = null, R.p = null;
-      } else if (Ee(_)) {
+      } else if (Ie(_)) {
         const g = T % A, te = p % E, W = `${g}_${te}`;
         let ne = L.get(W);
         if (ne)
           R.si = ne, R.f = null, R.v = null, R.p = null;
         else {
           ne = ie.generateRandomId(6), L.set(W, ne);
-          const Ce = u != null && u.copyRange ? (U = u == null ? void 0 : u.copyRange) == null ? void 0 : U.cols[te] : te, se = u != null && u.copyRange ? (I = u == null ? void 0 : u.copyRange) == null ? void 0 : I.rows[g] : g, We = t.cols[p] - Ce, ue = t.rows[T] - se, Ke = o.moveFormulaRefOffset(_, We, ue);
-          R.si = ne, R.f = Ke, R.v = null, R.p = null;
+          const Re = u != null && u.copyRange ? (U = u == null ? void 0 : u.copyRange) == null ? void 0 : U.cols[te] : te, se = u != null && u.copyRange ? (I = u == null ? void 0 : u.copyRange) == null ? void 0 : I.rows[g] : g, Ye = t.cols[p] - Re, ue = t.rows[T] - se, We = o.moveFormulaRefOffset(_, Ye, ue);
+          R.si = ne, R.f = We, R.v = null, R.p = null;
         }
       }
       if (u.pasteType === Ve.SPECIAL_PASTE_FORMULA && h.p) {
-        const g = cu(h);
+        const g = fu(h);
         g && (R.p = null, R.v = g);
       }
-      l.setValue(t.rows[T], t.cols[p], R);
+      s.setValue(t.rows[T], t.cols[p], R);
     }
   });
   const b = {
     unitId: a,
     subUnitId: e,
-    cellValue: l.getData()
+    cellValue: s.getData()
   };
   d.push({
     id: pe.id,
     params: b
   });
-  const C = Vi(
+  const C = wi(
     i,
     b
   );
-  return s.push({
+  return l.push({
     id: pe.id,
     params: C
   }), {
-    undos: s,
+    undos: l,
     redos: d
   };
 }
-function cu(a) {
+function fu(a) {
   if (a != null && a.p) {
     const e = a == null ? void 0 : a.p.body;
     if (e == null)
@@ -522,16 +522,16 @@ function cu(a) {
     return t.substring(t.length - 2, t.length) === jn ? t.substring(0, t.length - 2) : t;
   }
 }
-var fu = Object.defineProperty, su = Object.getOwnPropertyDescriptor, lu = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? su(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var su = Object.defineProperty, lu = Object.getOwnPropertyDescriptor, du = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? lu(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
-  return n && i && fu(e, t, i), i;
-}, be = (a, e) => (t, n) => e(t, n, a);
+  return n && i && su(e, t, i), i;
+}, _e = (a, e) => (t, n) => e(t, n, a);
 let _t = class extends re {
-  constructor(e, t, n, i, u, o, m, c, f, d) {
+  constructor(e, t, n, i, u, o, m, c) {
     super();
     x(this, "_previousShape");
-    this._context = e, this._editorBridgeService = t, this._formulaDataModel = n, this._lexerTreeBuilder = i, this._themeService = u, this._renderManagerService = o, this._selectionRenderService = m, this._sheetSkeletonManagerService = c, this._commandService = f, this._sheetInterceptorService = d, this._initInterceptorEditorStart(), this._commandExecutedListener(), this._initInterceptorCell();
+    this._context = e, this._editorBridgeService = t, this._formulaDataModel = n, this._themeService = i, this._renderManagerService = u, this._selectionRenderService = o, this._sheetSkeletonManagerService = m, this._commandService = c, this._initInterceptorEditorStart(), this._commandExecutedListener();
   }
   _initInterceptorEditorStart() {
     this.disposeWithMe(
@@ -544,18 +544,18 @@ let _t = class extends re {
               const { row: i, col: u, unitId: o, subUnitId: m, worksheet: c } = t, f = this._formulaDataModel.getArrayFormulaRange(), d = this._formulaDataModel.getArrayFormulaCellData();
               if (this._removeArrayFormulaRangeShape(), e == null)
                 return n(e);
-              let s = null;
-              const l = this._formulaDataModel.getFormulaStringByCell(i, u, m, o);
-              if (l !== null && (s = { f: l }), e.v != null && e.v !== "" && ((b = (E = (A = d[o]) == null ? void 0 : A[m]) == null ? void 0 : E[i]) == null ? void 0 : b[u]) == null)
-                return s ? { ...e, ...s } : n(e);
+              let l = null;
+              const s = this._formulaDataModel.getFormulaStringByCell(i, u, m, o);
+              if (s !== null && (l = { f: s }), e.v != null && e.v !== "" && ((b = (E = (A = d[o]) == null ? void 0 : A[m]) == null ? void 0 : E[i]) == null ? void 0 : b[u]) == null)
+                return l ? { ...e, ...l } : n(e);
               const L = (C = f == null ? void 0 : f[o]) == null ? void 0 : C[m];
               return L != null && new Q(L).forValue((T, p, h) => {
                 if (h == null)
                   return !0;
-                const { startRow: _, startColumn: V, endRow: R, endColumn: q } = h;
+                const { startRow: _, startColumn: V, endRow: R, endColumn: y } = h;
                 if (T === i && p === u)
                   return this._createArrayFormulaRangeShape(h, o), !1;
-                if (i >= _ && i <= R && u >= V && u <= q) {
+                if (i >= _ && i <= R && u >= V && u <= y) {
                   const D = c.getCell(_, V);
                   if ((D == null ? void 0 : D.v) === K.SPILL)
                     return;
@@ -565,34 +565,21 @@ let _t = class extends re {
                     m,
                     o
                   );
-                  return U == null || U.f == null ? !0 : (s == null && (s = {
+                  return U == null || U.f == null ? !0 : (l == null && (l = {
                     f: U.f,
                     isInArrayFormulaRange: !0
                   }), this._createArrayFormulaRangeShape(h, o), !1);
                 }
-              }), s ? { ...e, ...s } : n(e);
+              }), l ? { ...e, ...l } : n(e);
             }
           }
         )
       )
     );
   }
-  _initInterceptorCell() {
-    this.disposeWithMe(
-      this._sheetInterceptorService.intercept(pn.CELL_CONTENT, {
-        handler: (e, t, n) => e && e.v == null && e.t == null && e.f != null ? n({
-          ...e,
-          v: null,
-          // Default value for empty cell, information displayed before calculation
-          t: He.NUMBER
-        }) : n(e),
-        priority: 10
-      })
-    );
-  }
   _commandExecutedListener() {
     this.disposeWithMe(this._commandService.onCommandExecuted((e, t) => {
-      (e.id === ta.id || e.id === Ct.id && t && t.remove) && this._removeArrayFormulaRangeShape();
+      (e.id === ea.id || e.id === Ct.id && t && t.remove) && this._removeArrayFormulaRangeShape();
     }));
   }
   _createArrayFormulaRangeShape(e, t) {
@@ -611,56 +598,54 @@ let _t = class extends re {
       style: u
     }), f = (L = this._sheetSkeletonManagerService.getCurrent()) == null ? void 0 : L.skeleton;
     if (!o || !f) return;
-    const { rowHeaderWidth: d, columnHeaderHeight: s } = f, l = new Lr(o, 100, !1, this._themeService);
-    l.update(m, d, s, u, c), l.setEvent(!1), this._previousShape = l;
+    const { rowHeaderWidth: d, columnHeaderHeight: l } = f, s = new Pr(o, 100, !1, this._themeService);
+    s.update(m, d, l, u, c), s.setEvent(!1), this._previousShape = s;
   }
   _removeArrayFormulaRangeShape() {
     this._previousShape != null && (this._previousShape.dispose(), this._previousShape = null);
   }
 };
-_t = lu([
-  be(1, y(Sa)),
-  be(2, y(Ge)),
-  be(3, y(Xe)),
-  be(4, y(fn)),
-  be(5, Ft),
-  be(6, Na),
-  be(7, y(Ia)),
-  be(8, fe),
-  be(9, y(Ut))
+_t = du([
+  _e(1, q(Sa)),
+  _e(2, q(we)),
+  _e(3, q(sn)),
+  _e(4, Ft),
+  _e(5, Na),
+  _e(6, q(Ia)),
+  _e(7, fe)
 ], _t);
 const _a = {
   id: "sheet.command.paste-formula",
-  type: Se.COMMAND,
-  handler: async (a) => a.get(fe).executeCommand(Ar.id, {
+  type: Te.COMMAND,
+  handler: async (a) => a.get(fe).executeCommand(br.id, {
     value: Ve.SPECIAL_PASTE_FORMULA
   })
 }, Oa = {
   id: "formula-ui.command.insert-function",
-  type: Se.COMMAND,
+  type: Te.COMMAND,
   handler: async (a, e) => {
     const { list: t } = e, n = a.get(fe), i = new Q();
     t.forEach((o) => {
-      const { range: m, primary: c, formula: f } = o, { row: d, column: s } = c, l = ie.generateRandomId(6);
-      i.setValue(d, s, {
+      const { range: m, primary: c, formula: f } = o, { row: d, column: l } = c, s = ie.generateRandomId(6);
+      i.setValue(d, l, {
         f,
-        si: l
+        si: s
       });
       const { startRow: L, startColumn: A, endRow: E, endColumn: b } = m;
       for (let C = L; C <= E; C++)
         for (let T = A; T <= b; T++)
-          (C !== d || T !== s) && i.setValue(C, T, {
-            si: l
+          (C !== d || T !== l) && i.setValue(C, T, {
+            si: s
           });
     });
     const u = {
       value: i.getData()
     };
-    return n.executeCommand(Hi.id, u);
+    return n.executeCommand(Gi.id, u);
   }
-}, ye = {
+}, qe = {
   id: "formula-ui.operation.select-editor-formula",
-  type: Se.OPERATION,
+  type: Te.OPERATION,
   handler: (a, e) => (
     // const { eventType, keycode } = params;
     // const formulaPromptService = accessor.get(IFormulaPromptService);
@@ -690,14 +675,14 @@ const _a = {
     // }
     !0
   )
-}, Fe = yt("formula-ui.prompt-service");
+}, Fe = qt("formula-ui.prompt-service");
 class Ma {
   constructor() {
-    x(this, "_search$", new ve());
-    x(this, "_help$", new ve());
-    x(this, "_navigate$", new ve());
-    x(this, "_accept$", new ve());
-    x(this, "_acceptFormulaName$", new ve());
+    x(this, "_search$", new xe());
+    x(this, "_help$", new xe());
+    x(this, "_navigate$", new xe());
+    x(this, "_accept$", new xe());
+    x(this, "_acceptFormulaName$", new xe());
     x(this, "search$", this._search$.asObservable());
     x(this, "help$", this._help$.asObservable());
     x(this, "navigate$", this._navigate$.asObservable());
@@ -856,35 +841,35 @@ class Ma {
     return this._isLockedOnSelectionInsertRefString;
   }
 }
-const un = {
+const on = {
   id: "formula-ui.operation.help-function",
-  type: Se.OPERATION,
+  type: Te.OPERATION,
   handler: async (a, e) => (a.get(Fe).help(e), !0)
-}, bn = {
+}, Tn = {
   id: "formula-ui.operation.insert-function",
-  type: Se.OPERATION,
+  type: Te.OPERATION,
   handler: async (a, e) => {
     var C, T;
-    const t = a.get(Ln), n = a.get(ft), i = t.getSelections();
+    const t = a.get(An), n = a.get(Ge), i = t.getSelections();
     if (!i || !i.length)
       return !1;
-    const u = wi(a.get(Pe));
+    const u = Xi(a.get(Pe));
     if (!u) return !1;
-    const { worksheet: o, unitId: m, subUnitId: c } = u, f = o.getCellMatrix(), { value: d } = e, s = a.get(fe), l = [];
+    const { worksheet: o, unitId: m, subUnitId: c } = u, f = o.getCellMatrix(), { value: d } = e, l = a.get(fe), s = [];
     let L = null, A = 0, E = 0, b = "";
-    if (i.length === 1 && (Lu(i[0].range) || Au(i[0].range))) {
+    if (i.length === 1 && (Au(i[0].range) || Pu(i[0].range))) {
       const { range: p, primary: h } = i[0], _ = (C = h == null ? void 0 : h.actualRow) != null ? C : p.startRow, V = (T = h == null ? void 0 : h.actualColumn) != null ? T : p.startColumn;
       L = p, A = _, E = V;
       const R = Xn(f, _, V);
-      R && (b = ot(R));
+      R && (b = ut(R));
     } else
       i.some((p) => {
         var I, g;
-        const { range: h, primary: _ } = p, V = (I = _ == null ? void 0 : _.actualRow) != null ? I : h.startRow, R = (g = _ == null ? void 0 : _.actualColumn) != null ? g : h.startColumn, q = Xn(f, V, R);
-        if (!q)
+        const { range: h, primary: _ } = p, V = (I = _ == null ? void 0 : _.actualRow) != null ? I : h.startRow, R = (g = _ == null ? void 0 : _.actualColumn) != null ? g : h.startColumn, y = Xn(f, V, R);
+        if (!y)
           return L = h, A = V, E = R, !0;
-        const D = ot(q), U = `=${d}(${D})`;
-        return l.push({
+        const D = ut(y), U = `=${d}(${D})`;
+        return s.push({
           range: h,
           primary: {
             row: V,
@@ -894,8 +879,8 @@ const un = {
         }), !1;
       });
     if (L) {
-      const p = Gi(A, E, o), h = {
-        range: ge.clone(L),
+      const p = Yi(A, E, o), h = {
+        range: De.clone(L),
         primary: {
           startRow: p.startRow,
           startColumn: p.startColumn,
@@ -909,20 +894,20 @@ const un = {
       }, _ = {
         unitId: m,
         subUnitId: c,
-        pluginName: De,
+        pluginName: Me,
         selections: [h]
       };
-      await s.executeCommand(Xi.id, _), setTimeout(() => {
+      await l.executeCommand(Wi.id, _), setTimeout(() => {
         n.setFormula(`=${d}(${b}`);
       }, 0);
     }
-    return l.length === 0 ? !1 : s.executeCommand(Oa.id, {
-      list: l
+    return s.length === 0 ? !1 : l.executeCommand(Oa.id, {
+      list: s
     });
   }
 };
 function Xn(a, e, t) {
-  const n = du(a, e, t);
+  const n = pu(a, e, t);
   if (n !== e)
     return {
       startRow: n,
@@ -930,7 +915,7 @@ function Xn(a, e, t) {
       startColumn: t,
       endColumn: t
     };
-  const i = pu(a, e, t);
+  const i = Lu(a, e, t);
   return i !== t ? {
     startRow: e,
     endRow: e,
@@ -938,7 +923,7 @@ function Xn(a, e, t) {
     endColumn: t - 1
   } : null;
 }
-function du(a, e, t) {
+function pu(a, e, t) {
   let n = !1;
   if (e === 0) return e;
   for (let i = e - 1; i >= 0; i--) {
@@ -955,7 +940,7 @@ function du(a, e, t) {
   }
   return e;
 }
-function pu(a, e, t) {
+function Lu(a, e, t) {
   let n = !1;
   if (t === 0) return t;
   for (let i = t - 1; i >= 0; i--) {
@@ -980,31 +965,31 @@ function Ot(a) {
     const t = e.dataStream, i = t.substring(t.length - 2, t.length) === jn ? t.substring(0, t.length - 2) : t;
     return za(i);
   }
-  return a && (a.t === He.NUMBER || Za(a) === He.NUMBER);
+  return a && (a.t === Rt.NUMBER || Za(a) === Rt.NUMBER);
 }
-function Lu(a) {
+function Au(a) {
   return a.startRow === a.endRow && a.startColumn === a.endColumn;
 }
-function Au(a) {
+function Pu(a) {
   return a.startRow !== a.endRow && a.startColumn !== a.endColumn;
 }
-const Da = `${Pn}_MORE_FUNCTIONS_COMPONENT`, ga = {
+const Da = `${bn}_MORE_FUNCTIONS_COMPONENT`, ga = {
   id: "formula-ui.operation.more-functions",
-  type: Se.OPERATION,
-  handler: async (a) => (a.get(Ir).open({
+  type: Te.OPERATION,
+  handler: async (a) => (a.get(Rr).open({
     header: { title: "formula.insert.tooltip" },
     children: { label: Da }
   }), !0)
-}, Tn = {
+}, En = {
   id: "formula-ui.operation.change-ref-to-absolute",
-  type: Se.OPERATION,
+  type: Te.OPERATION,
   handler: async (a) => !0
-}, on = {
+}, mn = {
   id: "formula-ui.operation.search-function",
-  type: Se.OPERATION,
+  type: Te.OPERATION,
   handler: async (a, e) => (a.get(Fe).search(e), !0)
 };
-var xa = { exports: {} }, Bt = {};
+var xa = { exports: {} }, Ut = {};
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -1014,18 +999,18 @@ var xa = { exports: {} }, Bt = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var Pu = Hr, bu = Symbol.for("react.element"), Tu = Symbol.for("react.fragment"), Eu = Object.prototype.hasOwnProperty, Su = Pu.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, Iu = { key: !0, ref: !0, __self: !0, __source: !0 };
+var bu = wr, Tu = Symbol.for("react.element"), Eu = Symbol.for("react.fragment"), Su = Object.prototype.hasOwnProperty, Iu = bu.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, Nu = { key: !0, ref: !0, __self: !0, __source: !0 };
 function va(a, e, t) {
   var n, i = {}, u = null, o = null;
   t !== void 0 && (u = "" + t), e.key !== void 0 && (u = "" + e.key), e.ref !== void 0 && (o = e.ref);
-  for (n in e) Eu.call(e, n) && !Iu.hasOwnProperty(n) && (i[n] = e[n]);
+  for (n in e) Su.call(e, n) && !Nu.hasOwnProperty(n) && (i[n] = e[n]);
   if (a && a.defaultProps) for (n in e = a.defaultProps, e) i[n] === void 0 && (i[n] = e[n]);
-  return { $$typeof: bu, type: a, key: u, ref: o, props: i, _owner: Su.current };
+  return { $$typeof: Tu, type: a, key: u, ref: o, props: i, _owner: Iu.current };
 }
-Bt.Fragment = Tu;
-Bt.jsx = va;
-Bt.jsxs = va;
-xa.exports = Bt;
+Ut.Fragment = Eu;
+Ut.jsx = va;
+Ut.jsxs = va;
+xa.exports = Ut;
 var N = xa.exports, ce = function() {
   return ce = Object.assign || function(a) {
     for (var e, t = 1, n = arguments.length; t < n; t++) {
@@ -1034,23 +1019,23 @@ var N = xa.exports, ce = function() {
     }
     return a;
   }, ce.apply(this, arguments);
-}, Nu = function(a, e) {
+}, Ru = function(a, e) {
   var t = {};
   for (var n in a) Object.prototype.hasOwnProperty.call(a, n) && e.indexOf(n) < 0 && (t[n] = a[n]);
   if (a != null && typeof Object.getOwnPropertySymbols == "function")
     for (var i = 0, n = Object.getOwnPropertySymbols(a); i < n.length; i++)
       e.indexOf(n[i]) < 0 && Object.prototype.propertyIsEnumerable.call(a, n[i]) && (t[n[i]] = a[n[i]]);
   return t;
-}, dt = st(function(a, e) {
-  var t = a.icon, n = a.id, i = a.className, u = a.extend, o = Nu(a, ["icon", "id", "className", "extend"]), m = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), c = Ca("_".concat(hu()));
-  return qa(t, "".concat(n), { defIds: t.defIds, idSuffix: c.current }, ce({ ref: e, className: m }, o), u);
+}, lt = ft(function(a, e) {
+  var t = a.icon, n = a.id, i = a.className, u = a.extend, o = Ru(a, ["icon", "id", "className", "extend"]), m = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), c = Ca("_".concat(_u()));
+  return ya(t, "".concat(n), { defIds: t.defIds, idSuffix: c.current }, ce({ ref: e, className: m }, o), u);
 });
-function qa(a, e, t, n, i) {
-  return lt(a.tag, ce(ce({ key: e }, Ru(a, t, i)), n), (Cu(a, t).children || []).map(function(u, o) {
-    return qa(u, "".concat(e, "-").concat(a.tag, "-").concat(o), t, void 0, i);
+function ya(a, e, t, n, i) {
+  return st(a.tag, ce(ce({ key: e }, Cu(a, t, i)), n), (hu(a, t).children || []).map(function(u, o) {
+    return ya(u, "".concat(e, "-").concat(a.tag, "-").concat(o), t, void 0, i);
   }));
 }
-function Ru(a, e, t) {
+function Cu(a, e, t) {
   var n = ce({}, a.attrs);
   t != null && t.colorChannel1 && n.fill === "colorChannel1" && (n.fill = t.colorChannel1);
   var i = e.defIds;
@@ -1059,55 +1044,55 @@ function Ru(a, e, t) {
     typeof m == "string" && (n[o] = m.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), n;
 }
-function Cu(a, e) {
+function hu(a, e) {
   var t, n = e.defIds;
   return !n || n.length === 0 ? a : a.tag === "defs" && (!((t = a.children) === null || t === void 0) && t.length) ? ce(ce({}, a), { children: a.children.map(function(i) {
     return typeof i.attrs.id == "string" && n && n.indexOf(i.attrs.id) > -1 ? ce(ce({}, i), { attrs: ce(ce({}, i.attrs), { id: i.attrs.id + e.idSuffix }) }) : i;
   }) }) : a;
 }
-function hu() {
+function _u() {
   return Math.random().toString(36).substring(2, 8);
 }
-dt.displayName = "UniverIcon";
-var _u = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M14.1544 3.75557C14.3887 3.98988 14.3887 4.36978 14.1544 4.6041L6.51409 12.2444C6.40157 12.3569 6.24896 12.4201 6.08983 12.4201C5.9307 12.4201 5.77808 12.3569 5.66556 12.2444L1.84541 8.42425C1.6111 8.18993 1.6111 7.81003 1.84541 7.57572C2.07973 7.34141 2.45963 7.34141 2.69394 7.57572L6.08983 10.9716L13.3059 3.75557C13.5402 3.52126 13.9201 3.52126 14.1544 3.75557Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, ya = st(function(a, e) {
-  return lt(dt, Object.assign({}, a, {
+lt.displayName = "UniverIcon";
+var Ou = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M14.1544 3.75557C14.3887 3.98988 14.3887 4.36978 14.1544 4.6041L6.51409 12.2444C6.40157 12.3569 6.24896 12.4201 6.08983 12.4201C5.9307 12.4201 5.77808 12.3569 5.66556 12.2444L1.84541 8.42425C1.6111 8.18993 1.6111 7.81003 1.84541 7.57572C2.07973 7.34141 2.45963 7.34141 2.69394 7.57572L6.08983 10.9716L13.3059 3.75557C13.5402 3.52126 13.9201 3.52126 14.1544 3.75557Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, qa = ft(function(a, e) {
+  return st(lt, Object.assign({}, a, {
     id: "check-mark-single",
     ref: e,
-    icon: _u
+    icon: Ou
   }));
 });
-ya.displayName = "CheckMarkSingle";
-var Ou = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3.71274 2.86421C3.47843 2.6299 3.09853 2.6299 2.86421 2.86421C2.6299 3.09853 2.6299 3.47843 2.86421 3.71274L7.15154 8.00007L2.86421 12.2874C2.6299 12.5217 2.6299 12.9016 2.86421 13.1359C3.09853 13.3702 3.47843 13.3702 3.71274 13.1359L8.00007 8.84859L12.2874 13.1359C12.5217 13.3702 12.9016 13.3702 13.1359 13.1359C13.3702 12.9016 13.3702 12.5217 13.1359 12.2874L8.84859 8.00007L13.1359 3.71274C13.3702 3.47843 13.3702 3.09853 13.1359 2.86421C12.9016 2.6299 12.5217 2.6299 12.2874 2.86421L8.00007 7.15154L3.71274 2.86421Z" } }] }, Fa = st(function(a, e) {
-  return lt(dt, Object.assign({}, a, {
+qa.displayName = "CheckMarkSingle";
+var Mu = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3.71274 2.86421C3.47843 2.6299 3.09853 2.6299 2.86421 2.86421C2.6299 3.09853 2.6299 3.47843 2.86421 3.71274L7.15154 8.00007L2.86421 12.2874C2.6299 12.5217 2.6299 12.9016 2.86421 13.1359C3.09853 13.3702 3.47843 13.3702 3.71274 13.1359L8.00007 8.84859L12.2874 13.1359C12.5217 13.3702 12.9016 13.3702 13.1359 13.1359C13.3702 12.9016 13.3702 12.5217 13.1359 12.2874L8.84859 8.00007L13.1359 3.71274C13.3702 3.47843 13.3702 3.09853 13.1359 2.86421C12.9016 2.6299 12.5217 2.6299 12.2874 2.86421L8.00007 7.15154L3.71274 2.86421Z" } }] }, Fa = ft(function(a, e) {
+  return st(lt, Object.assign({}, a, {
     id: "close-single",
     ref: e,
-    icon: Ou
+    icon: Mu
   }));
 });
 Fa.displayName = "CloseSingle";
-var Mu = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.75 5.32495C8.75 5.73916 8.41421 6.07495 8 6.07495 7.58579 6.07495 7.25 5.73916 7.25 5.32495 7.25 4.91074 7.58579 4.57495 8 4.57495 8.41421 4.57495 8.75 4.91074 8.75 5.32495zM8.5999 7.52505C8.5999 7.19368 8.33127 6.92505 7.9999 6.92505 7.66853 6.92505 7.3999 7.19368 7.3999 7.52505V11.425C7.3999 11.7564 7.66853 12.025 7.9999 12.025 8.33127 12.025 8.5999 11.7564 8.5999 11.425V7.52505z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M0.899902 8.00002C0.899902 4.0788 4.07868 0.900024 7.9999 0.900024C11.9211 0.900024 15.0999 4.0788 15.0999 8.00002C15.0999 11.9212 11.9211 15.1 7.9999 15.1C4.07868 15.1 0.899902 11.9212 0.899902 8.00002ZM7.9999 2.10002C4.74142 2.10002 2.0999 4.74154 2.0999 8.00002C2.0999 11.2585 4.74142 13.9 7.9999 13.9C11.2584 13.9 13.8999 11.2585 13.8999 8.00002C13.8999 4.74154 11.2584 2.10002 7.9999 2.10002Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Ua = st(function(a, e) {
-  return lt(dt, Object.assign({}, a, {
+var Du = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.75 5.32495C8.75 5.73916 8.41421 6.07495 8 6.07495 7.58579 6.07495 7.25 5.73916 7.25 5.32495 7.25 4.91074 7.58579 4.57495 8 4.57495 8.41421 4.57495 8.75 4.91074 8.75 5.32495zM8.5999 7.52505C8.5999 7.19368 8.33127 6.92505 7.9999 6.92505 7.66853 6.92505 7.3999 7.19368 7.3999 7.52505V11.425C7.3999 11.7564 7.66853 12.025 7.9999 12.025 8.33127 12.025 8.5999 11.7564 8.5999 11.425V7.52505z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M0.899902 8.00002C0.899902 4.0788 4.07868 0.900024 7.9999 0.900024C11.9211 0.900024 15.0999 4.0788 15.0999 8.00002C15.0999 11.9212 11.9211 15.1 7.9999 15.1C4.07868 15.1 0.899902 11.9212 0.899902 8.00002ZM7.9999 2.10002C4.74142 2.10002 2.0999 4.74154 2.0999 8.00002C2.0999 11.2585 4.74142 13.9 7.9999 13.9C11.2584 13.9 13.8999 11.2585 13.8999 8.00002C13.8999 4.74154 11.2584 2.10002 7.9999 2.10002Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Ua = ft(function(a, e) {
+  return st(lt, Object.assign({}, a, {
     id: "details-single",
     ref: e,
-    icon: Mu
+    icon: Du
   }));
 });
 Ua.displayName = "DetailsSingle";
-var Du = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.90913 3.57564C6.14345 3.34132 6.52335 3.34132 6.75766 3.57564L10.7577 7.57564C10.992 7.80995 10.992 8.18985 10.7577 8.42417L6.75766 12.4242C6.52335 12.6585 6.14345 12.6585 5.90913 12.4242C5.67482 12.1899 5.67482 11.81 5.90913 11.5756L9.48487 7.9999L5.90913 4.42417C5.67482 4.18985 5.67482 3.80995 5.90913 3.57564Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Ba = st(function(a, e) {
-  return lt(dt, Object.assign({}, a, {
+var gu = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.90913 3.57564C6.14345 3.34132 6.52335 3.34132 6.75766 3.57564L10.7577 7.57564C10.992 7.80995 10.992 8.18985 10.7577 8.42417L6.75766 12.4242C6.52335 12.6585 6.14345 12.6585 5.90913 12.4242C5.67482 12.1899 5.67482 11.81 5.90913 11.5756L9.48487 7.9999L5.90913 4.42417C5.67482 4.18985 5.67482 3.80995 5.90913 3.57564Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Ba = ft(function(a, e) {
+  return st(lt, Object.assign({}, a, {
     id: "more-single",
     ref: e,
-    icon: Du
+    icon: gu
   }));
 });
 Ba.displayName = "MoreSingle";
-function gu(a, e) {
-  return Object.keys(a).filter((t) => isNaN(Number(t))).map((t) => ({
+function xu(a, e) {
+  return Object.keys(a).filter((t) => isNaN(Number(t)) && t !== "DefinedName").map((t) => ({
     label: e.t(`formula.functionType.${t.toLocaleLowerCase()}`),
     value: `${a[t]}`
   }));
 }
-function xu(a, e) {
+function vu(a, e) {
   let t = "";
   return a.aliasFunctionName ? (t = e.t(a.aliasFunctionName), t === a.aliasFunctionName && (t = a.functionName)) : t = a.functionName, t;
 }
@@ -1121,28 +1106,28 @@ function Va(a) {
   if (a.require && a.repeat)
     return `${a.name},...`;
 }
-const vu = "univer-formula-help-function", qu = "univer-formula-help-function-title", yu = "univer-formula-help-function-title-icons", Fu = "univer-formula-help-function-title-icon", Uu = "univer-formula-help-function-content", Bu = "univer-formula-help-function-content-inner", Vu = "univer-formula-help-function-content-params", Hu = "univer-formula-help-function-content-params-title", wu = "univer-formula-help-function-content-params-detail", Gu = "univer-formula-help-function-active", Xu = "univer-formula-help-decorator", Yu = "univer-formula-help-param", Wu = "univer-formula-help-param-prefix", Ku = "univer-formula-help-param-item", ku = "univer-formula-help-param-active", ee = {
-  formulaHelpFunction: vu,
+const yu = "univer-formula-help-function", qu = "univer-formula-help-function-title", Fu = "univer-formula-help-function-title-icons", Uu = "univer-formula-help-function-title-icon", Bu = "univer-formula-help-function-content", Vu = "univer-formula-help-function-content-inner", Hu = "univer-formula-help-function-content-params", wu = "univer-formula-help-function-content-params-title", Gu = "univer-formula-help-function-content-params-detail", Xu = "univer-formula-help-function-active", Yu = "univer-formula-help-decorator", Wu = "univer-formula-help-param", Ku = "univer-formula-help-param-prefix", ku = "univer-formula-help-param-item", $u = "univer-formula-help-param-active", ee = {
+  formulaHelpFunction: yu,
   formulaHelpFunctionTitle: qu,
-  formulaHelpFunctionTitleIcons: yu,
-  formulaHelpFunctionTitleIcon: Fu,
-  formulaHelpFunctionContent: Uu,
-  formulaHelpFunctionContentInner: Bu,
-  formulaHelpFunctionContentParams: Vu,
-  formulaHelpFunctionContentParamsTitle: Hu,
-  formulaHelpFunctionContentParamsDetail: wu,
-  formulaHelpFunctionActive: Gu,
-  formulaHelpDecorator: Xu,
-  formulaHelpParam: Yu,
-  formulaHelpParamPrefix: Wu,
-  formulaHelpParamItem: Ku,
-  formulaHelpParamActive: ku
+  formulaHelpFunctionTitleIcons: Fu,
+  formulaHelpFunctionTitleIcon: Uu,
+  formulaHelpFunctionContent: Bu,
+  formulaHelpFunctionContentInner: Vu,
+  formulaHelpFunctionContentParams: Hu,
+  formulaHelpFunctionContentParamsTitle: wu,
+  formulaHelpFunctionContentParamsDetail: Gu,
+  formulaHelpFunctionActive: Xu,
+  formulaHelpDecorator: Yu,
+  formulaHelpParam: Wu,
+  formulaHelpParamPrefix: Ku,
+  formulaHelpParamItem: ku,
+  formulaHelpParamActive: $u
 };
-function $u() {
-  const [a, e] = Y(!1), [t, n] = Y(!0), [i, u] = Y(!0), [o, m] = Y(0), [c, f] = Y([0, 0]), [d, s] = Y({ left: 0, top: 0 }), [l, L] = Y(null), A = le(Fe), E = le(we), b = E.t("formula.prompt.required"), C = E.t("formula.prompt.optional"), T = le(Pe), p = le(ft);
+function ju() {
+  const [a, e] = Y(!1), [t, n] = Y(!0), [i, u] = Y(!0), [o, m] = Y(0), [c, f] = Y([0, 0]), [d, l] = Y({ left: 0, top: 0 }), [s, L] = Y(null), A = le(Fe), E = le(He), b = E.t("formula.prompt.required"), C = E.t("formula.prompt.optional"), T = le(Pe), p = le(Ge);
   ht(() => {
-    const R = A.help$.subscribe((q) => {
-      const { visible: D, paramIndex: U, functionInfo: I } = q;
+    const R = A.help$.subscribe((y) => {
+      const { visible: D, paramIndex: U, functionInfo: I } = y;
       if (!D) {
         e(D);
         return;
@@ -1151,17 +1136,17 @@ function $u() {
       if (g == null)
         return;
       const { left: te, top: W, height: ne } = g;
-      I.description === "" && I.functionParameter.length === 0 || (f([te, W + ne]), m(U), L(I), s({ left: te, top: W }), e(D));
+      I.description === "" && I.functionParameter.length === 0 || (f([te, W + ne]), m(U), L(I), l({ left: te, top: W }), e(D));
     });
     return () => {
       R == null || R.unsubscribe();
     };
   }, []);
   function h() {
-    const q = T.getCurrentUniverDocInstance().getUnitId();
-    if (!p.isEditor(q))
+    const y = T.getCurrentUniverDocInstance().getUnitId();
+    if (!p.isEditor(y))
       return;
-    const D = p.getEditor(q);
+    const D = p.getEditor(y);
     return D == null ? void 0 : D.getBoundingClientRect();
   }
   function _(R) {
@@ -1170,13 +1155,13 @@ function $u() {
   function V() {
     u(!i);
   }
-  return /* @__PURE__ */ N.jsx(N.Fragment, { children: i ? /* @__PURE__ */ N.jsx(ha, { visible: a, offset: c, children: l ? /* @__PURE__ */ N.jsxs("div", { className: ee.formulaHelpFunction, children: [
+  return /* @__PURE__ */ N.jsx(N.Fragment, { children: i ? /* @__PURE__ */ N.jsx(ha, { visible: a, offset: c, children: s ? /* @__PURE__ */ N.jsxs("div", { className: ee.formulaHelpFunction, children: [
     /* @__PURE__ */ N.jsxs("div", { className: ee.formulaHelpFunctionTitle, children: [
       /* @__PURE__ */ N.jsx(
-        ju,
+        Qu,
         {
-          prefix: l.functionName,
-          value: l.functionParameter,
+          prefix: s.functionName,
+          value: s.functionParameter,
           active: o,
           onClick: _
         }
@@ -1214,24 +1199,24 @@ function $u() {
             $t,
             {
               title: E.t("formula.prompt.helpExample"),
-              value: `${l.functionName}(${l.functionParameter.map((R) => R.example).join(",")})`
+              value: `${s.functionName}(${s.functionParameter.map((R) => R.example).join(",")})`
             }
           ),
           /* @__PURE__ */ N.jsx(
             $t,
             {
               title: E.t("formula.prompt.helpAbstract"),
-              value: l.description
+              value: s.description
             }
           ),
-          l && l.functionParameter && l.functionParameter.map((R, q) => /* @__PURE__ */ N.jsx(
+          s && s.functionParameter && s.functionParameter.map((R, y) => /* @__PURE__ */ N.jsx(
             $t,
             {
-              className: o === q ? ee.formulaHelpFunctionActive : "",
+              className: o === y ? ee.formulaHelpFunctionActive : "",
               title: R.name,
               value: `${R.require ? b : C} ${R.detail}`
             },
-            q
+            y
           ))
         ] })
       }
@@ -1249,7 +1234,7 @@ function $u() {
 const $t = (a) => /* @__PURE__ */ N.jsxs("div", { className: ee.formulaHelpFunctionContentParams, children: [
   /* @__PURE__ */ N.jsx("div", { className: `${ee.formulaHelpFunctionContentParamsTitle} ${a.className}`, children: a.title }),
   /* @__PURE__ */ N.jsx("div", { className: ee.formulaHelpFunctionContentParamsDetail, children: a.value })
-] }), ju = (a) => {
+] }), Qu = (a) => {
   const { prefix: e, value: t, active: n, onClick: i } = a;
   return /* @__PURE__ */ N.jsxs("div", { className: ee.formulaHelpParam, children: [
     /* @__PURE__ */ N.jsxs("span", { className: ee.formulaHelpParamPrefix, children: [
@@ -1272,49 +1257,49 @@ const $t = (a) => /* @__PURE__ */ N.jsxs("div", { className: ee.formulaHelpFunct
     )),
     ")"
   ] });
-}, Qu = "univer-formula-search-function", zu = "univer-formula-search-function-item", Zu = "univer-formula-search-function-item-name", Ju = "univer-formula-search-function-item-name-light", eo = "univer-formula-search-function-item-desc", to = "univer-formula-search-function-item-active", Ie = {
-  formulaSearchFunction: Qu,
-  formulaSearchFunctionItem: zu,
-  formulaSearchFunctionItemName: Zu,
-  formulaSearchFunctionItemNameLight: Ju,
-  formulaSearchFunctionItemDesc: eo,
-  formulaSearchFunctionItemActive: to
+}, zu = "univer-formula-search-function", Zu = "univer-formula-search-function-item", Ju = "univer-formula-search-function-item-name", eo = "univer-formula-search-function-item-name-light", to = "univer-formula-search-function-item-desc", no = "univer-formula-search-function-item-active", Ee = {
+  formulaSearchFunction: zu,
+  formulaSearchFunctionItem: Zu,
+  formulaSearchFunctionItemName: Ju,
+  formulaSearchFunctionItemNameLight: eo,
+  formulaSearchFunctionItemDesc: to,
+  formulaSearchFunctionItemActive: no
 };
-function no() {
-  const [a, e] = Y(!1), [t, n] = Y(0), [i, u] = Y([0, 0]), [o, m] = Y([]), [c, f] = Y(""), d = Ca(null), s = le(Fe), l = le(Pe), L = le(ft);
+function ao() {
+  const [a, e] = Y(!1), [t, n] = Y(0), [i, u] = Y([0, 0]), [o, m] = Y([]), [c, f] = Y(""), d = Ca(null), l = le(Fe), s = le(Pe), L = le(Ge);
   ht(() => {
     let T = [], p = 0;
-    const h = s.search$.subscribe((R) => {
-      const { visible: q, searchText: D, searchList: U } = R;
-      if (!q) {
-        e(q);
+    const h = l.search$.subscribe((R) => {
+      const { visible: y, searchText: D, searchList: U } = R;
+      if (!y) {
+        e(y);
         return;
       }
       const I = A();
       if (I == null)
         return;
       const { left: g, top: te, height: W } = I;
-      f(D), m(U), T = U, u([g, te + W]), e(q), n(0), p = 0;
-    }), _ = s.navigate$.subscribe((R) => {
-      const { direction: q } = R;
-      if (q === X.UP) {
+      f(D), m(U), T = U, u([g, te + W]), e(y), n(0), p = 0;
+    }), _ = l.navigate$.subscribe((R) => {
+      const { direction: y } = R;
+      if (y === X.UP) {
         let D = p - 1;
         D = D < 0 ? T.length - 1 : D, n(D), p = D;
-      } else if (q === X.DOWN) {
+      } else if (y === X.DOWN) {
         let D = p + 1;
         D = D >= T.length ? 0 : D, n(D), p = D;
       }
       C(p);
-    }), V = s.accept$.subscribe((R) => {
-      const q = T[p].name;
-      s.acceptFormulaName(q);
+    }), V = l.accept$.subscribe((R) => {
+      const y = T[p].name;
+      l.acceptFormulaName(y);
     });
     return () => {
       h == null || h.unsubscribe(), _ == null || _.unsubscribe(), V == null || V.unsubscribe();
     };
   }, []);
   function A() {
-    const p = l.getCurrentUniverDocInstance().getUnitId();
+    const p = s.getCurrentUniverDocInstance().getUnitId();
     if (!L.isEditor(p))
       return;
     const h = L.getEditor(p);
@@ -1328,11 +1313,11 @@ function no() {
   }
   function C(T) {
     var g;
-    const p = (g = d.current) == null ? void 0 : g.querySelectorAll(`.${Ie.formulaSearchFunctionItem}`)[T];
+    const p = (g = d.current) == null ? void 0 : g.querySelectorAll(`.${Ee.formulaSearchFunctionItem}`)[T];
     if (!p) return;
     const h = p.parentNode;
     if (!h) return;
-    const V = h.getBoundingClientRect().top, R = h.offsetHeight, q = p.getBoundingClientRect(), D = q.top, U = q.height;
+    const V = h.getBoundingClientRect().top, R = h.offsetHeight, y = p.getBoundingClientRect(), D = y.top, U = y.height;
     if (D >= 0 && D > V && D - V + U <= R)
       return;
     const I = p.offsetTop - (R - U) / 2;
@@ -1341,33 +1326,33 @@ function no() {
       behavior: "smooth"
     });
   }
-  return o.length > 0 && /* @__PURE__ */ N.jsx(ha, { visible: a, offset: i, children: /* @__PURE__ */ N.jsx("ul", { className: Ie.formulaSearchFunction, ref: d, children: o.map((T, p) => /* @__PURE__ */ N.jsxs(
+  return o.length > 0 && /* @__PURE__ */ N.jsx(ha, { visible: a, offset: i, children: /* @__PURE__ */ N.jsx("ul", { className: Ee.formulaSearchFunction, ref: d, children: o.map((T, p) => /* @__PURE__ */ N.jsxs(
     "li",
     {
-      className: t === p ? `${Ie.formulaSearchFunctionItem} ${Ie.formulaSearchFunctionItemActive}` : Ie.formulaSearchFunctionItem,
+      className: t === p ? `${Ee.formulaSearchFunctionItem} ${Ee.formulaSearchFunctionItemActive}` : Ee.formulaSearchFunctionItem,
       onMouseEnter: () => E(p),
       onMouseLeave: b,
-      onClick: () => s.acceptFormulaName(T.name),
+      onClick: () => l.acceptFormulaName(T.name),
       children: [
-        /* @__PURE__ */ N.jsxs("span", { className: Ie.formulaSearchFunctionItemName, children: [
-          /* @__PURE__ */ N.jsx("span", { className: Ie.formulaSearchFunctionItemNameLight, children: T.name.substring(0, c.length) }),
+        /* @__PURE__ */ N.jsxs("span", { className: Ee.formulaSearchFunctionItemName, children: [
+          /* @__PURE__ */ N.jsx("span", { className: Ee.formulaSearchFunctionItemNameLight, children: T.name.substring(0, c.length) }),
           /* @__PURE__ */ N.jsx("span", { children: T.name.slice(c.length) })
         ] }),
-        /* @__PURE__ */ N.jsx("span", { className: Ie.formulaSearchFunctionItemDesc, children: T.desc })
+        /* @__PURE__ */ N.jsx("span", { className: Ee.formulaSearchFunctionItemDesc, children: T.desc })
       ]
     },
     p
   )) }) });
 }
-function ao() {
+function io() {
   return /* @__PURE__ */ N.jsxs(N.Fragment, { children: [
-    /* @__PURE__ */ N.jsx(no, {}),
-    /* @__PURE__ */ N.jsx($u, {})
+    /* @__PURE__ */ N.jsx(ao, {}),
+    /* @__PURE__ */ N.jsx(ju, {})
   ] });
 }
-const io = "univer-formula-more-functions", ro = "univer-formula-more-functions-operation", Yn = {
-  formulaMoreFunctions: io,
-  formulaMoreFunctionsOperation: ro
+const ro = "univer-formula-more-functions", uo = "univer-formula-more-functions-operation", Yn = {
+  formulaMoreFunctions: ro,
+  formulaMoreFunctionsOperation: uo
 };
 function Ha(a) {
   const { prefix: e, value: t } = a;
@@ -1383,35 +1368,35 @@ function Ha(a) {
     ")"
   ] });
 }
-const uo = "univer-formula-function-params", oo = "univer-formula-function-params-title", mo = "univer-formula-function-params-detail", jt = {
-  formulaFunctionParams: uo,
-  formulaFunctionParamsTitle: oo,
-  formulaFunctionParamsDetail: mo
+const oo = "univer-formula-function-params", mo = "univer-formula-function-params-title", co = "univer-formula-function-params-detail", jt = {
+  formulaFunctionParams: oo,
+  formulaFunctionParamsTitle: mo,
+  formulaFunctionParamsDetail: co
 };
-function Qe(a) {
+function je(a) {
   const { className: e, value: t, title: n } = a;
   return /* @__PURE__ */ N.jsxs("div", { className: jt.formulaFunctionParams, children: [
     /* @__PURE__ */ N.jsx("div", { className: `${jt.formulaFunctionParamsTitle} ${e}`, children: n }),
     /* @__PURE__ */ N.jsx("div", { className: jt.formulaFunctionParamsDetail, children: t })
   ] });
 }
-const co = "univer-formula-input-params-list", fo = "univer-formula-input-params-list-item-name", so = "univer-formula-input-params-list-item-selector", $e = {
-  formulaInputParamsList: co,
-  formulaInputParamsListItemName: fo,
-  formulaInputParamsListItemSelector: so
+const fo = "univer-formula-input-params-list", so = "univer-formula-input-params-list-item-name", lo = "univer-formula-input-params-list-item-selector", ke = {
+  formulaInputParamsList: fo,
+  formulaInputParamsListItemName: so,
+  formulaInputParamsListItemSelector: lo
 };
-function lo(a) {
+function po(a) {
   const { functionInfo: e, onChange: t } = a;
   if (!e) return null;
   Y([]);
   const [n, i] = Y(e.functionParameter), [u, o] = Y(-1);
-  return /* @__PURE__ */ N.jsxs("div", { className: $e.formulaInputParams, children: [
-    /* @__PURE__ */ N.jsx("div", { className: $e.formulaInputParamsList, children: n.map((m, c) => /* @__PURE__ */ N.jsxs("div", { children: [
-      /* @__PURE__ */ N.jsx("div", { className: $e.formulaInputParamsListItemName, children: m.name }),
-      /* @__PURE__ */ N.jsx("div", { className: $e.formulaInputParamsListItemSelector })
+  return /* @__PURE__ */ N.jsxs("div", { className: ke.formulaInputParams, children: [
+    /* @__PURE__ */ N.jsx("div", { className: ke.formulaInputParamsList, children: n.map((m, c) => /* @__PURE__ */ N.jsxs("div", { children: [
+      /* @__PURE__ */ N.jsx("div", { className: ke.formulaInputParamsListItemName, children: m.name }),
+      /* @__PURE__ */ N.jsx("div", { className: ke.formulaInputParamsListItemSelector })
     ] }, c)) }),
-    /* @__PURE__ */ N.jsx("div", { className: $e.formulaInputParamsInfo, children: /* @__PURE__ */ N.jsx(
-      Qe,
+    /* @__PURE__ */ N.jsx("div", { className: ke.formulaInputParamsInfo, children: /* @__PURE__ */ N.jsx(
+      je,
       {
         title: u === -1 ? /* @__PURE__ */ N.jsx(Ha, { prefix: e.functionName, value: n }) : n[u].name,
         value: u === -1 ? e.description : n[u].detail
@@ -1419,7 +1404,7 @@ function lo(a) {
     ) })
   ] });
 }
-const po = [], Lo = [
+const Lo = [], Ao = [
   {
     functionName: F.BETADIST,
     functionType: r.Compatibility,
@@ -2256,9 +2241,9 @@ const po = [], Lo = [
       }
     ]
   }
-], Ao = [
+], Po = [
   {
-    functionName: _e.CUBEKPIMEMBER,
+    functionName: he.CUBEKPIMEMBER,
     functionType: r.Cube,
     description: "formula.functionList.CUBEKPIMEMBER.description",
     abstract: "formula.functionList.CUBEKPIMEMBER.abstract",
@@ -2280,7 +2265,7 @@ const po = [], Lo = [
     ]
   },
   {
-    functionName: _e.CUBEMEMBER,
+    functionName: he.CUBEMEMBER,
     functionType: r.Cube,
     description: "formula.functionList.CUBEMEMBER.description",
     abstract: "formula.functionList.CUBEMEMBER.abstract",
@@ -2302,7 +2287,7 @@ const po = [], Lo = [
     ]
   },
   {
-    functionName: _e.CUBEMEMBERPROPERTY,
+    functionName: he.CUBEMEMBERPROPERTY,
     functionType: r.Cube,
     description: "formula.functionList.CUBEMEMBERPROPERTY.description",
     abstract: "formula.functionList.CUBEMEMBERPROPERTY.abstract",
@@ -2324,7 +2309,7 @@ const po = [], Lo = [
     ]
   },
   {
-    functionName: _e.CUBERANKEDMEMBER,
+    functionName: he.CUBERANKEDMEMBER,
     functionType: r.Cube,
     description: "formula.functionList.CUBERANKEDMEMBER.description",
     abstract: "formula.functionList.CUBERANKEDMEMBER.abstract",
@@ -2346,7 +2331,7 @@ const po = [], Lo = [
     ]
   },
   {
-    functionName: _e.CUBESET,
+    functionName: he.CUBESET,
     functionType: r.Cube,
     description: "formula.functionList.CUBESET.description",
     abstract: "formula.functionList.CUBESET.abstract",
@@ -2368,7 +2353,7 @@ const po = [], Lo = [
     ]
   },
   {
-    functionName: _e.CUBESETCOUNT,
+    functionName: he.CUBESETCOUNT,
     functionType: r.Cube,
     description: "formula.functionList.CUBESETCOUNT.description",
     abstract: "formula.functionList.CUBESETCOUNT.abstract",
@@ -2390,7 +2375,7 @@ const po = [], Lo = [
     ]
   },
   {
-    functionName: _e.CUBEVALUE,
+    functionName: he.CUBEVALUE,
     functionType: r.Cube,
     description: "formula.functionList.CUBEVALUE.description",
     abstract: "formula.functionList.CUBEVALUE.abstract",
@@ -2411,7 +2396,7 @@ const po = [], Lo = [
       }
     ]
   }
-], Po = [
+], bo = [
   {
     functionName: oe.DAVERAGE,
     functionType: r.Database,
@@ -2676,7 +2661,7 @@ const po = [], Lo = [
       }
     ]
   }
-], bo = [
+], To = [
   {
     functionName: w.DATE,
     functionType: r.Date,
@@ -2735,16 +2720,9 @@ const po = [], Lo = [
     abstract: "formula.functionList.DATEVALUE.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.DATEVALUE.functionParameter.number1.name",
-        detail: "formula.functionList.DATEVALUE.functionParameter.number1.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
-      },
-      {
-        name: "formula.functionList.DATEVALUE.functionParameter.number2.name",
-        detail: "formula.functionList.DATEVALUE.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.DATEVALUE.functionParameter.dateText.name",
+        detail: "formula.functionList.DATEVALUE.functionParameter.dateText.detail",
+        example: '"2024-8-8"',
         require: 1,
         repeat: 0
       }
@@ -2983,22 +2961,7 @@ const po = [], Lo = [
     functionType: r.Date,
     description: "formula.functionList.NOW.description",
     abstract: "formula.functionList.NOW.abstract",
-    functionParameter: [
-      {
-        name: "formula.functionList.NOW.functionParameter.number1.name",
-        detail: "formula.functionList.NOW.functionParameter.number1.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
-      },
-      {
-        name: "formula.functionList.NOW.functionParameter.number2.name",
-        detail: "formula.functionList.NOW.functionParameter.number2.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
-      }
-    ]
+    functionParameter: []
   },
   {
     functionName: w.SECOND,
@@ -3029,16 +2992,23 @@ const po = [], Lo = [
     abstract: "formula.functionList.TIME.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.TIME.functionParameter.number1.name",
-        detail: "formula.functionList.TIME.functionParameter.number1.detail",
-        example: "A1:A20",
+        name: "formula.functionList.TIME.functionParameter.hour.name",
+        detail: "formula.functionList.TIME.functionParameter.hour.detail",
+        example: "15",
         require: 1,
         repeat: 0
       },
       {
-        name: "formula.functionList.TIME.functionParameter.number2.name",
-        detail: "formula.functionList.TIME.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.TIME.functionParameter.minute.name",
+        detail: "formula.functionList.TIME.functionParameter.minute.detail",
+        example: "20",
+        require: 1,
+        repeat: 0
+      },
+      {
+        name: "formula.functionList.TIME.functionParameter.second.name",
+        detail: "formula.functionList.TIME.functionParameter.second.detail",
+        example: "59",
         require: 1,
         repeat: 0
       }
@@ -3051,16 +3021,9 @@ const po = [], Lo = [
     abstract: "formula.functionList.TIMEVALUE.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.TIMEVALUE.functionParameter.number1.name",
-        detail: "formula.functionList.TIMEVALUE.functionParameter.number1.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
-      },
-      {
-        name: "formula.functionList.TIMEVALUE.functionParameter.number2.name",
-        detail: "formula.functionList.TIMEVALUE.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.TIMEVALUE.functionParameter.timeText.name",
+        detail: "formula.functionList.TIMEVALUE.functionParameter.timeText.detail",
+        example: '"15:20:59"',
         require: 1,
         repeat: 0
       }
@@ -3198,7 +3161,7 @@ const po = [], Lo = [
       }
     ]
   }
-], To = [
+], Eo = [
   {
     functionName: M.BESSELI,
     functionType: r.Engineering,
@@ -4387,7 +4350,7 @@ const po = [], Lo = [
       }
     ]
   }
-], Eo = [
+], So = [
   {
     functionName: O.ACCRINT,
     functionType: r.Financial,
@@ -5598,7 +5561,7 @@ const po = [], Lo = [
       }
     ]
   }
-], So = [
+], Io = [
   {
     functionName: j.CELL,
     functionType: r.Information,
@@ -5984,7 +5947,7 @@ const po = [], Lo = [
       }
     ]
   }
-], Io = [
+], No = [
   {
     functionName: z.AND,
     functionType: r.Logical,
@@ -6418,7 +6381,7 @@ const po = [], Lo = [
       }
     ]
   }
-], No = [
+], Ro = [
   {
     functionName: B.ADDRESS,
     functionType: r.Lookup,
@@ -7352,7 +7315,7 @@ const po = [], Lo = [
       }
     ]
   }
-], Ro = [
+], Co = [
   {
     functionName: S.ABS,
     functionType: r.Math,
@@ -7486,16 +7449,9 @@ const po = [], Lo = [
     abstract: "formula.functionList.ASIN.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.ASIN.functionParameter.number1.name",
-        detail: "formula.functionList.ASIN.functionParameter.number1.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
-      },
-      {
-        name: "formula.functionList.ASIN.functionParameter.number2.name",
-        detail: "formula.functionList.ASIN.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.ASIN.functionParameter.number.name",
+        detail: "formula.functionList.ASIN.functionParameter.number.detail",
+        example: "0",
         require: 1,
         repeat: 0
       }
@@ -7508,16 +7464,9 @@ const po = [], Lo = [
     abstract: "formula.functionList.ASINH.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.ASINH.functionParameter.number1.name",
-        detail: "formula.functionList.ASINH.functionParameter.number1.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
-      },
-      {
-        name: "formula.functionList.ASINH.functionParameter.number2.name",
-        detail: "formula.functionList.ASINH.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.ASINH.functionParameter.number.name",
+        detail: "formula.functionList.ASINH.functionParameter.number.detail",
+        example: "10",
         require: 1,
         repeat: 0
       }
@@ -7530,16 +7479,9 @@ const po = [], Lo = [
     abstract: "formula.functionList.ATAN.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.ATAN.functionParameter.number1.name",
-        detail: "formula.functionList.ATAN.functionParameter.number1.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
-      },
-      {
-        name: "formula.functionList.ATAN.functionParameter.number2.name",
-        detail: "formula.functionList.ATAN.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.ATAN.functionParameter.number.name",
+        detail: "formula.functionList.ATAN.functionParameter.number.detail",
+        example: "1",
         require: 1,
         repeat: 0
       }
@@ -7552,16 +7494,16 @@ const po = [], Lo = [
     abstract: "formula.functionList.ATAN2.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.ATAN2.functionParameter.number1.name",
-        detail: "formula.functionList.ATAN2.functionParameter.number1.detail",
-        example: "A1:A20",
+        name: "formula.functionList.ATAN2.functionParameter.xNum.name",
+        detail: "formula.functionList.ATAN2.functionParameter.xNum.detail",
+        example: "4",
         require: 1,
         repeat: 0
       },
       {
-        name: "formula.functionList.ATAN2.functionParameter.number2.name",
-        detail: "formula.functionList.ATAN2.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.ATAN2.functionParameter.yNum.name",
+        detail: "formula.functionList.ATAN2.functionParameter.yNum.detail",
+        example: "3",
         require: 1,
         repeat: 0
       }
@@ -7574,16 +7516,9 @@ const po = [], Lo = [
     abstract: "formula.functionList.ATANH.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.ATANH.functionParameter.number1.name",
-        detail: "formula.functionList.ATANH.functionParameter.number1.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
-      },
-      {
-        name: "formula.functionList.ATANH.functionParameter.number2.name",
-        detail: "formula.functionList.ATANH.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.ATANH.functionParameter.number.name",
+        detail: "formula.functionList.ATANH.functionParameter.number.detail",
+        example: "0.1",
         require: 1,
         repeat: 0
       }
@@ -7728,16 +7663,9 @@ const po = [], Lo = [
     abstract: "formula.functionList.COS.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.COS.functionParameter.number1.name",
-        detail: "formula.functionList.COS.functionParameter.number1.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
-      },
-      {
-        name: "formula.functionList.COS.functionParameter.number2.name",
-        detail: "formula.functionList.COS.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.COS.functionParameter.number.name",
+        detail: "formula.functionList.COS.functionParameter.number.detail",
+        example: "1",
         require: 1,
         repeat: 0
       }
@@ -8984,7 +8912,7 @@ const po = [], Lo = [
       {
         name: "formula.functionList.SUMIFS.functionParameter.criteria2.name",
         detail: "formula.functionList.SUMIFS.functionParameter.criteria2.detail",
-        example: '"<100"',
+        example: '"<20"',
         require: 0,
         repeat: 1
       }
@@ -9107,16 +9035,9 @@ const po = [], Lo = [
     abstract: "formula.functionList.TAN.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.TAN.functionParameter.number1.name",
-        detail: "formula.functionList.TAN.functionParameter.number1.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
-      },
-      {
-        name: "formula.functionList.TAN.functionParameter.number2.name",
-        detail: "formula.functionList.TAN.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.TAN.functionParameter.number.name",
+        detail: "formula.functionList.TAN.functionParameter.number.detail",
+        example: "1",
         require: 1,
         repeat: 0
       }
@@ -9129,16 +9050,9 @@ const po = [], Lo = [
     abstract: "formula.functionList.TANH.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.TANH.functionParameter.number1.name",
-        detail: "formula.functionList.TANH.functionParameter.number1.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
-      },
-      {
-        name: "formula.functionList.TANH.functionParameter.number2.name",
-        detail: "formula.functionList.TANH.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.TANH.functionParameter.number.name",
+        detail: "formula.functionList.TANH.functionParameter.number.detail",
+        example: "1",
         require: 1,
         repeat: 0
       }
@@ -9166,7 +9080,7 @@ const po = [], Lo = [
       }
     ]
   }
-], Co = [
+], ho = [
   {
     functionName: P.AVEDEV,
     functionType: r.Statistical,
@@ -9183,9 +9097,9 @@ const po = [], Lo = [
       {
         name: "formula.functionList.AVEDEV.functionParameter.number2.name",
         detail: "formula.functionList.AVEDEV.functionParameter.number2.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
+        example: "B1:B20",
+        require: 0,
+        repeat: 1
       }
     ]
   },
@@ -9241,18 +9155,25 @@ const po = [], Lo = [
     abstract: "formula.functionList.AVERAGEIF.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.AVERAGEIF.functionParameter.number1.name",
-        detail: "formula.functionList.AVERAGEIF.functionParameter.number1.detail",
+        name: "formula.functionList.AVERAGEIF.functionParameter.range.name",
+        detail: "formula.functionList.AVERAGEIF.functionParameter.range.detail",
         example: "A1:A20",
         require: 1,
         repeat: 0
       },
       {
-        name: "formula.functionList.AVERAGEIF.functionParameter.number2.name",
-        detail: "formula.functionList.AVERAGEIF.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.AVERAGEIF.functionParameter.criteria.name",
+        detail: "formula.functionList.AVERAGEIF.functionParameter.criteria.detail",
+        example: '">5"',
         require: 1,
         repeat: 0
+      },
+      {
+        name: "formula.functionList.AVERAGEIF.functionParameter.averageRange.name",
+        detail: "formula.functionList.AVERAGEIF.functionParameter.averageRange.detail",
+        example: "B1:B20",
+        require: 0,
+        repeat: 0
       }
     ]
   },
@@ -9263,18 +9184,39 @@ const po = [], Lo = [
     abstract: "formula.functionList.AVERAGEIFS.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.AVERAGEIFS.functionParameter.number1.name",
-        detail: "formula.functionList.AVERAGEIFS.functionParameter.number1.detail",
+        name: "formula.functionList.AVERAGEIFS.functionParameter.averageRange.name",
+        detail: "formula.functionList.AVERAGEIFS.functionParameter.averageRange.detail",
         example: "A1:A20",
         require: 1,
         repeat: 0
       },
       {
-        name: "formula.functionList.AVERAGEIFS.functionParameter.number2.name",
-        detail: "formula.functionList.AVERAGEIFS.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.AVERAGEIFS.functionParameter.criteriaRange1.name",
+        detail: "formula.functionList.AVERAGEIFS.functionParameter.criteriaRange1.detail",
+        example: "B1:B20",
         require: 1,
         repeat: 0
+      },
+      {
+        name: "formula.functionList.AVERAGEIFS.functionParameter.criteria1.name",
+        detail: "formula.functionList.AVERAGEIFS.functionParameter.criteria1.detail",
+        example: '">10"',
+        require: 1,
+        repeat: 0
+      },
+      {
+        name: "formula.functionList.AVERAGEIFS.functionParameter.criteriaRange2.name",
+        detail: "formula.functionList.AVERAGEIFS.functionParameter.criteriaRange2.detail",
+        example: "C1:C20",
+        require: 0,
+        repeat: 1
+      },
+      {
+        name: "formula.functionList.AVERAGEIFS.functionParameter.criteria2.name",
+        detail: "formula.functionList.AVERAGEIFS.functionParameter.criteria2.detail",
+        example: '"<20"',
+        require: 0,
+        repeat: 1
       }
     ]
   },
@@ -9617,15 +9559,8 @@ const po = [], Lo = [
     abstract: "formula.functionList.COUNTBLANK.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.COUNTBLANK.functionParameter.number1.name",
-        detail: "formula.functionList.COUNTBLANK.functionParameter.number1.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
-      },
-      {
-        name: "formula.functionList.COUNTBLANK.functionParameter.number2.name",
-        detail: "formula.functionList.COUNTBLANK.functionParameter.number2.detail",
+        name: "formula.functionList.COUNTBLANK.functionParameter.range.name",
+        detail: "formula.functionList.COUNTBLANK.functionParameter.range.detail",
         example: "A1:A20",
         require: 1,
         repeat: 0
@@ -9639,16 +9574,16 @@ const po = [], Lo = [
     abstract: "formula.functionList.COUNTIF.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.COUNTIF.functionParameter.number1.name",
-        detail: "formula.functionList.COUNTIF.functionParameter.number1.detail",
+        name: "formula.functionList.COUNTIF.functionParameter.range.name",
+        detail: "formula.functionList.COUNTIF.functionParameter.range.detail",
         example: "A1:A20",
         require: 1,
         repeat: 0
       },
       {
-        name: "formula.functionList.COUNTIF.functionParameter.number2.name",
-        detail: "formula.functionList.COUNTIF.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.COUNTIF.functionParameter.criteria.name",
+        detail: "formula.functionList.COUNTIF.functionParameter.criteria.detail",
+        example: '">5"',
         require: 1,
         repeat: 0
       }
@@ -9661,18 +9596,32 @@ const po = [], Lo = [
     abstract: "formula.functionList.COUNTIFS.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.COUNTIFS.functionParameter.number1.name",
-        detail: "formula.functionList.COUNTIFS.functionParameter.number1.detail",
+        name: "formula.functionList.COUNTIFS.functionParameter.criteriaRange1.name",
+        detail: "formula.functionList.COUNTIFS.functionParameter.criteriaRange1.detail",
         example: "A1:A20",
         require: 1,
         repeat: 0
       },
       {
-        name: "formula.functionList.COUNTIFS.functionParameter.number2.name",
-        detail: "formula.functionList.COUNTIFS.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.COUNTIFS.functionParameter.criteria1.name",
+        detail: "formula.functionList.COUNTIFS.functionParameter.criteria1.detail",
+        example: '">10"',
         require: 1,
         repeat: 0
+      },
+      {
+        name: "formula.functionList.COUNTIFS.functionParameter.criteriaRange2.name",
+        detail: "formula.functionList.COUNTIFS.functionParameter.criteriaRange2.detail",
+        example: "B1:B20",
+        require: 0,
+        repeat: 1
+      },
+      {
+        name: "formula.functionList.COUNTIFS.functionParameter.criteria2.name",
+        detail: "formula.functionList.COUNTIFS.functionParameter.criteria2.detail",
+        example: '"<20"',
+        require: 0,
+        repeat: 1
       }
     ]
   },
@@ -10476,18 +10425,18 @@ const po = [], Lo = [
     abstract: "formula.functionList.MAXA.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.MAXA.functionParameter.number1.name",
-        detail: "formula.functionList.MAXA.functionParameter.number1.detail",
+        name: "formula.functionList.MAXA.functionParameter.value1.name",
+        detail: "formula.functionList.MAXA.functionParameter.value1.detail",
         example: "A1:A20",
         require: 1,
         repeat: 0
       },
       {
-        name: "formula.functionList.MAXA.functionParameter.number2.name",
-        detail: "formula.functionList.MAXA.functionParameter.number2.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
+        name: "formula.functionList.MAXA.functionParameter.value2.name",
+        detail: "formula.functionList.MAXA.functionParameter.value2.detail",
+        example: "B1:B20",
+        require: 0,
+        repeat: 1
       }
     ]
   },
@@ -10507,7 +10456,7 @@ const po = [], Lo = [
       {
         name: "formula.functionList.MAXIFS.functionParameter.criteriaRange1.name",
         detail: "formula.functionList.MAXIFS.functionParameter.criteriaRange1.detail",
-        example: "A1:A20",
+        example: "B1:B20",
         require: 1,
         repeat: 0
       },
@@ -10521,14 +10470,14 @@ const po = [], Lo = [
       {
         name: "formula.functionList.MAXIFS.functionParameter.criteriaRange2.name",
         detail: "formula.functionList.MAXIFS.functionParameter.criteriaRange2.detail",
-        example: "A1:A20",
+        example: "C1:C20",
         require: 0,
         repeat: 1
       },
       {
         name: "formula.functionList.MAXIFS.functionParameter.criteria2.name",
         detail: "formula.functionList.MAXIFS.functionParameter.criteria2.detail",
-        example: '"<100"',
+        example: '"<20"',
         require: 0,
         repeat: 1
       }
@@ -10586,18 +10535,18 @@ const po = [], Lo = [
     abstract: "formula.functionList.MINA.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.MINA.functionParameter.number1.name",
-        detail: "formula.functionList.MINA.functionParameter.number1.detail",
+        name: "formula.functionList.MINA.functionParameter.value1.name",
+        detail: "formula.functionList.MINA.functionParameter.value1.detail",
         example: "A1:A20",
         require: 1,
         repeat: 0
       },
       {
-        name: "formula.functionList.MINA.functionParameter.number2.name",
-        detail: "formula.functionList.MINA.functionParameter.number2.detail",
-        example: "A1:A20",
-        require: 1,
-        repeat: 0
+        name: "formula.functionList.MINA.functionParameter.value2.name",
+        detail: "formula.functionList.MINA.functionParameter.value2.detail",
+        example: "B1:B20",
+        require: 0,
+        repeat: 1
       }
     ]
   },
@@ -10608,18 +10557,39 @@ const po = [], Lo = [
     abstract: "formula.functionList.MINIFS.abstract",
     functionParameter: [
       {
-        name: "formula.functionList.MINIFS.functionParameter.number1.name",
-        detail: "formula.functionList.MINIFS.functionParameter.number1.detail",
+        name: "formula.functionList.MINIFS.functionParameter.minRange.name",
+        detail: "formula.functionList.MINIFS.functionParameter.minRange.detail",
         example: "A1:A20",
         require: 1,
         repeat: 0
       },
       {
-        name: "formula.functionList.MINIFS.functionParameter.number2.name",
-        detail: "formula.functionList.MINIFS.functionParameter.number2.detail",
-        example: "A1:A20",
+        name: "formula.functionList.MINIFS.functionParameter.criteriaRange1.name",
+        detail: "formula.functionList.MINIFS.functionParameter.criteriaRange1.detail",
+        example: "B1:B20",
         require: 1,
         repeat: 0
+      },
+      {
+        name: "formula.functionList.MINIFS.functionParameter.criteria1.name",
+        detail: "formula.functionList.MINIFS.functionParameter.criteria1.detail",
+        example: '">10"',
+        require: 1,
+        repeat: 0
+      },
+      {
+        name: "formula.functionList.MINIFS.functionParameter.criteriaRange2.name",
+        detail: "formula.functionList.MINIFS.functionParameter.criteriaRange2.detail",
+        example: "C1:C20",
+        require: 0,
+        repeat: 1
+      },
+      {
+        name: "formula.functionList.MINIFS.functionParameter.criteria2.name",
+        detail: "formula.functionList.MINIFS.functionParameter.criteria2.detail",
+        example: '"<20"',
+        require: 0,
+        repeat: 1
       }
     ]
   },
@@ -11635,7 +11605,7 @@ const po = [], Lo = [
       }
     ]
   }
-], ho = [
+], _o = [
   {
     functionName: v.ASC,
     functionType: r.Text,
@@ -12649,9 +12619,9 @@ const po = [], Lo = [
       }
     ]
   }
-], _o = [], Oo = [
+], Oo = [], Mo = [
   {
-    functionName: Xt.ENCODEURL,
+    functionName: Gt.ENCODEURL,
     functionType: r.Web,
     description: "formula.functionList.ENCODEURL.description",
     abstract: "formula.functionList.ENCODEURL.abstract",
@@ -12673,7 +12643,7 @@ const po = [], Lo = [
     ]
   },
   {
-    functionName: Xt.FILTERXML,
+    functionName: Gt.FILTERXML,
     functionType: r.Web,
     description: "formula.functionList.FILTERXML.description",
     abstract: "formula.functionList.FILTERXML.abstract",
@@ -12695,7 +12665,7 @@ const po = [], Lo = [
     ]
   },
   {
-    functionName: Xt.WEBSERVICE,
+    functionName: Gt.WEBSERVICE,
     functionType: r.Web,
     description: "formula.functionList.WEBSERVICE.description",
     abstract: "formula.functionList.WEBSERVICE.abstract",
@@ -12716,29 +12686,29 @@ const po = [], Lo = [
       }
     ]
   }
-], Mo = [
-  ...Eo,
-  ...bo,
-  ...Ro,
+], Do = [
+  ...So,
+  ...To,
   ...Co,
-  ...No,
-  ...Po,
   ...ho,
+  ...Ro,
+  ...bo,
+  ..._o,
+  ...No,
   ...Io,
-  ...So,
-  ...To,
+  ...Eo,
+  ...Po,
   ...Ao,
+  ...Mo,
   ...Lo,
-  ...Oo,
-  ...po,
-  ..._o
+  ...Oo
 ];
-var Do = Object.defineProperty, go = Object.getOwnPropertyDescriptor, xo = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? go(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var go = Object.defineProperty, xo = Object.getOwnPropertyDescriptor, vo = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? xo(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
-  return n && i && Do(e, t, i), i;
+  return n && i && go(e, t, i), i;
 }, Wn = (a, e) => (t, n) => e(t, n, a);
-const Ye = yt("formula-ui.description-service");
+const Xe = qt("formula-ui.description-service");
 let Mt = class {
   constructor(a = [], e, t) {
     x(this, "_descriptions", []);
@@ -12759,8 +12729,8 @@ let Mt = class {
   getSearchListByName(a) {
     const e = [], t = this._functionService.getDescriptions();
     return a = a.toLocaleUpperCase(), t.forEach((n) => {
-      const { functionName: i, abstract: u } = n;
-      i.toLocaleUpperCase().indexOf(a) > -1 && e.push({ name: i, desc: u });
+      const { functionName: i, abstract: u, functionType: o } = n;
+      i.toLocaleUpperCase().indexOf(a) > -1 && o !== r.DefinedName && e.push({ name: i, desc: u });
     }), e;
   }
   getSearchListByNameFirstLetter(a) {
@@ -12774,7 +12744,7 @@ let Mt = class {
     const e = [];
     return this._functionService.getDescriptions().forEach((n) => {
       const { functionName: i, functionType: u, abstract: o } = n;
-      (u === a || a === -1) && e.push({ name: i, desc: o });
+      (u === a || a === -1) && u !== r.DefinedName && e.push({ name: i, desc: o });
     }), e;
   }
   registerDescriptions(a) {
@@ -12797,7 +12767,7 @@ let Mt = class {
     if (e.length === 0)
       return !1;
     const t = e[0].description;
-    return !fi(t);
+    return !si(t);
   }
   _initialize() {
     this._localeService.localeChanged$.subscribe(() => {
@@ -12806,7 +12776,6 @@ let Mt = class {
   }
   _initDescription() {
     const a = [
-      ...si,
       ...li,
       ...di,
       ...pi,
@@ -12821,13 +12790,14 @@ let Mt = class {
       ...Ni,
       ...Ri,
       ...Ci,
-      ...hi
-    ].map((t) => t[1]), e = Mo.filter((t) => a.includes(t.functionName));
+      ...hi,
+      ..._i
+    ].map((t) => t[1]), e = Do.filter((t) => a.includes(t.functionName));
     this._descriptions = e.concat(this._description);
   }
   _registerDescriptions() {
     const a = this._localeService, e = this._descriptions.map((t) => ({
-      functionName: xu(t, a),
+      functionName: vu(t, a),
       functionType: t.functionType,
       description: a.t(t.description),
       abstract: a.t(t.abstract),
@@ -12842,21 +12812,21 @@ let Mt = class {
     this._functionService.registerDescriptions(...e);
   }
 };
-Mt = xo([
-  Wn(1, na),
-  Wn(2, y(we))
+Mt = vo([
+  Wn(1, ta),
+  Wn(2, q(He))
 ], Mt);
-const vo = "univer-formula-select-function-select", qo = "univer-formula-select-function-result", yo = "univer-formula-select-function-result-item", Fo = "univer-formula-select-function-result-item-name-light", Uo = "univer-formula-select-function-result-item-selected", Bo = "univer-formula-select-function-result-item-active", Vo = "univer-formula-select-function-content", Te = {
-  formulaSelectFunctionSelect: vo,
+const yo = "univer-formula-select-function-select", qo = "univer-formula-select-function-result", Fo = "univer-formula-select-function-result-item", Uo = "univer-formula-select-function-result-item-name-light", Bo = "univer-formula-select-function-result-item-selected", Vo = "univer-formula-select-function-result-item-active", Ho = "univer-formula-select-function-content", be = {
+  formulaSelectFunctionSelect: yo,
   formulaSelectFunctionResult: qo,
-  formulaSelectFunctionResultItem: yo,
-  formulaSelectFunctionResultItemNameLight: Fo,
-  formulaSelectFunctionResultItemSelected: Uo,
-  formulaSelectFunctionResultItemActive: Bo,
-  formulaSelectFunctionContent: Vo
+  formulaSelectFunctionResultItem: Fo,
+  formulaSelectFunctionResultItemNameLight: Uo,
+  formulaSelectFunctionResultItemSelected: Bo,
+  formulaSelectFunctionResultItemActive: Vo,
+  formulaSelectFunctionContent: Ho
 };
-function Ho(a) {
-  const { onChange: e } = a, t = "-1", [n, i] = Y(""), [u, o] = Y([]), [m, c] = Y(0), [f, d] = Y(t), [s, l] = Y(0), [L, A] = Y(null), E = le(Ye), b = le(we), C = gu(r, b);
+function wo(a) {
+  const { onChange: e } = a, t = "-1", [n, i] = Y(""), [u, o] = Y([]), [m, c] = Y(0), [f, d] = Y(t), [l, s] = Y(0), [L, A] = Y(null), E = le(Xe), b = le(He), C = xu(r, b);
   C.unshift({
     label: b.t("formula.moreFunctions.allFunctions"),
     value: t
@@ -12870,13 +12840,13 @@ function Ho(a) {
   const h = (I) => {
     if (n.trim() === "") return I;
     const g = new RegExp(`(${n.toLocaleUpperCase()})`);
-    return I.split(g).filter(Boolean).map((W, ne) => W.match(g) ? /* @__PURE__ */ N.jsx("span", { className: Te.formulaSelectFunctionResultItemNameLight, children: W }, ne) : W);
+    return I.split(g).filter(Boolean).map((W, ne) => W.match(g) ? /* @__PURE__ */ N.jsx("span", { className: be.formulaSelectFunctionResultItemNameLight, children: W }, ne) : W);
   }, _ = (I) => {
     if (u.length === 0) {
       A(null);
       return;
     }
-    l(I);
+    s(I);
     const g = E.getFunctionInfo(u[I].name);
     if (!g) {
       A(null);
@@ -12894,7 +12864,7 @@ function Ho(a) {
     const g = E.getSearchListByName(I);
     o(g);
   }
-  function q(I) {
+  function y(I) {
     if (I.stopPropagation(), I.key === "ArrowDown") {
       const g = m + 1;
       c(g === u.length ? 0 : g);
@@ -12909,13 +12879,13 @@ function Ho(a) {
     c(-1);
   };
   return /* @__PURE__ */ N.jsxs("div", { children: [
-    /* @__PURE__ */ N.jsxs("div", { className: Te.formulaSelectFunctionSelect, children: [
-      /* @__PURE__ */ N.jsx(wr, { value: f, options: C, onChange: V }),
+    /* @__PURE__ */ N.jsxs("div", { className: be.formulaSelectFunctionSelect, children: [
+      /* @__PURE__ */ N.jsx(Gr, { value: f, options: C, onChange: V }),
       /* @__PURE__ */ N.jsx(
-        Gr,
+        Xr,
         {
           placeholder: b.t("formula.moreFunctions.searchFunctionPlaceholder"),
-          onKeyDown: q,
+          onKeyDown: y,
           value: n,
           onChange: R,
           size: "large",
@@ -12923,38 +12893,38 @@ function Ho(a) {
         }
       )
     ] }),
-    /* @__PURE__ */ N.jsx("ul", { className: Te.formulaSelectFunctionResult, onKeyDown: q, tabIndex: -1, children: u.map(({ name: I }, g) => /* @__PURE__ */ N.jsxs(
+    /* @__PURE__ */ N.jsx("ul", { className: be.formulaSelectFunctionResult, onKeyDown: y, tabIndex: -1, children: u.map(({ name: I }, g) => /* @__PURE__ */ N.jsxs(
       "li",
       {
-        className: m === g ? `${Te.formulaSelectFunctionResultItem} ${Te.formulaSelectFunctionResultItemActive}` : Te.formulaSelectFunctionResultItem,
+        className: m === g ? `${be.formulaSelectFunctionResultItem} ${be.formulaSelectFunctionResultItemActive}` : be.formulaSelectFunctionResultItem,
         onMouseEnter: () => D(g),
         onMouseLeave: U,
         onClick: () => _(g),
         children: [
-          s === g && /* @__PURE__ */ N.jsx(ya, { className: Te.formulaSelectFunctionResultItemSelected }),
-          /* @__PURE__ */ N.jsx("span", { className: Te.formulaSelectFunctionResultItemName, children: h(I) })
+          l === g && /* @__PURE__ */ N.jsx(qa, { className: be.formulaSelectFunctionResultItemSelected }),
+          /* @__PURE__ */ N.jsx("span", { className: be.formulaSelectFunctionResultItemName, children: h(I) })
         ]
       },
       g
     )) }),
-    L && /* @__PURE__ */ N.jsxs("div", { className: Te.formulaSelectFunctionContent, children: [
-      /* @__PURE__ */ N.jsx(Qe, { title: L.functionName, value: L.description }),
+    L && /* @__PURE__ */ N.jsxs("div", { className: be.formulaSelectFunctionContent, children: [
+      /* @__PURE__ */ N.jsx(je, { title: L.functionName, value: L.description }),
       /* @__PURE__ */ N.jsx(
-        Qe,
+        je,
         {
           title: b.t("formula.moreFunctions.syntax"),
           value: /* @__PURE__ */ N.jsx(Ha, { prefix: L.functionName, value: L.functionParameter })
         }
       ),
       /* @__PURE__ */ N.jsx(
-        Qe,
+        je,
         {
           title: b.t("formula.prompt.helpExample"),
           value: `${L.functionName}(${L.functionParameter.map((I) => I.example).join(",")})`
         }
       ),
       L.functionParameter && L.functionParameter.map((I, g) => /* @__PURE__ */ N.jsx(
-        Qe,
+        je,
         {
           title: I.name,
           value: `${I.require ? T : p} ${I.detail}`
@@ -12964,8 +12934,8 @@ function Ho(a) {
     ] })
   ] });
 }
-function wo() {
-  const a = Pr(), [e, t] = Y(!0), [n, i] = Y(!1), [u, o] = Y(null), m = le(we), c = le(ft);
+function Go() {
+  const a = Tr(), [e, t] = Y(!0), [n, i] = Y(!1), [u, o] = Y(null), m = le(He), c = le(Ge);
   function f() {
     t(!e), i(!n);
   }
@@ -12973,8 +12943,8 @@ function wo() {
     c.setFormula(`=${u == null ? void 0 : u.functionName}(`);
   }
   return /* @__PURE__ */ N.jsxs("div", { className: Yn.formulaMoreFunctions, children: [
-    e && /* @__PURE__ */ N.jsx(Ho, { onChange: o }),
-    n && /* @__PURE__ */ N.jsx(lo, { functionInfo: u, onChange: () => {
+    e && /* @__PURE__ */ N.jsx(wo, { onChange: o }),
+    n && /* @__PURE__ */ N.jsx(po, { functionInfo: u, onChange: () => {
     } }),
     /* @__PURE__ */ N.jsxs("div", { className: Yn.formulaMoreFunctionsOperation, children: [
       n && /* @__PURE__ */ N.jsx(kt, { type: "primary", size: "small", onClick: f, children: m.t("formula.moreFunctions.next") }),
@@ -12983,21 +12953,21 @@ function wo() {
     ] })
   ] });
 }
-const Nt = {
-  type: Se.MUTATION,
+const It = {
+  type: Te.MUTATION,
   id: "sheet.mutation.data-validation-formula-mark-dirty",
   handler() {
     return !0;
   }
 };
-function Go(a) {
+function Xo(a) {
   return {
-    id: bn.id,
+    id: Tn.id,
     icon: "FunctionSingle",
     tooltip: "formula.insert.tooltip",
-    group: Nr.TOOLBAR_FORMULAS_INSERT,
-    type: An.SELECTOR,
-    positions: [Rr.TOOLBAR_START],
+    group: Cr.TOOLBAR_FORMULAS_INSERT,
+    type: Pn.SELECTOR,
+    positions: [hr.TOOLBAR_START],
     selections: [
       {
         label: "SUM",
@@ -13025,56 +12995,53 @@ function Go(a) {
         icon: "MinSingle"
       }
     ],
-    hidden$: Cr(a, G.UNIVER_SHEET),
+    hidden$: _r(a, G.UNIVER_SHEET),
     disabled$: Ra(a, { workbookTypes: [aa], worksheetTypes: [ia, ra], rangeTypes: [ua] })
   };
 }
-function Xo(a) {
+function Yo(a) {
   return {
     id: ga.id,
     title: "formula.insert.more",
-    positions: bn.id,
-    type: An.BUTTON
+    positions: Tn.id,
+    type: Pn.BUTTON
   };
 }
-function Yo(a) {
+function Wo(a) {
   return a.get(Pe).getCurrentTypeOfUnit$(G.UNIVER_SHEET).pipe(
-    Fr((n) => n ? a.get(Vn) ? new Ur((u) => u.next(!a.get(Vn).supportClipboard)) : Hn(!0) : Hn(!0))
+    Br((n) => n ? a.get(Vn) ? new Vr((u) => u.next(!a.get(Vn).supportClipboard)) : Hn(!0) : Hn(!0))
   );
 }
-function Wo(a) {
+function Ko(a) {
   return {
     id: _a.id,
-    type: An.BUTTON,
+    type: Pn.BUTTON,
     title: "formula.operation.pasteFormula",
-    positions: [br],
-    disabled$: Yo(a).pipe(
-      yr(Ra(a, { workbookTypes: [aa], rangeTypes: [ua], worksheetTypes: [ra, ia] })),
-      Ze(([e, t]) => e || t)
+    positions: [Er],
+    disabled$: Wo(a).pipe(
+      Ur(Ra(a, { workbookTypes: [aa], rangeTypes: [ua], worksheetTypes: [ra, ia] })),
+      ze(([e, t]) => e || t)
     )
   };
 }
 const wa = "meta_key_ctrl_And_Shift";
-function Ko(a) {
+function ko(a) {
   return a.getContextValue(Ja) && a.getContextValue(ei) && a.getContextValue(ti);
 }
 function Ga(a) {
-  return (Ee(a == null ? void 0 : a.f) || Ne(a == null ? void 0 : a.si)) && typeof (a == null ? void 0 : a.v) == "string" && _i.has(a.v) ? a.v : null;
+  return (Ie(a == null ? void 0 : a.f) || ye(a == null ? void 0 : a.si)) && typeof (a == null ? void 0 : a.v) == "string" && Oi.has(a.v) ? a.v : null;
 }
-function ko(a) {
-  return (Ee(a == null ? void 0 : a.f) || Ne(a == null ? void 0 : a.si)) && (a == null ? void 0 : a.t) === He.NUMBER && typeof (a == null ? void 0 : a.v) == "number" ? ea(a.v) : null;
-}
-const Vt = [
+const Bt = [
   H.ARROW_DOWN,
   H.ARROW_UP,
   H.ARROW_LEFT,
   H.ARROW_RIGHT
-], $o = [...Vt, H.ENTER, H.TAB, H.ESC];
+], $o = [...Bt, H.ENTER, H.TAB, H.ESC];
 function jo() {
   const a = [];
   for (const e of $o)
     a.push({
-      id: ye.id,
+      id: qe.id,
       binding: e,
       preconditions: (t) => ct(t),
       staticParameters: {
@@ -13086,40 +13053,40 @@ function jo() {
 }
 function Qo() {
   const a = [];
-  for (const e of Vt)
+  for (const e of Bt)
     a.push({
-      id: ye.id,
-      binding: e | Re.SHIFT,
+      id: qe.id,
+      binding: e | Ne.SHIFT,
       preconditions: (t) => ct(t),
       staticParameters: {
         eventType: de.Keyboard,
         keycode: e,
-        metaKey: Re.SHIFT
+        metaKey: Ne.SHIFT
       }
     });
   return a;
 }
 function zo() {
   const a = [];
-  for (const e of Vt)
+  for (const e of Bt)
     a.push({
-      id: ye.id,
-      binding: e | Re.CTRL_COMMAND,
+      id: qe.id,
+      binding: e | Ne.CTRL_COMMAND,
       preconditions: (t) => ct(t),
       staticParameters: {
         eventType: de.Keyboard,
         keycode: e,
-        metaKey: Re.CTRL_COMMAND
+        metaKey: Ne.CTRL_COMMAND
       }
     });
   return a;
 }
 function Zo() {
   const a = [];
-  for (const e of Vt)
+  for (const e of Bt)
     a.push({
-      id: ye.id,
-      binding: e | Re.SHIFT | Re.CTRL_COMMAND,
+      id: qe.id,
+      binding: e | Ne.SHIFT | Ne.CTRL_COMMAND,
       preconditions: (t) => ct(t),
       staticParameters: {
         eventType: de.Keyboard,
@@ -13130,7 +13097,7 @@ function Zo() {
   return a;
 }
 const Jo = {
-  id: Tn.id,
+  id: En.id,
   binding: H.F4,
   preconditions: (a) => ct(a)
 };
@@ -13138,9 +13105,9 @@ function em() {
   const a = [];
   for (const e of [H.ENTER, H.TAB, H.ARROW_DOWN, H.ARROW_UP])
     a.push({
-      id: ye.id,
+      id: qe.id,
       binding: e,
-      preconditions: (t) => Ko(t),
+      preconditions: (t) => ko(t),
       staticParameters: {
         eventType: de.Keyboard,
         keycode: e,
@@ -13155,7 +13122,7 @@ var tm = Object.defineProperty, nm = Object.getOwnPropertyDescriptor, am = (a, e
   return n && i && tm(e, t, i), i;
 }, Oe = (a, e) => (t, n) => e(t, n, a);
 const Xa = {};
-let nt = class extends re {
+let tt = class extends re {
   constructor(a, e, t, n, i, u, o, m) {
     super(), this._config = a, this._injector = e, this._menuService = t, this._commandService = n, this._shortcutService = i, this._uiPartsService = u, this._renderManagerService = o, this._componentManager = m, this._initialize();
   }
@@ -13164,7 +13131,7 @@ let nt = class extends re {
   }
   _registerMenus() {
     const { menu: a = {} } = this._config;
-    [Go, Xo, Wo].forEach(
+    [Xo, Yo, Ko].forEach(
       (e) => {
         this.disposeWithMe(this._menuService.addMenuItem(this._injector.invoke(e), a));
       }
@@ -13174,13 +13141,13 @@ let nt = class extends re {
     [
       Oa,
       _a,
-      bn,
+      Tn,
       ga,
+      mn,
       on,
-      un,
-      ye,
-      Tn,
-      Nt
+      qe,
+      En,
+      It
     ].forEach((a) => this.disposeWithMe(this._commandService.registerCommand(a)));
   }
   _registerShortcuts() {
@@ -13197,23 +13164,23 @@ let nt = class extends re {
   }
   _registerComponents() {
     this.disposeWithMe(
-      this._uiPartsService.registerComponent(_r.CONTENT, () => qr(ao, this._injector))
-    ), this._componentManager.register(Da, wo);
+      this._uiPartsService.registerComponent(Mr.CONTENT, () => Fr(io, this._injector))
+    ), this._componentManager.register(Da, Go);
   }
   _registerRenderModules() {
     this.disposeWithMe(this._renderManagerService.registerRenderModule(G.UNIVER_SHEET, _t));
   }
 };
-nt = am([
-  Le(Ae.Ready, nt),
-  Oe(1, y(mt)),
-  Oe(2, Or),
+tt = am([
+  Le(Ae.Ready, tt),
+  Oe(1, q(ot)),
+  Oe(2, Dr),
   Oe(3, fe),
-  Oe(4, Mr),
-  Oe(5, Dr),
+  Oe(4, gr),
+  Oe(5, xr),
   Oe(6, Ft),
-  Oe(7, y(hr))
-], nt);
+  Oe(7, q(Or))
+], tt);
 const Kn = "formula_reference_selection_plugin_name";
 function Qt(a, e, t) {
   const n = a.getCurrentTheme(), i = new Qn(e).setAlpha(0.05).toRgbString();
@@ -13238,8 +13205,8 @@ var im = Object.defineProperty, rm = Object.getOwnPropertyDescriptor, um = (a, e
   return n && i && im(e, t, i), i;
 }, ae = (a, e) => (t, n) => e(t, n, a);
 const om = [ai, ii];
-let Rt = class extends re {
-  constructor(e, t, n, i, u, o, m, c, f, d, s, l, L, A, E) {
+let Nt = class extends re {
+  constructor(e, t, n, i, u, o, m, c, f, d, l, s, L, A, E) {
     super();
     x(this, "_formulaRefColors", []);
     x(this, "_previousSequenceNodes");
@@ -13255,7 +13222,7 @@ let Rt = class extends re {
     x(this, "_userCursorMove", !1);
     x(this, "_previousEditorUnitId");
     x(this, "_existsSequenceNode", !1);
-    this._commandService = e, this._contextService = t, this._textSelectionRenderManager = n, this._editorBridgeService = i, this._formulaPromptService = u, this._lexerTreeBuilder = o, this._renderManagerService = m, this._themeService = c, this._selectionManagerService = f, this._univerInstanceService = d, this._selectionRenderService = s, this._descriptionService = l, this._textSelectionManagerService = L, this._contextMenuService = A, this._editorService = E, this._initialize();
+    this._commandService = e, this._contextService = t, this._textSelectionRenderManager = n, this._editorBridgeService = i, this._formulaPromptService = u, this._lexerTreeBuilder = o, this._renderManagerService = m, this._themeService = c, this._selectionManagerService = f, this._univerInstanceService = d, this._selectionRenderService = l, this._descriptionService = s, this._textSelectionManagerService = L, this._contextMenuService = A, this._editorService = E, this._initialize();
   }
   dispose() {
     this._formulaRefColors = [], this._resetTemp();
@@ -13323,18 +13290,18 @@ let Rt = class extends re {
       })
     ), this.disposeWithMe(
       this._editorService.closeRangePrompt$.subscribe(() => {
-        (!this._editorService.getSpreadsheetFocusState() || !this._formulaPromptService.isLockedSelectionInsert()) && (this._closeRangePrompt(), this._selectionManagerService.changePlugin(De));
+        (!this._editorService.getSpreadsheetFocusState() || !this._formulaPromptService.isLockedSelectionInsert()) && (this._closeRangePrompt(), this._selectionManagerService.changePlugin(Me));
       })
     );
   }
   _closeRangePrompt(e) {
     const t = this._selectionManagerService.getCurrent();
-    if (this._insertSelections = [], (t == null ? void 0 : t.pluginName) === De) {
+    if (this._insertSelections = [], (t == null ? void 0 : t.pluginName) === Me) {
       this._disableForceKeepVisible();
       return;
     }
-    this._selectionManagerService.clear(), e && this._editorService.isSheetEditor(e) ? (this._selectionManagerService.changePlugin(De), this._updateEditorModel(`\r
-`, [])) : this._selectionManagerService.changePluginNoRefresh(De), this._contextService.setContextValue(pt, !1), this._disableForceKeepVisible(), this._selectionRenderService.resetStyle(), this._resetTemp(), this._hideFunctionPanel();
+    this._selectionManagerService.clear(), e && this._editorService.isSheetEditor(e) ? (this._selectionManagerService.changePlugin(Me), this._updateEditorModel(`\r
+`, [])) : this._selectionManagerService.changePluginNoRefresh(Me), this._contextService.setContextValue(dt, !1), this._disableForceKeepVisible(), this._selectionRenderService.resetStyle(), this._resetTemp(), this._hideFunctionPanel();
   }
   _initialRefSelectionUpdateEvent() {
     const e = new zn();
@@ -13345,7 +13312,7 @@ let Rt = class extends re {
           const t = this._selectionManagerService.getCurrent();
           if (this._formulaPromptService.disableSelectionMoving(), (t == null ? void 0 : t.pluginName) !== Kn)
             return;
-          this._updateRefSelectionStyle(this._isSelectionMovingRefSelections), this._selectionRenderService.getCurrentControls().forEach((i) => {
+          this._updateRefSelectionStyle(this._isSelectionMovingRefSelections), this._selectionRenderService.getSelectionControls().forEach((i) => {
             i.disableHelperSelection(), e.add(
               Z(
                 i.selectionMoving$.subscribe((u) => {
@@ -13422,17 +13389,17 @@ let Rt = class extends re {
           }
           const m = e.length - o.token.length, c = { ...o };
           c.token = e, c.endIndex += m, i[u] = c;
-          const f = this._descriptionService.hasDefinedNameDescription(e), d = this._descriptionService.isFormulaDefinedName(e), s = e.length + 1, l = !f || d;
-          l && i.splice(u + 1, 0, Ue.OPEN_BRACKET);
+          const f = this._descriptionService.hasDefinedNameDescription(e), d = this._descriptionService.isFormulaDefinedName(e), l = e.length + 1, s = !f || d;
+          s && i.splice(u + 1, 0, Ue.OPEN_BRACKET);
           for (let A = u + 2, E = i.length; A < E; A++) {
             const b = i[A];
             if (typeof b == "string")
               continue;
             const C = { ...b };
-            C.startIndex += s, C.endIndex += s, i[A] = C;
+            C.startIndex += l, C.endIndex += l, i[A] = C;
           }
           let L = c.endIndex + 1;
-          l && (L += 1), this._syncToEditor(i, L);
+          s && (L += 1), this._syncToEditor(i, L);
         })
       )
     );
@@ -13454,7 +13421,7 @@ let Rt = class extends re {
         const f = this._descriptionService.getSearchListByNameFirstLetter(c);
         if (this._hideFunctionPanel(), f == null || f.length === 0)
           return;
-        this._commandService.executeCommand(on.id, {
+        this._commandService.executeCommand(mn.id, {
           visible: !0,
           searchText: c,
           searchList: f
@@ -13473,17 +13440,17 @@ let Rt = class extends re {
   }
   _changeHelpFunctionPanelState(e, t) {
     const n = this._descriptionService.getFunctionInfo(e);
-    this._hideFunctionPanel(), n != null && this._commandService.executeCommand(un.id, {
+    this._hideFunctionPanel(), n != null && this._commandService.executeCommand(on.id, {
       visible: !0,
       paramIndex: t,
       functionInfo: n
     });
   }
   _hideFunctionPanel() {
-    this._commandService.executeCommand(on.id, {
+    this._commandService.executeCommand(mn.id, {
       visible: !1,
       searchText: ""
-    }), this._commandService.executeCommand(un.id, {
+    }), this._commandService.executeCommand(on.id, {
       visible: !1,
       paramIndex: -1
     });
@@ -13503,7 +13470,7 @@ let Rt = class extends re {
       this._disableForceKeepVisible();
       return;
     }
-    Cn(e) ? (this._editorBridgeService.enableForceKeepVisible(), this._contextMenuService.disable(), this._formulaPromptService.enableLockedSelectionInsert(), this._selectionRenderService.enableRemainLast(), this._arrowMoveActionState !== 1 && (this._arrowMoveActionState = 2)) : this._disableForceKeepVisible();
+    hn(e) ? (this._editorBridgeService.enableForceKeepVisible(), this._contextMenuService.disable(), this._formulaPromptService.enableLockedSelectionInsert(), this._selectionRenderService.enableRemainLast(), this._arrowMoveActionState !== 1 && (this._arrowMoveActionState = 2)) : this._disableForceKeepVisible();
   }
   /**
    *
@@ -13533,7 +13500,7 @@ let Rt = class extends re {
     if (!(e != null && e.getBody()))
       return;
     const t = e.getUnitId(), n = this._editorService.getEditor(t), i = (o = (u = e.getBody()) == null ? void 0 : u.dataStream) != null ? o : "";
-    return !n || !n.onlyInputRange() ? { dataStream: i, offset: 0 } : { dataStream: Yt.EQUALS + i, offset: 1 };
+    return !n || !n.onlyInputRange() ? { dataStream: i, offset: 0 } : { dataStream: Xt.EQUALS + i, offset: 1 };
   }
   _getFormulaAndCellEditorBody(e) {
     return e.map((t) => {
@@ -13553,8 +13520,8 @@ let Rt = class extends re {
    */
   _contextSwitch() {
     const e = this._getCurrentBodyDataStreamAndOffset();
-    if (e && Ee(e.dataStream)) {
-      this._contextService.setContextValue(pt, !0);
+    if (e && Ie(e.dataStream)) {
+      this._contextService.setContextValue(dt, !0);
       const t = this._lexerTreeBuilder.sequenceNodesBuilder(e.dataStream.replace(/\r/g, "").replace(/\n/g, "")) || [];
       this._formulaPromptService.setSequenceNodes(t);
       const n = this._textSelectionManagerService.getActiveRange();
@@ -13564,10 +13531,10 @@ let Rt = class extends re {
       this._currentInsertRefStringIndex = i - 1 + e.offset;
       return;
     }
-    this._contextService.setContextValue(pt, !1), this._formulaPromptService.disableLockedSelectionChange(), this._formulaPromptService.disableLockedSelectionInsert(), this._formulaPromptService.clearSequenceNodes(), this._hideFunctionPanel();
+    this._contextService.setContextValue(dt, !1), this._formulaPromptService.disableLockedSelectionChange(), this._formulaPromptService.disableLockedSelectionInsert(), this._formulaPromptService.clearSequenceNodes(), this._hideFunctionPanel();
   }
   _getContextState() {
-    return this._contextService.getContextValue(pt);
+    return this._contextService.getContextValue(dt);
   }
   /**
    * Switch from formula selection state to regular selection state.
@@ -13575,10 +13542,10 @@ let Rt = class extends re {
   _switchSelectionPlugin() {
     if (this._getContextState() === !0) {
       this._selectionManagerService.changePluginNoRefresh(Kn);
-      const e = Yi(this._themeService);
+      const e = Ki(this._themeService);
       e.strokeDash = 8, e.hasAutoFill = !1, e.hasRowHeader = !1, e.hasColumnHeader = !1, this._selectionRenderService.setStyle(e);
     } else
-      this._selectionManagerService.changePluginNoRefresh(De), this._selectionRenderService.resetStyle();
+      this._selectionManagerService.changePluginNoRefresh(Me), this._selectionRenderService.resetStyle();
   }
   /**
    * Highlight cell editor and formula bar editor.
@@ -13610,7 +13577,7 @@ let Rt = class extends re {
       const d = e[c];
       if (typeof d == "string" || this._descriptionService.hasDefinedNameDescription(d.token.trim()))
         continue;
-      const { startIndex: s, endIndex: l, nodeType: L, token: A } = d;
+      const { startIndex: l, endIndex: s, nodeType: L, token: A } = d;
       let E = "";
       if (L === me.REFERENCE) {
         if (i.has(A))
@@ -13626,8 +13593,8 @@ let Rt = class extends re {
         });
       } else L === me.NUMBER ? E = this._numberColor : L === me.STRING ? E = this._stringColor : L === me.ARRAY && (E = this._stringColor);
       E && E.length > 0 && t.push({
-        st: s + 1 - o,
-        ed: l + 2 - o,
+        st: l + 1 - o,
+        ed: s + 2 - o,
         ts: {
           cl: {
             rgb: E
@@ -13651,32 +13618,32 @@ let Rt = class extends re {
       return;
     let m = null;
     for (let c = 0, f = e.length; c < f; c++) {
-      const d = e[c], { themeColor: s, token: l, refIndex: L } = d, A = qe(l), { unitId: E, sheetName: b, range: C } = A, T = Wi(C, o.getRowCount(), o.getColumnCount());
+      const d = e[c], { themeColor: l, token: s, refIndex: L } = d, A = ve(s), { unitId: E, sheetName: b, range: C } = A, T = ki(C, o.getRowCount(), o.getColumnCount());
       if (E != null && E.length > 0 && t !== E)
         continue;
       const p = this._getSheetIdByName(t, b.trim());
       if (b.length !== 0 && p !== n || this._exceedCurrentRange(T, o.getRowCount(), o.getColumnCount()))
         continue;
-      const h = this._getPrimary(T, s, L);
+      const h = this._getPrimary(T, l, L);
       if (h) {
         m = h;
         continue;
       }
-      const _ = Ki(T, o);
-      !ge.equals(_, T) && T.startRow === T.endRow && T.startColumn === T.endColumn && (T.startRow = _.startRow, T.endRow = _.endRow, T.startColumn = _.startColumn, T.endColumn = _.endColumn), i.push({
+      const _ = $i(T, o);
+      !De.equals(_, T) && T.startRow === T.endRow && T.startColumn === T.endColumn && (T.startRow = _.startRow, T.endRow = _.endRow, T.startColumn = _.startColumn, T.endColumn = _.endColumn), i.push({
         range: T,
         primary: _,
-        style: Qt(this._themeService, s, L.toString())
+        style: Qt(this._themeService, l, L.toString())
       });
     }
     m && i.push(m), i.length !== 0 && this._selectionManagerService.add(i);
   }
   _getPrimary(e, t, n) {
-    var s;
-    const i = (s = this._insertSelections.find((l) => {
-      const { startRow: L, startColumn: A, endRow: E, endColumn: b } = l.range;
+    var l;
+    const i = (l = this._insertSelections.find((s) => {
+      const { startRow: L, startColumn: A, endRow: E, endColumn: b } = s.range;
       return L === e.startRow && A === e.startColumn && E === e.endRow && b === e.endColumn || L === e.startRow && A === e.startColumn && e.startRow === e.endRow && e.startColumn === e.endColumn;
-    })) == null ? void 0 : s.primary;
+    })) == null ? void 0 : l.primary;
     if (i == null)
       return;
     const {
@@ -13696,7 +13663,7 @@ let Rt = class extends re {
   _getSheetIdByName(e, t) {
     var i;
     const n = this._univerInstanceService.getUniverSheetInstance(e);
-    return (i = n == null ? void 0 : n.getSheetBySheetName(Oi(t))) == null ? void 0 : i.getSheetId();
+    return (i = n == null ? void 0 : n.getSheetBySheetName(Mi(t))) == null ? void 0 : i.getSheetId();
   }
   _getSheetNameById(e, t) {
     var u;
@@ -13732,7 +13699,7 @@ let Rt = class extends re {
     const { openUnitId: o, openSheetId: m } = this._getOpenForCurrentSheet();
     t === o ? i = "" : i = t, n === m ? u = "" : u = this._getSheetNameById(t, n);
     const { range: c, primary: f } = e;
-    let { startRow: d, endRow: s, startColumn: l, endColumn: L } = c;
+    let { startRow: d, endRow: l, startColumn: s, endColumn: L } = c;
     const { startAbsoluteRefType: A, endAbsoluteRefType: E, rangeType: b } = c;
     if (f) {
       const {
@@ -13743,15 +13710,15 @@ let Rt = class extends re {
         startColumn: _,
         endColumn: V
       } = f;
-      (C || T) && p === d && _ === l && h === s && V === L && (d = p, l = _, s = p, L = _);
+      (C || T) && p === d && _ === s && h === l && V === L && (d = p, s = _, l = p, L = _);
     }
-    return St({
+    return Et({
       sheetName: u,
       unitId: i,
       range: {
         startRow: d,
-        endRow: s,
-        startColumn: l,
+        endRow: l,
+        startColumn: s,
         endColumn: L,
         rangeType: b,
         startAbsoluteRefType: A,
@@ -13765,7 +13732,7 @@ let Rt = class extends re {
    * @param textSelectionOffset
    */
   _syncToEditor(e, t, n, i = !0) {
-    let u = ln(e);
+    let u = dn(e);
     const { textRuns: o, refSelections: m } = this._buildTextRuns(e);
     this._isSelectionMovingRefSelections = m;
     const c = this._textSelectionManagerService.getActiveRange();
@@ -13773,13 +13740,13 @@ let Rt = class extends re {
       return;
     const { collapsed: f, style: d } = c;
     this._currentInsertRefStringIndex = t, n == null && (n = this._univerInstanceService.getCurrentUniverDocInstance().getUnitId()), this._fitEditorSize();
-    const s = this._editorService.getEditor(n);
-    s != null && s.isSingleChoice() && (u = u.split(",")[0]);
-    let l = u, L = 1;
-    (!s || !s.onlyInputRange()) && (l = `${Yt.EQUALS}${u}`, L = 0), i ? this._commandService.executeCommand(Xr.id, {
+    const l = this._editorService.getEditor(n);
+    l != null && l.isSingleChoice() && (u = u.split(",")[0]);
+    let s = u, L = 1;
+    (!l || !l.onlyInputRange()) && (s = `${Xt.EQUALS}${u}`, L = 0), i ? this._commandService.executeCommand(Yr.id, {
       unitId: n,
       body: {
-        dataStream: l,
+        dataStream: s,
         textRuns: o
       },
       textRanges: [
@@ -13791,7 +13758,7 @@ let Rt = class extends re {
         }
       ],
       segmentId: null
-    }) : (this._updateEditorModel(`${l}\r
+    }) : (this._updateEditorModel(`${s}\r
 `, o), this._textSelectionManagerService.replaceTextRanges([
       {
         startOffset: t + 1 - L,
@@ -13804,7 +13771,7 @@ let Rt = class extends re {
   }
   _fitEditorSize() {
     const t = this._univerInstanceService.getCurrentUniverDocInstance().getUnitId();
-    this._editorService.isEditor(t) && !this._editorService.isSheetEditor(t) || this._commandService.executeCommand(gr.id, {
+    this._editorService.isEditor(t) && !this._editorService.isSheetEditor(t) || this._commandService.executeCommand(vr.id, {
       unitId: t
     });
   }
@@ -13818,7 +13785,7 @@ let Rt = class extends re {
     const n = this._univerInstanceService.getCurrentUniverDocInstance(), i = n.getUnitId();
     if (!this._editorService.isEditor(i))
       return;
-    const u = (c = this._renderManagerService.getRenderById(i)) == null ? void 0 : c.with(Yr).getViewModel();
+    const u = (c = this._renderManagerService.getRenderById(i)) == null ? void 0 : c.with(Wr).getViewModel();
     if (u == null || n == null)
       return;
     const o = n == null ? void 0 : n.getSnapshot();
@@ -13870,24 +13837,24 @@ let Rt = class extends re {
       const i = this._getCurrentChar();
       if (i == null)
         return;
-      this._previousInsertRefStringIndex = this._currentInsertRefStringIndex, !Cn(i) && this._focusIsOnlyRange(e.length) && (this._formulaPromptService.insertSequenceString(this._currentInsertRefStringIndex, Ue.COMMA), n = this._formulaPromptService.getSequenceNodes(), this._previousInsertRefStringIndex += 1), this._previousSequenceNodes = ie.deepClone(n);
+      this._previousInsertRefStringIndex = this._currentInsertRefStringIndex, !hn(i) && this._focusIsOnlyRange(e.length) && (this._formulaPromptService.insertSequenceString(this._currentInsertRefStringIndex, Ue.COMMA), n = this._formulaPromptService.getSequenceNodes(), this._previousInsertRefStringIndex += 1), this._previousSequenceNodes = ie.deepClone(n);
       const u = this._getRefString(t);
       this._formulaPromptService.setSequenceNodes(n), this._formulaPromptService.insertSequenceRef(this._previousInsertRefStringIndex, u), this._selectionRenderService.disableSkipRemainLast();
     }
     this._arrowMoveActionState = 2, this._previousRangesCount = e.length;
   }
   _updateRefSelectionStyle(e) {
-    const t = this._selectionRenderService.getCurrentControls(), { unitId: n, sheetId: i } = this._getCurrentUnitIdAndSheetId();
+    const t = this._selectionRenderService.getSelectionControls(), { unitId: n, sheetId: i } = this._getCurrentUnitIdAndSheetId();
     for (let u = 0, o = e.length; u < o; u++) {
-      const m = e[u], { refIndex: c, themeColor: f, token: d } = m, s = qe(d), { unitId: l, sheetName: L, range: A } = s;
-      if (l != null && l.length > 0 && n !== l)
+      const m = e[u], { refIndex: c, themeColor: f, token: d } = m, l = ve(d), { unitId: s, sheetName: L, range: A } = l;
+      if (s != null && s.length > 0 && n !== s)
         continue;
       const E = this._getSheetIdByName(n, L.trim());
       if (E != null && E !== i)
         continue;
       const b = t.find((T) => {
         const { startRow: p, startColumn: h, endRow: _, endColumn: V, rangeType: R } = T.getRange();
-        return R === xe.COLUMN && h === A.startColumn && V === A.endColumn || R === xe.ROW && p === A.startRow && _ === A.endRow || p === A.startRow && h === A.startColumn && _ === A.endRow && V === A.endColumn || p === A.startRow && h === A.startColumn && A.startRow === A.endRow && A.startColumn === A.endColumn;
+        return R === ge.COLUMN && h === A.startColumn && V === A.endColumn || R === ge.ROW && p === A.startRow && _ === A.endRow || p === A.startRow && h === A.startColumn && _ === A.endRow && V === A.endColumn || p === A.startRow && h === A.startColumn && A.startRow === A.endRow && A.startColumn === A.endColumn;
       });
       if (b == null)
         continue;
@@ -13917,11 +13884,11 @@ let Rt = class extends re {
       } = f;
       (C || T) && p === u && _ === m && h === o && V === c && (u = p, m = _, o = p, c = _);
     }
-    const d = Number(i), s = this._formulaPromptService.getCurrentSequenceNodeByIndex(d);
-    let l = { startAbsoluteRefType: J.NONE };
-    if (typeof s != "string") {
-      const C = s.token;
-      l = Mi(C), l.endAbsoluteRefType == null && (l.endAbsoluteRefType = l.startAbsoluteRefType);
+    const d = Number(i), l = this._formulaPromptService.getCurrentSequenceNodeByIndex(d);
+    let s = { startAbsoluteRefType: J.NONE };
+    if (typeof l != "string") {
+      const C = l.token;
+      s = Di(C), s.endAbsoluteRefType == null && (s.endAbsoluteRefType = s.startAbsoluteRefType);
     }
     const L = this._getRefString({
       range: {
@@ -13929,7 +13896,7 @@ let Rt = class extends re {
         endRow: Math.max(u, o),
         startColumn: Math.min(m, c),
         endColumn: Math.max(m, c),
-        ...l
+        ...s
       },
       primary: f,
       style: null
@@ -13941,12 +13908,12 @@ let Rt = class extends re {
   _refreshFormulaAndCellEditor(e) {
     var t;
     for (const n of e) {
-      const i = yn(n, this._renderManagerService), u = i == null ? void 0 : i.document;
+      const i = qn(n, this._renderManagerService), u = i == null ? void 0 : i.document;
       u != null && ((t = u.getSkeleton()) == null || t.calculate(), u.makeDirty());
     }
   }
   _setRemainCapture() {
-    const { unitId: e } = this._getCurrentUnitIdAndSheetId(), t = yn(e, this._renderManagerService), n = t == null ? void 0 : t.engine;
+    const { unitId: e } = this._getCurrentUnitIdAndSheetId(), t = qn(e, this._renderManagerService), n = t == null ? void 0 : t.engine;
     n == null || n.setRemainCapture();
   }
   _cursorStateListener() {
@@ -13993,10 +13960,10 @@ let Rt = class extends re {
   _pressArrowKey(e) {
     const { keycode: t, metaKey: n } = e;
     let i = X.DOWN;
-    t === H.ARROW_DOWN ? i = X.DOWN : t === H.ARROW_UP ? i = X.UP : t === H.ARROW_LEFT ? i = X.LEFT : t === H.ARROW_RIGHT && (i = X.RIGHT), n === Re.CTRL_COMMAND ? this._commandService.executeCommand(Fn.id, {
+    t === H.ARROW_DOWN ? i = X.DOWN : t === H.ARROW_UP ? i = X.UP : t === H.ARROW_LEFT ? i = X.LEFT : t === H.ARROW_RIGHT && (i = X.RIGHT), n === Ne.CTRL_COMMAND ? this._commandService.executeCommand(Fn.id, {
       direction: i,
       jumpOver: Un.moveGap
-    }) : n === Re.SHIFT ? this._commandService.executeCommand(Bn.id, {
+    }) : n === Ne.SHIFT ? this._commandService.executeCommand(Bn.id, {
       direction: i
     }) : n === wa ? this._commandService.executeCommand(Bn.id, {
       direction: i,
@@ -14006,10 +13973,10 @@ let Rt = class extends re {
     });
   }
   _commandExecutedListener() {
-    const e = [ye.id];
+    const e = [qe.id];
     this.disposeWithMe(
       this._commandService.onCommandExecuted((t) => {
-        if (t.id === Tn.id)
+        if (t.id === En.id)
           this._changeRefString();
         else if (e.includes(t.id)) {
           const n = t.params, { keycode: i, isSingleEditor: u = !1 } = n;
@@ -14050,7 +14017,7 @@ let Rt = class extends re {
             return;
           }
           if (this._arrowMoveActionState === 2 && (this._arrowMoveActionState = 3), (this._selectionManagerService.getSelectionRanges() || []).length === 0) {
-            const f = this._selectionManagerService.getLastByPlugin(De);
+            const f = this._selectionManagerService.getLastByPlugin(Me);
             if (f != null) {
               const d = ie.deepClone(f);
               this._selectionManagerService.add([d]);
@@ -14067,7 +14034,7 @@ let Rt = class extends re {
     if (e == null)
       return;
     let t = X.LEFT;
-    e === H.ARROW_DOWN ? t = X.DOWN : e === H.ARROW_UP ? t = X.UP : e === H.ARROW_RIGHT && (t = X.RIGHT), this._commandService.executeCommand(Wr.id, {
+    e === H.ARROW_DOWN ? t = X.DOWN : e === H.ARROW_UP ? t = X.UP : e === H.ARROW_RIGHT && (t = X.RIGHT), this._commandService.executeCommand(Kr.id, {
       direction: t
     });
   }
@@ -14085,7 +14052,7 @@ let Rt = class extends re {
       Z(
         this._editorService.inputFormula$.subscribe((e) => {
           const { formulaString: t, editorUnitId: n } = e;
-          if (t.substring(0, 1) !== Yt.EQUALS)
+          if (t.substring(0, 1) !== Xt.EQUALS)
             return;
           this._editorBridgeService.isVisible().visible === !1 && this._editorBridgeService.changeVisible({
             visible: !0,
@@ -14112,15 +14079,15 @@ let Rt = class extends re {
     let m = u.token;
     o.length > 1 && (m = o[o.length - 1]);
     let c = "";
-    for (let s = 0, l = o.length; s < l - 1; s++)
-      c += o[s];
+    for (let l = 0, s = o.length; l < s - 1; l++)
+      c += o[l];
     let f = m;
     if (m.indexOf(Ue.COLON) > -1)
       if (!this._userCursorMove)
         f = this._changeRangeRef(m);
       else {
-        const s = m.split(Ue.COLON), l = s[0], L = s[1];
-        n - u.startIndex <= l.length ? f = this._changeSingleRef(l) + Ue.COLON + L : f = l + Ue.COLON + this._changeSingleRef(L);
+        const l = m.split(Ue.COLON), s = l[0], L = l[1];
+        n - u.startIndex <= s.length ? f = this._changeSingleRef(s) + Ue.COLON + L : f = s + Ue.COLON + this._changeSingleRef(L);
       }
     else
       f = this._changeSingleRef(m);
@@ -14129,52 +14096,60 @@ let Rt = class extends re {
     this._formulaPromptService.updateSequenceRef(i, f), this._syncToEditor(this._formulaPromptService.getSequenceNodes(), n + d + 1);
   }
   _changeRangeRef(e) {
-    const t = qe(e).range;
+    const t = ve(e).range;
     let n = "";
-    return t.startAbsoluteRefType === J.NONE || t.startAbsoluteRefType == null ? (t.startAbsoluteRefType = J.ALL, t.endAbsoluteRefType = J.ALL) : (t.startAbsoluteRefType = J.NONE, t.endAbsoluteRefType = J.NONE), n = ot(t), n;
+    return t.startAbsoluteRefType === J.NONE || t.startAbsoluteRefType == null ? (t.startAbsoluteRefType = J.ALL, t.endAbsoluteRefType = J.ALL) : (t.startAbsoluteRefType = J.NONE, t.endAbsoluteRefType = J.NONE), n = ut(t), n;
   }
   _changeSingleRef(e) {
-    const t = qe(e).range, n = t.startAbsoluteRefType;
+    const t = ve(e).range, n = t.startAbsoluteRefType;
     let i = "";
-    return n === J.NONE || n == null ? (t.startAbsoluteRefType = J.ALL, t.endAbsoluteRefType = J.ALL) : n === J.ALL ? (t.startAbsoluteRefType = J.ROW, t.endAbsoluteRefType = J.ROW) : n === J.ROW ? (t.startAbsoluteRefType = J.COLUMN, t.endAbsoluteRefType = J.COLUMN) : (t.startAbsoluteRefType = J.NONE, t.endAbsoluteRefType = J.NONE), i = ot(t), i;
+    return n === J.NONE || n == null ? (t.startAbsoluteRefType = J.ALL, t.endAbsoluteRefType = J.ALL) : n === J.ALL ? (t.startAbsoluteRefType = J.ROW, t.endAbsoluteRefType = J.ROW) : n === J.ROW ? (t.startAbsoluteRefType = J.COLUMN, t.endAbsoluteRefType = J.COLUMN) : (t.startAbsoluteRefType = J.NONE, t.endAbsoluteRefType = J.NONE), i = ut(t), i;
   }
   _getEditorObject() {
     const e = this._univerInstanceService.getCurrentUniverDocInstance().getUnitId(), t = this._editorService.getEditor(e);
     return t == null ? void 0 : t.render;
   }
 };
-Rt = um([
-  Le(Ae.Rendered, Rt),
+Nt = um([
+  Le(Ae.Rendered, Nt),
   ae(0, fe),
   ae(1, ri),
-  ae(2, Bi),
-  ae(3, y(Sa)),
-  ae(4, y(Fe)),
-  ae(5, y(Xe)),
+  ae(2, Hi),
+  ae(3, q(Sa)),
+  ae(4, q(Fe)),
+  ae(5, q(mt)),
   ae(6, Ft),
-  ae(7, y(fn)),
-  ae(8, y(Ln)),
+  ae(7, q(sn)),
+  ae(8, q(An)),
   ae(9, Pe),
-  ae(10, y(Na)),
-  ae(11, y(Ye)),
-  ae(12, y(Kr)),
-  ae(13, xr),
-  ae(14, ft)
-], Rt);
+  ae(10, q(Na)),
+  ae(11, q(Xe)),
+  ae(12, q(kr)),
+  ae(13, yr),
+  ae(14, Ge)
+], Nt);
 var mm = Object.defineProperty, cm = Object.getOwnPropertyDescriptor, fm = (a, e, t, n) => {
   for (var i = n > 1 ? void 0 : n ? cm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
   return n && i && mm(e, t, i), i;
-}, je = (a, e) => (t, n) => e(t, n, a);
-let at = class extends re {
+}, $e = (a, e) => (t, n) => e(t, n, a);
+let nt = class extends re {
   constructor(e, t, n, i, u) {
     super();
     x(this, "_waitingCommandQueue", []);
-    x(this, "_executingCommandQueue", []);
+    x(this, "_executingDirtyData", {
+      dirtyRanges: [],
+      dirtyNameMap: {},
+      dirtyDefinedNameMap: {},
+      dirtyUnitFeatureMap: {},
+      dirtyUnitOtherFormulaMap: {}
+    });
     x(this, "_setTimeoutKey", -1);
     x(this, "_startExecutionTime", 0);
     x(this, "_formulaCalculationDoneCount", 0);
     x(this, "_arrayFormulaCalculationDoneCount", 0);
+    x(this, "_executionInProgressParams", null);
+    x(this, "_restartCalculation", !1);
     this._commandService = e, this._activeDirtyManagerService = t, this._numfmtService = n, this._formulaDataModel = i, this._progressService = u, this._initialize();
   }
   _initialize() {
@@ -14186,19 +14161,20 @@ let at = class extends re {
         if (this._activeDirtyManagerService.get(e.id)) {
           if (e.id === pe.id) {
             const n = e.params;
-            if (t && t.onlyLocal === !0 || n.trigger === dn.id || n.trigger === oa.id || n.trigger === ma.id)
+            if (t && t.onlyLocal === !0 || n.trigger === pn.id || n.trigger === oa.id || n.trigger === ma.id)
               return;
           }
           this._waitingCommandQueue.push(e), clearTimeout(this._setTimeoutKey), this._setTimeoutKey = setTimeout(() => {
-            this._commandService.executeCommand(
-              hn.id,
+            const n = this._generateDirty(this._waitingCommandQueue);
+            this._executingDirtyData = this._mergeDirty(this._executingDirtyData, n), this._executionInProgressParams == null ? this._commandService.executeCommand(
+              Yt.id,
               {
-                ...this._generateDirty(this._waitingCommandQueue)
+                ...this._executingDirtyData
               },
               {
                 onlyLocal: !0
               }
-            ), this._startExecutionTime = performance.now(), this._executingCommandQueue = this._waitingCommandQueue, this._waitingCommandQueue = [];
+            ) : (this._restartCalculation = !0, this._commandService.executeCommand(gi.id, {})), this._startExecutionTime = performance.now(), this._waitingCommandQueue = [];
           }, 100);
         }
       })
@@ -14210,8 +14186,8 @@ let at = class extends re {
       const c = this._activeDirtyManagerService.get(m.id);
       if (c == null)
         continue;
-      const f = c.getDirtyData(m), { dirtyRanges: d, dirtyNameMap: s, dirtyDefinedNameMap: l, dirtyUnitFeatureMap: L, dirtyUnitOtherFormulaMap: A } = f;
-      d != null && t.push(...d), s != null && this._mergeDirtyNameMap(n, s), l != null && this._mergeDirtyNameMap(i, l), L != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, L), A != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(o, A);
+      const f = c.getDirtyData(m), { dirtyRanges: d, dirtyNameMap: l, dirtyDefinedNameMap: s, dirtyUnitFeatureMap: L, dirtyUnitOtherFormulaMap: A } = f;
+      d != null && t.push(...d), l != null && this._mergeDirtyNameMap(n, l), s != null && this._mergeDirtyNameMap(i, s), L != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, L), A != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(o, A);
     }
     return {
       dirtyRanges: t,
@@ -14222,6 +14198,16 @@ let at = class extends re {
       // numfmtItemMap,
     };
   }
+  _mergeDirty(e, t) {
+    const n = [...e.dirtyRanges, ...t.dirtyRanges], i = { ...e.dirtyNameMap }, u = { ...e.dirtyDefinedNameMap }, o = { ...e.dirtyUnitFeatureMap }, m = { ...e.dirtyUnitOtherFormulaMap };
+    return this._mergeDirtyNameMap(i, t.dirtyNameMap), this._mergeDirtyNameMap(u, t.dirtyDefinedNameMap), this._mergeDirtyUnitFeatureOrOtherFormulaMap(o, t.dirtyUnitFeatureMap), this._mergeDirtyUnitFeatureOrOtherFormulaMap(m, t.dirtyUnitOtherFormulaMap), {
+      dirtyRanges: n,
+      dirtyNameMap: i,
+      dirtyDefinedNameMap: u,
+      dirtyUnitFeatureMap: o,
+      dirtyUnitOtherFormulaMap: m
+    };
+  }
   _mergeDirtyNameMap(e, t) {
     Object.keys(t).forEach((n) => {
       e[n] == null && (e[n] = {}), Object.keys(t[n]).forEach((i) => {
@@ -14239,18 +14225,20 @@ let at = class extends re {
       });
     });
   }
+  // eslint-disable-next-line max-lines-per-function
   _initialExecuteFormulaProcessListener() {
-    const e = In(this._pushFormulaTask.bind(this), 300), t = In(this._pushArrayFormulaTask.bind(this), 300);
+    const e = Nn(this._pushFormulaTask.bind(this), 300), t = Nn(this._pushArrayFormulaTask.bind(this), 300);
     let n = null, i = 0, u = 0, o = 0, m = !1, c = !1;
     this.disposeWithMe(
+      // eslint-disable-next-line complexity, max-lines-per-function
       this._commandService.onCommandExecuted((f) => {
-        if (f.id !== Di.id)
+        if (f.id !== xi.id)
           return;
         const d = f.params;
         if (d.stageInfo != null) {
           const {
-            totalFormulasToCalculate: s,
-            completedFormulasCount: l,
+            totalFormulasToCalculate: l,
+            completedFormulasCount: s,
             totalArrayFormulasToCalculate: L,
             completedArrayFormulasCount: A,
             stage: E
@@ -14258,32 +14246,49 @@ let at = class extends re {
           E === Wt.START_DEPENDENCY ? (i++, n !== null && (clearTimeout(n), n = null), n = setTimeout(() => {
             const b = u - this._formulaCalculationDoneCount + (o - this._arrayFormulaCalculationDoneCount) + 100;
             this._progressService.insertTaskCount(b), this._progressService.pushTask({ count: 5 }), n = null;
-          }, 1e3)) : E === Wt.CURRENTLY_CALCULATING ? (l === 1 && !m && (m = !0, n ? u += s : this._progressService.insertTaskCount(s)), n ? this._formulaCalculationDoneCount = l : e(l)) : E === Wt.CURRENTLY_CALCULATING_ARRAY_FORMULA && (A === 1 && !c && (c = !0, n ? o += L : this._progressService.insertTaskCount(L)), n ? this._arrayFormulaCalculationDoneCount = A : t(A));
+          }, 1e3)) : E === Wt.CURRENTLY_CALCULATING ? (s === 1 && !m && (m = !0, n ? u += l : this._progressService.insertTaskCount(l)), n ? this._formulaCalculationDoneCount = s : e(s)) : E === Wt.CURRENTLY_CALCULATING_ARRAY_FORMULA && (A === 1 && !c && (c = !0, n ? o += L : this._progressService.insertTaskCount(L)), n ? this._arrayFormulaCalculationDoneCount = A : t(A)), this._executionInProgressParams = d.stageInfo;
         } else {
-          const s = d.functionsExecutedState;
-          let l = "";
-          switch (s) {
+          const l = d.functionsExecutedState;
+          let s = "";
+          switch (i--, l) {
             case Be.NOT_EXECUTED:
-              l = "No tasks are being executed anymore", this._executingCommandQueue = [];
+              s = "No tasks are being executed anymore", this._resetExecutingDirtyData();
               break;
             case Be.STOP_EXECUTION:
-              l = "The execution of the formula has been stopped", this._waitingCommandQueue.unshift(...this._executingCommandQueue), this._executingCommandQueue = [];
+              s = "The execution of the formula has been stopped", this._progressService.stop(), i = 0;
               break;
             case Be.SUCCESS:
-              l = `Formula calculation succeeded, Total time consumed: ${performance.now() - this._startExecutionTime} ms`, this._executingCommandQueue = [];
+              s = `Formula calculation succeeded, Total time consumed: ${performance.now() - this._startExecutionTime} ms`, this._resetExecutingDirtyData();
               break;
             case Be.INITIAL:
-              l = "Waiting for calculation", this._executingCommandQueue = [];
+              s = "Waiting for calculation", this._resetExecutingDirtyData();
               break;
           }
-          i--, i === 0 && (n ? (clearTimeout(n), n = null) : s === Be.SUCCESS ? this._progressService.complete() : s === Be.STOP_EXECUTION && this._progressService.stop(), this._formulaCalculationDoneCount = 0, this._arrayFormulaCalculationDoneCount = 0, m = !1, c = !1), console.warn(`execution result${l}`);
+          i === 0 && (n ? (clearTimeout(n), n = null) : l === Be.SUCCESS && this._progressService.complete(), this._formulaCalculationDoneCount = 0, this._arrayFormulaCalculationDoneCount = 0, m = !1, c = !1), l === Be.STOP_EXECUTION && this._restartCalculation ? (this._restartCalculation = !1, this._commandService.executeCommand(
+            Yt.id,
+            {
+              ...this._executingDirtyData
+            },
+            {
+              onlyLocal: !0
+            }
+          )) : this._executionInProgressParams = null, console.warn(`execution result${s}`);
         }
       })
     );
   }
+  _resetExecutingDirtyData() {
+    this._executingDirtyData = {
+      dirtyRanges: [],
+      dirtyNameMap: {},
+      dirtyDefinedNameMap: {},
+      dirtyUnitFeatureMap: {},
+      dirtyUnitOtherFormulaMap: {}
+    };
+  }
   _initialExecuteFormula() {
     this._commandService.executeCommand(
-      hn.id,
+      Yt.id,
       {
         commands: [],
         forceCalculation: !0
@@ -14314,14 +14319,14 @@ let at = class extends re {
     this._arrayFormulaCalculationDoneCount = e, this._progressService.pushTask({ count: t });
   }
 };
-at = fm([
-  Le(Ae.Ready, at),
-  je(0, fe),
-  je(1, sn),
-  je(2, y(ki)),
-  je(3, y(Ge)),
-  je(4, y(vr))
-], at);
+nt = fm([
+  Le(Ae.Ready, nt),
+  $e(0, fe),
+  $e(1, ln),
+  $e(2, q(ji)),
+  $e(3, q(we)),
+  $e(4, q(qr))
+], nt);
 function sm(a, e, t) {
   var n;
   return a == null || a[e] == null || ((n = a[e]) == null ? void 0 : n[t]) == null;
@@ -14351,27 +14356,27 @@ function dm(a, e) {
     if (u == null || o == null)
       return !0;
     Object.keys(u).forEach((m) => {
-      const c = new Q(u[m] || {}), f = new Q(o[m] || {}), d = new Q(), s = new Q();
+      const c = new Q(u[m] || {}), f = new Q(o[m] || {}), d = new Q(), l = new Q();
       if (c.forValue((b, C, T) => {
         if (T == null)
           return !0;
         const p = Ya(T);
-        p !== null && (d.setValue(b, C, p), s.setValue(b, C, f.getValue(b, C)));
+        p !== null && (d.setValue(b, C, p), l.setValue(b, C, f.getValue(b, C)));
       }), d.getSizeOf() === 0)
         return;
-      const l = {
+      const s = {
         subUnitId: m,
         unitId: i,
         cellValue: d.clone()
       }, L = {
         id: pe.id,
-        params: l
+        params: s
       };
       n.push(L);
       const A = {
         subUnitId: m,
         unitId: i,
-        cellValue: s.clone()
+        cellValue: l.clone()
       }, E = {
         id: pe.id,
         params: A
@@ -14420,7 +14425,7 @@ function Lm(a, e, t) {
       redoFormulaData: n,
       undoFormulaData: i
     };
-  const s = a[o][m], l = e[o][m], L = new Q(s || {}), A = new Q(l || {}), E = Am(L, u, f, d, c);
+  const l = a[o][m], s = e[o][m], L = new Q(l || {}), A = new Q(s || {}), E = Am(L, u, f, d, c);
   return n = Dm(E, L, A), i = gm(E, L), {
     redoFormulaData: n,
     undoFormulaData: i
@@ -14431,7 +14436,7 @@ function Am(a, e, t, n, i) {
   return a.forValue((o, m, c) => {
     if (c == null || !vm(c)) return !0;
     const f = ui(o, m);
-    let d = null, s = !1;
+    let d = null, l = !1;
     if ([
       0,
       1,
@@ -14440,10 +14445,10 @@ function Am(a, e, t, n, i) {
     ].includes(e))
       d = Pm(e, t, n, f);
     else if (i != null) {
-      const l = bm(e, i, f);
-      d = l.newCell, s = l.isReverse;
+      const s = bm(e, i, f);
+      d = s.newCell, l = s.isReverse;
     }
-    s ? u.unshift({ oldCell: f, newCell: d }) : u.push({ oldCell: f, newCell: d });
+    l ? u.unshift({ oldCell: f, newCell: d }) : u.push({ oldCell: f, newCell: d });
   }), u;
 }
 function Pm(a, e, t, n) {
@@ -14605,8 +14610,8 @@ function Dm(a, e, t) {
   return a.forEach((i) => {
     const { oldCell: u, newCell: o } = i, { startRow: m, startColumn: c } = u, f = t.getValue(m, c) || e.getValue(m, c), d = xm(f);
     if (n.setValue(m, c, { f: null, si: null }), o) {
-      const { startRow: s, startColumn: l } = o;
-      n.setValue(s, l, d);
+      const { startRow: l, startColumn: s } = o;
+      n.setValue(l, s, d);
     }
   }), n.clone();
 }
@@ -14615,8 +14620,8 @@ function gm(a, e) {
   return a.reverse().forEach((n) => {
     const { oldCell: i, newCell: u } = n, { startRow: o, startColumn: m } = i, c = e.getValue(o, m), f = Ya(c);
     if (u) {
-      const { startRow: d, startColumn: s } = u;
-      t.setValue(d, s, { f: null, si: null });
+      const { startRow: d, startColumn: l } = u;
+      t.setValue(d, l, { f: null, si: null });
     }
     t.setValue(o, m, f);
   }), t.clone();
@@ -14624,7 +14629,7 @@ function gm(a, e) {
 function Ya(a) {
   if (a == null)
     return;
-  const { f: e, si: t, x: n = 0, y: i = 0 } = a, u = Ee(e), o = Ne(t);
+  const { f: e, si: t, x: n = 0, y: i = 0 } = a, u = Ie(e), o = ye(t);
   if (!u && !o)
     return {
       f: null,
@@ -14636,7 +14641,7 @@ function Ya(a) {
 function xm(a) {
   if (a == null)
     return;
-  const { f: e, si: t } = a, n = Ee(e), i = Ne(t);
+  const { f: e, si: t } = a, n = Ie(e), i = ye(t);
   if (!n && !i)
     return {
       f: null,
@@ -14646,17 +14651,17 @@ function xm(a) {
   return n && (u.f = e), i && !n && (u.si = t), u;
 }
 function vm(a) {
-  const e = (a == null ? void 0 : a.f) || "", t = (a == null ? void 0 : a.si) || "", n = Ee(e), i = Ne(t);
+  const e = (a == null ? void 0 : a.f) || "", t = (a == null ? void 0 : a.si) || "", n = Ie(e), i = ye(t);
   return !!(n || i);
 }
-var qm = Object.defineProperty, ym = Object.getOwnPropertyDescriptor, Fm = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? ym(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var ym = Object.defineProperty, qm = Object.getOwnPropertyDescriptor, Fm = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? qm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
-  return n && i && qm(e, t, i), i;
-}, Me = (a, e) => (t, n) => e(t, n, a);
-let it = class extends re {
-  constructor(a, e, t, n, i, u, o) {
-    super(), this._univerInstanceService = a, this._commandService = e, this._lexerTreeBuilder = t, this._formulaDataModel = n, this._sheetInterceptorService = i, this._selectionManagerService = u, this._injector = o, this._initialize();
+  return n && i && ym(e, t, i), i;
+}, Se = (a, e) => (t, n) => e(t, n, a);
+let at = class extends re {
+  constructor(a, e, t, n, i, u, o, m) {
+    super(), this._univerInstanceService = a, this._commandService = e, this._lexerTreeBuilder = t, this._formulaDataModel = n, this._sheetInterceptorService = i, this._selectionManagerService = u, this._editorService = o, this._injector = m, this._initialize();
   }
   _initialize() {
     this._commandExecutedListener();
@@ -14671,7 +14676,7 @@ let it = class extends re {
         if (a.params)
           if (a.id === pe.id) {
             const t = a.params;
-            if (e && e.onlyLocal === !0 || t.trigger === dn.id || t.trigger === oa.id || t.trigger === ma.id)
+            if (e && e.onlyLocal === !0 || t.trigger === pn.id || t.trigger === oa.id || t.trigger === ma.id)
               return;
             this._handleSetRangeValuesMutation(t);
           } else if (a.id === nn.id) {
@@ -14685,14 +14690,18 @@ let it = class extends re {
           this._univerInstanceService.getTypeOfUnitAdded$(G.UNIVER_SHEET),
           this._univerInstanceService.getTypeOfUnitAdded$(G.UNIVER_DOC),
           this._univerInstanceService.getTypeOfUnitAdded$(G.UNIVER_SLIDE)
+        ).pipe(
+          un((a) => this._editorService.getEditor(a.getUnitId()) == null)
         ).subscribe((a) => this._handleUnitAdded(a))
       )
     ), this.disposeWithMe(
       Z(
         wn(
-          this._univerInstanceService.getTypeOfUnitDisposed$(G.UNIVER_SHEET).pipe(Ze((a) => a.getUnitId())),
-          this._univerInstanceService.getTypeOfUnitDisposed$(G.UNIVER_DOC).pipe(Ze((a) => a.getUnitId())),
-          this._univerInstanceService.getTypeOfUnitDisposed$(G.UNIVER_SLIDE).pipe(Ze((a) => a.getUnitId()))
+          this._univerInstanceService.getTypeOfUnitDisposed$(G.UNIVER_SHEET).pipe(ze((a) => a.getUnitId())),
+          this._univerInstanceService.getTypeOfUnitDisposed$(G.UNIVER_DOC).pipe(ze((a) => a.getUnitId())),
+          this._univerInstanceService.getTypeOfUnitDisposed$(G.UNIVER_SLIDE).pipe(ze((a) => a.getUnitId()))
+        ).pipe(
+          un((a) => this._editorService.getEditor(a) == null)
         ).subscribe((a) => this._handleRemoveSheetMutation(a))
       )
     );
@@ -14707,7 +14716,7 @@ let it = class extends re {
       }
     };
     this._formulaDataModel.updateArrayFormulaCellData(t, e, n), this._formulaDataModel.updateArrayFormulaRange(t, e, n), this._commandService.executeCommand(
-      Lt.id,
+      pt.id,
       {
         formulaData: u
       },
@@ -14730,7 +14739,7 @@ let it = class extends re {
   _handleRemoveSheetMutation(a, e) {
     const t = this._formulaDataModel.getFormulaData(), n = zt(t, a, e), i = this._formulaDataModel.getArrayFormulaRange(), u = zt(i, a, e), o = this._formulaDataModel.getArrayFormulaCellData(), m = zt(o, a, e);
     n && this._commandService.executeCommand(
-      Lt.id,
+      pt.id,
       {
         formulaData: n
       },
@@ -14751,7 +14760,7 @@ let it = class extends re {
   _handleInsertSheetMutation(a) {
     const { sheet: e, unitId: t } = a, n = this._formulaDataModel.getFormulaData(), { id: i, cellData: u } = e, o = new Q(u), m = _n(n, t, i, o);
     this._commandService.executeCommand(
-      Lt.id,
+      pt.id,
       {
         formulaData: m
       },
@@ -14769,7 +14778,7 @@ let it = class extends re {
       const m = o.getCellMatrix(), c = o.getSheetId(), f = _n(e, t, c, m);
       i[t][c] = (d = f[t]) == null ? void 0 : d[c];
     }) : n === G.UNIVER_DOC || G.UNIVER_SLIDE, this._commandService.executeCommand(
-      Lt.id,
+      pt.id,
       {
         formulaData: i
       },
@@ -14782,43 +14791,43 @@ let it = class extends re {
     const { id: e } = a;
     let t = null;
     switch (e) {
-      case ur.id:
+      case mr.id:
         t = this._handleMoveRange(a);
         break;
-      case rr.id:
+      case or.id:
         t = this._handleMoveRows(a);
         break;
-      case ir.id:
+      case ur.id:
         t = this._handleMoveCols(a);
         break;
-      case ar.id:
+      case rr.id:
         t = this._handleInsertRow(a);
         break;
-      case nr.id:
+      case ir.id:
         t = this._handleInsertCol(a);
         break;
-      case tr.id:
+      case ar.id:
         t = this._handleInsertRangeMoveRight(a);
         break;
-      case er.id:
+      case nr.id:
         t = this._handleInsertRangeMoveDown(a);
         break;
-      case Ji.id:
+      case tr.id:
         t = this._handleRemoveRow(a);
         break;
-      case Zi.id:
+      case er.id:
         t = this._handleRemoveCol(a);
         break;
-      case zi.id:
+      case Ji.id:
         t = this._handleDeleteRangeMoveUp(a);
         break;
-      case Qi.id:
+      case Zi.id:
         t = this._handleDeleteRangeMoveLeft(a);
         break;
-      case ji.id:
+      case zi.id:
         t = this._handleSetWorksheetName(a);
         break;
-      case $i.id:
+      case Qi.id:
         t = this._handleRemoveWorksheet(a);
         break;
     }
@@ -14865,18 +14874,18 @@ let it = class extends re {
       startColumn: 0,
       endRow: n,
       endColumn: c.getColumnCount() - 1,
-      rangeType: xe.ROW
-    }, s = {
+      rangeType: ge.ROW
+    }, l = {
       startRow: i,
       startColumn: 0,
       endRow: u,
       endColumn: c.getColumnCount() - 1,
-      rangeType: xe.ROW
+      rangeType: ge.ROW
     };
     return {
       type: 1,
       from: d,
-      to: s,
+      to: l,
       unitId: m,
       sheetId: f
     };
@@ -14894,18 +14903,18 @@ let it = class extends re {
       startColumn: t,
       endRow: c.getRowCount() - 1,
       endColumn: n,
-      rangeType: xe.COLUMN
-    }, s = {
+      rangeType: ge.COLUMN
+    }, l = {
       startRow: 0,
       startColumn: i,
       endRow: c.getRowCount() - 1,
       endColumn: u,
-      rangeType: xe.COLUMN
+      rangeType: ge.COLUMN
     };
     return {
       type: 2,
       from: d,
-      to: s,
+      to: l,
       unitId: m,
       sheetId: f
     };
@@ -15031,8 +15040,8 @@ let it = class extends re {
       const f = Object.keys(c);
       ie.isDefine(i[m]) || (i[m] = {}), ie.isDefine(u[m]) || (u[m] = {});
       for (const d of f) {
-        const s = new Q(c[d] || {}), l = new Q(), L = new Q();
-        s.forValue((A, E, b) => {
+        const l = new Q(c[d] || {}), s = new Q(), L = new Q();
+        l.forValue((A, E, b) => {
           var D;
           if (!b) return !0;
           const { f: C, x: T, y: p, si: h } = b, _ = this._lexerTreeBuilder.sequenceNodesBuilder(C);
@@ -15044,9 +15053,9 @@ let it = class extends re {
             const g = _[U];
             if (typeof g == "string" || g.nodeType !== me.REFERENCE)
               continue;
-            const { token: te } = g, W = qe(te), { range: ne, sheetName: Ce, unitId: se } = W;
+            const { token: te } = g, W = ve(te), { range: ne, sheetName: Re, unitId: se } = W;
             o.push({ row: A, column: E, range: ne });
-            const We = se == null || se.length === 0 ? m : se, ue = (D = e == null ? void 0 : e[We]) == null ? void 0 : D[Ce];
+            const Ye = se == null || se.length === 0 ? m : se, ue = (D = e == null ? void 0 : e[Ye]) == null ? void 0 : D[Re];
             if (!this._checkIsSameUnitAndSheet(
               t.unitId,
               t.sheetId,
@@ -15056,64 +15065,64 @@ let it = class extends re {
               ue || ""
             ))
               continue;
-            const Ke = {
+            const We = {
               range: ne,
               sheetId: ue,
               unitId: se,
-              sheetName: Ce,
+              sheetName: Re,
               refOffsetX: T || 0,
               refOffsetY: p || 0
             };
-            let he = null;
+            let Ce = null;
             if (t.type === 11) {
               const {
-                unitId: Ht,
-                sheetId: wt,
-                sheetName: Gt
+                unitId: Vt,
+                sheetId: Ht,
+                sheetName: wt
               } = t;
-              if (Gt == null || ue == null || ue.length === 0 || wt !== ue)
+              if (wt == null || ue == null || ue.length === 0 || Ht !== ue)
                 continue;
-              he = St({
+              Ce = Et({
                 range: ne,
-                sheetName: Gt,
+                sheetName: wt,
                 unitId: se
               });
             } else if (t.type === 12) {
               const {
-                unitId: Ht,
-                sheetId: wt,
-                sheetName: Gt
+                unitId: Vt,
+                sheetId: Ht,
+                sheetName: wt
               } = t;
-              if (ue == null || ue.length === 0 || wt !== ue)
+              if (ue == null || ue.length === 0 || Ht !== ue)
                 continue;
-              he = K.REF;
+              Ce = K.REF;
             } else
-              he = this._getNewRangeByMoveParam(
-                Ke,
+              Ce = this._getNewRangeByMoveParam(
+                We,
                 t,
                 m,
                 d
               );
-            he != null && (_[U] = {
+            Ce != null && (_[U] = {
               ...g,
-              token: he
+              token: Ce
             }, V = !0, R.push(U));
           }
           if (!V)
             return !0;
-          const q = this._updateRefOffset(_, R, T, p);
-          l.setValue(A, E, {
+          const y = this._updateRefOffset(_, R, T, p);
+          s.setValue(A, E, {
             f: C,
             x: T,
             y: p,
             si: h
           }), L.setValue(A, E, {
-            f: `=${ln(q)}`,
+            f: `=${dn(y)}`,
             x: T,
             y: p,
             si: h
           });
-        }), i[m] && (i[m][d] = l.getData()), u[m] && (u[m][d] = L.getData());
+        }), i[m] && (i[m][d] = s.getData()), u[m] && (u[m][d] = L.getData());
       }
     }
     return { newFormulaData: u, oldFormulaData: i, refRanges: o };
@@ -15121,8 +15130,8 @@ let it = class extends re {
   _getNewRangeByMoveParam(a, e, t, n) {
     const { type: i, unitId: u, sheetId: o, range: m, from: c, to: f } = e, {
       range: d,
-      sheetId: s,
-      unitId: l,
+      sheetId: l,
+      unitId: s,
       sheetName: L,
       refOffsetX: A,
       refOffsetY: E
@@ -15132,16 +15141,16 @@ let it = class extends re {
       o,
       t,
       n,
-      l,
-      s
+      s,
+      l
     ))
       return;
-    const b = ge.moveOffset(d, A, E);
+    const b = De.moveOffset(d, A, E);
     let C = null;
     if (i === 0) {
       if (c == null || f == null)
         return;
-      const T = this._checkMoveEdge(b, c), p = ge.getIntersects(b, c);
+      const T = this._checkMoveEdge(b, c), p = De.getIntersects(b, c);
       if (p == null)
         return;
       const h = ca(
@@ -15154,7 +15163,7 @@ let it = class extends re {
     } else if (i === 1) {
       if (c == null || f == null)
         return;
-      const T = this._checkMoveEdge(b, c), p = ge.getIntersects(b, c);
+      const T = this._checkMoveEdge(b, c), p = De.getIntersects(b, c);
       if (p == null)
         return;
       const h = fa(
@@ -15167,7 +15176,7 @@ let it = class extends re {
     } else if (i === 2) {
       if (c == null || f == null)
         return;
-      const T = this._checkMoveEdge(b, c), p = ge.getIntersects(b, c);
+      const T = this._checkMoveEdge(b, c), p = De.getIntersects(b, c);
       if (p == null)
         return;
       const h = sa(
@@ -15294,10 +15303,10 @@ let it = class extends re {
       }
     }
     if (C != null)
-      return St({
+      return Et({
         range: C,
         sheetName: L,
-        unitId: l
+        unitId: s
       });
   }
   _checkIsSameUnitAndSheet(a, e, t, n, i, u) {
@@ -15319,13 +15328,13 @@ let it = class extends re {
         i.push(m);
         continue;
       }
-      const { token: c } = m, f = qe(c), { range: d, sheetName: s, unitId: l } = f, L = ge.moveOffset(d, t, n);
+      const { token: c } = m, f = ve(c), { range: d, sheetName: l, unitId: s } = f, L = De.moveOffset(d, t, n);
       i.push({
         ...m,
-        token: St({
+        token: Et({
           range: L,
-          unitId: l,
-          sheetName: s
+          unitId: s,
+          sheetName: l
         })
       });
     }
@@ -15368,10 +15377,10 @@ let it = class extends re {
   _getMoveNewRange(a, e, t, n, i, u) {
     const { startRow: o, endRow: m, startColumn: c, endColumn: f } = e, {
       startRow: d,
-      startColumn: s,
-      endRow: l,
+      startColumn: l,
+      endRow: s,
       endColumn: L,
-      rangeType: A = xe.NORMAL
+      rangeType: A = ge.NORMAL
     } = t, { startRow: E, startColumn: b, endRow: C, endColumn: T } = n, {
       startRow: p,
       endRow: h,
@@ -15379,7 +15388,7 @@ let it = class extends re {
       endColumn: V
     } = u, {
       startRow: R,
-      endRow: q,
+      endRow: y,
       startColumn: D,
       endColumn: U
     } = i, I = { ...i };
@@ -15387,32 +15396,32 @@ let it = class extends re {
       if (c === D && f === U)
         if (o < R)
           I.startRow = o;
-        else if (m < q)
+        else if (m < y)
           I.startRow = o;
-        else if (m >= q && E <= q)
-          I.startRow = l + 1, I.endRow = m;
-        else if (E > q)
-          I.endRow -= l + 1 - R;
+        else if (m >= y && E <= y)
+          I.startRow = s + 1, I.endRow = m;
+        else if (E > y)
+          I.endRow -= s + 1 - R;
         else
           return;
       else
         return;
     else if (a === 1)
       if (c === D && f === U)
-        if (m > q)
+        if (m > y)
           I.endRow = m;
         else if (o > R)
           I.endRow = m;
         else if (o <= R && C >= R)
           I.endRow = d + 1, I.startRow = o;
         else if (C < R)
-          I.startRow += q - d + 1;
+          I.startRow += y - d + 1;
         else
           return;
       else
         return;
     else if (a === 2)
-      if (o === R && m === q)
+      if (o === R && m === y)
         if (c < D)
           I.startColumn = c;
         else if (f < U)
@@ -15426,20 +15435,20 @@ let it = class extends re {
       else
         return;
     else if (a === 3)
-      if (o === R && m === q)
+      if (o === R && m === y)
         if (f > U)
           I.endColumn = f;
         else if (c > D)
           I.endColumn = f;
         else if (c <= D && T >= D)
-          I.endColumn = s + 1, I.startColumn = c;
+          I.endColumn = l + 1, I.startColumn = c;
         else if (T < D)
-          I.startColumn += U - s + 1;
+          I.startColumn += U - l + 1;
         else
           return;
       else
         return;
-    else a === 4 ? (I.startRow = o, I.startColumn = c, I.endRow = m, I.endColumn = f) : s <= D && L >= U ? E > q ? I.endRow -= l - d + 1 : C < R && (I.startRow += l - d + 1) : d <= R && l >= q ? b > U ? I.endColumn -= L - s + 1 : T < D && (I.startColumn += L - s + 1) : ((b <= V + 1 && T >= U || b <= D && T >= _ - 1) && E <= R && C >= q || (E <= h + 1 && C >= q || E <= R && C >= p - 1) && b <= D && T >= U) && (I.startRow = o, I.startColumn = c, I.endRow = m, I.endColumn = f);
+    else a === 4 ? (I.startRow = o, I.startColumn = c, I.endRow = m, I.endColumn = f) : l <= D && L >= U ? E > y ? I.endRow -= s - d + 1 : C < R && (I.startRow += s - d + 1) : d <= R && s >= y ? b > U ? I.endColumn -= L - l + 1 : T < D && (I.startColumn += L - l + 1) : ((b <= V + 1 && T >= U || b <= D && T >= _ - 1) && E <= R && C >= y || (E <= h + 1 && C >= y || E <= R && C >= p - 1) && b <= D && T >= U) && (I.startRow = o, I.startColumn = c, I.endRow = m, I.endColumn = f);
     return I;
   }
   _getCurrentSheetInfo() {
@@ -15451,22 +15460,23 @@ let it = class extends re {
     };
   }
 };
-it = Fm([
-  Le(Ae.Ready, it),
-  Me(0, Pe),
-  Me(1, fe),
-  Me(2, y(Xe)),
-  Me(3, y(Ge)),
-  Me(4, y(Ut)),
-  Me(5, y(Ln)),
-  Me(6, y(mt))
-], it);
+at = Fm([
+  Le(Ae.Ready, at),
+  Se(0, Pe),
+  Se(1, fe),
+  Se(2, q(mt)),
+  Se(3, q(we)),
+  Se(4, q(Ln)),
+  Se(5, q(An)),
+  Se(6, Ge),
+  Se(7, q(ot))
+], at);
 var Um = Object.defineProperty, Bm = Object.getOwnPropertyDescriptor, Vm = (a, e, t, n) => {
   for (var i = n > 1 ? void 0 : n ? Bm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
   return n && i && Um(e, t, i), i;
 }, Hm = (a, e) => (t, n) => e(t, n, a);
-const En = yt(
+const Sn = qt(
   "formula-ui.formula-custom-function-service"
 );
 let Dt = class extends re {
@@ -15476,7 +15486,7 @@ let Dt = class extends re {
   registerFunctions(a) {
     const e = [], t = a.map((n) => (e.push(n[1]), [n[0].toString(), n[1]]));
     return this._commandService.executeCommand(
-      gi.id,
+      vi.id,
       {
         functions: t
       },
@@ -15485,7 +15495,7 @@ let Dt = class extends re {
       }
     ), Z(() => {
       this._commandService.executeCommand(
-        xi.id,
+        yi.id,
         {
           functions: e
         },
@@ -15503,8 +15513,8 @@ var wm = Object.defineProperty, Gm = Object.getOwnPropertyDescriptor, Xm = (a, e
   for (var i = n > 1 ? void 0 : n ? Gm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
   return n && i && wm(e, t, i), i;
-}, bt = (a, e) => (t, n) => e(t, n, a);
-const Wa = yt(
+}, Pt = (a, e) => (t, n) => e(t, n, a);
+const Wa = qt(
   "formula-ui.register-function-service"
 );
 let gt = class extends re {
@@ -15534,18 +15544,18 @@ let gt = class extends re {
   }
 };
 gt = Xm([
-  bt(0, y(we)),
-  bt(1, y(Ye)),
-  bt(2, y(En)),
-  bt(3, na)
+  Pt(0, q(He)),
+  Pt(1, q(Xe)),
+  Pt(2, q(Sn)),
+  Pt(3, ta)
 ], gt);
 var Ym = Object.defineProperty, Wm = Object.getOwnPropertyDescriptor, Km = (a, e, t, n) => {
   for (var i = n > 1 ? void 0 : n ? Wm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
   return n && i && Ym(e, t, i), i;
-}, Tt = (a, e) => (t, n) => e(t, n, a);
+}, bt = (a, e) => (t, n) => e(t, n, a);
 const Zt = "AllDefaultWorkbook";
-let rt = class extends re {
+let it = class extends re {
   constructor(e, t, n, i) {
     super();
     x(this, "_preUnitId", null);
@@ -15572,12 +15582,12 @@ let rt = class extends re {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((e, t) => {
         if (!(t != null && t.fromCollab)) {
-          if (e.id === or.id)
+          if (e.id === cr.id)
             this._unregisterDescriptionsForNotInSheetId(), this._registerDescriptions();
-          else if (e.id === mr.id) {
+          else if (e.id === fr.id) {
             const n = e.params;
             this._registerDescription(n);
-          } else if (e.id === cr.id) {
+          } else if (e.id === sr.id) {
             const n = e.params;
             this._unregisterDescription(n);
           } else if (e.id === rn.id) {
@@ -15660,13 +15670,13 @@ let rt = class extends re {
     }), this._descriptionService.unregisterDescriptions(i);
   }
 };
-rt = Km([
-  Le(Ae.Rendered, rt),
-  Tt(0, Ye),
-  Tt(1, Jn),
-  Tt(2, Pe),
-  Tt(3, fe)
-], rt);
+it = Km([
+  Le(Ae.Rendered, it),
+  bt(0, Xe),
+  bt(1, Jn),
+  bt(2, Pe),
+  bt(3, fe)
+], it);
 var km = Object.defineProperty, $m = Object.getOwnPropertyDescriptor, jm = (a, e, t, n) => {
   for (var i = n > 1 ? void 0 : n ? $m(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
@@ -15678,28 +15688,28 @@ let xt = class extends re {
   }
   registerFormula(a, e) {
     const t = /* @__PURE__ */ new Map(), n = this._lexerTreeBuilder.sequenceNodesBuilder(a), i = new zn(), u = (o) => {
-      const m = this._univerInstanceService.getCurrentUnitForType(G.UNIVER_SHEET), c = m.getActiveSheet(), f = m.getUnitId(), d = c == null ? void 0 : c.getSheetId(), s = n == null ? void 0 : n.map((L) => {
+      const m = this._univerInstanceService.getCurrentUnitForType(G.UNIVER_SHEET), c = m.getActiveSheet(), f = m.getUnitId(), d = c == null ? void 0 : c.getSheetId(), l = n == null ? void 0 : n.map((L) => {
         if (typeof L == "object" && L.nodeType === me.REFERENCE) {
           const A = t.get(L.token);
           if (A.unitId && A.unitId !== f && A.subUnitId && A.subUnitId !== d)
             return L;
-          const E = sr(A.range, o);
+          const E = dr(A.range, o);
           let b = "";
-          return A.unitId && A.sheetName ? b = vi(A.unitId, A.sheetName, A.range) : A.sheetName ? b = qi(A.sheetName, A.range) : b = E ? ot(E) : K.ERROR, {
+          return A.unitId && A.sheetName ? b = qi(A.unitId, A.sheetName, A.range) : A.sheetName ? b = Fi(A.sheetName, A.range) : b = E ? ut(E) : K.ERROR, {
             ...L,
             token: b
           };
         } else
           return L;
-      }), l = s && ln(s);
-      return e(`=${l}`);
+      }), s = l && dn(l);
+      return e(`=${s}`);
     };
     return n == null || n.forEach((o) => {
       if (typeof o == "object" && o.nodeType === me.REFERENCE) {
-        const m = qe(o.token), { range: c, unitId: f, sheetName: d } = m, s = f ? this._univerInstanceService.getUniverSheetInstance(f) : this._univerInstanceService.getCurrentUnitForType(G.UNIVER_SHEET), l = d ? s == null ? void 0 : s.getSheetBySheetName(d) : s == null ? void 0 : s.getActiveSheet();
-        if (!l)
+        const m = ve(o.token), { range: c, unitId: f, sheetName: d } = m, l = f ? this._univerInstanceService.getUniverSheetInstance(f) : this._univerInstanceService.getCurrentUnitForType(G.UNIVER_SHEET), s = d ? l == null ? void 0 : l.getSheetBySheetName(d) : l == null ? void 0 : l.getActiveSheet();
+        if (!s)
           return;
-        const L = l.getSheetId(), A = {
+        const L = s.getSheetId(), A = {
           unitId: f,
           subUnitId: L,
           range: c,
@@ -15711,11 +15721,11 @@ let xt = class extends re {
   }
 };
 xt = jm([
-  Jt(0, y(fr)),
-  Jt(1, y(Xe)),
+  Jt(0, q(lr)),
+  Jt(1, q(mt)),
   Jt(2, Pe)
 ], xt);
-var ze = /* @__PURE__ */ ((a) => (a[a.NOT_REGISTER = 1] = "NOT_REGISTER", a[a.SUCCESS = 2] = "SUCCESS", a[a.WAIT = 3] = "WAIT", a[a.ERROR = 4] = "ERROR", a))(ze || {}), Qm = Object.defineProperty, zm = Object.getOwnPropertyDescriptor, Zm = (a, e, t, n) => {
+var Qe = /* @__PURE__ */ ((a) => (a[a.NOT_REGISTER = 1] = "NOT_REGISTER", a[a.SUCCESS = 2] = "SUCCESS", a[a.WAIT = 3] = "WAIT", a[a.ERROR = 4] = "ERROR", a))(Qe || {}), Qm = Object.defineProperty, zm = Object.getOwnPropertyDescriptor, Zm = (a, e, t, n) => {
   for (var i = n > 1 ? void 0 : n ? zm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
   return n && i && Qm(e, t, i), i;
@@ -15724,9 +15734,9 @@ let vt = class extends re {
   constructor(e, t) {
     super();
     x(this, "_formulaCacheMap", /* @__PURE__ */ new Map());
-    x(this, "_formulaChange$", new ve());
+    x(this, "_formulaChange$", new xe());
     x(this, "formulaChange$", this._formulaChange$.asObservable());
-    x(this, "_formulaResult$", new ve());
+    x(this, "_formulaResult$", new xe());
     x(this, "formulaResult$", this._formulaResult$.asObservable());
     this._commandService = e, this._activeDirtyManagerService = t, this._initFormulaRegister(), this._initFormulaCalculationResultChange();
   }
@@ -15741,25 +15751,25 @@ let vt = class extends re {
   }
   _initFormulaRegister() {
     this._activeDirtyManagerService.register(
-      Nt.id,
+      It.id,
       {
-        commandId: Nt.id,
+        commandId: It.id,
         getDirtyData(e) {
           return {
             dirtyUnitOtherFormulaMap: e.params
           };
         }
       }
-    ), this.formulaChange$.pipe(Br(16), Vr((e) => !!e.length), Ze((e) => e.reduce((t, n) => {
+    ), this.formulaChange$.pipe(Hr(16), un((e) => !!e.length), ze((e) => e.reduce((t, n) => {
       const { unitId: i, subUnitId: u, formulaId: o, formulaText: m } = n;
       return t[i] || (t[i] = {}), t[i][u] || (t[i][u] = {}), t[i][u][o] = { f: m }, t;
     }, {}))).subscribe((e) => {
       for (const t in e)
         for (const n in e[t]) {
           const i = e[t][n], u = { unitId: t, subUnitId: n, formulaMap: i };
-          this._commandService.executeCommand(yi.id, u).then(() => {
+          this._commandService.executeCommand(Ui.id, u).then(() => {
             this._commandService.executeCommand(
-              Nt.id,
+              It.id,
               { [t]: { [n]: i } }
             );
           });
@@ -15768,21 +15778,21 @@ let vt = class extends re {
   }
   _initFormulaCalculationResultChange() {
     this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
-      if (e.id === ta.id) {
+      if (e.id === ea.id) {
         const t = e.params, { unitOtherData: n } = t, i = {};
         for (const u in n) {
           const o = n[u], m = {};
           i[u] = m;
           for (const c in o) {
-            const f = this._ensureCacheMap(u, c), d = o[c], s = [];
-            m[c] = s;
-            for (const l in d) {
-              const L = d[l];
-              if (f.has(l)) {
-                const A = f.get(l);
-                A.result = L, A.status = ze.SUCCESS, A.callbacks.forEach((E) => {
+            const f = this._ensureCacheMap(u, c), d = o[c], l = [];
+            m[c] = l;
+            for (const s in d) {
+              const L = d[s];
+              if (f.has(s)) {
+                const A = f.get(s);
+                A.result = L, A.status = Qe.SUCCESS, A.callbacks.forEach((E) => {
                   E(L);
-                }), A.callbacks.clear(), s.push(A);
+                }), A.callbacks.clear(), l.push(A);
               }
             }
           }
@@ -15795,7 +15805,7 @@ let vt = class extends re {
     const u = this._createFormulaId(e, t);
     return this._ensureCacheMap(e, t).set(u, {
       result: void 0,
-      status: ze.WAIT,
+      status: Qe.WAIT,
       formulaId: u,
       callbacks: /* @__PURE__ */ new Set(),
       extra: i
@@ -15812,13 +15822,13 @@ let vt = class extends re {
       subUnitId: t,
       formulaIdList: n
     };
-    this._commandService.executeCommand(Fi.id, i);
+    this._commandService.executeCommand(Bi.id, i);
     const u = this._ensureCacheMap(e, t);
     n.forEach((o) => u.delete(o));
   }
   getFormulaValue(e, t, n) {
     const i = this._ensureCacheMap(e, t), u = i.get(n);
-    return u ? u.status === ze.SUCCESS || u.status === ze.ERROR ? Promise.resolve(u) : new Promise((o) => {
+    return u ? u.status === Qe.SUCCESS || u.status === Qe.ERROR ? Promise.resolve(u) : new Promise((o) => {
       u.callbacks.add(() => {
         o(i.get(n));
       });
@@ -15830,7 +15840,7 @@ let vt = class extends re {
 };
 vt = Zm([
   kn(0, fe),
-  kn(1, sn)
+  kn(1, ln)
 ], vt);
 var Jm = Object.defineProperty, ec = Object.getOwnPropertyDescriptor, tc = (a, e, t, n) => {
   for (var i = n > 1 ? void 0 : n ? ec(e, t) : e, u = a.length - 1, o; u >= 0; u--)
@@ -15851,7 +15861,7 @@ const tn = "SHEET_FORMULA_ALERT", nc = {
   [K.CONNECT]: "connect",
   [K.NULL]: "null"
 };
-let mn = class extends re {
+let cn = class extends re {
   constructor(a, e, t, n) {
     super(), this._context = a, this._hoverManagerService = e, this._cellAlertManagerService = t, this._localeService = n, this._init();
   }
@@ -15873,7 +15883,7 @@ let mn = class extends re {
           if (m && m.row === a.location.row && m.col === a.location.col && m.subUnitId === a.location.subUnitId && m.unitId === a.location.unitId)
             return;
           this._cellAlertManagerService.showAlert({
-            type: Tr.ERROR,
+            type: Sr.ERROR,
             title: this._localeService.t("formula.error.title"),
             message: this._localeService.t(`formula.error.${nc[u]}`),
             location: a.location,
@@ -15888,11 +15898,11 @@ let mn = class extends re {
     }));
   }
 };
-mn = tc([
-  en(1, y(Er)),
-  en(2, y(Sr)),
-  en(3, y(we))
-], mn);
+cn = tc([
+  en(1, q(Ir)),
+  en(2, q(Nr)),
+  en(3, q(He))
+], cn);
 var ac = Object.defineProperty, ic = Object.getOwnPropertyDescriptor, rc = (a, e, t, n) => {
   for (var i = n > 1 ? void 0 : n ? ic(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
@@ -15904,42 +15914,36 @@ const oc = {
     color: "#409f11"
   }
 };
-let ut = class extends mi {
+let rt = class extends mi {
   constructor(a) {
     super(), this._sheetInterceptorService = a, this._init();
   }
   _init() {
     this.disposeWithMe(this._sheetInterceptorService.intercept(
-      pn.CELL_CONTENT,
+      na.CELL_CONTENT,
       {
-        handler: (a, e, t) => {
-          const n = ko(a);
-          return n !== null ? t({
-            ...a,
-            v: n
-          }) : Ga(a) ? t({
-            ...a,
-            markers: {
-              ...a == null ? void 0 : a.markers,
-              ...oc
-            }
-          }) : t(a);
-        },
+        handler: (a, e, t) => Ga(a) ? t({
+          ...a,
+          markers: {
+            ...a == null ? void 0 : a.markers,
+            ...oc
+          }
+        }) : t(a),
         priority: 10
       }
     ));
   }
 };
-ut = rc([
-  Le(Ae.Rendered, ut),
-  uc(0, y(Ut))
-], ut);
+rt = rc([
+  Le(Ae.Rendered, rt),
+  uc(0, q(Ln))
+], rt);
 var Ka = Object.defineProperty, mc = Object.getOwnPropertyDescriptor, cc = (a, e, t) => e in a ? Ka(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t, ka = (a, e, t, n) => {
   for (var i = n > 1 ? void 0 : n ? mc(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (i = (n ? o(e, t, i) : o(i)) || i);
   return n && i && Ka(e, t, i), i;
-}, cn = (a, e) => (t, n) => e(t, n, a), $a = (a, e, t) => cc(a, typeof e != "symbol" ? e + "" : e, t);
-let qt = class extends Zn {
+}, fn = (a, e) => (t, n) => e(t, n, a), $a = (a, e, t) => cc(a, typeof e != "symbol" ? e + "" : e, t);
+let yt = class extends Zn {
   constructor(a = {}, e, t) {
     super(), this._config = a, this._injector = e, this._renderManagerService = t, this._config = ie.deepMerge({}, Xa, this._config);
   }
@@ -15951,7 +15955,7 @@ let qt = class extends Zn {
   }
   _registerRenderModules() {
     [
-      mn
+      cn
     ].forEach((a) => {
       this.disposeWithMe(this._renderManagerService.registerRenderModule(G.UNIVER_SHEET, a));
     });
@@ -15961,7 +15965,7 @@ let qt = class extends Zn {
       // services
       [Fe, { useClass: Ma }],
       [
-        Ye,
+        Xe,
         {
           useFactory: () => {
             var e;
@@ -15969,39 +15973,39 @@ let qt = class extends Zn {
           }
         }
       ],
-      [En, { useClass: Dt }],
+      [Sn, { useClass: Dt }],
       [Wa, { useClass: gt }],
       [xt],
       [vt],
       // controllers
       [
-        nt,
+        tt,
         {
-          useFactory: () => this._injector.createInstance(nt, this._config)
+          useFactory: () => this._injector.createInstance(tt, this._config)
         }
       ],
-      [Rt],
-      [It],
-      [tt],
+      [Nt],
+      [St],
       [et],
+      [Je],
+      [nt],
       [at],
-      [it],
       [_t],
-      [Je],
-      [rt],
-      [ut]
+      [Ze],
+      [it],
+      [rt]
     ].forEach((e) => this._injector.add(e));
   }
 };
-$a(qt, "pluginName", Pn);
-$a(qt, "type", G.UNIVER_SHEET);
-qt = ka([
-  ci(Ui),
-  cn(1, y(mt)),
-  cn(2, Ft)
-], qt);
-var Et;
-let $n = (Et = class extends Zn {
+$a(yt, "pluginName", bn);
+$a(yt, "type", G.UNIVER_SHEET);
+yt = ka([
+  ci(Vi),
+  fn(1, q(ot)),
+  fn(2, Ft)
+], yt);
+var Tt;
+let $n = (Tt = class extends Zn {
   constructor(a = {}, e) {
     super(), this._config = a, this._injector = e, this._config = ie.deepMerge({}, Xa, this._config);
   }
@@ -16013,7 +16017,7 @@ let $n = (Et = class extends Zn {
       // services
       [Fe, { useClass: Ma }],
       [
-        Ye,
+        Xe,
         {
           useFactory: () => {
             var e;
@@ -16021,32 +16025,41 @@ let $n = (Et = class extends Zn {
           }
         }
       ],
-      [En, { useClass: Dt }],
+      [Sn, { useClass: Dt }],
       [Wa, { useClass: gt }],
       [xt],
       [vt],
-      [tt],
       [et],
+      [Je],
+      [nt],
       [at],
+      [Ze],
       [it],
-      [Je],
-      [rt],
-      [ut]
+      [rt]
     ].forEach((e) => this._injector.add(e));
   }
-}, x(Et, "pluginName", Pn), x(Et, "type", G.UNIVER_SHEET), Et);
+}, x(Tt, "pluginName", bn), x(Tt, "type", G.UNIVER_SHEET), Tt);
 $n = ka([
-  cn(1, y(mt))
+  fn(1, q(ot))
 ], $n);
 export {
   Mt as DescriptionService,
   Dt as FormulaCustomFunctionService,
   xt as FormulaRefRangeService,
-  Ye as IDescriptionService,
-  En as IFormulaCustomFunctionService,
+  on as HelpFunctionOperation,
+  Xe as IDescriptionService,
+  Sn as IFormulaCustomFunctionService,
   Wa as IRegisterFunctionService,
+  Oa as InsertFunctionCommand,
+  Tn as InsertFunctionOperation,
+  ga as MoreFunctionsOperation,
+  It as OtherFormulaMarkDirty,
+  En as ReferenceAbsoluteOperation,
   gt as RegisterFunctionService,
   vt as RegisterOtherFormulaService,
+  mn as SearchFunctionOperation,
+  qe as SelectEditorFormulaOperation,
+  _a as SheetOnlyPasteFormulaCommand,
   $n as UniverSheetsFormulaMobilePlugin,
-  qt as UniverSheetsFormulaPlugin
+  yt as UniverSheetsFormulaPlugin
 };