@univerjs/sheets-numfmt 0.2.2 → 0.2.3

package/lib/es/index.js

@@ -1,19 +1,19 @@
 var dt = Object.defineProperty;
 var ft = (e, t, r) => t in e ? dt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var ie = (e, t, r) => ft(e, typeof t != "symbol" ? t + "" : t, r);
-import { LocaleType as ht, Disposable as z, ObjectMatrix as Le, CellValueType as V, Range as R, UniverInstanceType as T, OnLifecycle as K, LifecycleStages as B, ThemeService as Fe, ICommandService as O, LocaleService as E, IUniverInstanceService as w, CommandType as D, IUndoRedoService as pt, sequenceExecute as vt, runOnLifecycle as _t, ILocalStorageService as gt, toDisposable as Ie, DisposableCollection as St, Plugin as bt, Tools as yt, DependentOn as Ct } from "@univerjs/core";
-import { Inject as b, createIdentifier as Tt, Injector as Me, Optional as It } from "@wendellhu/redi";
-import { INTERCEPTOR_POINT as We, SetNumfmtMutation as Y, SetRangeValuesMutation as Et, SheetInterceptorService as Pe, INumfmtService as H, getSheetCommandTarget as Re, transformCellsToRange as ke, rangeMerge as Ae, factorySetNumfmtUndoMutation as Ge, RemoveNumfmtMutation as pe, factoryRemoveNumfmtUndoMutation as ze, SelectionManagerService as U, SetRangeValuesCommand as Nt, WorkbookEditablePermission as q, WorksheetEditPermission as J, WorksheetSetCellStylePermission as Z, RangeProtectionPermissionEditPoint as Q, UniverSheetsPlugin as Mt } from "@univerjs/sheets";
-import { SheetSkeletonManagerService as Pt, IEditorBridgeService as Rt, getCurrentRangeDisable$ as X, deriveStateFromActiveSheet$ as xt, UniverSheetsUIPlugin as Ot } from "@univerjs/sheets-ui";
-import { switchMap as jt, of as $t, skip as wt, Observable as k, combineLatest as Dt, merge as Ut } from "rxjs";
-import x from "@univerjs/engine-numfmt";
-import { IRenderManagerService as Lt, ITextSelectionRenderManager as At } from "@univerjs/engine-render";
-import { ComponentManager as Ke, ISidebarService as Vt, MenuItemType as ee, MenuGroup as te, MenuPosition as ne, getMenuHiddenObservable as re, IMenuService as Bt } from "@univerjs/ui";
-import { map as Ht, switchMap as Ft, tap as Wt, debounceTime as kt } from "rxjs/operators";
-import Gt, { createContext as zt, useState as I, useEffect as xe, useRef as Ye, useContext as qe, useMemo as P, createElement as Kt } from "react";
-import { InputNumber as Oe, Select as je, SelectList as $e, Button as Ve } from "@univerjs/design";
-import { useDependency as N, useInjector as Yt } from "@wendellhu/redi/react-bindings";
-const Ee = "SHEET_NUMFMT_PLUGIN", me = (e) => x.getInfo(e).type || "unknown", we = (e, t, r) => {
+var ce = (e, t, r) => ft(e, typeof t != "symbol" ? t + "" : t, r);
+import { LocaleType as ht, Disposable as K, ObjectMatrix as Le, CellValueType as V, Range as R, UniverInstanceType as T, OnLifecycle as Y, LifecycleStages as B, ThemeService as We, ICommandService as O, LocaleService as E, IUniverInstanceService as w, CommandType as D, IUndoRedoService as pt, sequenceExecute as vt, runOnLifecycle as _t, ILocalStorageService as gt, toDisposable as Ee, DisposableCollection as St, Plugin as bt, Tools as Ct, DependentOn as yt } from "@univerjs/core";
+import { Inject as b, createIdentifier as Tt, Injector as Pe, Optional as It } from "@wendellhu/redi";
+import { INTERCEPTOR_POINT as ke, SetNumfmtMutation as q, SetRangeValuesMutation as Et, SheetInterceptorService as Re, INumfmtService as H, getSheetCommandTarget as xe, transformCellsToRange as Ge, rangeMerge as Ve, factorySetNumfmtUndoMutation as ze, RemoveNumfmtMutation as _e, factoryRemoveNumfmtUndoMutation as Ke, SheetsSelectionsService as U, SetRangeValuesCommand as Nt, WorkbookEditablePermission as J, WorksheetEditPermission as X, WorksheetSetCellStylePermission as Z, RangeProtectionPermissionEditPoint as Q, UniverSheetsPlugin as Mt } from "@univerjs/sheets";
+import { SheetSkeletonManagerService as Pt, IEditorBridgeService as Rt, getCurrentRangeDisable$ as ee, deriveStateFromActiveSheet$ as xt, UniverSheetsUIPlugin as Ot } from "@univerjs/sheets-ui";
+import { switchMap as jt, of as $t, skip as wt, Observable as G, combineLatest as Dt, merge as Ut } from "rxjs";
+import x, { DEFAULT_TEXT_FORMAT as At } from "@univerjs/engine-numfmt";
+import { IRenderManagerService as Lt, ITextSelectionRenderManager as Vt } from "@univerjs/engine-render";
+import { ComponentManager as Ye, ISidebarService as Bt, MenuItemType as te, MenuGroup as ne, MenuPosition as re, getMenuHiddenObservable as se, IMenuService as Ht } from "@univerjs/ui";
+import { map as Ft, switchMap as Wt, tap as kt, debounceTime as Gt } from "rxjs/operators";
+import zt, { createContext as Kt, useState as I, useEffect as Oe, useRef as qe, useContext as Je, useMemo as P, createElement as Yt } from "react";
+import { InputNumber as je, Select as $e, SelectList as we, Button as Be } from "@univerjs/design";
+import { useDependency as N, useInjector as qt } from "@wendellhu/redi/react-bindings";
+const Ne = "SHEET_NUMFMT_PLUGIN", fe = (e) => x.getInfo(e).type || "unknown", De = (e, t, r) => {
   const n = x.getInfo(e), s = r === ht.ZH_CN ? "zh-CN" : "en", i = n._partitions[1], o = x.format(e, t, { locale: s });
   return t < 0 ? {
     result: o,
@@ -22,18 +22,18 @@ const Ee = "SHEET_NUMFMT_PLUGIN", me = (e) => x.getInfo(e).type || "unknown", we
     result: o
   };
 };
-var qt = Object.defineProperty, Jt = Object.getOwnPropertyDescriptor, Zt = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Jt(t, r) : t, i = e.length - 1, o; i >= 0; i--)
+var Jt = Object.defineProperty, Xt = Object.getOwnPropertyDescriptor, Zt = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Xt(t, r) : t, i = e.length - 1, o; i >= 0; i--)
     (o = e[i]) && (s = (n ? o(t, r, s) : o(s)) || s);
