@univerjs/sheets-numfmt-ui 0.7.0 → 0.8.0-beta.0

package/lib/index.js

@@ -1,24 +1,24 @@
 var mt = Object.defineProperty;
 var dt = (e, t, r) => t in e ? mt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var q = (e, t, r) => dt(e, typeof t != "symbol" ? t + "" : t, r);
-import { Inject as S, LocaleService as M, IConfigService as Fe, Disposable as ie, isRealNum as ht, CommandType as Ae, ILocalStorageService as Le, numfmt as J, ThemeService as ft, IUniverInstanceService as ge, ICommandService as _e, UniverInstanceType as T, CellValueType as $, toDisposable as ve, DisposableCollection as vt, InterceptorEffectEnum as we, Range as He, Injector as je, Optional as pt, fromCallback as gt, DependentOn as _t, Plugin as St, merge as yt, registerDependencies as Ct, touchDependencies as bt } from "@univerjs/core";
+import { Inject as S, LocaleService as M, IConfigService as Fe, Disposable as ie, isRealNum as ht, CommandType as Ae, ILocalStorageService as Le, numfmt as J, ThemeService as ft, IUniverInstanceService as ge, ICommandService as _e, UniverInstanceType as T, CellValueType as U, toDisposable as ve, DisposableCollection as vt, InterceptorEffectEnum as we, Range as He, Injector as je, Optional as pt, willLoseNumericPrecision as gt, fromCallback as _t, DependentOn as St, Plugin as yt, merge as Ct, registerDependencies as bt, touchDependencies as Nt } from "@univerjs/core";
 import { IRenderManagerService as Be } from "@univerjs/engine-render";
-import { SHEETS_NUMFMT_PLUGIN_CONFIG_KEY as Nt, currencySymbols as Re, getDecimalFromPattern as ee, getCurrencyType as V, setPatternDecimal as w, getCurrencyFormatOptions as le, isPatternEqualWithoutDecimal as se, CURRENCYFORMAT as It, DATEFMTLISG as Et, NUMBERFORMAT as Tt, getDateFormatOptions as Ve, getNumberFormatOptions as We, isPatternHasDecimal as Mt, SheetsNumfmtCellContentController as Ge, getPatternPreviewIgnoreGeneral as xt, getPatternType as Se, SetNumfmtCommand as Ke, SetPercentCommand as Ze, SubtractDecimalCommand as Ye, AddDecimalCommand as ze, SetCurrencyCommand as Xe, MenuCurrencyService as Pt, countryCurrencyMap as k, getPatternPreview as wt, UniverSheetsNumfmtPlugin as Rt } from "@univerjs/sheets-numfmt";
-import { HoverManagerService as Ot, CellAlertManagerService as Ut, CellAlertType as kt, SheetSkeletonManagerService as Dt, IEditorBridgeService as $t, deriveStateFromActiveSheet$ as Ft, getCurrentRangeDisable$ as W, UniverSheetsUIPlugin as At } from "@univerjs/sheets-ui";
-import { isTextFormat as qe, isDefaultFormat as Lt, DEFAULT_TEXT_FORMAT_EXCEL as Ht } from "@univerjs/engine-numfmt";
-import { INumfmtService as ye, SheetInterceptorService as Je, SheetsSelectionsService as Ce, INTERCEPTOR_POINT as jt, RemoveNumfmtMutation as be, SetNumfmtMutation as Ne, BEFORE_CELL_EDIT as Bt, AFTER_CELL_EDIT as Vt, SetRangeValuesCommand as Wt, transformCellsToRange as Gt, factorySetNumfmtUndoMutation as Kt, factoryRemoveNumfmtUndoMutation as Zt, RangeProtectionPermissionEditPoint as G, WorksheetSetCellStylePermission as K, WorksheetEditPermission as Z, WorkbookEditablePermission as Y } from "@univerjs/sheets";
-import { IZenZoneService as Yt, useDependency as C, ComponentManager as Qe, ISidebarService as zt, getMenuHiddenObservable as z, MenuItemType as X, ILayoutService as Xt, RibbonStartGroup as qt, IMenuManagerService as Jt } from "@univerjs/ui";
-import { debounceTime as Qt, merge as et, Observable as L, combineLatest as en, filter as tn } from "rxjs";
-import { map as nn, switchMap as rn, tap as sn, debounceTime as on } from "rxjs/operators";
+import { SHEETS_NUMFMT_PLUGIN_CONFIG_KEY as It, currencySymbols as Re, getDecimalFromPattern as ee, getCurrencyType as V, setPatternDecimal as w, getCurrencyFormatOptions as le, isPatternEqualWithoutDecimal as se, CURRENCYFORMAT as Et, DATEFMTLISG as Tt, NUMBERFORMAT as Mt, getDateFormatOptions as Ve, getNumberFormatOptions as We, isPatternHasDecimal as xt, SheetsNumfmtCellContentController as Ge, getPatternPreviewIgnoreGeneral as Pt, getPatternType as Se, SetNumfmtCommand as Ke, SetPercentCommand as Ze, SubtractDecimalCommand as Ye, AddDecimalCommand as ze, SetCurrencyCommand as Xe, MenuCurrencyService as wt, countryCurrencyMap as D, getPatternPreview as Rt, UniverSheetsNumfmtPlugin as Ot } from "@univerjs/sheets-numfmt";
+import { HoverManagerService as Ut, CellAlertManagerService as kt, CellAlertType as Dt, SheetSkeletonManagerService as $t, IEditorBridgeService as Ft, deriveStateFromActiveSheet$ as At, getCurrentRangeDisable$ as W, UniverSheetsUIPlugin as Lt } from "@univerjs/sheets-ui";
+import { isTextFormat as qe, isDefaultFormat as Ht, DEFAULT_TEXT_FORMAT_EXCEL as jt } from "@univerjs/engine-numfmt";
+import { INumfmtService as ye, SheetInterceptorService as Je, SheetsSelectionsService as Ce, INTERCEPTOR_POINT as Bt, RemoveNumfmtMutation as be, SetNumfmtMutation as Ne, BEFORE_CELL_EDIT as Vt, AFTER_CELL_EDIT as Wt, SetRangeValuesCommand as Gt, transformCellsToRange as Kt, factorySetNumfmtUndoMutation as Zt, factoryRemoveNumfmtUndoMutation as Yt, RangeProtectionPermissionEditPoint as G, WorksheetSetCellStylePermission as K, WorksheetEditPermission as Z, WorkbookEditablePermission as Y } from "@univerjs/sheets";
+import { IZenZoneService as zt, useDependency as C, ComponentManager as Qe, ISidebarService as Xt, getMenuHiddenObservable as z, MenuItemType as X, ILayoutService as qt, RibbonDataGroup as Jt, IMenuManagerService as Qt } from "@univerjs/ui";
+import { debounceTime as en, merge as et, Observable as L, combineLatest as tn, filter as nn } from "rxjs";
+import { map as rn, switchMap as sn, tap as on, debounceTime as cn } from "rxjs/operators";
 import { jsxs as y, jsx as m } from "react/jsx-runtime";
-import { createContext as an, useState as N, useEffect as oe, useRef as Ie, useContext as tt, useMemo as R, forwardRef as nt, createElement as Ee, useCallback as cn } from "react";
-import { InputNumber as Te, Select as Me, SelectList as xe, Input as ln, clsx as un, borderClassName as mn, Button as Oe, Separator as dn } from "@univerjs/design";
+import { createContext as an, useState as N, useEffect as oe, useRef as Ie, useContext as tt, useMemo as R, forwardRef as nt, createElement as Ee, useCallback as ln } from "react";
+import { InputNumber as Te, Select as Me, SelectList as xe, Input as un, clsx as mn, borderClassName as dn, Button as Oe, Separator as hn } from "@univerjs/design";
 const Ue = {};
-var hn = Object.getOwnPropertyDescriptor, fn = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? hn(t, r) : t, s = e.length - 1, o; s >= 0; s--)
+var fn = Object.getOwnPropertyDescriptor, vn = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? fn(t, r) : t, s = e.length - 1, o; s >= 0; s--)
     (o = e[s]) && (i = o(i) || i);
   return i;
