@univerjs/sheets-numfmt 0.1.2 → 0.1.4

package/lib/es/index.js

@@ -1,26 +1,26 @@
 var $t = Object.defineProperty;
 var Ut = (e, t, r) => t in e ? $t(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var Y = (e, t, r) => (Ut(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { CommandType as X, ICommandService as E, IUniverInstanceService as $, IUndoRedoService as At, sequenceExecute as Lt, Tools as Vt, Disposable as H, OnLifecycle as k, LifecycleStages as U, Range as R, Rectangle as De, ObjectMatrix as lt, CellValueType as se, toDisposable as Z, ThemeService as ut, runOnLifecycle as Ht, ILocalStorageService as kt, LocaleService as T, DisposableCollection as dt, UniverInstanceType as de, Plugin as Ft, PluginType as Bt } from "@univerjs/core";
-import { transformCellsToRange as me, rangeMerge as z, SetNumfmtMutation as w, factorySetNumfmtUndoMutation as he, RemoveNumfmtMutation as M, factoryRemoveNumfmtUndoMutation as J, INumfmtService as A, INTERCEPTOR_POINT as mt, SheetInterceptorService as Ae, SelectionManagerService as ee, ClearSelectionFormatCommand as zt, ClearSelectionAllCommand as Wt, SetRangeValuesCommand as Kt, getCurrentSheetDisabled$ as fe, RefRangeService as Gt, EffectRefRangId as j, handleMoveRows as Yt, handleMoveCols as qt, handleIRemoveRow as Zt, handleIRemoveCol as Jt, handleMoveRange as Qt, handleInsertRow as Xt, handleInsertRangeMoveRight as en, handleInsertRangeMoveDown as tn, handleInsertCol as nn, handleDeleteRangeMoveUp as rn, handleDeleteRangeMoveLeft as sn, runRefRangeMutations as an, RemoveSheetCommand as on } from "@univerjs/sheets";
-import { Inject as g, Injector as K, createIdentifier as cn } from "@wendellhu/redi";
-import { IAutoFillService as ln, APPLY_TYPE as He, getAutoFillRepeatRange as un, SheetSkeletonManagerService as Ke, COPY_TYPE as nt, PREDEFINED_HOOK_NAME as rt, getRepeatRange as dn, ISheetClipboardService as mn, IEditorBridgeService as hn } from "@univerjs/sheets-ui";
-import { map as le, distinctUntilChanged as ht, switchMap as ft, tap as fn, debounceTime as pn, filter as st, bufferTime as vn } from "rxjs/operators";
-import D from "@univerjs/engine-numfmt";
-import { IRenderManagerService as gn, ITextSelectionRenderManager as _n } from "@univerjs/engine-render";
-import { ComponentManager as pt, ISidebarService as Sn, MenuItemType as pe, MenuGroup as ve, MenuPosition as ge, getMenuHiddenObservable as _e, IMenuService as Cn } from "@univerjs/ui";
-import { Observable as q, combineLatest as bn, merge as Ge } from "rxjs";
-import yn, { createContext as Rn, useState as x, useEffect as Ye, useRef as qe, useContext as vt, useMemo as V, createElement as te, forwardRef as ie } from "react";
-import { InputNumber as Ze, Select as Je, SelectList as Qe, Button as it } from "@univerjs/design";
-import { useDependency as N, useInjector as In } from "@wendellhu/redi/react-bindings";
-import { FormulaDataModel as Mn } from "@univerjs/engine-formula";
+import { CommandType as X, ICommandService as D, IUniverInstanceService as E, IUndoRedoService as At, sequenceExecute as Lt, Tools as Vt, Disposable as H, OnLifecycle as k, LifecycleStages as $, Range as R, Rectangle as De, LocaleType as Ht, ObjectMatrix as ut, CellValueType as ie, toDisposable as q, ThemeService as dt, LocaleService as j, runOnLifecycle as kt, ILocalStorageService as Ft, DisposableCollection as mt, UniverInstanceType as de, Plugin as Bt, PluginType as zt } from "@univerjs/core";
+import { transformCellsToRange as me, rangeMerge as z, SetNumfmtMutation as w, factorySetNumfmtUndoMutation as he, RemoveNumfmtMutation as M, factoryRemoveNumfmtUndoMutation as J, INumfmtService as U, INTERCEPTOR_POINT as ht, SheetInterceptorService as Ae, SelectionManagerService as ee, ClearSelectionFormatCommand as Wt, ClearSelectionAllCommand as Kt, SetRangeValuesCommand as Gt, getCurrentSheetDisabled$ as fe, RefRangeService as Yt, EffectRefRangId as N, handleMoveRows as Zt, handleMoveCols as qt, handleIRemoveRow as Jt, handleIRemoveCol as Qt, handleMoveRange as Xt, handleInsertRow as en, handleInsertRangeMoveRight as tn, handleInsertRangeMoveDown as nn, handleInsertCol as rn, handleDeleteRangeMoveUp as sn, handleDeleteRangeMoveLeft as an, runRefRangeMutations as on, RemoveSheetCommand as cn } from "@univerjs/sheets";
+import { Inject as g, Injector as K, createIdentifier as ln } from "@wendellhu/redi";
+import { IAutoFillService as un, APPLY_TYPE as He, getAutoFillRepeatRange as dn, SheetSkeletonManagerService as Ke, COPY_TYPE as rt, PREDEFINED_HOOK_NAME as st, getRepeatRange as mn, ISheetClipboardService as hn, IEditorBridgeService as fn } from "@univerjs/sheets-ui";
+import { map as le, distinctUntilChanged as ft, switchMap as pt, tap as pn, debounceTime as vn, filter as it, bufferTime as gn } from "rxjs/operators";
+import V from "@univerjs/engine-numfmt";
+import { IRenderManagerService as _n, ITextSelectionRenderManager as Sn } from "@univerjs/engine-render";
+import { ComponentManager as vt, ISidebarService as Cn, MenuItemType as pe, MenuGroup as ve, MenuPosition as ge, getMenuHiddenObservable as _e, IMenuService as bn } from "@univerjs/ui";
+import { Observable as Z, combineLatest as yn, merge as Ge } from "rxjs";
+import Rn, { createContext as In, useState as x, useEffect as Ye, useRef as Ze, useContext as gt, useMemo as L, createElement as te, forwardRef as ae } from "react";
+import { InputNumber as qe, Select as Je, SelectList as Qe, Button as at } from "@univerjs/design";
+import { useDependency as T, useInjector as Mn } from "@wendellhu/redi/react-bindings";
+import { FormulaDataModel as Pn } from "@univerjs/engine-formula";
 const Q = {
   id: "sheet.command.numfmt.set.numfmt",
   type: X.COMMAND,
   handler: (e, t) => {
     if (!t)
       return !1;
-    const r = e.get(E), n = e.get($), s = e.get(At), i = n.getCurrentUniverSheetInstance(), a = i.getUnitId(), c = i.getActiveSheet().getSheetId(), d = t.values.filter((f) => !!f.pattern), l = t.values.filter((f) => !f.pattern), u = me(a, c, d), m = {
+    const r = e.get(D), n = e.get(E), s = e.get(At), i = n.getCurrentUniverSheetInstance(), a = i.getUnitId(), c = i.getActiveSheet().getSheetId(), d = t.values.filter((f) => !!f.pattern), l = t.values.filter((f) => !f.pattern), u = me(a, c, d), m = {
       unitId: a,
       subUnitId: c,
       ranges: l.map((f) => ({
@@ -59,6 +59,7 @@ const Q = {
 }, On = {
   sheet: {
     numfmt: {
+      percent: "Percentage",
       title: "Number format",
       numfmtType: "Format types",
       cancel: "Cancel",
@@ -90,10 +91,11 @@ const Q = {
       subtractDecimal: "Decreasing decimal places"
     }
   }
-}, Pn = On, xn = {
+}, xn = On, wn = {
   sheet: {
     numfmt: {
-      title: "数据格式",
+      percent: "百分比",
+      title: "数字格式",
       numfmtType: "格式类型",
       cancel: "取消",
       confirm: "确认",
@@ -124,7 +126,7 @@ const Q = {
       subtractDecimal: "减少小数位"
     }
   }
-}, wn = xn, ue = "SHEET_NUMFMT_PLUGIN", Ee = (e) => {
+}, jn = wn, ue = "SHEET_NUMFMT_PLUGIN", Ee = (e) => {
   const t = e.filter((i) => i.id === M.id).map((i) => i.params), r = e.filter((i) => i.id === w.id).map((i) => i.params), n = [];
   if (t[0]) {
     const i = t.reduce(
@@ -171,10 +173,10 @@ const Q = {
   }
   return n;
 };
-var jn = Object.defineProperty, Nn = Object.getOwnPropertyDescriptor, Tn = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Nn(t, r) : t, i = e.length - 1, a; i >= 0; i--)
+var Nn = Object.defineProperty, Tn = Object.getOwnPropertyDescriptor, Dn = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Tn(t, r) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (s = (n ? a(t, r, s) : a(s)) || s);
-  return n && s && jn(t, r, s), s;
+  return n && s && Nn(t, r, s), s;
 }, Ce = (e, t) => (r, n) => t(r, n, e);
 let Re = class extends H {
   constructor(e, t, r, n) {
@@ -241,7 +243,7 @@ let Re = class extends H {
         row: s.startRow,
         col: s.startColumn
       };
-      return un(s, i).forEach((l) => {
+      return dn(s, i).forEach((l) => {
         const { undos: u, redos: m } = t(c, l.repeatStartCell, l.relativeRange);
         a.push(...u), o.push(...m);
       }), {
@@ -261,47 +263,47 @@ let Re = class extends H {
     this.disposeWithMe(this._autoFillService.addHook(n));
   }
 };
-Re = Tn([
-  k(U.Rendered, Re),
+Re = Dn([
+  k($.Rendered, Re),
   Ce(0, g(K)),
-  Ce(1, g($)),
-  Ce(2, g(A)),
-  Ce(3, g(ln))
+  Ce(1, g(E)),
+  Ce(2, g(U)),
+  Ce(3, g(un))
 ], Re);
-const Xe = (e) => D.getInfo(e).type || "unknown", gt = (e, t) => {
-  const n = D.getInfo(e)._partitions[1], s = D.format(e, t, { locale: "zh-CN" });
+const Xe = (e) => V.getInfo(e).type || "unknown", et = (e, t, r) => {
+  const n = V.getInfo(e), s = r === Ht.ZH_CN ? "zh-CN" : "en", i = n._partitions[1], a = V.format(e, t, { locale: s });
   return t < 0 ? {
-    result: s,
-    color: n.color
+    result: a,
+    color: i.color
   } : {
-    result: s
+    result: a
   };
 };
-var Dn = Object.defineProperty, En = Object.getOwnPropertyDescriptor, $n = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? En(t, r) : t, i = e.length - 1, a; i >= 0; i--)
+var En = Object.defineProperty, $n = Object.getOwnPropertyDescriptor, Un = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? $n(t, r) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (s = (n ? a(t, r, s) : a(s)) || s);
-  return n && s && Dn(t, r, s), s;
-}, oe = (e, t) => (r, n) => t(r, n, e);
+  return n && s && En(t, r, s), s;
+}, re = (e, t) => (r, n) => t(r, n, e);
 let Ie = class extends H {
-  constructor(e, t, r, n, s) {
-    super(), this._sheetInterceptorService = e, this._themeService = t, this._sheetSkeletonManagerService = r, this._commandService = n, this._numfmtService = s, this._initInterceptorCellContent();
+  constructor(e, t, r, n, s, i) {
+    super(), this._sheetInterceptorService = e, this._themeService = t, this._sheetSkeletonManagerService = r, this._commandService = n, this._numfmtService = s, this._localeService = i, this._initInterceptorCellContent();
   }
   _initInterceptorCellContent() {
-    const e = new lt();
+    const e = new ut();
     this.disposeWithMe(
-      this._sheetInterceptorService.intercept(mt.CELL_CONTENT, {
+      this._sheetInterceptorService.intercept(ht.CELL_CONTENT, {
         handler: (t, r, n) => {
           const s = r.unitId, i = r.subUnitId, a = this._numfmtService.getValue(s, i, r.row, r.col);
           if (!a)
             return n(t);
           const o = t;
-          if (!o || o.t !== se.NUMBER)
+          if (!o || o.t !== ie.NUMBER)
             return n(t);
           let c = "";
           const d = e.getValue(r.row, r.col);
           if (d && d.parameters === o.v)
             return { ...t, ...d.result };
-          const l = gt(a.pattern, Number(o.v));
+          const l = et(a.pattern, Number(o.v), this._localeService.getCurrentLocale());
           if (c = l.result, !c)
             return n(t);
           const u = { v: c };
@@ -329,10 +331,10 @@ let Ie = class extends H {
         }
       })
     ), this.disposeWithMe(
-      Z(
+      q(
         this._sheetSkeletonManagerService.currentSkeleton$.pipe(
           le((t) => t == null ? void 0 : t.sheetId),
-          ht()
+          ft()
         ).subscribe(() => {
           e.reset();
         })
@@ -340,17 +342,18 @@ let Ie = class extends H {
     );
   }
 };
-Ie = $n([
-  k(U.Rendered, Ie),
-  oe(0, g(Ae)),
-  oe(1, g(ut)),
-  oe(2, g(Ke)),
-  oe(3, g(E)),
-  oe(4, g(A))
+Ie = Un([
+  k($.Rendered, Ie),
+  re(0, g(Ae)),
+  re(1, g(dt)),
+  re(2, g(Ke)),
+  re(3, g(D)),
+  re(4, g(U)),
+  re(5, g(j))
 ], Ie);
 const W = (e, t = 0) => {
   var n;
-  return e && (n = D.getInfo(e).maxDecimals) != null ? n : t;
+  return e && (n = V.getInfo(e).maxDecimals) != null ? n : t;
 }, Le = (e, t) => {
   if (e && !t || !e && t)
     return !1;
@@ -362,19 +365,19 @@ const W = (e, t = 0) => {
       return u.type === "point" ? (l.isEnd = !0, l) : { ...l, result: l.result + m };
     },
     { isEnd: !1, result: "" }
-  ).result, n = D.getInfo(e)._partitions, s = D.getInfo(t)._partitions, i = r(n[0].tokens), a = r(s[0].tokens), o = r(n[1].tokens), c = r(s[1].tokens);
+  ).result, n = V.getInfo(e)._partitions, s = V.getInfo(t)._partitions, i = r(n[0].tokens), a = r(s[0].tokens), o = r(n[1].tokens), c = r(s[1].tokens);
   return i === a && o === c && n[1].color === s[1].color;
-}, at = (e) => new Array(Math.min(Math.max(0, Number(e)), 30)).fill(0).join(""), I = (e, t) => e.split(";").map((n) => /\.0?/.test(n) ? n.replace(
+}, ot = (e) => new Array(Math.min(Math.max(0, Number(e)), 30)).fill(0).join(""), I = (e, t) => e.split(";").map((n) => /\.0?/.test(n) ? n.replace(
   /\.0*/g,
-  `${t > 0 ? "." : ""}${at(Number(t || 0))}`
+  `${t > 0 ? "." : ""}${ot(Number(t || 0))}`
 ) : /0([^0]?)|0$/.test(n) ? n.replace(
   /0([^0]+)|0$/,
-  `0${t > 0 ? "." : ""}${at(Number(t || 0))}$1`
-) : n).join(";"), Un = (e) => /\.0?/.test(e) || /0([^0]?)|0$/.test(e), _t = {
+  `0${t > 0 ? "." : ""}${ot(Number(t || 0))}$1`
+) : n).join(";"), An = (e) => /\.0?/.test(e) || /0([^0]?)|0$/.test(e), _t = {
   id: "sheet.command.numfmt.add.decimal.command",
   type: X.COMMAND,
   handler: async (e) => {
-    const t = e.get(E), r = e.get(ee), n = e.get(A), s = e.get($), i = r.getSelections();
+    const t = e.get(D), r = e.get(ee), n = e.get(U), s = e.get(E), i = r.getSelections();
     if (!i || !i.length)
       return !1;
     const a = s.getCurrentUniverSheetInstance(), o = a.getActiveSheet(), c = a.getUnitId(), d = o.getSheetId();
@@ -409,7 +412,7 @@ const W = (e, t = 0) => {
       });
     }), h.length ? await t.executeCommand(Q.id, { values: h }) : !1;
   }
-}, An = [
+}, Ln = [
   {
     label: "1930-08-05",
     suffix: "yyyy-MM-dd"
@@ -454,7 +457,7 @@ const W = (e, t = 0) => {
     label: "08-05 下午 01:30",
     suffix: "MM-dd A/P hh:mm"
   }
-], Ln = [
+], Vn = [
   {
     label: "(1,235)",
     suffix: "#,##0_);(#,##0)"
@@ -514,7 +517,7 @@ const W = (e, t = 0) => {
   id: "sheet.command.numfmt.set.currency",
   type: X.COMMAND,
   handler: async (e) => {
-    const t = e.get(E), n = e.get(ee).getSelections();
+    const t = e.get(D), n = e.get(ee).getSelections();
     if (!n || !n.length)
       return !1;
     const s = [], i = St[0].suffix("¥");
@@ -528,7 +531,7 @@ const W = (e, t = 0) => {
   id: "sheet.command.numfmt.subtract.decimal.command",
   type: X.COMMAND,
   handler: async (e) => {
-    const t = e.get(E), r = e.get(ee), n = e.get(A), s = e.get($), i = r.getSelections();
+    const t = e.get(D), r = e.get(ee), n = e.get(U), s = e.get(E), i = r.getSelections();
     if (!i || !i.length)
       return !1;
     const a = s.getCurrentUniverSheetInstance(), o = a.getActiveSheet(), c = a.getUnitId(), d = o.getSheetId();
@@ -570,12 +573,12 @@ const W = (e, t = 0) => {
     // do nothing,just notify panel is closed
     !0
   )
-}, et = cn("INumfmtController");
-Ht(U.Rendered, et);
+}, tt = ln("INumfmtController");
+kt($.Rendered, tt);
 const $e = {
   id: "sheet.operation.open.numfmt.panel",
   type: X.OPERATION,
-  handler: (e) => (e.get(et).openPanel(), !0)
+  handler: (e) => (e.get(tt).openPanel(), !0)
 };
 var yt = { exports: {} }, Ve = {};
 /**
@@ -587,23 +590,23 @@ var yt = { exports: {} }, Ve = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var Vn = yn, Hn = Symbol.for("react.element"), kn = Symbol.for("react.fragment"), Fn = Object.prototype.hasOwnProperty, Bn = Vn.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, zn = { key: !0, ref: !0, __self: !0, __source: !0 };
+var Hn = Rn, kn = Symbol.for("react.element"), Fn = Symbol.for("react.fragment"), Bn = Object.prototype.hasOwnProperty, zn = Hn.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, Wn = { key: !0, ref: !0, __self: !0, __source: !0 };
 function Rt(e, t, r) {
   var n, s = {}, i = null, a = null;
   r !== void 0 && (i = "" + r), t.key !== void 0 && (i = "" + t.key), t.ref !== void 0 && (a = t.ref);
   for (n in t)
-    Fn.call(t, n) && !zn.hasOwnProperty(n) && (s[n] = t[n]);
+    Bn.call(t, n) && !Wn.hasOwnProperty(n) && (s[n] = t[n]);
   if (e && e.defaultProps)
     for (n in t = e.defaultProps, t)
       s[n] === void 0 && (s[n] = t[n]);
-  return { $$typeof: Hn, type: e, key: i, ref: a, props: s, _owner: Bn.current };
+  return { $$typeof: kn, type: e, key: i, ref: a, props: s, _owner: zn.current };
 }
-Ve.Fragment = kn;
+Ve.Fragment = Fn;
 Ve.jsx = Rt;
 Ve.jsxs = Rt;
 yt.exports = Ve;
 var p = yt.exports;
-const tt = Rn([]), We = [
+const nt = In([]), We = [
   "$",
   "£",
   "¥",
@@ -632,11 +635,11 @@ const tt = Rn([]), We = [
   "₾",
   "₿"
 ];
-var Wn = Object.defineProperty, Kn = Object.getOwnPropertyDescriptor, Gn = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Kn(t, r) : t, i = e.length - 1, a; i >= 0; i--)
+var Kn = Object.defineProperty, Gn = Object.getOwnPropertyDescriptor, Yn = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Gn(t, r) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (s = (n ? a(t, r, s) : a(s)) || s);
-  return n && s && Wn(t, r, s), s;
-}, Yn = (e, t) => (r, n) => t(r, n, e);
+  return n && s && Kn(t, r, s), s;
+}, Zn = (e, t) => (r, n) => t(r, n, e);
 let Ue = class {
   constructor(e) {
     this._localStorageService = e;
@@ -681,22 +684,22 @@ let Ue = class {
     this._localStorageService.removeItem(e);
   }
 };
-Ue = Gn([
-  Yn(0, g(kt))
+Ue = Yn([
+  Zn(0, g(Ft))
 ], Ue);
-const ot = "numfmtCurrency", qn = (e) => {
-  const t = N(Ue), [r, n] = x(We);
+const ct = "numfmtCurrency", qn = (e) => {
+  const t = T(Ue), [r, n] = x(We);
   return Ye(() => {
     t.addHabit("numfmtCurrency", []).then(() => {
-      t.getHabit(ot, [...We]).then((i) => {
+      t.getHabit(ct, [...We]).then((i) => {
         n(i), e && e(i);
       });
     });
   }, []), { userHabitCurrency: r, mark: (i) => {
-    t.markHabit(ot, i);
+    t.markHabit(ct, i);
   } };
-}, Zn = () => {
-  const e = qe([]), [t, r] = x({});
+}, Jn = () => {
+  const e = Ze([]), [t, r] = x({});
   return Ye(() => {
     e.current.forEach((s) => {
       s();
@@ -704,8 +707,8 @@ const ot = "numfmtCurrency", qn = (e) => {
   }, [t]), (s) => {
     e.current.push(s), r({});
   };
-}, Se = (e) => We.find((r) => e.includes(r)), Jn = (e) => !!Se(e) && e.startsWith("_("), Qn = (e) => {
-  const [t, r] = x(() => W(e.defaultPattern || "", 2)), n = vt(tt), [s, i] = x(() => Se(e.defaultPattern) || n[0]), a = V(() => n.map((u) => ({ label: u, value: u })), []), c = N(T).t;
+}, Se = (e) => We.find((r) => e.includes(r)), Qn = (e) => !!Se(e) && e.startsWith("_("), Xn = (e) => {
+  const [t, r] = x(() => W(e.defaultPattern || "", 2)), n = gt(nt), [s, i] = x(() => Se(e.defaultPattern) || n[0]), a = L(() => n.map((u) => ({ label: u, value: u })), []), c = T(j).t;
   e.action.current = () => I(`_("${s}"* #,##0${t > 0 ? ".0" : ""}_)`, t);
   const d = (u) => {
     i(u), e.onChange(I(`_("${u}"* #,##0${t > 0 ? ".0" : ""}_)`, t));
@@ -717,7 +720,7 @@ const ot = "numfmtCurrency", qn = (e) => {
     /* @__PURE__ */ p.jsxs("div", { className: "m-t-16 options ", children: [
       /* @__PURE__ */ p.jsxs("div", { className: "option", children: [
         /* @__PURE__ */ p.jsx("div", { className: "label", children: c("sheet.numfmt.decimalLength") }),
-        /* @__PURE__ */ p.jsx("div", { className: "m-t-8 w-120", children: /* @__PURE__ */ p.jsx(Ze, { value: t, max: 20, min: 0, onChange: l }) })
+        /* @__PURE__ */ p.jsx("div", { className: "m-t-8 w-120", children: /* @__PURE__ */ p.jsx(qe, { value: t, max: 20, min: 0, onChange: l }) })
       ] }),
       /* @__PURE__ */ p.jsxs("div", { className: "option", children: [
         /* @__PURE__ */ p.jsx("div", { className: "label", children: c("sheet.numfmt.currencyType") }),
@@ -730,12 +733,12 @@ const ot = "numfmtCurrency", qn = (e) => {
   label: t.label(e),
   value: t.suffix(e),
   color: t.color
-})), It = () => An.map((e) => ({ label: e.label, value: e.suffix })), Mt = () => Ln.map((e) => ({ label: e.label, value: e.suffix, color: e.color })), Xn = (e) => !!Se(e) && !e.startsWith("_("), er = (e) => {
-  const r = N(T).t, n = vt(tt), [s, i] = x(() => Se(e.defaultPattern) || n[0]), [a, o] = x(() => W(e.defaultPattern || "", 2)), [c, d] = x(() => {
+})), It = () => Ln.map((e) => ({ label: e.label, value: e.suffix })), Mt = () => Vn.map((e) => ({ label: e.label, value: e.suffix, color: e.color })), er = (e) => !!Se(e) && !e.startsWith("_("), tr = (e) => {
+  const r = T(j).t, n = gt(nt), [s, i] = x(() => Se(e.defaultPattern) || n[0]), [a, o] = x(() => W(e.defaultPattern || "", 2)), [c, d] = x(() => {
     var S;
     const v = Fe(s);
     return ((S = v.find((C) => Le(C.value, e.defaultPattern))) == null ? void 0 : S.value) || v[0].value;
-  }), l = V(() => Fe(s), [s]), u = V(() => n.map((v) => ({ label: v, value: v })), [n]);
+  }), l = L(() => Fe(s), [s]), u = L(() => n.map((v) => ({ label: v, value: v })), [n]);
   e.action.current = () => I(c, a);
   const m = (v) => {
     i(v);
@@ -750,7 +753,7 @@ const ot = "numfmtCurrency", qn = (e) => {
     /* @__PURE__ */ p.jsxs("div", { className: "m-t-16 options ", children: [
       /* @__PURE__ */ p.jsxs("div", { className: "option", children: [
         /* @__PURE__ */ p.jsx("div", { className: "label", children: r("sheet.numfmt.decimalLength") }),
-        /* @__PURE__ */ p.jsx("div", { className: "m-t-8 w-120", children: /* @__PURE__ */ p.jsx(Ze, { value: a, max: 20, min: 0, onChange: _ }) })
+        /* @__PURE__ */ p.jsx("div", { className: "m-t-8 w-120", children: /* @__PURE__ */ p.jsx(qe, { value: a, max: 20, min: 0, onChange: _ }) })
       ] }),
       /* @__PURE__ */ p.jsxs("div", { className: "option", children: [
         /* @__PURE__ */ p.jsx("div", { className: "label", children: r("sheet.numfmt.currencyType") }),
@@ -761,11 +764,11 @@ const ot = "numfmtCurrency", qn = (e) => {
     /* @__PURE__ */ p.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ p.jsx(Qe, { onChange: h, options: l, value: c }) }),
     /* @__PURE__ */ p.jsx("div", { className: "describe m-t-14", children: r("sheet.numfmt.currencyDes") })
   ] });
-}, tr = (e) => {
-  const t = D.getInfo(e);
-  return It().map((r) => r.value).includes(e) || ["date", "datetime", "time"].includes(t.type);
 }, nr = (e) => {
-  const t = V(It, []), n = N(T).t, [s, i] = x(() => {
+  const t = V.getInfo(e);
+  return It().map((r) => r.value).includes(e) || ["date", "datetime", "time"].includes(t.type);
+}, rr = (e) => {
+  const t = L(It, []), n = T(j).t, [s, i] = x(() => {
     if (e.defaultPattern) {
       const o = t.find((c) => c.value === e.defaultPattern);
       if (o)
@@ -782,14 +785,14 @@ const ot = "numfmtCurrency", qn = (e) => {
     /* @__PURE__ */ p.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ p.jsx(Qe, { value: s, options: t, onChange: a }) }),
     /* @__PURE__ */ p.jsx("div", { className: "describe m-t-14", children: n("sheet.numfmt.dateDes") })
   ] });
-}, rr = (e) => !e, sr = (e) => {
-  const r = N(T).t;
+}, sr = (e) => !e, ir = (e) => {
+  const r = T(j).t;
   return e.action.current = () => "", /* @__PURE__ */ p.jsx("div", { children: /* @__PURE__ */ p.jsx("div", { className: "describe m-t-14", children: r("sheet.numfmt.generalDes") }) });
-}, ir = (e) => Mt().some((t) => Le(t.value, e)), ar = (e) => {
-  const t = N(T), r = V(Mt, []), [n, s] = x(() => W(e.defaultPattern || "", 0)), [i, a] = x(() => {
+}, ar = (e) => Mt().some((t) => Le(t.value, e)), or = (e) => {
+  const t = T(j), r = L(Mt, []), [n, s] = x(() => W(e.defaultPattern || "", 0)), [i, a] = x(() => {
     const u = r.find((m) => Le(m.value, e.defaultPattern || ""));
     return (u == null ? void 0 : u.value) || r[0].value;
-  }), o = V(() => I(i, Number(n || 0)), [i, n]), c = V(() => !Un(i), [i]), d = (u) => {
+  }), o = L(() => I(i, Number(n || 0)), [i, n]), c = L(() => !An(i), [i]), d = (u) => {
     s(u || 0), e.onChange(I(i, Number(u || 0)));
   }, l = (u) => {
     s(W(u, 0)), a(u), e.onChange(u);
@@ -797,7 +800,7 @@ const ot = "numfmtCurrency", qn = (e) => {
   return e.action.current = () => o, /* @__PURE__ */ p.jsxs("div", { children: [
     /* @__PURE__ */ p.jsx("div", { className: "m-t-16 label", children: t.t("sheet.numfmt.decimalLength") }),
     /* @__PURE__ */ p.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ p.jsx(
-      Ze,
+      qe,
       {
         disabled: c,
         value: n,
@@ -813,29 +816,29 @@ const ot = "numfmtCurrency", qn = (e) => {
     /* @__PURE__ */ p.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ p.jsx(Qe, { onChange: l, options: r, value: i }) }),
     /* @__PURE__ */ p.jsx("div", { className: "describe m-t-14", children: t.t("sheet.numfmt.thousandthPercentileDes") })
   ] });
-}, or = (e) => {
-  const { defaultValue: t, defaultPattern: r, row: n, col: s } = e.value, i = N(T), a = qe(() => ""), o = i.t, c = Zn(), d = V(
+}, cr = (e) => {
+  const { defaultValue: t, defaultPattern: r, row: n, col: s } = e.value, i = T(j), a = Ze(() => ""), o = i.t, c = Jn(), d = L(
     () => [
-      { label: "sheet.numfmt.general", component: sr },
-      { label: "sheet.numfmt.accounting", component: Qn },
-      { label: "sheet.numfmt.currency", component: er },
-      { label: "sheet.numfmt.date", component: nr },
-      { label: "sheet.numfmt.thousandthPercentile", component: ar }
+      { label: "sheet.numfmt.general", component: ir },
+      { label: "sheet.numfmt.accounting", component: Xn },
+      { label: "sheet.numfmt.currency", component: tr },
+      { label: "sheet.numfmt.date", component: rr },
+      { label: "sheet.numfmt.thousandthPercentile", component: or }
     ].map((b) => ({ ...b, label: o(b.label) })),
     []
-  ), [l, u] = x(S), [m, h] = x(() => `${n}_${s}`), { mark: _, userHabitCurrency: v } = qn(() => h(`${n}_${s}_userCurrency'`)), f = V(() => {
+  ), [l, u] = x(S), [m, h] = x(() => `${n}_${s}`), { mark: _, userHabitCurrency: v } = qn(() => h(`${n}_${s}_userCurrency'`)), f = L(() => {
     var b;
     return (b = d.find((ne) => ne.label === l)) == null ? void 0 : b.component;
   }, [l]);
   function S() {
-    return [rr, Jn, Xn, tr, ir].reduce((ne, Dt, Et) => ne || (Dt(r) ? d[Et].label : ""), "") || d[0].label;
+    return [sr, Qn, er, nr, ar].reduce((ne, Dt, Et) => ne || (Dt(r) ? d[Et].label : ""), "") || d[0].label;
   }
   const C = d.map((b) => ({
     label: b.label,
     value: b.label
   })), y = (b) => {
     u(b), c(() => e.onChange({ type: "change", value: a.current() || "" }));
-  }, L = (b) => {
+  }, A = (b) => {
     e.onChange({ type: "change", value: b });
   }, G = () => {
     const b = a.current() || "", ne = Se(b);
@@ -843,7 +846,7 @@ const ot = "numfmtCurrency", qn = (e) => {
   }, F = () => {
     e.onChange({ type: "cancel", value: "" });
   }, B = {
-    onChange: L,
+    onChange: A,
     defaultValue: t,
     defaultPattern: r,
     action: a
@@ -854,18 +857,18 @@ const ot = "numfmtCurrency", qn = (e) => {
     /* @__PURE__ */ p.jsxs("div", { children: [
       /* @__PURE__ */ p.jsx("div", { className: "label m-t-14", children: o("sheet.numfmt.numfmtType") }),
       /* @__PURE__ */ p.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ p.jsx(Je, { onChange: y, options: C, value: l }) }),
-      /* @__PURE__ */ p.jsx("div", { children: f && /* @__PURE__ */ p.jsx(tt.Provider, { value: v, children: /* @__PURE__ */ te(f, { ...B, key: m }) }) })
+      /* @__PURE__ */ p.jsx("div", { children: f && /* @__PURE__ */ p.jsx(nt.Provider, { value: v, children: /* @__PURE__ */ te(f, { ...B, key: m }) }) })
     ] }),
     /* @__PURE__ */ p.jsxs("div", { className: "btn-list m-t-14 m-b-20", children: [
-      /* @__PURE__ */ p.jsx(it, { size: "small", onClick: F, className: "m-r-12", children: o("sheet.numfmt.cancel") }),
-      /* @__PURE__ */ p.jsx(it, { type: "primary", size: "small", onClick: G, children: o("sheet.numfmt.confirm") })
+      /* @__PURE__ */ p.jsx(at, { size: "small", onClick: F, className: "m-r-12", children: o("sheet.numfmt.cancel") }),
+      /* @__PURE__ */ p.jsx(at, { type: "primary", size: "small", onClick: G, children: o("sheet.numfmt.confirm") })
     ] })
   ] });
-}, Ot = {
+}, Pt = {
   id: "sheet.command.numfmt.set.percent",
   type: X.COMMAND,
   handler: async (e) => {
-    const t = e.get(E), n = e.get(ee).getSelections();
+    const t = e.get(D), n = e.get(ee).getSelections();
     if (!n || !n.length)
       return !1;
     const s = [], i = "0%";
@@ -876,11 +879,11 @@ const ot = "numfmtCurrency", qn = (e) => {
     }), await t.executeCommand(Q.id, { values: s });
   }
 };
-var cr = Object.defineProperty, lr = Object.getOwnPropertyDescriptor, ur = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? lr(t, r) : t, i = e.length - 1, a; i >= 0; i--)
+var lr = Object.defineProperty, ur = Object.getOwnPropertyDescriptor, dr = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? ur(t, r) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (s = (n ? a(t, r, s) : a(s)) || s);
-  return n && s && cr(t, r, s), s;
-}, O = (e, t) => (r, n) => t(r, n, e);
+  return n && s && lr(t, r, s), s;
+}, P = (e, t) => (r, n) => t(r, n, e);
 let Me = class extends H {
   constructor(t, r, n, s, i, a, o, c, d, l, u, m) {
     super();
@@ -903,23 +906,23 @@ let Me = class extends H {
       );
       let h = "";
       m && (h = m.pattern);
-      const _ = (u == null ? void 0 : u.t) === se.NUMBER ? u.v : 12345678, v = {
+      const _ = (u == null ? void 0 : u.t) === ie.NUMBER ? u.v : 12345678, v = {
         onChange: (f) => {
           var S, C;
           if (f.type === "change")
             this._previewPattern = f.value, this._sheetSkeletonManagerService.reCalculate(), (C = (S = this._renderManagerService.getRenderById(d.getUnitId())) == null ? void 0 : S.mainComponent) == null || C.makeDirty();
           else if (f.type === "confirm") {
-            const y = r.getSelectionRanges() || [], L = { values: [] }, G = Xe(f.value);
+            const y = r.getSelectionRanges() || [], A = { values: [] }, G = Xe(f.value);
             y.forEach((F) => {
               R.foreach(F, (B, b) => {
-                L.values.push({
+                A.values.push({
                   row: B,
                   col: b,
                   pattern: f.value,
                   type: G
                 });
               });
-            }), n.executeCommand(Q.id, L), t.close();
+            }), n.executeCommand(Q.id, A), t.close();
           } else
             f.type === "cancel" && t.close();
         },
@@ -945,7 +948,7 @@ let Me = class extends H {
       _t,
       bt,
       Ct,
-      Ot,
+      Pt,
       $e,
       ke,
       Q
@@ -954,7 +957,7 @@ let Me = class extends H {
     });
   }
   _initPanel() {
-    this._componentManager.register(ue, or);
+    this._componentManager.register(ue, cr);
   }
   _initInterceptorCommands() {
     const t = this;
@@ -962,8 +965,8 @@ let Me = class extends H {
       this._sheetInterceptorService.interceptCommand({
         getMutations(r) {
           switch (r.id) {
-            case Wt.id:
-            case zt.id: {
+            case Kt.id:
+            case Wt.id: {
               const n = t._univerInstanceService.getCurrentUniverSheetInstance().getUnitId(), s = t._univerInstanceService.getCurrentUniverSheetInstance().getActiveSheet().getSheetId(), i = t._selectionManagerService.getSelectionRanges();
               if (!(i != null && i.length))
                 break;
@@ -998,35 +1001,35 @@ let Me = class extends H {
     );
   }
   _initRealTimeRenderingInterceptor() {
-    const t = new q((n) => {
+    const t = new Z((n) => {
       this._commandService.onCommandExecuted((s) => {
         s.id === $e.id && n.next(!0), s.id === ke.id && n.next(!1);
       });
-    }), r = bn([
+    }), r = yn([
       t,
       this._selectionManagerService.selectionMoveEnd$.pipe(
         le((n) => n ? n.map((s) => s.range) : [])
       )
     ]);
     this.disposeWithMe(
-      Z(
+      q(
         r.pipe(
-          ft(
-            ([n, s]) => new q((i) => {
-              const a = new dt();
+          pt(
+            ([n, s]) => new Z((i) => {
+              const a = new mt();
               return n && s.length && i.next({ selectionRanges: s, disposableCollection: a }), () => {
                 a.dispose();
               };
             })
           ),
-          fn(() => {
+          pn(() => {
             this._previewPattern = null;
           })
         ).subscribe(({ disposableCollection: n, selectionRanges: s }) => {
           var a, o;
           const i = this._univerInstanceService.getCurrentUniverSheetInstance();
           this.openPanel(), n.add(
-            this._sheetInterceptorService.intercept(mt.CELL_CONTENT, {
+            this._sheetInterceptorService.intercept(ht.CELL_CONTENT, {
               priority: 99,
               handler: (c, d, l) => {
                 const { row: u, col: m } = d;
@@ -1034,22 +1037,22 @@ let Me = class extends H {
                   (h) => h.startColumn <= m && h.endColumn >= m && h.startRow <= u && h.endRow >= u
                 )) {
                   const h = d.worksheet.getCellRaw(u, m), _ = h == null ? void 0 : h.v, v = h == null ? void 0 : h.t;
-                  if (_ == null || v !== se.NUMBER || this._previewPattern === null)
+                  if (_ == null || v !== ie.NUMBER || this._previewPattern === null)
                     return l(c);
-                  const f = gt(this._previewPattern, _);
+                  const f = et(this._previewPattern, _, this._localeService.getCurrentLocale());
                   if (f.color) {
                     const C = this._themeService.getCurrentTheme()[`${f.color}500`];
                     return {
                       ...c,
                       v: f.result,
-                      t: se.STRING,
+                      t: ie.STRING,
                       s: { cl: { rgb: C } }
                     };
                   }
                   return {
                     ...c,
                     v: f.result,
-                    t: se.STRING
+                    t: ie.STRING
                   };
                 }
                 return l(c);
@@ -1063,9 +1066,9 @@ let Me = class extends H {
   _commandExecutedListener() {
     const t = [M.id, w.id];
     this.disposeWithMe(
-      Z(
+      q(
         Ge(
-          new q((r) => {
+          new Z((r) => {
             const n = this._commandService.onCommandExecuted((s) => {
               if (t.includes(s.id)) {
                 const i = s.params;
@@ -1077,7 +1080,7 @@ let Me = class extends H {
             };
           }),
           this._numfmtService.modelReplace$
-        ).pipe(pn(16)).subscribe((r) => {
+        ).pipe(vn(16)).subscribe((r) => {
           var n, s;
           this._sheetSkeletonManagerService.reCalculate(), (s = (n = this._renderManagerService.getRenderById(r)) == null ? void 0 : n.mainComponent) == null || s.makeDirty();
         })
@@ -1085,27 +1088,27 @@ let Me = class extends H {
     );
   }
 };
-Me = ur([
-  k(U.Rendered, Me),
-  O(0, g(Ae)),
-  O(1, g(ut)),
-  O(2, g(K)),
-  O(3, g($)),
-  O(4, g(Ke)),
-  O(5, g(E)),
-  O(6, g(ee)),
-  O(7, g(gn)),
-  O(8, g(A)),
-  O(9, g(pt)),
-  O(10, g(Sn)),
-  O(11, g(T))
+Me = dr([
+  k($.Rendered, Me),
+  P(0, g(Ae)),
+  P(1, g(dt)),
+  P(2, g(K)),
+  P(3, g(E)),
+  P(4, g(Ke)),
+  P(5, g(D)),
+  P(6, g(ee)),
+  P(7, g(_n)),
+  P(8, g(U)),
+  P(9, g(vt)),
+  P(10, g(Cn)),
+  P(11, g(j))
 ], Me);
-var dr = Object.defineProperty, mr = Object.getOwnPropertyDescriptor, hr = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? mr(t, r) : t, i = e.length - 1, a; i >= 0; i--)
+var mr = Object.defineProperty, hr = Object.getOwnPropertyDescriptor, fr = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? hr(t, r) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (s = (n ? a(t, r, s) : a(s)) || s);
-  return n && s && dr(t, r, s), s;
+  return n && s && mr(t, r, s), s;
 }, be = (e, t) => (r, n) => t(r, n, e);
-let Oe = class extends H {
+let Pe = class extends H {
   constructor(t, r, n, s) {
     super();
     Y(this, "_copyInfo");
@@ -1117,14 +1120,14 @@ let Oe = class extends H {
         id: ue,
         onBeforeCopy: (t, r, n) => this._collectNumfmt(t, r, n),
         onPasteCells: (t, r, n, s) => {
-          const { copyType: i = nt.COPY, pasteType: a } = s, { range: o } = t || {}, { range: c } = r;
+          const { copyType: i = rt.COPY, pasteType: a } = s, { range: o } = t || {}, { range: c } = r;
           return this._generateNumfmtMutations(c, { copyType: i, pasteType: a, copyRange: o });
         }
       })
     );
   }
   _collectNumfmt(t, r, n) {
-    const s = new lt();
+    const s = new ut();
     this._copyInfo = {
       matrix: s,
       info: {
@@ -1154,15 +1157,15 @@ let Oe = class extends H {
   }
   _generateNumfmtMutations(t, r) {
     const n = this._univerInstanceService.getCurrentUniverSheetInstance(), s = n.getActiveSheet(), i = n.getUnitId(), a = s.getSheetId();
-    if (r.copyType === nt.CUT)
+    if (r.copyType === rt.CUT)
       return this._copyInfo = null, { redos: [], undos: [] };
     if (!this._copyInfo || !this._copyInfo.matrix.getSizeOf() || !r.copyRange)
       return { redos: [], undos: [] };
-    if ([rt.SPECIAL_PASTE_COL_WIDTH, rt.SPECIAL_PASTE_VALUE].includes(
+    if ([st.SPECIAL_PASTE_COL_WIDTH, st.SPECIAL_PASTE_VALUE].includes(
       r.pasteType
     ))
       return { redos: [], undos: [] };
-    const o = dn(r.copyRange, t, !0), c = [], d = { unitId: i, subUnitId: a, ranges: [] }, l = this._numfmtService.getModel(i, a);
+    const o = mn(r.copyRange, t, !0), c = [], d = { unitId: i, subUnitId: a, ranges: [] }, l = this._numfmtService.getModel(i, a);
     R.foreach(t, (h, _) => {
       this._numfmtService.getValue(i, a, h, _, l) && d.ranges.push({ startRow: h, startColumn: _, endRow: h, endColumn: _ });
     }), o.forEach((h) => {
@@ -1202,19 +1205,19 @@ let Oe = class extends H {
     };
   }
 };
-Oe = hr([
-  k(U.Rendered, Oe),
-  be(0, g(mn)),
+Pe = fr([
+  k($.Rendered, Pe),
+  be(0, g(hn)),
   be(1, g(K)),
-  be(2, g(A)),
-  be(3, g($))
-], Oe);
-var fr = Object.defineProperty, pr = Object.getOwnPropertyDescriptor, vr = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? pr(t, r) : t, i = e.length - 1, a; i >= 0; i--)
+  be(2, g(U)),
+  be(3, g(E))
+], Pe);
+var pr = Object.defineProperty, vr = Object.getOwnPropertyDescriptor, gr = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? vr(t, r) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (s = (n ? a(t, r, s) : a(s)) || s);
-  return n && s && fr(t, r, s), s;
+  return n && s && pr(t, r, s), s;
 }, ce = (e, t) => (r, n) => t(r, n, e);
-const gr = () => {
+const _r = () => {
   let e = [];
   return {
     add: (s, i, a, o, c) => e.push({ unitId: s, subUnitId: i, row: a, col: o, value: c }),
@@ -1224,16 +1227,16 @@ const gr = () => {
     }
   };
 };
-let Pe = class extends H {
+let Oe = class extends H {
   constructor(t, r, n, s, i) {
     super();
     // collect effect mutations when edit end and push this to  commands stack in next commands progress
-    Y(this, "_collectEffectMutation", gr());
+    Y(this, "_collectEffectMutation", _r());
     this._sheetInterceptorService = t, this._numfmtService = r, this._univerInstanceService = n, this._injector = s, this._editorBridgeService = i, this._initInterceptorEditorStart(), this._initInterceptorEditorEnd(), this._initInterceptorCommands();
   }
   _initInterceptorEditorStart() {
     this.disposeWithMe(
-      Z(
+      q(
         this._editorBridgeService.interceptor.intercept(
           this._editorBridgeService.interceptor.getInterceptPoints().BEFORE_CELL_EDIT,
           {
@@ -1272,7 +1275,7 @@ let Pe = class extends H {
    */
   _initInterceptorEditorEnd() {
     this.disposeWithMe(
-      Z(
+      q(
         this._editorBridgeService.interceptor.intercept(
           this._editorBridgeService.interceptor.getInterceptPoints().AFTER_CELL_EDIT,
           {
@@ -1294,7 +1297,7 @@ let Pe = class extends H {
               };
               if (!(t != null && t.v))
                 return n(t);
-              const a = String(t.v), o = D.parseDate(a) || D.parseTime(a);
+              const a = String(t.v), o = V.parseDate(a) || V.parseTime(a);
               if (!!o) {
                 if (o && o.z) {
                   const d = Number(o.v);
@@ -1307,10 +1310,10 @@ let Pe = class extends H {
                       type: "date",
                       pattern: o.z
                     }
-                  ), { ...t, v: d, t: se.NUMBER };
+                  ), { ...t, v: d, t: ie.NUMBER };
                 }
               } else
-                (["date", "time", "datetime"].includes((s == null ? void 0 : s.type) || "") || !_r(a)) && i();
+                (["date", "time", "datetime"].includes((s == null ? void 0 : s.type) || "") || !Sr(a)) && i();
               return n(t);
             }
           }
@@ -1324,7 +1327,7 @@ let Pe = class extends H {
       this._sheetInterceptorService.interceptCommand({
         getMutations(r) {
           switch (r.id) {
-            case Kt.id: {
+            case Gt.id: {
               const n = t._univerInstanceService.getCurrentUniverSheetInstance().getUnitId(), s = t._univerInstanceService.getCurrentUniverSheetInstance().getActiveSheet().getSheetId(), i = t._collectEffectMutation.getEffects();
               if (!i.length)
                 return {
@@ -1381,45 +1384,45 @@ let Pe = class extends H {
     );
   }
 };
-Pe = vr([
-  k(U.Rendered, Pe),
+Oe = gr([
+  k($.Rendered, Oe),
   ce(0, g(Ae)),
-  ce(1, g(A)),
-  ce(2, g($)),
+  ce(1, g(U)),
+  ce(2, g(E)),
   ce(3, g(K)),
-  ce(4, g(hn))
-], Pe);
-function _r(e) {
+  ce(4, g(fn))
+], Oe);
+function Sr(e) {
   return /^-?\d+(\.\d+)?$/.test(e);
 }
-var Sr = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, br = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Cr(t, r) : t, i = e.length - 1, a; i >= 0; i--)
+var Cr = Object.defineProperty, br = Object.getOwnPropertyDescriptor, yr = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? br(t, r) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (s = (n ? a(t, r, s) : a(s)) || s);
-  return n && s && Sr(t, r, s), s;
-}, yr = (e, t) => (r, n) => t(r, n, e);
+  return n && s && Cr(t, r, s), s;
+}, Rr = (e, t) => (r, n) => t(r, n, e);
 let xe = class extends H {
   constructor(t) {
     super();
     Y(this, "_initLocal", () => {
-      this._localeService.load({ zhCN: wn, enUS: Pn });
+      this._localeService.load({ zhCN: jn, enUS: xn });
     });
     this._localeService = t, this._initLocal();
   }
 };
-xe = br([
-  k(U.Rendered, xe),
-  yr(0, g(T))
+xe = yr([
+  k($.Rendered, xe),
+  Rr(0, g(j))
 ], xe);
-var P = function() {
-  return P = Object.assign || function(e) {
+var O = function() {
+  return O = Object.assign || function(e) {
     for (var t, r = 1, n = arguments.length; r < n; r++) {
       t = arguments[r];
       for (var s in t)
         Object.prototype.hasOwnProperty.call(t, s) && (e[s] = t[s]);
     }
     return e;
-  }, P.apply(this, arguments);
-}, Rr = function(e, t) {
+  }, O.apply(this, arguments);
+}, Ir = function(e, t) {
   var r = {};
   for (var n in e)
     Object.prototype.hasOwnProperty.call(e, n) && t.indexOf(n) < 0 && (r[n] = e[n]);
@@ -1427,17 +1430,17 @@ var P = function() {
     for (var s = 0, n = Object.getOwnPropertySymbols(e); s < n.length; s++)
       t.indexOf(n[s]) < 0 && Object.prototype.propertyIsEnumerable.call(e, n[s]) && (r[n[s]] = e[n[s]]);
   return r;
-}, ae = ie(function(e, t) {
-  var r = e.icon, n = e.id, s = e.className, i = e.extend, a = Rr(e, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(n, " ").concat(s || "").trim(), c = qe("_".concat(Or()));
-  return Pt(r, "".concat(n), { defIds: r.defIds, idSuffix: c.current }, P({ ref: t, className: o }, a), i);
+}, oe = ae(function(e, t) {
+  var r = e.icon, n = e.id, s = e.className, i = e.extend, a = Ir(e, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(n, " ").concat(s || "").trim(), c = Ze("_".concat(Or()));
+  return Ot(r, "".concat(n), { defIds: r.defIds, idSuffix: c.current }, O({ ref: t, className: o }, a), i);
 });
-function Pt(e, t, r, n, s) {
-  return te(e.tag, P(P({ key: t }, Ir(e, r, s)), n), (Mr(e, r).children || []).map(function(i, a) {
-    return Pt(i, "".concat(t, "-").concat(e.tag, "-").concat(a), r, void 0, s);
+function Ot(e, t, r, n, s) {
+  return te(e.tag, O(O({ key: t }, Mr(e, r, s)), n), (Pr(e, r).children || []).map(function(i, a) {
+    return Ot(i, "".concat(t, "-").concat(e.tag, "-").concat(a), r, void 0, s);
   }));
 }
-function Ir(e, t, r) {
-  var n = P({}, e.attrs);
+function Mr(e, t, r) {
+  var n = O({}, e.attrs);
   r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1);
   var s = t.defIds;
   return !s || s.length === 0 || (e.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + t.idSuffix), Object.entries(n).forEach(function(i) {
@@ -1445,187 +1448,61 @@ function Ir(e, t, r) {
     typeof o == "string" && (n[a] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
   })), n;
 }
-function Mr(e, t) {
+function Pr(e, t) {
   var r, n = t.defIds;
-  return !n || n.length === 0 ? e : e.tag === "defs" && (!((r = e.children) === null || r === void 0) && r.length) ? P(P({}, e), { children: e.children.map(function(s) {
-    return typeof s.attrs.id == "string" && n && n.indexOf(s.attrs.id) > -1 ? P(P({}, s), { attrs: P(P({}, s.attrs), { id: s.attrs.id + t.idSuffix }) }) : s;
+  return !n || n.length === 0 ? e : e.tag === "defs" && (!((r = e.children) === null || r === void 0) && r.length) ? O(O({}, e), { children: e.children.map(function(s) {
+    return typeof s.attrs.id == "string" && n && n.indexOf(s.attrs.id) > -1 ? O(O({}, s), { attrs: O(O({}, s.attrs), { id: s.attrs.id + t.idSuffix }) }) : s;
   }) }) : e;
 }
 function Or() {
   return Math.random().toString(36).substring(2, 8);
 }
-ae.displayName = "UniverIcon";
-var Pr = {
-  tag: "svg",
-  attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" },
-  children: [
-    {
-      tag: "path",
-      attrs: {
-        fill: "currentColor",
-        d: "M3.99988 3.60921C3.99988 2.32055 5.04456 1.27588 6.33321 1.27588 7.62187 1.27588 8.66654 2.32055 8.66654 3.60921V6.24136C8.66654 7.53002 7.62187 8.5747 6.33321 8.5747 5.04455 8.5747 3.99988 7.53002 3.99988 6.24136V3.60921zM6.33321 2.60921C5.78093 2.60921 5.33321 3.05693 5.33321 3.60921V6.24136C5.33321 6.79364 5.78093 7.24136 6.33321 7.24136 6.88549 7.24136 7.33321 6.79364 7.33321 6.24136V3.60921C7.33321 3.05693 6.88549 2.60921 6.33321 2.60921zM9.99988 3.60921C9.99988 2.32055 11.0446 1.27588 12.3332 1.27588 13.6219 1.27588 14.6665 2.32055 14.6665 3.60921V6.24136C14.6665 7.53002 13.6219 8.5747 12.3332 8.5747 11.0446 8.5747 9.99988 7.53002 9.99988 6.24136V3.60921zM12.3332 2.60921C11.7809 2.60921 11.3332 3.05693 11.3332 3.60921V6.24136C11.3332 6.79364 11.7809 7.24136 12.3332 7.24136 12.8855 7.24136 13.3332 6.79364 13.3332 6.24136V3.60921C13.3332 3.05693 12.8855 2.60921 12.3332 2.60921z",
-        fillRule: "evenodd",
-        clipRule: "evenodd"
-      }
-    },
-    {
-      tag: "path",
-      attrs: {
-        fill: "currentColor",
-        d: "M12.4713 9.58625C12.211 9.3259 11.7889 9.3259 11.5285 9.58625 11.2682 9.8466 11.2682 10.2687 11.5285 10.5291L12.3904 11.391H6.33329C5.9651 11.391 5.66663 11.6895 5.66663 12.0577 5.66663 12.4258 5.9651 12.7243 6.33329 12.7243H12.3904L11.5285 13.5862C11.2682 13.8466 11.2682 14.2687 11.5285 14.5291 11.7889 14.7894 12.211 14.7894 12.4713 14.5291L14.4669 12.5335C14.4851 12.5156 14.5022 12.4968 14.5183 12.477 14.5484 12.4399 14.5739 12.4003 14.5948 12.359 14.6407 12.2685 14.6666 12.1661 14.6666 12.0577 14.6666 11.9492 14.6407 11.8468 14.5948 11.7563 14.5739 11.715 14.5484 11.6754 14.5183 11.6383 14.5022 11.6185 14.4851 11.5997 14.4669 11.5818L12.4713 9.58625zM1.33325 7.98825C1.33325 7.62006 1.63173 7.32159 1.99992 7.32159H2.33325C2.70144 7.32159 2.99992 7.62006 2.99992 7.98825 2.99992 8.35644 2.70144 8.65492 2.33325 8.65492H1.99992C1.63173 8.65492 1.33325 8.35644 1.33325 7.98825z"
-      }
-    }
-  ]
-}, xt = ie(function(e, t) {
-  return te(ae, Object.assign({}, e, {
+oe.displayName = "UniverIcon";
+var xr = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3.99988 3.60921C3.99988 2.32055 5.04456 1.27588 6.33321 1.27588 7.62187 1.27588 8.66654 2.32055 8.66654 3.60921V6.24136C8.66654 7.53002 7.62187 8.5747 6.33321 8.5747 5.04455 8.5747 3.99988 7.53002 3.99988 6.24136V3.60921zM6.33321 2.60921C5.78093 2.60921 5.33321 3.05693 5.33321 3.60921V6.24136C5.33321 6.79364 5.78093 7.24136 6.33321 7.24136 6.88549 7.24136 7.33321 6.79364 7.33321 6.24136V3.60921C7.33321 3.05693 6.88549 2.60921 6.33321 2.60921zM9.99988 3.60921C9.99988 2.32055 11.0446 1.27588 12.3332 1.27588 13.6219 1.27588 14.6665 2.32055 14.6665 3.60921V6.24136C14.6665 7.53002 13.6219 8.5747 12.3332 8.5747 11.0446 8.5747 9.99988 7.53002 9.99988 6.24136V3.60921zM12.3332 2.60921C11.7809 2.60921 11.3332 3.05693 11.3332 3.60921V6.24136C11.3332 6.79364 11.7809 7.24136 12.3332 7.24136 12.8855 7.24136 13.3332 6.79364 13.3332 6.24136V3.60921C13.3332 3.05693 12.8855 2.60921 12.3332 2.60921z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M12.4713 9.58625C12.211 9.3259 11.7889 9.3259 11.5285 9.58625 11.2682 9.8466 11.2682 10.2687 11.5285 10.5291L12.3904 11.391H6.33329C5.9651 11.391 5.66663 11.6895 5.66663 12.0577 5.66663 12.4258 5.9651 12.7243 6.33329 12.7243H12.3904L11.5285 13.5862C11.2682 13.8466 11.2682 14.2687 11.5285 14.5291 11.7889 14.7894 12.211 14.7894 12.4713 14.5291L14.4669 12.5335C14.4851 12.5156 14.5022 12.4968 14.5183 12.477 14.5484 12.4399 14.5739 12.4003 14.5948 12.359 14.6407 12.2685 14.6666 12.1661 14.6666 12.0577 14.6666 11.9492 14.6407 11.8468 14.5948 11.7563 14.5739 11.715 14.5484 11.6754 14.5183 11.6383 14.5022 11.6185 14.4851 11.5997 14.4669 11.5818L12.4713 9.58625zM1.33325 7.98825C1.33325 7.62006 1.63173 7.32159 1.99992 7.32159H2.33325C2.70144 7.32159 2.99992 7.62006 2.99992 7.98825 2.99992 8.35644 2.70144 8.65492 2.33325 8.65492H1.99992C1.63173 8.65492 1.33325 8.35644 1.33325 7.98825z" } }] }, xt = ae(function(e, t) {
+  return te(oe, Object.assign({}, e, {
     id: "add-digits-single",
     ref: t,
-    icon: Pr
+    icon: xr
   }));
 });
 xt.displayName = "AddDigitsSingle";
-const xr = xt;
-var wr = {
-  tag: "svg",
-  attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" },
-  children: [
-    {
-      tag: "mask",
-      attrs: {
-        id: "mask0_102_556",
-        style: { maskType: "alpha" },
-        width: 16,
-        height: 16,
-        x: 0,
-        y: 0,
-        maskUnits: "userSpaceOnUse"
-      },
-      children: [
-        { tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }
-      ]
-    },
-    {
-      tag: "g",
-      attrs: { mask: "url(#mask0_102_556)" },
-      children: [
-        {
-          tag: "path",
-          attrs: {
-            fill: "currentColor",
-            d: "M0.629584 3.99986C1.13729 3.4922 1.9604 3.49224 2.46806 3.99995L7.57569 9.10806C7.81 9.3424 8.18992 9.3424 8.42424 9.10808L13.5323 3.99998C14.04 3.4923 14.8631 3.4923 15.3708 3.99998C15.8785 4.50766 15.8785 5.33078 15.3708 5.83846L9.41415 11.7951C8.63307 12.5762 7.36669 12.5762 6.58565 11.7951L0.629497 5.83834C0.121839 5.33063 0.121879 4.50752 0.629584 3.99986Z",
-            fillRule: "evenodd",
-            clipRule: "evenodd"
-          }
-        }
-      ]
-    }
-  ]
-}, wt = ie(function(e, t) {
-  return te(ae, Object.assign({}, e, {
+const wr = xt;
+var jr = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "mask", attrs: { id: "mask0_102_556", style: { maskType: "alpha" }, width: 16, height: 16, x: 0, y: 0, maskUnits: "userSpaceOnUse" }, children: [{ tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }] }, { tag: "g", attrs: { mask: "url(#mask0_102_556)" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M0.629584 3.99986C1.13729 3.4922 1.9604 3.49224 2.46806 3.99995L7.57569 9.10806C7.81 9.3424 8.18992 9.3424 8.42424 9.10808L13.5323 3.99998C14.04 3.4923 14.8631 3.4923 15.3708 3.99998C15.8785 4.50766 15.8785 5.33078 15.3708 5.83846L9.41415 11.7951C8.63307 12.5762 7.36669 12.5762 6.58565 11.7951L0.629497 5.83834C0.121839 5.33063 0.121879 4.50752 0.629584 3.99986Z", fillRule: "evenodd", clipRule: "evenodd" } }] }] }, wt = ae(function(e, t) {
+  return te(oe, Object.assign({}, e, {
     id: "more-down-single",
     ref: t,
-    icon: wr
+    icon: jr
   }));
 });
 wt.displayName = "MoreDownSingle";
-const jr = wt;
-var Nr = {
-  tag: "svg",
-  attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" },
-  children: [
-    {
-      tag: "mask",
-      attrs: {
-        id: "mask0_561_2",
-        style: { maskType: "alpha" },
-        width: 16,
-        height: 16,
-        x: 0,
-        y: 0,
-        maskUnits: "userSpaceOnUse"
-      },
-      children: [
-        { tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }
-      ]
-    },
-    {
-      tag: "g",
-      attrs: {
-        fill: "currentColor",
-        mask: "url(#mask0_561_2)",
-        fillRule: "evenodd",
-        clipRule: "evenodd"
-      },
-      children: [
-        {
-          tag: "path",
-          attrs: {
-            d: "M4.91876 2.65039C3.66601 2.65039 2.65045 3.66595 2.65045 4.9187 2.65045 6.17146 3.66601 7.18702 4.91876 7.18702 6.17152 7.18702 7.18708 6.17146 7.18708 4.9187 7.18708 3.66595 6.17152 2.65039 4.91876 2.65039zM3.94663 4.9187C3.94663 4.38181 4.38187 3.94657 4.91876 3.94657 5.45566 3.94657 5.8909 4.38181 5.8909 4.9187 5.8909 5.4556 5.45566 5.89084 4.91876 5.89084 4.38187 5.89084 3.94663 5.4556 3.94663 4.9187zM11.0812 8.81299C9.82842 8.81299 8.81286 9.82855 8.81286 11.0813 8.81286 12.3341 9.82842 13.3496 11.0812 13.3496 12.3339 13.3496 13.3495 12.3341 13.3495 11.0813 13.3495 9.82855 12.3339 8.81299 11.0812 8.81299zM10.109 11.0813C10.109 10.5444 10.5443 10.1092 11.0812 10.1092 11.6181 10.1092 12.0533 10.5444 12.0533 11.0813 12.0533 11.6182 11.6181 12.0534 11.0812 12.0534 10.5443 12.0534 10.109 11.6182 10.109 11.0813zM13.1597 2.84021C13.4128 3.09331 13.4128 3.50365 13.1597 3.75675L3.7568 13.1596C3.5037 13.4127 3.09336 13.4127 2.84026 13.1596 2.58717 12.9065 2.58717 12.4962 2.84026 12.2431L12.2431 2.84021C12.4962 2.58712 12.9066 2.58712 13.1597 2.84021z"
-          }
-        }
-      ]
-    }
-  ]
-}, jt = ie(function(e, t) {
-  return te(ae, Object.assign({}, e, {
+const Nr = wt;
+var Tr = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "mask", attrs: { id: "mask0_561_2", style: { maskType: "alpha" }, width: 16, height: 16, x: 0, y: 0, maskUnits: "userSpaceOnUse" }, children: [{ tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }] }, { tag: "g", attrs: { fill: "currentColor", mask: "url(#mask0_561_2)", fillRule: "evenodd", clipRule: "evenodd" }, children: [{ tag: "path", attrs: { d: "M4.91876 2.65039C3.66601 2.65039 2.65045 3.66595 2.65045 4.9187 2.65045 6.17146 3.66601 7.18702 4.91876 7.18702 6.17152 7.18702 7.18708 6.17146 7.18708 4.9187 7.18708 3.66595 6.17152 2.65039 4.91876 2.65039zM3.94663 4.9187C3.94663 4.38181 4.38187 3.94657 4.91876 3.94657 5.45566 3.94657 5.8909 4.38181 5.8909 4.9187 5.8909 5.4556 5.45566 5.89084 4.91876 5.89084 4.38187 5.89084 3.94663 5.4556 3.94663 4.9187zM11.0812 8.81299C9.82842 8.81299 8.81286 9.82855 8.81286 11.0813 8.81286 12.3341 9.82842 13.3496 11.0812 13.3496 12.3339 13.3496 13.3495 12.3341 13.3495 11.0813 13.3495 9.82855 12.3339 8.81299 11.0812 8.81299zM10.109 11.0813C10.109 10.5444 10.5443 10.1092 11.0812 10.1092 11.6181 10.1092 12.0533 10.5444 12.0533 11.0813 12.0533 11.6182 11.6181 12.0534 11.0812 12.0534 10.5443 12.0534 10.109 11.6182 10.109 11.0813zM13.1597 2.84021C13.4128 3.09331 13.4128 3.50365 13.1597 3.75675L3.7568 13.1596C3.5037 13.4127 3.09336 13.4127 2.84026 13.1596 2.58717 12.9065 2.58717 12.4962 2.84026 12.2431L12.2431 2.84021C12.4962 2.58712 12.9066 2.58712 13.1597 2.84021z" } }] }] }, jt = ae(function(e, t) {
+  return te(oe, Object.assign({}, e, {
     id: "percent-single",
     ref: t,
-    icon: Nr
+    icon: Tr
   }));
 });
 jt.displayName = "PercentSingle";
-const Tr = jt;
-var Dr = {
-  tag: "svg",
-  attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" },
-  children: [
-    {
-      tag: "path",
-      attrs: {
-        fill: "currentColor",
-        d: "M5 3.61825C5 2.32958 6.04468 1.28491 7.33333 1.28491C8.62199 1.28491 9.66667 2.32958 9.66667 3.61825V6.30787C9.66667 7.59653 8.62199 8.64121 7.33333 8.64121C6.04468 8.64121 5 7.59653 5 6.30787V3.61825ZM7.33333 2.61825C6.78105 2.61825 6.33333 3.06596 6.33333 3.61825V6.30787C6.33333 6.86015 6.78106 7.30787 7.33333 7.30787C7.88561 7.30787 8.33333 6.86015 8.33333 6.30787V3.61825C8.33333 3.06596 7.88561 2.61825 7.33333 2.61825Z",
-        fillRule: "evenodd",
-        clipRule: "evenodd"
-      }
-    },
-    {
-      tag: "path",
-      attrs: {
-        fill: "currentColor",
-        d: "M2 7.9745C2 7.60631 2.29848 7.30783 2.66667 7.30783H3C3.36819 7.30783 3.66667 7.60631 3.66667 7.9745 3.66667 8.34269 3.36819 8.64117 3 8.64117H2.66667C2.29848 8.64117 2 8.34269 2 7.9745zM8.80482 9.56197C9.06517 9.82232 9.06517 10.2444 8.80482 10.5048L7.94289 11.3667H13.3334C13.7016 11.3667 14.0001 11.6652 14.0001 12.0334 14.0001 12.4016 13.7016 12.7 13.3334 12.7H7.94289L8.80482 13.562C9.06517 13.8223 9.06517 14.2444 8.80482 14.5048 8.54447 14.7651 8.12236 14.7651 7.86201 14.5048L5.86201 12.5048C5.79809 12.4409 5.74987 12.3672 5.71733 12.2886 5.68474 12.21 5.66675 12.1238 5.66675 12.0334 5.66675 11.943 5.68474 11.8568 5.71733 11.7782 5.74987 11.6996 5.79809 11.6259 5.86201 11.562L7.86201 9.56197C8.12236 9.30162 8.54447 9.30162 8.80482 9.56197z"
-      }
-    }
-  ]
-}, Nt = ie(function(e, t) {
-  return te(ae, Object.assign({}, e, {
+const Dr = jt;
+var Er = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5 3.61825C5 2.32958 6.04468 1.28491 7.33333 1.28491C8.62199 1.28491 9.66667 2.32958 9.66667 3.61825V6.30787C9.66667 7.59653 8.62199 8.64121 7.33333 8.64121C6.04468 8.64121 5 7.59653 5 6.30787V3.61825ZM7.33333 2.61825C6.78105 2.61825 6.33333 3.06596 6.33333 3.61825V6.30787C6.33333 6.86015 6.78106 7.30787 7.33333 7.30787C7.88561 7.30787 8.33333 6.86015 8.33333 6.30787V3.61825C8.33333 3.06596 7.88561 2.61825 7.33333 2.61825Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M2 7.9745C2 7.60631 2.29848 7.30783 2.66667 7.30783H3C3.36819 7.30783 3.66667 7.60631 3.66667 7.9745 3.66667 8.34269 3.36819 8.64117 3 8.64117H2.66667C2.29848 8.64117 2 8.34269 2 7.9745zM8.80482 9.56197C9.06517 9.82232 9.06517 10.2444 8.80482 10.5048L7.94289 11.3667H13.3334C13.7016 11.3667 14.0001 11.6652 14.0001 12.0334 14.0001 12.4016 13.7016 12.7 13.3334 12.7H7.94289L8.80482 13.562C9.06517 13.8223 9.06517 14.2444 8.80482 14.5048 8.54447 14.7651 8.12236 14.7651 7.86201 14.5048L5.86201 12.5048C5.79809 12.4409 5.74987 12.3672 5.71733 12.2886 5.68474 12.21 5.66675 12.1238 5.66675 12.0334 5.66675 11.943 5.68474 11.8568 5.71733 11.7782 5.74987 11.6996 5.79809 11.6259 5.86201 11.562L7.86201 9.56197C8.12236 9.30162 8.54447 9.30162 8.80482 9.56197z" } }] }, Nt = ae(function(e, t) {
+  return te(oe, Object.assign({}, e, {
     id: "reduce-digits-single",
     ref: t,
-    icon: Dr
+    icon: Er
   }));
 });
 Nt.displayName = "ReduceDigitsSingle";
-const Er = Nt;
-var $r = {
-  tag: "svg",
-  attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" },
-  children: [
-    {
-      tag: "path",
-      attrs: {
-        fill: "currentColor",
-        d: "M4.05443 1.55744C4.34898 1.33653 4.76685 1.39623 4.98776 1.69078L7.99996 5.98276L11.0122 1.69078C11.2331 1.39623 11.6509 1.33653 11.9455 1.55744C12.24 1.77836 12.2997 2.19623 12.0788 2.49078L9.33338 6.42708H12.0788C12.447 6.42708 12.7455 6.72556 12.7455 7.09375C12.7455 7.46194 12.447 7.76042 12.0788 7.76042H8.66659V9.69702H12.3348C12.703 9.69702 13.0015 9.9955 13.0015 10.3637C13.0015 10.7319 12.703 11.0304 12.3348 11.0304H8.66659V13.9091C8.66659 14.2773 8.36811 14.5758 7.99992 14.5758C7.63173 14.5758 7.33325 14.2773 7.33325 13.9091V11.0304H3.66508C3.29689 11.0304 2.99841 10.7319 2.99841 10.3637C2.99841 9.9955 3.29689 9.69702 3.66508 9.69702H7.33325V7.76042H3.92109C3.5529 7.76042 3.25443 7.46194 3.25443 7.09375C3.25443 6.72556 3.5529 6.42708 3.92109 6.42708H6.66653L3.92109 2.49078C3.70018 2.19623 3.75987 1.77836 4.05443 1.55744Z"
-      }
-    }
-  ]
-}, Tt = ie(function(e, t) {
-  return te(ae, Object.assign({}, e, {
+const $r = Nt;
+var Ur = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M4.05443 1.55744C4.34898 1.33653 4.76685 1.39623 4.98776 1.69078L7.99996 5.98276L11.0122 1.69078C11.2331 1.39623 11.6509 1.33653 11.9455 1.55744C12.24 1.77836 12.2997 2.19623 12.0788 2.49078L9.33338 6.42708H12.0788C12.447 6.42708 12.7455 6.72556 12.7455 7.09375C12.7455 7.46194 12.447 7.76042 12.0788 7.76042H8.66659V9.69702H12.3348C12.703 9.69702 13.0015 9.9955 13.0015 10.3637C13.0015 10.7319 12.703 11.0304 12.3348 11.0304H8.66659V13.9091C8.66659 14.2773 8.36811 14.5758 7.99992 14.5758C7.63173 14.5758 7.33325 14.2773 7.33325 13.9091V11.0304H3.66508C3.29689 11.0304 2.99841 10.7319 2.99841 10.3637C2.99841 9.9955 3.29689 9.69702 3.66508 9.69702H7.33325V7.76042H3.92109C3.5529 7.76042 3.25443 7.46194 3.25443 7.09375C3.25443 6.72556 3.5529 6.42708 3.92109 6.42708H6.66653L3.92109 2.49078C3.70018 2.19623 3.75987 1.77836 4.05443 1.55744Z" } }] }, Tt = ae(function(e, t) {
+  return te(oe, Object.assign({}, e, {
     id: "rmb-single",
     ref: t,
-    icon: $r
+    icon: Ur
   }));
 });
 Tt.displayName = "RmbSingle";
-const Ur = Tt, we = [
+const Ar = Tt, we = [
   {
     label: "sheet.numfmt.general",
     pattern: null
@@ -1678,16 +1555,16 @@ const Ur = Tt, we = [
     label: "sheet.numfmt.moreFmt",
     pattern: ""
   }
-], Ar = (e) => {
+], Lr = (e) => {
   var n;
-  const t = N(T), r = (n = e.value) != null ? n : t.t("sheet.numfmt.general");
+  const t = T(j), r = (n = e.value) != null ? n : t.t("sheet.numfmt.general");
   return /* @__PURE__ */ p.jsx("span", { className: "more-numfmt-type", children: r });
-}, Lr = () => {
-  const e = N(E), t = N(T), r = In(), n = N(ee), s = (o) => {
+}, Vr = () => {
+  const e = T(D), t = T(j), r = Mn(), n = T(ee), s = (o) => {
     const c = n.getLast();
     if (!c)
       return;
-    const d = r.get(_n), l = c.range, u = [];
+    const d = r.get(Sn), l = c.range, u = [];
     R.foreach(l, (m, h) => {
       o ? u.push({ row: m, col: h, pattern: o, type: Xe(o) }) : u.push({ row: m, col: h });
     }), e.executeCommand(Q.id, { values: u }), d.focus();
@@ -1710,14 +1587,14 @@ const Ur = Tt, we = [
       },
       children: [
         /* @__PURE__ */ p.jsx("div", { children: t.t(o.label) }),
-        /* @__PURE__ */ p.jsx("div", { className: "m-l-26", children: o.pattern ? D.format(o.pattern || "", a, { locale: "zh-CN" }) : "" })
+        /* @__PURE__ */ p.jsx("div", { className: "m-l-26", children: o.pattern ? et(o.pattern || "", a, t.getCurrentLocale()).result : "" })
       ]
     },
     c
   )) });
-}, Vr = (e) => {
+}, Hr = (e) => {
   const t = "icon-rmbSingle";
-  return e.register(t, Ur), e.register("MoreDownSingle", jr), (r) => ({
+  return e.register(t, Ar), e.register("MoreDownSingle", Nr), (r) => ({
     icon: t,
     id: Ct.id,
     title: "sheet.numfmt.currency",
@@ -1728,9 +1605,9 @@ const Ur = Tt, we = [
     hidden$: _e(r, de.SHEET),
     disabled$: fe(r)
   });
-}, Hr = (e) => {
+}, kr = (e) => {
   const t = "icon-addDigitsSingle";
-  return e.register(t, xr), (r) => ({
+  return e.register(t, wr), (r) => ({
     icon: t,
     id: _t.id,
     title: "sheet.numfmt.addDecimal",
@@ -1741,9 +1618,9 @@ const Ur = Tt, we = [
     hidden$: _e(r, de.SHEET),
     disabled$: fe(r)
   });
-}, kr = (e) => {
+}, Fr = (e) => {
   const t = "icon-reduceDigitsSingle";
-  return e.register(t, Er), (r) => ({
+  return e.register(t, $r), (r) => ({
     icon: t,
     id: bt.id,
     title: "sheet.numfmt.subtractDecimal",
@@ -1754,11 +1631,11 @@ const Ur = Tt, we = [
     hidden$: _e(r, de.SHEET),
     disabled$: fe(r)
   });
-}, Fr = (e) => {
+}, Br = (e) => {
   const t = "icon-PercentSingle";
-  return e.register(t, Tr), (r) => ({
+  return e.register(t, Dr), (r) => ({
     icon: t,
-    id: Ot.id,
+    id: Pt.id,
     title: "sheet.numfmt.percent",
     tooltip: "sheet.numfmt.percent",
     type: pe.BUTTON,
@@ -1767,13 +1644,13 @@ const Ur = Tt, we = [
     hidden$: _e(r, de.SHEET),
     disabled$: fe(r)
   });
-}, Br = (e) => {
+}, zr = (e) => {
   const t = "sheet.numfmt.moreNumfmtType", r = "sheet.numfmt.moreNumfmtType.options";
-  return e.register(t, Ar), e.register(r, Lr), (n) => {
-    const s = n.get(A), i = n.get(Mn), a = n.get($), o = n.get(E), c = n.get(T), d = n.get(ee), l = new q(
+  return e.register(t, Lr), e.register(r, Vr), (n) => {
+    const s = n.get(U), i = n.get(Pn), a = n.get(E), o = n.get(D), c = n.get(j), d = n.get(ee), l = new Z(
       (u) => Ge(
         d.selectionMoveEnd$,
-        new q((m) => {
+        new Z((m) => {
           const h = [M.id, w.id], _ = o.onCommandExecuted((v) => {
             h.includes(v.id) && m.next(null);
           });
@@ -1782,11 +1659,11 @@ const Ur = Tt, we = [
       ).subscribe(() => {
         const m = d.getSelections();
         if (m && m[0]) {
-          const h = a.getCurrentUniverSheetInstance(), _ = h.getActiveSheet(), v = m[0].range, f = v.startRow, S = v.startColumn, C = s.getValue(h.getUnitId(), _.getSheetId(), f, S), y = i.getNumfmtValue(h.getUnitId(), _.getSheetId(), f, S), L = (C == null ? void 0 : C.pattern) || y;
+          const h = a.getCurrentUniverSheetInstance(), _ = h.getActiveSheet(), v = m[0].range, f = v.startRow, S = v.startColumn, C = s.getValue(h.getUnitId(), _.getSheetId(), f, S), y = i.getNumfmtValue(h.getUnitId(), _.getSheetId(), f, S), A = (C == null ? void 0 : C.pattern) || y;
           let G = c.t("sheet.numfmt.general");
-          if (L) {
+          if (A) {
             const F = we.filter((B) => typeof B == "object" && B.pattern).find(
-              (B) => Le(L, B.pattern)
+              (B) => Le(A, B.pattern)
             );
             F && typeof F == "object" && F.pattern ? G = c.t(F.label) : G = c.t("sheet.numfmt.moreFmt");
           }
@@ -1816,33 +1693,33 @@ const Ur = Tt, we = [
     };
   };
 };
-var zr = Object.defineProperty, Wr = Object.getOwnPropertyDescriptor, Kr = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Wr(t, r) : t, i = e.length - 1, a; i >= 0; i--)
+var Wr = Object.defineProperty, Kr = Object.getOwnPropertyDescriptor, Gr = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Kr(t, r) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (s = (n ? a(t, r, s) : a(s)) || s);
-  return n && s && zr(t, r, s), s;
+  return n && s && Wr(t, r, s), s;
 }, Be = (e, t) => (r, n) => t(r, n, e);
 let je = class extends H {
   constructor(e, t, r) {
     super(), this._injector = e, this._componentManager = t, this._menuService = r, this._initMenu();
   }
   _initMenu() {
-    [Fr, Hr, kr, Vr, Br].map((e) => e(this._componentManager)).forEach((e) => {
+    [Br, kr, Fr, Hr, zr].map((e) => e(this._componentManager)).forEach((e) => {
       this.disposeWithMe(this._menuService.addMenuItem(e(this._injector)));
     });
   }
 };
-je = Kr([
-  k(U.Rendered, je),
+je = Gr([
+  k($.Rendered, je),
   Be(0, g(K)),
-  Be(1, g(pt)),
-  Be(2, g(Cn))
+  Be(1, g(vt)),
+  Be(2, g(bn))
 ], je);
-var Gr = Object.defineProperty, Yr = Object.getOwnPropertyDescriptor, qr = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Yr(t, r) : t, i = e.length - 1, a; i >= 0; i--)
+var Yr = Object.defineProperty, Zr = Object.getOwnPropertyDescriptor, qr = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Zr(t, r) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (s = (n ? a(t, r, s) : a(s)) || s);
-  return n && s && Gr(t, r, s), s;
-}, re = (e, t) => (r, n) => t(r, n, e);
-const Zr = [w.id, M.id];
+  return n && s && Yr(t, r, s), s;
+}, se = (e, t) => (r, n) => t(r, n, e);
+const Jr = [w.id, M.id];
 let Ne = class extends H {
   constructor(e, t, r, n, s, i) {
     super(), this._numfmtService = e, this._univerInstanceService = t, this._injector = r, this._refRangeService = n, this._sheetSkeletonManagerService = s, this._commandService = i, this._registerRefRange(), this._mergeRefMutations();
@@ -1852,24 +1729,24 @@ let Ne = class extends H {
       handler: (e, t, r) => {
         if (!e)
           return r(e);
-        const n = e.filter((s) => !Zr.includes(s.id));
+        const n = e.filter((s) => !Jr.includes(s.id));
         return n.push(...Ee(e)), r(n);
       }
     });
   }
   _registerRefRange() {
     this.disposeWithMe(
-      Z(
+      q(
         Ge(
           this._sheetSkeletonManagerService.currentSkeleton$.pipe(
             le((e) => e == null ? void 0 : e.sheetId),
-            ht()
+            ft()
           ),
           this._numfmtService.modelReplace$
         ).pipe(
-          ft(
-            () => new q((e) => {
-              const t = new dt();
+          pt(
+            () => new Z((e) => {
+              const t = new mt();
               return e.next(t), () => {
                 t.dispose();
               };
@@ -1885,50 +1762,50 @@ let Ne = class extends H {
             };
             let u = [];
             switch (o.id) {
-              case j.DeleteRangeMoveLeftCommandId: {
+              case N.DeleteRangeMoveLeftCommandId: {
+                u = an(o, l);
+                break;
+              }
+              case N.DeleteRangeMoveUpCommandId: {
                 u = sn(o, l);
                 break;
               }
-              case j.DeleteRangeMoveUpCommandId: {
+              case N.InsertColCommandId: {
                 u = rn(o, l);
                 break;
               }
-              case j.InsertColCommandId: {
+              case N.InsertRangeMoveDownCommandId: {
                 u = nn(o, l);
                 break;
               }
-              case j.InsertRangeMoveDownCommandId: {
+              case N.InsertRangeMoveRightCommandId: {
                 u = tn(o, l);
                 break;
               }
-              case j.InsertRangeMoveRightCommandId: {
+              case N.InsertRowCommandId: {
                 u = en(o, l);
                 break;
               }
-              case j.InsertRowCommandId: {
+              case N.MoveRangeCommandId: {
                 u = Xt(o, l);
                 break;
               }
-              case j.MoveRangeCommandId: {
+              case N.RemoveColCommandId: {
                 u = Qt(o, l);
                 break;
               }
-              case j.RemoveColCommandId: {
+              case N.RemoveRowCommandId: {
                 u = Jt(o, l);
                 break;
               }
-              case j.RemoveRowCommandId: {
-                u = Zt(o, l);
-                break;
-              }
-              case j.MoveColsCommandId: {
+              case N.MoveColsCommandId: {
                 u = qt(o, l);
                 break;
               }
-              case j.MoveRowsCommandId:
-                u = Yt(o, l);
+              case N.MoveRowsCommandId:
+                u = Zt(o, l);
             }
-            const m = an(u, l), h = this._numfmtService.getValue(r, n, c, d);
+            const m = on(u, l), h = this._numfmtService.getValue(r, n, c, d);
             if (!m && h) {
               const _ = {
                 id: M.id,
@@ -1961,8 +1838,8 @@ let Ne = class extends H {
                   subUnitId: n,
                   ranges: [{ startColumn: d, startRow: c, endColumn: d, endRow: c }]
                 }
-              }, L = J(this._injector, y.params);
-              return _.push(S, y), v.push(...C, ...L), {
+              }, A = J(this._injector, y.params);
+              return _.push(S, y), v.push(...C, ...A), {
                 redos: _,
                 undos: v.reverse()
               };
@@ -1981,27 +1858,27 @@ let Ne = class extends H {
             );
             i.set(`${o}_${c}`, l), e.add(l);
           }), e.add(
-            Z(
-              new q((o) => {
+            q(
+              new Z((o) => {
                 e.add(
                   this._commandService.onCommandExecuted((c) => {
                     [w.id, M.id].includes(c.id) && o.next(c.params);
                   })
                 );
               }).pipe(
-                st(
+                it(
                   (o) => o.unitId === r && o.subUnitId === n
                 ),
                 le((o) => o.ranges ? o.ranges : o.values ? Object.keys(o.values).reduce((c, d) => {
                   const l = o.values[d];
                   return c.push(...l.ranges), c;
                 }, []) : []),
-                vn(300),
+                gn(300),
                 // updating the listener moves to the next queue
                 le(
                   (o) => o.reduce((c, d) => (c.push(...d), c), [])
                 ),
-                st((o) => !!o.length)
+                it((o) => !!o.length)
               ).subscribe((o) => {
                 o.forEach((c) => {
                   R.foreach(c, (d, l) => {
@@ -2029,18 +1906,18 @@ let Ne = class extends H {
   }
 };
 Ne = qr([
-  k(U.Rendered, Ne),
-  re(0, g(A)),
-  re(1, g($)),
-  re(2, g(K)),
-  re(3, g(Gt)),
-  re(4, g(Ke)),
-  re(5, g(E))
+  k($.Rendered, Ne),
+  se(0, g(U)),
+  se(1, g(E)),
+  se(2, g(K)),
+  se(3, g(Yt)),
+  se(4, g(Ke)),
+  se(5, g(D))
 ], Ne);
-var Jr = Object.defineProperty, Qr = Object.getOwnPropertyDescriptor, Xr = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Qr(t, r) : t, i = e.length - 1, a; i >= 0; i--)
+var Qr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, es = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Xr(t, r) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (s = (n ? a(t, r, s) : a(s)) || s);
-  return n && s && Jr(t, r, s), s;
+  return n && s && Qr(t, r, s), s;
 }, ye = (e, t) => (r, n) => t(r, n, e);
 let Te = class extends H {
   constructor(e, t, r, n) {
@@ -2050,8 +1927,8 @@ let Te = class extends H {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: (e) => {
-          if (e.id === on.id) {
-            const t = e.params, r = t.unitId || es(this._univerInstanceService), n = t.subUnitId || ts(this._univerInstanceService), s = this._numfmtService.getModel(r, n);
+          if (e.id === cn.id) {
+            const t = e.params, r = t.unitId || ts(this._univerInstanceService), n = t.subUnitId || ns(this._univerInstanceService), s = this._numfmtService.getModel(r, n);
             if (!s)
               return { redos: [], undos: [] };
             const i = [];
@@ -2074,34 +1951,34 @@ let Te = class extends H {
     );
   }
 };
-Te = Xr([
-  k(U.Rendered, Te),
-  ye(0, g(A)),
+Te = es([
+  k($.Rendered, Te),
+  ye(0, g(U)),
   ye(1, g(Ae)),
-  ye(2, g($)),
+  ye(2, g(E)),
   ye(3, g(K))
 ], Te);
-const es = (e) => e.getCurrentUniverSheetInstance().getUnitId(), ts = (e) => e.getCurrentUniverSheetInstance().getActiveSheet().getSheetId();
-var ns = Object.defineProperty, rs = Object.getOwnPropertyDescriptor, ss = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? rs(t, r) : t, i = e.length - 1, a; i >= 0; i--)
+const ts = (e) => e.getCurrentUniverSheetInstance().getUnitId(), ns = (e) => e.getCurrentUniverSheetInstance().getActiveSheet().getSheetId();
+var rs = Object.defineProperty, ss = Object.getOwnPropertyDescriptor, is = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? ss(t, r) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (s = (n ? a(t, r, s) : a(s)) || s);
-  return n && s && ns(t, r, s), s;
-}, is = (e, t) => (r, n) => t(r, n, e), ze;
-let ct = (ze = class extends Ft {
+  return n && s && rs(t, r, s), s;
+}, as = (e, t) => (r, n) => t(r, n, e), ze;
+let lt = (ze = class extends Bt {
   constructor(e, t) {
     super(ue), this._injector = t;
   }
   onStarting() {
-    this._injector.add([et, { useClass: Me, lazy: !1 }]), this._injector.add([Pe]), this._injector.add([Ue]), this._injector.add([Ne]), this._injector.add([Te]), this._injector.add([Oe]), this._injector.add([Re]), this._injector.add([Ie]), this._injector.add([xe]), this._injector.add([je]);
+    this._injector.add([tt, { useClass: Me, lazy: !1 }]), this._injector.add([Oe]), this._injector.add([Ue]), this._injector.add([Ne]), this._injector.add([Te]), this._injector.add([Pe]), this._injector.add([Re]), this._injector.add([Ie]), this._injector.add([xe]), this._injector.add([je]);
   }
-}, Y(ze, "type", Bt.Sheet), ze);
-ct = ss([
-  is(1, g(K))
-], ct);
+}, Y(ze, "type", zt.Sheet), ze);
+lt = is([
+  as(1, g(K))
+], lt);
 export {
   Q as SetNumfmtCommand,
-  ct as UniverSheetsNumfmtPlugin,
-  Pn as enUS,
-  gt as getPatternPreview,
-  wn as zhCN
+  lt as UniverSheetsNumfmtPlugin,
+  xn as enUS,
+  et as getPatternPreview,
+  jn as zhCN
 };