-  return n && s && qt(t, r, s), s;
-}, A = (e, t) => (r, n) => t(r, n, e);
-let oe = class extends z {
+  return n && s && Jt(t, r, s), s;
+}, L = (e, t) => (r, n) => t(r, n, e);
+let ae = class extends K {
   constructor(e, t, r, n, s, i) {
     super(), this._instanceService = e, this._sheetInterceptorService = t, this._themeService = r, this._commandService = n, this._numfmtService = s, this._localeService = i, this._initInterceptorCellContent();
   }
   _initInterceptorCellContent() {
     const e = new Le();
-    this.disposeWithMe(this._sheetInterceptorService.intercept(We.CELL_CONTENT, {
+    this.disposeWithMe(this._sheetInterceptorService.intercept(ke.CELL_CONTENT, {
       handler: (t, r, n) => {
         const s = r.unitId, i = r.subUnitId, o = this._numfmtService.getValue(s, i, r.row, r.col);
         if (!o)
@@ -45,7 +45,7 @@ let oe = class extends z {
         const f = e.getValue(r.row, r.col);
         if (f && f.parameters === c.v)
           return n({ ...t, ...f.result });
-        const m = we(o.pattern, Number(c.v), this._localeService.getCurrentLocale());
+        const m = De(o.pattern, Number(c.v), this._localeService.getCurrentLocale());
         if (a = m.result, !a)
           return n(t);
         const l = { v: a };
@@ -60,7 +60,7 @@ let oe = class extends z {
       },
       priority: 10
     })), this.disposeWithMe(this._commandService.onCommandExecuted((t) => {
-      if (t.id === Y.id) {
+      if (t.id === q.id) {
         const r = t.params;
         Object.keys(r.values).forEach((n) => {
           r.values[n].ranges.forEach((i) => {
@@ -86,19 +86,19 @@ let oe = class extends z {
     );
   }
 };
-oe = Zt([
-  K(B.Rendered, oe),
-  A(0, w),
-  A(1, b(Pe)),
-  A(2, b(Fe)),
-  A(3, b(O)),
-  A(4, b(H)),
-  A(5, b(E))
-], oe);
+ae = Zt([
+  Y(B.Rendered, ae),
+  L(0, w),
+  L(1, b(Re)),
+  L(2, b(We)),
+  L(3, b(O)),
+  L(4, b(H)),
+  L(5, b(E))
+], ae);
 const j = (e, t = 0) => {
   var n;
   return e && (n = x.getInfo(e).maxDecimals) != null ? n : t;
-}, ve = (e, t) => {
+}, ge = (e, t) => {
   if (e && !t || !e && t)
     return !1;
   const r = (f) => f.reduce(
@@ -111,21 +111,21 @@ const j = (e, t = 0) => {
     { isEnd: !1, result: "" }
   ).result, n = x.getInfo(e)._partitions, s = x.getInfo(t)._partitions, i = r(n[0].tokens), o = r(s[0].tokens), c = r(n[1].tokens), a = r(s[1].tokens);
   return i === o && c === a && n[1].color === s[1].color;
-}, Be = (e) => new Array(Math.min(Math.max(0, Number(e)), 30)).fill(0).join(""), C = (e, t) => e.split(";").map((n) => /\.0?/.test(n) ? n.replace(
+}, He = (e) => new Array(Math.min(Math.max(0, Number(e)), 30)).fill(0).join(""), y = (e, t) => e.split(";").map((n) => /\.0?/.test(n) ? n.replace(
   /\.0*/g,
-  `${t > 0 ? "." : ""}${Be(Number(t || 0))}`
+  `${t > 0 ? "." : ""}${He(Number(t || 0))}`
 ) : /0([^0]?)|0$/.test(n) ? n.replace(
   /0([^0]+)|0$/,
-  `0${t > 0 ? "." : ""}${Be(Number(t || 0))}$1`
+  `0${t > 0 ? "." : ""}${He(Number(t || 0))}$1`
 ) : n).join(";"), Qt = (e) => /\.0?/.test(e) || /0([^0]?)|0$/.test(e), $ = {
   id: "sheet.command.numfmt.set.numfmt",
   type: D.COMMAND,
   handler: (e, t) => {
     if (!t)
       return !1;
-    const r = e.get(O), n = e.get(w), s = e.get(pt), i = Re(n, t);
+    const r = e.get(O), n = e.get(w), s = e.get(pt), i = xe(n, t);
     if (!i) return !1;
-    const { unitId: o, subUnitId: c } = i, a = t.values.filter((h) => !!h.pattern), f = t.values.filter((h) => !h.pattern), m = ke(o, c, a), l = {
+    const { unitId: o, subUnitId: c } = i, a = t.values.filter((h) => !!h.pattern), f = t.values.filter((h) => !h.pattern), m = Ge(o, c, a), l = {
       unitId: o,
       subUnitId: c,
       ranges: f.map((h) => ({
@@ -134,66 +134,66 @@ const j = (e, t = 0) => {
         endColumn: h.col,
         endRow: h.row
       }))
-    }, u = [], p = [];
+    }, u = [], v = [];
     if (a.length) {
-      Object.keys(m.values).forEach((v) => {
-        const g = m.values[v];
-        g.ranges = Ae(g.ranges);
+      Object.keys(m.values).forEach((g) => {
+        const p = m.values[g];
+        p.ranges = Ve(p.ranges);
       }), u.push({
-        id: Y.id,
+        id: q.id,
         params: m
       });
-      const h = Ge(e, m);
-      p.push(...h);
+      const h = ze(e, m);
+      v.push(...h);
     }
     if (f.length) {
-      l.ranges = Ae(l.ranges), u.push({
-        id: pe.id,
+      l.ranges = Ve(l.ranges), u.push({
+        id: _e.id,
         params: l
       });
-      const h = ze(e, l);
-      p.push(...h);
+      const h = Ke(e, l);
+      v.push(...h);
     }
     const _ = vt(u, r).result;
     return _ && s.pushUndoRedo({
       unitID: o,
-      undoMutations: p,
+      undoMutations: v,
       redoMutations: u
     }), _;
   }
-}, Je = {
+}, Xe = {
   id: "sheet.command.numfmt.add.decimal.command",
   type: D.COMMAND,
   handler: async (e) => {
-    const t = e.get(O), r = e.get(U), n = e.get(H), s = e.get(w), i = r.getSelections();
+    const t = e.get(O), r = e.get(U), n = e.get(H), s = e.get(w), i = r.getCurrentSelections();
     if (!i || !i.length)
       return !1;
-    const o = Re(s);
+    const o = xe(s);
     if (!o) return !1;
     const { unitId: c, subUnitId: a } = o;
     let f = 0;
-    i.forEach((p) => {
-      R.foreach(p.range, (_, h) => {
-        const v = n.getValue(c, a, _, h);
-        if (!v)
+    i.forEach((v) => {
+      R.foreach(v.range, (_, h) => {
+        const g = n.getValue(c, a, _, h);
+        if (!g)
           return;
-        const g = j(v.pattern);
-        f = g > f ? g : f;
+        const p = j(g.pattern);
+        f = p > f ? p : f;
       });
     });
-    const m = f + 1, l = C(`0${m > 0 ? ".0" : ""}`, m), u = [];
-    return i.forEach((p) => {
-      R.foreach(p.range, (_, h) => {
-        const v = n.getValue(c, a, _, h);
-        if (!v)
+    const m = f + 1, l = y(`0${m > 0 ? ".0" : ""}`, m), u = [];
+    return i.forEach((v) => {
+      R.foreach(v.range, (_, h) => {
+        const g = n.getValue(c, a, _, h);
+        if (!g)
           u.push({
             row: _,
             col: h,
             pattern: l
           });
         else {
-          const g = j(v.pattern), S = C(v.pattern, g + 1);
-          S !== v.pattern && u.push({
+          const p = j(g.pattern), S = y(g.pattern, p + 1);
+          S !== g.pattern && u.push({
             row: _,
             col: h,
             pattern: S
@@ -202,7 +202,7 @@ const j = (e, t = 0) => {
       });
     }), u.length ? await t.executeCommand($.id, { values: u }) : !1;
   }
-}, Xt = [
+}, en = [
   {
     label: "1930-08-05",
     suffix: "yyyy-MM-dd"
@@ -247,7 +247,7 @@ const j = (e, t = 0) => {
     label: "08-05 下午 01:30",
     suffix: "MM-dd A/P hh:mm"
   }
-], en = [
+], tn = [
   {
     label: "(1,235)",
     suffix: "#,##0_);(#,##0)"
@@ -307,7 +307,7 @@ const j = (e, t = 0) => {
   id: "sheet.command.numfmt.set.currency",
   type: D.COMMAND,
   handler: async (e) => {
-    const t = e.get(O), n = e.get(U).getSelections();
+    const t = e.get(O), n = e.get(U).getCurrentSelections();
     if (!n || !n.length)
       return !1;
     const s = [], i = Ze[0].suffix("¥");
@@ -317,42 +317,42 @@ const j = (e, t = 0) => {
       });
     }), await t.executeCommand($.id, { values: s });
   }
-}, Xe = {
+}, et = {
   id: "sheet.command.numfmt.subtract.decimal.command",
   type: D.COMMAND,
   handler: async (e) => {
-    const t = e.get(O), r = e.get(U), n = e.get(H), s = e.get(w), i = r.getSelections();
+    const t = e.get(O), r = e.get(U), n = e.get(H), s = e.get(w), i = r.getCurrentSelections();
     if (!i || !i.length)
       return !1;
-    const o = Re(s);
+    const o = xe(s);
     if (!o) return !1;
     const { unitId: c, subUnitId: a } = o;
     let f = 0;
     i.forEach((_) => {
-      R.foreach(_.range, (h, v) => {
-        const g = n.getValue(c, a, h, v);
-        if (!g)
+      R.foreach(_.range, (h, g) => {
+        const p = n.getValue(c, a, h, g);
+        if (!p)
           return;
-        const S = j(g.pattern);
+        const S = j(p.pattern);
         f = S > f ? S : f;
       });
     });
-    const m = f - 1, l = C(`0${m > 0 ? ".0" : "."}`, m), u = [];
+    const m = f - 1, l = y(`0${m > 0 ? ".0" : "."}`, m), u = [];
     return i.forEach((_) => {
-      R.foreach(_.range, (h, v) => {
-        const g = n.getValue(c, a, h, v);
-        if (!g)
+      R.foreach(_.range, (h, g) => {
+        const p = n.getValue(c, a, h, g);
+        if (!p)
           u.push({
             row: h,
-            col: v,
+            col: g,
             pattern: l
           });
         else {
-          const S = j(g.pattern);
+          const S = j(p.pattern);
           u.push({
             row: h,
-            col: v,
-            pattern: C(g.pattern, S - 1)
+            col: g,
+            pattern: y(p.pattern, S - 1)
           });
         }
       });
@@ -365,14 +365,14 @@ const j = (e, t = 0) => {
     // do nothing,just notify panel is closed
     !0
   )
-}, De = Tt("INumfmtController");
-_t(B.Rendered, De);
-const de = {
+}, Ue = Tt("INumfmtController");
+_t(B.Rendered, Ue);
+const he = {
   id: "sheet.operation.open.numfmt.panel",
   type: D.OPERATION,
-  handler: (e) => (e.get(De).openPanel(), !0)
+  handler: (e) => (e.get(Ue).openPanel(), !0)
 };
-var et = { exports: {} }, _e = {};
+var tt = { exports: {} }, Se = {};
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -382,20 +382,20 @@ var et = { exports: {} }, _e = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var tn = Gt, nn = Symbol.for("react.element"), rn = Symbol.for("react.fragment"), sn = Object.prototype.hasOwnProperty, on = tn.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, cn = { key: !0, ref: !0, __self: !0, __source: !0 };
-function tt(e, t, r) {
+var nn = zt, rn = Symbol.for("react.element"), sn = Symbol.for("react.fragment"), on = Object.prototype.hasOwnProperty, cn = nn.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, an = { key: !0, ref: !0, __self: !0, __source: !0 };
+function nt(e, t, r) {
   var n, s = {}, i = null, o = null;
   r !== void 0 && (i = "" + r), t.key !== void 0 && (i = "" + t.key), t.ref !== void 0 && (o = t.ref);
-  for (n in t) sn.call(t, n) && !cn.hasOwnProperty(n) && (s[n] = t[n]);
+  for (n in t) on.call(t, n) && !an.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: nn, type: e, key: i, ref: o, props: s, _owner: on.current };
+  return { $$typeof: rn, type: e, key: i, ref: o, props: s, _owner: cn.current };
 }
-_e.Fragment = rn;
-_e.jsx = tt;
-_e.jsxs = tt;
-et.exports = _e;
-var d = et.exports;
-const Ue = zt([]), Ne = [
+Se.Fragment = sn;
+Se.jsx = nt;
+Se.jsxs = nt;
+tt.exports = Se;
+var d = tt.exports;
+const Ae = Kt([]), Me = [
   "$",
   "£",
   "¥",
@@ -424,12 +424,12 @@ const Ue = zt([]), Ne = [
   "₾",
   "₿"
 ];
-var an = Object.defineProperty, ln = Object.getOwnPropertyDescriptor, un = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? ln(t, r) : t, i = e.length - 1, o; i >= 0; i--)
+var ln = Object.defineProperty, un = Object.getOwnPropertyDescriptor, mn = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? un(t, r) : t, i = e.length - 1, o; i >= 0; i--)
     (o = e[i]) && (s = (n ? o(t, r, s) : o(s)) || s);
-  return n && s && an(t, r, s), s;
-}, mn = (e, t) => (r, n) => t(r, n, e);
-let fe = class {
+  return n && s && ln(t, r, s), s;
+}, dn = (e, t) => (r, n) => t(r, n, e);
+let pe = class {
   constructor(e) {
     this._localStorageService = e;
   }
@@ -473,93 +473,93 @@ let fe = class {
     this._localStorageService.removeItem(e);
   }
 };
-fe = un([
-  mn(0, b(gt))
-], fe);
-const He = "numfmtCurrency", dn = (e) => {
-  const t = N(fe), [r, n] = I(Ne);
-  return xe(() => {
+pe = mn([
+  dn(0, b(gt))
+], pe);
+const Fe = "numfmtCurrency", fn = (e) => {
+  const t = N(pe), [r, n] = I(Me);
+  return Oe(() => {
     t.addHabit("numfmtCurrency", []).then(() => {
-      t.getHabit(He, [...Ne]).then((i) => {
+      t.getHabit(Fe, [...Me]).then((i) => {
         n(i), e && e(i);
       });
     });
   }, []), { userHabitCurrency: r, mark: (i) => {
-    t.markHabit(He, i);
+    t.markHabit(Fe, i);
   } };
-}, fn = () => {
-  const e = Ye([]), [t, r] = I({});
-  return xe(() => {
+}, hn = () => {
+  const e = qe([]), [t, r] = I({});
+  return Oe(() => {
     e.current.forEach((s) => {
       s();
     }), e.current = [];
   }, [t]), (s) => {
     e.current.push(s), r({});
   };
-}, se = (e) => Ne.find((r) => e.includes(r)), hn = (e) => !!se(e) && e.startsWith("_("), pn = (e) => {
-  const [t, r] = I(() => j(e.defaultPattern || "", 2)), n = qe(Ue), [s, i] = I(() => se(e.defaultPattern) || n[0]), o = P(() => n.map((l) => ({ label: l, value: l })), []), a = N(E).t;
-  e.action.current = () => C(`_("${s}"* #,##0${t > 0 ? ".0" : ""}_)`, t);
+}, ie = (e) => Me.find((r) => e.includes(r)), pn = (e) => !!ie(e) && e.startsWith("_("), vn = (e) => {
+  const [t, r] = I(() => j(e.defaultPattern || "", 2)), n = Je(Ae), [s, i] = I(() => ie(e.defaultPattern) || n[0]), o = P(() => n.map((l) => ({ label: l, value: l })), []), a = N(E).t;
+  e.action.current = () => y(`_("${s}"* #,##0${t > 0 ? ".0" : ""}_)`, t);
   const f = (l) => {
-    i(l), e.onChange(C(`_("${l}"* #,##0${t > 0 ? ".0" : ""}_)`, t));
+    i(l), e.onChange(y(`_("${l}"* #,##0${t > 0 ? ".0" : ""}_)`, t));
   }, m = (l) => {
     const u = l || 0;
-    r(u), e.onChange(C(`_("${s}"* #,##0${u > 0 ? ".0" : ""}_)`, u));
+    r(u), e.onChange(y(`_("${s}"* #,##0${u > 0 ? ".0" : ""}_)`, u));
   };
   return /* @__PURE__ */ d.jsxs("div", { children: [
     /* @__PURE__ */ d.jsxs("div", { className: "m-t-16 options ", children: [
       /* @__PURE__ */ d.jsxs("div", { className: "option", children: [
         /* @__PURE__ */ d.jsx("div", { className: "label", children: a("sheet.numfmt.decimalLength") }),
-        /* @__PURE__ */ d.jsx("div", { className: "m-t-8 w-120", children: /* @__PURE__ */ d.jsx(Oe, { value: t, max: 20, min: 0, onChange: m }) })
+        /* @__PURE__ */ d.jsx("div", { className: "m-t-8 w-120", children: /* @__PURE__ */ d.jsx(je, { value: t, max: 20, min: 0, onChange: m }) })
       ] }),
       /* @__PURE__ */ d.jsxs("div", { className: "option", children: [
         /* @__PURE__ */ d.jsx("div", { className: "label", children: a("sheet.numfmt.currencyType") }),
-        /* @__PURE__ */ d.jsx("div", { className: "m-t-8 w-140", children: /* @__PURE__ */ d.jsx(je, { onChange: f, options: o, value: s }) })
+        /* @__PURE__ */ d.jsx("div", { className: "m-t-8 w-140", children: /* @__PURE__ */ d.jsx($e, { onChange: f, options: o, value: s }) })
       ] })
     ] }),
     /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: a("sheet.numfmt.accountingDes") })
   ] });
-}, Ce = (e) => Ze.map((t) => ({
+}, Te = (e) => Ze.map((t) => ({
   label: t.label(e),
   value: t.suffix(e),
   color: t.color
-})), nt = () => Xt.map((e) => ({ label: e.label, value: e.suffix })), rt = () => en.map((e) => ({ label: e.label, value: e.suffix, color: e.color })), vn = (e) => !!se(e) && !e.startsWith("_("), _n = (e) => {
-  const r = N(E).t, n = qe(Ue), [s, i] = I(() => se(e.defaultPattern) || n[0]), [o, c] = I(() => j(e.defaultPattern || "", 2)), [a, f] = I(() => {
-    var g;
-    const h = Ce(s);
-    return ((g = h.find((S) => ve(S.value, e.defaultPattern))) == null ? void 0 : g.value) || h[0].value;
-  }), m = P(() => Ce(s), [s]), l = P(() => n.map((h) => ({ label: h, value: h })), [n]);
-  e.action.current = () => C(a, o);
+})), rt = () => en.map((e) => ({ label: e.label, value: e.suffix })), st = () => tn.map((e) => ({ label: e.label, value: e.suffix, color: e.color })), _n = (e) => !!ie(e) && !e.startsWith("_("), gn = (e) => {
+  const r = N(E).t, n = Je(Ae), [s, i] = I(() => ie(e.defaultPattern) || n[0]), [o, c] = I(() => j(e.defaultPattern || "", 2)), [a, f] = I(() => {
+    var p;
+    const h = Te(s);
+    return ((p = h.find((S) => ge(S.value, e.defaultPattern))) == null ? void 0 : p.value) || h[0].value;
+  }), m = P(() => Te(s), [s]), l = P(() => n.map((h) => ({ label: h, value: h })), [n]);
+  e.action.current = () => y(a, o);
   const u = (h) => {
     if (h === void 0)
       return;
     i(h);
-    const v = Ce(h)[0].value;
-    f(v), e.onChange(C(v, o));
-  }, p = (h) => {
-    h !== void 0 && (f(h), e.onChange(C(h, o)));
+    const g = Te(h)[0].value;
+    f(g), e.onChange(y(g, o));
+  }, v = (h) => {
+    h !== void 0 && (f(h), e.onChange(y(h, o)));
   }, _ = (h) => {
-    c(h || 0), e.onChange(C(a, h || 0));
+    c(h || 0), e.onChange(y(a, h || 0));
   };
   return /* @__PURE__ */ d.jsxs("div", { children: [
     /* @__PURE__ */ d.jsxs("div", { className: "m-t-16 options ", children: [
       /* @__PURE__ */ d.jsxs("div", { className: "option", children: [
         /* @__PURE__ */ d.jsx("div", { className: "label", children: r("sheet.numfmt.decimalLength") }),
-        /* @__PURE__ */ d.jsx("div", { className: "m-t-8 w-120", children: /* @__PURE__ */ d.jsx(Oe, { value: o, max: 20, min: 0, onChange: _ }) })
+        /* @__PURE__ */ d.jsx("div", { className: "m-t-8 w-120", children: /* @__PURE__ */ d.jsx(je, { value: o, max: 20, min: 0, onChange: _ }) })
       ] }),
       /* @__PURE__ */ d.jsxs("div", { className: "option", children: [
         /* @__PURE__ */ d.jsx("div", { className: "label", children: r("sheet.numfmt.currencyType") }),
-        /* @__PURE__ */ d.jsx("div", { className: "m-t-8 w-140", children: /* @__PURE__ */ d.jsx(je, { onChange: u, options: l, value: s }) })
+        /* @__PURE__ */ d.jsx("div", { className: "m-t-8 w-140", children: /* @__PURE__ */ d.jsx($e, { onChange: u, options: l, value: s }) })
       ] })
     ] }),
     /* @__PURE__ */ d.jsx("div", { className: "m-t-16 label", children: r("sheet.numfmt.negType") }),
-    /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx($e, { onChange: p, options: m, value: a }) }),
+    /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx(we, { onChange: v, options: m, value: a }) }),
     /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: r("sheet.numfmt.currencyDes") })
   ] });
-}, gn = (e) => {
-  const t = x.getInfo(e);
-  return nt().map((r) => r.value).includes(e) || ["date", "datetime", "time"].includes(t.type);
 }, Sn = (e) => {
-  const t = P(nt, []), n = N(E).t, [s, i] = I(() => {
+  const t = x.getInfo(e);
+  return rt().map((r) => r.value).includes(e) || ["date", "datetime", "time"].includes(t.type);
+}, bn = (e) => {
+  const t = P(rt, []), n = N(E).t, [s, i] = I(() => {
     if (e.defaultPattern) {
       const c = t.find((a) => a.value === e.defaultPattern);
       if (c)
@@ -573,25 +573,25 @@ const He = "numfmtCurrency", dn = (e) => {
   };
   return /* @__PURE__ */ d.jsxs("div", { children: [
     /* @__PURE__ */ d.jsx("div", { className: "m-t-16 label", children: n("sheet.numfmt.dateType") }),
-    /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx($e, { value: s, options: t, onChange: o }) }),
+    /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx(we, { value: s, options: t, onChange: o }) }),
     /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: n("sheet.numfmt.dateDes") })
   ] });
-}, bn = (e) => !e, yn = (e) => {
+}, Cn = (e) => !e, yn = (e) => {
   const r = N(E).t;
   return e.action.current = () => "", /* @__PURE__ */ d.jsx("div", { children: /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: r("sheet.numfmt.generalDes") }) });
-}, Cn = (e) => rt().some((t) => ve(t.value, e)), Tn = (e) => {
-  const t = N(E), r = P(rt, []), [n, s] = I(() => j(e.defaultPattern || "", 0)), [i, o] = I(() => {
-    const l = r.find((u) => ve(u.value, e.defaultPattern || ""));
+}, Tn = (e) => st().some((t) => ge(t.value, e)), In = (e) => {
+  const t = N(E), r = P(st, []), [n, s] = I(() => j(e.defaultPattern || "", 0)), [i, o] = I(() => {
+    const l = r.find((u) => ge(u.value, e.defaultPattern || ""));
     return (l == null ? void 0 : l.value) || r[0].value;
-  }), c = P(() => C(i, Number(n || 0)), [i, n]), a = P(() => !Qt(i), [i]), f = (l) => {
-    s(l || 0), e.onChange(C(i, Number(l || 0)));
+  }), c = P(() => y(i, Number(n || 0)), [i, n]), a = P(() => !Qt(i), [i]), f = (l) => {
+    s(l || 0), e.onChange(y(i, Number(l || 0)));
   }, m = (l) => {
     l !== void 0 && (s(j(l, 0)), o(l), e.onChange(l));
   };
   return e.action.current = () => c, /* @__PURE__ */ d.jsxs("div", { children: [
     /* @__PURE__ */ d.jsx("div", { className: "m-t-16 label", children: t.t("sheet.numfmt.decimalLength") }),
     /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx(
-      Oe,
+      je,
       {
         disabled: a,
         value: n,
@@ -604,62 +604,62 @@ const He = "numfmtCurrency", dn = (e) => {
       " ",
       t.t("sheet.numfmt.negType")
     ] }),
-    /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx($e, { onChange: m, options: r, value: i }) }),
+    /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx(we, { onChange: m, options: r, value: i }) }),
     /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: t.t("sheet.numfmt.thousandthPercentileDes") })
   ] });
-}, In = (e) => {
-  const { defaultValue: t, defaultPattern: r, row: n, col: s } = e.value, i = N(E), o = Ye(() => ""), c = i.t, a = fn(), f = P(
+}, En = (e) => {
+  const { defaultValue: t, defaultPattern: r, row: n, col: s } = e.value, i = N(E), o = qe(() => ""), c = i.t, a = hn(), f = P(
     () => [
       { label: "sheet.numfmt.general", component: yn },
-      { label: "sheet.numfmt.accounting", component: pn },
-      { label: "sheet.numfmt.currency", component: _n },
-      { label: "sheet.numfmt.date", component: Sn },
-      { label: "sheet.numfmt.thousandthPercentile", component: Tn }
-    ].map((y) => ({ ...y, label: c(y.label) })),
+      { label: "sheet.numfmt.accounting", component: vn },
+      { label: "sheet.numfmt.currency", component: gn },
+      { label: "sheet.numfmt.date", component: bn },
+      { label: "sheet.numfmt.thousandthPercentile", component: In }
+    ].map((C) => ({ ...C, label: c(C.label) })),
     []
-  ), [m, l] = I(g), [u, p] = I(() => `${n}_${s}`), { mark: _, userHabitCurrency: h } = dn(() => p(`${n}_${s}_userCurrency'`)), v = P(() => {
-    var y;
-    return (y = f.find((L) => L.label === m)) == null ? void 0 : y.component;
+  ), [m, l] = I(p), [u, v] = I(() => `${n}_${s}`), { mark: _, userHabitCurrency: h } = fn(() => v(`${n}_${s}_userCurrency'`)), g = P(() => {
+    var C;
+    return (C = f.find((A) => A.label === m)) == null ? void 0 : C.component;
   }, [m]);
-  function g() {
-    return [bn, hn, vn, gn, Cn].reduce((L, ut, mt) => L || (ut(r) ? f[mt].label : ""), "") || f[0].label;
+  function p() {
+    return [Cn, pn, _n, Sn, Tn].reduce((A, ut, mt) => A || (ut(r) ? f[mt].label : ""), "") || f[0].label;
   }
-  const S = f.map((y) => ({
-    label: y.label,
-    value: y.label
-  })), F = (y) => {
-    l(y), a(() => e.onChange({ type: "change", value: o.current() || "" }));
-  }, ge = (y) => {
-    e.onChange({ type: "change", value: y });
-  }, Se = () => {
-    const y = o.current() || "", L = se(y);
-    L && _(L), e.onChange({ type: "confirm", value: y });
+  const S = f.map((C) => ({
+    label: C.label,
+    value: C.label
+  })), F = (C) => {
+    l(C), a(() => e.onChange({ type: "change", value: o.current() || "" }));
+  }, oe = (C) => {
+    e.onChange({ type: "change", value: C });
   }, be = () => {
+    const C = o.current() || "", A = ie(C);
+    A && _(A), e.onChange({ type: "confirm", value: C });
+  }, W = () => {
     e.onChange({ type: "cancel", value: "" });
-  }, lt = {
-    onChange: ge,
+  }, Ce = {
+    onChange: oe,
     defaultValue: t,
     defaultPattern: r,
     action: o
   };
-  return xe(() => {
-    l(g()), p(`${n}_${s}`);
+  return Oe(() => {
+    l(p()), v(`${n}_${s}`);
   }, [n, s]), /* @__PURE__ */ d.jsxs("div", { className: "numfmt-panel p-b-20", children: [
     /* @__PURE__ */ d.jsxs("div", { children: [
       /* @__PURE__ */ d.jsx("div", { className: "label m-t-14", children: c("sheet.numfmt.numfmtType") }),
-      /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx(je, { onChange: F, options: S, value: m }) }),
-      /* @__PURE__ */ d.jsx("div", { children: v && /* @__PURE__ */ d.jsx(Ue.Provider, { value: h, children: /* @__PURE__ */ Kt(v, { ...lt, key: u }) }) })
+      /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx($e, { onChange: F, options: S, value: m }) }),
+      /* @__PURE__ */ d.jsx("div", { children: g && /* @__PURE__ */ d.jsx(Ae.Provider, { value: h, children: /* @__PURE__ */ Yt(g, { ...Ce, key: u }) }) })
     ] }),
     /* @__PURE__ */ d.jsxs("div", { className: "btn-list m-t-14 m-b-20", children: [
-      /* @__PURE__ */ d.jsx(Ve, { size: "small", onClick: be, className: "m-r-12", children: c("sheet.numfmt.cancel") }),
-      /* @__PURE__ */ d.jsx(Ve, { type: "primary", size: "small", onClick: Se, children: c("sheet.numfmt.confirm") })
+      /* @__PURE__ */ d.jsx(Be, { size: "small", onClick: W, className: "m-r-12", children: c("sheet.numfmt.cancel") }),
+      /* @__PURE__ */ d.jsx(Be, { type: "primary", size: "small", onClick: be, children: c("sheet.numfmt.confirm") })
     ] })
   ] });
-}, st = {
+}, it = {
   id: "sheet.command.numfmt.set.percent",
   type: D.COMMAND,
   handler: async (e) => {
-    const t = e.get(O), n = e.get(U).getSelections();
+    const t = e.get(O), n = e.get(U).getCurrentSelections();
     if (!n || !n.length)
       return !1;
     const s = [], i = "0%";
@@ -670,12 +670,12 @@ const He = "numfmtCurrency", dn = (e) => {
     }), await t.executeCommand($.id, { values: s });
   }
 };
-var En = Object.defineProperty, Nn = Object.getOwnPropertyDescriptor, Mn = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Nn(t, r) : t, i = e.length - 1, o; i >= 0; i--)
+var Nn = Object.defineProperty, Mn = Object.getOwnPropertyDescriptor, Pn = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Mn(t, r) : t, i = e.length - 1, o; i >= 0; i--)
     (o = e[i]) && (s = (n ? o(t, r, s) : o(s)) || s);
-  return n && s && En(t, r, s), s;
+  return n && s && Nn(t, r, s), s;
 }, M = (e, t) => (r, n) => t(r, n, e);
-let ce = class extends z {
+let le = class extends K {
   constructor(t, r, n, s, i, o, c, a, f, m) {
     super();
     /**
@@ -684,12 +684,13 @@ let ce = class extends z {
      * @type {(string | null)}
      * @memberof NumfmtController
      */
-    ie(this, "_previewPattern", "");
-    ie(this, "_sidebarDisposable", null);
+    ce(this, "_previewPattern", "");
+    ce(this, "_sidebarDisposable", null);
     this._sheetInterceptorService = t, this._themeService = r, this._univerInstanceService = n, this._commandService = s, this._selectionManagerService = i, this._renderManagerService = o, this._numfmtService = c, this._componentManager = a, this._sidebarService = f, this._localeService = m, this._initRealTimeRenderingInterceptor(), this._initPanel(), this._initCommands(), this._initCloseListener(), this._commandExecutedListener();
   }
   openPanel() {
-    const t = this._sidebarService, r = this._selectionManagerService, n = this._commandService, s = this._univerInstanceService, i = this._numfmtService, o = this._localeService, a = (r.getSelectionRanges() || [])[0];
+    var g;
+    const t = this._sidebarService, r = this._selectionManagerService, n = this._commandService, s = this._univerInstanceService, i = this._numfmtService, o = this._localeService, a = (((g = r.getCurrentSelections()) == null ? void 0 : g.map((p) => p.range)) || [])[0];
     if (!a)
       return !1;
     const f = s.getCurrentUnitForType(T.UNIVER_SHEET), m = f.getActiveSheet();
@@ -701,32 +702,33 @@ let ce = class extends z {
       a.startRow,
       a.startColumn
     );
-    let p = "";
-    u && (p = u.pattern);
+    let v = "";
+    u && (v = u.pattern);
     const _ = (l == null ? void 0 : l.t) === V.NUMBER ? l.v : 12345678, h = {
-      onChange: (v) => {
-        if (v.type === "change")
-          this._previewPattern = v.value, this._forceUpdate();
-        else if (v.type === "confirm") {
-          const g = r.getSelectionRanges() || [], S = { values: [] }, F = me(v.value);
-          g.forEach((ge) => {
-            R.foreach(ge, (Se, be) => {
-              S.values.push({
-                row: Se,
-                col: be,
-                pattern: v.value,
-                type: F
+      onChange: (p) => {
+        var S;
+        if (p.type === "change")
+          this._previewPattern = p.value, this._forceUpdate();
+        else if (p.type === "confirm") {
+          const F = ((S = r.getCurrentSelections()) == null ? void 0 : S.map((W) => W.range)) || [], oe = { values: [] }, be = fe(p.value);
+          F.forEach((W) => {
+            R.foreach(W, (Ce, C) => {
+              oe.values.push({
+                row: Ce,
+                col: C,
+                pattern: p.value,
+                type: be
               });
             });
-          }), n.executeCommand($.id, S), t.close();
-        } else v.type === "cancel" && t.close();
+          }), n.executeCommand($.id, oe), t.close();
+        } else p.type === "cancel" && t.close();
       },
-      value: { defaultPattern: p, defaultValue: _, row: a.startRow, col: a.startColumn }
+      value: { defaultPattern: v, defaultValue: _, row: a.startRow, col: a.startColumn }
     };
     return this._sidebarDisposable = t.open({
       header: { title: o.t("sheet.numfmt.title") },
       children: {
-        label: Ee,
+        label: Ne,
         ...h
         // need passthrough to react props.
       },
@@ -744,11 +746,11 @@ let ce = class extends z {
   }
   _initCommands() {
     [
-      Je,
       Xe,
+      et,
       Qe,
-      st,
-      de,
+      it,
+      he,
       ye,
       $
     ].forEach((t) => {
@@ -756,64 +758,64 @@ let ce = class extends z {
     });
   }
   _initPanel() {
-    this._componentManager.register(Ee, In);
+    this._componentManager.register(Ne, En);
   }
   _initRealTimeRenderingInterceptor() {
-    const t = new k((n) => {
+    const t = new G((n) => {
       this._commandService.onCommandExecuted((s) => {
-        s.id === de.id && n.next(!0), s.id === ye.id && n.next(!1);
+        s.id === he.id && n.next(!0), s.id === ye.id && n.next(!1);
       });
     }), r = Dt([
       t,
       this._selectionManagerService.selectionMoveEnd$.pipe(
-        Ht((n) => n ? n.map((s) => s.range) : [])
+        Ft((n) => n ? n.map((s) => s.range) : [])
       )
     ]);
     this.disposeWithMe(
-      Ie(
+      Ee(
         r.pipe(
-          Ft(
-            ([n, s]) => new k((i) => {
+          Wt(
+            ([n, s]) => new G((i) => {
               const o = new St();
               return n && s.length && i.next({ selectionRanges: s, disposableCollection: o }), () => {
                 o.dispose();
               };
             })
           ),
-          Wt(() => {
+          kt(() => {
             this._previewPattern = null;
           })
         ).subscribe(({ disposableCollection: n, selectionRanges: s }) => {
           var o, c;
           const i = this._univerInstanceService.getCurrentUnitForType(T.UNIVER_SHEET);
           this.openPanel(), n.add(
-            this._sheetInterceptorService.intercept(We.CELL_CONTENT, {
+            this._sheetInterceptorService.intercept(ke.CELL_CONTENT, {
               priority: 99,
               handler: (a, f, m) => {
-                const { row: l, col: u } = f, p = m(a) || {};
+                const { row: l, col: u } = f, v = m(a) || {};
                 if (s.find(
                   (_) => _.startColumn <= u && _.endColumn >= u && _.startRow <= l && _.endRow >= l
                 )) {
-                  const _ = f.worksheet.getCellRaw(l, u), h = _ == null ? void 0 : _.v, v = _ == null ? void 0 : _.t;
-                  if (h == null || v !== V.NUMBER || this._previewPattern === null)
-                    return p;
-                  const g = we(this._previewPattern, h, this._localeService.getCurrentLocale());
-                  if (g.color) {
-                    const F = this._themeService.getCurrentTheme()[`${g.color}500`];
+                  const _ = f.worksheet.getCellRaw(l, u), h = _ == null ? void 0 : _.v, g = _ == null ? void 0 : _.t;
+                  if (h == null || g !== V.NUMBER || this._previewPattern === null)
+                    return v;
+                  const p = De(this._previewPattern, h, this._localeService.getCurrentLocale());
+                  if (p.color) {
+                    const F = this._themeService.getCurrentTheme()[`${p.color}500`];
                     return {
-                      ...p,
-                      v: g.result,
+                      ...v,
+                      v: p.result,
                       t: V.STRING,
                       s: { cl: { rgb: F } }
                     };
                   }
                   return {
-                    ...p,
-                    v: g.result,
+                    ...v,
+                    v: p.result,
                     t: V.STRING
                   };
                 }
-                return p;
+                return v;
               }
             })
           ), (c = (o = this._renderManagerService.getRenderById(i.getUnitId())) == null ? void 0 : o.mainComponent) == null || c.makeDirty();
@@ -822,9 +824,9 @@ let ce = class extends z {
     );
   }
   _commandExecutedListener() {
-    const t = [pe.id, Y.id];
+    const t = [_e.id, q.id];
     this.disposeWithMe(
-      new k((r) => {
+      new G((r) => {
         const n = this._commandService.onCommandExecuted((s) => {
           if (t.includes(s.id)) {
             const i = s.params;
@@ -832,7 +834,7 @@ let ce = class extends z {
           }
         });
         return () => n.dispose();
-      }).pipe(kt(16)).subscribe((r) => this._forceUpdate(r))
+      }).pipe(Gt(16)).subscribe((r) => this._forceUpdate(r))
     );
   }
   _initCloseListener() {
@@ -842,25 +844,25 @@ let ce = class extends z {
     });
   }
 };
-ce = Mn([
-  K(B.Rendered, ce),
-  M(0, b(Pe)),
-  M(1, b(Fe)),
+le = Pn([
+  Y(B.Rendered, le),
+  M(0, b(Re)),
+  M(1, b(We)),
   M(2, w),
   M(3, O),
   M(4, b(U)),
   M(5, Lt),
   M(6, H),
-  M(7, b(Ke)),
-  M(8, Vt),
+  M(7, b(Ye)),
+  M(8, Bt),
   M(9, b(E))
-], ce);
-var Pn = Object.defineProperty, Rn = Object.getOwnPropertyDescriptor, xn = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Rn(t, r) : t, i = e.length - 1, o; i >= 0; i--)
+], le);
+var Rn = Object.defineProperty, xn = Object.getOwnPropertyDescriptor, On = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? xn(t, r) : t, i = e.length - 1, o; i >= 0; i--)
     (o = e[i]) && (s = (n ? o(t, r, s) : o(s)) || s);
-  return n && s && Pn(t, r, s), s;
-}, W = (e, t) => (r, n) => t(r, n, e);
-const On = () => {
+  return n && s && Rn(t, r, s), s;
+}, k = (e, t) => (r, n) => t(r, n, e);
+const jn = () => {
   let e = [];
   return {
     add: (s, i, o, c, a) => e.push({ unitId: s, subUnitId: i, row: o, col: c, value: a }),
@@ -870,16 +872,16 @@ const On = () => {
     }
   };
 };
-let ae = class extends z {
+let ue = class extends K {
   constructor(t, r, n, s, i) {
     super();
     // collect effect mutations when edit end and push this to  commands stack in next commands progress
-    ie(this, "_collectEffectMutation", On());
+    ce(this, "_collectEffectMutation", jn());
     this._sheetInterceptorService = t, this._numfmtService = r, this._univerInstanceService = n, this._injector = s, this._editorBridgeService = i, this._initInterceptorEditorStart(), this._initInterceptorEditorEnd(), this._initInterceptorCommands();
   }
   _initInterceptorEditorStart() {
     this._editorBridgeService && this.disposeWithMe(
-      Ie(
+      Ee(
         this._editorBridgeService.interceptor.intercept(
           this._editorBridgeService.interceptor.getInterceptPoints().BEFORE_CELL_EDIT,
           {
@@ -891,7 +893,7 @@ let ae = class extends z {
                 i
               );
               if (o)
-                switch (me(o.pattern)) {
+                switch (fe(o.pattern)) {
                   case "scientific":
                   case "percent":
                   case "currency":
@@ -918,7 +920,7 @@ let ae = class extends z {
    */
   _initInterceptorEditorEnd() {
     this._editorBridgeService && this.disposeWithMe(
-      Ie(
+      Ee(
         this._editorBridgeService.interceptor.intercept(
           this._editorBridgeService.interceptor.getInterceptPoints().AFTER_CELL_EDIT,
           {
@@ -930,7 +932,7 @@ let ae = class extends z {
                 r.subUnitId,
                 r.row,
                 r.col
-              ), i = (m = s && me(s.pattern)) != null ? m : "", o = () => {
+              ), i = (m = s && fe(s.pattern)) != null ? m : "", o = () => {
                 s && this._collectEffectMutation.add(
                   r.unitId,
                   r.subUnitId,
@@ -955,7 +957,7 @@ let ae = class extends z {
                     }
                   ), { ...t, v: l, t: V.NUMBER };
                 }
-              } else (["date", "time", "datetime"].includes(i) || !jn(c)) && o();
+              } else (["date", "time", "datetime"].includes(i) || !$n(c)) && o();
               return n(t);
             }
           }
@@ -984,15 +986,15 @@ let ae = class extends z {
                   undos: []
                 };
               const a = c.filter((u) => {
-                var p;
-                return !!((p = u.value) != null && p.pattern);
+                var v;
+                return !!((v = u.value) != null && v.pattern);
               }).map((u) => ({
                 row: u.row,
                 col: u.col,
                 pattern: u.value.pattern
               })), f = c.filter((u) => {
-                var p;
-                return !((p = u.value) != null && p.pattern);
+                var v;
+                return !((v = u.value) != null && v.pattern);
               }).map((u) => ({
                 startRow: u.row,
                 endColumn: u.col,
@@ -1001,21 +1003,21 @@ let ae = class extends z {
               })), m = [], l = [];
               if (a) {
                 const u = {
-                  id: Y.id,
-                  params: ke(i, o, a)
+                  id: q.id,
+                  params: Ge(i, o, a)
                 };
-                m.push(u), l.push(...Ge(t._injector, u.params));
+                m.push(u), l.push(...ze(t._injector, u.params));
               }
               if (f) {
                 const u = {
-                  id: pe.id,
+                  id: _e.id,
                   params: {
                     unitId: i,
                     subUnitId: o,
                     ranges: f
                   }
                 };
-                m.push(u), l.push(...ze(t._injector, u.params));
+                m.push(u), l.push(...Ke(t._injector, u.params));
               }
               return {
                 redos: m,
@@ -1032,39 +1034,39 @@ let ae = class extends z {
     );
   }
 };
-ae = xn([
-  K(B.Rendered, ae),
-  W(0, b(Pe)),
-  W(1, b(H)),
-  W(2, b(w)),
-  W(3, b(Me)),
-  W(4, It(Rt))
-], ae);
-function jn(e) {
+ue = On([
+  Y(B.Rendered, ue),
+  k(0, b(Re)),
+  k(1, b(H)),
+  k(2, b(w)),
+  k(3, b(Pe)),
+  k(4, It(Rt))
+], ue);
+function $n(e) {
   return /^-?\d+(\.\d+)?$/.test(e);
 }
-var $n = Object.defineProperty, wn = Object.getOwnPropertyDescriptor, Dn = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? wn(t, r) : t, i = e.length - 1, o; i >= 0; i--)
+var wn = Object.defineProperty, Dn = Object.getOwnPropertyDescriptor, Un = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Dn(t, r) : t, i = e.length - 1, o; i >= 0; i--)
     (o = e[i]) && (s = (n ? o(t, r, s) : o(s)) || s);
-  return n && s && $n(t, r, s), s;
-}, Un = (e, t) => (r, n) => t(r, n, e);
-let le = class extends z {
+  return n && s && wn(t, r, s), s;
+}, An = (e, t) => (r, n) => t(r, n, e);
+let me = class extends K {
   constructor(e) {
     super(), this._localeService = e;
   }
 };
-le = Dn([
-  K(B.Rendered, le),
-  Un(0, b(E))
-], le);
-const ue = [
+me = Un([
+  Y(B.Rendered, me),
+  An(0, b(E))
+], me);
+const de = [
   {
     label: "sheet.numfmt.general",
     pattern: null
   },
   {
     label: "sheet.numfmt.text",
-    pattern: "@@@"
+    pattern: At
   },
   "|",
   {
@@ -1110,30 +1112,30 @@ const ue = [
     label: "sheet.numfmt.moreFmt",
     pattern: ""
   }
-], it = "sheet.numfmt.moreNumfmtType", ot = "sheet.numfmt.moreNumfmtType.options", Ln = (e) => {
+], ot = "sheet.numfmt.moreNumfmtType", ct = "sheet.numfmt.moreNumfmtType.options", Ln = (e) => {
   var n;
   const t = N(E), r = (n = e.value) != null ? n : t.t("sheet.numfmt.general");
   return /* @__PURE__ */ d.jsx("span", { className: "more-numfmt-type", children: r });
-}, An = () => {
-  const e = N(O), t = N(E), r = Yt(), n = N(U), s = (c) => {
-    const a = n.getLast();
+}, Vn = () => {
+  const e = N(O), t = N(E), r = qt(), n = N(U), s = (c) => {
+    const a = n.getCurrentLastSelection();
     if (!a)
       return;
-    const f = r.get(At), m = a.range, l = [];
-    R.foreach(m, (u, p) => {
-      c ? l.push({ row: u, col: p, pattern: c, type: me(c) }) : l.push({ row: u, col: p });
+    const f = r.get(Vt), m = a.range, l = [];
+    R.foreach(m, (u, v) => {
+      c ? l.push({ row: u, col: v, pattern: c, type: fe(c) }) : l.push({ row: u, col: v });
     }), e.executeCommand($.id, { values: l }), f.focus();
   }, i = (c) => {
     if (c === 0)
       s(null);
-    else if (c === ue.length - 1)
-      e.executeCommand(de.id);
+    else if (c === de.length - 1)
+      e.executeCommand(he.id);
     else {
-      const a = ue[c];
+      const a = de[c];
       a.pattern && s(a.pattern);
     }
   }, o = 1220;
-  return /* @__PURE__ */ d.jsx("div", { className: "more-numfmt-type-options", children: ue.map((c, a) => c === "|" ? /* @__PURE__ */ d.jsx("div", { className: "line m-t-4", onClick: (f) => f.stopPropagation() }, a) : /* @__PURE__ */ d.jsxs(
+  return /* @__PURE__ */ d.jsx("div", { className: "more-numfmt-type-options", children: de.map((c, a) => c === "|" ? /* @__PURE__ */ d.jsx("div", { className: "line m-t-4", onClick: (f) => f.stopPropagation() }, a) : /* @__PURE__ */ d.jsxs(
     "div",
     {
       className: "option-item m-t-4",
@@ -1142,153 +1144,153 @@ const ue = [
       },
       children: [
         /* @__PURE__ */ d.jsx("div", { children: t.t(c.label) }),
-        /* @__PURE__ */ d.jsx("div", { className: "m-l-26", children: c.pattern ? we(c.pattern || "", o, t.getCurrentLocale()).result : "" })
+        /* @__PURE__ */ d.jsx("div", { className: "m-l-26", children: c.pattern ? De(c.pattern || "", o, t.getCurrentLocale()).result : "" })
       ]
     },
     a
   )) });
-}, Vn = (e) => ({
+}, Bn = (e) => ({
   icon: "RmbSingle",
   id: Qe.id,
   title: "sheet.numfmt.currency",
   tooltip: "sheet.numfmt.currency",
-  type: ee.BUTTON,
-  group: te.TOOLBAR_FORMULAS_INSERT,
-  positions: [ne.TOOLBAR_START],
-  hidden$: re(e, T.UNIVER_SHEET),
-  disabled$: X(e, { workbookTypes: [q], worksheetTypes: [J, Z], rangeTypes: [Q] })
-}), Bn = (e) => ({
+  type: te.BUTTON,
+  group: ne.TOOLBAR_FORMULAS_INSERT,
+  positions: [re.TOOLBAR_START],
+  hidden$: se(e, T.UNIVER_SHEET),
+  disabled$: ee(e, { workbookTypes: [J], worksheetTypes: [X, Z], rangeTypes: [Q] })
+}), Hn = (e) => ({
   icon: "AddDigitsSingle",
-  id: Je.id,
+  id: Xe.id,
   title: "sheet.numfmt.addDecimal",
   tooltip: "sheet.numfmt.addDecimal",
-  type: ee.BUTTON,
-  positions: [ne.TOOLBAR_START],
-  group: te.TOOLBAR_FORMULAS_INSERT,
-  hidden$: re(e, T.UNIVER_SHEET),
-  disabled$: X(e, { workbookTypes: [q], worksheetTypes: [J, Z], rangeTypes: [Q] })
-}), Hn = (e) => ({
+  type: te.BUTTON,
+  positions: [re.TOOLBAR_START],
+  group: ne.TOOLBAR_FORMULAS_INSERT,
+  hidden$: se(e, T.UNIVER_SHEET),
+  disabled$: ee(e, { workbookTypes: [J], worksheetTypes: [X, Z], rangeTypes: [Q] })
+}), Fn = (e) => ({
   icon: "ReduceDigitsSingle",
-  id: Xe.id,
+  id: et.id,
   title: "sheet.numfmt.subtractDecimal",
   tooltip: "sheet.numfmt.subtractDecimal",
-  type: ee.BUTTON,
-  group: te.TOOLBAR_FORMULAS_INSERT,
-  positions: [ne.TOOLBAR_START],
-  hidden$: re(e, T.UNIVER_SHEET),
-  disabled$: X(e, { workbookTypes: [q], worksheetTypes: [J, Z], rangeTypes: [Q] })
-}), Fn = (e) => ({
+  type: te.BUTTON,
+  group: ne.TOOLBAR_FORMULAS_INSERT,
+  positions: [re.TOOLBAR_START],
+  hidden$: se(e, T.UNIVER_SHEET),
+  disabled$: ee(e, { workbookTypes: [J], worksheetTypes: [X, Z], rangeTypes: [Q] })
+}), Wn = (e) => ({
   icon: "PercentSingle",
-  id: st.id,
+  id: it.id,
   title: "sheet.numfmt.percent",
   tooltip: "sheet.numfmt.percent",
-  type: ee.BUTTON,
-  group: te.TOOLBAR_FORMULAS_INSERT,
-  positions: [ne.TOOLBAR_START],
-  hidden$: re(e, T.UNIVER_SHEET),
-  disabled$: X(e, { workbookTypes: [q], worksheetTypes: [J, Z], rangeTypes: [Q] })
-}), Wn = (e) => {
-  const t = e.get(H), r = e.get(w), n = e.get(O), s = e.get(E), i = e.get(U), o = xt(r, "", ({ workbook: c, worksheet: a }) => new k(
+  type: te.BUTTON,
+  group: ne.TOOLBAR_FORMULAS_INSERT,
+  positions: [re.TOOLBAR_START],
+  hidden$: se(e, T.UNIVER_SHEET),
+  disabled$: ee(e, { workbookTypes: [J], worksheetTypes: [X, Z], rangeTypes: [Q] })
+}), kn = (e) => {
+  const t = e.get(H), r = e.get(w), n = e.get(O), s = e.get(E), i = e.get(U), o = xt(r, "", ({ workbook: c, worksheet: a }) => new G(
     (f) => Ut(
       i.selectionMoveEnd$,
-      new k((m) => {
-        const l = [pe.id, Y.id], u = n.onCommandExecuted((p) => {
-          l.includes(p.id) && m.next(null);
+      new G((m) => {
+        const l = [_e.id, q.id], u = n.onCommandExecuted((v) => {
+          l.includes(v.id) && m.next(null);
         });
         return () => u.dispose();
       })
     ).subscribe(() => {
-      const m = i.getSelections();
+      const m = i.getCurrentSelections();
       if (m && m[0]) {
-        const l = m[0].range, u = l.startRow, p = l.startColumn, _ = t.getValue(c.getUnitId(), a.getSheetId(), u, p), h = _ == null ? void 0 : _.pattern;
-        let v = s.t("sheet.numfmt.general");
+        const l = m[0].range, u = l.startRow, v = l.startColumn, _ = t.getValue(c.getUnitId(), a.getSheetId(), u, v), h = _ == null ? void 0 : _.pattern;
+        let g = s.t("sheet.numfmt.general");
         if (h) {
-          const g = ue.filter((S) => typeof S == "object" && S.pattern).find(
-            (S) => ve(h, S.pattern)
+          const p = de.filter((S) => typeof S == "object" && S.pattern).find(
+            (S) => ge(h, S.pattern)
           );
-          g && typeof g == "object" && g.pattern ? v = s.t(g.label) : v = s.t("sheet.numfmt.moreFmt");
+          p && typeof p == "object" && p.pattern ? g = s.t(p.label) : g = s.t("sheet.numfmt.moreFmt");
         }
-        f.next(v);
+        f.next(g);
       }
     })
   ));
   return {
-    label: it,
-    id: de.id,
+    label: ot,
+    id: he.id,
     tooltip: "sheet.numfmt.title",
-    type: ee.SELECTOR,
-    group: te.TOOLBAR_FORMULAS_INSERT,
-    positions: [ne.TOOLBAR_START],
+    type: te.SELECTOR,
+    group: ne.TOOLBAR_FORMULAS_INSERT,
+    positions: [re.TOOLBAR_START],
     selections: [
       {
         label: {
-          name: ot,
+          name: ct,
           hoverable: !1
         }
       }
     ],
     value$: o,
-    hidden$: re(e, T.UNIVER_SHEET),
-    disabled$: X(e, { workbookTypes: [q], worksheetTypes: [Z, J], rangeTypes: [Q] })
+    hidden$: se(e, T.UNIVER_SHEET),
+    disabled$: ee(e, { workbookTypes: [J], worksheetTypes: [Z, X], rangeTypes: [Q] })
   };
 };
-var kn = Object.defineProperty, Gn = Object.getOwnPropertyDescriptor, zn = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Gn(t, r) : t, i = e.length - 1, o; i >= 0; i--)
+var Gn = Object.defineProperty, zn = Object.getOwnPropertyDescriptor, Kn = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? zn(t, r) : t, i = e.length - 1, o; i >= 0; i--)
     (o = e[i]) && (s = (n ? o(t, r, s) : o(s)) || s);
-  return n && s && kn(t, r, s), s;
-}, Te = (e, t) => (r, n) => t(r, n, e);
-const Kn = {};
-let G = class extends z {
+  return n && s && Gn(t, r, s), s;
+}, Ie = (e, t) => (r, n) => t(r, n, e);
+const Yn = {};
+let z = class extends K {
   constructor(e, t, r, n) {
     super(), this._config = e, this._injector = t, this._componentManager = r, this._menuService = n, this._initMenu();
   }
   _initMenu() {
     const { menu: e = {} } = this._config;
-    [Fn, Bn, Hn, Vn, Wn].forEach((t) => {
+    [Wn, Hn, Fn, Bn, kn].forEach((t) => {
       this.disposeWithMe(this._menuService.addMenuItem(t(this._injector), e));
-    }), this.disposeWithMe(this._componentManager.register(it, Ln)), this.disposeWithMe(this._componentManager.register(ot, An));
+    }), this.disposeWithMe(this._componentManager.register(ot, Ln)), this.disposeWithMe(this._componentManager.register(ct, Vn));
   }
 };
-G = zn([
-  K(B.Rendered, G),
-  Te(1, b(Me)),
-  Te(2, b(Ke)),
-  Te(3, b(Bt))
-], G);
-var ct = Object.defineProperty, Yn = Object.getOwnPropertyDescriptor, qn = (e, t, r) => t in e ? ct(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, Jn = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Yn(t, r) : t, i = e.length - 1, o; i >= 0; i--)
+z = Kn([
+  Y(B.Rendered, z),
+  Ie(1, b(Pe)),
+  Ie(2, b(Ye)),
+  Ie(3, b(Ht))
+], z);
+var at = Object.defineProperty, qn = Object.getOwnPropertyDescriptor, Jn = (e, t, r) => t in e ? at(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, Xn = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? qn(t, r) : t, i = e.length - 1, o; i >= 0; i--)
     (o = e[i]) && (s = (n ? o(t, r, s) : o(s)) || s);
-  return n && s && ct(t, r, s), s;
-}, Zn = (e, t) => (r, n) => t(r, n, e), at = (e, t, r) => qn(e, typeof t != "symbol" ? t + "" : t, r);
-let he = class extends bt {
+  return n && s && at(t, r, s), s;
+}, Zn = (e, t) => (r, n) => t(r, n, e), lt = (e, t, r) => Jn(e, typeof t != "symbol" ? t + "" : t, r);
+let ve = class extends bt {
   constructor(e = {}, t) {
-    super(), this._config = e, this._injector = t, this._config = yt.deepMerge({}, Kn, this._config);
+    super(), this._config = e, this._injector = t, this._config = Ct.deepMerge({}, Yn, this._config);
   }
   onStarting() {
-    this._injector.add([De, { useClass: ce, lazy: !1 }]), this._injector.add([ae]), this._injector.add([fe]), this._injector.add([oe]), this._injector.add([le]), this._injector.add(
+    this._injector.add([Ue, { useClass: le, lazy: !1 }]), this._injector.add([ue]), this._injector.add([pe]), this._injector.add([ae]), this._injector.add([me]), this._injector.add(
       [
-        G,
+        z,
         {
-          useFactory: () => this._injector.createInstance(G, this._config)
+          useFactory: () => this._injector.createInstance(z, this._config)
         }
       ]
     );
   }
 };
-at(he, "pluginName", Ee);
-at(he, "type", T.UNIVER_SHEET);
-he = Jn([
-  Ct(Mt, Ot),
-  Zn(1, b(Me))
-], he);
+lt(ve, "pluginName", Ne);
+lt(ve, "type", T.UNIVER_SHEET);
+ve = Xn([
+  yt(Mt, Ot),
+  Zn(1, b(Pe))
+], ve);
 export {
-  Je as AddDecimalCommand,
+  Xe as AddDecimalCommand,
   ye as CloseNumfmtPanelOperator,
-  de as OpenNumfmtPanelOperator,
+  he as OpenNumfmtPanelOperator,
   Qe as SetCurrencyCommand,
   $ as SetNumfmtCommand,
-  st as SetPercentCommand,
-  Xe as SubtractDecimalCommand,
-  he as UniverSheetsNumfmtPlugin,
-  we as getPatternPreview
+  it as SetPercentCommand,
+  et as SubtractDecimalCommand,
+  ve as UniverSheetsNumfmtPlugin,
+  De as getPatternPreview
 };