@univerjs/sheets-numfmt 0.1.15 → 0.1.16

package/lib/es/index.js

@@ -1,6 +1,6 @@
 var mt = Object.defineProperty;
-var dt = (e, t, n) => t in e ? mt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
-var ie = (e, t, n) => (dt(e, typeof t != "symbol" ? t + "" : t, n), n);
+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";
@@ -19,47 +19,46 @@ const $ = {
   handler: (e, t) => {
     if (!t)
       return !1;
-    const n = e.get(O), s = e.get(D), r = e.get(ft), i = Me(s, t);
-    if (!i)
-      return !1;
-    const { unitId: o, subUnitId: a } = i, l = t.values.filter((f) => !!f.pattern), u = t.values.filter((f) => !f.pattern), m = Fe(o, a, l), c = {
+    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: a,
-      ranges: u.map((f) => ({
-        startColumn: f.col,
-        startRow: f.row,
-        endColumn: f.col,
-        endRow: f.row
+      subUnitId: c,
+      ranges: f.map((h) => ({
+        startColumn: h.col,
+        startRow: h.row,
+        endColumn: h.col,
+        endRow: h.row
       }))
-    }, h = [], g = [];
-    if (l.length) {
-      Object.keys(m.values).forEach((p) => {
-        const _ = m.values[p];
-        _.ranges = Le(_.ranges);
-      }), h.push({
+    }, 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 f = We(e, m);
-      g.push(...f);
+      const h = We(e, m);
+      p.push(...h);
     }
-    if (u.length) {
-      c.ranges = Le(c.ranges), h.push({
+    if (f.length) {
+      l.ranges = Le(l.ranges), u.push({
         id: pe.id,
-        params: c
+        params: l
       });
-      const f = ke(e, c);
-      g.push(...f);
+      const h = ke(e, l);
+      p.push(...h);
     }
-    const v = ht(h, n).result;
-    return v && r.pushUndoRedo({
+    const _ = ht(u, s).result;
+    return _ && r.pushUndoRedo({
       unitID: o,
-      undoMutations: g,
-      redoMutations: h
-    }), v;
+      undoMutations: p,
+      redoMutations: u
+    }), _;
   }
-}, Ee = "SHEET_NUMFMT_PLUGIN", me = (e) => x.getInfo(e).type || "unknown", we = (e, t, n) => {
-  const s = x.getInfo(e), r = n === pt.ZH_CN ? "zh-CN" : "en", i = s._partitions[1], o = x.format(e, t, { locale: r });
+}, 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 });
   return t < 0 ? {
     result: o,
     color: i.color
@@ -67,50 +66,50 @@ const $ = {
     result: o
   };
 };
-var Kt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, qt = (e, t, n, s) => {
-  for (var r = s > 1 ? void 0 : s ? Yt(t, n) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (s ? o(t, n, r) : o(r)) || r);
-  return s && r && Kt(t, n, r), r;
-}, A = (e, t) => (n, s) => t(n, s, e);
+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);
 let oe = class extends z {
-  constructor(e, t, n, s, r, i) {
-    super(), this._instanceService = e, this._sheetInterceptorService = t, this._themeService = n, this._commandService = s, this._numfmtService = r, this._localeService = i, this._initInterceptorCellContent();
+  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();
   }
   _initInterceptorCellContent() {
     const e = new vt();
     this.disposeWithMe(this._sheetInterceptorService.intercept(Ge.CELL_CONTENT, {
-      handler: (t, n, s) => {
-        const r = n.unitId, i = n.subUnitId, o = this._numfmtService.getValue(r, i, n.row, n.col);
+      handler: (t, s, n) => {
+        const r = s.unitId, i = s.subUnitId, o = this._numfmtService.getValue(r, i, s.row, s.col);
         if (!o)
-          return s(t);
-        const a = t;
-        if (!a || a.t !== V.NUMBER)
-          return s(t);
-        let l = "";
-        const u = e.getValue(n.row, n.col);
-        if (u && u.parameters === a.v)
-          return s({ ...t, ...u.result });
-        const m = we(o.pattern, Number(a.v), this._localeService.getCurrentLocale());
-        if (l = m.result, !l)
-          return s(t);
-        const c = { v: l };
+          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);
+        if (f && f.parameters === c.v)
+          return n({ ...t, ...f.result });
+        const m = we(o.pattern, Number(c.v), this._localeService.getCurrentLocale());
+        if (a = m.result, !a)
+          return n(t);
+        const l = { v: a };
         if (m.color) {
-          const h = this._themeService.getCurrentTheme()[`${m.color}500`];
-          h && (c.interceptorStyle = { cl: { rgb: h } });
+          const u = this._themeService.getCurrentTheme()[`${m.color}500`];
+          u && (l.interceptorStyle = { cl: { rgb: u } });
         }
-        return e.setValue(n.row, n.col, {
-          result: c,
-          parameters: a.v
-        }), s({ ...t, ...c });
+        return e.setValue(s.row, s.col, {
+          result: l,
+          parameters: c.v
+        }), n({ ...t, ...l });
       },
       priority: 10
     })), this.disposeWithMe(this._commandService.onCommandExecuted((t) => {
       if (t.id === Y.id) {
-        const n = t.params;
-        Object.keys(n.values).forEach((s) => {
-          n.values[s].ranges.forEach((i) => {
-            R.foreach(i, (o, a) => {
-              e.realDeleteValue(o, a);
+        const s = t.params;
+        Object.keys(s.values).forEach((n) => {
+          s.values[n].ranges.forEach((i) => {
+            R.foreach(i, (o, c) => {
+              e.realDeleteValue(o, c);
             });
           });
         });
@@ -118,8 +117,8 @@ let oe = class extends z {
     })), this.disposeWithMe(
       this._instanceService.getCurrentTypeOfUnit$(T.UNIVER_SHEET).pipe(
         xt((t) => {
-          var n;
-          return (n = t == null ? void 0 : t.activeSheet$) != null ? n : Ot(null);
+          var s;
+          return (s = t == null ? void 0 : t.activeSheet$) != null ? s : Ot(null);
         }),
         jt(1)
       ).subscribe(() => e.reset())
@@ -136,68 +135,67 @@ oe = qt([
   A(5, S(E))
 ], oe);
 const j = (e, t = 0) => {
-  var s;
-  return e && (s = x.getInfo(e).maxDecimals) != null ? s : t;
+  var n;
+  return e && (n = x.getInfo(e).maxDecimals) != null ? n : t;
 }, ve = (e, t) => {
   if (e && !t || !e && t)
     return !1;
-  const n = (u) => u.reduce(
-    (m, c) => {
+  const s = (f) => f.reduce(
+    (m, l) => {
       if (m.isEnd)
         return m;
-      const h = c.value || c.num;
-      return c.type === "point" ? (m.isEnd = !0, m) : { ...m, result: m.result + h };
+      const u = l.value || l.num;
+      return l.type === "point" ? (m.isEnd = !0, m) : { ...m, result: m.result + u };
     },
     { isEnd: !1, result: "" }
-  ).result, s = x.getInfo(e)._partitions, r = x.getInfo(t)._partitions, i = n(s[0].tokens), o = n(r[0].tokens), a = n(s[1].tokens), l = n(r[1].tokens);
-  return i === o && a === l && s[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((s) => /\.0?/.test(s) ? s.replace(
+  ).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(
   /\.0*/g,
   `${t > 0 ? "." : ""}${Ve(Number(t || 0))}`
-) : /0([^0]?)|0$/.test(s) ? s.replace(
+) : /0([^0]?)|0$/.test(n) ? n.replace(
   /0([^0]+)|0$/,
   `0${t > 0 ? "." : ""}${Ve(Number(t || 0))}$1`
-) : s).join(";"), Jt = (e) => /\.0?/.test(e) || /0([^0]?)|0$/.test(e), qe = {
+) : n).join(";"), Jt = (e) => /\.0?/.test(e) || /0([^0]?)|0$/.test(e), qe = {
   id: "sheet.command.numfmt.add.decimal.command",
   type: w.COMMAND,
   handler: async (e) => {
-    const t = e.get(O), n = e.get(U), s = e.get(H), r = e.get(D), i = n.getSelections();
+    const t = e.get(O), s = e.get(U), n = e.get(H), r = e.get(D), i = s.getSelections();
     if (!i || !i.length)
       return !1;
     const o = Me(r);
-    if (!o)
-      return !1;
-    const { unitId: a, subUnitId: l } = o;
-    let u = 0;
-    i.forEach((g) => {
-      R.foreach(g.range, (v, f) => {
-        const p = s.getValue(a, l, v, f);
-        if (!p)
+    if (!o) return !1;
+    const { unitId: c, subUnitId: a } = o;
+    let f = 0;
+    i.forEach((p) => {
+      R.foreach(p.range, (_, h) => {
+        const v = n.getValue(c, a, _, h);
+        if (!v)
           return;
-        const _ = j(p.pattern);
-        u = _ > u ? _ : u;
+        const g = j(v.pattern);
+        f = g > f ? g : f;
       });
     });
-    const m = u + 1, c = C(`0${m > 0 ? ".0" : ""}`, m), h = [];
-    return i.forEach((g) => {
-      R.foreach(g.range, (v, f) => {
-        const p = s.getValue(a, l, v, f);
-        if (!p)
-          h.push({
-            row: v,
-            col: f,
-            pattern: c
+    const m = f + 1, l = C(`0${m > 0 ? ".0" : ""}`, m), u = [];
+    return i.forEach((p) => {
+      R.foreach(p.range, (_, h) => {
+        const v = n.getValue(c, a, _, h);
+        if (!v)
+          u.push({
+            row: _,
+            col: h,
+            pattern: l
           });
         else {
-          const _ = j(p.pattern), b = C(p.pattern, _ + 1);
-          b !== p.pattern && h.push({
-            row: v,
-            col: f,
+          const g = j(v.pattern), b = C(v.pattern, g + 1);
+          b !== v.pattern && u.push({
+            row: _,
+            col: h,
             pattern: b
           });
         }
       });
-    }), h.length ? await t.executeCommand($.id, { values: h }) : !1;
+    }), u.length ? await t.executeCommand($.id, { values: u }) : !1;
   }
 }, Zt = [
   {
@@ -304,13 +302,13 @@ const j = (e, t = 0) => {
   id: "sheet.command.numfmt.set.currency",
   type: w.COMMAND,
   handler: async (e) => {
-    const t = e.get(O), s = e.get(U).getSelections();
-    if (!s || !s.length)
+    const t = e.get(O), n = e.get(U).getSelections();
+    if (!n || !n.length)
       return !1;
     const r = [], i = Je[0].suffix("¥");
-    return s.forEach((a) => {
-      R.foreach(a.range, (l, u) => {
-        r.push({ row: l, col: u, pattern: i, type: "currency" });
+    return n.forEach((c) => {
+      R.foreach(c.range, (a, f) => {
+        r.push({ row: a, col: f, pattern: i, type: "currency" });
       });
     }), await t.executeCommand($.id, { values: r });
   }
@@ -318,43 +316,42 @@ const j = (e, t = 0) => {
   id: "sheet.command.numfmt.subtract.decimal.command",
   type: w.COMMAND,
   handler: async (e) => {
-    const t = e.get(O), n = e.get(U), s = e.get(H), r = e.get(D), i = n.getSelections();
+    const t = e.get(O), s = e.get(U), n = e.get(H), r = e.get(D), i = s.getSelections();
     if (!i || !i.length)
       return !1;
     const o = Me(r);
-    if (!o)
-      return !1;
-    const { unitId: a, subUnitId: l } = o;
-    let u = 0;
-    i.forEach((v) => {
-      R.foreach(v.range, (f, p) => {
-        const _ = s.getValue(a, l, f, p);
-        if (!_)
+    if (!o) return !1;
+    const { unitId: c, subUnitId: a } = o;
+    let f = 0;
+    i.forEach((_) => {
+      R.foreach(_.range, (h, v) => {
+        const g = n.getValue(c, a, h, v);
+        if (!g)
           return;
-        const b = j(_.pattern);
-        u = b > u ? b : u;
+        const b = j(g.pattern);
+        f = b > f ? b : f;
       });
     });
-    const m = u - 1, c = C(`0${m > 0 ? ".0" : "."}`, m), h = [];
-    return i.forEach((v) => {
-      R.foreach(v.range, (f, p) => {
-        const _ = s.getValue(a, l, f, p);
-        if (!_)
-          h.push({
-            row: f,
-            col: p,
-            pattern: c
+    const m = f - 1, l = C(`0${m > 0 ? ".0" : "."}`, m), u = [];
+    return i.forEach((_) => {
+      R.foreach(_.range, (h, v) => {
+        const g = n.getValue(c, a, h, v);
+        if (!g)
+          u.push({
+            row: h,
+            col: v,
+            pattern: l
           });
         else {
-          const b = j(_.pattern);
-          h.push({
-            row: f,
-            col: p,
-            pattern: C(_.pattern, b - 1)
+          const b = j(g.pattern);
+          u.push({
+            row: h,
+            col: v,
+            pattern: C(g.pattern, b - 1)
           });
         }
       });
-    }), await t.executeCommand($.id, { values: h });
+    }), await t.executeCommand($.id, { values: u });
   }
 }, ye = {
   id: "sheet.operation.close.numfmt.panel",
@@ -381,14 +378,11 @@ var Xe = { exports: {} }, _e = {};
  * 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, n) {
-  var s, r = {}, i = null, o = null;
-  n !== void 0 && (i = "" + n), t.key !== void 0 && (i = "" + t.key), t.ref !== void 0 && (o = t.ref);
-  for (s in t)
-    nn.call(t, s) && !rn.hasOwnProperty(s) && (r[s] = t[s]);
-  if (e && e.defaultProps)
-    for (s in t = e.defaultProps, t)
-      r[s] === void 0 && (r[s] = t[s]);
+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 };
 }
 _e.Fragment = tn;
@@ -425,11 +419,11 @@ const Ue = kt([]), Ne = [
   "₾",
   "₿"
 ];
-var on = Object.defineProperty, cn = Object.getOwnPropertyDescriptor, an = (e, t, n, s) => {
-  for (var r = s > 1 ? void 0 : s ? cn(t, n) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (s ? o(t, n, r) : o(r)) || r);
-  return s && r && on(t, n, r), r;
-}, ln = (e, t) => (n, s) => t(n, s, e);
+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);
 let fe = class {
   constructor(e) {
     this._localStorageService = e;
@@ -438,37 +432,37 @@ let fe = class {
     return `userHabitController_${e}`;
   }
   async addHabit(e, t) {
-    const n = this._getKey(e);
-    return this._localStorageService.getItem(n).then((s) => {
-      s || this._localStorageService.setItem(n, t);
+    const s = this._getKey(e);
+    return this._localStorageService.getItem(s).then((n) => {
+      n || this._localStorageService.setItem(s, t);
     });
   }
   markHabit(e, t) {
-    const n = this._getKey(e);
-    this._localStorageService.getItem(n).then((s) => {
-      if (s) {
-        const r = s.findIndex((i) => i === t);
-        r > -1 && s.splice(r, 1), s.unshift(t), this._localStorageService.setItem(n, s);
+    const s = this._getKey(e);
+    this._localStorageService.getItem(s).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);
       }
     });
   }
   async getHabit(e, t) {
-    const n = this._getKey(e), s = await this._localStorageService.getItem(n);
-    if (t && s) {
-      const r = s.map((i, o, a) => {
-        const l = a.length;
+    const s = this._getKey(e), n = await this._localStorageService.getItem(s);
+    if (t && n) {
+      const r = n.map((i, o, c) => {
+        const a = c.length;
         return {
           value: i,
-          priority: l - o
+          priority: a - o
         };
       });
       return t.sort((i, o) => {
-        var u, m;
-        const a = ((u = r.find((c) => c.value === i)) == null ? void 0 : u.priority) || -1;
-        return (((m = r.find((c) => c.value === o)) == null ? void 0 : m.priority) || -1) - a;
+        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;
       });
     }
-    return s || [];
+    return n || [];
   }
   deleteHabit(e) {
     this._localStorageService.removeItem(e);
@@ -478,204 +472,204 @@ fe = an([
   ln(0, S(gt))
 ], fe);
 const Be = "numfmtCurrency", un = (e) => {
-  const t = N(fe), [n, s] = I(Ne);
+  const t = N(fe), [s, n] = I(Ne);
   return xe(() => {
     t.addHabit("numfmtCurrency", []).then(() => {
       t.getHabit(Be, [...Ne]).then((i) => {
-        s(i), e && e(i);
+        n(i), e && e(i);
       });
     });
-  }, []), { userHabitCurrency: n, mark: (i) => {
+  }, []), { userHabitCurrency: s, mark: (i) => {
     t.markHabit(Be, i);
   } };
 }, mn = () => {
-  const e = Ke([]), [t, n] = I({});
+  const e = Ke([]), [t, s] = I({});
   return xe(() => {
     e.current.forEach((r) => {
       r();
     }), e.current = [];
   }, [t]), (r) => {
-    e.current.push(r), n({});
+    e.current.push(r), s({});
   };
-}, re = (e) => Ne.find((n) => e.includes(n)), dn = (e) => !!re(e) && e.startsWith("_("), fn = (e) => {
-  const [t, n] = I(() => j(e.defaultPattern || "", 2)), s = Ye(Ue), [r, i] = I(() => re(e.defaultPattern) || s[0]), o = P(() => s.map((c) => ({ label: c, value: c })), []), l = N(E).t;
+}, 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);
-  const u = (c) => {
-    i(c), e.onChange(C(`_("${c}"* #,##0${t > 0 ? ".0" : ""}_)`, t));
-  }, m = (c) => {
-    const h = c || 0;
-    n(h), e.onChange(C(`_("${r}"* #,##0${h > 0 ? ".0" : ""}_)`, h));
+  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));
   };
   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: l("sheet.numfmt.decimalLength") }),
+        /* @__PURE__ */ d.jsx("div", { className: "label", children: a("sheet.numfmt.decimalLength") }),
         /* @__PURE__ */ d.jsx("div", { className: "m-t-8 w-120", children: /* @__PURE__ */ d.jsx(Oe, { value: t, max: 20, min: 0, onChange: m }) })
       ] }),
       /* @__PURE__ */ d.jsxs("div", { className: "option", children: [
-        /* @__PURE__ */ d.jsx("div", { className: "label", children: l("sheet.numfmt.currencyType") }),
-        /* @__PURE__ */ d.jsx("div", { className: "m-t-8 w-140", children: /* @__PURE__ */ d.jsx(je, { onChange: u, options: o, value: r }) })
+        /* @__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: "describe m-t-14", children: l("sheet.numfmt.accountingDes") })
+    /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: a("sheet.numfmt.accountingDes") })
   ] });
 }, Ce = (e) => Je.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 n = N(E).t, s = Ye(Ue), [r, i] = I(() => re(e.defaultPattern) || s[0]), [o, a] = I(() => j(e.defaultPattern || "", 2)), [l, u] = I(() => {
-    var _;
-    const f = Ce(r);
-    return ((_ = f.find((b) => ve(b.value, e.defaultPattern))) == null ? void 0 : _.value) || f[0].value;
-  }), m = P(() => Ce(r), [r]), c = P(() => s.map((f) => ({ label: f, value: f })), [s]);
-  e.action.current = () => C(l, o);
-  const h = (f) => {
-    i(f);
-    const p = Ce(f)[0].value;
-    u(p), e.onChange(C(p, o));
-  }, g = (f) => {
-    u(f), e.onChange(C(f, o));
-  }, v = (f) => {
-    a(f || 0), e.onChange(C(l, f || 0));
+  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(() => {
+    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]);
+  e.action.current = () => C(a, o);
+  const u = (h) => {
+    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) => {
+    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: n("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: v }) })
+        /* @__PURE__ */ d.jsx("div", { className: "label", children: s("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: n("sheet.numfmt.currencyType") }),
-        /* @__PURE__ */ d.jsx("div", { className: "m-t-8 w-140", children: /* @__PURE__ */ d.jsx(je, { onChange: h, options: c, value: r }) })
+        /* @__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: "m-t-16 label", children: n("sheet.numfmt.negType") }),
-    /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx($e, { onChange: g, options: m, value: l }) }),
-    /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: n("sheet.numfmt.currencyDes") })
+    /* @__PURE__ */ d.jsx("div", { className: "m-t-16 label", children: s("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") })
   ] });
 }, vn = (e) => {
   const t = x.getInfo(e);
-  return tt().map((n) => n.value).includes(e) || ["date", "datetime", "time"].includes(t.type);
+  return tt().map((s) => s.value).includes(e) || ["date", "datetime", "time"].includes(t.type);
 }, _n = (e) => {
-  const t = P(tt, []), s = N(E).t, [r, i] = I(() => {
+  const t = P(tt, []), n = N(E).t, [r, i] = I(() => {
     if (e.defaultPattern) {
-      const a = t.find((l) => l.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 = () => r;
-  const o = (a) => {
-    i(a), e.onChange(a);
+  const o = (c) => {
+    i(c), e.onChange(c);
   };
   return /* @__PURE__ */ d.jsxs("div", { children: [
-    /* @__PURE__ */ d.jsx("div", { className: "m-t-16 label", children: s("sheet.numfmt.dateType") }),
+    /* @__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: "describe m-t-14", children: s("sheet.numfmt.dateDes") })
+    /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: n("sheet.numfmt.dateDes") })
   ] });
 }, gn = (e) => !e, Sn = (e) => {
-  const n = N(E).t;
-  return e.action.current = () => "", /* @__PURE__ */ d.jsx("div", { children: /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: n("sheet.numfmt.generalDes") }) });
+  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), n = P(nt, []), [s, r] = I(() => j(e.defaultPattern || "", 0)), [i, o] = I(() => {
-    const c = n.find((h) => ve(h.value, e.defaultPattern || ""));
-    return (c == null ? void 0 : c.value) || n[0].value;
-  }), a = P(() => C(i, Number(s || 0)), [i, s]), l = P(() => !Jt(i), [i]), u = (c) => {
-    r(c || 0), e.onChange(C(i, Number(c || 0)));
-  }, m = (c) => {
-    r(j(c, 0)), o(c), e.onChange(c);
+  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)));
+  }, m = (l) => {
+    r(j(l, 0)), o(l), e.onChange(l);
   };
-  return e.action.current = () => a, /* @__PURE__ */ d.jsxs("div", { children: [
+  return e.action.current = () => c, /* @__PURE__ */ d.jsxs("div", { children: [
     /* @__PURE__ */ d.jsx("div", { className: "m-t-16 label", children: t.t("sheet.numfmt.decimalLength") }),
     /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx(
       Oe,
       {
-        disabled: l,
-        value: s,
+        disabled: a,
+        value: n,
         max: 20,
         min: 0,
-        onChange: u
+        onChange: f
       }
     ) }),
     /* @__PURE__ */ d.jsxs("div", { className: "m-t-16 label", children: [
       " ",
       t.t("sheet.numfmt.negType")
     ] }),
-    /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx($e, { onChange: m, options: n, value: i }) }),
+    /* @__PURE__ */ d.jsx("div", { className: "m-t-8", children: /* @__PURE__ */ d.jsx($e, { onChange: m, options: s, value: i }) }),
     /* @__PURE__ */ d.jsx("div", { className: "describe m-t-14", children: t.t("sheet.numfmt.thousandthPercentileDes") })
   ] });
 }, Cn = (e) => {
-  const { defaultValue: t, defaultPattern: n, row: s, col: r } = e.value, i = N(E), o = Ke(() => ""), a = i.t, l = mn(), u = P(
+  const { defaultValue: t, defaultPattern: s, row: n, col: r } = e.value, i = N(E), o = Ke(() => ""), c = i.t, a = mn(), 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 }
-    ].map((y) => ({ ...y, label: a(y.label) })),
+    ].map((y) => ({ ...y, label: c(y.label) })),
     []
-  ), [m, c] = I(_), [h, g] = I(() => `${s}_${r}`), { mark: v, userHabitCurrency: f } = un(() => g(`${s}_${r}_userCurrency'`)), p = P(() => {
+  ), [m, l] = I(g), [u, p] = I(() => `${n}_${r}`), { mark: _, userHabitCurrency: h } = un(() => p(`${n}_${r}_userCurrency'`)), v = P(() => {
     var y;
-    return (y = u.find((L) => L.label === m)) == null ? void 0 : y.component;
+    return (y = f.find((L) => L.label === m)) == null ? void 0 : y.component;
   }, [m]);
-  function _() {
-    return [gn, dn, hn, vn, bn].reduce((L, lt, ut) => L || (lt(n) ? u[ut].label : ""), "") || u[0].label;
+  function g() {
+    return [gn, dn, hn, vn, bn].reduce((L, lt, ut) => L || (lt(s) ? f[ut].label : ""), "") || f[0].label;
   }
-  const b = u.map((y) => ({
+  const b = f.map((y) => ({
     label: y.label,
     value: y.label
   })), F = (y) => {
-    c(y), l(() => e.onChange({ type: "change", value: o.current() || "" }));
+    l(y), a(() => e.onChange({ type: "change", value: o.current() || "" }));
   }, ge = (y) => {
     e.onChange({ type: "change", value: y });
   }, Se = () => {
     const y = o.current() || "", L = re(y);
-    L && v(L), e.onChange({ type: "confirm", value: y });
+    L && _(L), e.onChange({ type: "confirm", value: y });
   }, be = () => {
     e.onChange({ type: "cancel", value: "" });
   }, at = {
     onChange: ge,
     defaultValue: t,
-    defaultPattern: n,
+    defaultPattern: s,
     action: o
   };
   return xe(() => {
-    c(_()), g(`${s}_${r}`);
-  }, [s, r]), /* @__PURE__ */ d.jsxs("div", { className: "numfmt-panel p-b-20", children: [
+    l(g()), p(`${n}_${r}`);
+  }, [n, r]), /* @__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: a("sheet.numfmt.numfmtType") }),
+      /* @__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: p && /* @__PURE__ */ d.jsx(Ue.Provider, { value: f, children: /* @__PURE__ */ Gt(p, { ...at, key: h }) }) })
+      /* @__PURE__ */ d.jsx("div", { children: v && /* @__PURE__ */ d.jsx(Ue.Provider, { value: h, children: /* @__PURE__ */ Gt(v, { ...at, 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: a("sheet.numfmt.cancel") }),
-      /* @__PURE__ */ d.jsx(Ae, { type: "primary", size: "small", onClick: Se, children: a("sheet.numfmt.confirm") })
+      /* @__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") })
     ] })
   ] });
 }, st = {
   id: "sheet.command.numfmt.set.percent",
   type: w.COMMAND,
   handler: async (e) => {
-    const t = e.get(O), s = e.get(U).getSelections();
-    if (!s || !s.length)
+    const t = e.get(O), n = e.get(U).getSelections();
+    if (!n || !n.length)
       return !1;
     const r = [], i = "0%";
-    return s.forEach((a) => {
-      R.foreach(a.range, (l, u) => {
-        r.push({ row: l, col: u, pattern: i, type: "percent" });
+    return n.forEach((c) => {
+      R.foreach(c.range, (a, f) => {
+        r.push({ row: a, col: f, pattern: i, type: "percent" });
       });
     }), await t.executeCommand($.id, { values: r });
   }
 };
-var Tn = Object.defineProperty, In = Object.getOwnPropertyDescriptor, En = (e, t, n, s) => {
-  for (var r = s > 1 ? void 0 : s ? In(t, n) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (s ? o(t, n, r) : o(r)) || r);
-  return s && r && Tn(t, n, r), r;
-}, M = (e, t) => (n, s) => t(n, s, e);
+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);
 let ce = class extends z {
-  constructor(t, n, s, r, i, o, a, l, u, m) {
+  constructor(t, s, n, r, i, o, c, a, f, m) {
     super();
     /**
      * If _previewPattern is null ,the realTimeRenderingInterceptor will skip and if it is '',realTimeRenderingInterceptor will clear numfmt.
@@ -685,59 +679,61 @@ let ce = class extends z {
      */
     ie(this, "_previewPattern", "");
     ie(this, "_sidebarDisposable", null);
-    this._sheetInterceptorService = t, this._themeService = n, this._univerInstanceService = s, this._commandService = r, this._selectionManagerService = i, this._renderManagerService = o, this._numfmtService = a, this._componentManager = l, this._sidebarService = u, this._localeService = m, this._initRealTimeRenderingInterceptor(), this._initPanel(), this._initCommands(), this._initCloseListener(), this._commandExecutedListener();
+    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();
   }
   openPanel() {
-    const t = this._sidebarService, n = this._selectionManagerService, s = this._commandService, r = this._univerInstanceService, i = this._numfmtService, o = this._localeService, l = (n.getSelectionRanges() || [])[0];
-    if (!l)
+    const t = this._sidebarService, s = this._selectionManagerService, n = this._commandService, r = this._univerInstanceService, i = this._numfmtService, o = this._localeService, a = (s.getSelectionRanges() || [])[0];
+    if (!a)
+      return !1;
+    const f = r.getCurrentUnitForType(T.UNIVER_SHEET), m = f.getActiveSheet();
+    if (!m)
       return !1;
-    const u = r.getCurrentUnitForType(T.UNIVER_SHEET), m = u.getActiveSheet(), c = m.getCellRaw(l.startRow, l.startColumn), h = i.getValue(
-      u.getUnitId(),
+    const l = m.getCellRaw(a.startRow, a.startColumn), u = i.getValue(
+      f.getUnitId(),
       m.getSheetId(),
-      l.startRow,
-      l.startColumn
+      a.startRow,
+      a.startColumn
     );
-    let g = "";
-    h && (g = h.pattern);
-    const v = (c == null ? void 0 : c.t) === V.NUMBER ? c.v : 12345678, f = {
-      onChange: (p) => {
-        if (p.type === "change")
-          this._previewPattern = p.value, this._forceUpdate();
-        else if (p.type === "confirm") {
-          const _ = n.getSelectionRanges() || [], b = { values: [] }, F = me(p.value);
-          _.forEach((ge) => {
+    let p = "";
+    u && (p = u.pattern);
+    const _ = (l == null ? void 0 : l.t) === V.NUMBER ? l.v : 12345678, h = {
+      onChange: (v) => {
+        if (v.type === "change")
+          this._previewPattern = v.value, this._forceUpdate();
+        else if (v.type === "confirm") {
+          const g = s.getSelectionRanges() || [], b = { values: [] }, F = me(v.value);
+          g.forEach((ge) => {
             R.foreach(ge, (Se, be) => {
               b.values.push({
                 row: Se,
                 col: be,
-                pattern: p.value,
+                pattern: v.value,
                 type: F
               });
             });
-          }), s.executeCommand($.id, b), t.close();
-        } else
-          p.type === "cancel" && t.close();
+          }), n.executeCommand($.id, b), t.close();
+        } else v.type === "cancel" && t.close();
       },
-      value: { defaultPattern: g, defaultValue: v, row: l.startRow, col: l.startColumn }
+      value: { defaultPattern: p, defaultValue: _, row: a.startRow, col: a.startColumn }
     };
     return this._sidebarDisposable = t.open({
       header: { title: o.t("sheet.numfmt.title") },
       children: {
         label: Ee,
-        ...f
+        ...h
         // need passthrough to react props.
       },
       onClose: () => {
-        this._forceUpdate(), s.executeCommand(ye.id);
+        this._forceUpdate(), n.executeCommand(ye.id);
       }
     }), !0;
   }
   _forceUpdate(t) {
-    var s;
-    const n = this._renderManagerService.getRenderById(
+    var n;
+    const s = this._renderManagerService.getRenderById(
       t != null ? t : this._univerInstanceService.getCurrentUnitForType(T.UNIVER_SHEET).getUnitId()
     );
-    n == null || n.with(Nt).reCalculate(), (s = n == null ? void 0 : n.mainComponent) == null || s.makeDirty();
+    s == null || s.with(Nt).reCalculate(), (n = s == null ? void 0 : s.mainComponent) == null || n.makeDirty();
   }
   _initCommands() {
     [
@@ -756,23 +752,23 @@ let ce = class extends z {
     this._componentManager.register(Ee, Cn);
   }
   _initRealTimeRenderingInterceptor() {
-    const t = new k((s) => {
+    const t = new k((n) => {
       this._commandService.onCommandExecuted((r) => {
-        r.id === de.id && s.next(!0), r.id === ye.id && s.next(!1);
+        r.id === de.id && n.next(!0), r.id === ye.id && n.next(!1);
       });
-    }), n = $t([
+    }), s = $t([
       t,
       this._selectionManagerService.selectionMoveEnd$.pipe(
-        Vt((s) => s ? s.map((r) => r.range) : [])
+        Vt((n) => n ? n.map((r) => r.range) : [])
       )
     ]);
     this.disposeWithMe(
       Ie(
-        n.pipe(
+        s.pipe(
           Bt(
-            ([s, r]) => new k((i) => {
+            ([n, r]) => new k((i) => {
               const o = new St();
-              return s && r.length && i.next({ selectionRanges: r, disposableCollection: o }), () => {
+              return n && r.length && i.next({ selectionRanges: r, disposableCollection: o }), () => {
                 o.dispose();
               };
             })
@@ -780,40 +776,40 @@ let ce = class extends z {
           Ht(() => {
             this._previewPattern = null;
           })
-        ).subscribe(({ disposableCollection: s, selectionRanges: r }) => {
-          var o, a;
+        ).subscribe(({ disposableCollection: n, selectionRanges: r }) => {
+          var o, c;
           const i = this._univerInstanceService.getCurrentUnitForType(T.UNIVER_SHEET);
-          this.openPanel(), s.add(
+          this.openPanel(), n.add(
             this._sheetInterceptorService.intercept(Ge.CELL_CONTENT, {
               priority: 99,
-              handler: (l, u, m) => {
-                const { row: c, col: h } = u, g = m(l) || {};
+              handler: (a, f, m) => {
+                const { row: l, col: u } = f, p = m(a) || {};
                 if (r.find(
-                  (v) => v.startColumn <= h && v.endColumn >= h && v.startRow <= c && v.endRow >= c
+                  (_) => _.startColumn <= u && _.endColumn >= u && _.startRow <= l && _.endRow >= l
                 )) {
-                  const v = u.worksheet.getCellRaw(c, h), f = v == null ? void 0 : v.v, p = v == null ? void 0 : v.t;
-                  if (f == null || p !== V.NUMBER || this._previewPattern === null)
-                    return g;
-                  const _ = we(this._previewPattern, f, this._localeService.getCurrentLocale());
-                  if (_.color) {
-                    const F = this._themeService.getCurrentTheme()[`${_.color}500`];
+                  const _ = f.worksheet.getCellRaw(l, u), h = _ == null ? void 0 : _.v, v = _ == null ? void 0 : _.t;
+                  if (h == null || v !== V.NUMBER || this._previewPattern === null)
+                    return p;
+                  const g = we(this._previewPattern, h, this._localeService.getCurrentLocale());
+                  if (g.color) {
+                    const F = this._themeService.getCurrentTheme()[`${g.color}500`];
                     return {
-                      ...g,
-                      v: _.result,
+                      ...p,
+                      v: g.result,
                       t: V.STRING,
                       s: { cl: { rgb: F } }
                     };
                   }
                   return {
-                    ...g,
-                    v: _.result,
+                    ...p,
+                    v: g.result,
                     t: V.STRING
                   };
                 }
-                return g;
+                return p;
               }
             })
-          ), (a = (o = this._renderManagerService.getRenderById(i.getUnitId())) == null ? void 0 : o.mainComponent) == null || a.makeDirty();
+          ), (c = (o = this._renderManagerService.getRenderById(i.getUnitId())) == null ? void 0 : o.mainComponent) == null || c.makeDirty();
         })
       )
     );
@@ -821,21 +817,21 @@ let ce = class extends z {
   _commandExecutedListener() {
     const t = [pe.id, Y.id];
     this.disposeWithMe(
-      new k((n) => {
-        const s = this._commandService.onCommandExecuted((r) => {
+      new k((s) => {
+        const n = this._commandService.onCommandExecuted((r) => {
           if (t.includes(r.id)) {
             const i = r.params;
-            n.next(i.unitId);
+            s.next(i.unitId);
           }
         });
-        return () => s.dispose();
-      }).pipe(Ft(16)).subscribe((n) => this._forceUpdate(n))
+        return () => n.dispose();
+      }).pipe(Ft(16)).subscribe((s) => this._forceUpdate(s))
     );
   }
   _initCloseListener() {
     this._univerInstanceService.getCurrentTypeOfUnit$(T.UNIVER_SHEET).subscribe((t) => {
-      var n;
-      t || ((n = this._sidebarDisposable) == null || n.dispose(), this._sidebarDisposable = null);
+      var s;
+      t || ((s = this._sidebarDisposable) == null || s.dispose(), this._sidebarDisposable = null);
     });
   }
 };
@@ -852,15 +848,15 @@ ce = En([
   M(8, Lt),
   M(9, S(E))
 ], ce);
-var Nn = Object.defineProperty, Mn = Object.getOwnPropertyDescriptor, Pn = (e, t, n, s) => {
-  for (var r = s > 1 ? void 0 : s ? Mn(t, n) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (s ? o(t, n, r) : o(r)) || r);
-  return s && r && Nn(t, n, r), r;
-}, W = (e, t) => (n, s) => t(n, s, e);
+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 = () => {
   let e = [];
   return {
-    add: (r, i, o, a, l) => e.push({ unitId: r, subUnitId: i, row: o, col: a, value: l }),
+    add: (r, i, o, c, a) => e.push({ unitId: r, subUnitId: i, row: o, col: c, value: a }),
     getEffects: () => e,
     clean: () => {
       e = [];
@@ -868,11 +864,11 @@ const Rn = () => {
   };
 };
 let ae = class extends z {
-  constructor(t, n, s, r, i) {
+  constructor(t, s, n, r, 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 = n, this._univerInstanceService = s, this._injector = r, this._editorBridgeService = i, this._initInterceptorEditorStart(), this._initInterceptorEditorEnd(), this._initInterceptorCommands();
+    this._sheetInterceptorService = t, this._numfmtService = s, this._univerInstanceService = n, this._injector = r, this._editorBridgeService = i, this._initInterceptorEditorStart(), this._initInterceptorEditorEnd(), this._initInterceptorCommands();
   }
   _initInterceptorEditorStart() {
     this.disposeWithMe(
@@ -880,10 +876,10 @@ let ae = class extends z {
         this._editorBridgeService.interceptor.intercept(
           this._editorBridgeService.interceptor.getInterceptPoints().BEFORE_CELL_EDIT,
           {
-            handler: (t, n, s) => {
-              const r = n.row, i = n.col, o = this._numfmtService.getValue(
-                n.unitId,
-                n.subUnitId,
+            handler: (t, s, n) => {
+              const r = s.row, i = s.col, o = this._numfmtService.getValue(
+                s.unitId,
+                s.subUnitId,
                 r,
                 i
               );
@@ -894,14 +890,14 @@ let ae = class extends z {
                   case "currency":
                   case "grouped":
                   case "number":
-                    return n.worksheet.getCellRaw(r, i);
+                    return s.worksheet.getCellRaw(r, i);
                   case "date":
                   case "time":
                   case "datetime":
                   default:
-                    return s && s(t);
+                    return n && n(t);
                 }
-              return s(t);
+              return n(t);
             }
           }
         )
@@ -919,42 +915,41 @@ let ae = class extends z {
         this._editorBridgeService.interceptor.intercept(
           this._editorBridgeService.interceptor.getInterceptPoints().AFTER_CELL_EDIT,
           {
-            handler: (t, n, s) => {
+            handler: (t, s, n) => {
               var m;
               this._collectEffectMutation.clean();
               const r = this._numfmtService.getValue(
-                n.unitId,
-                n.subUnitId,
-                n.row,
-                n.col
+                s.unitId,
+                s.subUnitId,
+                s.row,
+                s.col
               ), i = (m = r && me(r.pattern)) != null ? m : "", o = () => {
                 r && this._collectEffectMutation.add(
-                  n.unitId,
-                  n.subUnitId,
-                  n.row,
-                  n.col,
+                  s.unitId,
+                  s.subUnitId,
+                  s.row,
+                  s.col,
                   null
                 );
               };
               if (!(t != null && t.v))
-                return s(t);
-              const a = String(t.v), l = x.parseDate(a) || x.parseTime(a);
-              if (!!l) {
-                if (l && l.z) {
-                  const c = Number(l.v);
+                return n(t);
+              const c = String(t.v), a = x.parseDate(c) || x.parseTime(c);
+              if (!!a) {
+                if (a && a.z) {
+                  const l = Number(a.v);
                   return this._collectEffectMutation.add(
-                    n.unitId,
-                    n.subUnitId,
-                    n.row,
-                    n.col,
+                    s.unitId,
+                    s.subUnitId,
+                    s.row,
+                    s.col,
                     {
-                      pattern: l.z
+                      pattern: a.z
                     }
-                  ), { ...t, v: c, t: V.NUMBER };
+                  ), { ...t, v: l, t: V.NUMBER };
                 }
-              } else
-                (["date", "time", "datetime"].includes(i) || !xn(a)) && o();
-              return s(t);
+              } else (["date", "time", "datetime"].includes(i) || !xn(c)) && o();
+              return n(t);
             }
           }
         )
@@ -965,52 +960,59 @@ let ae = class extends z {
     const t = this;
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
-        getMutations(n) {
-          switch (n.id) {
+        getMutations(s) {
+          var n;
+          switch (s.id) {
             case Tt.id: {
-              const s = t._univerInstanceService.getCurrentUnitForType(T.UNIVER_SHEET), r = s.getUnitId(), i = s.getActiveSheet().getSheetId(), o = t._collectEffectMutation.getEffects();
-              if (!o.length)
+              const r = t._univerInstanceService.getCurrentUnitForType(T.UNIVER_SHEET), i = r.getUnitId(), o = (n = r.getActiveSheet()) == null ? void 0 : n.getSheetId();
+              if (!o)
+                return {
+                  redos: [],
+                  undos: []
+                };
+              const c = t._collectEffectMutation.getEffects();
+              if (!c.length)
                 return {
                   redos: [],
                   undos: []
                 };
-              const a = o.filter((c) => {
-                var h;
-                return !!((h = c.value) != null && h.pattern);
-              }).map((c) => ({
-                row: c.row,
-                col: c.col,
-                pattern: c.value.pattern
-              })), l = o.filter((c) => {
-                var h;
-                return !((h = c.value) != null && h.pattern);
-              }).map((c) => ({
-                startRow: c.row,
-                endColumn: c.col,
-                startColumn: c.col,
-                endRow: c.row
-              })), u = [], m = [];
+              const a = c.filter((u) => {
+                var p;
+                return !!((p = u.value) != null && p.pattern);
+              }).map((u) => ({
+                row: u.row,
+                col: u.col,
+                pattern: u.value.pattern
+              })), f = c.filter((u) => {
+                var p;
+                return !((p = u.value) != null && p.pattern);
+              }).map((u) => ({
+                startRow: u.row,
+                endColumn: u.col,
+                startColumn: u.col,
+                endRow: u.row
+              })), m = [], l = [];
               if (a) {
-                const c = {
+                const u = {
                   id: Y.id,
-                  params: Fe(r, i, a)
+                  params: Fe(i, o, a)
                 };
-                u.push(c), m.push(...We(t._injector, c.params));
+                m.push(u), l.push(...We(t._injector, u.params));
               }
-              if (l) {
-                const c = {
+              if (f) {
+                const u = {
                   id: pe.id,
                   params: {
-                    unitId: r,
-                    subUnitId: i,
-                    ranges: l
+                    unitId: i,
+                    subUnitId: o,
+                    ranges: f
                   }
                 };
-                u.push(c), m.push(...ke(t._injector, c.params));
+                m.push(u), l.push(...ke(t._injector, u.params));
               }
               return {
-                redos: u,
-                undos: m.reverse()
+                redos: m,
+                undos: l.reverse()
               };
             }
           }
@@ -1034,11 +1036,11 @@ ae = Pn([
 function xn(e) {
   return /^-?\d+(\.\d+)?$/.test(e);
 }
-var On = Object.defineProperty, jn = Object.getOwnPropertyDescriptor, $n = (e, t, n, s) => {
-  for (var r = s > 1 ? void 0 : s ? jn(t, n) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (s ? o(t, n, r) : o(r)) || r);
-  return s && r && On(t, n, r), r;
-}, wn = (e, t) => (n, s) => t(n, s, 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);
 let le = class extends z {
   constructor(e) {
     super(), this._localeService = e;
@@ -1102,41 +1104,41 @@ const ue = [
     pattern: ""
   }
 ], rt = "sheet.numfmt.moreNumfmtType", it = "sheet.numfmt.moreNumfmtType.options", Dn = (e) => {
-  var s;
-  const t = N(E), n = (s = e.value) != null ? s : t.t("sheet.numfmt.general");
-  return /* @__PURE__ */ d.jsx("span", { className: "more-numfmt-type", children: n });
+  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), n = zt(), s = N(U), r = (a) => {
-    const l = s.getLast();
-    if (!l)
+  const e = N(O), t = N(E), s = zt(), n = N(U), r = (c) => {
+    const a = n.getLast();
+    if (!a)
       return;
-    const u = n.get(Ut), m = l.range, c = [];
-    R.foreach(m, (h, g) => {
-      a ? c.push({ row: h, col: g, pattern: a, type: me(a) }) : c.push({ row: h, col: g });
-    }), e.executeCommand($.id, { values: c }), u.focus();
-  }, i = (a) => {
-    if (a === 0)
+    const f = s.get(Ut), 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);
-    else if (a === ue.length - 1)
+    else if (c === ue.length - 1)
       e.executeCommand(de.id);
     else {
-      const l = ue[a];
-      l.pattern && r(l.pattern);
+      const a = ue[c];
+      a.pattern && r(a.pattern);
     }
   }, o = 1220;
-  return /* @__PURE__ */ d.jsx("div", { className: "more-numfmt-type-options", children: ue.map((a, l) => a === "|" ? /* @__PURE__ */ d.jsx("div", { className: "line m-t-4", onClick: (u) => u.stopPropagation() }, l) : /* @__PURE__ */ d.jsxs(
+  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(
     "div",
     {
       className: "option-item m-t-4",
       onClick: () => {
-        i(l);
+        i(a);
       },
       children: [
-        /* @__PURE__ */ d.jsx("div", { children: t.t(a.label) }),
-        /* @__PURE__ */ d.jsx("div", { className: "m-l-26", children: a.pattern ? we(a.pattern || "", o, t.getCurrentLocale()).result : "" })
+        /* @__PURE__ */ d.jsx("div", { children: t.t(c.label) }),
+        /* @__PURE__ */ d.jsx("div", { className: "m-l-26", children: c.pattern ? we(c.pattern || "", o, t.getCurrentLocale()).result : "" })
       ]
     },
-    l
+    a
   )) });
 }, Ln = (e) => ({
   icon: "RmbSingle",
@@ -1179,27 +1181,27 @@ const ue = [
   hidden$: se(e, T.UNIVER_SHEET),
   disabled$: X(e, { workbookTypes: [q], worksheetTypes: [J, Z], rangeTypes: [Q] })
 }), Hn = (e) => {
-  const t = e.get(H), n = e.get(D), s = e.get(O), r = e.get(E), i = e.get(U), o = Pt(n, "", ({ workbook: a, worksheet: l }) => new k(
-    (u) => wt(
+  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(
       i.selectionMoveEnd$,
       new k((m) => {
-        const c = [pe.id, Y.id], h = s.onCommandExecuted((g) => {
-          c.includes(g.id) && m.next(null);
+        const l = [pe.id, Y.id], u = n.onCommandExecuted((p) => {
+          l.includes(p.id) && m.next(null);
         });
-        return () => h.dispose();
+        return () => u.dispose();
       })
     ).subscribe(() => {
       const m = i.getSelections();
       if (m && m[0]) {
-        const c = m[0].range, h = c.startRow, g = c.startColumn, v = t.getValue(a.getUnitId(), l.getSheetId(), h, g), f = v == null ? void 0 : v.pattern;
-        let p = r.t("sheet.numfmt.general");
-        if (f) {
-          const _ = ue.filter((b) => typeof b == "object" && b.pattern).find(
-            (b) => ve(f, b.pattern)
+        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");
+        if (h) {
+          const g = ue.filter((b) => typeof b == "object" && b.pattern).find(
+            (b) => ve(h, b.pattern)
           );
-          _ && typeof _ == "object" && _.pattern ? p = r.t(_.label) : p = r.t("sheet.numfmt.moreFmt");
+          g && typeof g == "object" && g.pattern ? v = r.t(g.label) : v = r.t("sheet.numfmt.moreFmt");
         }
-        u.next(p);
+        f.next(v);
       }
     })
   ));
@@ -1223,15 +1225,15 @@ const ue = [
     disabled$: X(e, { workbookTypes: [q], worksheetTypes: [Z, J], rangeTypes: [Q] })
   };
 };
-var Fn = Object.defineProperty, Wn = Object.getOwnPropertyDescriptor, kn = (e, t, n, s) => {
-  for (var r = s > 1 ? void 0 : s ? Wn(t, n) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (s ? o(t, n, r) : o(r)) || r);
-  return s && r && Fn(t, n, r), r;
-}, Te = (e, t) => (n, s) => t(n, s, e);
+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 = {};
 let G = class extends z {
-  constructor(e, t, n, s) {
-    super(), this._config = e, this._injector = t, this._componentManager = n, this._menuService = s, this._initMenu();
+  constructor(e, t, s, n) {
+    super(), this._config = e, this._injector = t, this._componentManager = s, this._menuService = n, this._initMenu();
   }
   _initMenu() {
     const { menu: e = {} } = this._config;
@@ -1246,11 +1248,11 @@ G = kn([
   Te(2, S(ze)),
   Te(3, S(At))
 ], G);
-var ot = Object.defineProperty, zn = Object.getOwnPropertyDescriptor, Kn = (e, t, n) => t in e ? ot(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, Yn = (e, t, n, s) => {
-  for (var r = s > 1 ? void 0 : s ? zn(t, n) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (r = (s ? o(t, n, r) : o(r)) || r);
-  return s && r && ot(t, n, r), r;
-}, qn = (e, t) => (n, s) => t(n, s, e), ct = (e, t, n) => (Kn(e, typeof t != "symbol" ? t + "" : t, n), n);
+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);
 let he = class extends bt {
   constructor(e = {}, t) {
     super(), this._config = e, this._injector = t, this._config = yt.deepMerge({}, Gn, this._config);