@univerjs/sheets-numfmt 0.1.16 → 0.2.0

package/lib/es/index.js

@@ -1,64 +1,20 @@
-var mt = Object.defineProperty;
-var dt = (e, t, s) => t in e ? mt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: s }) : e[t] = s;
-var ie = (e, t, s) => dt(e, typeof t != "symbol" ? t + "" : t, s);
-import { CommandType as w, ICommandService as O, IUniverInstanceService as D, IUndoRedoService as ft, sequenceExecute as ht, LocaleType as pt, Disposable as z, ObjectMatrix as vt, CellValueType as V, Range as R, UniverInstanceType as T, OnLifecycle as K, LifecycleStages as B, ThemeService as He, LocaleService as E, 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 { getSheetCommandTarget as Me, transformCellsToRange as Fe, rangeMerge as Le, SetNumfmtMutation as Y, factorySetNumfmtUndoMutation as We, RemoveNumfmtMutation as pe, factoryRemoveNumfmtUndoMutation as ke, INTERCEPTOR_POINT as Ge, SheetInterceptorService as Pe, INumfmtService as H, SelectionManagerService as U, SetRangeValuesCommand as Tt, WorkbookEditablePermission as q, WorksheetEditPermission as J, WorksheetSetCellStylePermission as Z, RangeProtectionPermissionEditPoint as Q, UniverSheetsPlugin as It } from "@univerjs/sheets";
-import { Inject as S, createIdentifier as Et, Injector as Re } from "@wendellhu/redi";
-import { SheetSkeletonManagerService as Nt, IEditorBridgeService as Mt, getCurrentRangeDisable$ as X, deriveStateFromActiveSheet$ as Pt, UniverSheetsUIPlugin as Rt } from "@univerjs/sheets-ui";
-import { switchMap as xt, of as Ot, skip as jt, Observable as k, combineLatest as $t, merge as wt } from "rxjs";
+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 Dt, ITextSelectionRenderManager as Ut } from "@univerjs/engine-render";
-import { ComponentManager as ze, ISidebarService as Lt, MenuItemType as ee, MenuGroup as te, MenuPosition as ne, getMenuHiddenObservable as se, IMenuService as At } from "@univerjs/ui";
-import { map as Vt, switchMap as Bt, tap as Ht, debounceTime as Ft } from "rxjs/operators";
-import Wt, { createContext as kt, useState as I, useEffect as xe, useRef as Ke, useContext as Ye, useMemo as P, createElement as Gt } from "react";
-import { InputNumber as Oe, Select as je, SelectList as $e, Button as Ae } from "@univerjs/design";
-import { useDependency as N, useInjector as zt } from "@wendellhu/redi/react-bindings";
-const $ = {
-  id: "sheet.command.numfmt.set.numfmt",
-  type: w.COMMAND,
-  handler: (e, t) => {
-    if (!t)
-      return !1;
-    const s = e.get(O), n = e.get(D), r = e.get(ft), i = Me(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 = Fe(o, c, a), l = {
-      unitId: o,
-      subUnitId: c,
-      ranges: f.map((h) => ({
-        startColumn: h.col,
-        startRow: h.row,
-        endColumn: h.col,
-        endRow: h.row
-      }))
-    }, u = [], p = [];
-    if (a.length) {
-      Object.keys(m.values).forEach((v) => {
-        const g = m.values[v];
-        g.ranges = Le(g.ranges);
-      }), u.push({
-        id: Y.id,
-        params: m
-      });
-      const h = We(e, m);
-      p.push(...h);
-    }
-    if (f.length) {
-      l.ranges = Le(l.ranges), u.push({
-        id: pe.id,
-        params: l
-      });
-      const h = ke(e, l);
-      p.push(...h);
-    }
-    const _ = ht(u, s).result;
-    return _ && r.pushUndoRedo({
-      unitID: o,
-      undoMutations: p,
-      redoMutations: u
-    }), _;
-  }
-}, Ee = "SHEET_NUMFMT_PLUGIN", me = (e) => x.getInfo(e).type || "unknown", we = (e, t, s) => {
-  const n = x.getInfo(e), r = s === pt.ZH_CN ? "zh-CN" : "en", i = n._partitions[1], o = x.format(e, t, { locale: r });
+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) => {
+  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,
     color: i.color
@@ -66,27 +22,27 @@ const $ = {
     result: o
   };
 };
-var Kt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, qt = (e, t, s, n) => {
-  for (var r = n > 1 ? void 0 : n ? Yt(t, s) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (n ? o(t, s, r) : o(r)) || r);
-  return n && r && Kt(t, s, r), r;
-}, A = (e, t) => (s, n) => t(s, n, e);
+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--)
+    (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 {
-  constructor(e, t, s, n, r, i) {
-    super(), this._instanceService = e, this._sheetInterceptorService = t, this._themeService = s, this._commandService = n, this._numfmtService = r, this._localeService = i, this._initInterceptorCellContent();
+  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 vt();
-    this.disposeWithMe(this._sheetInterceptorService.intercept(Ge.CELL_CONTENT, {
-      handler: (t, s, n) => {
-        const r = s.unitId, i = s.subUnitId, o = this._numfmtService.getValue(r, i, s.row, s.col);
+    const e = new Le();
+    this.disposeWithMe(this._sheetInterceptorService.intercept(We.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)
           return n(t);
         const c = t;
         if (!c || c.t !== V.NUMBER)
           return n(t);
         let a = "";
-        const f = e.getValue(s.row, s.col);
+        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());
@@ -97,7 +53,7 @@ let oe = class extends z {
           const u = this._themeService.getCurrentTheme()[`${m.color}500`];
           u && (l.interceptorStyle = { cl: { rgb: u } });
         }
-        return e.setValue(s.row, s.col, {
+        return e.setValue(r.row, r.col, {
           result: l,
           parameters: c.v
         }), n({ ...t, ...l });
@@ -105,34 +61,39 @@ let oe = class extends z {
       priority: 10
     })), this.disposeWithMe(this._commandService.onCommandExecuted((t) => {
       if (t.id === Y.id) {
-        const s = t.params;
-        Object.keys(s.values).forEach((n) => {
-          s.values[n].ranges.forEach((i) => {
+        const r = t.params;
+        Object.keys(r.values).forEach((n) => {
+          r.values[n].ranges.forEach((i) => {
             R.foreach(i, (o, c) => {
               e.realDeleteValue(o, c);
             });
           });
         });
+      } else if (t.id === Et.id) {
+        const r = t.params;
+        new Le(r.cellValue).forValue((n, s) => {
+          e.realDeleteValue(n, s);
+        });
       }
     })), this.disposeWithMe(
       this._instanceService.getCurrentTypeOfUnit$(T.UNIVER_SHEET).pipe(
-        xt((t) => {
-          var s;
-          return (s = t == null ? void 0 : t.activeSheet$) != null ? s : Ot(null);
+        jt((t) => {
+          var r;
+          return (r = t == null ? void 0 : t.activeSheet$) != null ? r : $t(null);
         }),
-        jt(1)
+        wt(1)
       ).subscribe(() => e.reset())
     );
   }
 };
-oe = qt([
+oe = Zt([
   K(B.Rendered, oe),
-  A(0, D),
-  A(1, S(Pe)),
-  A(2, S(He)),
-  A(3, S(O)),
-  A(4, S(H)),
-  A(5, S(E))
+  A(0, w),
+  A(1, b(Pe)),
+  A(2, b(Fe)),
+  A(3, b(O)),
+  A(4, b(H)),
+  A(5, b(E))
 ], oe);
 const j = (e, t = 0) => {
   var n;
@@ -140,7 +101,7 @@ const j = (e, t = 0) => {
 }, ve = (e, t) => {
   if (e && !t || !e && t)
     return !1;
-  const s = (f) => f.reduce(
+  const r = (f) => f.reduce(
     (m, l) => {
       if (m.isEnd)
         return m;
@@ -148,22 +109,66 @@ const j = (e, t = 0) => {
       return l.type === "point" ? (m.isEnd = !0, m) : { ...m, result: m.result + u };
     },
     { isEnd: !1, result: "" }
-  ).result, n = x.getInfo(e)._partitions, r = x.getInfo(t)._partitions, i = s(n[0].tokens), o = s(r[0].tokens), c = s(n[1].tokens), a = s(r[1].tokens);
-  return i === o && c === a && n[1].color === r[1].color;
-}, Ve = (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(
+  ).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(
   /\.0*/g,
-  `${t > 0 ? "." : ""}${Ve(Number(t || 0))}`
+  `${t > 0 ? "." : ""}${Be(Number(t || 0))}`
 ) : /0([^0]?)|0$/.test(n) ? n.replace(
   /0([^0]+)|0$/,
-  `0${t > 0 ? "." : ""}${Ve(Number(t || 0))}$1`
-) : n).join(";"), Jt = (e) => /\.0?/.test(e) || /0([^0]?)|0$/.test(e), qe = {
+  `0${t > 0 ? "." : ""}${Be(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);
+    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 = {
+      unitId: o,
+      subUnitId: c,
+      ranges: f.map((h) => ({
+        startColumn: h.col,
+        startRow: h.row,
+        endColumn: h.col,
+        endRow: h.row
+      }))
+    }, u = [], p = [];
+    if (a.length) {
+      Object.keys(m.values).forEach((v) => {
+        const g = m.values[v];
+        g.ranges = Ae(g.ranges);
+      }), u.push({
+        id: Y.id,
+        params: m
+      });
+      const h = Ge(e, m);
+      p.push(...h);
+    }
+    if (f.length) {
+      l.ranges = Ae(l.ranges), u.push({
+        id: pe.id,
+        params: l
+      });
+      const h = ze(e, l);
+      p.push(...h);
+    }
+    const _ = vt(u, r).result;
+    return _ && s.pushUndoRedo({
+      unitID: o,
+      undoMutations: p,
+      redoMutations: u
+    }), _;
+  }
+}, Je = {
   id: "sheet.command.numfmt.add.decimal.command",
-  type: w.COMMAND,
+  type: D.COMMAND,
   handler: async (e) => {
-    const t = e.get(O), s = e.get(U), n = e.get(H), r = e.get(D), i = s.getSelections();
+    const t = e.get(O), r = e.get(U), n = e.get(H), s = e.get(w), i = r.getSelections();
     if (!i || !i.length)
       return !1;
-    const o = Me(r);
+    const o = Re(s);
     if (!o) return !1;
     const { unitId: c, subUnitId: a } = o;
     let f = 0;
@@ -187,17 +192,17 @@ const j = (e, t = 0) => {
             pattern: l
           });
         else {
-          const g = j(v.pattern), b = C(v.pattern, g + 1);
-          b !== v.pattern && u.push({
+          const g = j(v.pattern), S = C(v.pattern, g + 1);
+          S !== v.pattern && u.push({
             row: _,
             col: h,
-            pattern: b
+            pattern: S
           });
         }
       });
     }), u.length ? await t.executeCommand($.id, { values: u }) : !1;
   }
-}, Zt = [
+}, Xt = [
   {
     label: "1930-08-05",
     suffix: "yyyy-MM-dd"
@@ -242,7 +247,7 @@ const j = (e, t = 0) => {
     label: "08-05 下午 01:30",
     suffix: "MM-dd A/P hh:mm"
   }
-], Qt = [
+], en = [
   {
     label: "(1,235)",
     suffix: "#,##0_);(#,##0)"
@@ -270,7 +275,7 @@ const j = (e, t = 0) => {
     suffix: "#,##0.00_);[Red]-#,##0.00",
     color: "red"
   }
-], Je = [
+], Ze = [
   {
     label: (e) => `${e}1,235`,
     suffix: (e) => `"${e}"#,##0.00_);"${e}"#,##0.00`
@@ -298,28 +303,28 @@ const j = (e, t = 0) => {
     suffix: (e) => `"${e}"#,##0.00_);[Red]-"${e}"#,##0.00`,
     color: "red"
   }
-], Ze = {
+], Qe = {
   id: "sheet.command.numfmt.set.currency",
-  type: w.COMMAND,
+  type: D.COMMAND,
   handler: async (e) => {
     const t = e.get(O), n = e.get(U).getSelections();
     if (!n || !n.length)
       return !1;
-    const r = [], i = Je[0].suffix("¥");
+    const s = [], i = Ze[0].suffix("¥");
     return n.forEach((c) => {
       R.foreach(c.range, (a, f) => {
-        r.push({ row: a, col: f, pattern: i, type: "currency" });
+        s.push({ row: a, col: f, pattern: i, type: "currency" });
       });
-    }), await t.executeCommand($.id, { values: r });
+    }), await t.executeCommand($.id, { values: s });
   }
-}, Qe = {
+}, Xe = {
   id: "sheet.command.numfmt.subtract.decimal.command",
-  type: w.COMMAND,
+  type: D.COMMAND,
   handler: async (e) => {
-    const t = e.get(O), s = e.get(U), n = e.get(H), r = e.get(D), i = s.getSelections();
+    const t = e.get(O), r = e.get(U), n = e.get(H), s = e.get(w), i = r.getSelections();
     if (!i || !i.length)
       return !1;
-    const o = Me(r);
+    const o = Re(s);
     if (!o) return !1;
     const { unitId: c, subUnitId: a } = o;
     let f = 0;
@@ -328,8 +333,8 @@ const j = (e, t = 0) => {
         const g = n.getValue(c, a, h, v);
         if (!g)
           return;
-        const b = j(g.pattern);
-        f = b > f ? b : f;
+        const S = j(g.pattern);
+        f = S > f ? S : f;
       });
     });
     const m = f - 1, l = C(`0${m > 0 ? ".0" : "."}`, m), u = [];
@@ -343,11 +348,11 @@ const j = (e, t = 0) => {
             pattern: l
           });
         else {
-          const b = j(g.pattern);
+          const S = j(g.pattern);
           u.push({
             row: h,
             col: v,
-            pattern: C(g.pattern, b - 1)
+            pattern: C(g.pattern, S - 1)
           });
         }
       });
@@ -355,19 +360,19 @@ const j = (e, t = 0) => {
   }
 }, ye = {
   id: "sheet.operation.close.numfmt.panel",
-  type: w.OPERATION,
+  type: D.OPERATION,
   handler: () => (
     // do nothing,just notify panel is closed
     !0
   )
-}, De = Et("INumfmtController");
+}, De = Tt("INumfmtController");
 _t(B.Rendered, De);
 const de = {
   id: "sheet.operation.open.numfmt.panel",
-  type: w.OPERATION,
+  type: D.OPERATION,
   handler: (e) => (e.get(De).openPanel(), !0)
 };
-var Xe = { exports: {} }, _e = {};
+var et = { exports: {} }, _e = {};
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -377,20 +382,20 @@ var Xe = { 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 Xt = Wt, en = Symbol.for("react.element"), tn = Symbol.for("react.fragment"), nn = Object.prototype.hasOwnProperty, sn = Xt.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, rn = { key: !0, ref: !0, __self: !0, __source: !0 };
-function et(e, t, s) {
-  var n, r = {}, i = null, o = null;
-  s !== void 0 && (i = "" + s), t.key !== void 0 && (i = "" + t.key), t.ref !== void 0 && (o = t.ref);
-  for (n in t) nn.call(t, n) && !rn.hasOwnProperty(n) && (r[n] = t[n]);
-  if (e && e.defaultProps) for (n in t = e.defaultProps, t) r[n] === void 0 && (r[n] = t[n]);
-  return { $$typeof: en, type: e, key: i, ref: o, props: r, _owner: sn.current };
+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 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]);
+  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 };
 }
-_e.Fragment = tn;
-_e.jsx = et;
-_e.jsxs = et;
-Xe.exports = _e;
-var d = Xe.exports;
-const Ue = kt([]), Ne = [
+_e.Fragment = rn;
+_e.jsx = tt;
+_e.jsxs = tt;
+et.exports = _e;
+var d = et.exports;
+const Ue = zt([]), Ne = [
   "$",
   "£",
   "¥",
@@ -419,11 +424,11 @@ const Ue = kt([]), Ne = [
   "₾",
   "₿"
 ];
-var on = Object.defineProperty, cn = Object.getOwnPropertyDescriptor, an = (e, t, s, n) => {
-  for (var r = n > 1 ? void 0 : n ? cn(t, s) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (n ? o(t, s, r) : o(r)) || r);
-  return n && r && on(t, s, r), r;
-}, ln = (e, t) => (s, n) => t(s, n, e);
+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--)
+    (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 {
   constructor(e) {
     this._localStorageService = e;
@@ -432,24 +437,24 @@ let fe = class {
     return `userHabitController_${e}`;
   }
   async addHabit(e, t) {
-    const s = this._getKey(e);
-    return this._localStorageService.getItem(s).then((n) => {
-      n || this._localStorageService.setItem(s, t);
+    const r = this._getKey(e);
+    return this._localStorageService.getItem(r).then((n) => {
+      n || this._localStorageService.setItem(r, t);
     });
   }
   markHabit(e, t) {
-    const s = this._getKey(e);
-    this._localStorageService.getItem(s).then((n) => {
+    const r = this._getKey(e);
+    this._localStorageService.getItem(r).then((n) => {
       if (n) {
-        const r = n.findIndex((i) => i === t);
-        r > -1 && n.splice(r, 1), n.unshift(t), this._localStorageService.setItem(s, n);
+        const s = n.findIndex((i) => i === t);
+        s > -1 && n.splice(s, 1), n.unshift(t), this._localStorageService.setItem(r, n);
       }
     });
   }
   async getHabit(e, t) {
-    const s = this._getKey(e), n = await this._localStorageService.getItem(s);
+    const r = this._getKey(e), n = await this._localStorageService.getItem(r);
     if (t && n) {
-      const r = n.map((i, o, c) => {
+      const s = n.map((i, o, c) => {
         const a = c.length;
         return {
           value: i,
@@ -458,8 +463,8 @@ let fe = class {
       });
       return t.sort((i, o) => {
         var f, m;
-        const c = ((f = r.find((l) => l.value === i)) == null ? void 0 : f.priority) || -1;
-        return (((m = r.find((l) => l.value === o)) == null ? void 0 : m.priority) || -1) - c;
+        const c = ((f = s.find((l) => l.value === i)) == null ? void 0 : f.priority) || -1;
+        return (((m = s.find((l) => l.value === o)) == null ? void 0 : m.priority) || -1) - c;
       });
     }
     return n || [];
@@ -468,37 +473,37 @@ let fe = class {
     this._localStorageService.removeItem(e);
   }
 };
-fe = an([
-  ln(0, S(gt))
+fe = un([
+  mn(0, b(gt))
 ], fe);
-const Be = "numfmtCurrency", un = (e) => {
-  const t = N(fe), [s, n] = I(Ne);
+const He = "numfmtCurrency", dn = (e) => {
+  const t = N(fe), [r, n] = I(Ne);
   return xe(() => {
     t.addHabit("numfmtCurrency", []).then(() => {
-      t.getHabit(Be, [...Ne]).then((i) => {
+      t.getHabit(He, [...Ne]).then((i) => {
         n(i), e && e(i);
       });
     });
-  }, []), { userHabitCurrency: s, mark: (i) => {
-    t.markHabit(Be, i);
+  }, []), { userHabitCurrency: r, mark: (i) => {
+    t.markHabit(He, i);
   } };
-}, mn = () => {
-  const e = Ke([]), [t, s] = I({});
+}, fn = () => {
+  const e = Ye([]), [t, r] = I({});
   return xe(() => {
-    e.current.forEach((r) => {
-      r();
+    e.current.forEach((s) => {
+      s();
     }), e.current = [];
-  }, [t]), (r) => {
-    e.current.push(r), s({});
+  }, [t]), (s) => {
+    e.current.push(s), r({});
   };
-}, re = (e) => Ne.find((s) => e.includes(s)), dn = (e) => !!re(e) && e.startsWith("_("), fn = (e) => {
-  const [t, s] = I(() => j(e.defaultPattern || "", 2)), n = Ye(Ue), [r, i] = I(() => re(e.defaultPattern) || n[0]), o = P(() => n.map((l) => ({ label: l, value: l })), []), a = N(E).t;
-  e.action.current = () => C(`_("${r}"* #,##0${t > 0 ? ".0" : ""}_)`, t);
+}, 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);
   const f = (l) => {
     i(l), e.onChange(C(`_("${l}"* #,##0${t > 0 ? ".0" : ""}_)`, t));
   }, m = (l) => {
     const u = l || 0;
-    s(u), e.onChange(C(`_("${r}"* #,##0${u > 0 ? ".0" : ""}_)`, u));
+    r(u), e.onChange(C(`_("${s}"* #,##0${u > 0 ? ".0" : ""}_)`, u));
   };
   return /* @__PURE__ */ d.jsxs("div", { children: [
     /* @__PURE__ */ d.jsxs("div", { className: "m-t-16 options ", children: [
@@ -508,51 +513,53 @@ const Be = "numfmtCurrency", un = (e) => {
       ] }),
       /* @__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: r }) })
+        /* @__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: "describe m-t-14", children: a("sheet.numfmt.accountingDes") })
   ] });
-}, Ce = (e) => Je.map((t) => ({
+}, Ce = (e) => Ze.map((t) => ({
   label: t.label(e),
   value: t.suffix(e),
   color: t.color
-})), tt = () => Zt.map((e) => ({ label: e.label, value: e.suffix })), nt = () => Qt.map((e) => ({ label: e.label, value: e.suffix, color: e.color })), hn = (e) => !!re(e) && !e.startsWith("_("), pn = (e) => {
-  const s = N(E).t, n = Ye(Ue), [r, i] = I(() => re(e.defaultPattern) || n[0]), [o, c] = I(() => j(e.defaultPattern || "", 2)), [a, f] = I(() => {
+})), 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(r);
-    return ((g = h.find((b) => ve(b.value, e.defaultPattern))) == null ? void 0 : g.value) || h[0].value;
-  }), m = P(() => Ce(r), [r]), l = P(() => n.map((h) => ({ label: h, value: h })), [n]);
+    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);
   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) => {
-    f(h), e.onChange(C(h, o));
+    h !== void 0 && (f(h), e.onChange(C(h, o)));
   }, _ = (h) => {
     c(h || 0), e.onChange(C(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: s("sheet.numfmt.decimalLength") }),
+        /* @__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.jsxs("div", { className: "option", children: [
-        /* @__PURE__ */ d.jsx("div", { className: "label", children: s("sheet.numfmt.currencyType") }),
-        /* @__PURE__ */ d.jsx("div", { className: "m-t-8 w-140", children: /* @__PURE__ */ d.jsx(je, { onChange: u, options: l, value: r }) })
+        /* @__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-16 label", children: s("sheet.numfmt.negType") }),
+    /* @__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: "describe m-t-14", children: s("sheet.numfmt.currencyDes") })
+    /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: r("sheet.numfmt.currencyDes") })
   ] });
-}, vn = (e) => {
+}, gn = (e) => {
   const t = x.getInfo(e);
-  return tt().map((s) => s.value).includes(e) || ["date", "datetime", "time"].includes(t.type);
-}, _n = (e) => {
-  const t = P(tt, []), n = N(E).t, [r, i] = I(() => {
+  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(() => {
     if (e.defaultPattern) {
       const c = t.find((a) => a.value === e.defaultPattern);
       if (c)
@@ -560,26 +567,26 @@ const Be = "numfmtCurrency", un = (e) => {
     }
     return t[0].value;
   });
-  e.action.current = () => r;
+  e.action.current = () => s;
   const o = (c) => {
-    i(c), e.onChange(c);
+    c !== void 0 && (i(c), e.onChange(c));
   };
   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: r, options: t, onChange: o }) }),
+    /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx($e, { value: s, options: t, onChange: o }) }),
     /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: n("sheet.numfmt.dateDes") })
   ] });
-}, gn = (e) => !e, Sn = (e) => {
-  const s = N(E).t;
-  return e.action.current = () => "", /* @__PURE__ */ d.jsx("div", { children: /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: s("sheet.numfmt.generalDes") }) });
-}, bn = (e) => nt().some((t) => ve(t.value, e)), yn = (e) => {
-  const t = N(E), s = P(nt, []), [n, r] = I(() => j(e.defaultPattern || "", 0)), [i, o] = I(() => {
-    const l = s.find((u) => ve(u.value, e.defaultPattern || ""));
-    return (l == null ? void 0 : l.value) || s[0].value;
-  }), c = P(() => C(i, Number(n || 0)), [i, n]), a = P(() => !Jt(i), [i]), f = (l) => {
-    r(l || 0), e.onChange(C(i, Number(l || 0)));
+}, bn = (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 || ""));
+    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)));
   }, m = (l) => {
-    r(j(l, 0)), o(l), e.onChange(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") }),
@@ -597,27 +604,27 @@ const Be = "numfmtCurrency", un = (e) => {
       " ",
       t.t("sheet.numfmt.negType")
     ] }),
-    /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx($e, { onChange: m, options: s, value: i }) }),
+    /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx($e, { onChange: m, options: r, value: i }) }),
     /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: t.t("sheet.numfmt.thousandthPercentileDes") })
   ] });
-}, Cn = (e) => {
-  const { defaultValue: t, defaultPattern: s, row: n, col: r } = e.value, i = N(E), o = Ke(() => ""), c = i.t, a = mn(), f = P(
+}, 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(
     () => [
-      { label: "sheet.numfmt.general", component: Sn },
-      { label: "sheet.numfmt.accounting", component: fn },
-      { label: "sheet.numfmt.currency", component: pn },
-      { label: "sheet.numfmt.date", component: _n },
-      { label: "sheet.numfmt.thousandthPercentile", component: yn }
+      { 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) })),
     []
-  ), [m, l] = I(g), [u, p] = I(() => `${n}_${r}`), { mark: _, userHabitCurrency: h } = un(() => p(`${n}_${r}_userCurrency'`)), v = P(() => {
+  ), [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]);
   function g() {
-    return [gn, dn, hn, vn, bn].reduce((L, lt, ut) => L || (lt(s) ? f[ut].label : ""), "") || f[0].label;
+    return [bn, hn, vn, gn, Cn].reduce((L, ut, mt) => L || (ut(r) ? f[mt].label : ""), "") || f[0].label;
   }
-  const b = f.map((y) => ({
+  const S = f.map((y) => ({
     label: y.label,
     value: y.label
   })), F = (y) => {
@@ -625,51 +632,51 @@ const Be = "numfmtCurrency", un = (e) => {
   }, ge = (y) => {
     e.onChange({ type: "change", value: y });
   }, Se = () => {
-    const y = o.current() || "", L = re(y);
+    const y = o.current() || "", L = se(y);
     L && _(L), e.onChange({ type: "confirm", value: y });
   }, be = () => {
     e.onChange({ type: "cancel", value: "" });
-  }, at = {
+  }, lt = {
     onChange: ge,
     defaultValue: t,
-    defaultPattern: s,
+    defaultPattern: r,
     action: o
   };
   return xe(() => {
-    l(g()), p(`${n}_${r}`);
-  }, [n, r]), /* @__PURE__ */ d.jsxs("div", { className: "numfmt-panel p-b-20", children: [
+    l(g()), p(`${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: b, value: m }) }),
-      /* @__PURE__ */ d.jsx("div", { children: v && /* @__PURE__ */ d.jsx(Ue.Provider, { value: h, children: /* @__PURE__ */ Gt(v, { ...at, key: u }) }) })
+      /* @__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.jsxs("div", { className: "btn-list m-t-14 m-b-20", children: [
-      /* @__PURE__ */ d.jsx(Ae, { size: "small", onClick: be, className: "m-r-12", children: c("sheet.numfmt.cancel") }),
-      /* @__PURE__ */ d.jsx(Ae, { type: "primary", size: "small", onClick: Se, children: c("sheet.numfmt.confirm") })
+      /* @__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") })
     ] })
   ] });
 }, st = {
   id: "sheet.command.numfmt.set.percent",
-  type: w.COMMAND,
+  type: D.COMMAND,
   handler: async (e) => {
     const t = e.get(O), n = e.get(U).getSelections();
     if (!n || !n.length)
       return !1;
-    const r = [], i = "0%";
+    const s = [], i = "0%";
     return n.forEach((c) => {
       R.foreach(c.range, (a, f) => {
-        r.push({ row: a, col: f, pattern: i, type: "percent" });
+        s.push({ row: a, col: f, pattern: i, type: "percent" });
       });
-    }), await t.executeCommand($.id, { values: r });
+    }), await t.executeCommand($.id, { values: s });
   }
 };
-var Tn = Object.defineProperty, In = Object.getOwnPropertyDescriptor, En = (e, t, s, n) => {
-  for (var r = n > 1 ? void 0 : n ? In(t, s) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (n ? o(t, s, r) : o(r)) || r);
-  return n && r && Tn(t, s, r), r;
-}, M = (e, t) => (s, n) => t(s, n, e);
+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--)
+    (o = e[i]) && (s = (n ? o(t, r, s) : o(s)) || s);
+  return n && s && En(t, r, s), s;
+}, M = (e, t) => (r, n) => t(r, n, e);
 let ce = class extends z {
-  constructor(t, s, n, r, i, o, c, a, f, m) {
+  constructor(t, r, n, s, i, o, c, a, f, m) {
     super();
     /**
      * If _previewPattern is null ,the realTimeRenderingInterceptor will skip and if it is '',realTimeRenderingInterceptor will clear numfmt.
@@ -679,13 +686,13 @@ let ce = class extends z {
      */
     ie(this, "_previewPattern", "");
     ie(this, "_sidebarDisposable", null);
-    this._sheetInterceptorService = t, this._themeService = s, this._univerInstanceService = n, this._commandService = r, 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();
+    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, s = this._selectionManagerService, n = this._commandService, r = this._univerInstanceService, i = this._numfmtService, o = this._localeService, a = (s.getSelectionRanges() || [])[0];
+    const t = this._sidebarService, r = this._selectionManagerService, n = this._commandService, s = this._univerInstanceService, i = this._numfmtService, o = this._localeService, a = (r.getSelectionRanges() || [])[0];
     if (!a)
       return !1;
-    const f = r.getCurrentUnitForType(T.UNIVER_SHEET), m = f.getActiveSheet();
+    const f = s.getCurrentUnitForType(T.UNIVER_SHEET), m = f.getActiveSheet();
     if (!m)
       return !1;
     const l = m.getCellRaw(a.startRow, a.startColumn), u = i.getValue(
@@ -701,17 +708,17 @@ let ce = class extends z {
         if (v.type === "change")
           this._previewPattern = v.value, this._forceUpdate();
         else if (v.type === "confirm") {
-          const g = s.getSelectionRanges() || [], b = { values: [] }, F = me(v.value);
+          const g = r.getSelectionRanges() || [], S = { values: [] }, F = me(v.value);
           g.forEach((ge) => {
             R.foreach(ge, (Se, be) => {
-              b.values.push({
+              S.values.push({
                 row: Se,
                 col: be,
                 pattern: v.value,
                 type: F
               });
             });
-          }), n.executeCommand($.id, b), t.close();
+          }), n.executeCommand($.id, S), t.close();
         } else v.type === "cancel" && t.close();
       },
       value: { defaultPattern: p, defaultValue: _, row: a.startRow, col: a.startColumn }
@@ -730,16 +737,16 @@ let ce = class extends z {
   }
   _forceUpdate(t) {
     var n;
-    const s = this._renderManagerService.getRenderById(
+    const r = this._renderManagerService.getRenderById(
       t != null ? t : this._univerInstanceService.getCurrentUnitForType(T.UNIVER_SHEET).getUnitId()
     );
-    s == null || s.with(Nt).reCalculate(), (n = s == null ? void 0 : s.mainComponent) == null || n.makeDirty();
+    r == null || r.with(Pt).reCalculate(), (n = r == null ? void 0 : r.mainComponent) == null || n.makeDirty();
   }
   _initCommands() {
     [
-      qe,
+      Je,
+      Xe,
       Qe,
-      Ze,
       st,
       de,
       ye,
@@ -749,42 +756,42 @@ let ce = class extends z {
     });
   }
   _initPanel() {
-    this._componentManager.register(Ee, Cn);
+    this._componentManager.register(Ee, In);
   }
   _initRealTimeRenderingInterceptor() {
     const t = new k((n) => {
-      this._commandService.onCommandExecuted((r) => {
-        r.id === de.id && n.next(!0), r.id === ye.id && n.next(!1);
+      this._commandService.onCommandExecuted((s) => {
+        s.id === de.id && n.next(!0), s.id === ye.id && n.next(!1);
       });
-    }), s = $t([
+    }), r = Dt([
       t,
       this._selectionManagerService.selectionMoveEnd$.pipe(
-        Vt((n) => n ? n.map((r) => r.range) : [])
+        Ht((n) => n ? n.map((s) => s.range) : [])
       )
     ]);
     this.disposeWithMe(
       Ie(
-        s.pipe(
-          Bt(
-            ([n, r]) => new k((i) => {
+        r.pipe(
+          Ft(
+            ([n, s]) => new k((i) => {
               const o = new St();
-              return n && r.length && i.next({ selectionRanges: r, disposableCollection: o }), () => {
+              return n && s.length && i.next({ selectionRanges: s, disposableCollection: o }), () => {
                 o.dispose();
               };
             })
           ),
-          Ht(() => {
+          Wt(() => {
             this._previewPattern = null;
           })
-        ).subscribe(({ disposableCollection: n, selectionRanges: r }) => {
+        ).subscribe(({ disposableCollection: n, selectionRanges: s }) => {
           var o, c;
           const i = this._univerInstanceService.getCurrentUnitForType(T.UNIVER_SHEET);
           this.openPanel(), n.add(
-            this._sheetInterceptorService.intercept(Ge.CELL_CONTENT, {
+            this._sheetInterceptorService.intercept(We.CELL_CONTENT, {
               priority: 99,
               handler: (a, f, m) => {
                 const { row: l, col: u } = f, p = m(a) || {};
-                if (r.find(
+                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;
@@ -817,46 +824,46 @@ let ce = class extends z {
   _commandExecutedListener() {
     const t = [pe.id, Y.id];
     this.disposeWithMe(
-      new k((s) => {
-        const n = this._commandService.onCommandExecuted((r) => {
-          if (t.includes(r.id)) {
-            const i = r.params;
-            s.next(i.unitId);
+      new k((r) => {
+        const n = this._commandService.onCommandExecuted((s) => {
+          if (t.includes(s.id)) {
+            const i = s.params;
+            r.next(i.unitId);
           }
         });
         return () => n.dispose();
-      }).pipe(Ft(16)).subscribe((s) => this._forceUpdate(s))
+      }).pipe(kt(16)).subscribe((r) => this._forceUpdate(r))
     );
   }
   _initCloseListener() {
     this._univerInstanceService.getCurrentTypeOfUnit$(T.UNIVER_SHEET).subscribe((t) => {
-      var s;
-      t || ((s = this._sidebarDisposable) == null || s.dispose(), this._sidebarDisposable = null);
+      var r;
+      t || ((r = this._sidebarDisposable) == null || r.dispose(), this._sidebarDisposable = null);
     });
   }
 };
-ce = En([
+ce = Mn([
   K(B.Rendered, ce),
-  M(0, S(Pe)),
-  M(1, S(He)),
-  M(2, D),
+  M(0, b(Pe)),
+  M(1, b(Fe)),
+  M(2, w),
   M(3, O),
-  M(4, S(U)),
-  M(5, Dt),
+  M(4, b(U)),
+  M(5, Lt),
   M(6, H),
-  M(7, S(ze)),
-  M(8, Lt),
-  M(9, S(E))
+  M(7, b(Ke)),
+  M(8, Vt),
+  M(9, b(E))
 ], ce);
-var Nn = Object.defineProperty, Mn = Object.getOwnPropertyDescriptor, Pn = (e, t, s, n) => {
-  for (var r = n > 1 ? void 0 : n ? Mn(t, s) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (n ? o(t, s, r) : o(r)) || r);
-  return n && r && Nn(t, s, r), r;
-}, W = (e, t) => (s, n) => t(s, n, e);
-const Rn = () => {
+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--)
+    (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 = () => {
   let e = [];
   return {
-    add: (r, i, o, c, a) => e.push({ unitId: r, subUnitId: i, row: o, col: c, value: a }),
+    add: (s, i, o, c, a) => e.push({ unitId: s, subUnitId: i, row: o, col: c, value: a }),
     getEffects: () => e,
     clean: () => {
       e = [];
@@ -864,23 +871,23 @@ const Rn = () => {
   };
 };
 let ae = class extends z {
-  constructor(t, s, n, r, i) {
+  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", Rn());
-    this._sheetInterceptorService = t, this._numfmtService = s, this._univerInstanceService = n, this._injector = r, this._editorBridgeService = i, this._initInterceptorEditorStart(), this._initInterceptorEditorEnd(), this._initInterceptorCommands();
+    ie(this, "_collectEffectMutation", On());
+    this._sheetInterceptorService = t, this._numfmtService = r, this._univerInstanceService = n, this._injector = s, this._editorBridgeService = i, this._initInterceptorEditorStart(), this._initInterceptorEditorEnd(), this._initInterceptorCommands();
   }
   _initInterceptorEditorStart() {
-    this.disposeWithMe(
+    this._editorBridgeService && this.disposeWithMe(
       Ie(
         this._editorBridgeService.interceptor.intercept(
           this._editorBridgeService.interceptor.getInterceptPoints().BEFORE_CELL_EDIT,
           {
-            handler: (t, s, n) => {
-              const r = s.row, i = s.col, o = this._numfmtService.getValue(
-                s.unitId,
-                s.subUnitId,
-                r,
+            handler: (t, r, n) => {
+              const s = r.row, i = r.col, o = this._numfmtService.getValue(
+                r.unitId,
+                r.subUnitId,
+                s,
                 i
               );
               if (o)
@@ -890,7 +897,7 @@ let ae = class extends z {
                   case "currency":
                   case "grouped":
                   case "number":
-                    return s.worksheet.getCellRaw(r, i);
+                    return r.worksheet.getCellRaw(s, i);
                   case "date":
                   case "time":
                   case "datetime":
@@ -910,25 +917,25 @@ let ae = class extends z {
    * @memberof NumfmtService
    */
   _initInterceptorEditorEnd() {
-    this.disposeWithMe(
+    this._editorBridgeService && this.disposeWithMe(
       Ie(
         this._editorBridgeService.interceptor.intercept(
           this._editorBridgeService.interceptor.getInterceptPoints().AFTER_CELL_EDIT,
           {
-            handler: (t, s, n) => {
+            handler: (t, r, n) => {
               var m;
               this._collectEffectMutation.clean();
-              const r = this._numfmtService.getValue(
-                s.unitId,
-                s.subUnitId,
-                s.row,
-                s.col
-              ), i = (m = r && me(r.pattern)) != null ? m : "", o = () => {
-                r && this._collectEffectMutation.add(
-                  s.unitId,
-                  s.subUnitId,
-                  s.row,
-                  s.col,
+              const s = this._numfmtService.getValue(
+                r.unitId,
+                r.subUnitId,
+                r.row,
+                r.col
+              ), i = (m = s && me(s.pattern)) != null ? m : "", o = () => {
+                s && this._collectEffectMutation.add(
+                  r.unitId,
+                  r.subUnitId,
+                  r.row,
+                  r.col,
                   null
                 );
               };
@@ -939,16 +946,16 @@ let ae = class extends z {
                 if (a && a.z) {
                   const l = Number(a.v);
                   return this._collectEffectMutation.add(
-                    s.unitId,
-                    s.subUnitId,
-                    s.row,
-                    s.col,
+                    r.unitId,
+                    r.subUnitId,
+                    r.row,
+                    r.col,
                     {
                       pattern: a.z
                     }
                   ), { ...t, v: l, t: V.NUMBER };
                 }
-              } else (["date", "time", "datetime"].includes(i) || !xn(c)) && o();
+              } else (["date", "time", "datetime"].includes(i) || !jn(c)) && o();
               return n(t);
             }
           }
@@ -960,11 +967,11 @@ let ae = class extends z {
     const t = this;
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
-        getMutations(s) {
+        getMutations(r) {
           var n;
-          switch (s.id) {
-            case Tt.id: {
-              const r = t._univerInstanceService.getCurrentUnitForType(T.UNIVER_SHEET), i = r.getUnitId(), o = (n = r.getActiveSheet()) == null ? void 0 : n.getSheetId();
+          switch (r.id) {
+            case Nt.id: {
+              const s = t._univerInstanceService.getCurrentUnitForType(T.UNIVER_SHEET), i = s.getUnitId(), o = (n = s.getActiveSheet()) == null ? void 0 : n.getSheetId();
               if (!o)
                 return {
                   redos: [],
@@ -995,9 +1002,9 @@ let ae = class extends z {
               if (a) {
                 const u = {
                   id: Y.id,
-                  params: Fe(i, o, a)
+                  params: ke(i, o, a)
                 };
-                m.push(u), l.push(...We(t._injector, u.params));
+                m.push(u), l.push(...Ge(t._injector, u.params));
               }
               if (f) {
                 const u = {
@@ -1008,7 +1015,7 @@ let ae = class extends z {
                     ranges: f
                   }
                 };
-                m.push(u), l.push(...ke(t._injector, u.params));
+                m.push(u), l.push(...ze(t._injector, u.params));
               }
               return {
                 redos: m,
@@ -1025,30 +1032,30 @@ let ae = class extends z {
     );
   }
 };
-ae = Pn([
+ae = xn([
   K(B.Rendered, ae),
-  W(0, S(Pe)),
-  W(1, S(H)),
-  W(2, S(D)),
-  W(3, S(Re)),
-  W(4, S(Mt))
+  W(0, b(Pe)),
+  W(1, b(H)),
+  W(2, b(w)),
+  W(3, b(Me)),
+  W(4, It(Rt))
 ], ae);
-function xn(e) {
+function jn(e) {
   return /^-?\d+(\.\d+)?$/.test(e);
 }
-var On = Object.defineProperty, jn = Object.getOwnPropertyDescriptor, $n = (e, t, s, n) => {
-  for (var r = n > 1 ? void 0 : n ? jn(t, s) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (n ? o(t, s, r) : o(r)) || r);
-  return n && r && On(t, s, r), r;
-}, wn = (e, t) => (s, n) => t(s, n, 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--)
+    (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 {
   constructor(e) {
     super(), this._localeService = e;
   }
 };
-le = $n([
+le = Dn([
   K(B.Rendered, le),
-  wn(0, S(E))
+  Un(0, b(E))
 ], le);
 const ue = [
   {
@@ -1103,27 +1110,27 @@ const ue = [
     label: "sheet.numfmt.moreFmt",
     pattern: ""
   }
-], rt = "sheet.numfmt.moreNumfmtType", it = "sheet.numfmt.moreNumfmtType.options", Dn = (e) => {
+], it = "sheet.numfmt.moreNumfmtType", ot = "sheet.numfmt.moreNumfmtType.options", Ln = (e) => {
   var n;
-  const t = N(E), s = (n = e.value) != null ? n : t.t("sheet.numfmt.general");
-  return /* @__PURE__ */ d.jsx("span", { className: "more-numfmt-type", children: s });
-}, Un = () => {
-  const e = N(O), t = N(E), s = zt(), n = N(U), r = (c) => {
+  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();
     if (!a)
       return;
-    const f = s.get(Ut), m = a.range, l = [];
+    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 });
     }), e.executeCommand($.id, { values: l }), f.focus();
   }, i = (c) => {
     if (c === 0)
-      r(null);
+      s(null);
     else if (c === ue.length - 1)
       e.executeCommand(de.id);
     else {
       const a = ue[c];
-      a.pattern && r(a.pattern);
+      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(
@@ -1140,37 +1147,37 @@ const ue = [
     },
     a
   )) });
-}, Ln = (e) => ({
+}, Vn = (e) => ({
   icon: "RmbSingle",
-  id: Ze.id,
+  id: Qe.id,
   title: "sheet.numfmt.currency",
   tooltip: "sheet.numfmt.currency",
   type: ee.BUTTON,
   group: te.TOOLBAR_FORMULAS_INSERT,
   positions: [ne.TOOLBAR_START],
-  hidden$: se(e, T.UNIVER_SHEET),
+  hidden$: re(e, T.UNIVER_SHEET),
   disabled$: X(e, { workbookTypes: [q], worksheetTypes: [J, Z], rangeTypes: [Q] })
-}), An = (e) => ({
+}), Bn = (e) => ({
   icon: "AddDigitsSingle",
-  id: qe.id,
+  id: Je.id,
   title: "sheet.numfmt.addDecimal",
   tooltip: "sheet.numfmt.addDecimal",
   type: ee.BUTTON,
   positions: [ne.TOOLBAR_START],
   group: te.TOOLBAR_FORMULAS_INSERT,
-  hidden$: se(e, T.UNIVER_SHEET),
+  hidden$: re(e, T.UNIVER_SHEET),
   disabled$: X(e, { workbookTypes: [q], worksheetTypes: [J, Z], rangeTypes: [Q] })
-}), Vn = (e) => ({
+}), Hn = (e) => ({
   icon: "ReduceDigitsSingle",
-  id: Qe.id,
+  id: Xe.id,
   title: "sheet.numfmt.subtractDecimal",
   tooltip: "sheet.numfmt.subtractDecimal",
   type: ee.BUTTON,
   group: te.TOOLBAR_FORMULAS_INSERT,
   positions: [ne.TOOLBAR_START],
-  hidden$: se(e, T.UNIVER_SHEET),
+  hidden$: re(e, T.UNIVER_SHEET),
   disabled$: X(e, { workbookTypes: [q], worksheetTypes: [J, Z], rangeTypes: [Q] })
-}), Bn = (e) => ({
+}), Fn = (e) => ({
   icon: "PercentSingle",
   id: st.id,
   title: "sheet.numfmt.percent",
@@ -1178,11 +1185,11 @@ const ue = [
   type: ee.BUTTON,
   group: te.TOOLBAR_FORMULAS_INSERT,
   positions: [ne.TOOLBAR_START],
-  hidden$: se(e, T.UNIVER_SHEET),
+  hidden$: re(e, T.UNIVER_SHEET),
   disabled$: X(e, { workbookTypes: [q], worksheetTypes: [J, Z], rangeTypes: [Q] })
-}), Hn = (e) => {
-  const t = e.get(H), s = e.get(D), n = e.get(O), r = e.get(E), i = e.get(U), o = Pt(s, "", ({ workbook: c, worksheet: a }) => new k(
-    (f) => wt(
+}), 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(
+    (f) => Ut(
       i.selectionMoveEnd$,
       new k((m) => {
         const l = [pe.id, Y.id], u = n.onCommandExecuted((p) => {
@@ -1194,19 +1201,19 @@ const ue = [
       const m = i.getSelections();
       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 = r.t("sheet.numfmt.general");
+        let v = s.t("sheet.numfmt.general");
         if (h) {
-          const g = ue.filter((b) => typeof b == "object" && b.pattern).find(
-            (b) => ve(h, b.pattern)
+          const g = ue.filter((S) => typeof S == "object" && S.pattern).find(
+            (S) => ve(h, S.pattern)
           );
-          g && typeof g == "object" && g.pattern ? v = r.t(g.label) : v = r.t("sheet.numfmt.moreFmt");
+          g && typeof g == "object" && g.pattern ? v = s.t(g.label) : v = s.t("sheet.numfmt.moreFmt");
         }
         f.next(v);
       }
     })
   ));
   return {
-    label: rt,
+    label: it,
     id: de.id,
     tooltip: "sheet.numfmt.title",
     type: ee.SELECTOR,
@@ -1215,47 +1222,47 @@ const ue = [
     selections: [
       {
         label: {
-          name: it,
+          name: ot,
           hoverable: !1
         }
       }
     ],
     value$: o,
-    hidden$: se(e, T.UNIVER_SHEET),
+    hidden$: re(e, T.UNIVER_SHEET),
     disabled$: X(e, { workbookTypes: [q], worksheetTypes: [Z, J], rangeTypes: [Q] })
   };
 };
-var Fn = Object.defineProperty, Wn = Object.getOwnPropertyDescriptor, kn = (e, t, s, n) => {
-  for (var r = n > 1 ? void 0 : n ? Wn(t, s) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (n ? o(t, s, r) : o(r)) || r);
-  return n && r && Fn(t, s, r), r;
-}, Te = (e, t) => (s, n) => t(s, n, e);
-const Gn = {};
+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--)
+    (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 {
-  constructor(e, t, s, n) {
-    super(), this._config = e, this._injector = t, this._componentManager = s, this._menuService = n, this._initMenu();
+  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;
-    [Bn, An, Vn, Ln, Hn].forEach((t) => {
+    [Fn, Bn, Hn, Vn, Wn].forEach((t) => {
       this.disposeWithMe(this._menuService.addMenuItem(t(this._injector), e));
-    }), this.disposeWithMe(this._componentManager.register(rt, Dn)), this.disposeWithMe(this._componentManager.register(it, Un));
+    }), this.disposeWithMe(this._componentManager.register(it, Ln)), this.disposeWithMe(this._componentManager.register(ot, An));
   }
 };
-G = kn([
+G = zn([
   K(B.Rendered, G),
-  Te(1, S(Re)),
-  Te(2, S(ze)),
-  Te(3, S(At))
+  Te(1, b(Me)),
+  Te(2, b(Ke)),
+  Te(3, b(Bt))
 ], G);
-var ot = Object.defineProperty, zn = Object.getOwnPropertyDescriptor, Kn = (e, t, s) => t in e ? ot(e, t, { enumerable: !0, configurable: !0, writable: !0, value: s }) : e[t] = s, Yn = (e, t, s, n) => {
-  for (var r = n > 1 ? void 0 : n ? zn(t, s) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (n ? o(t, s, r) : o(r)) || r);
-  return n && r && ot(t, s, r), r;
-}, qn = (e, t) => (s, n) => t(s, n, e), ct = (e, t, s) => Kn(e, typeof t != "symbol" ? t + "" : t, s);
+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--)
+    (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 {
   constructor(e = {}, t) {
-    super(), this._config = e, this._injector = t, this._config = yt.deepMerge({}, Gn, this._config);
+    super(), this._config = e, this._injector = t, this._config = yt.deepMerge({}, Kn, 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(
@@ -1268,14 +1275,20 @@ let he = class extends bt {
     );
   }
 };
-ct(he, "pluginName", Ee);
-ct(he, "type", T.UNIVER_SHEET);
-he = Yn([
-  Ct(It, Rt),
-  qn(1, S(Re))
+at(he, "pluginName", Ee);
+at(he, "type", T.UNIVER_SHEET);
+he = Jn([
+  Ct(Mt, Ot),
+  Zn(1, b(Me))
 ], he);
 export {
+  Je as AddDecimalCommand,
+  ye as CloseNumfmtPanelOperator,
+  de as OpenNumfmtPanelOperator,
+  Qe as SetCurrencyCommand,
   $ as SetNumfmtCommand,
+  st as SetPercentCommand,
+  Xe as SubtractDecimalCommand,
   he as UniverSheetsNumfmtPlugin,
   we as getPatternPreview
 };