npm - @univerjs/sheets-formula - Versions diffs - 0.1.13 → 0.1.14 - Mend

@univerjs/sheets-formula 0.1.13 → 0.1.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/lib/cjs/index.js +4 -4
package/lib/es/index.js +958 -959
package/lib/types/controllers/formula-editor-show.controller.d.ts +2 -2
package/lib/types/controllers/formula-render.controller.d.ts +2 -5
package/lib/types/controllers/prompt.controller.d.ts +2 -3
package/lib/types/controllers/utils/utils.d.ts +6 -0
package/lib/umd/index.js +4 -4
package/package.json +41 -28

package/lib/es/index.js CHANGED Viewed

@@ -1,24 +1,24 @@
-var Ua = Object.defineProperty;
-var Ba = (a, e, t) => e in a ? Ua(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
-var D = (a, e, t) => (Ba(a, typeof e != "symbol" ? e + "" : e, t), t);
-import { Disposable as ne, ObjectMatrix as j, Dimension as An, OnLifecycle as ce, LifecycleStages as fe, IUniverInstanceService as de, CellValueType as Nt, ThemeService as an, ICommandService as ue, isFormulaString as De, isFormulaId as Fe, Tools as te, Direction as w, CommandType as Pe, UniverInstanceType as Y, toDisposable as Q, ColorKit as Gn, Rectangle as he, DEFAULT_EMPTY_DOCUMENT_VALUE as Va, isRealNum as Ha, getCellValueType as wa, LocaleService as ge, FOCUSING_DOC as Ga, FOCUSING_UNIVER_EDITOR as Xa, FOCUSING_UNIVER_EDITOR_STANDALONE_SINGLE_MODE as Ya, FOCUSING_EDITOR_INPUT_FORMULA as tt, DisposableCollection as Xn, RANGE_TYPE as _e, AbsoluteRefType as Z, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Wa, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as Ka, IContextService as ka, throttle as Pn, cellToRange as $a, RxDisposable as ja, Plugin as Qa } from "@univerjs/core";
+var Ba = Object.defineProperty;
+var Va = (a, e, t) => e in a ? Ba(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
+var q = (a, e, t) => (Va(a, typeof e != "symbol" ? e + "" : e, t), t);
+import { Disposable as ne, ObjectMatrix as j, Dimension as Ln, OnLifecycle as ce, LifecycleStages as fe, IUniverInstanceService as de, CellValueType as Ue, ThemeService as an, ICommandService as ue, isFormulaString as Ee, isFormulaId as ge, Tools as te, Direction as w, CommandType as Pe, UniverInstanceType as Y, toDisposable as Q, ColorKit as Vn, Rectangle as _e, DEFAULT_EMPTY_DOCUMENT_VALUE as Ha, isRealNum as wa, getCellValueType as Ga, LocaleService as xe, FOCUSING_DOC as Xa, FOCUSING_UNIVER_EDITOR as Ya, FOCUSING_UNIVER_EDITOR_STANDALONE_SINGLE_MODE as Wa, FOCUSING_EDITOR_INPUT_FORMULA as nt, DisposableCollection as Hn, RANGE_TYPE as Oe, AbsoluteRefType as Z, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Ka, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as ka, IContextService as $a, throttle as An, cellToRange as ja, RxDisposable as Qa, Plugin as za, DependentOn as Za } from "@univerjs/core";
 import { Inject as y, Injector as Ot, createIdentifier as Mt } from "@wendellhu/redi";
-import { SetDefinedNameMutation as bn, RemoveDefinedNameMutation as Tn, FormulaDataModel as ke, IActiveDirtyManagerService as rn, IDefinedNamesService as Yn, SetArrayFormulaDataMutation as Rt, LexerTreeBuilder as Ue, ErrorType as W, SetFormulaCalculationResultMutation as Wn, sequenceNodeType as ie, serializeRange as Ke, FUNCTION_NAMES_COMPATIBILITY as B, FunctionType as r, FUNCTION_NAMES_CUBE as Ie, FUNCTION_NAMES_DATABASE as ae, FUNCTION_NAMES_DATE as G, FUNCTION_NAMES_ENGINEERING as O, FUNCTION_NAMES_FINANCIAL as _, FUNCTION_NAMES_INFORMATION as $, FUNCTION_NAMES_LOGICAL as z, FUNCTION_NAMES_LOOKUP as V, FUNCTION_NAMES_MATH as N, FUNCTION_NAMES_STATISTICAL as P, FUNCTION_NAMES_TEXT as v, FUNCTION_NAMES_WEB as yt, isReferenceStrings as za, functionArray as Za, functionCompatibility as Ja, functionCube as ei, functionDatabase as ti, functionDate as ni, functionEngineering as ai, functionFinancial as ii, functionInformation as ri, functionLogical as ui, functionLookup as oi, functionMath as mi, functionMeta as ci, functionStatistical as fi, functionText as si, functionUniver as li, functionWeb as di, IFunctionService as Kn, ERROR_TYPE_SET as pi, matchToken as qe, matchRefDrawToken as En, compareToken as Ft, deserializeRangeWithSheet as Me, normalizeSheetName as Li, serializeRangeToRefString as st, generateStringWithSequence as un, getAbsoluteRefTypeWitString as Ai, SetFormulaCalculationStartMutation as Sn, SetFormulaCalculationNotificationMutation as Pi, FormulaExecuteStageType as Ut, FormulaExecutedStateType as ye, SetFormulaDataMutation as nt, initSheetFormulaData as In, RegisterFunctionMutation as bi, UnregisterFunctionMutation as Ti, serializeRangeWithSpreadsheet as Ei, serializeRangeWithSheet as Si, SetOtherFormulaMutation as Ii, RemoveOtherFormulaMutation as Ni } from "@univerjs/engine-formula";
-import { SetRangeValuesMutation as le, SetStyleCommand as on, MoveRangeMutation as Nn, MoveRowsMutation as Rn, MoveColsMutation as Cn, RemoveRowMutation as hn, RemoveColMutation as _n, RemoveSheetMutation as kt, InsertSheetMutation as $t, SetDefinedNameCommand as jt, INTERCEPTOR_POINT as mn, SheetInterceptorService as Dt, SetRangeValuesUndoMutationFactory as Ri, SetRangeValuesCommand as Ci, SelectionManagerService as cn, getSheetCommandTarget as hi, getCellAtRowCol as _i, SetSelectionsOperation as Oi, NORMAL_SELECTION_PLUGIN_NAME as Ce, WorkbookEditablePermission as kn, WorksheetEditPermission as $n, WorksheetSetCellValuePermission as jn, RangeProtectionPermissionEditPoint as Qn, convertSelectionDataToRange as Bt, getNormalSelectionStyle as Mi, setEndForRange as Di, getPrimaryForRange as gi, SetBorderCommand as zn, ClearSelectionFormatCommand as Zn, INumfmtService as xi, handleMoveRange as Jn, EffectRefRangId as K, runRefRangeMutations as k, handleMoveRows as ea, handleMoveCols as ta, handleInsertRow as na, handleInsertCol as aa, handleIRemoveRow as ia, handleIRemoveCol as ra, handleDeleteRangeMoveLeft as ua, handleDeleteRangeMoveUp as oa, handleInsertRangeMoveDown as ma, handleInsertRangeMoveRight as ca, RemoveSheetCommand as vi, SetWorksheetNameCommand as qi, DeleteRangeMoveLeftCommand as yi, DeleteRangeMoveUpCommand as Fi, RemoveColCommand as Ui, RemoveRowCommand as Bi, InsertRangeMoveDownCommand as Vi, InsertRangeMoveRightCommand as Hi, InsertColCommand as wi, InsertRowCommand as Gi, MoveColsCommand as Xi, MoveRowsCommand as Yi, MoveRangeCommand as Wi, SetWorksheetActiveOperation as Ki, InsertDefinedNameCommand as ki, RemoveDefinedNameCommand as $i, RefRangeService as ji, handleDefaultRangeChangeWithEffectRefCommands as Qi } from "@univerjs/sheets";
-import { DATA_TYPE as On, APPLY_TYPE as zi, IAutoFillService as Zi, SheetPasteCommand as Ji, COPY_TYPE as fa, PREDEFINED_HOOK_NAME as er, ISheetClipboardService as tr, SelectionShape as nr, IEditorBridgeService as sa, SheetSkeletonManagerService as fn, ISelectionRenderService as la, useActiveWorkbook as ar, getCurrentRangeDisable$ as da, PASTE_SPECIAL_MENU_ID as ir, whenFormulaEditorActivated as $e, getEditorObject as Mn, MoveSelectionCommand as at, JumpOver as Dn, ExpandSelectionCommand as gn, CellAlertType as rr, HoverManagerService as ur, CellAlertManagerService as or } from "@univerjs/sheets-ui";
-import { IRenderManagerService as sn, DeviceInputEventType as se, getCellInfoInMergeData as mr, ITextSelectionRenderManager as cr } from "@univerjs/engine-render";
-import { IEditorService as je, ISidebarService as fr, MenuGroup as sr, MenuItemType as ln, MenuPosition as lr, getMenuHiddenObservable as dr, IClipboardInterfaceService as pr, KeyCode as H, MetaKeys as Ee, ComponentManager as Lr, BuiltInUIPart as Ar, IMenuService as Pr, IShortcutService as br, IUIPartsService as Tr, SetEditorResizeOperation as Er, IContextMenuService as Sr, IProgressService as Ir } from "@univerjs/ui";
-import { useDependency as me, connectInjector as Nr } from "@wendellhu/redi/react-bindings";
-import { Subject as Oe, combineLatestWith as Rr, map as Ye, Observable as Cr, merge as xn, bufferTime as hr, filter as _r } from "rxjs";
-import Or, { forwardRef as Qe, useRef as pa, createElement as ze, useState as X, useEffect as Ct } from "react";
-import { Popup as La, Select as Mr, Input as Dr, Button as Vt } from "@univerjs/design";
-import { ReplaceContentCommand as gr, MoveCursorOperation as xr, TextSelectionManagerService as vr, DocViewModelManagerService as qr } from "@univerjs/docs";
-const Aa = "formula-ui";
-var yr = Object.defineProperty, Fr = Object.getOwnPropertyDescriptor, Ur = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? Fr(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+import { SetDefinedNameMutation as Pn, RemoveDefinedNameMutation as bn, FormulaDataModel as $e, IActiveDirtyManagerService as rn, IDefinedNamesService as wn, SetArrayFormulaDataMutation as Nt, stripErrorMargin as Gn, LexerTreeBuilder as Be, ErrorType as W, SetFormulaCalculationResultMutation as Xn, sequenceNodeType as ie, serializeRange as ke, FUNCTION_NAMES_COMPATIBILITY as B, FunctionType as r, FUNCTION_NAMES_CUBE as Ne, FUNCTION_NAMES_DATABASE as ae, FUNCTION_NAMES_DATE as G, FUNCTION_NAMES_ENGINEERING as O, FUNCTION_NAMES_FINANCIAL as _, FUNCTION_NAMES_INFORMATION as $, FUNCTION_NAMES_LOGICAL as z, FUNCTION_NAMES_LOOKUP as V, FUNCTION_NAMES_MATH as N, FUNCTION_NAMES_STATISTICAL as P, FUNCTION_NAMES_TEXT as x, FUNCTION_NAMES_WEB as yt, isReferenceStrings as Ja, functionArray as ei, functionCompatibility as ti, functionCube as ni, functionDatabase as ai, functionDate as ii, functionEngineering as ri, functionFinancial as ui, functionInformation as oi, functionLogical as mi, functionLookup as ci, functionMath as fi, functionMeta as si, functionStatistical as li, functionText as di, functionUniver as pi, functionWeb as Li, IFunctionService as Yn, ERROR_TYPE_SET as Ai, matchToken as ye, matchRefDrawToken as Tn, compareToken as Ft, deserializeRangeWithSheet as De, normalizeSheetName as Pi, serializeRangeToRefString as st, generateStringWithSequence as un, getAbsoluteRefTypeWitString as bi, SetFormulaCalculationStartMutation as En, SetFormulaCalculationNotificationMutation as Ti, FormulaExecuteStageType as Ut, FormulaExecutedStateType as Fe, SetFormulaDataMutation as at, initSheetFormulaData as Sn, RegisterFunctionMutation as Ei, UnregisterFunctionMutation as Si, serializeRangeWithSpreadsheet as Ii, serializeRangeWithSheet as Ni, SetOtherFormulaMutation as Ri, RemoveOtherFormulaMutation as Ci, UniverFormulaEnginePlugin as hi } from "@univerjs/engine-formula";
+import { SetRangeValuesMutation as le, SetStyleCommand as on, MoveRangeMutation as In, MoveRowsMutation as Nn, MoveColsMutation as Rn, RemoveRowMutation as Cn, RemoveColMutation as hn, RemoveSheetMutation as kt, InsertSheetMutation as $t, SetDefinedNameCommand as jt, INTERCEPTOR_POINT as mn, SheetInterceptorService as Dt, SetRangeValuesUndoMutationFactory as _i, SetRangeValuesCommand as Oi, SelectionManagerService as cn, getSheetCommandTarget as Mi, getCellAtRowCol as Di, SetSelectionsOperation as gi, NORMAL_SELECTION_PLUGIN_NAME as he, WorkbookEditablePermission as Wn, WorksheetEditPermission as Kn, WorksheetSetCellValuePermission as kn, RangeProtectionPermissionEditPoint as $n, convertSelectionDataToRange as Bt, getNormalSelectionStyle as xi, setEndForRange as vi, getPrimaryForRange as qi, SetBorderCommand as jn, ClearSelectionFormatCommand as Qn, INumfmtService as yi, handleMoveRange as zn, EffectRefRangId as K, runRefRangeMutations as k, handleMoveRows as Zn, handleMoveCols as Jn, handleInsertRow as ea, handleInsertCol as ta, handleIRemoveRow as na, handleIRemoveCol as aa, handleDeleteRangeMoveLeft as ia, handleDeleteRangeMoveUp as ra, handleInsertRangeMoveDown as ua, handleInsertRangeMoveRight as oa, RemoveSheetCommand as Fi, SetWorksheetNameCommand as Ui, DeleteRangeMoveLeftCommand as Bi, DeleteRangeMoveUpCommand as Vi, RemoveColCommand as Hi, RemoveRowCommand as wi, InsertRangeMoveDownCommand as Gi, InsertRangeMoveRightCommand as Xi, InsertColCommand as Yi, InsertRowCommand as Wi, MoveColsCommand as Ki, MoveRowsCommand as ki, MoveRangeCommand as $i, SetWorksheetActiveOperation as ji, InsertDefinedNameCommand as Qi, RemoveDefinedNameCommand as zi, RefRangeService as Zi, handleDefaultRangeChangeWithEffectRefCommands as Ji } from "@univerjs/sheets";
+import { DATA_TYPE as _n, APPLY_TYPE as er, IAutoFillService as tr, SheetPasteCommand as nr, COPY_TYPE as ma, PREDEFINED_HOOK_NAME as ar, ISheetClipboardService as ir, SelectionShape as rr, IEditorBridgeService as ca, SheetSkeletonManagerService as fa, ISelectionRenderService as sa, useActiveWorkbook as ur, getCurrentRangeDisable$ as la, PASTE_SPECIAL_MENU_ID as or, whenFormulaEditorActivated as je, getEditorObject as On, MoveSelectionCommand as it, JumpOver as Mn, ExpandSelectionCommand as Dn, CellAlertType as mr, HoverManagerService as cr, CellAlertManagerService as fr } from "@univerjs/sheets-ui";
+import { IRenderManagerService as fn, DeviceInputEventType as se, getCellInfoInMergeData as sr, ITextSelectionRenderManager as lr } from "@univerjs/engine-render";
+import { IEditorService as Qe, ISidebarService as dr, MenuGroup as pr, MenuItemType as sn, MenuPosition as Lr, getMenuHiddenObservable as Ar, IClipboardInterfaceService as Pr, KeyCode as H, MetaKeys as Se, ComponentManager as br, BuiltInUIPart as Tr, IMenuService as Er, IShortcutService as Sr, IUIPartsService as Ir, SetEditorResizeOperation as Nr, IContextMenuService as Rr, IProgressService as Cr } from "@univerjs/ui";
+import { useDependency as me, connectInjector as hr } from "@wendellhu/redi/react-bindings";
+import { Subject as Me, combineLatestWith as _r, map as We, Observable as Or, merge as gn, bufferTime as Mr, filter as Dr } from "rxjs";
+import gr, { forwardRef as ze, useRef as da, createElement as Ze, useState as X, useEffect as Rt } from "react";
+import { Popup as pa, Select as xr, Input as vr, Button as Vt } from "@univerjs/design";
+import { ReplaceContentCommand as qr, MoveCursorOperation as yr, TextSelectionManagerService as Fr, DocViewModelManagerService as Ur } from "@univerjs/docs";
+const La = "formula-ui";
+var Br = Object.defineProperty, Vr = Object.getOwnPropertyDescriptor, Hr = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? Vr(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 && yr(e, t, i), i;
-}, it = (a, e) => (t, n) => e(t, n, a);
+  return n && i && Br(e, t, i), i;
+}, rt = (a, e) => (t, n) => e(t, n, a);
 let lt = class extends ne {
   constructor(a, e, t, n) {
     super(), this._activeDirtyManagerService = a, this._univerInstanceService = e, this._formulaDataModel = t, this._definedNamesService = n, this._initialize();
@@ -38,24 +38,24 @@ let lt = class extends ne {
     }), this._initialMove(), this._initialRowAndColumn(), this._initialSheet(), this._initialDefinedName();
   }
   _initialMove() {
-    this._activeDirtyManagerService.register(Nn.id, {
-      commandId: Nn.id,
+    this._activeDirtyManagerService.register(In.id, {
+      commandId: In.id,
       getDirtyData: (a) => {
         const e = a.params;
         return {
           dirtyRanges: this._getMoveRangeMutationDirtyRange(e)
         };
       }
-    }), this._activeDirtyManagerService.register(Rn.id, {
-      commandId: Rn.id,
+    }), this._activeDirtyManagerService.register(Nn.id, {
+      commandId: Nn.id,
       getDirtyData: (a) => {
         const e = a.params;
         return {
           dirtyRanges: this._getMoveRowsMutationDirtyRange(e)
         };
       }
-    }), this._activeDirtyManagerService.register(Cn.id, {
-      commandId: Cn.id,
+    }), this._activeDirtyManagerService.register(Rn.id, {
+      commandId: Rn.id,
       getDirtyData: (a) => {
         const e = a.params;
         return {
@@ -65,16 +65,16 @@ let lt = class extends ne {
     });
   }
   _initialRowAndColumn() {
-    this._activeDirtyManagerService.register(hn.id, {
-      commandId: hn.id,
+    this._activeDirtyManagerService.register(Cn.id, {
+      commandId: Cn.id,
       getDirtyData: (a) => {
         const e = a.params;
         return {
           dirtyRanges: this._getRemoveRowOrColumnMutation(e, !0)
         };
       }
-    }), this._activeDirtyManagerService.register(_n.id, {
-      commandId: _n.id,
+    }), this._activeDirtyManagerService.register(hn.id, {
+      commandId: hn.id,
       getDirtyData: (a) => {
         const e = a.params;
         return {
@@ -99,14 +99,14 @@ let lt = class extends ne {
     });
   }
   _initialDefinedName() {
-    this._activeDirtyManagerService.register(bn.id, {
-      commandId: bn.id,
+    this._activeDirtyManagerService.register(Pn.id, {
+      commandId: Pn.id,
       getDirtyData: (a) => {
         const e = a.params;
         return { dirtyDefinedNameMap: this._getDefinedNameMutation(e) };
       }
-    }), this._activeDirtyManagerService.register(Tn.id, {
-      commandId: Tn.id,
+    }), this._activeDirtyManagerService.register(bn.id, {
+      commandId: bn.id,
       getDirtyData: (a) => {
         const e = a.params;
         return { dirtyDefinedNameMap: this._getDefinedNameMutation(e) };
@@ -139,12 +139,12 @@ let lt = class extends ne {
     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 j();
     let s = null;
     const { startRow: l, startColumn: L, endRow: b, endColumn: E } = n;
-    i === An.ROWS ? s = this._rangeToMatrix({
+    i === Ln.ROWS ? s = this._rangeToMatrix({
       startRow: l,
       startColumn: L,
       endRow: c,
       endColumn: E
-    }) : i === An.COLUMNS && (s = this._rangeToMatrix({
+    }) : i === Ln.COLUMNS && (s = this._rangeToMatrix({
       startRow: l,
       startColumn: L,
       endRow: b,
@@ -225,18 +225,18 @@ let lt = class extends ne {
     return n;
   }
 };
-lt = Ur([
+lt = Hr([
   ce(fe.Ready, lt),
-  it(0, rn),
-  it(1, de),
-  it(2, y(ke)),
-  it(3, Yn)
+  rt(0, rn),
+  rt(1, de),
+  rt(2, y($e)),
+  rt(3, wn)
 ], lt);
-var Br = Object.defineProperty, Vr = Object.getOwnPropertyDescriptor, Hr = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? Vr(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var wr = Object.defineProperty, Gr = Object.getOwnPropertyDescriptor, Xr = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? Gr(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 && Br(e, t, i), i;
-}, rt = (a, e) => (t, n) => e(t, n, a);
+  return n && i && wr(e, t, i), i;
+}, ut = (a, e) => (t, n) => e(t, n, a);
 let dt = class extends ne {
   constructor(a, e, t, n) {
     super(), this._commandService = a, this._sheetInterceptorService = e, this._formulaDataModel = t, this._themeService = n, this._initialize();
@@ -247,7 +247,7 @@ let dt = class extends ne {
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((a) => {
-        if (a.id !== Rt.id)
+        if (a.id !== Nt.id)
           return;
         const e = a.params;
         if (e == null)
@@ -269,25 +269,29 @@ let dt = class extends ne {
             ...c,
             v: 0,
             // Default value for empty cell
-            t: Nt.NUMBER
+            t: Ue.NUMBER
+          }) : (a == null ? void 0 : a.t) === Ue.NUMBER && typeof (a == null ? void 0 : a.v) == "number" ? t({
+            ...a,
+            ...c,
+            v: Gn(a.v)
           }) : t({ ...a, ...c });
         }
       })
     );
   }
 };
-dt = Hr([
+dt = Xr([
   ce(fe.Ready, dt),
-  rt(0, ue),
-  rt(1, y(Dt)),
-  rt(2, y(ke)),
-  rt(3, y(an))
+  ut(0, ue),
+  ut(1, y(Dt)),
+  ut(2, y($e)),
+  ut(3, y(an))
 ], dt);
-var wr = Object.defineProperty, Gr = Object.getOwnPropertyDescriptor, Xr = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? Gr(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var Yr = Object.defineProperty, Wr = Object.getOwnPropertyDescriptor, Kr = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? Wr(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 && wr(e, t, i), i;
-}, vn = (a, e) => (t, n) => e(t, n, a);
+  return n && i && Yr(e, t, i), i;
+}, xn = (a, e) => (t, n) => e(t, n, a);
 let pt = class extends ne {
   constructor(a, e) {
     super(), this._autoFillService = a, this._lexerTreeBuilder = e, this._initialize();
@@ -297,12 +301,12 @@ let pt = class extends ne {
   }
   _registerAutoFill() {
     const a = {
-      type: On.FORMULA,
+      type: _n.FORMULA,
       priority: 1001,
-      match: (e) => De(e == null ? void 0 : e.f) || Fe(e == null ? void 0 : e.si),
-      isContinue: (e, t) => e.type === On.FORMULA,
+      match: (e) => Ee(e == null ? void 0 : e.f) || ge(e == null ? void 0 : e.si),
+      isContinue: (e, t) => e.type === _n.FORMULA,
       applyFunctions: {
-        [zi.COPY]: (e, t, n, i) => {
+        [er.COPY]: (e, t, n, i) => {
           const { data: u, index: o } = e;
           return this._fillCopyFormula(u, t, n, o, i);
         }
@@ -312,12 +316,12 @@ let pt = class extends ne {
   }
   _fillCopyFormula(a, e, t, n, i) {
     var c, f;
-    const u = Wr(i), o = [], m = /* @__PURE__ */ new Map();
+    const u = $r(i), o = [], m = /* @__PURE__ */ new Map();
     for (let d = 1; d <= e; d++) {
       const s = (d - 1) % a.length, l = te.deepClone(a[s]);
       if (l) {
-        const L = ((c = a[s]) == null ? void 0 : c.f) || "", b = ((f = a[s]) == null ? void 0 : f.si) || "", E = De(L);
-        if (Fe(b))
+        const L = ((c = a[s]) == null ? void 0 : c.f) || "", b = ((f = a[s]) == null ? void 0 : f.si) || "", E = Ee(L);
+        if (ge(b))
           l.si = b, l.f = null, l.v = null, l.p = null, t === w.DOWN || t === w.RIGHT ? o.push(l) : o.unshift(l);
         else if (E) {
           let R = m.get(s);
@@ -325,7 +329,7 @@ let pt = class extends ne {
             l.si = R, l.f = null, l.v = null, l.p = null;
           else {
             R = te.generateRandomId(6), m.set(s, R);
-            const { offsetX: T, offsetY: A } = Yr(u, t), h = this._lexerTreeBuilder.moveFormulaRefOffset(
+            const { offsetX: T, offsetY: A } = kr(u, t), h = this._lexerTreeBuilder.moveFormulaRefOffset(
               L,
               T,
               A
@@ -339,12 +343,12 @@ let pt = class extends ne {
     return o;
   }
 };
-pt = Xr([
+pt = Kr([
   ce(fe.Ready, pt),
-  vn(0, Zi),
-  vn(1, y(Ue))
+  xn(0, tr),
+  xn(1, y(Be))
 ], pt);
-function Yr(a, e) {
+function kr(a, e) {
   let t = 0, n = 0;
   switch (e) {
     case w.UP:
@@ -362,7 +366,7 @@ function Yr(a, e) {
   }
   return { offsetX: t, offsetY: n };
 }
-function Wr(a) {
+function $r(a) {
   let e = 0;
   for (const t in a)
     a[t].forEach((n) => {
@@ -370,19 +374,19 @@ function Wr(a) {
     });
   return e;
 }
-const Pa = "special-paste-formula", ba = {
+const Aa = "special-paste-formula", Pa = {
   id: "sheet.command.paste-formula",
   type: Pe.COMMAND,
-  handler: async (a) => a.get(ue).executeCommand(Ji.id, {
-    value: Pa
+  handler: async (a) => a.get(ue).executeCommand(nr.id, {
+    value: Aa
   })
 };
-var Kr = Object.defineProperty, kr = Object.getOwnPropertyDescriptor, $r = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? kr(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var jr = Object.defineProperty, Qr = Object.getOwnPropertyDescriptor, zr = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? Qr(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;
-}, ut = (a, e) => (t, n) => e(t, n, a);
-const jr = "default-paste-formula";
+  return n && i && jr(e, t, i), i;
+}, ot = (a, e) => (t, n) => e(t, n, a);
+const Zr = "default-paste-formula";
 let Lt = class extends ne {
   constructor(a, e, t, n) {
     super(), this._currentUniverSheet = a, this._lexerTreeBuilder = e, this._sheetClipboardService = t, this._injector = n, this._initialize();
@@ -395,7 +399,7 @@ let Lt = class extends ne {
   }
   _pasteFormulaHook() {
     return {
-      id: Pa,
+      id: Aa,
       priority: 10,
       specialPasteInfo: { label: "specialPaste.formula" },
       onPasteCells: (a, e, t, n) => this._onPasteCells(a, e, t, n, !0)
@@ -403,18 +407,18 @@ let Lt = class extends ne {
   }
   _pasteWithFormulaHook() {
     return {
-      id: jr,
+      id: Zr,
       priority: 10,
       onPasteCells: (a, e, t, n) => this._onPasteCells(a, e, t, n, !1)
     };
   }
   _onPasteCells(a, e, t, n, i) {
     const u = {
-      copyType: n.copyType || fa.COPY,
+      copyType: n.copyType || ma.COPY,
       copyRange: a == null ? void 0 : a.range,
       pasteType: n.pasteType
     }, o = e.range, m = t, c = this._currentUniverSheet.getCurrentUnitForType(Y.UNIVER_SHEET), f = c.getUnitId(), d = c.getActiveSheet().getSheetId();
-    return this._injector.invoke((s) => Qr(
+    return this._injector.invoke((s) => Jr(
       f,
       d,
       o,
@@ -426,36 +430,36 @@ let Lt = class extends ne {
     ));
   }
 };
-Lt = $r([
+Lt = zr([
   ce(fe.Ready, Lt),
-  ut(0, de),
-  ut(1, y(Ue)),
-  ut(2, tr),
-  ut(3, y(Ot))
+  ot(0, de),
+  ot(1, y(Be)),
+  ot(2, ir),
+  ot(3, y(Ot))
 ], Lt);
-function Qr(a, e, t, n, i, u, o, m = !1) {
+function Jr(a, e, t, n, i, u, o, m = !1) {
   const c = [], f = [], d = new j(), s = /* @__PURE__ */ new Map();
   let l = 0, L = 0;
   if (u && u.copyRange) {
     const { copyType: p, copyRange: R } = u;
-    p === fa.COPY && R && (l = R.rows.length, L = R.cols.length);
+    p === ma.COPY && R && (l = R.rows.length, L = R.cols.length);
   }
   n.forValue((p, R, T) => {
-    var g, M;
+    var D, M;
     const A = T.f || "", h = T.si || "";
     let S = {};
     if (m && (S = te.deepClone(T)), !(!l || !L)) {
-      if (Fe(h))
+      if (ge(h))
         S.si = h, S.f = null, S.v = null, S.p = null;
-      else if (De(A) && u.pasteType === er.DEFAULT_PASTE) {
-        const q = p % l, x = R % L, U = `${q}_${x}`;
+      else if (Ee(A) && u.pasteType === ar.DEFAULT_PASTE) {
+        const v = p % l, g = R % L, U = `${v}_${g}`;
         let I = s.get(U);
         if (I)
           S.si = I, S.f = null, S.v = null, S.p = null;
         else {
           I = te.generateRandomId(6), s.set(U, I);
-          const F = u != null && u.copyRange ? (g = u == null ? void 0 : u.copyRange) == null ? void 0 : g.cols[x] : x, pe = u != null && u.copyRange ? (M = u == null ? void 0 : u.copyRange) == null ? void 0 : M.rows[q] : q, oe = t.cols[R] - F, Se = t.rows[p] - pe, et = o.moveFormulaRefOffset(A, oe, Se);
-          S.si = I, S.f = et, S.v = null, S.p = null;
+          const F = u != null && u.copyRange ? (D = u == null ? void 0 : u.copyRange) == null ? void 0 : D.cols[g] : g, pe = u != null && u.copyRange ? (M = u == null ? void 0 : u.copyRange) == null ? void 0 : M.rows[v] : v, oe = t.cols[R] - F, Ie = t.rows[p] - pe, tt = o.moveFormulaRefOffset(A, oe, Ie);
+          S.si = I, S.f = tt, S.v = null, S.p = null;
         }
       }
       d.setValue(t.rows[p], t.cols[R], S);
@@ -470,7 +474,7 @@ function Qr(a, e, t, n, i, u, o, m = !1) {
     id: le.id,
     params: b
   });
-  const E = Ri(
+  const E = _i(
     i,
     b
   );
@@ -482,15 +486,15 @@ function Qr(a, e, t, n, i, u, o, m = !1) {
     redos: c
   };
 }
-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--)
+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 && zr(e, t, i), i;
+  return n && i && eu(e, t, i), i;
 }, Le = (a, e) => (t, n) => e(t, n, a);
-let ht = class extends ne {
+let Ct = class extends ne {
   constructor(e, t, n, i, u, o, m, c, f, d) {
     super();
-    D(this, "_previousShape");
+    q(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();
   }
   _initInterceptorEditorStart() {
@@ -512,12 +516,12 @@ let ht = class extends ne {
               return L != null && new j(L).forValue((T, A, h) => {
                 if (h == null)
                   return !0;
-                const { startRow: S, startColumn: g, endRow: M, endColumn: q } = h;
+                const { startRow: S, startColumn: D, endRow: M, endColumn: v } = h;
                 if (T === i && A === u)
                   return this._createArrayFormulaRangeShape(h, o), !1;
-                if (i >= S && i <= M && u >= g && u <= q) {
-                  const x = c.getCell(S, g);
-                  if ((x == null ? void 0 : x.v) === W.SPILL)
+                if (i >= S && i <= M && u >= D && u <= v) {
+                  const g = c.getCell(S, D);
+                  if ((g == null ? void 0 : g.v) === W.SPILL)
                     return;
                   const U = this._formulaDataModel.getFormulaDataItem(
                     T,
@@ -544,7 +548,7 @@ let ht = class extends ne {
           ...e,
           v: null,
           // Default value for empty cell, information displayed before calculation
-          t: Nt.NUMBER
+          t: Ue.NUMBER
         }) : n(e),
         priority: 10
       })
@@ -552,12 +556,12 @@ let ht = class extends ne {
   }
   _commandExecutedListener() {
     this.disposeWithMe(this._commandService.onCommandExecuted((e, t) => {
-      (e.id === Wn.id || e.id === Rt.id && t && t.remove) && this._removeArrayFormulaRangeShape();
+      (e.id === Xn.id || e.id === Nt.id && t && t.remove) && this._removeArrayFormulaRangeShape();
     }));
   }
   _createArrayFormulaRangeShape(e, t) {
     var L;
-    const n = this._themeService.getCurrentTheme(), i = new Gn(n.colorWhite).setAlpha(0).toString(), u = {
+    const n = this._themeService.getCurrentTheme(), i = new Vn(n.colorWhite).setAlpha(0).toString(), u = {
       strokeWidth: 1,
       stroke: n.hyacinth700,
       fill: i,
@@ -572,25 +576,25 @@ let ht = class extends ne {
     }), f = (L = this._sheetSkeletonManagerService.getCurrent()) == null ? void 0 : L.skeleton;
     if (!o || !f)
       return;
-    const { rowHeaderWidth: d, columnHeaderHeight: s } = f, l = new nr(o, 100, !1, this._themeService);
+    const { rowHeaderWidth: d, columnHeaderHeight: s } = f, l = new rr(o, 100, !1, this._themeService);
     l.update(m, d, s, u, c), l.setEvent(!1), this._previousShape = l;
   }
   _removeArrayFormulaRangeShape() {
     this._previousShape != null && (this._previousShape.dispose(), this._previousShape = null);
   }
 };
-ht = Jr([
-  Le(1, y(sa)),
-  Le(2, y(ke)),
-  Le(3, y(Ue)),
+Ct = nu([
+  Le(1, y(ca)),
+  Le(2, y($e)),
+  Le(3, y(Be)),
   Le(4, y(an)),
-  Le(5, sn),
-  Le(6, la),
-  Le(7, y(fn)),
+  Le(5, fn),
+  Le(6, sa),
+  Le(7, y(fa)),
   Le(8, ue),
   Le(9, y(Dt))
-], ht);
-const Ta = {
+], Ct);
+const ba = {
   id: "formula-ui.command.insert-function",
   type: Pe.COMMAND,
   handler: async (a, e) => {
@@ -611,9 +615,9 @@ const Ta = {
     const u = {
       value: i.getData()
     };
-    return n.executeCommand(Ci.id, u);
+    return n.executeCommand(Oi.id, u);
   }
-}, xe = {
+}, ve = {
   id: "formula-ui.operation.select-editor-formula",
   type: Pe.OPERATION,
   handler: (a, e) => (
@@ -645,26 +649,26 @@ const Ta = {
     // }
     !0
   )
-}, Be = Mt("formula-ui.prompt-service");
-class eu {
+}, Ve = Mt("formula-ui.prompt-service");
+class au {
   constructor() {
-    D(this, "_search$", new Oe());
-    D(this, "_help$", new Oe());
-    D(this, "_navigate$", new Oe());
-    D(this, "_accept$", new Oe());
-    D(this, "_acceptFormulaName$", new Oe());
-    D(this, "search$", this._search$.asObservable());
-    D(this, "help$", this._help$.asObservable());
-    D(this, "navigate$", this._navigate$.asObservable());
-    D(this, "accept$", this._accept$.asObservable());
-    D(this, "acceptFormulaName$", this._acceptFormulaName$.asObservable());
-    D(this, "_searching", !1);
-    D(this, "_helping", !1);
-    D(this, "_isInsertRefString", !1);
-    D(this, "_sequenceNodes", []);
-    D(this, "_isSelectionMoving", !1);
-    D(this, "_isLockedOnSelectionChangeRefString", !1);
-    D(this, "_isLockedOnSelectionInsertRefString", !1);
+    q(this, "_search$", new Me());
+    q(this, "_help$", new Me());
+    q(this, "_navigate$", new Me());
+    q(this, "_accept$", new Me());
+    q(this, "_acceptFormulaName$", new Me());
+    q(this, "search$", this._search$.asObservable());
+    q(this, "help$", this._help$.asObservable());
+    q(this, "navigate$", this._navigate$.asObservable());
+    q(this, "accept$", this._accept$.asObservable());
+    q(this, "acceptFormulaName$", this._acceptFormulaName$.asObservable());
+    q(this, "_searching", !1);
+    q(this, "_helping", !1);
+    q(this, "_isInsertRefString", !1);
+    q(this, "_sequenceNodes", []);
+    q(this, "_isSelectionMoving", !1);
+    q(this, "_isLockedOnSelectionChangeRefString", !1);
+    q(this, "_isLockedOnSelectionInsertRefString", !1);
   }
   dispose() {
     this._search$.complete(), this._help$.complete(), this._navigate$.complete(), this._accept$.complete(), this._acceptFormulaName$.complete(), this._sequenceNodes = [];
@@ -814,44 +818,44 @@ class eu {
 const Qt = {
   id: "formula-ui.operation.help-function",
   type: Pe.OPERATION,
-  handler: async (a, e) => (a.get(Be).help(e), !0)
-}, dn = {
+  handler: async (a, e) => (a.get(Ve).help(e), !0)
+}, ln = {
   id: "formula-ui.operation.insert-function",
   type: Pe.OPERATION,
   handler: async (a, e) => {
     var R, T;
-    const t = a.get(cn), n = a.get(je), i = t.getSelections();
+    const t = a.get(cn), n = a.get(Qe), i = t.getSelections();
     if (!i || !i.length)
       return !1;
-    const u = hi(a.get(de));
+    const u = Mi(a.get(de));
     if (!u)
       return !1;
     const { worksheet: o, unitId: m, subUnitId: c } = u, f = o.getCellMatrix(), { value: d } = e, s = a.get(ue), l = [];
     let L = null, b = 0, E = 0, p = "";
-    if (i.length === 1 && (au(i[0].range) || iu(i[0].range))) {
-      const { range: A, primary: h } = i[0], S = (R = h == null ? void 0 : h.actualRow) != null ? R : A.startRow, g = (T = h == null ? void 0 : h.actualColumn) != null ? T : A.startColumn;
-      L = A, b = S, E = g;
-      const M = qn(f, S, g);
-      M && (p = Ke(M));
+    if (i.length === 1 && (uu(i[0].range) || ou(i[0].range))) {
+      const { range: A, primary: h } = i[0], S = (R = h == null ? void 0 : h.actualRow) != null ? R : A.startRow, D = (T = h == null ? void 0 : h.actualColumn) != null ? T : A.startColumn;
+      L = A, b = S, E = D;
+      const M = vn(f, S, D);
+      M && (p = ke(M));
     } else
       i.some((A) => {
         var I, F;
-        const { range: h, primary: S } = A, g = (I = S == null ? void 0 : S.actualRow) != null ? I : h.startRow, M = (F = S == null ? void 0 : S.actualColumn) != null ? F : h.startColumn, q = qn(f, g, M);
-        if (!q)
-          return L = h, b = g, E = M, !0;
-        const x = Ke(q), U = `=${d}(${x})`;
+        const { range: h, primary: S } = A, D = (I = S == null ? void 0 : S.actualRow) != null ? I : h.startRow, M = (F = S == null ? void 0 : S.actualColumn) != null ? F : h.startColumn, v = vn(f, D, M);
+        if (!v)
+          return L = h, b = D, E = M, !0;
+        const g = ke(v), U = `=${d}(${g})`;
         return l.push({
           range: h,
           primary: {
-            row: g,
+            row: D,
             column: M
           },
           formula: U
         }), !1;
       });
     if (L) {
-      const A = _i(b, E, o), h = {
-        range: he.clone(L),
+      const A = Di(b, E, o), h = {
+        range: _e.clone(L),
         primary: {
           startRow: A.startRow,
           startColumn: A.startColumn,
@@ -865,20 +869,20 @@ const Qt = {
       }, S = {
         unitId: m,
         subUnitId: c,
-        pluginName: Ce,
+        pluginName: he,
         selections: [h]
       };
-      await s.executeCommand(Oi.id, S), setTimeout(() => {
+      await s.executeCommand(gi.id, S), setTimeout(() => {
         n.setFormula(`=${d}(${p}`);
       }, 0);
     }
-    return l.length === 0 ? !1 : s.executeCommand(Ta.id, {
+    return l.length === 0 ? !1 : s.executeCommand(ba.id, {
       list: l
     });
   }
 };
-function qn(a, e, t) {
-  const n = tu(a, e, t);
+function vn(a, e, t) {
+  const n = iu(a, e, t);
   if (n !== e)
     return {
       startRow: n,
@@ -886,7 +890,7 @@ function qn(a, e, t) {
       startColumn: t,
       endColumn: t
     };
-  const i = nu(a, e, t);
+  const i = ru(a, e, t);
   return i !== t ? {
     startRow: e,
     endRow: e,
@@ -894,18 +898,18 @@ function qn(a, e, t) {
     endColumn: t - 1
   } : null;
 }
-function tu(a, e, t) {
+function iu(a, e, t) {
   let n = !1;
   if (e === 0)
     return e;
   for (let i = e - 1; i >= 0; i--) {
     const u = a.getValue(i, t);
-    if (_t(u) && !n) {
+    if (ht(u) && !n) {
       if (i === 0)
         return 0;
       n = !0;
     } else {
-      if (n && !_t(u))
+      if (n && !ht(u))
         return i + 1;
       if (n && i === 0)
         return 0;
@@ -913,18 +917,18 @@ function tu(a, e, t) {
   }
   return e;
 }
-function nu(a, e, t) {
+function ru(a, e, t) {
   let n = !1;
   if (t === 0)
     return t;
   for (let i = t - 1; i >= 0; i--) {
     const u = a.getValue(e, i);
-    if (_t(u) && !n) {
+    if (ht(u) && !n) {
       if (i === 0)
         return 0;
       n = !0;
     } else {
-      if (n && !_t(u))
+      if (n && !ht(u))
         return i + 1;
       if (n && i === 0)
         return 0;
@@ -932,39 +936,39 @@ function nu(a, e, t) {
   }
   return t;
 }
-function _t(a) {
+function ht(a) {
   if (a != null && a.p) {
     const e = a == null ? void 0 : a.p.body;
     if (e == null)
       return !1;
-    const t = e.dataStream, i = t.substring(t.length - 2, t.length) === Va ? t.substring(0, t.length - 2) : t;
-    return Ha(i);
+    const t = e.dataStream, i = t.substring(t.length - 2, t.length) === Ha ? t.substring(0, t.length - 2) : t;
+    return wa(i);
   }
-  return a && (a.t === Nt.NUMBER || wa(a) === Nt.NUMBER);
+  return a && (a.t === Ue.NUMBER || Ga(a) === Ue.NUMBER);
 }
-function au(a) {
+function uu(a) {
   return a.startRow === a.endRow && a.startColumn === a.endColumn;
 }
-function iu(a) {
+function ou(a) {
   return a.startRow !== a.endRow && a.startColumn !== a.endColumn;
 }
-const Ea = `${Aa}_MORE_FUNCTIONS_COMPONENT`, Sa = {
+const Ta = `${La}_MORE_FUNCTIONS_COMPONENT`, Ea = {
   id: "formula-ui.operation.more-functions",
   type: Pe.OPERATION,
-  handler: async (a) => (a.get(fr).open({
+  handler: async (a) => (a.get(dr).open({
     header: { title: "formula.insert.tooltip" },
-    children: { label: Ea }
+    children: { label: Ta }
   }), !0)
-}, pn = {
+}, dn = {
   id: "formula-ui.operation.change-ref-to-absolute",
   type: Pe.OPERATION,
   handler: async (a) => !0
 }, zt = {
   id: "formula-ui.operation.search-function",
   type: Pe.OPERATION,
-  handler: async (a, e) => (a.get(Be).search(e), !0)
+  handler: async (a, e) => (a.get(Ve).search(e), !0)
 };
-var Ia = { exports: {} }, gt = {};
+var Sa = { exports: {} }, gt = {};
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -974,22 +978,22 @@ var Ia = { exports: {} }, gt = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var ru = Or, uu = Symbol.for("react.element"), ou = Symbol.for("react.fragment"), mu = Object.prototype.hasOwnProperty, cu = ru.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, fu = { key: !0, ref: !0, __self: !0, __source: !0 };
-function Na(a, e, t) {
+var mu = gr, cu = Symbol.for("react.element"), fu = Symbol.for("react.fragment"), su = Object.prototype.hasOwnProperty, lu = mu.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, du = { key: !0, ref: !0, __self: !0, __source: !0 };
+function Ia(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)
-    mu.call(e, n) && !fu.hasOwnProperty(n) && (i[n] = e[n]);
+    su.call(e, n) && !du.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: uu, type: a, key: u, ref: o, props: i, _owner: cu.current };
+  return { $$typeof: cu, type: a, key: u, ref: o, props: i, _owner: lu.current };
 }
-gt.Fragment = ou;
-gt.jsx = Na;
-gt.jsxs = Na;
-Ia.exports = gt;
-var C = Ia.exports, re = function() {
+gt.Fragment = fu;
+gt.jsx = Ia;
+gt.jsxs = Ia;
+Sa.exports = gt;
+var C = Sa.exports, re = function() {
   return re = Object.assign || function(a) {
     for (var e, t = 1, n = arguments.length; t < n; t++) {
       e = arguments[t];
@@ -998,7 +1002,7 @@ var C = Ia.exports, re = function() {
     }
     return a;
   }, re.apply(this, arguments);
-}, su = function(a, e) {
+}, pu = function(a, e) {
   var t = {};
   for (var n in a)
     Object.prototype.hasOwnProperty.call(a, n) && e.indexOf(n) < 0 && (t[n] = a[n]);
@@ -1006,16 +1010,16 @@ var C = Ia.exports, re = 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;
-}, Ze = Qe(function(a, e) {
-  var t = a.icon, n = a.id, i = a.className, u = a.extend, o = su(a, ["icon", "id", "className", "extend"]), m = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), c = pa("_".concat(pu()));
-  return Ra(t, "".concat(n), { defIds: t.defIds, idSuffix: c.current }, re({ ref: e, className: m }, o), u);
+}, Je = ze(function(a, e) {
+  var t = a.icon, n = a.id, i = a.className, u = a.extend, o = pu(a, ["icon", "id", "className", "extend"]), m = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), c = da("_".concat(Pu()));
+  return Na(t, "".concat(n), { defIds: t.defIds, idSuffix: c.current }, re({ ref: e, className: m }, o), u);
 });
-function Ra(a, e, t, n, i) {
-  return ze(a.tag, re(re({ key: e }, lu(a, t, i)), n), (du(a, t).children || []).map(function(u, o) {
-    return Ra(u, "".concat(e, "-").concat(a.tag, "-").concat(o), t, void 0, i);
+function Na(a, e, t, n, i) {
+  return Ze(a.tag, re(re({ key: e }, Lu(a, t, i)), n), (Au(a, t).children || []).map(function(u, o) {
+    return Na(u, "".concat(e, "-").concat(a.tag, "-").concat(o), t, void 0, i);
   }));
 }
-function lu(a, e, t) {
+function Lu(a, e, t) {
   var n = re({}, a.attrs);
   t != null && t.colorChannel1 && n.fill === "colorChannel1" && (n.fill = t.colorChannel1);
   var i = e.defIds;
@@ -1024,63 +1028,63 @@ function lu(a, e, t) {
     typeof m == "string" && (n[o] = m.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), n;
 }
-function du(a, e) {
+function Au(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) ? re(re({}, a), { children: a.children.map(function(i) {
     return typeof i.attrs.id == "string" && n && n.indexOf(i.attrs.id) > -1 ? re(re({}, i), { attrs: re(re({}, i.attrs), { id: i.attrs.id + e.idSuffix }) }) : i;
   }) }) : a;
 }
-function pu() {
+function Pu() {
   return Math.random().toString(36).substring(2, 8);
 }
-Ze.displayName = "UniverIcon";
-var Lu = { 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" } }] }, Ca = Qe(function(a, e) {
-  return ze(Ze, Object.assign({}, a, {
+Je.displayName = "UniverIcon";
+var bu = { 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" } }] }, Ra = ze(function(a, e) {
+  return Ze(Je, Object.assign({}, a, {
     id: "check-mark-single",
     ref: e,
-    icon: Lu
+    icon: bu
   }));
 });
-Ca.displayName = "CheckMarkSingle";
-const Au = Ca;
-var Pu = { 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" } }] }, ha = Qe(function(a, e) {
-  return ze(Ze, Object.assign({}, a, {
+Ra.displayName = "CheckMarkSingle";
+const Tu = Ra;
+var Eu = { 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" } }] }, Ca = ze(function(a, e) {
+  return Ze(Je, Object.assign({}, a, {
     id: "close-single",
     ref: e,
-    icon: Pu
+    icon: Eu
   }));
 });
-ha.displayName = "CloseSingle";
-const bu = ha;
-var Tu = { 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" } }] }, _a = Qe(function(a, e) {
-  return ze(Ze, Object.assign({}, a, {
+Ca.displayName = "CloseSingle";
+const Su = Ca;
+var Iu = { 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" } }] }, ha = ze(function(a, e) {
+  return Ze(Je, Object.assign({}, a, {
     id: "details-single",
     ref: e,
-    icon: Tu
+    icon: Iu
   }));
 });
-_a.displayName = "DetailsSingle";
-const Eu = _a;
-var Su = { 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" } }] }, Oa = Qe(function(a, e) {
-  return ze(Ze, Object.assign({}, a, {
+ha.displayName = "DetailsSingle";
+const Nu = ha;
+var Ru = { 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" } }] }, _a = ze(function(a, e) {
+  return Ze(Je, Object.assign({}, a, {
     id: "more-single",
     ref: e,
-    icon: Su
+    icon: Ru
   }));
 });
-Oa.displayName = "MoreSingle";
-const Iu = Oa;
-function Nu(a, e) {
+_a.displayName = "MoreSingle";
+const Cu = _a;
+function hu(a, e) {
   return Object.keys(a).filter((t) => isNaN(Number(t))).map((t) => ({
     label: e.t(`formula.functionType.${t.toLocaleLowerCase()}`),
     value: `${a[t]}`
   }));
 }
-function Ru(a, e) {
+function _u(a, e) {
   let t = "";
   return a.aliasFunctionName ? (t = e.t(a.aliasFunctionName), t === a.aliasFunctionName && (t = a.functionName)) : t = a.functionName, t;
 }
-function Ma(a) {
+function Oa(a) {
   if (!a.require && !a.repeat)
     return `[${a.name}]`;
   if (a.require && !a.repeat)
@@ -1090,56 +1094,56 @@ function Ma(a) {
   if (a.require && a.repeat)
     return `${a.name},...`;
 }
-const Cu = "univer-formula-help-function", hu = "univer-formula-help-function-title", _u = "univer-formula-help-function-title-icons", Ou = "univer-formula-help-function-title-icon", Mu = "univer-formula-help-function-content", Du = "univer-formula-help-function-content-inner", gu = "univer-formula-help-function-content-params", xu = "univer-formula-help-function-content-params-title", vu = "univer-formula-help-function-content-params-detail", qu = "univer-formula-help-function-active", yu = "univer-formula-help-decorator", Fu = "univer-formula-help-param", Uu = "univer-formula-help-param-prefix", Bu = "univer-formula-help-param-item", Vu = "univer-formula-help-param-active", ee = {
-  formulaHelpFunction: Cu,
-  formulaHelpFunctionTitle: hu,
-  formulaHelpFunctionTitleIcons: _u,
-  formulaHelpFunctionTitleIcon: Ou,
-  formulaHelpFunctionContent: Mu,
-  formulaHelpFunctionContentInner: Du,
-  formulaHelpFunctionContentParams: gu,
-  formulaHelpFunctionContentParamsTitle: xu,
-  formulaHelpFunctionContentParamsDetail: vu,
-  formulaHelpFunctionActive: qu,
-  formulaHelpDecorator: yu,
-  formulaHelpParam: Fu,
-  formulaHelpParamPrefix: Uu,
-  formulaHelpParamItem: Bu,
-  formulaHelpParamActive: Vu
+const Ou = "univer-formula-help-function", Mu = "univer-formula-help-function-title", Du = "univer-formula-help-function-title-icons", gu = "univer-formula-help-function-title-icon", xu = "univer-formula-help-function-content", vu = "univer-formula-help-function-content-inner", qu = "univer-formula-help-function-content-params", yu = "univer-formula-help-function-content-params-title", Fu = "univer-formula-help-function-content-params-detail", Uu = "univer-formula-help-function-active", Bu = "univer-formula-help-decorator", Vu = "univer-formula-help-param", Hu = "univer-formula-help-param-prefix", wu = "univer-formula-help-param-item", Gu = "univer-formula-help-param-active", J = {
+  formulaHelpFunction: Ou,
+  formulaHelpFunctionTitle: Mu,
+  formulaHelpFunctionTitleIcons: Du,
+  formulaHelpFunctionTitleIcon: gu,
+  formulaHelpFunctionContent: xu,
+  formulaHelpFunctionContentInner: vu,
+  formulaHelpFunctionContentParams: qu,
+  formulaHelpFunctionContentParamsTitle: yu,
+  formulaHelpFunctionContentParamsDetail: Fu,
+  formulaHelpFunctionActive: Uu,
+  formulaHelpDecorator: Bu,
+  formulaHelpParam: Vu,
+  formulaHelpParamPrefix: Hu,
+  formulaHelpParamItem: wu,
+  formulaHelpParamActive: Gu
 };
-function Hu() {
-  const [a, e] = X(!1), [t, n] = X(!0), [i, u] = X(!0), [o, m] = X(0), [c, f] = X([0, 0]), [d, s] = X({ left: 0, top: 0 }), [l, L] = X(null), b = me(Be), E = me(ge), p = E.t("formula.prompt.required"), R = E.t("formula.prompt.optional"), T = me(de), A = me(je);
-  Ct(() => {
-    const g = b.help$.subscribe((M) => {
-      const { visible: q, paramIndex: x, functionInfo: U } = M;
-      if (!q) {
-        e(q);
+function Xu() {
+  const [a, e] = X(!1), [t, n] = X(!0), [i, u] = X(!0), [o, m] = X(0), [c, f] = X([0, 0]), [d, s] = X({ left: 0, top: 0 }), [l, L] = X(null), b = me(Ve), E = me(xe), p = E.t("formula.prompt.required"), R = E.t("formula.prompt.optional"), T = me(de), A = me(Qe);
+  Rt(() => {
+    const D = b.help$.subscribe((M) => {
+      const { visible: v, paramIndex: g, functionInfo: U } = M;
+      if (!v) {
+        e(v);
         return;
       }
       const I = h();
       if (I == null)
         return;
       const { left: F, top: pe, height: oe } = I;
-      U.description === "" && U.functionParameter.length === 0 || (f([F, pe + oe]), m(x), L(U), s({ left: F, top: pe }), e(q));
+      U.description === "" && U.functionParameter.length === 0 || (f([F, pe + oe]), m(g), L(U), s({ left: F, top: pe }), e(v));
     });
     return () => {
-      g == null || g.unsubscribe();
+      D == null || D.unsubscribe();
     };
   }, []);
   function h() {
     const M = T.getCurrentUniverDocInstance().getUnitId();
     if (!A.isEditor(M))
       return;
-    const q = A.getEditor(M);
-    return q == null ? void 0 : q.getBoundingClientRect();
+    const v = A.getEditor(M);
+    return v == null ? void 0 : v.getBoundingClientRect();
   }
-  function S(g) {
-    m(g);
+  function S(D) {
+    m(D);
   }
-  return /* @__PURE__ */ C.jsx(C.Fragment, { children: i ? /* @__PURE__ */ C.jsx(La, { visible: a, offset: c, children: l ? /* @__PURE__ */ C.jsxs("div", { className: ee.formulaHelpFunction, children: [
-    /* @__PURE__ */ C.jsxs("div", { className: ee.formulaHelpFunctionTitle, children: [
+  return /* @__PURE__ */ C.jsx(C.Fragment, { children: i ? /* @__PURE__ */ C.jsx(pa, { visible: a, offset: c, children: l ? /* @__PURE__ */ C.jsxs("div", { className: J.formulaHelpFunction, children: [
+    /* @__PURE__ */ C.jsxs("div", { className: J.formulaHelpFunctionTitle, children: [
       /* @__PURE__ */ C.jsx(
-        wu,
+        Yu,
         {
           prefix: l.functionName,
           value: l.functionParameter,
@@ -1147,22 +1151,22 @@ function Hu() {
           onClick: S
         }
       ),
-      /* @__PURE__ */ C.jsxs("div", { className: ee.formulaHelpFunctionTitleIcons, children: [
+      /* @__PURE__ */ C.jsxs("div", { className: J.formulaHelpFunctionTitleIcons, children: [
         /* @__PURE__ */ C.jsx(
           "div",
           {
-            className: ee.formulaHelpFunctionTitleIcon,
+            className: J.formulaHelpFunctionTitleIcon,
             style: { transform: t ? "rotateZ(-90deg)" : "rotateZ(90deg)" },
             onClick: () => n(!t),
-            children: /* @__PURE__ */ C.jsx(Iu, {})
+            children: /* @__PURE__ */ C.jsx(Cu, {})
           }
         ),
         /* @__PURE__ */ C.jsx(
           "div",
           {
-            className: ee.formulaHelpFunctionTitleIcon,
+            className: J.formulaHelpFunctionTitleIcon,
             onClick: () => u(!i),
-            children: /* @__PURE__ */ C.jsx(bu, {})
+            children: /* @__PURE__ */ C.jsx(Su, {})
           }
         )
       ] })
@@ -1170,17 +1174,17 @@ function Hu() {
     /* @__PURE__ */ C.jsx(
       "div",
       {
-        className: ee.formulaHelpFunctionContent,
+        className: J.formulaHelpFunctionContent,
         style: {
           height: t ? "unset" : 0,
           padding: t ? "revert-layer" : 0
         },
-        children: /* @__PURE__ */ C.jsxs("div", { className: ee.formulaHelpFunctionContentInner, children: [
+        children: /* @__PURE__ */ C.jsxs("div", { className: J.formulaHelpFunctionContentInner, children: [
           /* @__PURE__ */ C.jsx(
             Ht,
             {
               title: E.t("formula.prompt.helpExample"),
-              value: `${l.functionName}(${l.functionParameter.map((g) => g.example).join(",")})`
+              value: `${l.functionName}(${l.functionParameter.map((D) => D.example).join(",")})`
             }
           ),
           /* @__PURE__ */ C.jsx(
@@ -1190,12 +1194,12 @@ function Hu() {
               value: l.description
             }
           ),
-          l && l.functionParameter && l.functionParameter.map((g, M) => /* @__PURE__ */ C.jsx(
+          l && l.functionParameter && l.functionParameter.map((D, M) => /* @__PURE__ */ C.jsx(
             Ht,
             {
-              className: o === M ? ee.formulaHelpFunctionActive : "",
-              title: g.name,
-              value: `${g.require ? p : R} ${g.detail}`
+              className: o === M ? J.formulaHelpFunctionActive : "",
+              title: D.name,
+              value: `${D.require ? p : R} ${D.detail}`
             },
             M
           ))
@@ -1205,32 +1209,32 @@ function Hu() {
   ] }) : /* @__PURE__ */ C.jsx(C.Fragment, {}) }) : a ? /* @__PURE__ */ C.jsx(
     "div",
     {
-      className: ee.formulaHelpDecorator,
+      className: J.formulaHelpDecorator,
       onClick: () => u(!i),
       style: { left: d.left - 24, top: d.top },
-      children: /* @__PURE__ */ C.jsx(Eu, {})
+      children: /* @__PURE__ */ C.jsx(Nu, {})
     }
   ) : /* @__PURE__ */ C.jsx(C.Fragment, {}) });
 }
-const Ht = (a) => /* @__PURE__ */ C.jsxs("div", { className: ee.formulaHelpFunctionContentParams, children: [
-  /* @__PURE__ */ C.jsx("div", { className: `${ee.formulaHelpFunctionContentParamsTitle} ${a.className}`, children: a.title }),
-  /* @__PURE__ */ C.jsx("div", { className: ee.formulaHelpFunctionContentParamsDetail, children: a.value })
-] }), wu = (a) => {
+const Ht = (a) => /* @__PURE__ */ C.jsxs("div", { className: J.formulaHelpFunctionContentParams, children: [
+  /* @__PURE__ */ C.jsx("div", { className: `${J.formulaHelpFunctionContentParamsTitle} ${a.className}`, children: a.title }),
+  /* @__PURE__ */ C.jsx("div", { className: J.formulaHelpFunctionContentParamsDetail, children: a.value })
+] }), Yu = (a) => {
   const { prefix: e, value: t, active: n, onClick: i } = a;
-  return /* @__PURE__ */ C.jsxs("div", { className: ee.formulaHelpParam, children: [
-    /* @__PURE__ */ C.jsxs("span", { className: ee.formulaHelpParamPrefix, children: [
+  return /* @__PURE__ */ C.jsxs("div", { className: J.formulaHelpParam, children: [
+    /* @__PURE__ */ C.jsxs("span", { className: J.formulaHelpParamPrefix, children: [
       e,
       "("
     ] }),
     t && t.map((u, o) => (
       // TODO@Dushusir: more params needs to be active
-      /* @__PURE__ */ C.jsxs("span", { className: ee.formulaHelpParamItem, children: [
+      /* @__PURE__ */ C.jsxs("span", { className: J.formulaHelpParamItem, children: [
         /* @__PURE__ */ C.jsx(
           "span",
           {
-            className: n === o ? ee.formulaHelpFunctionActive : ee.formulaHelpParamActive,
+            className: n === o ? J.formulaHelpFunctionActive : J.formulaHelpParamActive,
             onClick: () => i(o),
-            children: Ma(u)
+            children: Oa(u)
           }
         ),
         o === t.length - 1 ? "" : ","
@@ -1238,45 +1242,45 @@ const Ht = (a) => /* @__PURE__ */ C.jsxs("div", { className: ee.formulaHelpFunct
     )),
     ")"
   ] });
-}, Gu = "univer-formula-search-function", Xu = "univer-formula-search-function-item", Yu = "univer-formula-search-function-item-name", Wu = "univer-formula-search-function-item-name-light", Ku = "univer-formula-search-function-item-desc", ku = "univer-formula-search-function-item-active", Te = {
-  formulaSearchFunction: Gu,
-  formulaSearchFunctionItem: Xu,
-  formulaSearchFunctionItemName: Yu,
-  formulaSearchFunctionItemNameLight: Wu,
-  formulaSearchFunctionItemDesc: Ku,
-  formulaSearchFunctionItemActive: ku
+}, Wu = "univer-formula-search-function", Ku = "univer-formula-search-function-item", ku = "univer-formula-search-function-item-name", $u = "univer-formula-search-function-item-name-light", ju = "univer-formula-search-function-item-desc", Qu = "univer-formula-search-function-item-active", Te = {
+  formulaSearchFunction: Wu,
+  formulaSearchFunctionItem: Ku,
+  formulaSearchFunctionItemName: ku,
+  formulaSearchFunctionItemNameLight: $u,
+  formulaSearchFunctionItemDesc: ju,
+  formulaSearchFunctionItemActive: Qu
 };
-function $u() {
-  const [a, e] = X(!1), [t, n] = X(0), [i, u] = X([0, 0]), [o, m] = X([]), [c, f] = X(""), d = pa(null), s = me(Be), l = me(de), L = me(je);
-  Ct(() => {
+function zu() {
+  const [a, e] = X(!1), [t, n] = X(0), [i, u] = X([0, 0]), [o, m] = X([]), [c, f] = X(""), d = da(null), s = me(Ve), l = me(de), L = me(Qe);
+  Rt(() => {
     let T = [], A = 0;
     const h = s.search$.subscribe((M) => {
-      const { visible: q, searchText: x, searchList: U } = M;
-      if (!q) {
-        e(q);
+      const { visible: v, searchText: g, searchList: U } = M;
+      if (!v) {
+        e(v);
         return;
       }
       const I = b();
       if (I == null)
         return;
       const { left: F, top: pe, height: oe } = I;
-      f(x), m(U), T = U, u([F, pe + oe]), e(q), n(0), A = 0;
+      f(g), m(U), T = U, u([F, pe + oe]), e(v), n(0), A = 0;
     }), S = s.navigate$.subscribe((M) => {
-      const { direction: q } = M;
-      if (q === w.UP) {
-        let x = A - 1;
-        x = x < 0 ? T.length - 1 : x, n(x), A = x;
-      } else if (q === w.DOWN) {
-        let x = A + 1;
-        x = x >= T.length ? 0 : x, n(x), A = x;
+      const { direction: v } = M;
+      if (v === w.UP) {
+        let g = A - 1;
+        g = g < 0 ? T.length - 1 : g, n(g), A = g;
+      } else if (v === w.DOWN) {
+        let g = A + 1;
+        g = g >= T.length ? 0 : g, n(g), A = g;
       }
       R(A);
-    }), g = s.accept$.subscribe((M) => {
-      const q = T[A].name;
-      s.acceptFormulaName(q);
+    }), D = s.accept$.subscribe((M) => {
+      const v = T[A].name;
+      s.acceptFormulaName(v);
     });
     return () => {
-      h == null || h.unsubscribe(), S == null || S.unsubscribe(), g == null || g.unsubscribe();
+      h == null || h.unsubscribe(), S == null || S.unsubscribe(), D == null || D.unsubscribe();
     };
   }, []);
   function b() {
@@ -1300,8 +1304,8 @@ function $u() {
     const h = A.parentNode;
     if (!h)
       return;
-    const g = h.getBoundingClientRect().top, M = h.offsetHeight, q = A.getBoundingClientRect(), x = q.top, U = q.height;
-    if (x >= 0 && x > g && x - g + U <= M)
+    const D = h.getBoundingClientRect().top, M = h.offsetHeight, v = A.getBoundingClientRect(), g = v.top, U = v.height;
+    if (g >= 0 && g > D && g - D + U <= M)
       return;
     const I = A.offsetTop - (M - U) / 2;
     h.scrollTo({
@@ -1309,7 +1313,7 @@ function $u() {
       behavior: "smooth"
     });
   }
-  return o.length > 0 && /* @__PURE__ */ C.jsx(La, { visible: a, offset: i, children: /* @__PURE__ */ C.jsx("ul", { className: Te.formulaSearchFunction, ref: d, children: o.map((T, A) => /* @__PURE__ */ C.jsxs(
+  return o.length > 0 && /* @__PURE__ */ C.jsx(pa, { visible: a, offset: i, children: /* @__PURE__ */ C.jsx("ul", { className: Te.formulaSearchFunction, ref: d, children: o.map((T, A) => /* @__PURE__ */ C.jsxs(
     "li",
     {
       className: t === A ? `${Te.formulaSearchFunctionItem} ${Te.formulaSearchFunctionItemActive}` : Te.formulaSearchFunctionItem,
@@ -1327,17 +1331,17 @@ function $u() {
     A
   )) }) });
 }
-function ju() {
+function Zu() {
   return /* @__PURE__ */ C.jsxs(C.Fragment, { children: [
-    /* @__PURE__ */ C.jsx($u, {}),
-    /* @__PURE__ */ C.jsx(Hu, {})
+    /* @__PURE__ */ C.jsx(zu, {}),
+    /* @__PURE__ */ C.jsx(Xu, {})
   ] });
 }
-const Qu = "univer-formula-more-functions", zu = "univer-formula-more-functions-operation", yn = {
-  formulaMoreFunctions: Qu,
-  formulaMoreFunctionsOperation: zu
+const Ju = "univer-formula-more-functions", eo = "univer-formula-more-functions-operation", qn = {
+  formulaMoreFunctions: Ju,
+  formulaMoreFunctionsOperation: eo
 };
-function Da(a) {
+function Ma(a) {
   const { prefix: e, value: t } = a;
   return /* @__PURE__ */ C.jsxs("div", { children: [
     /* @__PURE__ */ C.jsxs("span", { children: [
@@ -1345,50 +1349,50 @@ function Da(a) {
       "("
     ] }),
     t && t.map((n, i) => /* @__PURE__ */ C.jsxs("span", { children: [
-      /* @__PURE__ */ C.jsx("span", { children: Ma(n) }),
+      /* @__PURE__ */ C.jsx("span", { children: Oa(n) }),
       i === t.length - 1 ? "" : ","
     ] }, i)),
     ")"
   ] });
 }
-const Zu = "univer-formula-function-params", Ju = "univer-formula-function-params-title", eo = "univer-formula-function-params-detail", wt = {
-  formulaFunctionParams: Zu,
-  formulaFunctionParamsTitle: Ju,
-  formulaFunctionParamsDetail: eo
+const to = "univer-formula-function-params", no = "univer-formula-function-params-title", ao = "univer-formula-function-params-detail", wt = {
+  formulaFunctionParams: to,
+  formulaFunctionParamsTitle: no,
+  formulaFunctionParamsDetail: ao
 };
-function Ge(a) {
+function Xe(a) {
   const { className: e, value: t, title: n } = a;
   return /* @__PURE__ */ C.jsxs("div", { className: wt.formulaFunctionParams, children: [
     /* @__PURE__ */ C.jsx("div", { className: `${wt.formulaFunctionParamsTitle} ${e}`, children: n }),
     /* @__PURE__ */ C.jsx("div", { className: wt.formulaFunctionParamsDetail, children: t })
   ] });
 }
-const to = "univer-formula-input-params-list", no = "univer-formula-input-params-list-item-name", ao = "univer-formula-input-params-list-item-selector", He = {
-  formulaInputParamsList: to,
-  formulaInputParamsListItemName: no,
-  formulaInputParamsListItemSelector: ao
+const io = "univer-formula-input-params-list", ro = "univer-formula-input-params-list-item-name", uo = "univer-formula-input-params-list-item-selector", we = {
+  formulaInputParamsList: io,
+  formulaInputParamsListItemName: ro,
+  formulaInputParamsListItemSelector: uo
 };
-function io(a) {
+function oo(a) {
   const { functionInfo: e, onChange: t } = a;
   if (!e)
     return null;
   X([]);
   const [n, i] = X(e.functionParameter), [u, o] = X(-1);
-  return /* @__PURE__ */ C.jsxs("div", { className: He.formulaInputParams, children: [
-    /* @__PURE__ */ C.jsx("div", { className: He.formulaInputParamsList, children: n.map((m, c) => /* @__PURE__ */ C.jsxs("div", { children: [
-      /* @__PURE__ */ C.jsx("div", { className: He.formulaInputParamsListItemName, children: m.name }),
-      /* @__PURE__ */ C.jsx("div", { className: He.formulaInputParamsListItemSelector })
+  return /* @__PURE__ */ C.jsxs("div", { className: we.formulaInputParams, children: [
+    /* @__PURE__ */ C.jsx("div", { className: we.formulaInputParamsList, children: n.map((m, c) => /* @__PURE__ */ C.jsxs("div", { children: [
+      /* @__PURE__ */ C.jsx("div", { className: we.formulaInputParamsListItemName, children: m.name }),
+      /* @__PURE__ */ C.jsx("div", { className: we.formulaInputParamsListItemSelector })
     ] }, c)) }),
-    /* @__PURE__ */ C.jsx("div", { className: He.formulaInputParamsInfo, children: /* @__PURE__ */ C.jsx(
-      Ge,
+    /* @__PURE__ */ C.jsx("div", { className: we.formulaInputParamsInfo, children: /* @__PURE__ */ C.jsx(
+      Xe,
       {
-        title: u === -1 ? /* @__PURE__ */ C.jsx(Da, { prefix: e.functionName, value: n }) : n[u].name,
+        title: u === -1 ? /* @__PURE__ */ C.jsx(Ma, { prefix: e.functionName, value: n }) : n[u].name,
         value: u === -1 ? e.description : n[u].detail
       }
     ) })
   ] });
 }
-const ro = [], uo = [
+const mo = [], co = [
   {
     functionName: B.BETADIST,
     functionType: r.Compatibility,
@@ -2225,9 +2229,9 @@ const ro = [], uo = [
       }
     ]
   }
-], oo = [
+], fo = [
   {
-    functionName: Ie.CUBEKPIMEMBER,
+    functionName: Ne.CUBEKPIMEMBER,
     functionType: r.Cube,
     description: "formula.functionList.CUBEKPIMEMBER.description",
     abstract: "formula.functionList.CUBEKPIMEMBER.abstract",
@@ -2249,7 +2253,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: Ie.CUBEMEMBER,
+    functionName: Ne.CUBEMEMBER,
     functionType: r.Cube,
     description: "formula.functionList.CUBEMEMBER.description",
     abstract: "formula.functionList.CUBEMEMBER.abstract",
@@ -2271,7 +2275,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: Ie.CUBEMEMBERPROPERTY,
+    functionName: Ne.CUBEMEMBERPROPERTY,
     functionType: r.Cube,
     description: "formula.functionList.CUBEMEMBERPROPERTY.description",
     abstract: "formula.functionList.CUBEMEMBERPROPERTY.abstract",
@@ -2293,7 +2297,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: Ie.CUBERANKEDMEMBER,
+    functionName: Ne.CUBERANKEDMEMBER,
     functionType: r.Cube,
     description: "formula.functionList.CUBERANKEDMEMBER.description",
     abstract: "formula.functionList.CUBERANKEDMEMBER.abstract",
@@ -2315,7 +2319,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: Ie.CUBESET,
+    functionName: Ne.CUBESET,
     functionType: r.Cube,
     description: "formula.functionList.CUBESET.description",
     abstract: "formula.functionList.CUBESET.abstract",
@@ -2337,7 +2341,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: Ie.CUBESETCOUNT,
+    functionName: Ne.CUBESETCOUNT,
     functionType: r.Cube,
     description: "formula.functionList.CUBESETCOUNT.description",
     abstract: "formula.functionList.CUBESETCOUNT.abstract",
@@ -2359,7 +2363,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: Ie.CUBEVALUE,
+    functionName: Ne.CUBEVALUE,
     functionType: r.Cube,
     description: "formula.functionList.CUBEVALUE.description",
     abstract: "formula.functionList.CUBEVALUE.abstract",
@@ -2380,7 +2384,7 @@ const ro = [], uo = [
       }
     ]
   }
-], mo = [
+], so = [
   {
     functionName: ae.DAVERAGE,
     functionType: r.Database,
@@ -2645,7 +2649,7 @@ const ro = [], uo = [
       }
     ]
   }
-], co = [
+], lo = [
   {
     functionName: G.DATE,
     functionType: r.Date,
@@ -3167,7 +3171,7 @@ const ro = [], uo = [
       }
     ]
   }
-], fo = [
+], po = [
   {
     functionName: O.BESSELI,
     functionType: r.Engineering,
@@ -4356,7 +4360,7 @@ const ro = [], uo = [
       }
     ]
   }
-], so = [
+], Lo = [
   {
     functionName: _.ACCRINT,
     functionType: r.Financial,
@@ -5567,7 +5571,7 @@ const ro = [], uo = [
       }
     ]
   }
-], lo = [
+], Ao = [
   {
     functionName: $.CELL,
     functionType: r.Information,
@@ -5953,7 +5957,7 @@ const ro = [], uo = [
       }
     ]
   }
-], po = [
+], Po = [
   {
     functionName: z.AND,
     functionType: r.Logical,
@@ -6387,7 +6391,7 @@ const ro = [], uo = [
       }
     ]
   }
-], Lo = [
+], bo = [
   {
     functionName: V.ADDRESS,
     functionType: r.Lookup,
@@ -7314,7 +7318,7 @@ const ro = [], uo = [
       }
     ]
   }
-], Ao = [
+], To = [
   {
     functionName: N.ABS,
     functionType: r.Math,
@@ -9128,7 +9132,7 @@ const ro = [], uo = [
       }
     ]
   }
-], Po = [
+], Eo = [
   {
     functionName: P.AVEDEV,
     functionType: r.Statistical,
@@ -11597,9 +11601,9 @@ const ro = [], uo = [
       }
     ]
   }
-], bo = [
+], So = [
   {
-    functionName: v.ASC,
+    functionName: x.ASC,
     functionType: r.Text,
     description: "formula.functionList.ASC.description",
     abstract: "formula.functionList.ASC.abstract",
@@ -11621,7 +11625,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.ARRAYTOTEXT,
+    functionName: x.ARRAYTOTEXT,
     functionType: r.Text,
     description: "formula.functionList.ARRAYTOTEXT.description",
     abstract: "formula.functionList.ARRAYTOTEXT.abstract",
@@ -11643,7 +11647,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.BAHTTEXT,
+    functionName: x.BAHTTEXT,
     functionType: r.Text,
     description: "formula.functionList.BAHTTEXT.description",
     abstract: "formula.functionList.BAHTTEXT.abstract",
@@ -11665,7 +11669,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.CHAR,
+    functionName: x.CHAR,
     functionType: r.Text,
     description: "formula.functionList.CHAR.description",
     abstract: "formula.functionList.CHAR.abstract",
@@ -11687,7 +11691,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.CLEAN,
+    functionName: x.CLEAN,
     functionType: r.Text,
     description: "formula.functionList.CLEAN.description",
     abstract: "formula.functionList.CLEAN.abstract",
@@ -11709,7 +11713,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.CODE,
+    functionName: x.CODE,
     functionType: r.Text,
     description: "formula.functionList.CODE.description",
     abstract: "formula.functionList.CODE.abstract",
@@ -11731,7 +11735,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.CONCAT,
+    functionName: x.CONCAT,
     functionType: r.Text,
     description: "formula.functionList.CONCAT.description",
     abstract: "formula.functionList.CONCAT.abstract",
@@ -11753,7 +11757,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.CONCATENATE,
+    functionName: x.CONCATENATE,
     functionType: r.Text,
     description: "formula.functionList.CONCATENATE.description",
     abstract: "formula.functionList.CONCATENATE.abstract",
@@ -11775,7 +11779,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.DBCS,
+    functionName: x.DBCS,
     functionType: r.Text,
     description: "formula.functionList.DBCS.description",
     abstract: "formula.functionList.DBCS.abstract",
@@ -11797,7 +11801,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.DOLLAR,
+    functionName: x.DOLLAR,
     functionType: r.Text,
     description: "formula.functionList.DOLLAR.description",
     abstract: "formula.functionList.DOLLAR.abstract",
@@ -11819,7 +11823,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.EXACT,
+    functionName: x.EXACT,
     functionType: r.Text,
     description: "formula.functionList.EXACT.description",
     abstract: "formula.functionList.EXACT.abstract",
@@ -11841,7 +11845,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.FIND,
+    functionName: x.FIND,
     functionType: r.Text,
     description: "formula.functionList.FIND.description",
     abstract: "formula.functionList.FIND.abstract",
@@ -11863,7 +11867,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.FINDB,
+    functionName: x.FINDB,
     functionType: r.Text,
     description: "formula.functionList.FINDB.description",
     abstract: "formula.functionList.FINDB.abstract",
@@ -11885,7 +11889,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.FIXED,
+    functionName: x.FIXED,
     functionType: r.Text,
     description: "formula.functionList.FIXED.description",
     abstract: "formula.functionList.FIXED.abstract",
@@ -11907,7 +11911,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.LEFT,
+    functionName: x.LEFT,
     functionType: r.Text,
     description: "formula.functionList.LEFT.description",
     abstract: "formula.functionList.LEFT.abstract",
@@ -11929,7 +11933,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.LEFTB,
+    functionName: x.LEFTB,
     functionType: r.Text,
     description: "formula.functionList.LEFTB.description",
     abstract: "formula.functionList.LEFTB.abstract",
@@ -11951,7 +11955,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.LEN,
+    functionName: x.LEN,
     functionType: r.Text,
     description: "formula.functionList.LEN.description",
     abstract: "formula.functionList.LEN.abstract",
@@ -11966,7 +11970,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.LENB,
+    functionName: x.LENB,
     functionType: r.Text,
     description: "formula.functionList.LENB.description",
     abstract: "formula.functionList.LENB.abstract",
@@ -11981,7 +11985,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.LOWER,
+    functionName: x.LOWER,
     functionType: r.Text,
     description: "formula.functionList.LOWER.description",
     abstract: "formula.functionList.LOWER.abstract",
@@ -11996,7 +12000,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.MID,
+    functionName: x.MID,
     functionType: r.Text,
     description: "formula.functionList.MID.description",
     abstract: "formula.functionList.MID.abstract",
@@ -12018,7 +12022,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.MIDB,
+    functionName: x.MIDB,
     functionType: r.Text,
     description: "formula.functionList.MIDB.description",
     abstract: "formula.functionList.MIDB.abstract",
@@ -12040,7 +12044,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.NUMBERVALUE,
+    functionName: x.NUMBERVALUE,
     functionType: r.Text,
     description: "formula.functionList.NUMBERVALUE.description",
     abstract: "formula.functionList.NUMBERVALUE.abstract",
@@ -12062,7 +12066,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.PHONETIC,
+    functionName: x.PHONETIC,
     functionType: r.Text,
     description: "formula.functionList.PHONETIC.description",
     abstract: "formula.functionList.PHONETIC.abstract",
@@ -12084,7 +12088,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.PROPER,
+    functionName: x.PROPER,
     functionType: r.Text,
     description: "formula.functionList.PROPER.description",
     abstract: "formula.functionList.PROPER.abstract",
@@ -12106,7 +12110,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.REPLACE,
+    functionName: x.REPLACE,
     functionType: r.Text,
     description: "formula.functionList.REPLACE.description",
     abstract: "formula.functionList.REPLACE.abstract",
@@ -12128,7 +12132,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.REPLACEB,
+    functionName: x.REPLACEB,
     functionType: r.Text,
     description: "formula.functionList.REPLACEB.description",
     abstract: "formula.functionList.REPLACEB.abstract",
@@ -12150,7 +12154,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.REPT,
+    functionName: x.REPT,
     functionType: r.Text,
     description: "formula.functionList.REPT.description",
     abstract: "formula.functionList.REPT.abstract",
@@ -12172,7 +12176,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.RIGHT,
+    functionName: x.RIGHT,
     functionType: r.Text,
     description: "formula.functionList.RIGHT.description",
     abstract: "formula.functionList.RIGHT.abstract",
@@ -12194,7 +12198,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.RIGHTB,
+    functionName: x.RIGHTB,
     functionType: r.Text,
     description: "formula.functionList.RIGHTB.description",
     abstract: "formula.functionList.RIGHTB.abstract",
@@ -12216,7 +12220,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.SEARCH,
+    functionName: x.SEARCH,
     functionType: r.Text,
     description: "formula.functionList.SEARCH.description",
     abstract: "formula.functionList.SEARCH.abstract",
@@ -12238,7 +12242,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.SEARCHB,
+    functionName: x.SEARCHB,
     functionType: r.Text,
     description: "formula.functionList.SEARCHB.description",
     abstract: "formula.functionList.SEARCHB.abstract",
@@ -12260,7 +12264,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.SUBSTITUTE,
+    functionName: x.SUBSTITUTE,
     functionType: r.Text,
     description: "formula.functionList.SUBSTITUTE.description",
     abstract: "formula.functionList.SUBSTITUTE.abstract",
@@ -12282,7 +12286,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.T,
+    functionName: x.T,
     functionType: r.Text,
     description: "formula.functionList.T.description",
     abstract: "formula.functionList.T.abstract",
@@ -12304,7 +12308,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.TEXT,
+    functionName: x.TEXT,
     functionType: r.Text,
     description: "formula.functionList.TEXT.description",
     abstract: "formula.functionList.TEXT.abstract",
@@ -12326,7 +12330,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.TEXTAFTER,
+    functionName: x.TEXTAFTER,
     functionType: r.Text,
     description: "formula.functionList.TEXTAFTER.description",
     abstract: "formula.functionList.TEXTAFTER.abstract",
@@ -12348,7 +12352,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.TEXTBEFORE,
+    functionName: x.TEXTBEFORE,
     functionType: r.Text,
     description: "formula.functionList.TEXTBEFORE.description",
     abstract: "formula.functionList.TEXTBEFORE.abstract",
@@ -12370,7 +12374,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.TEXTJOIN,
+    functionName: x.TEXTJOIN,
     functionType: r.Text,
     description: "formula.functionList.TEXTJOIN.description",
     abstract: "formula.functionList.TEXTJOIN.abstract",
@@ -12392,7 +12396,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.TEXTSPLIT,
+    functionName: x.TEXTSPLIT,
     functionType: r.Text,
     description: "formula.functionList.TEXTSPLIT.description",
     abstract: "formula.functionList.TEXTSPLIT.abstract",
@@ -12414,7 +12418,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.TRIM,
+    functionName: x.TRIM,
     functionType: r.Text,
     description: "formula.functionList.TRIM.description",
     abstract: "formula.functionList.TRIM.abstract",
@@ -12436,7 +12440,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.UNICHAR,
+    functionName: x.UNICHAR,
     functionType: r.Text,
     description: "formula.functionList.UNICHAR.description",
     abstract: "formula.functionList.UNICHAR.abstract",
@@ -12458,7 +12462,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.UNICODE,
+    functionName: x.UNICODE,
     functionType: r.Text,
     description: "formula.functionList.UNICODE.description",
     abstract: "formula.functionList.UNICODE.abstract",
@@ -12480,7 +12484,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.UPPER,
+    functionName: x.UPPER,
     functionType: r.Text,
     description: "formula.functionList.UPPER.description",
     abstract: "formula.functionList.UPPER.abstract",
@@ -12502,7 +12506,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.VALUE,
+    functionName: x.VALUE,
     functionType: r.Text,
     description: "formula.functionList.VALUE.description",
     abstract: "formula.functionList.VALUE.abstract",
@@ -12524,7 +12528,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.VALUETOTEXT,
+    functionName: x.VALUETOTEXT,
     functionType: r.Text,
     description: "formula.functionList.VALUETOTEXT.description",
     abstract: "formula.functionList.VALUETOTEXT.abstract",
@@ -12546,7 +12550,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.CALL,
+    functionName: x.CALL,
     functionType: r.Text,
     description: "formula.functionList.CALL.description",
     abstract: "formula.functionList.CALL.abstract",
@@ -12568,7 +12572,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.EUROCONVERT,
+    functionName: x.EUROCONVERT,
     functionType: r.Text,
     description: "formula.functionList.EUROCONVERT.description",
     abstract: "formula.functionList.EUROCONVERT.abstract",
@@ -12590,7 +12594,7 @@ const ro = [], uo = [
     ]
   },
   {
-    functionName: v.REGISTER_ID,
+    functionName: x.REGISTER_ID,
     functionType: r.Text,
     description: "formula.functionList.REGISTER_ID.description",
     abstract: "formula.functionList.REGISTER_ID.abstract",
@@ -12611,7 +12615,7 @@ const ro = [], uo = [
       }
     ]
   }
-], To = [], Eo = [
+], Io = [], No = [
   {
     functionName: yt.ENCODEURL,
     functionType: r.Web,
@@ -12678,32 +12682,32 @@ const ro = [], uo = [
       }
     ]
   }
-], So = [
-  ...so,
-  ...co,
-  ...Ao,
-  ...Po,
+], Ro = [
   ...Lo,
-  ...mo,
+  ...lo,
+  ...To,
+  ...Eo,
   ...bo,
+  ...so,
+  ...So,
+  ...Po,
+  ...Ao,
   ...po,
-  ...lo,
   ...fo,
-  ...oo,
-  ...uo,
-  ...Eo,
-  ...ro,
-  ...To
+  ...co,
+  ...No,
+  ...mo,
+  ...Io
 ];
-var Io = Object.defineProperty, No = Object.getOwnPropertyDescriptor, Ro = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? No(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var Co = Object.defineProperty, ho = Object.getOwnPropertyDescriptor, _o = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? ho(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 && Io(e, t, i), i;
-}, Fn = (a, e) => (t, n) => e(t, n, a);
-const Je = Mt("formula-ui.description-service");
+  return n && i && Co(e, t, i), i;
+}, yn = (a, e) => (t, n) => e(t, n, a);
+const et = Mt("formula-ui.description-service");
 let Zt = class {
   constructor(a = [], e, t) {
-    D(this, "_descriptions", []);
+    q(this, "_descriptions", []);
     this._description = a, this._functionService = e, this._localeService = t, this._initialize();
   }
   dispose() {
@@ -12759,7 +12763,7 @@ let Zt = class {
     if (e.length === 0)
       return !1;
     const t = e[0].description;
-    return !za(t);
+    return !Ja(t);
   }
   _initialize() {
     this._localeService.localeChanged$.subscribe(() => {
@@ -12768,8 +12772,6 @@ let Zt = class {
   }
   _initDescription() {
     const a = [
-      ...Za,
-      ...Ja,
       ...ei,
       ...ti,
       ...ni,
@@ -12783,13 +12785,15 @@ let Zt = class {
       ...fi,
       ...si,
       ...li,
-      ...di
-    ].map((t) => t[1]), e = So.filter((t) => a.includes(t.functionName));
+      ...di,
+      ...pi,
+      ...Li
+    ].map((t) => t[1]), e = Ro.filter((t) => a.includes(t.functionName));
     this._descriptions = e.concat(this._description);
   }
   _registerDescriptions() {
     const a = this._localeService, e = this._descriptions.map((t) => ({
-      functionName: Ru(t, a),
+      functionName: _u(t, a),
       functionType: t.functionType,
       description: a.t(t.description),
       abstract: a.t(t.abstract),
@@ -12804,36 +12808,36 @@ let Zt = class {
     this._functionService.registerDescriptions(...e);
   }
 };
-Zt = Ro([
-  Fn(1, Kn),
-  Fn(2, y(ge))
+Zt = _o([
+  yn(1, Yn),
+  yn(2, y(xe))
 ], Zt);
-const Co = "univer-formula-select-function-select", ho = "univer-formula-select-function-result", _o = "univer-formula-select-function-result-item", Oo = "univer-formula-select-function-result-item-name-light", Mo = "univer-formula-select-function-result-item-selected", Do = "univer-formula-select-function-result-item-active", go = "univer-formula-select-function-content", Ae = {
-  formulaSelectFunctionSelect: Co,
-  formulaSelectFunctionResult: ho,
-  formulaSelectFunctionResultItem: _o,
-  formulaSelectFunctionResultItemNameLight: Oo,
-  formulaSelectFunctionResultItemSelected: Mo,
-  formulaSelectFunctionResultItemActive: Do,
-  formulaSelectFunctionContent: go
+const Oo = "univer-formula-select-function-select", Mo = "univer-formula-select-function-result", Do = "univer-formula-select-function-result-item", go = "univer-formula-select-function-result-item-name-light", xo = "univer-formula-select-function-result-item-selected", vo = "univer-formula-select-function-result-item-active", qo = "univer-formula-select-function-content", Ae = {
+  formulaSelectFunctionSelect: Oo,
+  formulaSelectFunctionResult: Mo,
+  formulaSelectFunctionResultItem: Do,
+  formulaSelectFunctionResultItemNameLight: go,
+  formulaSelectFunctionResultItemSelected: xo,
+  formulaSelectFunctionResultItemActive: vo,
+  formulaSelectFunctionContent: qo
 };
-function xo(a) {
-  const { onChange: e } = a, t = "-1", [n, i] = X(""), [u, o] = X([]), [m, c] = X(0), [f, d] = X(t), [s, l] = X(0), [L, b] = X(null), E = me(Je), p = me(ge), R = Nu(r, p);
+function yo(a) {
+  const { onChange: e } = a, t = "-1", [n, i] = X(""), [u, o] = X([]), [m, c] = X(0), [f, d] = X(t), [s, l] = X(0), [L, b] = X(null), E = me(et), p = me(xe), R = hu(r, p);
   R.unshift({
     label: p.t("formula.moreFunctions.allFunctions"),
     value: t
   });
   const T = p.t("formula.prompt.required"), A = p.t("formula.prompt.optional");
-  Ct(() => {
-    g(t);
-  }, []), Ct(() => {
+  Rt(() => {
+    D(t);
+  }, []), Rt(() => {
     S(0);
   }, [u]);
   const h = (I) => {
     if (n.trim() === "")
       return I;
     const F = new RegExp(`(${n.toLocaleUpperCase()})`);
-    return I.split(F).filter(Boolean).map((oe, Se) => oe.match(F) ? /* @__PURE__ */ C.jsx("span", { className: Ae.formulaSelectFunctionResultItemNameLight, children: oe }, Se) : oe);
+    return I.split(F).filter(Boolean).map((oe, Ie) => oe.match(F) ? /* @__PURE__ */ C.jsx("span", { className: Ae.formulaSelectFunctionResultItemNameLight, children: oe }, Ie) : oe);
   }, S = (I) => {
     if (u.length === 0) {
       b(null);
@@ -12847,7 +12851,7 @@ function xo(a) {
     }
     b(F), e(F);
   };
-  function g(I) {
+  function D(I) {
     d(I);
     const F = E.getSearchListByType(+I);
     o(F);
@@ -12857,7 +12861,7 @@ function xo(a) {
     const F = E.getSearchListByName(I);
     o(F);
   }
-  function q(I) {
+  function v(I) {
     if (I.stopPropagation(), I.key === "ArrowDown") {
       const F = m + 1;
       c(F === u.length ? 0 : F);
@@ -12867,19 +12871,19 @@ function xo(a) {
     } else
       I.key === "Enter" && S(m);
   }
-  const x = (I) => {
+  const g = (I) => {
     c(I);
   }, U = () => {
     c(-1);
   };
   return /* @__PURE__ */ C.jsxs("div", { children: [
     /* @__PURE__ */ C.jsxs("div", { className: Ae.formulaSelectFunctionSelect, children: [
-      /* @__PURE__ */ C.jsx(Mr, { value: f, options: R, onChange: g }),
+      /* @__PURE__ */ C.jsx(xr, { value: f, options: R, onChange: D }),
       /* @__PURE__ */ C.jsx(
-        Dr,
+        vr,
         {
           placeholder: p.t("formula.moreFunctions.searchFunctionPlaceholder"),
-          onKeyDown: q,
+          onKeyDown: v,
           value: n,
           onChange: M,
           size: "large",
@@ -12887,38 +12891,38 @@ function xo(a) {
         }
       )
     ] }),
-    /* @__PURE__ */ C.jsx("ul", { className: Ae.formulaSelectFunctionResult, onKeyDown: q, tabIndex: -1, children: u.map(({ name: I }, F) => /* @__PURE__ */ C.jsxs(
+    /* @__PURE__ */ C.jsx("ul", { className: Ae.formulaSelectFunctionResult, onKeyDown: v, tabIndex: -1, children: u.map(({ name: I }, F) => /* @__PURE__ */ C.jsxs(
       "li",
       {
         className: m === F ? `${Ae.formulaSelectFunctionResultItem} ${Ae.formulaSelectFunctionResultItemActive}` : Ae.formulaSelectFunctionResultItem,
-        onMouseEnter: () => x(F),
+        onMouseEnter: () => g(F),
         onMouseLeave: U,
         onClick: () => S(F),
         children: [
-          s === F && /* @__PURE__ */ C.jsx(Au, { className: Ae.formulaSelectFunctionResultItemSelected }),
+          s === F && /* @__PURE__ */ C.jsx(Tu, { className: Ae.formulaSelectFunctionResultItemSelected }),
           /* @__PURE__ */ C.jsx("span", { className: Ae.formulaSelectFunctionResultItemName, children: h(I) })
         ]
       },
       F
     )) }),
     L && /* @__PURE__ */ C.jsxs("div", { className: Ae.formulaSelectFunctionContent, children: [
-      /* @__PURE__ */ C.jsx(Ge, { title: L.functionName, value: L.description }),
+      /* @__PURE__ */ C.jsx(Xe, { title: L.functionName, value: L.description }),
       /* @__PURE__ */ C.jsx(
-        Ge,
+        Xe,
         {
           title: p.t("formula.moreFunctions.syntax"),
-          value: /* @__PURE__ */ C.jsx(Da, { prefix: L.functionName, value: L.functionParameter })
+          value: /* @__PURE__ */ C.jsx(Ma, { prefix: L.functionName, value: L.functionParameter })
         }
       ),
       /* @__PURE__ */ C.jsx(
-        Ge,
+        Xe,
         {
           title: p.t("formula.prompt.helpExample"),
           value: `${L.functionName}(${L.functionParameter.map((I) => I.example).join(",")})`
         }
       ),
       L.functionParameter && L.functionParameter.map((I, F) => /* @__PURE__ */ C.jsx(
-        Ge,
+        Xe,
         {
           title: I.name,
           value: `${I.require ? T : A} ${I.detail}`
@@ -12928,19 +12932,19 @@ function xo(a) {
     ] })
   ] });
 }
-function vo() {
-  const a = ar(), [e, t] = X(!0), [n, i] = X(!1), [u, o] = X(null), m = me(ge), c = me(je);
+function Fo() {
+  const a = ur(), [e, t] = X(!0), [n, i] = X(!1), [u, o] = X(null), m = me(xe), c = me(Qe);
   function f() {
     t(!e), i(!n);
   }
   function d() {
     c.setFormula(`=${u == null ? void 0 : u.functionName}(`);
   }
-  return /* @__PURE__ */ C.jsxs("div", { className: yn.formulaMoreFunctions, children: [
-    e && /* @__PURE__ */ C.jsx(xo, { onChange: o }),
-    n && /* @__PURE__ */ C.jsx(io, { functionInfo: u, onChange: () => {
+  return /* @__PURE__ */ C.jsxs("div", { className: qn.formulaMoreFunctions, children: [
+    e && /* @__PURE__ */ C.jsx(yo, { onChange: o }),
+    n && /* @__PURE__ */ C.jsx(oo, { functionInfo: u, onChange: () => {
     } }),
-    /* @__PURE__ */ C.jsxs("div", { className: yn.formulaMoreFunctionsOperation, children: [
+    /* @__PURE__ */ C.jsxs("div", { className: qn.formulaMoreFunctionsOperation, children: [
       n && /* @__PURE__ */ C.jsx(Vt, { type: "primary", size: "small", onClick: f, children: m.t("formula.moreFunctions.next") }),
       n && /* @__PURE__ */ C.jsx(Vt, { size: "small", onClick: f, children: m.t("formula.moreFunctions.prev") }),
       e && !!a && /* @__PURE__ */ C.jsx(Vt, { type: "primary", size: "small", onClick: d, children: m.t("formula.moreFunctions.confirm") })
@@ -12954,14 +12958,14 @@ const At = {
     return !0;
   }
 };
-function qo(a) {
+function Uo(a) {
   return {
-    id: dn.id,
+    id: ln.id,
     icon: "FunctionSingle",
     tooltip: "formula.insert.tooltip",
-    group: sr.TOOLBAR_FORMULAS_INSERT,
-    type: ln.SELECTOR,
-    positions: [lr.TOOLBAR_START],
+    group: pr.TOOLBAR_FORMULAS_INSERT,
+    type: sn.SELECTOR,
+    positions: [Lr.TOOLBAR_START],
     selections: [
       {
         label: "SUM",
@@ -12989,53 +12993,56 @@ function qo(a) {
         icon: "MinSingle"
       }
     ],
-    hidden$: dr(a, Y.UNIVER_SHEET),
-    disabled$: da(a, { workbookTypes: [kn], worksheetTypes: [$n, jn], rangeTypes: [Qn] })
+    hidden$: Ar(a, Y.UNIVER_SHEET),
+    disabled$: la(a, { workbookTypes: [Wn], worksheetTypes: [Kn, kn], rangeTypes: [$n] })
   };
 }
-function yo(a) {
+function Bo(a) {
   return {
-    id: Sa.id,
+    id: Ea.id,
     title: "formula.insert.more",
-    positions: dn.id,
-    type: ln.BUTTON
+    positions: ln.id,
+    type: sn.BUTTON
   };
 }
-function Fo(a) {
-  return new Cr((t) => t.next(!a.get(pr).supportClipboard));
+function Vo(a) {
+  return new Or((t) => t.next(!a.get(Pr).supportClipboard));
 }
-function Uo(a) {
+function Ho(a) {
   return {
-    id: ba.id,
-    type: ln.BUTTON,
+    id: Pa.id,
+    type: sn.BUTTON,
     title: "formula.operation.pasteFormula",
-    positions: [ir],
-    disabled$: Fo(a).pipe(
-      Rr(da(a, { workbookTypes: [kn], rangeTypes: [Qn], worksheetTypes: [jn, $n] })),
-      Ye(([e, t]) => e || t)
+    positions: [or],
+    disabled$: Vo(a).pipe(
+      _r(la(a, { workbookTypes: [Wn], rangeTypes: [$n], worksheetTypes: [kn, Kn] })),
+      We(([e, t]) => e || t)
     )
   };
 }
-const ga = "meta_key_ctrl_And_Shift";
-function Bo(a) {
-  return a.getContextValue(Ga) && a.getContextValue(Xa) && a.getContextValue(Ya);
+const Da = "meta_key_ctrl_And_Shift";
+function wo(a) {
+  return a.getContextValue(Xa) && a.getContextValue(Ya) && a.getContextValue(Wa);
 }
-function xa(a) {
-  return typeof (a == null ? void 0 : a.v) == "string" && (De(a.f) || Fe(a.si)) && pi.has(a.v) ? a.v : null;
+function ga(a) {
+  return (Ee(a == null ? void 0 : a.f) || ge(a == null ? void 0 : a.si)) && typeof (a == null ? void 0 : a.v) == "string" && Ai.has(a.v) ? a.v : null;
+}
+function Go(a) {
+  return (Ee(a == null ? void 0 : a.f) || ge(a == null ? void 0 : a.si)) && (a == null ? void 0 : a.t) === Ue.NUMBER && typeof (a == null ? void 0 : a.v) == "number" ? Gn(a.v) : null;
 }
 const xt = [
   H.ARROW_DOWN,
   H.ARROW_UP,
   H.ARROW_LEFT,
   H.ARROW_RIGHT
-], Vo = [...xt, H.ENTER, H.TAB, H.ESC];
-function Ho() {
+], Xo = [...xt, H.ENTER, H.TAB, H.ESC];
+function Yo() {
   const a = [];
-  for (const e of Vo)
+  for (const e of Xo)
     a.push({
-      id: xe.id,
+      id: ve.id,
       binding: e,
-      preconditions: (t) => $e(t),
+      preconditions: (t) => je(t),
       staticParameters: {
         eventType: se.Keyboard,
         keycode: e
@@ -13043,63 +13050,63 @@ function Ho() {
     });
   return a;
 }
-function wo() {
+function Wo() {
   const a = [];
   for (const e of xt)
     a.push({
-      id: xe.id,
-      binding: e | Ee.SHIFT,
-      preconditions: (t) => $e(t),
+      id: ve.id,
+      binding: e | Se.SHIFT,
+      preconditions: (t) => je(t),
       staticParameters: {
         eventType: se.Keyboard,
         keycode: e,
-        metaKey: Ee.SHIFT
+        metaKey: Se.SHIFT
       }
     });
   return a;
 }
-function Go() {
+function Ko() {
   const a = [];
   for (const e of xt)
     a.push({
-      id: xe.id,
-      binding: e | Ee.CTRL_COMMAND,
-      preconditions: (t) => $e(t),
+      id: ve.id,
+      binding: e | Se.CTRL_COMMAND,
+      preconditions: (t) => je(t),
       staticParameters: {
         eventType: se.Keyboard,
         keycode: e,
-        metaKey: Ee.CTRL_COMMAND
+        metaKey: Se.CTRL_COMMAND
       }
     });
   return a;
 }
-function Xo() {
+function ko() {
   const a = [];
   for (const e of xt)
     a.push({
-      id: xe.id,
-      binding: e | Ee.SHIFT | Ee.CTRL_COMMAND,
-      preconditions: (t) => $e(t),
+      id: ve.id,
+      binding: e | Se.SHIFT | Se.CTRL_COMMAND,
+      preconditions: (t) => je(t),
       staticParameters: {
         eventType: se.Keyboard,
         keycode: e,
-        metaKey: ga
+        metaKey: Da
       }
     });
   return a;
 }
-const Yo = {
-  id: pn.id,
+const $o = {
+  id: dn.id,
   binding: H.F4,
-  preconditions: (a) => $e(a)
+  preconditions: (a) => je(a)
 };
-function Wo() {
+function jo() {
   const a = [];
   for (const e of [H.ENTER, H.TAB, H.ARROW_DOWN, H.ARROW_UP])
     a.push({
-      id: xe.id,
+      id: ve.id,
       binding: e,
-      preconditions: (t) => Bo(t),
+      preconditions: (t) => wo(t),
       staticParameters: {
         eventType: se.Keyboard,
         keycode: e,
@@ -13108,13 +13115,13 @@ function Wo() {
     });
   return a;
 }
-var Ko = Object.defineProperty, ko = Object.getOwnPropertyDescriptor, $o = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? ko(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var Qo = Object.defineProperty, zo = Object.getOwnPropertyDescriptor, Zo = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? zo(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 && Ko(e, t, i), i;
-}, Ne = (a, e) => (t, n) => e(t, n, a);
-const jo = {};
-let We = class extends ne {
+  return n && i && Qo(e, t, i), i;
+}, Re = (a, e) => (t, n) => e(t, n, a);
+const Jo = {};
+let Ke = class extends ne {
   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();
   }
@@ -13123,7 +13130,7 @@ let We = class extends ne {
   }
   _registerMenus() {
     const { menu: a = {} } = this._config;
-    [qo, yo, Uo].forEach(
+    [Uo, Bo, Ho].forEach(
       (e) => {
         this.disposeWithMe(this._menuService.addMenuItem(this._injector.invoke(e), a));
       }
@@ -13131,51 +13138,51 @@ let We = class extends ne {
   }
   _registerCommands() {
     [
-      Ta,
       ba,
-      dn,
-      Sa,
+      Pa,
+      ln,
+      Ea,
       zt,
       Qt,
-      xe,
-      pn,
+      ve,
+      dn,
       At
     ].forEach((a) => this.disposeWithMe(this._commandService.registerCommand(a)));
   }
   _registerShortcuts() {
     [
-      ...Ho(),
-      ...wo(),
-      ...Go(),
-      ...Xo(),
+      ...Yo(),
       ...Wo(),
-      Yo
+      ...Ko(),
+      ...ko(),
+      ...jo(),
+      $o
     ].forEach((a) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(a));
     });
   }
   _registerComponents() {
     this.disposeWithMe(
-      this._uiPartsService.registerComponent(Ar.CONTENT, () => Nr(ju, this._injector))
-    ), this._componentManager.register(Ea, vo);
+      this._uiPartsService.registerComponent(Tr.CONTENT, () => hr(Zu, this._injector))
+    ), this._componentManager.register(Ta, Fo);
   }
   _registerRenderControllers() {
-    this.disposeWithMe(this._renderManagerService.registerRenderController(Y.UNIVER_SHEET, ht));
+    this.disposeWithMe(this._renderManagerService.registerRenderController(Y.UNIVER_SHEET, Ct));
   }
 };
-We = $o([
-  ce(fe.Ready, We),
-  Ne(1, y(Ot)),
-  Ne(2, Pr),
-  Ne(3, ue),
-  Ne(4, br),
-  Ne(5, Tr),
-  Ne(6, sn),
-  Ne(7, y(Lr))
-], We);
-const Un = "formula_reference_selection_plugin_name";
+Ke = Zo([
+  ce(fe.Ready, Ke),
+  Re(1, y(Ot)),
+  Re(2, Er),
+  Re(3, ue),
+  Re(4, Sr),
+  Re(5, Ir),
+  Re(6, fn),
+  Re(7, y(br))
+], Ke);
+const Fn = "formula_reference_selection_plugin_name";
 function Gt(a, e, t) {
-  const n = a.getCurrentTheme(), i = new Gn(e).setAlpha(0.05).toRgbString();
+  const n = a.getCurrentTheme(), i = new Vn(e).setAlpha(0.05).toRgbString();
   return {
     id: t,
     strokeWidth: 1,
@@ -13191,30 +13198,30 @@ function Gt(a, e, t) {
     hasColumnHeader: !1
   };
 }
-var Qo = Object.defineProperty, zo = Object.getOwnPropertyDescriptor, Zo = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? zo(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var em = Object.defineProperty, tm = Object.getOwnPropertyDescriptor, nm = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? tm(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 && Qo(e, t, i), i;
-}, J = (a, e) => (t, n) => e(t, n, a);
-const Jo = [Wa, Ka];
+  return n && i && em(e, t, i), i;
+}, ee = (a, e) => (t, n) => e(t, n, a);
+const am = [Ka, ka];
 let Pt = class extends ne {
-  constructor(e, t, n, i, u, o, m, c, f, d, s, l, L, b, E, p, R) {
+  constructor(e, t, n, i, u, o, m, c, f, d, s, l, L, b, E, p) {
     super();
-    D(this, "_formulaRefColors", []);
-    D(this, "_previousSequenceNodes");
-    D(this, "_previousRangesCount", 0);
-    D(this, "_previousInsertRefStringIndex");
-    D(this, "_currentInsertRefStringIndex", -1);
-    D(this, "_arrowMoveActionState", 0);
-    D(this, "_isSelectionMovingRefSelections", []);
-    D(this, "_stringColor", "");
-    D(this, "_numberColor", "");
-    D(this, "_insertSelections", []);
-    D(this, "_inputPanelState", 0);
-    D(this, "_userCursorMove", !1);
-    D(this, "_previousEditorUnitId");
-    D(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._sheetSkeletonManagerService = d, this._univerInstanceService = s, this._selectionRenderService = l, this._descriptionService = L, this._textSelectionManagerService = b, this._docViewModelManagerService = E, this._contextMenuService = p, this._editorService = R, this._initialize();
+    q(this, "_formulaRefColors", []);
+    q(this, "_previousSequenceNodes");
+    q(this, "_previousRangesCount", 0);
+    q(this, "_previousInsertRefStringIndex");
+    q(this, "_currentInsertRefStringIndex", -1);
+    q(this, "_arrowMoveActionState", 0);
+    q(this, "_isSelectionMovingRefSelections", []);
+    q(this, "_stringColor", "");
+    q(this, "_numberColor", "");
+    q(this, "_insertSelections", []);
+    q(this, "_inputPanelState", 0);
+    q(this, "_userCursorMove", !1);
+    q(this, "_previousEditorUnitId");
+    q(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._docViewModelManagerService = b, this._contextMenuService = E, this._editorService = p, this._initialize();
   }
   dispose() {
     this._formulaRefColors = [], this._resetTemp();
@@ -13282,27 +13289,27 @@ let Pt = class extends ne {
       })
     ), this.disposeWithMe(
       this._editorService.closeRangePrompt$.subscribe(() => {
-        (!this._editorService.getSpreadsheetFocusState() || !this._formulaPromptService.isLockedSelectionInsert()) && (this._closeRangePrompt(), this._selectionManagerService.changePlugin(Ce));
+        (!this._editorService.getSpreadsheetFocusState() || !this._formulaPromptService.isLockedSelectionInsert()) && (this._closeRangePrompt(), this._selectionManagerService.changePlugin(he));
       })
     );
   }
   _closeRangePrompt(e) {
     const t = this._selectionManagerService.getCurrent();
-    if (this._insertSelections = [], (t == null ? void 0 : t.pluginName) === Ce) {
+    if (this._insertSelections = [], (t == null ? void 0 : t.pluginName) === he) {
       this._disableForceKeepVisible();
       return;
     }
-    this._selectionManagerService.clear(), e && this._editorService.isSheetEditor(e) ? (this._selectionManagerService.changePlugin(Ce), this._updateEditorModel(`\r
-`, [])) : this._selectionManagerService.changePluginNoRefresh(Ce), this._contextService.setContextValue(tt, !1), this._disableForceKeepVisible(), this._selectionRenderService.resetStyle(), this._resetTemp(), this._hideFunctionPanel();
+    this._selectionManagerService.clear(), e && this._editorService.isSheetEditor(e) ? (this._selectionManagerService.changePlugin(he), this._updateEditorModel(`\r
+`, [])) : this._selectionManagerService.changePluginNoRefresh(he), this._contextService.setContextValue(nt, !1), this._disableForceKeepVisible(), this._selectionRenderService.resetStyle(), this._resetTemp(), this._hideFunctionPanel();
   }
   _initialRefSelectionUpdateEvent() {
-    const e = new Xn();
+    const e = new Hn();
     this.disposeWithMe(
       Q(
         this._selectionManagerService.selectionMoveEnd$.subscribe(() => {
           e.dispose();
           const t = this._selectionManagerService.getCurrent();
-          if (this._formulaPromptService.disableSelectionMoving(), (t == null ? void 0 : t.pluginName) !== Un)
+          if (this._formulaPromptService.disableSelectionMoving(), (t == null ? void 0 : t.pluginName) !== Fn)
             return;
           this._updateRefSelectionStyle(this._isSelectionMovingRefSelections), this._selectionRenderService.getCurrentControls().forEach((i) => {
             i.disableHelperSelection(), e.add(
@@ -13382,7 +13389,7 @@ let Pt = class extends ne {
           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, qe.OPEN_BRACKET);
+          l && i.splice(u + 1, 0, ye.OPEN_BRACKET);
           for (let b = u + 2, E = i.length; b < E; b++) {
             const p = i[b];
             if (typeof p == "string")
@@ -13462,7 +13469,7 @@ let Pt = class extends ne {
       this._disableForceKeepVisible();
       return;
     }
-    En(e) ? (this._editorBridgeService.enableForceKeepVisible(), this._contextMenuService.disable(), this._formulaPromptService.enableLockedSelectionInsert(), this._selectionRenderService.enableRemainLast(), this._arrowMoveActionState !== 1 && (this._arrowMoveActionState = 2)) : this._disableForceKeepVisible();
+    Tn(e) ? (this._editorBridgeService.enableForceKeepVisible(), this._contextMenuService.disable(), this._formulaPromptService.enableLockedSelectionInsert(), this._selectionRenderService.enableRemainLast(), this._arrowMoveActionState !== 1 && (this._arrowMoveActionState = 2)) : this._disableForceKeepVisible();
   }
   /**
    *
@@ -13502,7 +13509,7 @@ let Pt = class extends ne {
   }
   _editorModelUnitIds() {
     const t = this._univerInstanceService.getCurrentUniverDocInstance().getUnitId();
-    return this._editorService.isEditor(t) && !this._editorService.isSheetEditor(t) ? [t] : Jo;
+    return this._editorService.isEditor(t) && !this._editorService.isSheetEditor(t) ? [t] : am;
   }
   /**
    * Detect whether the user's input content is a formula. If it is a formula,
@@ -13512,8 +13519,8 @@ let Pt = class extends ne {
    */
   _contextSwitch() {
     const e = this._getCurrentBodyDataStreamAndOffset();
-    if (e && De(e.dataStream)) {
-      this._contextService.setContextValue(tt, !0);
+    if (e && Ee(e.dataStream)) {
+      this._contextService.setContextValue(nt, !0);
       const t = this._lexerTreeBuilder.sequenceNodesBuilder(e.dataStream.replace(/\r/g, "").replace(/\n/g, "")) || [];
       this._formulaPromptService.setSequenceNodes(t);
       const n = this._textSelectionManagerService.getActiveRange();
@@ -13523,21 +13530,21 @@ let Pt = class extends ne {
       this._currentInsertRefStringIndex = i - 1 + e.offset;
       return;
     }
-    this._contextService.setContextValue(tt, !1), this._formulaPromptService.disableLockedSelectionChange(), this._formulaPromptService.disableLockedSelectionInsert(), this._formulaPromptService.clearSequenceNodes(), this._hideFunctionPanel();
+    this._contextService.setContextValue(nt, !1), this._formulaPromptService.disableLockedSelectionChange(), this._formulaPromptService.disableLockedSelectionInsert(), this._formulaPromptService.clearSequenceNodes(), this._hideFunctionPanel();
   }
   _getContextState() {
-    return this._contextService.getContextValue(tt);
+    return this._contextService.getContextValue(nt);
   }
   /**
    * Switch from formula selection state to regular selection state.
    */
   _switchSelectionPlugin() {
     if (this._getContextState() === !0) {
-      this._selectionManagerService.changePluginNoRefresh(Un);
-      const e = Mi(this._themeService);
+      this._selectionManagerService.changePluginNoRefresh(Fn);
+      const e = xi(this._themeService);
       e.strokeDash = 8, e.hasAutoFill = !1, e.hasRowHeader = !1, e.hasColumnHeader = !1, this._selectionRenderService.setStyle(e);
     } else
-      this._selectionManagerService.changePluginNoRefresh(Ce), this._selectionRenderService.resetStyle();
+      this._selectionManagerService.changePluginNoRefresh(he), this._selectionRenderService.resetStyle();
   }
   /**
    * Highlight cell editor and formula bar editor.
@@ -13611,7 +13618,7 @@ let Pt = class extends ne {
       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, b = Me(l), { unitId: E, sheetName: p, range: R } = b, T = Di(R, o.getRowCount(), o.getColumnCount());
+      const d = e[c], { themeColor: s, token: l, refIndex: L } = d, b = De(l), { unitId: E, sheetName: p, range: R } = b, T = vi(R, o.getRowCount(), o.getColumnCount());
       if (E != null && E.length > 0 && t !== E)
         continue;
       const A = this._getSheetIdByName(t, p.trim());
@@ -13622,8 +13629,8 @@ let Pt = class extends ne {
         m = h;
         continue;
       }
-      const S = gi(T, o);
-      !he.equals(S, T) && T.startRow === T.endRow && T.startColumn === T.endColumn && (T.startRow = S.startRow, T.endRow = S.endRow, T.startColumn = S.startColumn, T.endColumn = S.endColumn), i.push({
+      const S = qi(T, o);
+      !_e.equals(S, T) && T.startRow === T.endRow && T.startColumn === T.endColumn && (T.startRow = S.startRow, T.endRow = S.endRow, T.startColumn = S.startColumn, T.endColumn = S.endColumn), i.push({
         range: T,
         primary: S,
         style: Gt(this._themeService, s, L.toString())
@@ -13656,7 +13663,7 @@ let Pt = class extends ne {
   _getSheetIdByName(e, t) {
     var i;
     const n = this._univerInstanceService.getUniverSheetInstance(e);
-    return (i = n == null ? void 0 : n.getSheetBySheetName(Li(t))) == null ? void 0 : i.getSheetId();
+    return (i = n == null ? void 0 : n.getSheetBySheetName(Pi(t))) == null ? void 0 : i.getSheetId();
   }
   _getSheetNameById(e, t) {
     var u;
@@ -13664,19 +13671,12 @@ let Pt = class extends ne {
     return ((u = n == null ? void 0 : n.getSheetBySheetId(t)) == null ? void 0 : u.getName()) || "";
   }
   _getCurrentUnitIdAndSheetId() {
-    const e = this._sheetSkeletonManagerService.getCurrent();
-    if (e == null) {
-      const u = this._univerInstanceService.getCurrentUnitForType(Y.UNIVER_SHEET), o = u.getActiveSheet();
-      return {
-        unitId: u.getUnitId(),
-        sheetId: o.getSheetId()
-      };
-    }
-    const { unitId: t, sheetId: n, skeleton: i } = e;
+    var i, u;
+    const e = this._univerInstanceService.getCurrentUnitForType(Y.UNIVER_SHEET), t = e.getActiveSheet(), n = (u = (i = this._renderManagerService.getRenderById(e.getUnitId())) == null ? void 0 : i.with(fa)) == null ? void 0 : u.getCurrentSkeleton();
     return {
-      unitId: t,
-      sheetId: n,
-      skeleton: i
+      unitId: e.getUnitId(),
+      sheetId: t.getSheetId(),
+      skeleton: n
     };
   }
   _getOpenForCurrentSheet() {
@@ -13708,9 +13708,9 @@ let Pt = class extends ne {
         startRow: A,
         endRow: h,
         startColumn: S,
-        endColumn: g
+        endColumn: D
       } = f;
-      (R || T) && A === d && S === l && h === s && g === L && (d = A, l = S, s = A, L = S);
+      (R || T) && A === d && S === l && h === s && D === L && (d = A, l = S, s = A, L = S);
     }
     return st({
       sheetName: u,
@@ -13743,7 +13743,7 @@ let Pt = class extends ne {
     const s = this._editorService.getEditor(n);
     s != null && s.isSingleChoice() && (u = u.split(",")[0]);
     let l = u, L = 1;
-    (!s || !s.onlyInputRange()) && (l = `${Ft.EQUALS}${u}`, L = 0), i ? this._commandService.executeCommand(gr.id, {
+    (!s || !s.onlyInputRange()) && (l = `${Ft.EQUALS}${u}`, L = 0), i ? this._commandService.executeCommand(qr.id, {
       unitId: n,
       body: {
         dataStream: l,
@@ -13771,7 +13771,7 @@ let Pt = class extends ne {
   }
   _fitEditorSize() {
     const t = this._univerInstanceService.getCurrentUniverDocInstance().getUnitId();
-    this._editorService.isEditor(t) && !this._editorService.isSheetEditor(t) || this._commandService.executeCommand(Er.id, {
+    this._editorService.isEditor(t) && !this._editorService.isSheetEditor(t) || this._commandService.executeCommand(Nr.id, {
       unitId: t
     });
   }
@@ -13836,7 +13836,7 @@ let Pt = class extends ne {
       const i = this._getCurrentChar();
       if (i == null)
         return;
-      this._previousInsertRefStringIndex = this._currentInsertRefStringIndex, !En(i) && this._focusIsOnlyRange(e.length) && (this._formulaPromptService.insertSequenceString(this._currentInsertRefStringIndex, qe.COMMA), n = this._formulaPromptService.getSequenceNodes(), this._previousInsertRefStringIndex += 1), this._previousSequenceNodes = te.deepClone(n);
+      this._previousInsertRefStringIndex = this._currentInsertRefStringIndex, !Tn(i) && this._focusIsOnlyRange(e.length) && (this._formulaPromptService.insertSequenceString(this._currentInsertRefStringIndex, ye.COMMA), n = this._formulaPromptService.getSequenceNodes(), this._previousInsertRefStringIndex += 1), this._previousSequenceNodes = te.deepClone(n);
       const u = this._getRefString(t);
       this._formulaPromptService.setSequenceNodes(n), this._formulaPromptService.insertSequenceRef(this._previousInsertRefStringIndex, u), this._selectionRenderService.disableSkipRemainLast();
     }
@@ -13845,15 +13845,15 @@ let Pt = class extends ne {
   _updateRefSelectionStyle(e) {
     const t = this._selectionRenderService.getCurrentControls(), { 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 = Me(d), { unitId: l, sheetName: L, range: b } = s;
+      const m = e[u], { refIndex: c, themeColor: f, token: d } = m, s = De(d), { unitId: l, sheetName: L, range: b } = s;
       if (l != null && l.length > 0 && n !== l)
         continue;
       const E = this._getSheetIdByName(n, L.trim());
       if (E != null && E !== i)
         continue;
       const p = t.find((T) => {
-        const { startRow: A, startColumn: h, endRow: S, endColumn: g, rangeType: M } = T.getRange();
-        return M === _e.COLUMN && h === b.startColumn && g === b.endColumn || M === _e.ROW && A === b.startRow && S === b.endRow || A === b.startRow && h === b.startColumn && S === b.endRow && g === b.endColumn || A === b.startRow && h === b.startColumn && b.startRow === b.endRow && b.startColumn === b.endColumn;
+        const { startRow: A, startColumn: h, endRow: S, endColumn: D, rangeType: M } = T.getRange();
+        return M === Oe.COLUMN && h === b.startColumn && D === b.endColumn || M === Oe.ROW && A === b.startRow && S === b.endRow || A === b.startRow && h === b.startColumn && S === b.endRow && D === b.endColumn || A === b.startRow && h === b.startColumn && b.startRow === b.endRow && b.startColumn === b.endColumn;
       });
       if (p == null)
         continue;
@@ -13871,7 +13871,7 @@ let Pt = class extends ne {
     if (i == null || !te.isStringNumber(i))
       return;
     let { startRow: u, endRow: o, startColumn: m, endColumn: c } = e;
-    const f = mr(u, m, n == null ? void 0 : n.mergeData);
+    const f = sr(u, m, n == null ? void 0 : n.mergeData);
     if (f) {
       const {
         isMerged: R,
@@ -13879,15 +13879,15 @@ let Pt = class extends ne {
         startRow: A,
         endRow: h,
         startColumn: S,
-        endColumn: g
+        endColumn: D
       } = f;
-      (R || T) && A === u && S === m && h === o && g === c && (u = A, m = S, o = A, c = S);
+      (R || T) && A === u && S === m && h === o && D === c && (u = A, m = S, o = A, c = S);
     }
     const d = Number(i), s = this._formulaPromptService.getCurrentSequenceNodeByIndex(d);
     let l = { startAbsoluteRefType: Z.NONE };
     if (typeof s != "string") {
       const R = s.token;
-      l = Ai(R), l.endAbsoluteRefType == null && (l.endAbsoluteRefType = l.startAbsoluteRefType);
+      l = bi(R), l.endAbsoluteRefType == null && (l.endAbsoluteRefType = l.startAbsoluteRefType);
     }
     const L = this._getRefString({
       range: {
@@ -13907,12 +13907,12 @@ let Pt = class extends ne {
   _refreshFormulaAndCellEditor(e) {
     var t;
     for (const n of e) {
-      const i = Mn(n, this._renderManagerService), u = i == null ? void 0 : i.document;
+      const i = On(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 = Mn(e, this._renderManagerService), n = t == null ? void 0 : t.engine;
+    const { unitId: e } = this._getCurrentUnitIdAndSheetId(), t = On(e, this._renderManagerService), n = t == null ? void 0 : t.engine;
     n == null || n.setRemainCapture();
   }
   _cursorStateListener() {
@@ -13938,7 +13938,7 @@ let Pt = class extends ne {
       visible: !1,
       eventType: se.Keyboard,
       keycode: t
-    }), this._commandService.executeCommand(at.id, {
+    }), this._commandService.executeCommand(it.id, {
       direction: w.DOWN
     }));
   }
@@ -13952,7 +13952,7 @@ let Pt = class extends ne {
       visible: !1,
       eventType: se.Keyboard,
       keycode: t
-    }), this._commandService.executeCommand(at.id, {
+    }), this._commandService.executeCommand(it.id, {
       direction: w.RIGHT
     }));
   }
@@ -13967,23 +13967,23 @@ let Pt = class extends ne {
   _pressArrowKey(e) {
     const { keycode: t, metaKey: n } = e;
     let i = w.DOWN;
-    t === H.ARROW_DOWN ? i = w.DOWN : t === H.ARROW_UP ? i = w.UP : t === H.ARROW_LEFT ? i = w.LEFT : t === H.ARROW_RIGHT && (i = w.RIGHT), n === Ee.CTRL_COMMAND ? this._commandService.executeCommand(at.id, {
+    t === H.ARROW_DOWN ? i = w.DOWN : t === H.ARROW_UP ? i = w.UP : t === H.ARROW_LEFT ? i = w.LEFT : t === H.ARROW_RIGHT && (i = w.RIGHT), n === Se.CTRL_COMMAND ? this._commandService.executeCommand(it.id, {
       direction: i,
-      jumpOver: Dn.moveGap
-    }) : n === Ee.SHIFT ? this._commandService.executeCommand(gn.id, {
+      jumpOver: Mn.moveGap
+    }) : n === Se.SHIFT ? this._commandService.executeCommand(Dn.id, {
       direction: i
-    }) : n === ga ? this._commandService.executeCommand(gn.id, {
+    }) : n === Da ? this._commandService.executeCommand(Dn.id, {
       direction: i,
-      jumpOver: Dn.moveGap
-    }) : this._commandService.executeCommand(at.id, {
+      jumpOver: Mn.moveGap
+    }) : this._commandService.executeCommand(it.id, {
       direction: i
     });
   }
   _commandExecutedListener() {
-    const e = [xe.id];
+    const e = [ve.id];
     this.disposeWithMe(
       this._commandService.onCommandExecuted((t) => {
-        if (t.id === pn.id)
+        if (t.id === dn.id)
           this._changeRefString();
         else if (e.includes(t.id)) {
           const n = t.params, { keycode: i, isSingleEditor: u = !1 } = n;
@@ -14024,7 +14024,7 @@ let Pt = class extends ne {
             return;
           }
           if (this._arrowMoveActionState === 2 && (this._arrowMoveActionState = 3), (this._selectionManagerService.getSelectionRanges() || []).length === 0) {
-            const f = this._selectionManagerService.getLastByPlugin(Ce);
+            const f = this._selectionManagerService.getLastByPlugin(he);
             if (f != null) {
               const d = te.deepClone(f);
               this._selectionManagerService.add([d]);
@@ -14041,7 +14041,7 @@ let Pt = class extends ne {
     if (e == null)
       return;
     let t = w.LEFT;
-    e === H.ARROW_DOWN ? t = w.DOWN : e === H.ARROW_UP ? t = w.UP : e === H.ARROW_RIGHT && (t = w.RIGHT), this._commandService.executeCommand(xr.id, {
+    e === H.ARROW_DOWN ? t = w.DOWN : e === H.ARROW_UP ? t = w.UP : e === H.ARROW_RIGHT && (t = w.RIGHT), this._commandService.executeCommand(yr.id, {
       direction: t
     });
   }
@@ -14093,12 +14093,12 @@ let Pt = class extends ne {
     for (let s = 0, l = o.length; s < l - 1; s++)
       c += o[s];
     let f = m;
-    if (m.indexOf(qe.COLON) > -1)
+    if (m.indexOf(ye.COLON) > -1)
       if (!this._userCursorMove)
         f = this._changeRangeRef(m);
       else {
-        const s = m.split(qe.COLON), l = s[0], L = s[1];
-        n - u.startIndex <= l.length ? f = this._changeSingleRef(l) + qe.COLON + L : f = l + qe.COLON + this._changeSingleRef(L);
+        const s = m.split(ye.COLON), l = s[0], L = s[1];
+        n - u.startIndex <= l.length ? f = this._changeSingleRef(l) + ye.COLON + L : f = l + ye.COLON + this._changeSingleRef(L);
       }
     else
       f = this._changeSingleRef(m);
@@ -14107,54 +14107,53 @@ let Pt = class extends ne {
     this._formulaPromptService.updateSequenceRef(i, f), this._syncToEditor(this._formulaPromptService.getSequenceNodes(), n + d + 1);
   }
   _changeRangeRef(e) {
-    const t = Me(e).range;
+    const t = De(e).range;
     let n = "";
-    return t.startAbsoluteRefType === Z.NONE || t.startAbsoluteRefType == null ? (t.startAbsoluteRefType = Z.ALL, t.endAbsoluteRefType = Z.ALL) : (t.startAbsoluteRefType = Z.NONE, t.endAbsoluteRefType = Z.NONE), n = Ke(t), n;
+    return t.startAbsoluteRefType === Z.NONE || t.startAbsoluteRefType == null ? (t.startAbsoluteRefType = Z.ALL, t.endAbsoluteRefType = Z.ALL) : (t.startAbsoluteRefType = Z.NONE, t.endAbsoluteRefType = Z.NONE), n = ke(t), n;
   }
   _changeSingleRef(e) {
-    const t = Me(e).range, n = t.startAbsoluteRefType;
+    const t = De(e).range, n = t.startAbsoluteRefType;
     let i = "";
-    return n === Z.NONE || n == null ? (t.startAbsoluteRefType = Z.ALL, t.endAbsoluteRefType = Z.ALL) : n === Z.ALL ? (t.startAbsoluteRefType = Z.ROW, t.endAbsoluteRefType = Z.ROW) : n === Z.ROW ? (t.startAbsoluteRefType = Z.COLUMN, t.endAbsoluteRefType = Z.COLUMN) : (t.startAbsoluteRefType = Z.NONE, t.endAbsoluteRefType = Z.NONE), i = Ke(t), i;
+    return n === Z.NONE || n == null ? (t.startAbsoluteRefType = Z.ALL, t.endAbsoluteRefType = Z.ALL) : n === Z.ALL ? (t.startAbsoluteRefType = Z.ROW, t.endAbsoluteRefType = Z.ROW) : n === Z.ROW ? (t.startAbsoluteRefType = Z.COLUMN, t.endAbsoluteRefType = Z.COLUMN) : (t.startAbsoluteRefType = Z.NONE, t.endAbsoluteRefType = Z.NONE), i = ke(t), i;
   }
   _getEditorObject() {
     const e = this._univerInstanceService.getCurrentUniverDocInstance().getUnitId(), t = this._editorService.getEditor(e);
     return t == null ? void 0 : t.render;
   }
 };
-Pt = Zo([
+Pt = nm([
   ce(fe.Rendered, Pt),
-  J(0, ue),
-  J(1, ka),
-  J(2, cr),
-  J(3, y(sa)),
-  J(4, y(Be)),
-  J(5, y(Ue)),
-  J(6, sn),
-  J(7, y(an)),
-  J(8, y(cn)),
-  J(9, y(fn)),
-  J(10, de),
-  J(11, y(la)),
-  J(12, y(Je)),
-  J(13, y(vr)),
-  J(14, y(qr)),
-  J(15, Sr),
-  J(16, je)
+  ee(0, ue),
+  ee(1, $a),
+  ee(2, lr),
+  ee(3, y(ca)),
+  ee(4, y(Ve)),
+  ee(5, y(Be)),
+  ee(6, fn),
+  ee(7, y(an)),
+  ee(8, y(cn)),
+  ee(9, de),
+  ee(10, y(sa)),
+  ee(11, y(et)),
+  ee(12, y(Fr)),
+  ee(13, y(Ur)),
+  ee(14, Rr),
+  ee(15, Qe)
 ], Pt);
-var em = Object.defineProperty, tm = Object.getOwnPropertyDescriptor, nm = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? tm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var im = Object.defineProperty, rm = Object.getOwnPropertyDescriptor, um = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? rm(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 && em(e, t, i), i;
-}, we = (a, e) => (t, n) => e(t, n, a);
+  return n && i && im(e, t, i), i;
+}, Ge = (a, e) => (t, n) => e(t, n, a);
 let bt = class extends ne {
   constructor(e, t, n, i, u) {
     super();
-    D(this, "_waitingCommandQueue", []);
-    D(this, "_executingCommandQueue", []);
-    D(this, "_setTimeoutKey", -1);
-    D(this, "_startExecutionTime", 0);
-    D(this, "_formulaCalculationDoneCount", 0);
-    D(this, "_arrayFormulaCalculationDoneCount", 0);
+    q(this, "_waitingCommandQueue", []);
+    q(this, "_executingCommandQueue", []);
+    q(this, "_setTimeoutKey", -1);
+    q(this, "_startExecutionTime", 0);
+    q(this, "_formulaCalculationDoneCount", 0);
+    q(this, "_arrayFormulaCalculationDoneCount", 0);
     this._commandService = e, this._activeDirtyManagerService = t, this._numfmtService = n, this._formulaDataModel = i, this._progressService = u, this._initialize();
   }
   _initialize() {
@@ -14166,12 +14165,12 @@ let bt = class extends ne {
         if (this._activeDirtyManagerService.get(e.id)) {
           if (e.id === le.id) {
             const n = e.params;
-            if (t && t.onlyLocal === !0 || n.trigger === on.id || n.trigger === zn.id || n.trigger === Zn.id)
+            if (t && t.onlyLocal === !0 || n.trigger === on.id || n.trigger === jn.id || n.trigger === Qn.id)
               return;
           }
           this._waitingCommandQueue.push(e), clearTimeout(this._setTimeoutKey), this._setTimeoutKey = setTimeout(() => {
             this._commandService.executeCommand(
-              Sn.id,
+              En.id,
               {
                 ...this._generateDirty(this._waitingCommandQueue)
               },
@@ -14220,11 +14219,11 @@ let bt = class extends ne {
     });
   }
   _initialExecuteFormulaProcessListener() {
-    const e = Pn(this._pushFormulaTask.bind(this), 300), t = Pn(this._pushArrayFormulaTask.bind(this), 300);
+    const e = An(this._pushFormulaTask.bind(this), 300), t = An(this._pushArrayFormulaTask.bind(this), 300);
     let n = null, i = 0, u = 0, o = 0, m = !1, c = !1;
     this.disposeWithMe(
       this._commandService.onCommandExecuted((f) => {
-        if (f.id !== Pi.id)
+        if (f.id !== Ti.id)
           return;
         const d = f.params;
         if (d.stageInfo != null) {
@@ -14243,27 +14242,27 @@ let bt = class extends ne {
           const s = d.functionsExecutedState;
           let l = "";
           switch (s) {
-            case ye.NOT_EXECUTED:
+            case Fe.NOT_EXECUTED:
               l = "No tasks are being executed anymore", this._executingCommandQueue = [];
               break;
-            case ye.STOP_EXECUTION:
+            case Fe.STOP_EXECUTION:
               l = "The execution of the formula has been stopped", this._waitingCommandQueue.unshift(...this._executingCommandQueue), this._executingCommandQueue = [];
               break;
-            case ye.SUCCESS:
+            case Fe.SUCCESS:
               l = `Formula calculation succeeded, Total time consumed: ${performance.now() - this._startExecutionTime} ms`, this._executingCommandQueue = [];
               break;
-            case ye.INITIAL:
+            case Fe.INITIAL:
               l = "Waiting for calculation", this._executingCommandQueue = [];
               break;
           }
-          i--, i === 0 && (n ? (clearTimeout(n), n = null) : s === ye.SUCCESS ? this._progressService.complete() : s === ye.STOP_EXECUTION && this._progressService.stop(), this._formulaCalculationDoneCount = 0, this._arrayFormulaCalculationDoneCount = 0, m = !1, c = !1), console.warn(`execution result${l}`);
+          i--, i === 0 && (n ? (clearTimeout(n), n = null) : s === Fe.SUCCESS ? this._progressService.complete() : s === Fe.STOP_EXECUTION && this._progressService.stop(), this._formulaCalculationDoneCount = 0, this._arrayFormulaCalculationDoneCount = 0, m = !1, c = !1), console.warn(`execution result${l}`);
         }
       })
     );
   }
   _initialExecuteFormula() {
     this._commandService.executeCommand(
-      Sn.id,
+      En.id,
       {
         commands: [],
         forceCalculation: !0
@@ -14294,15 +14293,15 @@ let bt = class extends ne {
     this._arrayFormulaCalculationDoneCount = e, this._progressService.pushTask({ count: t });
   }
 };
-bt = nm([
+bt = um([
   ce(fe.Ready, bt),
-  we(0, ue),
-  we(1, rn),
-  we(2, y(xi)),
-  we(3, y(ke)),
-  we(4, y(Ir))
+  Ge(0, ue),
+  Ge(1, rn),
+  Ge(2, y(yi)),
+  Ge(3, y($e)),
+  Ge(4, y(Cr))
 ], bt);
-function am(a, e, t) {
+function om(a, e, t) {
   var n;
   return a == null || a[e] == null || ((n = a[e]) == null ? void 0 : n[t]) == null;
 }
@@ -14320,11 +14319,11 @@ function Xt(a, e, t) {
       [e]: null
     };
 }
-function im(a, e, t) {
+function mm(a, e, t) {
   const { type: n } = t;
-  return n === 11 || n === 12 ? rm(a, e) : um(a, e, t);
+  return n === 11 || n === 12 ? cm(a, e) : fm(a, e, t);
 }
-function rm(a, e) {
+function cm(a, e) {
   const t = [], n = [];
   return Object.keys(e).forEach((i) => {
     const u = e[i], o = a[i];
@@ -14335,7 +14334,7 @@ function rm(a, e) {
       if (c.forValue((p, R, T) => {
         if (T == null)
           return !0;
-        const A = Ln(T);
+        const A = pn(T);
         A !== null && (d.setValue(p, R, A), s.setValue(p, R, f.getValue(p, R)));
       }), d.getSizeOf() === 0)
         return;
@@ -14363,8 +14362,8 @@ function rm(a, e) {
     redos: n
   };
 }
-function um(a, e, t) {
-  const { sheetId: n, unitId: i } = t, { redoFormulaData: u, undoFormulaData: o } = om(a, e, t), m = [], c = [];
+function fm(a, e, t) {
+  const { sheetId: n, unitId: i } = t, { redoFormulaData: u, undoFormulaData: o } = sm(a, e, t), m = [], c = [];
   if (Object.keys(u).length !== 0) {
     const f = {
       subUnitId: n,
@@ -14392,10 +14391,10 @@ function um(a, e, t) {
     redos: m
   };
 }
-function om(a, e, t) {
+function sm(a, e, t) {
   let n = {}, i = {};
   const { type: u, unitId: o, sheetId: m, range: c, from: f, to: d } = t;
-  if (am(a, o, m))
+  if (om(a, o, m))
     return {
       redoFormulaData: n,
       undoFormulaData: i
@@ -14405,52 +14404,52 @@ function om(a, e, t) {
   return L.forValue((R, T, A) => {
     if (A == null)
       return !0;
-    if (!Sm(A))
+    if (!Cm(A))
       return;
-    const h = $a(R, T);
+    const h = ja(R, T);
     let S = null;
     switch (u) {
       case 0:
         if (f == null || d == null)
           return;
-        S = mm(f, d, h);
+        S = lm(f, d, h);
         break;
       case 1:
         if (f == null || d == null)
           return;
-        S = cm(f, d, h);
+        S = dm(f, d, h);
         break;
       case 2:
         if (f == null || d == null)
           return;
-        S = fm(f, d, h);
+        S = pm(f, d, h);
         break;
     }
     if (te.isDefine(c))
       switch (u) {
         case 3:
-          S = sm(c, h), p = !0;
+          S = Lm(c, h), p = !0;
           break;
         case 4:
-          S = lm(c, h), p = !0;
+          S = Am(c, h), p = !0;
           break;
         case 5:
-          S = dm(c, h);
+          S = Pm(c, h);
           break;
         case 6:
-          S = pm(c, h);
+          S = bm(c, h);
           break;
         case 7:
-          S = Lm(c, h);
+          S = Tm(c, h);
           break;
         case 8:
-          S = Am(c, h);
+          S = Em(c, h);
           break;
         case 9:
-          S = Pm(c, h), p = !0;
+          S = Sm(c, h), p = !0;
           break;
         case 10:
-          S = bm(c, h), p = !0;
+          S = Im(c, h), p = !0;
           break;
       }
     S != null && (p ? E.unshift({
@@ -14460,13 +14459,13 @@ function om(a, e, t) {
       oldCell: h,
       newCell: S
     }));
-  }), n = Tm(E, L, b), i = Em(E, L), {
+  }), n = Nm(E, L, b), i = Rm(E, L), {
     redoFormulaData: n,
     undoFormulaData: i
   };
 }
-function mm(a, e, t) {
-  const n = Jn(
+function lm(a, e, t) {
+  const n = zn(
     {
       id: K.MoveRangeCommandId,
       params: { toRange: e, fromRange: a }
@@ -14475,8 +14474,8 @@ function mm(a, e, t) {
   );
   return k(n, t);
 }
-function cm(a, e, t) {
-  const n = ea(
+function dm(a, e, t) {
+  const n = Zn(
     {
       id: K.MoveRowsCommandId,
       params: { toRange: e, fromRange: a }
@@ -14485,8 +14484,8 @@ function cm(a, e, t) {
   );
   return k(n, t);
 }
-function fm(a, e, t) {
-  const n = ta(
+function pm(a, e, t) {
+  const n = Jn(
     {
       id: K.MoveColsCommandId,
       params: { toRange: e, fromRange: a }
@@ -14495,8 +14494,8 @@ function fm(a, e, t) {
   );
   return k(n, t);
 }
-function sm(a, e) {
-  const t = na(
+function Lm(a, e) {
+  const t = ea(
     {
       id: K.InsertRowCommandId,
       params: { range: a, unitId: "", subUnitId: "", direction: w.DOWN }
@@ -14505,8 +14504,8 @@ function sm(a, e) {
   );
   return k(t, e);
 }
-function lm(a, e) {
-  const t = aa(
+function Am(a, e) {
+  const t = ta(
     {
       id: K.InsertColCommandId,
       params: { range: a, unitId: "", subUnitId: "", direction: w.RIGHT }
@@ -14515,8 +14514,8 @@ function lm(a, e) {
   );
   return k(t, e);
 }
-function dm(a, e) {
-  const t = ia(
+function Pm(a, e) {
+  const t = na(
     {
       id: K.RemoveRowCommandId,
       params: { range: a }
@@ -14525,8 +14524,8 @@ function dm(a, e) {
   );
   return k(t, e);
 }
-function pm(a, e) {
-  const t = ra(
+function bm(a, e) {
+  const t = aa(
     {
       id: K.RemoveColCommandId,
       params: { range: a }
@@ -14535,8 +14534,8 @@ function pm(a, e) {
   );
   return k(t, e);
 }
-function Lm(a, e) {
-  const t = ua(
+function Tm(a, e) {
+  const t = ia(
     {
       id: K.DeleteRangeMoveLeftCommandId,
       params: { range: a }
@@ -14545,8 +14544,8 @@ function Lm(a, e) {
   );
   return k(t, e);
 }
-function Am(a, e) {
-  const t = oa(
+function Em(a, e) {
+  const t = ra(
     {
       id: K.DeleteRangeMoveUpCommandId,
       params: { range: a }
@@ -14555,8 +14554,8 @@ function Am(a, e) {
   );
   return k(t, e);
 }
-function Pm(a, e) {
-  const t = ma(
+function Sm(a, e) {
+  const t = ua(
     {
       id: K.InsertRangeMoveDownCommandId,
       params: { range: a }
@@ -14565,8 +14564,8 @@ function Pm(a, e) {
   );
   return k(t, e);
 }
-function bm(a, e) {
-  const t = ca(
+function Im(a, e) {
+  const t = oa(
     {
       id: K.InsertRangeMoveRightCommandId,
       params: { range: a }
@@ -14575,24 +14574,24 @@ function bm(a, e) {
   );
   return k(t, e);
 }
-function Tm(a, e, t) {
+function Nm(a, e, t) {
   const n = new j({});
   return a.forEach((i) => {
-    const { oldCell: u, newCell: o } = i, { startRow: m, startColumn: c } = u, { startRow: f, startColumn: d } = o, s = t.getValue(m, c) || e.getValue(m, c), l = Ln(s);
+    const { oldCell: u, newCell: o } = i, { startRow: m, startColumn: c } = u, { startRow: f, startColumn: d } = o, s = t.getValue(m, c) || e.getValue(m, c), l = pn(s);
     n.setValue(m, c, { f: null, si: null }), n.setValue(f, d, l);
   }), n.clone();
 }
-function Em(a, e) {
+function Rm(a, e) {
   const t = new j({});
   return a.forEach((n) => {
-    const { oldCell: i, newCell: u } = n, { startRow: o, startColumn: m } = i, { startRow: c, startColumn: f } = u, d = e.getValue(o, m), s = Ln(d);
+    const { oldCell: i, newCell: u } = n, { startRow: o, startColumn: m } = i, { startRow: c, startColumn: f } = u, d = e.getValue(o, m), s = pn(d);
     t.setValue(c, f, { f: null, si: null }), t.setValue(o, m, s);
   }), t.clone();
 }
-function Ln(a) {
+function pn(a) {
   if (a == null)
     return;
-  const { f: e, si: t, x: n = 0, y: i = 0 } = a, u = De(e), o = Fe(t);
+  const { f: e, si: t, x: n = 0, y: i = 0 } = a, u = Ee(e), o = ge(t);
   if (!u && !o)
     return {
       f: null,
@@ -14601,15 +14600,15 @@ function Ln(a) {
   const m = {};
   return o && (m.si = t), u && n === 0 && i === 0 && (m.f = e), m;
 }
-function Sm(a) {
-  const e = (a == null ? void 0 : a.f) || "", t = (a == null ? void 0 : a.si) || "", n = De(e), i = Fe(t);
+function Cm(a) {
+  const e = (a == null ? void 0 : a.f) || "", t = (a == null ? void 0 : a.si) || "", n = Ee(e), i = ge(t);
   return !!(n || i);
 }
-var Im = Object.defineProperty, Nm = Object.getOwnPropertyDescriptor, Rm = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? Nm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var hm = Object.defineProperty, _m = Object.getOwnPropertyDescriptor, Om = (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);
-  return n && i && Im(e, t, i), i;
-}, Re = (a, e) => (t, n) => e(t, n, a);
+  return n && i && hm(e, t, i), i;
+}, Ce = (a, e) => (t, n) => e(t, n, a);
 let Tt = class extends ne {
   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();
@@ -14627,7 +14626,7 @@ let Tt = class extends ne {
         if (a.params)
           if (a.id === le.id) {
             const t = a.params;
-            if (e && e.onlyLocal === !0 || t.trigger === on.id || t.trigger === zn.id || t.trigger === Zn.id)
+            if (e && e.onlyLocal === !0 || t.trigger === on.id || t.trigger === jn.id || t.trigger === Qn.id)
               return;
             this._handleSetRangeValuesMutation(t);
           } else if (a.id === kt.id) {
@@ -14638,7 +14637,7 @@ let Tt = class extends ne {
       })
     ), this.disposeWithMe(
       Q(
-        xn(
+        gn(
           this._univerInstanceService.getTypeOfUnitAdded$(Y.UNIVER_SHEET),
           this._univerInstanceService.getTypeOfUnitAdded$(Y.UNIVER_DOC),
           this._univerInstanceService.getTypeOfUnitAdded$(Y.UNIVER_SLIDE)
@@ -14646,10 +14645,10 @@ let Tt = class extends ne {
       )
     ), this.disposeWithMe(
       Q(
-        xn(
-          this._univerInstanceService.getTypeOfUnitDisposed$(Y.UNIVER_SHEET).pipe(Ye((a) => a.getUnitId())),
-          this._univerInstanceService.getTypeOfUnitDisposed$(Y.UNIVER_DOC).pipe(Ye((a) => a.getUnitId())),
-          this._univerInstanceService.getTypeOfUnitDisposed$(Y.UNIVER_SLIDE).pipe(Ye((a) => a.getUnitId()))
+        gn(
+          this._univerInstanceService.getTypeOfUnitDisposed$(Y.UNIVER_SHEET).pipe(We((a) => a.getUnitId())),
+          this._univerInstanceService.getTypeOfUnitDisposed$(Y.UNIVER_DOC).pipe(We((a) => a.getUnitId())),
+          this._univerInstanceService.getTypeOfUnitDisposed$(Y.UNIVER_SLIDE).pipe(We((a) => a.getUnitId()))
         ).subscribe((a) => this._handleRemoveSheetMutation(a))
       )
     );
@@ -14664,7 +14663,7 @@ let Tt = class extends ne {
       }
     };
     this._formulaDataModel.updateArrayFormulaCellData(t, e, n), this._formulaDataModel.updateArrayFormulaRange(t, e, n), this._commandService.executeCommand(
-      nt.id,
+      at.id,
       {
         formulaData: u
       },
@@ -14672,7 +14671,7 @@ let Tt = class extends ne {
         onlyLocal: !0
       }
     ), this._commandService.executeCommand(
-      Rt.id,
+      Nt.id,
       {
         arrayFormulaRange: this._formulaDataModel.getArrayFormulaRange(),
         arrayFormulaCellData: this._formulaDataModel.getArrayFormulaCellData()
@@ -14687,7 +14686,7 @@ let Tt = class extends ne {
   _handleRemoveSheetMutation(a, e) {
     const t = this._formulaDataModel.getFormulaData(), n = Xt(t, a, e), i = this._formulaDataModel.getArrayFormulaRange(), u = Xt(i, a, e), o = this._formulaDataModel.getArrayFormulaCellData(), m = Xt(o, a, e);
     n && this._commandService.executeCommand(
-      nt.id,
+      at.id,
       {
         formulaData: n
       },
@@ -14695,7 +14694,7 @@ let Tt = class extends ne {
         onlyLocal: !0
       }
     ), u && m && this._commandService.executeCommand(
-      Rt.id,
+      Nt.id,
       {
         arrayFormulaRange: i,
         arrayFormulaCellData: o
@@ -14706,9 +14705,9 @@ let Tt = class extends ne {
     );
   }
   _handleInsertSheetMutation(a) {
-    const { sheet: e, unitId: t } = a, n = this._formulaDataModel.getFormulaData(), { id: i, cellData: u } = e, o = new j(u), m = In(n, t, i, o);
+    const { sheet: e, unitId: t } = a, n = this._formulaDataModel.getFormulaData(), { id: i, cellData: u } = e, o = new j(u), m = Sn(n, t, i, o);
     this._commandService.executeCommand(
-      nt.id,
+      at.id,
       {
         formulaData: m
       },
@@ -14723,10 +14722,10 @@ let Tt = class extends ne {
     };
     n === Y.UNIVER_SHEET ? a.getSheets().forEach((o) => {
       var d;
-      const m = o.getCellMatrix(), c = o.getSheetId(), f = In(e, t, c, m);
+      const m = o.getCellMatrix(), c = o.getSheetId(), f = Sn(e, t, c, m);
       i[t][c] = (d = f[t]) == null ? void 0 : d[c];
     }) : n === Y.UNIVER_DOC || Y.UNIVER_SLIDE, this._commandService.executeCommand(
-      nt.id,
+      at.id,
       {
         formulaData: i
       },
@@ -14739,43 +14738,43 @@ let Tt = class extends ne {
     const { id: e } = a;
     let t = null;
     switch (e) {
-      case Wi.id:
+      case $i.id:
         t = this._handleMoveRange(a);
         break;
-      case Yi.id:
+      case ki.id:
         t = this._handleMoveRows(a);
         break;
-      case Xi.id:
+      case Ki.id:
         t = this._handleMoveCols(a);
         break;
-      case Gi.id:
+      case Wi.id:
         t = this._handleInsertRow(a);
         break;
-      case wi.id:
+      case Yi.id:
         t = this._handleInsertCol(a);
         break;
-      case Hi.id:
+      case Xi.id:
         t = this._handleInsertRangeMoveRight(a);
         break;
-      case Vi.id:
+      case Gi.id:
         t = this._handleInsertRangeMoveDown(a);
         break;
-      case Bi.id:
+      case wi.id:
         t = this._handleRemoveRow(a);
         break;
-      case Ui.id:
+      case Hi.id:
         t = this._handleRemoveCol(a);
         break;
-      case Fi.id:
+      case Vi.id:
         t = this._handleDeleteRangeMoveUp(a);
         break;
-      case yi.id:
+      case Bi.id:
         t = this._handleDeleteRangeMoveLeft(a);
         break;
-      case qi.id:
+      case Ui.id:
         t = this._handleSetWorksheetName(a);
         break;
-      case vi.id:
+      case Fi.id:
         t = this._handleRemoveWorksheet(a);
         break;
     }
@@ -14784,7 +14783,7 @@ let Tt = class extends ne {
         i,
         n,
         t
-      ), { undos: o, redos: m } = im(i, u, t);
+      ), { undos: o, redos: m } = mm(i, u, t);
       return {
         undos: o,
         redos: m
@@ -14823,13 +14822,13 @@ let Tt = class extends ne {
       startColumn: 0,
       endRow: n,
       endColumn: c.getColumnCount() - 1,
-      rangeType: _e.ROW
+      rangeType: Oe.ROW
     }, s = {
       startRow: i,
       startColumn: 0,
       endRow: u,
       endColumn: c.getColumnCount() - 1,
-      rangeType: _e.ROW
+      rangeType: Oe.ROW
     };
     return {
       type: 1,
@@ -14851,13 +14850,13 @@ let Tt = class extends ne {
       startColumn: t,
       endRow: c.getRowCount() - 1,
       endColumn: n,
-      rangeType: _e.COLUMN
+      rangeType: Oe.COLUMN
     }, s = {
       startRow: 0,
       startColumn: i,
       endRow: c.getRowCount() - 1,
       endColumn: u,
-      rangeType: _e.COLUMN
+      rangeType: Oe.COLUMN
     };
     return {
       type: 2,
@@ -15002,83 +15001,83 @@ let Tt = class extends ne {
       for (const d of f) {
         const s = new j(c[d] || {}), l = new j(), L = new j();
         s.forValue((b, E, p) => {
-          var x;
+          var g;
           if (!p)
             return !0;
           const { f: R, x: T, y: A, si: h } = p, S = this._lexerTreeBuilder.sequenceNodesBuilder(R);
           if (S == null)
             return !0;
-          let g = !1;
+          let D = !1;
           const M = [];
           for (let U = 0, I = S.length; U < I; U++) {
             const F = S[U];
             if (typeof F == "string" || F.nodeType !== ie.REFERENCE)
               continue;
-            const { token: pe } = F, oe = Me(pe), { range: Se, sheetName: et, unitId: ve } = oe;
-            o.push({ row: b, column: E, range: Se });
-            const qa = ve == null || ve.length === 0 ? m : ve, be = (x = e == null ? void 0 : e[qa]) == null ? void 0 : x[et];
+            const { token: pe } = F, oe = De(pe), { range: Ie, sheetName: tt, unitId: qe } = oe;
+            o.push({ row: b, column: E, range: Ie });
+            const ya = qe == null || qe.length === 0 ? m : qe, be = (g = e == null ? void 0 : e[ya]) == null ? void 0 : g[tt];
             if (!this._checkIsSameUnitAndSheet(
               t.unitId,
               t.sheetId,
               m,
               d,
-              ve,
+              qe,
               be || ""
             ))
               continue;
-            const ya = {
-              range: Se,
+            const Fa = {
+              range: Ie,
               sheetId: be,
-              unitId: ve,
-              sheetName: et,
+              unitId: qe,
+              sheetName: tt,
               refOffsetX: T || 0,
               refOffsetY: A || 0
             };
-            let Ve = null;
+            let He = null;
             if (t.type === 11) {
               const {
-                unitId: Fa,
+                unitId: Ua,
                 sheetId: vt,
                 sheetName: qt
               } = t;
               if (qt == null || be == null || be.length === 0 || vt !== be)
                 continue;
-              Ve = st({
-                range: Se,
+              He = st({
+                range: Ie,
                 sheetName: qt,
-                unitId: ve
+                unitId: qe
               });
             } else if (t.type === 12) {
               const {
-                unitId: Fa,
+                unitId: Ua,
                 sheetId: vt,
                 sheetName: qt
               } = t;
               if (be == null || be.length === 0 || vt !== be)
                 continue;
-              Ve = W.REF;
+              He = W.REF;
             } else
-              Ve = this._getNewRangeByMoveParam(
-                ya,
+              He = this._getNewRangeByMoveParam(
+                Fa,
                 t,
                 m,
                 d
               );
-            Ve != null && (S[U] = {
+            He != null && (S[U] = {
               ...F,
-              token: Ve
-            }, g = !0, M.push(U));
+              token: He
+            }, D = !0, M.push(U));
           }
-          if (!g)
+          if (!D)
             return !0;
-          const q = this._updateRefOffset(S, M, T, A);
+          const v = this._updateRefOffset(S, M, T, A);
           l.setValue(b, E, {
             f: R,
             x: T,
             y: A,
             si: h
           }), L.setValue(b, E, {
-            f: `=${un(q)}`,
+            f: `=${un(v)}`,
             x: T,
             y: A,
             si: h
@@ -15106,15 +15105,15 @@ let Tt = class extends ne {
       s
     ))
       return;
-    const p = he.moveOffset(d, b, E);
+    const p = _e.moveOffset(d, b, E);
     let R = null;
     if (i === 0) {
       if (c == null || f == null)
         return;
-      const T = this._checkMoveEdge(p, c), A = he.getIntersects(p, c);
+      const T = this._checkMoveEdge(p, c), A = _e.getIntersects(p, c);
       if (A == null)
         return;
-      const h = Jn(
+      const h = zn(
         { id: K.MoveRangeCommandId, params: { toRange: f, fromRange: c } },
         A
       ), S = k(h, A);
@@ -15124,10 +15123,10 @@ let Tt = class extends ne {
     } else if (i === 1) {
       if (c == null || f == null)
         return;
-      const T = this._checkMoveEdge(p, c), A = he.getIntersects(p, c);
+      const T = this._checkMoveEdge(p, c), A = _e.getIntersects(p, c);
       if (A == null)
         return;
-      const h = ea(
+      const h = Zn(
         { id: K.MoveRowsCommandId, params: { toRange: f, fromRange: c } },
         A
       ), S = k(h, A);
@@ -15137,10 +15136,10 @@ let Tt = class extends ne {
     } else if (i === 2) {
       if (c == null || f == null)
         return;
-      const T = this._checkMoveEdge(p, c), A = he.getIntersects(p, c);
+      const T = this._checkMoveEdge(p, c), A = _e.getIntersects(p, c);
       if (A == null)
         return;
-      const h = ta(
+      const h = Jn(
         { id: K.MoveColsCommandId, params: { toRange: f, fromRange: c } },
         A
       ), S = k(h, A);
@@ -15150,7 +15149,7 @@ let Tt = class extends ne {
     }
     if (m != null) {
       if (i === 3) {
-        const T = na(
+        const T = ea(
           {
             id: K.InsertRowCommandId,
             params: { range: m, unitId: "", subUnitId: "", direction: w.DOWN }
@@ -15164,7 +15163,7 @@ let Tt = class extends ne {
           ...A
         };
       } else if (i === 4) {
-        const T = aa(
+        const T = ta(
           {
             id: K.InsertColCommandId,
             params: { range: m, unitId: "", subUnitId: "", direction: w.RIGHT }
@@ -15178,7 +15177,7 @@ let Tt = class extends ne {
           ...A
         };
       } else if (i === 5) {
-        const T = ia(
+        const T = na(
           {
             id: K.RemoveRowCommandId,
             params: { range: m }
@@ -15192,7 +15191,7 @@ let Tt = class extends ne {
           ...A
         };
       } else if (i === 6) {
-        const T = ra(
+        const T = aa(
           {
             id: K.RemoveColCommandId,
             params: { range: m }
@@ -15206,7 +15205,7 @@ let Tt = class extends ne {
           ...A
         };
       } else if (i === 7) {
-        const T = ua(
+        const T = ia(
           {
             id: K.DeleteRangeMoveLeftCommandId,
             params: { range: m }
@@ -15220,7 +15219,7 @@ let Tt = class extends ne {
           ...A
         };
       } else if (i === 8) {
-        const T = oa(
+        const T = ra(
           {
             id: K.DeleteRangeMoveUpCommandId,
             params: { range: m }
@@ -15234,7 +15233,7 @@ let Tt = class extends ne {
           ...A
         };
       } else if (i === 9) {
-        const T = ma(
+        const T = ua(
           {
             id: K.InsertRangeMoveDownCommandId,
             params: { range: m }
@@ -15248,7 +15247,7 @@ let Tt = class extends ne {
           ...A
         };
       } else if (i === 10) {
-        const T = ca(
+        const T = oa(
           {
             id: K.InsertRangeMoveRightCommandId,
             params: { range: m }
@@ -15289,7 +15288,7 @@ let Tt = class extends ne {
         i.push(m);
         continue;
       }
-      const { token: c } = m, f = Me(c), { range: d, sheetName: s, unitId: l } = f, L = he.moveOffset(d, t, n);
+      const { token: c } = m, f = De(c), { range: d, sheetName: s, unitId: l } = f, L = _e.moveOffset(d, t, n);
       i.push({
         ...m,
         token: st({
@@ -15341,76 +15340,76 @@ let Tt = class extends ne {
       startColumn: s,
       endRow: l,
       endColumn: L,
-      rangeType: b = _e.NORMAL
+      rangeType: b = Oe.NORMAL
     } = t, { startRow: E, startColumn: p, endRow: R, endColumn: T } = n, {
       startRow: A,
       endRow: h,
       startColumn: S,
-      endColumn: g
+      endColumn: D
     } = u, {
       startRow: M,
-      endRow: q,
-      startColumn: x,
+      endRow: v,
+      startColumn: g,
       endColumn: U
     } = i, I = { ...i };
     if (a === 0)
-      if (c === x && f === U)
+      if (c === g && f === U)
         if (o < M)
           I.startRow = o;
-        else if (m < q)
+        else if (m < v)
           I.startRow = o;
-        else if (m >= q && E <= q)
+        else if (m >= v && E <= v)
           I.startRow = l + 1, I.endRow = m;
-        else if (E > q)
+        else if (E > v)
           I.endRow -= l + 1 - M;
         else
           return;
       else
         return;
     else if (a === 1)
-      if (c === x && f === U)
-        if (m > q)
+      if (c === g && f === U)
+        if (m > v)
           I.endRow = m;
         else if (o > M)
           I.endRow = m;
         else if (o <= M && R >= M)
           I.endRow = d + 1, I.startRow = o;
         else if (R < M)
-          I.startRow += q - d + 1;
+          I.startRow += v - d + 1;
         else
           return;
       else
         return;
     else if (a === 2)
-      if (o === M && m === q)
-        if (c < x)
+      if (o === M && m === v)
+        if (c < g)
           I.startColumn = c;
         else if (f < U)
           I.startColumn = c;
         else if (f >= U && p <= U)
           I.startColumn = L + 1, I.endColumn = f;
         else if (p > U)
-          I.endColumn -= L + 1 - x;
+          I.endColumn -= L + 1 - g;
         else
           return;
       else
         return;
     else if (a === 3)
-      if (o === M && m === q)
+      if (o === M && m === v)
         if (f > U)
           I.endColumn = f;
-        else if (c > x)
+        else if (c > g)
           I.endColumn = f;
-        else if (c <= x && T >= x)
+        else if (c <= g && T >= g)
           I.endColumn = s + 1, I.startColumn = c;
-        else if (T < x)
+        else if (T < g)
           I.startColumn += U - s + 1;
         else
           return;
       else
         return;
     else
-      a === 4 ? (I.startRow = o, I.startColumn = c, I.endRow = m, I.endColumn = f) : s <= x && L >= U ? E > q ? I.endRow -= l - d + 1 : R < M && (I.startRow += l - d + 1) : d <= M && l >= q ? p > U ? I.endColumn -= L - s + 1 : T < x && (I.startColumn += L - s + 1) : ((p <= g + 1 && T >= U || p <= x && T >= S - 1) && E <= M && R >= q || (E <= h + 1 && R >= q || E <= M && R >= A - 1) && p <= x && T >= U) && (I.startRow = o, I.startColumn = c, I.endRow = m, I.endColumn = f);
+      a === 4 ? (I.startRow = o, I.startColumn = c, I.endRow = m, I.endColumn = f) : s <= g && L >= U ? E > v ? I.endRow -= l - d + 1 : R < M && (I.startRow += l - d + 1) : d <= M && l >= v ? p > U ? I.endColumn -= L - s + 1 : T < g && (I.startColumn += L - s + 1) : ((p <= D + 1 && T >= U || p <= g && T >= S - 1) && E <= M && R >= v || (E <= h + 1 && R >= v || E <= M && R >= A - 1) && p <= g && T >= U) && (I.startRow = o, I.startColumn = c, I.endRow = m, I.endColumn = f);
     return I;
   }
   _getCurrentSheetInfo() {
@@ -15421,22 +15420,22 @@ let Tt = class extends ne {
     };
   }
 };
-Tt = Rm([
+Tt = Om([
   ce(fe.Ready, Tt),
-  Re(0, de),
-  Re(1, ue),
-  Re(2, y(Ue)),
-  Re(3, y(ke)),
-  Re(4, y(Dt)),
-  Re(5, y(cn)),
-  Re(6, y(Ot))
+  Ce(0, de),
+  Ce(1, ue),
+  Ce(2, y(Be)),
+  Ce(3, y($e)),
+  Ce(4, y(Dt)),
+  Ce(5, y(cn)),
+  Ce(6, y(Ot))
 ], Tt);
-var Cm = Object.defineProperty, hm = Object.getOwnPropertyDescriptor, _m = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? hm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var Mm = Object.defineProperty, Dm = Object.getOwnPropertyDescriptor, gm = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? Dm(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 && Cm(e, t, i), i;
-}, Om = (a, e) => (t, n) => e(t, n, a);
-const va = Mt(
+  return n && i && Mm(e, t, i), i;
+}, xm = (a, e) => (t, n) => e(t, n, a);
+const xa = Mt(
   "formula-ui.formula-custom-function-service"
 );
 let Jt = class extends ne {
@@ -15446,7 +15445,7 @@ let Jt = class extends ne {
   registerFunctions(a) {
     const e = [], t = a.map((n) => (e.push(n[1]), [n[0].toString(), n[1]]));
     return this._commandService.executeCommand(
-      bi.id,
+      Ei.id,
       {
         functions: t
       },
@@ -15455,7 +15454,7 @@ let Jt = class extends ne {
       }
     ), Q(() => {
       this._commandService.executeCommand(
-        Ti.id,
+        Si.id,
         {
           functions: e
         },
@@ -15466,15 +15465,15 @@ let Jt = class extends ne {
     });
   }
 };
-Jt = _m([
-  Om(0, ue)
+Jt = gm([
+  xm(0, ue)
 ], Jt);
-var Mm = Object.defineProperty, Dm = Object.getOwnPropertyDescriptor, gm = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? Dm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var vm = Object.defineProperty, qm = Object.getOwnPropertyDescriptor, ym = (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 && Mm(e, t, i), i;
-}, ot = (a, e) => (t, n) => e(t, n, a);
-const xm = Mt(
+  return n && i && vm(e, t, i), i;
+}, mt = (a, e) => (t, n) => e(t, n, a);
+const Fm = Mt(
   "formula-ui.register-function-service"
 );
 let en = class extends ne {
@@ -15503,22 +15502,22 @@ let en = class extends ne {
     });
   }
 };
-en = gm([
-  ot(0, y(ge)),
-  ot(1, y(Je)),
-  ot(2, y(va)),
-  ot(3, Kn)
+en = ym([
+  mt(0, y(xe)),
+  mt(1, y(et)),
+  mt(2, y(xa)),
+  mt(3, Yn)
 ], en);
-var vm = Object.defineProperty, qm = Object.getOwnPropertyDescriptor, ym = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? qm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+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 && vm(e, t, i), i;
-}, mt = (a, e) => (t, n) => e(t, n, a);
+  return n && i && Um(e, t, i), i;
+}, ct = (a, e) => (t, n) => e(t, n, a);
 const Yt = "AllDefaultWorkbook";
 let Et = class extends ne {
   constructor(e, t, n, i) {
     super();
-    D(this, "_preUnitId", null);
+    q(this, "_preUnitId", null);
     this._descriptionService = e, this._definedNamesService = t, this._univerInstanceService = n, this._commandService = i, this._initialize();
   }
   _initialize() {
@@ -15542,12 +15541,12 @@ let Et = class extends ne {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((e, t) => {
         if (!(t != null && t.fromCollab)) {
-          if (e.id === Ki.id)
+          if (e.id === ji.id)
             this._unregisterDescriptionsForNotInSheetId(), this._registerDescriptions();
-          else if (e.id === ki.id) {
+          else if (e.id === Qi.id) {
             const n = e.params;
             this._registerDescription(n);
-          } else if (e.id === $i.id) {
+          } else if (e.id === zi.id) {
             const n = e.params;
             this._unregisterDescription(n);
           } else if (e.id === jt.id) {
@@ -15630,32 +15629,32 @@ let Et = class extends ne {
     }), this._descriptionService.unregisterDescriptions(i);
   }
 };
-Et = ym([
+Et = Vm([
   ce(fe.Rendered, Et),
-  mt(0, Je),
-  mt(1, Yn),
-  mt(2, de),
-  mt(3, ue)
+  ct(0, et),
+  ct(1, wn),
+  ct(2, de),
+  ct(3, ue)
 ], Et);
-var Fm = Object.defineProperty, Um = Object.getOwnPropertyDescriptor, Bm = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? Um(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var Hm = Object.defineProperty, wm = Object.getOwnPropertyDescriptor, Gm = (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 && Fm(e, t, i), i;
+  return n && i && Hm(e, t, i), i;
 }, Wt = (a, e) => (t, n) => e(t, n, a);
 let tn = class extends ne {
   constructor(a, e, t) {
     super(), this._refRangeService = a, this._lexerTreeBuilder = e, this._univerInstanceService = t;
   }
   registerFormula(a, e) {
-    const t = /* @__PURE__ */ new Map(), n = this._lexerTreeBuilder.sequenceNodesBuilder(a), i = new Xn(), u = (o) => {
+    const t = /* @__PURE__ */ new Map(), n = this._lexerTreeBuilder.sequenceNodesBuilder(a), i = new Hn(), u = (o) => {
       const m = this._univerInstanceService.getCurrentUnitForType(Y.UNIVER_SHEET), c = m.getActiveSheet(), f = m.getUnitId(), d = c.getSheetId(), s = n == null ? void 0 : n.map((L) => {
         if (typeof L == "object" && L.nodeType === ie.REFERENCE) {
           const b = t.get(L.token);
           if (b.unitId && b.unitId !== f && b.subUnitId && b.subUnitId !== d)
             return L;
-          const E = Qi(b.range, o);
+          const E = Ji(b.range, o);
           let p = "";
-          return b.unitId && b.sheetName ? p = Ei(b.unitId, b.sheetName, b.range) : b.sheetName ? p = Si(b.sheetName, b.range) : p = E ? Ke(E) : W.ERROR, {
+          return b.unitId && b.sheetName ? p = Ii(b.unitId, b.sheetName, b.range) : b.sheetName ? p = Ni(b.sheetName, b.range) : p = E ? ke(E) : W.ERROR, {
             ...L,
             token: p
           };
@@ -15666,7 +15665,7 @@ let tn = class extends ne {
     };
     return n == null || n.forEach((o) => {
       if (typeof o == "object" && o.nodeType === ie.REFERENCE) {
-        const m = Me(o.token), { range: c, unitId: f, sheetName: d } = m, s = f ? this._univerInstanceService.getUniverSheetInstance(f) : this._univerInstanceService.getCurrentUnitForType(Y.UNIVER_SHEET), l = d ? s == null ? void 0 : s.getSheetBySheetName(d) : s == null ? void 0 : s.getActiveSheet();
+        const m = De(o.token), { range: c, unitId: f, sheetName: d } = m, s = f ? this._univerInstanceService.getUniverSheetInstance(f) : this._univerInstanceService.getCurrentUnitForType(Y.UNIVER_SHEET), l = d ? s == null ? void 0 : s.getSheetBySheetName(d) : s == null ? void 0 : s.getActiveSheet();
         if (!l)
           return;
         const L = l.getSheetId(), b = {
@@ -15680,24 +15679,24 @@ let tn = class extends ne {
     }), i;
   }
 };
-tn = Bm([
-  Wt(0, y(ji)),
-  Wt(1, y(Ue)),
+tn = Gm([
+  Wt(0, y(Zi)),
+  Wt(1, y(Be)),
   Wt(2, de)
 ], tn);
-var Xe = /* @__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))(Xe || {}), Vm = Object.defineProperty, Hm = Object.getOwnPropertyDescriptor, wm = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? Hm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var Ye = /* @__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))(Ye || {}), Xm = Object.defineProperty, Ym = Object.getOwnPropertyDescriptor, Wm = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? Ym(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 && Vm(e, t, i), i;
-}, Bn = (a, e) => (t, n) => e(t, n, a);
+  return n && i && Xm(e, t, i), i;
+}, Un = (a, e) => (t, n) => e(t, n, a);
 let nn = class extends ne {
   constructor(e, t) {
     super();
-    D(this, "_formulaCacheMap", /* @__PURE__ */ new Map());
-    D(this, "_formulaChange$", new Oe());
-    D(this, "formulaChange$", this._formulaChange$.asObservable());
-    D(this, "_formulaResult$", new Oe());
-    D(this, "formulaResult$", this._formulaResult$.asObservable());
+    q(this, "_formulaCacheMap", /* @__PURE__ */ new Map());
+    q(this, "_formulaChange$", new Me());
+    q(this, "formulaChange$", this._formulaChange$.asObservable());
+    q(this, "_formulaResult$", new Me());
+    q(this, "formulaResult$", this._formulaResult$.asObservable());
     this._commandService = e, this._activeDirtyManagerService = t, this._initFormulaRegister(), this._initFormulaCalculationResultChange();
   }
   _ensureCacheMap(e, t) {
@@ -15720,14 +15719,14 @@ let nn = class extends ne {
           };
         }
       }
-    ), this.formulaChange$.pipe(hr(16), _r((e) => !!e.length), Ye((e) => e.reduce((t, n) => {
+    ), this.formulaChange$.pipe(Mr(16), Dr((e) => !!e.length), We((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(Ii.id, u).then(() => {
+          this._commandService.executeCommand(Ri.id, u).then(() => {
             this._commandService.executeCommand(
               At.id,
               { [t]: { [n]: i } }
@@ -15738,7 +15737,7 @@ let nn = class extends ne {
   }
   _initFormulaCalculationResultChange() {
     this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
-      if (e.id === Wn.id) {
+      if (e.id === Xn.id) {
         const t = e.params, { unitOtherData: n } = t, i = {};
         for (const u in n) {
           const o = n[u], m = {};
@@ -15750,7 +15749,7 @@ let nn = class extends ne {
               const L = d[l];
               if (f.has(l)) {
                 const b = f.get(l);
-                b.result = L, b.status = Xe.SUCCESS, b.callbacks.forEach((E) => {
+                b.result = L, b.status = Ye.SUCCESS, b.callbacks.forEach((E) => {
                   E(L);
                 }), b.callbacks.clear(), s.push(b);
               }
@@ -15765,7 +15764,7 @@ let nn = class extends ne {
     const u = this._createFormulaId(e, t);
     return this._ensureCacheMap(e, t).set(u, {
       result: void 0,
-      status: Xe.WAIT,
+      status: Ye.WAIT,
       formulaId: u,
       callbacks: /* @__PURE__ */ new Set(),
       extra: i
@@ -15782,13 +15781,13 @@ let nn = class extends ne {
       subUnitId: t,
       formulaIdList: n
     };
-    this._commandService.executeCommand(Ni.id, i);
+    this._commandService.executeCommand(Ci.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 === Xe.SUCCESS || u.status === Xe.ERROR ? Promise.resolve(u) : new Promise((o) => {
+    return u ? u.status === Ye.SUCCESS || u.status === Ye.ERROR ? Promise.resolve(u) : new Promise((o) => {
       u.callbacks.add(() => {
         o(i.get(n));
       });
@@ -15798,16 +15797,16 @@ let nn = class extends ne {
     return this._ensureCacheMap(e, t).get(n);
   }
 };
-nn = wm([
-  Bn(0, ue),
-  Bn(1, rn)
+nn = Wm([
+  Un(0, ue),
+  Un(1, rn)
 ], nn);
-var Gm = Object.defineProperty, Xm = Object.getOwnPropertyDescriptor, Ym = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? Xm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var Km = Object.defineProperty, km = Object.getOwnPropertyDescriptor, $m = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? km(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 && Gm(e, t, i), i;
-}, ct = (a, e) => (t, n) => e(t, n, a);
-const Kt = "SHEET_FORMULA_ALERT", Wm = {
+  return n && i && Km(e, t, i), i;
+}, ft = (a, e) => (t, n) => e(t, n, a);
+const Kt = "SHEET_FORMULA_ALERT", jm = {
   [W.DIV_BY_ZERO]: "divByZero",
   [W.NAME]: "name",
   [W.VALUE]: "value",
@@ -15834,16 +15833,16 @@ let St = class extends ne {
       if (a) {
         const i = this._univerInstanceService.getCurrentUnitForType(Y.UNIVER_SHEET).getActiveSheet().getCell(a.location.row, a.location.col);
         if (i) {
-          const u = xa(i);
+          const u = ga(i);
           if (!u)
             return;
           const o = this._cellAlertManagerService.currentAlert.get(Kt), m = (e = o == null ? void 0 : o.alert) == null ? void 0 : e.location;
           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: rr.ERROR,
+            type: mr.ERROR,
             title: this._localeService.t("formula.error.title"),
-            message: this._localeService.t(`formula.error.${Wm[u]}`),
+            message: this._localeService.t(`formula.error.${jm[u]}`),
             location: a.location,
             width: 200,
             height: 74,
@@ -15856,65 +15855,62 @@ let St = class extends ne {
     }));
   }
 };
-St = Ym([
+St = $m([
   ce(fe.Rendered, St),
-  ct(0, y(ur)),
-  ct(1, y(or)),
-  ct(2, de),
-  ct(3, y(ge))
+  ft(0, y(cr)),
+  ft(1, y(fr)),
+  ft(2, de),
+  ft(3, y(xe))
 ], St);
-var Km = Object.defineProperty, km = Object.getOwnPropertyDescriptor, $m = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? km(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var 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 && Km(e, t, i), i;
-}, Vn = (a, e) => (t, n) => e(t, n, a);
-let It = class extends ja {
-  constructor(a, e) {
-    super(), this._sheetSkeletonManagerService = a, this._sheetInterceptorService = e, this._init();
+  return n && i && Qm(e, t, i), i;
+}, Jm = (a, e) => (t, n) => e(t, n, a);
+const ec = {
+  tl: {
+    size: 6,
+    color: "#409f11"
   }
-  _init() {
-    this._initViewModelIntercept();
+};
+let It = class extends Qa {
+  constructor(a) {
+    super(), this._sheetInterceptorService = a, this._init();
   }
-  _initViewModelIntercept() {
-    const a = {
-      tl: {
-        size: 6,
-        color: "#409f11"
+  _init() {
+    this.disposeWithMe(this._sheetInterceptorService.intercept(
+      mn.CELL_CONTENT,
+      {
+        handler: (a, e, t) => {
+          const n = Go(a);
+          return n !== null ? t({
+            ...a,
+            v: n
+          }) : ga(a) ? t({
+            ...a,
+            markers: {
+              ...a == null ? void 0 : a.markers,
+              ...ec
+            }
+          }) : t(a);
+        },
+        priority: 10
       }
-    };
-    this.disposeWithMe(
-      this._sheetInterceptorService.intercept(
-        mn.CELL_CONTENT,
-        {
-          handler: (e, t, n) => {
-            var o;
-            return !((o = this._sheetSkeletonManagerService.getCurrent()) == null ? void 0 : o.skeleton) || !xa(e) ? n(e) : n({
-              ...e,
-              markers: {
-                ...e == null ? void 0 : e.markers,
-                ...a
-              }
-            });
-          },
-          priority: 10
-        }
-      )
-    );
+    ));
   }
 };
-It = $m([
+It = Zm([
   ce(fe.Rendered, It),
-  Vn(0, y(fn)),
-  Vn(1, y(Dt))
+  Jm(0, y(Dt))
 ], It);
-var jm = Object.defineProperty, Qm = Object.getOwnPropertyDescriptor, zm = (a, e, t, n) => {
-  for (var i = n > 1 ? void 0 : n ? Qm(e, t) : e, u = a.length - 1, o; u >= 0; u--)
+var va = Object.defineProperty, tc = Object.getOwnPropertyDescriptor, nc = (a, e, t) => e in a ? va(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t, ac = (a, e, t, n) => {
+  for (var i = n > 1 ? void 0 : n ? tc(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 && jm(e, t, i), i;
-}, Hn = (a, e) => (t, n) => e(t, n, a), ft;
-let wn = (ft = class extends Qa {
+  return n && i && va(e, t, i), i;
+}, Bn = (a, e) => (t, n) => e(t, n, a), qa = (a, e, t) => (nc(a, typeof e != "symbol" ? e + "" : e, t), t);
+let _t = class extends za {
   constructor(a = {}, e, t) {
-    super(), this._config = a, this._injector = e, this._localeService = t, this._config = te.deepMerge({}, jo, this._config);
+    super(), this._config = a, this._injector = e, this._localeService = t, this._config = te.deepMerge({}, Jo, this._config);
   }
   onStarting() {
     this._init();
@@ -15922,9 +15918,9 @@ let wn = (ft = class extends Qa {
   _init() {
     [
       // services
-      [Be, { useClass: eu }],
+      [Ve, { useClass: au }],
       [
-        Je,
+        et,
         {
           useFactory: () => {
             var e;
@@ -15932,15 +15928,15 @@ let wn = (ft = class extends Qa {
           }
         }
       ],
-      [va, { useClass: Jt }],
-      [xm, { useClass: en }],
+      [xa, { useClass: Jt }],
+      [Fm, { useClass: en }],
       [tn],
       [nn],
       // controllers
       [
-        We,
+        Ke,
         {
-          useFactory: () => this._injector.createInstance(We, this._config)
+          useFactory: () => this._injector.createInstance(Ke, this._config)
         }
       ],
       [Pt],
@@ -15949,27 +15945,30 @@ let wn = (ft = class extends Qa {
       [dt],
       [bt],
       [Tt],
-      [ht],
+      [Ct],
       [lt],
       [Et],
       [It],
       [St]
     ].forEach((e) => this._injector.add(e));
   }
-}, D(ft, "pluginName", Aa), D(ft, "type", Y.UNIVER_SHEET), ft);
-wn = zm([
-  Hn(1, y(Ot)),
-  Hn(2, y(ge))
-], wn);
+};
+qa(_t, "pluginName", La);
+qa(_t, "type", Y.UNIVER_SHEET);
+_t = ac([
+  Za(hi),
+  Bn(1, y(Ot)),
+  Bn(2, y(xe))
+], _t);
 export {
   Zt as DescriptionService,
   Jt as FormulaCustomFunctionService,
   tn as FormulaRefRangeService,
-  Je as IDescriptionService,
-  va as IFormulaCustomFunctionService,
-  xm as IRegisterFunctionService,
+  et as IDescriptionService,
+  xa as IFormulaCustomFunctionService,
+  Fm as IRegisterFunctionService,
   en as RegisterFunctionService,
   nn as RegisterOtherFormulaService,
-  Pa as SPECIAL_PASTE_FORMULA,
-  wn as UniverSheetsFormulaPlugin
+  Aa as SPECIAL_PASTE_FORMULA,
+  _t as UniverSheetsFormulaPlugin
 };