-}, D = (e, t) => (r, n) => t(r, n, e);
+}, $ = (e, t) => (r, n) => t(r, n, e);
 const ue = "SHEET_NUMFMT_ALERT";
 let pe = class extends ie {
   constructor(e, t, r, n, i, s, o) {
@@ -28,30 +28,30 @@ let pe = class extends ie {
     this._initCellAlertPopup(), this._initZenService();
   }
   _initCellAlertPopup() {
-    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(Qt(100)).subscribe((e) => {
+    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(en(100)).subscribe((e) => {
       var t, r;
       if (e) {
         const n = e.location, i = this._context.unit, s = i.getActiveSheet();
         if (!s) return;
-        const o = n.unitId, a = n.subUnitId;
-        let c;
+        const o = n.unitId, c = n.subUnitId;
+        let a;
         const u = s.getCell(n.row, n.col);
         if (u != null && u.s) {
           const d = i.getStyles().get(u.s);
-          d != null && d.n && (c = d.n);
+          d != null && d.n && (a = d.n);
         }
-        if (c || (c = this._numfmtService.getValue(o, a, n.row, n.col)), !c) {
+        if (a || (a = this._numfmtService.getValue(o, c, n.row, n.col)), !a) {
           this._hideAlert();
           return;
         }
-        if (qe(c.pattern) && (u != null && u.v) && ht(u.v)) {
-          if ((t = this._configService.getConfig(Nt)) != null && t.disableTextFormatAlert)
+        if (qe(a.pattern) && (u != null && u.v) && ht(u.v)) {
+          if ((t = this._configService.getConfig(It)) != null && t.disableTextFormatAlert)
             return;
           const d = this._cellAlertManagerService.currentAlert.get(ue), l = (r = d == null ? void 0 : d.alert) == null ? void 0 : r.location;
           if (l && l.row === n.row && l.col === n.col && l.subUnitId === n.subUnitId && l.unitId === n.unitId)
             return;
           this._cellAlertManagerService.showAlert({
-            type: kt.WARNING,
+            type: Dt.WARNING,
             title: this._localeService.t("info.error"),
             message: this._localeService.t("info.forceStringInfo"),
             location: n,
@@ -74,13 +74,13 @@ let pe = class extends ie {
     this._cellAlertManagerService.removeAlert(ue);
   }
 };
-pe = fn([
-  D(1, S(Ot)),
-  D(2, S(Ut)),
-  D(3, S(M)),
-  D(4, Yt),
-  D(5, S(ye)),
-  D(6, Fe)
+pe = vn([
+  $(1, S(Ut)),
+  $(2, S(kt)),
+  $(3, S(M)),
+  $(4, zt),
+  $(5, S(ye)),
+  $(6, Fe)
 ], pe);
 const me = {
   id: "sheet.operation.close.numfmt.panel",
@@ -94,11 +94,11 @@ const me = {
   type: Ae.OPERATION,
   handler: (e) => (e.get(B).openPanel(), !0)
 };
-var vn = Object.getOwnPropertyDescriptor, pn = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? vn(t, r) : t, s = e.length - 1, o; s >= 0; s--)
+var pn = Object.getOwnPropertyDescriptor, gn = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? pn(t, r) : t, s = e.length - 1, o; s >= 0; s--)
     (o = e[s]) && (i = o(i) || i);
   return i;
-}, gn = (e, t) => (r, n) => t(r, n, e);
+}, _n = (e, t) => (r, n) => t(r, n, e);
 const Pe = an([]);
 let j = class {
   constructor(e) {
@@ -125,17 +125,17 @@ let j = class {
   async getHabit(e, t) {
     const r = this._getKey(e), n = await this._localStorageService.getItem(r);
     if (t && n) {
-      const i = n.map((s, o, a) => {
-        const c = a.length;
+      const i = n.map((s, o, c) => {
+        const a = c.length;
         return {
           value: s,
-          priority: c - o
+          priority: a - o
         };
       });
       return t.sort((s, o) => {
         var u, d;
-        const a = ((u = i.find((l) => l.value === s)) == null ? void 0 : u.priority) || -1;
-        return (((d = i.find((l) => l.value === o)) == null ? void 0 : d.priority) || -1) - a;
+        const c = ((u = i.find((l) => l.value === s)) == null ? void 0 : u.priority) || -1;
+        return (((d = i.find((l) => l.value === o)) == null ? void 0 : d.priority) || -1) - c;
       });
     }
     return n || [];
@@ -144,10 +144,10 @@ let j = class {
     this._localStorageService.removeItem(e);
   }
 };
-j = pn([
-  gn(0, S(Le))
+j = gn([
+  _n(0, S(Le))
 ], j);
-const ke = "numfmtCurrency", _n = (e) => {
+const ke = "numfmtCurrency", Sn = (e) => {
   const t = C(j), [r, n] = N(Re);
   return oe(() => {
     t.addHabit("numfmtCurrency", []).then(() => {
@@ -158,7 +158,7 @@ const ke = "numfmtCurrency", _n = (e) => {
   }, []), { userHabitCurrency: r, mark: (s) => {
     t.markHabit(ke, s);
   } };
-}, Sn = () => {
+}, yn = () => {
   const e = Ie([]), [t, r] = N({});
   return oe(() => {
     e.current.forEach((i) => {
@@ -167,14 +167,14 @@ const ke = "numfmtCurrency", _n = (e) => {
   }, [t]), (i) => {
     e.current.push(i), r({});
   };
-}, yn = (e) => !!V(e) && e.startsWith("_("), Cn = (e) => {
-  const { defaultPattern: t, action: r, onChange: n } = e, [i, s] = N(() => ee(t || "", 2)), o = tt(Pe), [a, c] = N(() => V(t) || o[0]), u = R(() => o.map((p) => ({ label: p, value: p })), []), l = C(M).t;
-  r.current = () => w(`_("${a}"* #,##0${i > 0 ? ".0" : ""}_)`, i);
+}, Cn = (e) => !!V(e) && e.startsWith("_("), bn = (e) => {
+  const { defaultPattern: t, action: r, onChange: n } = e, [i, s] = N(() => ee(t || "", 2)), o = tt(Pe), [c, a] = N(() => V(t) || o[0]), u = R(() => o.map((p) => ({ label: p, value: p })), []), l = C(M).t;
+  r.current = () => w(`_("${c}"* #,##0${i > 0 ? ".0" : ""}_)`, i);
   const h = (p) => {
-    c(p), n(w(`_("${p}"* #,##0${i > 0 ? ".0" : ""}_)`, i));
+    a(p), n(w(`_("${p}"* #,##0${i > 0 ? ".0" : ""}_)`, i));
   }, f = (p) => {
     const v = p || 0;
-    s(v), n(w(`_("${a}"* #,##0${v > 0 ? ".0" : ""}_)`, v));
+    s(v), n(w(`_("${c}"* #,##0${v > 0 ? ".0" : ""}_)`, v));
   };
   return /* @__PURE__ */ y("div", { children: [
     /* @__PURE__ */ y("div", { className: "univer-mt-4 univer-flex univer-justify-between", children: [
@@ -198,7 +198,7 @@ const ke = "numfmtCurrency", _n = (e) => {
           Me,
           {
             options: u,
-            value: a,
+            value: c,
             onChange: h
           }
         ) })
@@ -206,13 +206,13 @@ const ke = "numfmtCurrency", _n = (e) => {
     ] }),
     /* @__PURE__ */ m("div", { className: "univer-mt-4 univer-text-sm univer-text-gray-400", children: l("sheet.numfmt.accountingDes") })
   ] });
-}, bn = (e) => !!V(e) && !e.startsWith("_("), Nn = (e) => {
-  const r = C(M).t, n = tt(Pe), [i, s] = N(() => V(e.defaultPattern) || n[0]), [o, a] = N(() => ee(e.defaultPattern || "", 2)), [c, u] = N(() => {
+}, Nn = (e) => !!V(e) && !e.startsWith("_("), In = (e) => {
+  const r = C(M).t, n = tt(Pe), [i, s] = N(() => V(e.defaultPattern) || n[0]), [o, c] = N(() => ee(e.defaultPattern || "", 2)), [a, u] = N(() => {
     var g;
     const v = le(i);
     return ((g = v.find((I) => se(I.value, e.defaultPattern))) == null ? void 0 : g.value) || v[0].value;
   }), d = R(() => le(i), [i]), l = R(() => n.map((v) => ({ label: v, value: v })), [n]);
-  e.action.current = () => w(c, o);
+  e.action.current = () => w(a, o);
   const h = (v) => {
     if (v === void 0)
       return;
@@ -222,7 +222,7 @@ const ke = "numfmtCurrency", _n = (e) => {
   }, f = (v) => {
     v !== void 0 && (u(v), e.onChange(w(v, o)));
   }, p = (v) => {
-    a(v || 0), e.onChange(w(c, v || 0));
+    c(v || 0), e.onChange(w(a, v || 0));
   };
   return /* @__PURE__ */ y("div", { children: [
     /* @__PURE__ */ y("div", { className: "univer-mt-4 univer-flex univer-justify-between", children: [
@@ -251,7 +251,7 @@ const ke = "numfmtCurrency", _n = (e) => {
       ] })
     ] }),
     /* @__PURE__ */ m("div", { className: "univer-mt-4 label", children: r("sheet.numfmt.negType") }),
-    /* @__PURE__ */ m("div", { className: "univer-mt-2", children: /* @__PURE__ */ m(xe, { value: c, options: d, onChange: f }) }),
+    /* @__PURE__ */ m("div", { className: "univer-mt-2", children: /* @__PURE__ */ m(xe, { value: a, options: d, onChange: f }) }),
     /* @__PURE__ */ m("div", { className: "univer-mt-4 univer-text-sm univer-text-gray-400", children: r("sheet.numfmt.currencyDes") })
   ] });
 };
@@ -263,7 +263,7 @@ var E = function() {
     }
     return e;
   }, E.apply(this, arguments);
-}, In = function(e, t) {
+}, En = function(e, t) {
   var r = {};
   for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && t.indexOf(n) < 0 && (r[n] = e[n]);
   if (e != null && typeof Object.getOwnPropertySymbols == "function")
@@ -271,58 +271,58 @@ var E = function() {
       t.indexOf(n[i]) < 0 && Object.prototype.propertyIsEnumerable.call(e, n[i]) && (r[n[i]] = e[n[i]]);
   return r;
 }, rt = nt(function(e, t) {
-  var r = e.icon, n = e.id, i = e.className, s = e.extend, o = In(e, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), c = Ie("_".concat(Mn()));
-  return it(r, "".concat(n), { defIds: r.defIds, idSuffix: c.current }, E({ ref: t, className: a }, o), s);
+  var r = e.icon, n = e.id, i = e.className, s = e.extend, o = En(e, ["icon", "id", "className", "extend"]), c = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), a = Ie("_".concat(xn()));
+  return it(r, "".concat(n), { defIds: r.defIds, idSuffix: a.current }, E({ ref: t, className: c }, o), s);
 });
 function it(e, t, r, n, i) {
-  return Ee(e.tag, E(E({ key: t }, En(e, r, i)), n), (Tn(e, r).children || []).map(function(s, o) {
+  return Ee(e.tag, E(E({ key: t }, Tn(e, r, i)), n), (Mn(e, r).children || []).map(function(s, o) {
     return it(s, "".concat(t, "-").concat(e.tag, "-").concat(o), r, void 0, i);
   }));
 }
-function En(e, t, r) {
+function Tn(e, t, r) {
   var n = E({}, e.attrs);
   r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1), e.tag === "mask" && n.id && (n.id = n.id + t.idSuffix), Object.entries(n).forEach(function(s) {
-    var o = s[0], a = s[1];
-    o === "mask" && typeof a == "string" && (n[o] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
+    var o = s[0], c = s[1];
+    o === "mask" && typeof c == "string" && (n[o] = c.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
   });
   var i = t.defIds;
   return !i || i.length === 0 || (e.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + t.idSuffix), Object.entries(n).forEach(function(s) {
-    var o = s[0], a = s[1];
-    typeof a == "string" && (n[o] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
+    var o = s[0], c = s[1];
+    typeof c == "string" && (n[o] = c.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
   })), n;
 }
-function Tn(e, t) {
+function Mn(e, t) {
   var r, n = t.defIds;
   return !n || n.length === 0 ? e : e.tag === "defs" && (!((r = e.children) === null || r === void 0) && r.length) ? E(E({}, e), { children: e.children.map(function(i) {
     return typeof i.attrs.id == "string" && n && n.indexOf(i.attrs.id) > -1 ? E(E({}, i), { attrs: E(E({}, i.attrs), { id: i.attrs.id + t.idSuffix }) }) : i;
   }) }) : e;
 }
-function Mn() {
+function xn() {
   return Math.random().toString(36).substring(2, 8);
 }
 rt.displayName = "UniverIcon";
-var xn = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M14.1544 3.75557C14.3887 3.98988 14.3887 4.36978 14.1544 4.6041L6.51409 12.2444C6.40157 12.3569 6.24896 12.4201 6.08983 12.4201C5.9307 12.4201 5.77808 12.3569 5.66556 12.2444L1.84541 8.42425C1.6111 8.18993 1.6111 7.81003 1.84541 7.57572C2.07973 7.34141 2.45963 7.34141 2.69394 7.57572L6.08983 10.9716L13.3059 3.75557C13.5402 3.52126 13.9201 3.52126 14.1544 3.75557Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, st = nt(function(e, t) {
+var Pn = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M14.1544 3.75557C14.3887 3.98988 14.3887 4.36978 14.1544 4.6041L6.51409 12.2444C6.40157 12.3569 6.24896 12.4201 6.08983 12.4201C5.9307 12.4201 5.77808 12.3569 5.66556 12.2444L1.84541 8.42425C1.6111 8.18993 1.6111 7.81003 1.84541 7.57572C2.07973 7.34141 2.45963 7.34141 2.69394 7.57572L6.08983 10.9716L13.3059 3.75557C13.5402 3.52126 13.9201 3.52126 14.1544 3.75557Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, st = nt(function(e, t) {
   return Ee(rt, Object.assign({}, e, {
     id: "check-mark-single",
     ref: t,
-    icon: xn
+    icon: Pn
   }));
 });
 st.displayName = "CheckMarkSingle";
 const de = "customFormat", he = "numfmt_custom_pattern";
-function Pn(e) {
-  const { defaultPattern: t, action: r, onChange: n } = e, i = C(j), s = C(Le), o = C(M), [a, c] = N(t);
-  r.current = () => (i.markHabit(de, a), s.getItem(he).then((f = []) => {
-    const p = [.../* @__PURE__ */ new Set([a, ...f || []])].splice(0, 10).filter((v) => !!v);
+function wn(e) {
+  const { defaultPattern: t, action: r, onChange: n } = e, i = C(j), s = C(Le), o = C(M), [c, a] = N(t);
+  r.current = () => (i.markHabit(de, c), s.getItem(he).then((f = []) => {
+    const p = [.../* @__PURE__ */ new Set([c, ...f || []])].splice(0, 10).filter((v) => !!v);
     s.setItem(he, p);
-  }), a);
+  }), c);
   const [u, d] = N([]);
   oe(() => {
     s.getItem(he).then((f) => {
       const p = [
-        ...It.map((v) => v.suffix("$")),
-        ...Et.map((v) => v.suffix),
-        ...Tt.map((v) => v.suffix)
+        ...Et.map((v) => v.suffix("$")),
+        ...Tt.map((v) => v.suffix),
+        ...Mt.map((v) => v.suffix)
       ];
       p.push(...f || []), i.addHabit(de, []).finally(() => {
         i.getHabit(de, p).then((v) => {
@@ -332,33 +332,33 @@ function Pn(e) {
     });
   }, []);
   const l = (f) => {
-    c(f), n(f);
+    a(f), n(f);
   }, h = () => {
-    n(a);
+    n(c);
   };
   return /* @__PURE__ */ y("div", { children: [
     /* @__PURE__ */ m("div", { className: "univer-mt-4 univer-text-sm univer-text-gray-400", children: o.t("sheet.numfmt.customFormat") }),
     /* @__PURE__ */ m(
-      ln,
+      un,
       {
         placeholder: o.t("sheet.numfmt.customFormat"),
         onBlur: h,
-        value: a,
-        onChange: c,
+        value: c,
+        onChange: a,
         className: "univer-mt-2 univer-w-full"
       }
     ),
     /* @__PURE__ */ m(
       "div",
       {
-        className: un("univer-mt-2 univer-max-h-[400px] univer-overflow-auto univer-rounded-lg univer-p-2", mn),
+        className: mn("univer-mt-2 univer-max-h-[400px] univer-overflow-auto univer-rounded-lg univer-p-2", dn),
         children: u.map((f) => /* @__PURE__ */ y(
           "div",
           {
             onClick: () => l(f),
             className: "univer-flex univer-cursor-pointer univer-items-center univer-gap-1.5 univer-py-1.5 univer-text-sm",
             children: [
-              /* @__PURE__ */ m("div", { className: "univer-flex univer-w-4 univer-items-center univer-text-primary-600", children: a === f && /* @__PURE__ */ m(st, {}) }),
+              /* @__PURE__ */ m("div", { className: "univer-flex univer-w-4 univer-items-center univer-text-primary-600", children: c === f && /* @__PURE__ */ m(st, {}) }),
               /* @__PURE__ */ m("div", { children: f })
             ]
           },
@@ -369,27 +369,27 @@ function Pn(e) {
     /* @__PURE__ */ m(
       "div",
       {
-        className: "univer-mt-3 univer-text-sm univer-text-gray-600 dark:univer-text-gray-200",
+        className: "univer-mt-3 univer-text-sm univer-text-gray-600 dark:!univer-text-gray-200",
         children: o.t("sheet.numfmt.customFormatDes")
       }
     )
   ] });
 }
-const wn = (e) => {
+const Rn = (e) => {
   const t = J.getInfo(e);
   return Ve().map((r) => r.value).includes(e) || ["date", "datetime", "time"].includes(t.type);
-}, Rn = (e) => {
+}, On = (e) => {
   const t = R(Ve, []), n = C(M).t, [i, s] = N(() => {
     if (e.defaultPattern) {
-      const a = t.find((c) => c.value === e.defaultPattern);
-      if (a)
-        return a.value;
+      const c = t.find((a) => a.value === e.defaultPattern);
+      if (c)
+        return c.value;
     }
     return t[0].value;
   });
   e.action.current = () => i;
-  const o = (a) => {
-    a !== void 0 && (s(a), e.onChange(a));
+  const o = (c) => {
+    c !== void 0 && (s(c), e.onChange(c));
   };
   return /* @__PURE__ */ y("div", { children: [
     /* @__PURE__ */ m("div", { className: "univer-mt-4 univer-text-sm univer-text-gray-400", children: n("sheet.numfmt.dateType") }),
@@ -397,35 +397,35 @@ const wn = (e) => {
     /* @__PURE__ */ m(
       "div",
       {
-        className: "univer-mt-3.5 univer-text-sm/5 univer-text-gray-600 dark:univer-text-gray-200",
+        className: "univer-mt-3.5 univer-text-sm/5 univer-text-gray-600 dark:!univer-text-gray-200",
         children: n("sheet.numfmt.dateDes")
       }
     )
   ] });
-}, On = (e) => !e, Un = (e) => {
+}, Un = (e) => !e, kn = (e) => {
   const r = C(M).t;
   return e.action.current = () => "", /* @__PURE__ */ m("div", { children: /* @__PURE__ */ m(
     "div",
     {
-      className: "univer-mt-3.5 univer-text-sm/5 univer-text-gray-600 dark:univer-text-gray-200",
+      className: "univer-mt-3.5 univer-text-sm/5 univer-text-gray-600 dark:!univer-text-gray-200",
       children: r("sheet.numfmt.generalDes")
     }
   ) });
-}, kn = (e) => We().some((t) => se(t.value, e)), Dn = (e) => {
+}, Dn = (e) => We().some((t) => se(t.value, e)), $n = (e) => {
   const t = C(M), r = R(We, []), [n, i] = N(() => ee(e.defaultPattern || "", 0)), [s, o] = N(() => {
     const l = r.find((h) => se(h.value, e.defaultPattern || ""));
     return (l == null ? void 0 : l.value) || r[0].value;
-  }), a = R(() => w(s, Number(n || 0)), [s, n]), c = R(() => !Mt(s), [s]), u = (l) => {
+  }), c = R(() => w(s, Number(n || 0)), [s, n]), a = R(() => !xt(s), [s]), u = (l) => {
     i(l || 0), e.onChange(w(s, Number(l || 0)));
   }, d = (l) => {
     l !== void 0 && (i(ee(l, 0)), o(l), e.onChange(l));
   };
-  return e.action.current = () => a, /* @__PURE__ */ y("div", { children: [
+  return e.action.current = () => c, /* @__PURE__ */ y("div", { children: [
     /* @__PURE__ */ m("div", { className: "univer-mt-4 univer-text-sm univer-text-gray-400", children: t.t("sheet.numfmt.decimalLength") }),
     /* @__PURE__ */ m("div", { className: "univer-mt-2", children: /* @__PURE__ */ m(
       Te,
       {
-        disabled: c,
+        disabled: a,
         value: n,
         max: 20,
         min: 0,
@@ -440,42 +440,42 @@ const wn = (e) => {
     /* @__PURE__ */ m(
       "div",
       {
-        className: "univer-mt-3.5 univer-text-sm/5 univer-text-gray-600 dark:univer-text-gray-200",
+        className: "univer-mt-3.5 univer-text-sm/5 univer-text-gray-600 dark:!univer-text-gray-200",
         children: t.t("sheet.numfmt.thousandthPercentileDes")
       }
     )
   ] });
-}, $n = (e) => {
-  const { defaultValue: t, defaultPattern: r, row: n, col: i } = e.value, s = C(M), o = Ie(() => ""), a = s.t, c = Sn(), u = R(
+}, Fn = (e) => {
+  const { defaultValue: t, defaultPattern: r, row: n, col: i } = e.value, s = C(M), o = Ie(() => ""), c = s.t, a = yn(), u = R(
     () => [
-      { label: "sheet.numfmt.general", component: Un },
-      { label: "sheet.numfmt.accounting", component: Cn },
-      { label: "sheet.numfmt.currency", component: Nn },
-      { label: "sheet.numfmt.date", component: Rn },
-      { label: "sheet.numfmt.thousandthPercentile", component: Dn },
-      { label: "sheet.numfmt.customFormat", component: Pn }
-    ].map((_) => ({ ..._, label: a(_.label) })),
+      { label: "sheet.numfmt.general", component: kn },
+      { label: "sheet.numfmt.accounting", component: bn },
+      { label: "sheet.numfmt.currency", component: In },
+      { label: "sheet.numfmt.date", component: On },
+      { label: "sheet.numfmt.thousandthPercentile", component: $n },
+      { label: "sheet.numfmt.customFormat", component: wn }
+    ].map((_) => ({ ..._, label: c(_.label) })),
     []
-  ), [d, l] = N(g), [h, f] = N(() => `${n}_${i}`), { mark: p, userHabitCurrency: v } = _n(() => f(`${n}_${i}_userCurrency'`)), b = R(() => {
+  ), [d, l] = N(g), [h, f] = N(() => `${n}_${i}`), { mark: p, userHabitCurrency: v } = Sn(() => f(`${n}_${i}_userCurrency'`)), b = R(() => {
     var _;
-    return (_ = u.find((U) => U.label === d)) == null ? void 0 : _.component;
+    return (_ = u.find((k) => k.label === d)) == null ? void 0 : _.component;
   }, [d]);
   function g() {
-    return [On, yn, bn, wn, kn].reduce((U, lt, ut) => U || (lt(r) ? u[ut].label : ""), "") || u[0].label;
+    return [Un, Cn, Nn, Rn, Dn].reduce((k, lt, ut) => k || (lt(r) ? u[ut].label : ""), "") || u[0].label;
   }
   const I = u.map((_) => ({
     label: _.label,
     value: _.label
   })), O = (_) => {
-    l(_), c(() => e.onChange({ type: "change", value: o.current() || "" }));
-  }, P = cn((_) => {
+    l(_), a(() => e.onChange({ type: "change", value: o.current() || "" }));
+  }, P = ln((_) => {
     e.onChange({ type: "change", value: _ });
-  }, []), ae = () => {
-    const _ = o.current() || "", U = V(_);
-    U && p(U), e.onChange({ type: "confirm", value: _ });
+  }, []), ce = () => {
+    const _ = o.current() || "", k = V(_);
+    k && p(k), e.onChange({ type: "confirm", value: _ });
   }, F = () => {
     e.onChange({ type: "cancel", value: "" });
-  }, ce = {
+  }, ae = {
     onChange: P,
     defaultValue: t,
     defaultPattern: r,
@@ -489,26 +489,26 @@ const wn = (e) => {
       className: "univer-flex univer-h-full univer-flex-col univer-justify-between univer-overflow-y-auto univer-pb-5",
       children: [
         /* @__PURE__ */ y("div", { children: [
-          /* @__PURE__ */ m("div", { className: "univer-mt-3.5 univer-text-sm univer-text-gray-400", children: a("sheet.numfmt.numfmtType") }),
+          /* @__PURE__ */ m("div", { className: "univer-mt-3.5 univer-text-sm univer-text-gray-400", children: c("sheet.numfmt.numfmtType") }),
           /* @__PURE__ */ m("div", { className: "univer-mt-2", children: /* @__PURE__ */ m(Me, { className: "univer-w-full", value: d, options: I, onChange: O }) }),
-          /* @__PURE__ */ m("div", { children: b && /* @__PURE__ */ m(Pe.Provider, { value: v, children: /* @__PURE__ */ Ee(b, { ...ce, key: h }) }) })
+          /* @__PURE__ */ m("div", { children: b && /* @__PURE__ */ m(Pe.Provider, { value: v, children: /* @__PURE__ */ Ee(b, { ...ae, key: h }) }) })
         ] }),
         /* @__PURE__ */ y("div", { className: "univer-mb-5 univer-mt-3.5 univer-flex univer-justify-end", children: [
-          /* @__PURE__ */ m(Oe, { onClick: F, className: "univer-mr-3", children: a("sheet.numfmt.cancel") }),
-          /* @__PURE__ */ m(Oe, { variant: "primary", onClick: ae, children: a("sheet.numfmt.confirm") })
+          /* @__PURE__ */ m(Oe, { onClick: F, className: "univer-mr-3", children: c("sheet.numfmt.cancel") }),
+          /* @__PURE__ */ m(Oe, { variant: "primary", onClick: ce, children: c("sheet.numfmt.confirm") })
         ] })
       ]
     }
   );
 };
-var Fn = Object.getOwnPropertyDescriptor, An = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Fn(t, r) : t, s = e.length - 1, o; s >= 0; s--)
+var An = Object.getOwnPropertyDescriptor, Ln = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? An(t, r) : t, s = e.length - 1, o; s >= 0; s--)
     (o = e[s]) && (i = o(i) || i);
   return i;
 }, x = (e, t) => (r, n) => t(r, n, e);
 const De = "SHEET_NUMFMT_PANEL";
 let B = class extends ie {
-  constructor(t, r, n, i, s, o, a, c, u, d, l) {
+  constructor(t, r, n, i, s, o, c, a, u, d, l) {
     super();
     /**
      * If _previewPattern is null ,the realTimeRenderingInterceptor will skip and if it is '',realTimeRenderingInterceptor will clear numfmt.
@@ -518,7 +518,7 @@ let B = class extends ie {
      */
     q(this, "_previewPattern", "");
     q(this, "_sidebarDisposable", null);
-    this._sheetInterceptorService = t, this._themeService = r, this._univerInstanceService = n, this._commandService = i, this._selectionManagerService = s, this._renderManagerService = o, this._numfmtService = a, this._componentManager = c, this._sidebarService = u, this._localeService = d, this._sheetsNumfmtCellContentController = l, this._initRealTimeRenderingInterceptor(), this._initPanel(), this._initCommands(), this._initCloseListener(), this._commandExecutedListener(), this._initNumfmtLocalChange();
+    this._sheetInterceptorService = t, this._themeService = r, this._univerInstanceService = n, this._commandService = i, this._selectionManagerService = s, this._renderManagerService = o, this._numfmtService = c, this._componentManager = a, this._sidebarService = u, this._localeService = d, this._sheetsNumfmtCellContentController = l, this._initRealTimeRenderingInterceptor(), this._initPanel(), this._initCommands(), this._initCloseListener(), this._commandExecutedListener(), this._initNumfmtLocalChange();
   }
   _initNumfmtLocalChange() {
     this.disposeWithMe(et(this._sheetsNumfmtCellContentController.local$, this._localeService.currentLocale$).subscribe(() => {
@@ -527,40 +527,40 @@ let B = class extends ie {
   }
   openPanel() {
     var b;
-    const t = this._sidebarService, r = this._selectionManagerService, n = this._commandService, i = this._univerInstanceService, s = this._numfmtService, o = this._localeService, c = (((b = r.getCurrentSelections()) == null ? void 0 : b.map((g) => g.range)) || [])[0];
-    if (!c)
+    const t = this._sidebarService, r = this._selectionManagerService, n = this._commandService, i = this._univerInstanceService, s = this._numfmtService, o = this._localeService, a = (((b = r.getCurrentSelections()) == null ? void 0 : b.map((g) => g.range)) || [])[0];
+    if (!a)
       return !1;
     const u = i.getCurrentUnitForType(T.UNIVER_SHEET), d = u.getActiveSheet();
     if (!d)
       return !1;
-    const l = d.getCellRaw(c.startRow, c.startColumn), h = s.getValue(
+    const l = d.getCellRaw(a.startRow, a.startColumn), h = s.getValue(
       u.getUnitId(),
       d.getSheetId(),
-      c.startRow,
-      c.startColumn
+      a.startRow,
+      a.startColumn
     );
     let f = "";
     h && (f = h.pattern);
-    const p = (l == null ? void 0 : l.t) === $.NUMBER ? l.v : 12345678, v = {
+    const p = (l == null ? void 0 : l.t) === U.NUMBER ? l.v : 12345678, v = {
       onChange: (g) => {
         var I;
         if (g.type === "change")
           this._previewPattern = g.value, this._forceUpdate();
         else if (g.type === "confirm") {
-          const O = ((I = r.getCurrentSelections()) == null ? void 0 : I.map((F) => F.range)) || [], P = { values: [] }, ae = Se(g.value);
+          const O = ((I = r.getCurrentSelections()) == null ? void 0 : I.map((F) => F.range)) || [], P = { values: [] }, ce = Se(g.value);
           O.forEach((F) => {
-            He.foreach(F, (ce, _) => {
+            He.foreach(F, (ae, _) => {
               P.values.push({
-                row: ce,
+                row: ae,
                 col: _,
                 pattern: g.value,
-                type: ae
+                type: ce
               });
             });
           }), n.executeCommand(Ke.id, P), t.close();
         } else g.type === "cancel" && t.close();
       },
-      value: { defaultPattern: f, defaultValue: p, row: c.startRow, col: c.startColumn }
+      value: { defaultPattern: f, defaultValue: p, row: a.startRow, col: a.startColumn }
     };
     return this._sidebarDisposable = t.open({
       header: { title: o.t("sheet.numfmt.title") },
@@ -579,7 +579,7 @@ let B = class extends ie {
     const r = this._renderManagerService.getRenderById(
       t != null ? t : this._univerInstanceService.getCurrentUnitForType(T.UNIVER_SHEET).getUnitId()
     );
-    r == null || r.with(Dt).reCalculate(), (n = r == null ? void 0 : r.mainComponent) == null || n.makeDirty();
+    r == null || r.with($t).reCalculate(), (n = r == null ? void 0 : r.mainComponent) == null || n.makeDirty();
   }
   _initCommands() {
     [
@@ -590,7 +590,9 @@ let B = class extends ie {
     });
   }
   _initPanel() {
-    this._componentManager.register(De, $n);
+    this.disposeWithMe(
+      this._componentManager.register(De, Fn)
+    );
   }
   // eslint-disable-next-line max-lines-per-function
   _initRealTimeRenderingInterceptor() {
@@ -598,16 +600,16 @@ let B = class extends ie {
       this._commandService.onCommandExecuted((i) => {
         i.id === H.id && n.next(!0), i.id === me.id && n.next(!1);
       });
-    }), r = en([
+    }), r = tn([
       t,
       this._selectionManagerService.selectionMoveEnd$.pipe(
-        nn((n) => n ? n.map((i) => i.range) : [])
+        rn((n) => n ? n.map((i) => i.range) : [])
       )
     ]);
     this.disposeWithMe(
       ve(
         r.pipe(
-          rn(
+          sn(
             ([n, i]) => new L((s) => {
               const o = new vt();
               return n && i.length && s.next({ selectionRanges: i, disposableCollection: o }), () => {
@@ -615,44 +617,44 @@ let B = class extends ie {
               };
             })
           ),
-          sn(() => {
+          on(() => {
             this._previewPattern = null;
           })
         ).subscribe(({ disposableCollection: n, selectionRanges: i }) => {
-          var o, a;
+          var o, c;
           const s = this._univerInstanceService.getCurrentUnitForType(T.UNIVER_SHEET);
           this.openPanel(), n.add(
-            this._sheetInterceptorService.intercept(jt.CELL_CONTENT, {
+            this._sheetInterceptorService.intercept(Bt.CELL_CONTENT, {
               priority: 99,
               effect: we.Value | we.Style,
-              handler: (c, u, d) => {
-                const { row: l, col: h } = u, f = d(c) || {};
+              handler: (a, u, d) => {
+                const { row: l, col: h } = u, f = d(a) || {};
                 if (i.find(
                   (p) => p.startColumn <= h && p.endColumn >= h && p.startRow <= l && p.endRow >= l
                 )) {
                   const p = u.worksheet.getCellRaw(l, h), v = p == null ? void 0 : p.v, b = p == null ? void 0 : p.t;
-                  if (v == null || b !== $.NUMBER || this._previewPattern === null)
+                  if (v == null || b !== U.NUMBER || this._previewPattern === null)
                     return f;
-                  const g = xt(this._previewPattern, v, this._sheetsNumfmtCellContentController.local);
+                  const g = Pt(this._previewPattern, v, this._sheetsNumfmtCellContentController.local);
                   if (g.color) {
                     const I = this._themeService.getColorFromTheme(`${g.color}.500`);
                     return {
                       ...f,
                       v: g.result,
-                      t: $.STRING,
+                      t: U.STRING,
                       s: { cl: { rgb: I } }
                     };
                   }
                   return {
                     ...f,
                     v: g.result,
-                    t: $.STRING
+                    t: U.STRING
                   };
                 }
                 return f;
               }
             })
-          ), (a = (o = this._renderManagerService.getRenderById(s.getUnitId())) == null ? void 0 : o.mainComponent) == null || a.makeDirty();
+          ), (c = (o = this._renderManagerService.getRenderById(s.getUnitId())) == null ? void 0 : o.mainComponent) == null || c.makeDirty();
         })
       )
     );
@@ -668,7 +670,7 @@ let B = class extends ie {
           }
         });
         return () => n.dispose();
-      }).pipe(on(16)).subscribe((r) => this._forceUpdate(r))
+      }).pipe(cn(16)).subscribe((r) => this._forceUpdate(r))
     );
   }
   _initCloseListener() {
@@ -678,7 +680,7 @@ let B = class extends ie {
     });
   }
 };
-B = An([
+B = Ln([
   x(0, S(Je)),
   x(1, S(ft)),
   x(2, ge),
@@ -687,19 +689,19 @@ B = An([
   x(5, Be),
   x(6, ye),
   x(7, S(Qe)),
-  x(8, zt),
+  x(8, Xt),
   x(9, S(M)),
   x(10, S(Ge))
 ], B);
-var Ln = Object.getOwnPropertyDescriptor, Hn = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Ln(t, r) : t, s = e.length - 1, o; s >= 0; s--)
+var Hn = Object.getOwnPropertyDescriptor, jn = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? Hn(t, r) : t, s = e.length - 1, o; s >= 0; s--)
     (o = e[s]) && (i = o(i) || i);
   return i;
 }, A = (e, t) => (r, n) => t(r, n, e);
-const jn = () => {
+const Bn = () => {
   let e = [];
   return {
-    add: (i, s, o, a, c) => e.push({ unitId: i, subUnitId: s, row: o, col: a, value: c }),
+    add: (i, s, o, c, a) => e.push({ unitId: i, subUnitId: s, row: o, col: c, value: a }),
     getEffects: () => e,
     clean: () => {
       e = [];
@@ -710,13 +712,13 @@ let te = class extends ie {
   constructor(t, r, n, i, s) {
     super();
     // collect effect mutations when edit end and push this to  commands stack in next commands progress
-    q(this, "_collectEffectMutation", jn());
+    q(this, "_collectEffectMutation", Bn());
     this._sheetInterceptorService = t, this._numfmtService = r, this._univerInstanceService = n, this._injector = i, this._editorBridgeService = s, this._initInterceptorEditorStart(), this._initInterceptorEditorEnd(), this._initInterceptorCommands();
   }
   _initInterceptorEditorStart() {
     this._editorBridgeService && this.disposeWithMe(
       ve(
-        this._sheetInterceptorService.writeCellInterceptor.intercept(Bt, {
+        this._sheetInterceptorService.writeCellInterceptor.intercept(Vt, {
           handler: (t, r, n) => {
             const i = r.row, s = r.col, o = this._numfmtService.getValue(
               r.unitId,
@@ -730,8 +732,8 @@ let te = class extends ie {
                 case "currency":
                 case "grouped":
                 case "number": {
-                  const c = r.worksheet.getCellRaw(i, s);
-                  return n && n(c);
+                  const a = r.worksheet.getCellRaw(i, s);
+                  return n && n(a);
                 }
                 case "percent":
                 case "date":
@@ -751,13 +753,14 @@ let te = class extends ie {
    * @private
    * @memberof NumfmtService
    */
+  // eslint-disable-next-line max-lines-per-function
   _initInterceptorEditorEnd() {
     this.disposeWithMe(
       ve(
-        this._sheetInterceptorService.writeCellInterceptor.intercept(Vt, {
+        this._sheetInterceptorService.writeCellInterceptor.intercept(Wt, {
           // eslint-disable-next-line complexity
           handler: (t, r, n) => {
-            var c, u, d;
+            var a, u, d;
             this._collectEffectMutation.clean();
             const i = this._numfmtService.getValue(
               r.unitId,
@@ -765,28 +768,35 @@ let te = class extends ie {
               r.row,
               r.col
             );
-            if (!(t != null && t.v) && !(t != null && t.p) || qe(i == null ? void 0 : i.pattern) || t.t === $.FORCE_STRING)
+            if (!(t != null && t.v) && !(t != null && t.p) || qe(i == null ? void 0 : i.pattern) || t.t === U.FORCE_STRING)
               return n(t);
-            const s = (c = t.p) == null ? void 0 : c.body, o = (d = (u = t == null ? void 0 : t.p) == null ? void 0 : u.body) != null && d.dataStream ? t.p.body.dataStream.replace(/\r\n$/, "") : String(t.v), a = J.parseDate(o) || J.parseTime(o) || J.parseNumber(o);
+            const s = (a = t.p) == null ? void 0 : a.body, o = (d = (u = t == null ? void 0 : t.p) == null ? void 0 : u.body) != null && d.dataStream ? t.p.body.dataStream.replace(/\r\n$/, "") : String(t.v), c = J.parseDate(o) || J.parseTime(o) || J.parseNumber(o);
             if (s)
-              if (Bn(s)) {
+              if (Vn(s)) {
                 const { dataStream: l } = s, h = l.replace(/\r\n$/, ""), f = Number(h);
-                if (Number.isNaN(f) && !a)
+                if (Number.isNaN(f) && !c)
                   return n(t);
               } else
                 return n(t);
-            if (a) {
-              a.z && this._collectEffectMutation.add(
+            if (c) {
+              if (!c.z && gt(o))
+                return n({
+                  ...t,
+                  p: void 0,
+                  v: o,
+                  t: U.FORCE_STRING
+                });
+              c.z && this._collectEffectMutation.add(
                 r.unitId,
                 r.subUnitId,
                 r.row,
                 r.col,
                 {
-                  pattern: a.z
+                  pattern: c.z
                 }
               );
-              const l = Number(a.v);
-              return n({ ...t, p: void 0, v: l, t: $.NUMBER });
+              const l = Number(c.v);
+              return n({ ...t, p: void 0, v: l, t: U.NUMBER });
             }
             return n(t);
           }
@@ -801,27 +811,27 @@ let te = class extends ie {
         getMutations(r) {
           var n;
           switch (r.id) {
-            case Wt.id: {
+            case Gt.id: {
               const i = t._univerInstanceService.getCurrentUnitForType(T.UNIVER_SHEET), s = i.getUnitId(), o = (n = i.getActiveSheet()) == null ? void 0 : n.getSheetId();
               if (!o)
                 return {
                   redos: [],
                   undos: []
                 };
-              const a = t._collectEffectMutation.getEffects();
-              if (t._collectEffectMutation.clean(), !a.length)
+              const c = t._collectEffectMutation.getEffects();
+              if (t._collectEffectMutation.clean(), !c.length)
                 return {
                   redos: [],
                   undos: []
                 };
-              const c = a.filter((h) => {
+              const a = c.filter((h) => {
                 var f;
                 return !!((f = h.value) != null && f.pattern);
               }).map((h) => ({
                 row: h.row,
                 col: h.col,
                 pattern: h.value.pattern
-              })), u = a.filter((h) => {
+              })), u = c.filter((h) => {
                 var f;
                 return !((f = h.value) != null && f.pattern);
               }).map((h) => ({
@@ -830,12 +840,12 @@ let te = class extends ie {
                 startColumn: h.col,
                 endRow: h.row
               })), d = [], l = [];
-              if (c.length) {
+              if (a.length) {
                 const h = {
                   id: Ne.id,
-                  params: Gt(s, o, c)
+                  params: Kt(s, o, a)
                 };
-                d.push(h), l.push(...Kt(t._injector, h.params));
+                d.push(h), l.push(...Zt(t._injector, h.params));
               }
               if (u.length) {
                 const h = {
@@ -846,7 +856,7 @@ let te = class extends ie {
                     ranges: u
                   }
                 };
-                d.push(h), l.push(...Zt(t._injector, h.params));
+                d.push(h), l.push(...Yt(t._injector, h.params));
               }
               return {
                 redos: d,
@@ -863,16 +873,16 @@ let te = class extends ie {
     );
   }
 };
-te = Hn([
+te = jn([
   A(0, S(Je)),
   A(1, S(ye)),
   A(2, S(ge)),
   A(3, S(je)),
-  A(4, pt($t))
+  A(4, pt(Ft))
 ], te);
-function Bn(e) {
+function Vn(e) {
   const { textRuns: t = [], paragraphs: r = [], customRanges: n, customBlocks: i = [] } = e, s = ["va"];
-  return !(t.some((o) => !!(o.ts && Object.keys(o.ts).some((c) => s.includes(c)))) || r.some((o) => o.bullet) || r.length >= 2 || n != null && n.length || i.length > 0);
+  return !(t.some((o) => !!(o.ts && Object.keys(o.ts).some((a) => s.includes(a)))) || r.some((o) => o.bullet) || r.length >= 2 || n != null && n.length || i.length > 0);
 }
 const Q = [
   {
@@ -881,7 +891,7 @@ const Q = [
   },
   {
     label: "sheet.numfmt.text",
-    pattern: Ht
+    pattern: jt
   },
   "|",
   {
@@ -935,20 +945,20 @@ const Q = [
     label: "sheet.numfmt.moreFmt",
     pattern: ""
   }
-], Vn = (e) => ({
+], Wn = (e) => ({
   icon: new L((t) => {
-    const r = e.get(Pt);
+    const r = e.get(wt);
     function n(s) {
       return {
-        [k.US]: "DollarSingle",
-        [k.RU]: "RoubleSingle",
-        [k.CN]: "RmbSingle",
-        [k.AT]: "EuroSingle"
+        [D.US]: "DollarSingle",
+        [D.RU]: "RoubleSingle",
+        [D.CN]: "RmbSingle",
+        [D.AT]: "EuroSingle"
       }[s] || "DollarSingle";
     }
-    const i = k[r.getCurrencySymbol()] || "$";
+    const i = D[r.getCurrencySymbol()] || "$";
     return t.next(n(i)), r.currencySymbol$.subscribe((s) => {
-      const o = k[s] || "$";
+      const o = D[s] || "$";
       t.next(n(o));
     });
   }),
@@ -958,7 +968,7 @@ const Q = [
   type: X.BUTTON,
   hidden$: z(e, T.UNIVER_SHEET),
   disabled$: W(e, { workbookTypes: [Y], worksheetTypes: [Z, K], rangeTypes: [G] })
-}), Wn = (e) => ({
+}), Gn = (e) => ({
   icon: "AddDigitsSingle",
   id: ze.id,
   title: "sheet.numfmt.addDecimal",
@@ -966,7 +976,7 @@ const Q = [
   type: X.BUTTON,
   hidden$: z(e, T.UNIVER_SHEET),
   disabled$: W(e, { workbookTypes: [Y], worksheetTypes: [Z, K], rangeTypes: [G] })
-}), Gn = (e) => ({
+}), Kn = (e) => ({
   icon: "ReduceDigitsSingle",
   id: Ye.id,
   title: "sheet.numfmt.subtractDecimal",
@@ -974,7 +984,7 @@ const Q = [
   type: X.BUTTON,
   hidden$: z(e, T.UNIVER_SHEET),
   disabled$: W(e, { workbookTypes: [Y], worksheetTypes: [Z, K], rangeTypes: [G] })
-}), Kn = (e) => ({
+}), Zn = (e) => ({
   icon: "PercentSingle",
   id: Ze.id,
   title: "sheet.numfmt.percent",
@@ -982,23 +992,23 @@ const Q = [
   type: X.BUTTON,
   hidden$: z(e, T.UNIVER_SHEET),
   disabled$: W(e, { workbookTypes: [Y], worksheetTypes: [Z, K], rangeTypes: [G] })
-}), Zn = (e) => {
-  const t = e.get(ge), r = e.get(_e), n = e.get(M), i = e.get(Ce), s = [be.id, Ne.id], o = Ft(
+}), Yn = (e) => {
+  const t = e.get(ge), r = e.get(_e), n = e.get(M), i = e.get(Ce), s = [be.id, Ne.id], o = At(
     t,
     "",
-    ({ workbook: a, worksheet: c }) => new L(
+    ({ workbook: c, worksheet: a }) => new L(
       (u) => et(
         i.selectionMoveEnd$,
-        gt(r.onCommandExecuted.bind(r)).pipe(
-          tn(([d]) => s.includes(d.id))
+        _t(r.onCommandExecuted.bind(r)).pipe(
+          nn(([d]) => s.includes(d.id))
         )
       ).subscribe(() => {
         var l, h;
         const d = i.getCurrentSelections();
         if (d && d[0]) {
-          const f = d[0].range, p = f.startRow, v = f.startColumn, b = (h = a.getStyles().get((l = c.getCell(p, v)) == null ? void 0 : l.s)) == null ? void 0 : h.n, g = b == null ? void 0 : b.pattern;
+          const f = d[0].range, p = f.startRow, v = f.startColumn, b = (h = c.getStyles().get((l = a.getCell(p, v)) == null ? void 0 : l.s)) == null ? void 0 : h.n, g = b == null ? void 0 : b.pattern;
           let I = n.t("sheet.numfmt.general");
-          if (Lt(g)) {
+          if (Ht(g)) {
             u.next(I);
             return;
           }
@@ -1022,7 +1032,7 @@ const Q = [
     selections: [
       {
         label: {
-          name: at,
+          name: ct,
           hoverable: !1,
           selectable: !1
         }
@@ -1032,68 +1042,68 @@ const Q = [
     hidden$: z(e, T.UNIVER_SHEET),
     disabled$: W(e, { workbookTypes: [Y], worksheetTypes: [K, Z], rangeTypes: [G] })
   };
-}, ot = "sheet.numfmt.moreNumfmtType", at = "sheet.numfmt.moreNumfmtType.options", Yn = (e) => {
+}, ot = "sheet.numfmt.moreNumfmtType", ct = "sheet.numfmt.moreNumfmtType.options", zn = (e) => {
   const { value: t } = e, r = C(M), n = t != null ? t : r.t("sheet.numfmt.general");
   return /* @__PURE__ */ m("span", { className: "univer-text-sm", children: n });
-}, zn = () => {
-  const e = C(_e), t = C(M), r = C(Xt), n = C(Ge), i = C(Ce), s = (c) => {
+}, Xn = () => {
+  const e = C(_e), t = C(M), r = C(qt), n = C(Ge), i = C(Ce), s = (a) => {
     const u = i.getCurrentLastSelection();
     if (!u)
       return;
     const d = u.range, l = [];
     He.foreach(d, (h, f) => {
-      c ? l.push({ row: h, col: f, pattern: c, type: Se(c) }) : l.push({ row: h, col: f });
+      a ? l.push({ row: h, col: f, pattern: a, type: Se(a) }) : l.push({ row: h, col: f });
     }), e.executeCommand(Ke.id, { values: l }), r.focus();
-  }, o = (c) => {
-    if (c === 0)
+  }, o = (a) => {
+    if (a === 0)
       s(null);
-    else if (c === Q.length - 1)
+    else if (a === Q.length - 1)
       e.executeCommand(H.id), r.focus();
     else {
-      const u = Q[c];
+      const u = Q[a];
       u.pattern && s(u.pattern);
     }
-  }, a = 1220;
-  return /* @__PURE__ */ m("div", { className: "univer-grid univer-gap-1 univer-p-1.5", children: Q.map((c, u) => c === "|" ? /* @__PURE__ */ m(dn, {}, u) : /* @__PURE__ */ y(
+  }, c = 1220;
+  return /* @__PURE__ */ m("div", { className: "univer-grid univer-gap-1 univer-p-1.5", children: Q.map((a, u) => a === "|" ? /* @__PURE__ */ m(hn, {}, u) : /* @__PURE__ */ y(
     "div",
     {
-      className: "univer-flex univer-h-7 univer-items-center univer-justify-between univer-gap-6 univer-rounded univer-px-2 univer-text-sm dark:hover:univer-bg-gray-700 hover:univer-bg-gray-100",
+      className: "univer-flex univer-h-7 univer-items-center univer-justify-between univer-gap-6 univer-rounded univer-px-2 univer-text-sm dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-100",
       onClick: () => {
         o(u);
       },
       children: [
-        /* @__PURE__ */ m("span", { children: t.t(c.label) }),
-        /* @__PURE__ */ m("span", { className: "univer-text-xs univer-text-gray-500", children: c.pattern ? wt(c.pattern || "", a, n.local).result.trim() : "" })
+        /* @__PURE__ */ m("span", { children: t.t(a.label) }),
+        /* @__PURE__ */ m("span", { className: "univer-text-xs univer-text-gray-500", children: a.pattern ? Rt(a.pattern || "", c, n.local).result.trim() : "" })
       ]
     },
     u
   )) });
-}, Xn = {
-  [qt.FORMULAS_INSERT]: {
+}, qn = {
+  [Jt.FORMULAS]: {
     [Xe.id]: {
-      order: 4,
-      menuItemFactory: Vn
+      order: 0,
+      menuItemFactory: Wn
     },
     [ze.id]: {
-      order: 5,
-      menuItemFactory: Wn
+      order: 1,
+      menuItemFactory: Gn
     },
     [Ye.id]: {
-      order: 6,
-      menuItemFactory: Gn
+      order: 2,
+      menuItemFactory: Kn
     },
     [Ze.id]: {
-      order: 7,
-      menuItemFactory: Kn
+      order: 3,
+      menuItemFactory: Zn
     },
     [H.id]: {
-      order: 8,
-      menuItemFactory: Zn
+      order: 4,
+      menuItemFactory: Yn
     }
   }
 };
-var qn = Object.getOwnPropertyDescriptor, Jn = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? qn(t, r) : t, s = e.length - 1, o; s >= 0; s--)
+var Jn = Object.getOwnPropertyDescriptor, Qn = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? Jn(t, r) : t, s = e.length - 1, o; s >= 0; s--)
     (o = e[s]) && (i = o(i) || i);
   return i;
 }, $e = (e, t) => (r, n) => t(r, n, e);
@@ -1102,23 +1112,30 @@ let ne = class extends ie {
     super(), this._componentManager = e, this._menuManagerService = t, this._initMenu();
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(Xn), this.disposeWithMe(this._componentManager.register(ot, Yn)), this.disposeWithMe(this._componentManager.register(at, zn));
+    this._menuManagerService.mergeMenu(qn), [
+      [ot, zn],
+      [ct, Xn]
+    ].forEach(([e, t]) => {
+      this.disposeWithMe(
+        this._componentManager.register(e, t)
+      );
+    });
   }
 };
-ne = Jn([
+ne = Qn([
   $e(0, S(Qe)),
-  $e(1, Jt)
+  $e(1, Qt)
 ], ne);
-var Qn = Object.defineProperty, er = Object.getOwnPropertyDescriptor, tr = (e, t, r) => t in e ? Qn(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, nr = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? er(t, r) : t, s = e.length - 1, o; s >= 0; s--)
+var er = Object.defineProperty, tr = Object.getOwnPropertyDescriptor, nr = (e, t, r) => t in e ? er(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, rr = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? tr(t, r) : t, s = e.length - 1, o; s >= 0; s--)
     (o = e[s]) && (i = o(i) || i);
   return i;
-}, fe = (e, t) => (r, n) => t(r, n, e), ct = (e, t, r) => tr(e, typeof t != "symbol" ? t + "" : t, r);
-const rr = "SHEET_NUMFMT_UI_PLUGIN";
-let re = class extends St {
+}, fe = (e, t) => (r, n) => t(r, n, e), at = (e, t, r) => nr(e, typeof t != "symbol" ? t + "" : t, r);
+const ir = "SHEET_NUMFMT_UI_PLUGIN";
+let re = class extends yt {
   constructor(e = Ue, t, r, n) {
     super(), this._config = e, this._injector = t, this._configService = r, this._renderManagerService = n;
-    const { menu: i, ...s } = yt(
+    const { menu: i, ...s } = Ct(
       {},
       Ue,
       this._config
@@ -1126,7 +1143,7 @@ let re = class extends St {
     i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig("sheets-numfmt-ui.config", s);
   }
   onStarting() {
-    Ct(this._injector, [
+    bt(this._injector, [
       [B],
       [te],
       [j],
@@ -1134,7 +1151,7 @@ let re = class extends St {
     ]);
   }
   onRendered() {
-    this._registerRenderModules(), bt(this._injector, [
+    this._registerRenderModules(), Nt(this._injector, [
       [B],
       [te],
       [ne]
@@ -1148,10 +1165,10 @@ let re = class extends St {
     });
   }
 };
-ct(re, "pluginName", rr);
-ct(re, "type", T.UNIVER_SHEET);
-re = nr([
-  _t(At, Rt),
+at(re, "pluginName", ir);
+at(re, "type", T.UNIVER_SHEET);
+re = rr([
+  St(Lt, Ot),
   fe(1, S(je)),
   fe(2, Fe),
   fe(3, Be)