@univerjs/sheets-numfmt 0.8.0-nightly.202505261607 → 0.8.0-nightly.202505281606

package/lib/es/index.js

@@ -1,12 +1,12 @@
-var ae = Object.defineProperty;
-var le = (e, t, n) => t in e ? ae(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
-var M = (e, t, n) => le(e, typeof t != "symbol" ? t + "" : t, n);
-import { numfmt as x, CommandType as P, ICommandService as E, IUniverInstanceService as F, IUndoRedoService as ue, CellValueType as I, ObjectMatrix as b, sequenceExecute as me, Range as N, Inject as T, ThemeService as fe, LocaleService as de, IConfigService as X, Disposable as Q, LocaleType as $, InterceptorEffectEnum as K, UniverInstanceType as ee, DependentOn as ge, Injector as he, Plugin as ve, merge as pe, registerDependencies as Se, touchDependencies as z } from "@univerjs/core";
-import { getSheetCommandTarget as H, transformCellsToRange as ye, checkCellValueType as G, rangeMerge as Y, SetNumfmtMutation as te, factorySetNumfmtUndoMutation as _e, RemoveNumfmtMutation as Ce, SetRangeValuesMutation as B, factoryRemoveNumfmtUndoMutation as be, SheetsSelectionsService as j, INumfmtService as W, SheetInterceptorService as Me, INTERCEPTOR_POINT as $e, InterceptCellContentPriority as Re, UniverSheetsPlugin as Ie } from "@univerjs/sheets";
-import { isTextFormat as ne } from "@univerjs/engine-numfmt";
-import { BehaviorSubject as k, merge as Ne, switchMap as Ee, of as Te, skip as xe } from "rxjs";
+var ie = Object.defineProperty;
+var le = (e, t, r) => t in e ? ie(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
+var M = (e, t, r) => le(e, typeof t != "symbol" ? t + "" : t, r);
+import { numfmt as U, CommandType as V, ICommandService as T, IUniverInstanceService as A, IUndoRedoService as ue, CellValueType as N, ObjectMatrix as b, sequenceExecute as me, Range as I, Inject as E, ThemeService as fe, LocaleService as de, IConfigService as X, Disposable as Q, LocaleType as $, InterceptorEffectEnum as z, UniverInstanceType as ee, DependentOn as he, Injector as ge, Plugin as pe, merge as Se, registerDependencies as ve, touchDependencies as Y } from "@univerjs/core";
+import { getSheetCommandTarget as H, transformCellsToRange as ye, checkCellValueType as G, rangeMerge as Z, SetNumfmtMutation as te, factorySetNumfmtUndoMutation as _e, RemoveNumfmtMutation as Ce, SetRangeValuesMutation as B, factoryRemoveNumfmtUndoMutation as be, SheetsSelectionsService as j, INumfmtService as W, SheetInterceptorService as Me, INTERCEPTOR_POINT as $e, InterceptCellContentPriority as Re, UniverSheetsPlugin as Ne } from "@univerjs/sheets";
+import { isTextFormat as re } from "@univerjs/engine-numfmt";
+import { BehaviorSubject as K, merge as Ie, switchMap as Te, of as Ee, skip as xe } from "rxjs";
 import { stripErrorMargin as Ve } from "@univerjs/engine-formula";
-const re = [
+const ne = [
   "$",
   "£",
   "¥",
@@ -34,7 +34,7 @@ const re = [
   "₽",
   "₾",
   "₿"
-], Pe = {
+], we = {
   US: "$",
   // United States Dollar
   CA: "C$",
@@ -119,7 +119,7 @@ const re = [
     label: "08-05 下午 01:30",
     suffix: "MM-dd A/P hh:mm"
   }
-], we = [
+], Oe = [
   {
     label: "(1,235)",
     suffix: "#,##0_);(#,##0)"
@@ -175,83 +175,70 @@ const re = [
     suffix: (e) => `"${e}"#,##0.00_);[Red]-"${e}"#,##0.00`,
     color: "red"
   }
-], Oe = "SHEET_NUMFMT_PLUGIN", w = (e, t = 0) => {
-  var r;
-  return e && (r = x.getInfo(e).maxDecimals) != null ? r : t;
-}, tt = (e, t) => {
-  if (e && !t || !e && t)
-    return !1;
-  const n = (u) => u.reduce(
-    (g, v) => {
-      if (g.isEnd)
-        return g;
-      const h = v.value || v.num;
-      return v.type === "point" ? (g.isEnd = !0, g) : { ...g, result: g.result + h };
-    },
-    { isEnd: !1, result: "" }
-  ).result, r = x.getInfo(e)._partitions, s = x.getInfo(t)._partitions, o = n(r[0].tokens), c = n(s[0].tokens), i = n(r[1].tokens), m = n(s[1].tokens);
-  return o === c && i === m && r[1].color === s[1].color;
-}, q = (e) => new Array(Math.min(Math.max(0, Number(e)), 30)).fill(0).join(""), O = (e, t) => e.split(";").map((r) => /\.0?/.test(r) ? r.replace(
+], Pe = "SHEET_NUMFMT_PLUGIN", O = (e, t = 0) => {
+  var n;
+  return e && (n = U.getFormatInfo(e).maxDecimals) != null ? n : t;
+}, k = (e) => new Array(Math.min(Math.max(0, Number(e)), 30)).fill(0).join(""), P = (e, t) => e.split(";").map((n) => /\.0?/.test(n) ? n.replace(
   /\.0*/g,
-  `${t > 0 ? "." : ""}${q(Number(t || 0))}`
-) : /0([^0]?)|0$/.test(r) ? r.replace(
+  `${t > 0 ? "." : ""}${k(Number(t || 0))}`
+) : /0([^0]?)|0$/.test(n) ? n.replace(
   /0([^0]+)|0$/,
-  `0${t > 0 ? "." : ""}${q(Number(t || 0))}$1`
-) : r).join(";"), nt = (e) => /\.0?/.test(e) || /0([^0]?)|0$/.test(e), U = {
+  `0${t > 0 ? "." : ""}${k(Number(t || 0))}$1`
+) : n).join(";"), tt = (e) => /\.0?/.test(e) || /0([^0]?)|0$/.test(e), w = {
   id: "sheet.command.numfmt.set.numfmt",
-  type: P.COMMAND,
+  type: V.COMMAND,
   // eslint-disable-next-line max-lines-per-function
   handler: (e, t) => {
     if (!t)
       return !1;
-    const n = e.get(E), r = e.get(F), s = e.get(ue), o = H(r, t);
-    if (!o) return !1;
-    const { unitId: c, subUnitId: i, worksheet: m } = o, u = t.values.filter((l) => !!l.pattern), g = t.values.filter((l) => !l.pattern), v = ye(c, i, u), h = {
+    const r = e.get(T), n = e.get(A), s = e.get(ue), a = H(n, t);
+    if (!a) return !1;
+    const { unitId: c, subUnitId: l, worksheet: f } = a, u = t.values.filter((o) => !!o.pattern), y = t.values.filter((o) => !o.pattern), _ = ye(c, l, u), h = {
       unitId: c,
-      subUnitId: i,
-      ranges: g.map((l) => ({
-        startColumn: l.col,
-        startRow: l.row,
-        endColumn: l.col,
-        endRow: l.row
+      subUnitId: l,
+      ranges: y.map((o) => ({
+        startColumn: o.col,
+        startRow: o.row,
+        endColumn: o.col,
+        endRow: o.row
       }))
-    }, C = [], S = [];
+    }, C = [], p = [];
     if (u.length) {
-      const l = u.reduce((d, a) => {
-        ne(a.pattern) && d.setValue(a.row, a.col, { t: I.STRING });
-        const _ = m.getCellRaw(a.row, a.col);
-        if (_) {
-          const V = G(_.v);
-          V !== _.t && d.setValue(a.row, a.col, { t: V });
+      const o = u.reduce((m, i) => {
+        re(i.pattern) && m.setValue(i.row, i.col, { t: N.STRING });
+        const v = f.getCellRaw(i.row, i.col);
+        if (v) {
+          const x = G(v.v);
+          x !== v.t && m.setValue(i.row, i.col, { t: x });
         }
-        return d;
-      }, new b()).getMatrix(), p = new b();
-      new b(l).forValue((d, a) => {
-        const _ = m.getCellRaw(d, a);
-        _ ? p.setValue(d, a, { t: _.t }) : p.setValue(d, a, { t: void 0 });
-      }), Object.keys(v.values).forEach((d) => {
-        const a = v.values[d];
-        a.ranges = Y(a.ranges);
+        return m;
+      }, new b()).getMatrix(), g = new b();
+      new b(o).forValue((m, i) => {
+        const v = f.getCellRaw(m, i);
+        v ? g.setValue(m, i, { t: v.t }) : g.setValue(m, i, { t: void 0 });
+      }), Object.keys(_.values).forEach((m) => {
+        const i = _.values[m];
+        i.ranges = Z(i.ranges);
       }), C.push({
         id: te.id,
-        params: v
+        params: _
       });
-      const y = _e(e, v);
-      S.push(...y);
+      const S = _e(e, _);
+      p.push(...S);
     }
-    if (g.length) {
-      h.ranges = Y(h.ranges);
-      const l = g.reduce((d, a) => {
-        const _ = m.getCellRaw(a.row, a.col);
-        if (_) {
-          const V = G(_.v);
-          V !== _.t && d.setValue(a.row, a.col, { t: V });
+    if (y.length) {
+      h.ranges = Z(h.ranges);
+      const o = y.reduce((m, i) => {
+        const v = f.getCellRaw(i.row, i.col);
+        if (v) {
+          const x = G(v.v);
+          x !== v.t && m.setValue(i.row, i.col, { t: x });
         }
-        return d;
-      }, new b()).getMatrix(), p = new b();
-      new b(l).forValue((d, a) => {
-        const _ = m.getCellRaw(d, a);
-        _ ? p.setValue(d, a, { t: _.t }) : p.setValue(d, a, { t: void 0 });
+        return m;
+      }, new b()).getMatrix(), g = new b();
+      new b(o).forValue((m, i) => {
+        const v = f.getCellRaw(m, i);
+        v ? g.setValue(m, i, { t: v.t }) : g.setValue(m, i, { t: void 0 });
       }), C.push({
         id: Ce.id,
         params: h
@@ -259,83 +246,83 @@ const re = [
         id: B.id,
         params: {
           unitId: c,
-          subUnitId: i,
-          cellValue: l
+          subUnitId: l,
+          cellValue: o
         }
       });
-      const y = be(e, h);
-      S.push({
+      const S = be(e, h);
+      p.push({
         id: B.id,
         params: {
           unitId: c,
-          subUnitId: i,
-          cellValue: p.getMatrix()
+          subUnitId: l,
+          cellValue: g.getMatrix()
         }
-      }, ...y);
+      }, ...S);
     }
-    const f = me(C, n).result;
-    return f && s.pushUndoRedo({
+    const d = me(C, r).result;
+    return d && s.pushUndoRedo({
       unitID: c,
-      undoMutations: S,
+      undoMutations: p,
       redoMutations: C
-    }), f;
+    }), d;
   }
 }, De = {
   id: "sheet.command.numfmt.add.decimal.command",
-  type: P.COMMAND,
+  type: V.COMMAND,
   handler: async (e) => {
-    const t = e.get(E), n = e.get(j), r = e.get(W), s = e.get(F), o = n.getCurrentSelections();
-    if (!o || !o.length)
+    const t = e.get(T), r = e.get(j), n = e.get(W), s = e.get(A), a = r.getCurrentSelections();
+    if (!a || !a.length)
       return !1;
     const c = H(s);
     if (!c) return !1;
-    const { unitId: i, subUnitId: m } = c;
+    const { unitId: l, subUnitId: f } = c;
     let u = 0;
-    o.forEach((C) => {
-      N.foreach(C.range, (S, f) => {
-        const l = r.getValue(i, m, S, f);
-        if (!l) {
-          const y = c.worksheet.getCellRaw(S, f);
-          if (!u && y && y.t === I.NUMBER && y.v) {
-            const d = /\.(\d*)$/.exec(String(y.v));
-            if (d) {
-              const a = d[1].length;
-              if (!a)
+    a.forEach((C) => {
+      I.foreach(C.range, (p, d) => {
+        const o = n.getValue(l, f, p, d);
+        if (!o) {
+          const S = c.worksheet.getCellRaw(p, d);
+          if (!u && S && S.t === N.NUMBER && S.v) {
+            const m = /\.(\d*)$/.exec(String(S.v));
+            if (m) {
+              const i = m[1].length;
+              if (!i)
                 return;
-              u = Math.max(u, a);
+              u = Math.max(u, i);
             }
           }
           return;
         }
-        const p = w(l.pattern);
-        u = p > u ? p : u;
+        const g = O(o.pattern);
+        u = g > u ? g : u;
       });
     });
-    const g = u + 1, v = O(`0${g > 0 ? ".0" : ""}`, g), h = [];
-    return o.forEach((C) => {
-      N.foreach(C.range, (S, f) => {
-        const l = r.getValue(i, m, S, f);
-        if (!l)
+    const y = u + 1, _ = P(`0${y > 0 ? ".0" : ""}`, y), h = [];
+    return a.forEach((C) => {
+      I.foreach(C.range, (p, d) => {
+        const o = n.getValue(l, f, p, d);
+        if (!o)
           h.push({
-            row: S,
-            col: f,
-            pattern: v
+            row: p,
+            col: d,
+            pattern: _
           });
         else {
-          const p = w(l.pattern), y = O(l.pattern, p + 1);
-          y !== l.pattern && h.push({
-            row: S,
-            col: f,
-            pattern: y
+          const g = O(o.pattern), S = P(o.pattern, g + 1);
+          S !== o.pattern && h.push({
+            row: p,
+            col: d,
+            pattern: S
           });
         }
       });
-    }), h.length ? await t.executeCommand(U.id, { values: h }) : !1;
+    }), h.length ? await t.executeCommand(w.id, { values: h }) : !1;
   }
 };
 class oe {
   constructor() {
-    M(this, "_currencySymbol$", new k("US"));
+    M(this, "_currencySymbol$", new K("US"));
     M(this, "currencySymbol$", this._currencySymbol$.asObservable());
   }
   /**
@@ -348,103 +335,103 @@ class oe {
     return this._currencySymbol$.getValue();
   }
 }
-const Ae = {
+const Fe = {
   id: "sheet.command.numfmt.set.currency",
-  type: P.COMMAND,
+  type: V.COMMAND,
   handler: async (e) => {
-    const t = e.get(E), n = e.get(j), r = e.get(oe), s = Pe[r.getCurrencySymbol()] || "$", o = n.getCurrentSelections();
-    if (!o || !o.length)
+    const t = e.get(T), r = e.get(j), n = e.get(oe), s = we[n.getCurrencySymbol()] || "$", a = r.getCurrentSelections();
+    if (!a || !a.length)
       return !1;
-    const c = [], i = se[4].suffix(s);
-    return o.forEach((u) => {
-      N.foreach(u.range, (g, v) => {
-        c.push({ row: g, col: v, pattern: i, type: "currency" });
+    const c = [], l = se[4].suffix(s);
+    return a.forEach((u) => {
+      I.foreach(u.range, (y, _) => {
+        c.push({ row: y, col: _, pattern: l, type: "currency" });
       });
-    }), await t.executeCommand(U.id, { values: c });
+    }), await t.executeCommand(w.id, { values: c });
   }
-}, Fe = {
+}, Ae = {
   id: "sheet.command.numfmt.set.percent",
-  type: P.COMMAND,
+  type: V.COMMAND,
   handler: async (e) => {
-    const t = e.get(E), r = e.get(j).getCurrentSelections();
-    if (!r || !r.length)
+    const t = e.get(T), n = e.get(j).getCurrentSelections();
+    if (!n || !n.length)
       return !1;
-    const s = [], o = "0%";
-    return r.forEach((i) => {
-      N.foreach(i.range, (m, u) => {
-        s.push({ row: m, col: u, pattern: o, type: "percent" });
+    const s = [], a = "0%";
+    return n.forEach((l) => {
+      I.foreach(l.range, (f, u) => {
+        s.push({ row: f, col: u, pattern: a, type: "percent" });
       });
-    }), await t.executeCommand(U.id, { values: s });
+    }), await t.executeCommand(w.id, { values: s });
   }
 }, je = {
   id: "sheet.command.numfmt.subtract.decimal.command",
-  type: P.COMMAND,
+  type: V.COMMAND,
   handler: async (e) => {
-    const t = e.get(E), n = e.get(j), r = e.get(W), s = e.get(F), o = n.getCurrentSelections();
-    if (!o || !o.length)
+    const t = e.get(T), r = e.get(j), n = e.get(W), s = e.get(A), a = r.getCurrentSelections();
+    if (!a || !a.length)
       return !1;
     const c = H(s);
     if (!c) return !1;
-    const { unitId: i, subUnitId: m } = c;
+    const { unitId: l, subUnitId: f } = c;
     let u = 0;
-    o.forEach((S) => {
-      N.foreach(S.range, (f, l) => {
-        const p = r.getValue(i, m, f, l);
-        if (!p) {
-          const d = c.worksheet.getCellRaw(f, l);
-          if (!u && d && d.t === I.NUMBER && d.v) {
-            const a = /\.(\d*)$/.exec(String(d.v));
-            if (a) {
-              const _ = a[1].length;
-              if (!_)
+    a.forEach((p) => {
+      I.foreach(p.range, (d, o) => {
+        const g = n.getValue(l, f, d, o);
+        if (!g) {
+          const m = c.worksheet.getCellRaw(d, o);
+          if (!u && m && m.t === N.NUMBER && m.v) {
+            const i = /\.(\d*)$/.exec(String(m.v));
+            if (i) {
+              const v = i[1].length;
+              if (!v)
                 return;
-              u = Math.max(u, _);
+              u = Math.max(u, v);
             }
           }
           return;
         }
-        const y = w(p.pattern);
-        u = y > u ? y : u;
+        const S = O(g.pattern);
+        u = S > u ? S : u;
       });
     });
-    const g = u - 1, v = O(`0${g > 0 ? ".0" : "."}`, g), h = [];
-    return o.forEach((S) => {
-      N.foreach(S.range, (f, l) => {
-        const p = r.getValue(i, m, f, l);
-        if (!p)
+    const y = u - 1, _ = P(`0${y > 0 ? ".0" : "."}`, y), h = [];
+    return a.forEach((p) => {
+      I.foreach(p.range, (d, o) => {
+        const g = n.getValue(l, f, d, o);
+        if (!g)
           h.push({
-            row: f,
-            col: l,
-            pattern: v
+            row: d,
+            col: o,
+            pattern: _
           });
         else {
-          const y = w(p.pattern);
+          const S = O(g.pattern);
           h.push({
-            row: f,
-            col: l,
-            pattern: O(p.pattern, y - 1)
+            row: d,
+            col: o,
+            pattern: P(g.pattern, S - 1)
           });
         }
       });
-    }), await t.executeCommand(U.id, { values: h });
+    }), await t.executeCommand(w.id, { values: h });
   }
-}, ce = "sheets-numfmt.config", Z = {}, rt = (e) => x.getInfo(e).type || "unknown", Le = (e, t, n = "en") => {
-  const s = x.getInfo(e)._partitions[1], o = x.format(e, t, { locale: n, throws: !1 });
+}, ae = "sheets-numfmt.config", q = {}, rt = (e) => U.getFormatInfo(e).type || "unknown", Le = (e, t, r = "en") => {
+  const n = String(U.formatColor(e, t)), s = U.format(e, t, { locale: r, throws: !1 });
   return t < 0 ? {
-    result: o,
-    color: s.color
+    result: s,
+    color: n
   } : {
-    result: o
+    result: s
   };
-}, Ge = (e, t, n) => e === "General" ? {
+}, Ge = (e, t, r) => e === "General" ? {
   result: String(Ve(t))
   // In Excel, the default General format also needs to handle numeric precision.
-} : Le(e, t, n);
-var Be = Object.getOwnPropertyDescriptor, He = (e, t, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? Be(t, n) : t, o = e.length - 1, c; o >= 0; o--)
-    (c = e[o]) && (s = c(s) || s);
+} : Le(e, t, r);
+var Be = Object.getOwnPropertyDescriptor, He = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Be(t, r) : t, a = e.length - 1, c; a >= 0; a--)
+    (c = e[a]) && (s = c(s) || s);
   return s;
-}, R = (e, t) => (n, r) => t(n, r, e);
+}, R = (e, t) => (r, n) => t(r, n, e);
 const We = {
   tl: {
     size: 6,
@@ -452,11 +439,11 @@ const We = {
   }
 };
 let D = class extends Q {
-  constructor(t, n, r, s, o, c, i) {
+  constructor(t, r, n, s, a, c, l) {
     super();
-    M(this, "_local$", new k("en"));
+    M(this, "_local$", new K("en"));
     M(this, "local$", this._local$.asObservable());
-    this._instanceService = t, this._sheetInterceptorService = n, this._themeService = r, this._commandService = s, this._numfmtService = o, this._localeService = c, this._configService = i, this._initInterceptorCellContent();
+    this._instanceService = t, this._sheetInterceptorService = r, this._themeService = n, this._commandService = s, this._numfmtService = a, this._localeService = c, this._configService = l, this._initInterceptorCellContent();
   }
   get local() {
     const t = this._local$.getValue();
@@ -482,77 +469,65 @@ let D = class extends Q {
   // eslint-disable-next-line max-lines-per-function
   _initInterceptorCellContent() {
     const t = new b();
-    this.disposeWithMe(Ne(this._local$, this._localeService.currentLocale$).subscribe(() => {
+    this.disposeWithMe(Ie(this._local$, this._localeService.currentLocale$).subscribe(() => {
       t.reset();
     })), this.disposeWithMe(this._sheetInterceptorService.intercept($e.CELL_CONTENT, {
-      effect: K.Value | K.Style,
+      effect: z.Value | z.Style,
       // eslint-disable-next-line complexity
-      handler: (n, r, s) => {
-        var S;
-        const o = r.unitId, c = r.subUnitId;
-        let i;
-        const m = n;
-        if (!m)
-          return s(n);
-        if (n != null && n.s) {
-          const f = r.workbook.getStyles().get(n.s);
-          f != null && f.n && (i = f.n);
+      handler: (r, n, s) => {
+        var p, d;
+        const a = n.unitId, c = n.subUnitId;
+        let l;
+        const f = r;
+        if (!f || f.v === void 0 || f.v === null)
+          return s(r);
+        if (r != null && r.s) {
+          const o = n.workbook.getStyles().get(r.s);
+          o != null && o.n && (l = o.n);
         }
-        if (i || (i = this._numfmtService.getValue(o, c, r.row, r.col)), !i || (n.t || G(m.v)) !== I.NUMBER)
-          return s(n);
-        if (ne(i.pattern))
-          return (S = this._configService.getConfig(ce)) != null && S.disableTextFormatMark ? s({
-            ...n,
-            t: I.STRING
-          }) : s({
-            ...n,
-            t: I.STRING,
-            markers: {
-              ...n == null ? void 0 : n.markers,
-              ...We
-            }
-          });
-        let g = "";
-        const v = t.getValue(r.row, r.col);
-        if (v && v.parameters === `${m.v}_${i.pattern}`)
-          return s({ ...n, ...v.result });
-        if (m.v === void 0 || m.v === null)
-          return s(n);
-        const h = Ge(i.pattern, Number(m.v), this.local);
-        if (g = h.result, !g)
-          return s(n);
-        const C = { v: g, t: I.NUMBER };
+        if (l || (l = this._numfmtService.getValue(a, c, n.row, n.col)), !l || l.pattern === "General" || G(f.v) !== N.NUMBER)
+          return s(r);
+        if ((!r || r === n.rawData) && (r = { ...n.rawData }), re(l.pattern))
+          return (p = this._configService.getConfig(ae)) != null && p.disableTextFormatMark ? (r.t = N.STRING, s(r)) : (r.t = N.STRING, r.markers = { ...r == null ? void 0 : r.markers, ...We }, s(r));
+        let y = "";
+        const _ = t.getValue(n.row, n.col);
+        if (_ && _.parameters === `${f.v}_${l.pattern}`)
+          return s({ ...r, ..._.result });
+        const h = Ge(l.pattern, Number(f.v), this.local);
+        if (y = h.result, !y)
+          return s(r);
+        const C = { v: y, t: N.NUMBER };
         if (h.color) {
-          const f = this._themeService.getColorFromTheme(`${h.color}.500`);
-          f && (C.interceptorStyle = { cl: { rgb: f } });
+          const o = (d = this._themeService.getColorFromTheme(`${h.color}.500`)) != null ? d : h.color;
+          o && (C.interceptorStyle = { cl: { rgb: o } });
         }
-        return t.setValue(r.row, r.col, {
+        return t.setValue(n.row, n.col, {
           result: C,
-          parameters: `${m.v}_${i.pattern}`
-        }), s({ ...n, ...C });
+          parameters: `${f.v}_${l.pattern}`
+        }), Object.assign(r, C), s(r);
       },
       priority: Re.NUMFMT
-    })), this.disposeWithMe(this._commandService.onCommandExecuted((n) => {
-      if (n.id === te.id) {
-        const r = n.params;
-        Object.keys(r.values).forEach((s) => {
-          r.values[s].ranges.forEach((c) => {
-            N.foreach(c, (i, m) => {
-              t.realDeleteValue(i, m);
+    })), this.disposeWithMe(this._commandService.onCommandExecuted((r) => {
+      if (r.id === te.id) {
+        const n = r.params;
+        Object.keys(n.values).forEach((s) => {
+          n.values[s].ranges.forEach((c) => {
+            I.foreach(c, (l, f) => {
+              t.realDeleteValue(l, f);
             });
           });
         });
-      } else if (n.id === B.id) {
-        const r = n.params;
-        new b(r.cellValue).forValue((s, o) => {
-          t.realDeleteValue(s, o);
+      } else if (r.id === B.id) {
+        const n = r.params;
+        new b(n.cellValue).forValue((s, a) => {
+          t.realDeleteValue(s, a);
         });
       }
     })), this.disposeWithMe(
       this._instanceService.getCurrentTypeOfUnit$(ee.UNIVER_SHEET).pipe(
-        Ee((n) => {
-          var r;
-          return (r = n == null ? void 0 : n.activeSheet$) != null ? r : Te(null);
+        Te((r) => {
+          var n;
+          return (n = r == null ? void 0 : r.activeSheet$) != null ? n : Ee(null);
         }),
         xe(1)
       ).subscribe(() => t.reset())
@@ -563,107 +538,106 @@ let D = class extends Q {
   }
 };
 D = He([
-  R(0, F),
-  R(1, T(Me)),
-  R(2, T(fe)),
-  R(3, T(E)),
-  R(4, T(W)),
-  R(5, T(de)),
+  R(0, A),
+  R(1, E(Me)),
+  R(2, E(fe)),
+  R(3, E(T)),
+  R(4, E(W)),
+  R(5, E(de)),
   R(6, X)
 ], D);
 class J extends Q {
   constructor() {
     super(...arguments);
-    M(this, "_currencySymbol$", new k("US"));
+    M(this, "_currencySymbol$", new K("US"));
     M(this, "currencySymbol$", this._currencySymbol$.asObservable());
   }
   /**
    * Set the currency symbol by setting the country code.
    */
-  setCurrencySymbolByCountryCode(n) {
-    this._currencySymbol$.next(n);
+  setCurrencySymbolByCountryCode(r) {
+    this._currencySymbol$.next(r);
   }
   getCurrencySymbol() {
     return this._currencySymbol$.getValue();
   }
 }
-var ke = Object.defineProperty, Ke = Object.getOwnPropertyDescriptor, ze = (e, t, n) => t in e ? ke(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, Ye = (e, t, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? Ke(t, n) : t, o = e.length - 1, c; o >= 0; o--)
-    (c = e[o]) && (s = c(s) || s);
+var Ke = Object.defineProperty, ze = Object.getOwnPropertyDescriptor, Ye = (e, t, r) => t in e ? Ke(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, Ze = (e, t, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? ze(t, r) : t, a = e.length - 1, c; a >= 0; a--)
+    (c = e[a]) && (s = c(s) || s);
   return s;
-}, L = (e, t) => (n, r) => t(n, r, e), ie = (e, t, n) => ze(e, typeof t != "symbol" ? t + "" : t, n);
-let A = class extends ve {
-  constructor(e = Z, t, n, r) {
-    super(), this._config = e, this._injector = t, this._configService = n, this._commandService = r;
-    const { ...s } = pe(
+}, L = (e, t) => (r, n) => t(r, n, e), ce = (e, t, r) => Ye(e, typeof t != "symbol" ? t + "" : t, r);
+let F = class extends pe {
+  constructor(e = q, t, r, n) {
+    super(), this._config = e, this._injector = t, this._configService = r, this._commandService = n;
+    const { ...s } = Se(
       {},
-      Z,
+      q,
       this._config
     );
-    this._configService.setConfig(ce, s);
+    this._configService.setConfig(ae, s);
   }
   onStarting() {
-    Se(this._injector, [
+    ve(this._injector, [
       [D],
       [oe],
       [J]
-    ]), z(this._injector, [
+    ]), Y(this._injector, [
       [D]
     ]);
   }
   onRendered() {
-    z(this._injector, [
+    Y(this._injector, [
       [J]
     ]), [
       De,
       je,
-      Ae,
       Fe,
-      U
+      Ae,
+      w
     ].forEach((e) => {
       this.disposeWithMe(this._commandService.registerCommand(e));
     });
   }
 };
-ie(A, "pluginName", Oe);
-ie(A, "type", ee.UNIVER_SHEET);
-A = Ye([
-  ge(Ie),
-  L(1, T(he)),
+ce(F, "pluginName", Pe);
+ce(F, "type", ee.UNIVER_SHEET);
+F = Ze([
+  he(Ne),
+  L(1, E(ge)),
   L(2, X),
-  L(3, E)
-], A);
-const st = (e) => re.find((n) => e.includes(n)), ot = () => re.map((e) => ({ label: e, value: e })), ct = (e) => se.map((t) => ({
+  L(3, T)
+], F);
+const nt = (e) => ne.find((r) => e.includes(r)), st = () => ne.map((e) => ({ label: e, value: e })), ot = (e) => se.map((t) => ({
   label: t.label(e),
   value: t.suffix(e),
   color: t.color
-})), it = () => Ue.map((e) => ({ label: e.label, value: e.suffix })), at = () => we.map((e) => ({ label: e.label, value: e.suffix, color: e.color }));
+})), at = () => Ue.map((e) => ({ label: e.label, value: e.suffix })), ct = () => Oe.map((e) => ({ label: e.label, value: e.suffix, color: e.color }));
 export {
   De as AddDecimalCommand,
   se as CURRENCYFORMAT,
   Ue as DATEFMTLISG,
   oe as MenuCurrencyService,
-  we as NUMBERFORMAT,
-  ce as SHEETS_NUMFMT_PLUGIN_CONFIG_KEY,
-  Ae as SetCurrencyCommand,
-  U as SetNumfmtCommand,
-  Fe as SetPercentCommand,
+  Oe as NUMBERFORMAT,
+  ae as SHEETS_NUMFMT_PLUGIN_CONFIG_KEY,
+  Fe as SetCurrencyCommand,
+  w as SetNumfmtCommand,
+  Ae as SetPercentCommand,
   D as SheetsNumfmtCellContentController,
   je as SubtractDecimalCommand,
-  A as UniverSheetsNumfmtPlugin,
-  Pe as countryCurrencyMap,
-  re as currencySymbols,
-  ct as getCurrencyFormatOptions,
-  ot as getCurrencyOptions,
-  st as getCurrencyType,
-  it as getDateFormatOptions,
-  w as getDecimalFromPattern,
-  q as getDecimalString,
-  at as getNumberFormatOptions,
+  F as UniverSheetsNumfmtPlugin,
+  we as countryCurrencyMap,
+  ne as currencySymbols,
+  ot as getCurrencyFormatOptions,
+  st as getCurrencyOptions,
+  nt as getCurrencyType,
+  at as getDateFormatOptions,
+  O as getDecimalFromPattern,
+  k as getDecimalString,
+  ct as getNumberFormatOptions,
   Le as getPatternPreview,
   Ge as getPatternPreviewIgnoreGeneral,
   rt as getPatternType,
-  tt as isPatternEqualWithoutDecimal,
-  nt as isPatternHasDecimal,
-  O as setPatternDecimal
+  tt as isPatternHasDecimal,
+  P as setPatternDecimal
 };