@univerjs/sheets-numfmt 0.5.5-nightly.202501210734 → 0.5.5-nightly.202501210925

package/lib/es/facade.js

@@ -1,19 +1,25 @@
-import { SetNumfmtCommand as l, SheetsNumfmtCellContentController as i } from "@univerjs/sheets-numfmt";
-import { FRange as o, FWorkbook as s } from "@univerjs/sheets/facade";
-class a extends o {
-  setNumberFormat(t) {
-    const e = [];
-    return this.forEach((m, r) => e.push({ row: m, col: r, pattern: t })), this._commandService.syncExecuteCommand(l.id, {
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
+import { SetNumfmtCommand, SheetsNumfmtCellContentController } from "@univerjs/sheets-numfmt";
+import { FRange, FWorkbook } from "@univerjs/sheets/facade";
+const _FRangeLegacy = class _FRangeLegacy extends FRange {
+  setNumberFormat(pattern) {
+    const values = [];
+    return this.forEach((row, col) => values.push({ row, col, pattern })), this._commandService.syncExecuteCommand(SetNumfmtCommand.id, {
       unitId: this._workbook.getUnitId(),
       subUnitId: this._worksheet.getSheetId(),
-      values: e
+      values
     }), this;
   }
-}
-o.extend(a);
-class c extends s {
-  setNumfmtLocal(t) {
-    return this._injector.get(i).setNumfmtLocal(t), this;
+};
+__name(_FRangeLegacy, "FRangeLegacy");
+let FRangeLegacy = _FRangeLegacy;
+FRange.extend(FRangeLegacy);
+const _FWorkbookLegacy = class _FWorkbookLegacy extends FWorkbook {
+  setNumfmtLocal(local) {
+    return this._injector.get(SheetsNumfmtCellContentController).setNumfmtLocal(local), this;
   }
-}
-s.extend(c);
+};
+__name(_FWorkbookLegacy, "FWorkbookLegacy");
+let FWorkbookLegacy = _FWorkbookLegacy;
+FWorkbook.extend(FWorkbookLegacy);

package/lib/es/index.js

@@ -1,12 +1,13 @@
-var ne = Object.defineProperty;
-var re = (e, t, r) => t in e ? ne(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var y = (e, t, r) => re(e, typeof t != "symbol" ? t + "" : t, r);
-import { numfmt as N, CommandType as I, ICommandService as M, IUniverInstanceService as D, IUndoRedoService as se, sequenceExecute as oe, Range as C, CellValueType as A, Inject as E, ThemeService as ce, LocaleService as ae, Disposable as X, LocaleType as b, ObjectMatrix as B, InterceptorEffectEnum as W, isRealNum as ie, UniverInstanceType as Y, DependentOn as ue, Injector as le, Plugin as me, registerDependencies as fe, touchDependencies as G } from "@univerjs/core";
-import { getSheetCommandTarget as w, transformCellsToRange as de, rangeMerge as H, SetNumfmtMutation as Z, factorySetNumfmtUndoMutation as he, RemoveNumfmtMutation as ge, factoryRemoveNumfmtUndoMutation as pe, SheetsSelectionsService as V, INumfmtService as F, SheetInterceptorService as ve, INTERCEPTOR_POINT as Se, InterceptCellContentPriority as _e, SetRangeValuesMutation as ye, UniverSheetsPlugin as be } from "@univerjs/sheets";
-import { BehaviorSubject as j, merge as Ce, switchMap as Me, of as $e, skip as Ee } from "rxjs";
-import { DEFAULT_TEXT_FORMAT as Ne } from "@univerjs/engine-numfmt";
-import { stripErrorMargin as Re } from "@univerjs/engine-formula";
-const J = [
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
+import { numfmt, CommandType, ICommandService, IUniverInstanceService, IUndoRedoService, sequenceExecute, Range, CellValueType, Inject, ThemeService, LocaleService, Disposable, LocaleType, ObjectMatrix, InterceptorEffectEnum, isRealNum, UniverInstanceType, DependentOn, Injector, Plugin, registerDependencies, touchDependencies } from "@univerjs/core";
+import { getSheetCommandTarget, transformCellsToRange, rangeMerge, SetNumfmtMutation, factorySetNumfmtUndoMutation, RemoveNumfmtMutation, factoryRemoveNumfmtUndoMutation, SheetsSelectionsService, INumfmtService, SheetInterceptorService, INTERCEPTOR_POINT, InterceptCellContentPriority, SetRangeValuesMutation, UniverSheetsPlugin } from "@univerjs/sheets";
+import { BehaviorSubject, merge, switchMap, of, skip } from "rxjs";
+import { DEFAULT_TEXT_FORMAT } from "@univerjs/engine-numfmt";
+import { stripErrorMargin } from "@univerjs/engine-formula";
+const currencySymbols = [
   "$",
   "£",
   "¥",
@@ -34,7 +35,7 @@ const J = [
   "₽",
   "₾",
   "₿"
-], Ie = {
+], countryCurrencyMap = {
   US: "$",
   // United States Dollar
   CA: "C$",
@@ -74,7 +75,7 @@ const J = [
   SI: "€",
   ES: "€"
   // Add more mappings as needed
-}, Te = [
+}, DATEFMTLISG = [
   {
     label: "1930-08-05",
     suffix: "yyyy-MM-dd"
@@ -119,7 +120,7 @@ const J = [
     label: "08-05 下午 01:30",
     suffix: "MM-dd A/P hh:mm"
   }
-], xe = [
+], NUMBERFORMAT = [
   {
     label: "(1,235)",
     suffix: "#,##0_);(#,##0)"
@@ -147,468 +148,471 @@ const J = [
     suffix: "#,##0.00_);[Red]-#,##0.00",
     color: "red"
   }
-], Q = [
+], CURRENCYFORMAT = [
   {
-    label: (e) => `${e}1,235`,
-    suffix: (e) => `"${e}"#,##0.00_);"${e}"#,##0.00`
+    label: /* @__PURE__ */ __name((suffix) => `${suffix}1,235`, "label"),
+    suffix: /* @__PURE__ */ __name((suffix) => `"${suffix}"#,##0.00_);"${suffix}"#,##0.00`, "suffix")
   },
   {
-    label: (e) => `${e}1,235`,
-    suffix: (e) => `"${e}"#,##0.00_);[Red]"${e}"#,##0.00`,
+    label: /* @__PURE__ */ __name((suffix) => `${suffix}1,235`, "label"),
+    suffix: /* @__PURE__ */ __name((suffix) => `"${suffix}"#,##0.00_);[Red]"${suffix}"#,##0.00`, "suffix"),
     color: "red"
   },
   {
-    label: (e) => `(${e}1,235)`,
-    suffix: (e) => `"${e}"#,##0.00_);("${e}"#,##0.00)`
+    label: /* @__PURE__ */ __name((suffix) => `(${suffix}1,235)`, "label"),
+    suffix: /* @__PURE__ */ __name((suffix) => `"${suffix}"#,##0.00_);("${suffix}"#,##0.00)`, "suffix")
   },
   {
-    label: (e) => `(${e}1,235)`,
-    suffix: (e) => `"${e}"#,##0.00_);[Red]("${e}"#,##0.00)`,
+    label: /* @__PURE__ */ __name((suffix) => `(${suffix}1,235)`, "label"),
+    suffix: /* @__PURE__ */ __name((suffix) => `"${suffix}"#,##0.00_);[Red]("${suffix}"#,##0.00)`, "suffix"),
     color: "red"
   },
   {
-    label: (e) => `-${e}1,235`,
-    suffix: (e) => `"${e}"#,##0.00_);-"${e}"#,##0.00`
+    label: /* @__PURE__ */ __name((suffix) => `-${suffix}1,235`, "label"),
+    suffix: /* @__PURE__ */ __name((suffix) => `"${suffix}"#,##0.00_);-"${suffix}"#,##0.00`, "suffix")
   },
   {
-    label: (e) => `-${e}1,235`,
-    suffix: (e) => `"${e}"#,##0.00_);[Red]-"${e}"#,##0.00`,
+    label: /* @__PURE__ */ __name((suffix) => `-${suffix}1,235`, "label"),
+    suffix: /* @__PURE__ */ __name((suffix) => `"${suffix}"#,##0.00_);[Red]-"${suffix}"#,##0.00`, "suffix"),
     color: "red"
   }
-], Pe = "SHEET_NUMFMT_PLUGIN", x = (e, t = 0) => {
-  var n;
-  return e && (n = N.getInfo(e).maxDecimals) != null ? n : t;
-}, Ze = (e, t) => {
-  if (e && !t || !e && t)
+], SHEET_NUMFMT_PLUGIN = "SHEET_NUMFMT_PLUGIN", getDecimalFromPattern = /* @__PURE__ */ __name((pattern, defaultValue = 0) => {
+  var _a3;
+  return pattern && (_a3 = numfmt.getInfo(pattern).maxDecimals) != null ? _a3 : defaultValue;
+}, "getDecimalFromPattern"), isPatternEqualWithoutDecimal = /* @__PURE__ */ __name((patternA, patternB) => {
+  if (patternA && !patternB || !patternA && patternB)
     return !1;
-  const r = (c) => c.reduce(
-    (l, h) => {
-      if (l.isEnd)
-        return l;
-      const f = h.value || h.num;
-      return h.type === "point" ? (l.isEnd = !0, l) : { ...l, result: l.result + f };
+  const getString = /* @__PURE__ */ __name((tokens) => tokens.reduce(
+    (pre, cur) => {
+      if (pre.isEnd)
+        return pre;
+      const str = cur.value || cur.num;
+      return cur.type === "point" ? (pre.isEnd = !0, pre) : { ...pre, result: pre.result + str };
     },
     { isEnd: !1, result: "" }
-  ).result, n = N.getInfo(e)._partitions, s = N.getInfo(t)._partitions, o = r(n[0].tokens), a = r(s[0].tokens), d = r(n[1].tokens), u = r(s[1].tokens);
-  return o === a && d === u && n[1].color === s[1].color;
-}, z = (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(
+  ).result, "getString"), partitionsA = numfmt.getInfo(patternA)._partitions, partitionsB = numfmt.getInfo(patternB)._partitions, A1 = getString(partitionsA[0].tokens), B1 = getString(partitionsB[0].tokens), A2 = getString(partitionsA[1].tokens), B2 = getString(partitionsB[1].tokens);
+  return A1 === B1 && A2 === B2 && partitionsA[1].color === partitionsB[1].color;
+}, "isPatternEqualWithoutDecimal"), getDecimalString = /* @__PURE__ */ __name((length) => new Array(Math.min(Math.max(0, Number(length)), 30)).fill(0).join(""), "getDecimalString"), setPatternDecimal = /* @__PURE__ */ __name((patterns, decimalLength) => patterns.split(";").map((pattern) => /\.0?/.test(pattern) ? pattern.replace(
   /\.0*/g,
-  `${t > 0 ? "." : ""}${z(Number(t || 0))}`
-) : /0([^0]?)|0$/.test(n) ? n.replace(
+  `${decimalLength > 0 ? "." : ""}${getDecimalString(Number(decimalLength || 0))}`
+) : /0([^0]?)|0$/.test(pattern) ? pattern.replace(
   /0([^0]+)|0$/,
-  `0${t > 0 ? "." : ""}${z(Number(t || 0))}$1`
-) : n).join(";"), Je = (e) => /\.0?/.test(e) || /0([^0]?)|0$/.test(e), T = {
+  `0${decimalLength > 0 ? "." : ""}${getDecimalString(Number(decimalLength || 0))}$1`
+) : pattern).join(";"), "setPatternDecimal"), isPatternHasDecimal = /* @__PURE__ */ __name((pattern) => /\.0?/.test(pattern) || /0([^0]?)|0$/.test(pattern), "isPatternHasDecimal"), SetNumfmtCommand = {
   id: "sheet.command.numfmt.set.numfmt",
-  type: I.COMMAND,
-  handler: (e, t) => {
-    if (!t)
+  type: CommandType.COMMAND,
+  handler: /* @__PURE__ */ __name((accessor, params) => {
+    if (!params)
       return !1;
-    const r = e.get(M), n = e.get(D), s = e.get(se), o = w(n, t);
-    if (!o) return !1;
-    const { unitId: a, subUnitId: d } = o, u = t.values.filter((i) => !!i.pattern), c = t.values.filter((i) => !i.pattern), l = de(a, d, u), h = {
-      unitId: a,
-      subUnitId: d,
-      ranges: c.map((i) => ({
-        startColumn: i.col,
-        startRow: i.row,
-        endColumn: i.col,
-        endRow: i.row
+    const commandService = accessor.get(ICommandService), univerInstanceService = accessor.get(IUniverInstanceService), undoRedoService = accessor.get(IUndoRedoService), target = getSheetCommandTarget(univerInstanceService, params);
+    if (!target) return !1;
+    const { unitId, subUnitId } = target, setCells = params.values.filter((value) => !!value.pattern), removeCells = params.values.filter((value) => !value.pattern), setRedos = transformCellsToRange(unitId, subUnitId, setCells), removeRedos = {
+      unitId,
+      subUnitId,
+      ranges: removeCells.map((cell) => ({
+        startColumn: cell.col,
+        startRow: cell.row,
+        endColumn: cell.col,
+        endRow: cell.row
       }))
-    }, f = [], v = [];
-    if (u.length) {
-      Object.keys(l.values).forEach((g) => {
-        const p = l.values[g];
-        p.ranges = H(p.ranges);
-      }), f.push({
-        id: Z.id,
-        params: l
+    }, redos = [], undos = [];
+    if (setCells.length) {
+      Object.keys(setRedos.values).forEach((key) => {
+        const v = setRedos.values[key];
+        v.ranges = rangeMerge(v.ranges);
+      }), redos.push({
+        id: SetNumfmtMutation.id,
+        params: setRedos
       });
-      const i = he(e, l);
-      v.push(...i);
+      const undo = factorySetNumfmtUndoMutation(accessor, setRedos);
+      undos.push(...undo);
     }
-    if (c.length) {
-      h.ranges = H(h.ranges), f.push({
-        id: ge.id,
-        params: h
+    if (removeCells.length) {
+      removeRedos.ranges = rangeMerge(removeRedos.ranges), redos.push({
+        id: RemoveNumfmtMutation.id,
+        params: removeRedos
       });
-      const i = pe(e, h);
-      v.push(...i);
+      const undo = factoryRemoveNumfmtUndoMutation(accessor, removeRedos);
+      undos.push(...undo);
     }
-    const m = oe(f, r).result;
-    return m && s.pushUndoRedo({
-      unitID: a,
-      undoMutations: v,
-      redoMutations: f
-    }), m;
-  }
-}, Ue = {
+    const result = sequenceExecute(redos, commandService).result;
+    return result && undoRedoService.pushUndoRedo({
+      unitID: unitId,
+      undoMutations: undos,
+      redoMutations: redos
+    }), result;
+  }, "handler")
+}, AddDecimalCommand = {
   id: "sheet.command.numfmt.add.decimal.command",
-  type: I.COMMAND,
-  handler: async (e) => {
-    const t = e.get(M), r = e.get(V), n = e.get(F), s = e.get(D), o = r.getCurrentSelections();
-    if (!o || !o.length)
+  type: CommandType.COMMAND,
+  handler: /* @__PURE__ */ __name(async (accessor) => {
+    const commandService = accessor.get(ICommandService), selectionManagerService = accessor.get(SheetsSelectionsService), numfmtService = accessor.get(INumfmtService), univerInstanceService = accessor.get(IUniverInstanceService), selections = selectionManagerService.getCurrentSelections();
+    if (!selections || !selections.length)
       return !1;
-    const a = w(s);
-    if (!a) return !1;
-    const { unitId: d, subUnitId: u } = a;
-    let c = 0;
-    o.forEach((v) => {
-      C.foreach(v.range, (m, i) => {
-        const g = n.getValue(d, u, m, i);
-        if (!g) {
-          const S = a.worksheet.getCellRaw(m, i);
-          if (!c && S && S.t === A.NUMBER && S.v) {
-            const _ = /\.(\d*)$/.exec(String(S.v));
-            if (_) {
-              const R = _[1].length;
-              if (!R)
+    const target = getSheetCommandTarget(univerInstanceService);
+    if (!target) return !1;
+    const { unitId, subUnitId } = target;
+    let maxDecimals = 0;
+    selections.forEach((selection) => {
+      Range.foreach(selection.range, (row, col) => {
+        const numfmtValue = numfmtService.getValue(unitId, subUnitId, row, col);
+        if (!numfmtValue) {
+          const cell = target.worksheet.getCellRaw(row, col);
+          if (!maxDecimals && cell && cell.t === CellValueType.NUMBER && cell.v) {
+            const regResult = /\.(\d*)$/.exec(String(cell.v));
+            if (regResult) {
+              const length = regResult[1].length;
+              if (!length)
                 return;
-              c = Math.max(c, R);
+              maxDecimals = Math.max(maxDecimals, length);
             }
           }
           return;
         }
-        const p = x(g.pattern);
-        c = p > c ? p : c;
+        const decimals2 = getDecimalFromPattern(numfmtValue.pattern);
+        maxDecimals = decimals2 > maxDecimals ? decimals2 : maxDecimals;
       });
     });
-    const l = c + 1, h = P(`0${l > 0 ? ".0" : ""}`, l), f = [];
-    return o.forEach((v) => {
-      C.foreach(v.range, (m, i) => {
-        const g = n.getValue(d, u, m, i);
-        if (!g)
-          f.push({
-            row: m,
-            col: i,
-            pattern: h
+    const decimals = maxDecimals + 1, defaultPattern = setPatternDecimal(`0${decimals > 0 ? ".0" : ""}`, decimals), values = [];
+    return selections.forEach((selection) => {
+      Range.foreach(selection.range, (row, col) => {
+        const numfmtValue = numfmtService.getValue(unitId, subUnitId, row, col);
+        if (!numfmtValue)
+          values.push({
+            row,
+            col,
+            pattern: defaultPattern
           });
         else {
-          const p = x(g.pattern), S = P(g.pattern, p + 1);
-          S !== g.pattern && f.push({
-            row: m,
-            col: i,
-            pattern: S
+          const decimals2 = getDecimalFromPattern(numfmtValue.pattern), pattern = setPatternDecimal(numfmtValue.pattern, decimals2 + 1);
+          pattern !== numfmtValue.pattern && values.push({
+            row,
+            col,
+            pattern
           });
         }
       });
-    }), f.length ? await t.executeCommand(T.id, { values: f }) : !1;
-  }
-};
-class k {
+    }), values.length ? await commandService.executeCommand(SetNumfmtCommand.id, { values }) : !1;
+  }, "handler")
+}, _MenuCurrencyService = class _MenuCurrencyService {
   constructor() {
-    y(this, "_currencySymbol$", new j("US"));
-    y(this, "currencySymbol$", this._currencySymbol$.asObservable());
+    __publicField(this, "_currencySymbol$", new BehaviorSubject("US"));
+    __publicField(this, "currencySymbol$", this._currencySymbol$.asObservable());
   }
   /**
    * Set the currency symbol by setting the country code.
    */
-  setCurrencySymbolByCountryCode(t) {
-    this._currencySymbol$.next(t);
+  setCurrencySymbolByCountryCode(symbol) {
+    this._currencySymbol$.next(symbol);
   }
   getCurrencySymbol() {
     return this._currencySymbol$.getValue();
   }
-}
-const Oe = {
+};
+__name(_MenuCurrencyService, "MenuCurrencyService");
+let MenuCurrencyService = _MenuCurrencyService;
+const SetCurrencyCommand = {
   id: "sheet.command.numfmt.set.currency",
-  type: I.COMMAND,
-  handler: async (e) => {
-    const t = e.get(M), r = e.get(V), n = e.get(k), s = Ie[n.getCurrencySymbol()] || "$", o = r.getCurrentSelections();
-    if (!o || !o.length)
+  type: CommandType.COMMAND,
+  handler: /* @__PURE__ */ __name(async (accessor) => {
+    const commandService = accessor.get(ICommandService), selectionManagerService = accessor.get(SheetsSelectionsService), menuCurrencyService = accessor.get(MenuCurrencyService), symbol = countryCurrencyMap[menuCurrencyService.getCurrencySymbol()] || "$", selections = selectionManagerService.getCurrentSelections();
+    if (!selections || !selections.length)
       return !1;
-    const a = [], d = Q[4].suffix(s);
-    return o.forEach((c) => {
-      C.foreach(c.range, (l, h) => {
-        a.push({ row: l, col: h, pattern: d, type: "currency" });
+    const values = [], suffix = CURRENCYFORMAT[4].suffix(symbol);
+    return selections.forEach((selection) => {
+      Range.foreach(selection.range, (row, col) => {
+        values.push({ row, col, pattern: suffix, type: "currency" });
       });
-    }), await t.executeCommand(T.id, { values: a });
-  }
-}, De = {
+    }), await commandService.executeCommand(SetNumfmtCommand.id, { values });
+  }, "handler")
+}, SetPercentCommand = {
   id: "sheet.command.numfmt.set.percent",
-  type: I.COMMAND,
-  handler: async (e) => {
-    const t = e.get(M), n = e.get(V).getCurrentSelections();
-    if (!n || !n.length)
+  type: CommandType.COMMAND,
+  handler: /* @__PURE__ */ __name(async (accessor) => {
+    const commandService = accessor.get(ICommandService), selections = accessor.get(SheetsSelectionsService).getCurrentSelections();
+    if (!selections || !selections.length)
       return !1;
-    const s = [], o = "0%";
-    return n.forEach((d) => {
-      C.foreach(d.range, (u, c) => {
-        s.push({ row: u, col: c, pattern: o, type: "percent" });
+    const values = [], suffix = "0%";
+    return selections.forEach((selection) => {
+      Range.foreach(selection.range, (row, col) => {
+        values.push({ row, col, pattern: suffix, type: "percent" });
       });
-    }), await t.executeCommand(T.id, { values: s });
-  }
-}, Ve = {
+    }), await commandService.executeCommand(SetNumfmtCommand.id, { values });
+  }, "handler")
+}, SubtractDecimalCommand = {
   id: "sheet.command.numfmt.subtract.decimal.command",
-  type: I.COMMAND,
-  handler: async (e) => {
-    const t = e.get(M), r = e.get(V), n = e.get(F), s = e.get(D), o = r.getCurrentSelections();
-    if (!o || !o.length)
+  type: CommandType.COMMAND,
+  handler: /* @__PURE__ */ __name(async (accessor) => {
+    const commandService = accessor.get(ICommandService), selectionManagerService = accessor.get(SheetsSelectionsService), numfmtService = accessor.get(INumfmtService), univerInstanceService = accessor.get(IUniverInstanceService), selections = selectionManagerService.getCurrentSelections();
+    if (!selections || !selections.length)
       return !1;
-    const a = w(s);
-    if (!a) return !1;
-    const { unitId: d, subUnitId: u } = a;
-    let c = 0;
-    o.forEach((m) => {
-      C.foreach(m.range, (i, g) => {
-        const p = n.getValue(d, u, i, g);
-        if (!p) {
-          const _ = a.worksheet.getCellRaw(i, g);
-          if (!c && _ && _.t === A.NUMBER && _.v) {
-            const R = /\.(\d*)$/.exec(String(_.v));
-            if (R) {
-              const L = R[1].length;
-              if (!L)
+    const target = getSheetCommandTarget(univerInstanceService);
+    if (!target) return !1;
+    const { unitId, subUnitId } = target;
+    let maxDecimals = 0;
+    selections.forEach((selection) => {
+      Range.foreach(selection.range, (row, col) => {
+        const numfmtValue = numfmtService.getValue(unitId, subUnitId, row, col);
+        if (!numfmtValue) {
+          const cell = target.worksheet.getCellRaw(row, col);
+          if (!maxDecimals && cell && cell.t === CellValueType.NUMBER && cell.v) {
+            const regResult = /\.(\d*)$/.exec(String(cell.v));
+            if (regResult) {
+              const length = regResult[1].length;
+              if (!length)
                 return;
-              c = Math.max(c, L);
+              maxDecimals = Math.max(maxDecimals, length);
             }
           }
           return;
         }
-        const S = x(p.pattern);
-        c = S > c ? S : c;
+        const decimals2 = getDecimalFromPattern(numfmtValue.pattern);
+        maxDecimals = decimals2 > maxDecimals ? decimals2 : maxDecimals;
       });
     });
-    const l = c - 1, h = P(`0${l > 0 ? ".0" : "."}`, l), f = [];
-    return o.forEach((m) => {
-      C.foreach(m.range, (i, g) => {
-        const p = n.getValue(d, u, i, g);
-        if (!p)
-          f.push({
-            row: i,
-            col: g,
-            pattern: h
+    const decimals = maxDecimals - 1, defaultPattern = setPatternDecimal(`0${decimals > 0 ? ".0" : "."}`, decimals), values = [];
+    return selections.forEach((selection) => {
+      Range.foreach(selection.range, (row, col) => {
+        const numfmtValue = numfmtService.getValue(unitId, subUnitId, row, col);
+        if (!numfmtValue)
+          values.push({
+            row,
+            col,
+            pattern: defaultPattern
           });
         else {
-          const S = x(p.pattern);
-          f.push({
-            row: i,
-            col: g,
-            pattern: P(p.pattern, S - 1)
+          const decimals2 = getDecimalFromPattern(numfmtValue.pattern);
+          values.push({
+            row,
+            col,
+            pattern: setPatternDecimal(numfmtValue.pattern, decimals2 - 1)
           });
         }
       });
-    }), await t.executeCommand(T.id, { values: f });
-  }
-}, Qe = (e) => N.getInfo(e).type || "unknown", Ae = (e, t, r = "en") => {
-  const s = N.getInfo(e)._partitions[1], o = N.format(e, t, { locale: r, throws: !1 });
-  return t < 0 ? {
-    result: o,
-    color: s.color
+    }), await commandService.executeCommand(SetNumfmtCommand.id, { values });
+  }, "handler")
+}, getPatternType = /* @__PURE__ */ __name((pattern) => numfmt.getInfo(pattern).type || "unknown", "getPatternType"), getPatternPreview = /* @__PURE__ */ __name((pattern, value, locale = "en") => {
+  const negInfo = numfmt.getInfo(pattern)._partitions[1], result = numfmt.format(pattern, value, { locale, throws: !1 });
+  return value < 0 ? {
+    result,
+    color: negInfo.color
   } : {
-    result: o
+    result
   };
-}, we = (e, t, r) => e === "General" ? {
-  result: String(Re(t))
+}, "getPatternPreview"), getPatternPreviewIgnoreGeneral = /* @__PURE__ */ __name((pattern, value, locale) => pattern === "General" ? {
+  result: String(stripErrorMargin(value))
   // In Excel, the default General format also needs to handle numeric precision.
-} : Ae(e, t, r);
-var Fe = Object.defineProperty, je = Object.getOwnPropertyDescriptor, Le = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? je(t, r) : t, o = e.length - 1, a; o >= 0; o--)
-    (a = e[o]) && (s = (n ? a(t, r, s) : a(s)) || s);
-  return n && s && Fe(t, r, s), s;
-}, $ = (e, t) => (r, n) => t(r, n, e);
-let U = class extends X {
-  constructor(t, r, n, s, o, a) {
+} : getPatternPreview(pattern, value, locale), "getPatternPreviewIgnoreGeneral");
+var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$1(target, key, result), result;
+}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), _a;
+let SheetsNumfmtCellContentController = (_a = class extends Disposable {
+  constructor(_instanceService, _sheetInterceptorService, _themeService, _commandService, _numfmtService, _localeService) {
     super();
-    y(this, "_local$", new j("en"));
-    y(this, "local$", this._local$.asObservable());
-    this._instanceService = t, this._sheetInterceptorService = r, this._themeService = n, this._commandService = s, this._numfmtService = o, this._localeService = a, this._initInterceptorCellContent();
+    __publicField(this, "_local$", new BehaviorSubject("en"));
+    __publicField(this, "local$", this._local$.asObservable());
+    this._instanceService = _instanceService, this._sheetInterceptorService = _sheetInterceptorService, this._themeService = _themeService, this._commandService = _commandService, this._numfmtService = _numfmtService, this._localeService = _localeService, this._initInterceptorCellContent();
   }
   get local() {
-    const t = this._local$.getValue();
-    if (t)
-      return t;
+    const _local = this._local$.getValue();
+    if (_local)
+      return _local;
     switch (this._localeService.getCurrentLocale()) {
-      case b.FR_FR:
+      case LocaleType.FR_FR:
         return "fr";
-      case b.RU_RU:
+      case LocaleType.RU_RU:
         return "ru";
-      case b.VI_VN:
+      case LocaleType.VI_VN:
         return "vi";
-      case b.ZH_CN:
+      case LocaleType.ZH_CN:
         return "zh-CN";
-      case b.ZH_TW:
+      case LocaleType.ZH_TW:
         return "zh-TW";
-      case b.EN_US:
-      case b.FA_IR:
+      case LocaleType.EN_US:
+      case LocaleType.FA_IR:
       default:
         return "en";
     }
   }
   // eslint-disable-next-line max-lines-per-function
   _initInterceptorCellContent() {
-    const t = {
+    const TEXT_FORMAT_MARK = {
       tl: {
         size: 6,
         color: "#409f11"
       }
-    }, r = new B();
-    this.disposeWithMe(Ce(this._local$, this._localeService.currentLocale$).subscribe(() => {
-      r.reset();
-    })), this.disposeWithMe(this._sheetInterceptorService.intercept(Se.CELL_CONTENT, {
-      effect: W.Value | W.Style,
-      handler: (n, s, o) => {
-        const a = s.unitId, d = s.subUnitId;
-        let u;
-        const c = n;
-        if (!c)
-          return o(n);
-        if (n != null && n.s) {
-          const m = s.workbook.getStyles().get(n.s);
-          m != null && m.n && (u = m.n);
+    }, renderCache = new ObjectMatrix();
+    this.disposeWithMe(merge(this._local$, this._localeService.currentLocale$).subscribe(() => {
+      renderCache.reset();
+    })), this.disposeWithMe(this._sheetInterceptorService.intercept(INTERCEPTOR_POINT.CELL_CONTENT, {
+      effect: InterceptorEffectEnum.Value | InterceptorEffectEnum.Style,
+      handler: /* @__PURE__ */ __name((cell, location, next) => {
+        const unitId = location.unitId, sheetId = location.subUnitId;
+        let numfmtValue;
+        const originCellValue = cell;
+        if (!originCellValue)
+          return next(cell);
+        if (cell != null && cell.s) {
+          const style = location.workbook.getStyles().get(cell.s);
+          style != null && style.n && (numfmtValue = style.n);
         }
-        if (u || (u = this._numfmtService.getValue(a, d, s.row, s.col)), !u)
-          return o(n);
-        if (u.pattern === Ne && c.v && ie(c.v))
-          return o({
-            ...n,
+        if (numfmtValue || (numfmtValue = this._numfmtService.getValue(unitId, sheetId, location.row, location.col)), !numfmtValue)
+          return next(cell);
+        if (numfmtValue.pattern === DEFAULT_TEXT_FORMAT && originCellValue.v && isRealNum(originCellValue.v))
+          return next({
+            ...cell,
             markers: {
-              ...n == null ? void 0 : n.markers,
-              ...t
+              ...cell == null ? void 0 : cell.markers,
+              ...TEXT_FORMAT_MARK
             }
           });
-        if (c.t !== A.NUMBER || c.v == null || Number.isNaN(c.v))
-          return o(n);
-        let l = "";
-        const h = r.getValue(s.row, s.col);
-        if (h && h.parameters === `${c.v}_${u.pattern}`)
-          return o({ ...n, ...h.result });
-        const f = we(u.pattern, Number(c.v), this.local);
-        if (l = f.result, !l)
-          return o(n);
-        const v = { v: l };
-        if (f.color) {
-          const m = this._themeService.getCurrentTheme()[`${f.color}500`];
-          m && (v.interceptorStyle = { cl: { rgb: m } });
+        if (originCellValue.t !== CellValueType.NUMBER || originCellValue.v == null || Number.isNaN(originCellValue.v))
+          return next(cell);
+        let numfmtRes = "";
+        const cache = renderCache.getValue(location.row, location.col);
+        if (cache && cache.parameters === `${originCellValue.v}_${numfmtValue.pattern}`)
+          return next({ ...cell, ...cache.result });
+        const info = getPatternPreviewIgnoreGeneral(numfmtValue.pattern, Number(originCellValue.v), this.local);
+        if (numfmtRes = info.result, !numfmtRes)
+          return next(cell);
+        const res = { v: numfmtRes };
+        if (info.color) {
+          const color = this._themeService.getCurrentTheme()[`${info.color}500`];
+          color && (res.interceptorStyle = { cl: { rgb: color } });
         }
-        return r.setValue(s.row, s.col, {
-          result: v,
-          parameters: `${c.v}_${u.pattern}`
-        }), o({ ...n, ...v });
-      },
-      priority: _e.NUMFMT
-    })), this.disposeWithMe(this._commandService.onCommandExecuted((n) => {
-      if (n.id === Z.id) {
-        const s = n.params;
-        Object.keys(s.values).forEach((o) => {
-          s.values[o].ranges.forEach((d) => {
-            C.foreach(d, (u, c) => {
-              r.realDeleteValue(u, c);
+        return renderCache.setValue(location.row, location.col, {
+          result: res,
+          parameters: `${originCellValue.v}_${numfmtValue.pattern}`
+        }), next({ ...cell, ...res });
+      }, "handler"),
+      priority: InterceptCellContentPriority.NUMFMT
+    })), this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
+      if (commandInfo.id === SetNumfmtMutation.id) {
+        const params = commandInfo.params;
+        Object.keys(params.values).forEach((key) => {
+          params.values[key].ranges.forEach((range) => {
+            Range.foreach(range, (row, col) => {
+              renderCache.realDeleteValue(row, col);
             });
           });
         });
-      } else if (n.id === ye.id) {
-        const s = n.params;
-        new B(s.cellValue).forValue((o, a) => {
-          r.realDeleteValue(o, a);
+      } else if (commandInfo.id === SetRangeValuesMutation.id) {
+        const params = commandInfo.params;
+        new ObjectMatrix(params.cellValue).forValue((row, col) => {
+          renderCache.realDeleteValue(row, col);
         });
       }
     })), this.disposeWithMe(
-      this._instanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET).pipe(
-        Me((n) => {
-          var s;
-          return (s = n == null ? void 0 : n.activeSheet$) != null ? s : $e(null);
+      this._instanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(
+        switchMap((workbook) => {
+          var _a3;
+          return (_a3 = workbook == null ? void 0 : workbook.activeSheet$) != null ? _a3 : of(null);
         }),
-        Ee(1)
-      ).subscribe(() => r.reset())
+        skip(1)
+      ).subscribe(() => renderCache.reset())
     );
   }
-  setNumfmtLocal(t) {
-    this._local$.next(t);
+  setNumfmtLocal(local) {
+    this._local$.next(local);
   }
-};
-U = Le([
-  $(0, D),
-  $(1, E(ve)),
-  $(2, E(ce)),
-  $(3, E(M)),
-  $(4, E(F)),
-  $(5, E(ae))
-], U);
-class K extends X {
+}, __name(_a, "SheetsNumfmtCellContentController"), _a);
+SheetsNumfmtCellContentController = __decorateClass$1([
+  __decorateParam$1(0, IUniverInstanceService),
+  __decorateParam$1(1, Inject(SheetInterceptorService)),
+  __decorateParam$1(2, Inject(ThemeService)),
+  __decorateParam$1(3, Inject(ICommandService)),
+  __decorateParam$1(4, Inject(INumfmtService)),
+  __decorateParam$1(5, Inject(LocaleService))
+], SheetsNumfmtCellContentController);
+const _NumfmtCurrencyController = class _NumfmtCurrencyController extends Disposable {
   constructor() {
     super(...arguments);
-    y(this, "_currencySymbol$", new j("US"));
-    y(this, "currencySymbol$", this._currencySymbol$.asObservable());
+    __publicField(this, "_currencySymbol$", new BehaviorSubject("US"));
+    __publicField(this, "currencySymbol$", this._currencySymbol$.asObservable());
   }
   /**
    * Set the currency symbol by setting the country code.
    */
-  setCurrencySymbolByCountryCode(r) {
-    this._currencySymbol$.next(r);
+  setCurrencySymbolByCountryCode(symbol) {
+    this._currencySymbol$.next(symbol);
   }
   getCurrencySymbol() {
     return this._currencySymbol$.getValue();
   }
-}
-var ee = Object.defineProperty, Be = Object.getOwnPropertyDescriptor, We = (e, t, r) => t in e ? ee(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, Ge = (e, t, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? Be(t, r) : t, o = e.length - 1, a; o >= 0; o--)
-    (a = e[o]) && (s = (n ? a(t, r, s) : a(s)) || s);
-  return n && s && ee(t, r, s), s;
-}, q = (e, t) => (r, n) => t(r, n, e), te = (e, t, r) => We(e, typeof t != "symbol" ? t + "" : t, r);
-let O = class extends me {
-  constructor(e = void 0, t, r) {
-    super(), this._config = e, this._injector = t, this._commandService = r;
+};
+__name(_NumfmtCurrencyController, "NumfmtCurrencyController");
+let NumfmtCurrencyController = _NumfmtCurrencyController;
+var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __defNormalProp2 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp"), __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp2(target, key, result), result;
+}, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam"), __publicField2 = /* @__PURE__ */ __name((obj, key, value) => __defNormalProp2(obj, typeof key != "symbol" ? key + "" : key, value), "__publicField"), _a2;
+let UniverSheetsNumfmtPlugin = (_a2 = class extends Plugin {
+  constructor(_config = void 0, _injector, _commandService) {
+    super(), this._config = _config, this._injector = _injector, this._commandService = _commandService;
   }
   onStarting() {
-    fe(this._injector, [
-      [U],
-      [k],
-      [K]
-    ]), G(this._injector, [
-      [U]
+    registerDependencies(this._injector, [
+      [SheetsNumfmtCellContentController],
+      [MenuCurrencyService],
+      [NumfmtCurrencyController]
+    ]), touchDependencies(this._injector, [
+      [SheetsNumfmtCellContentController]
     ]);
   }
   onRendered() {
-    G(this._injector, [
-      [K]
+    touchDependencies(this._injector, [
+      [NumfmtCurrencyController]
     ]), [
-      Ue,
-      Ve,
-      Oe,
-      De,
-      T
-    ].forEach((e) => {
-      this.disposeWithMe(this._commandService.registerCommand(e));
+      AddDecimalCommand,
+      SubtractDecimalCommand,
+      SetCurrencyCommand,
+      SetPercentCommand,
+      SetNumfmtCommand
+    ].forEach((config) => {
+      this.disposeWithMe(this._commandService.registerCommand(config));
     });
   }
-};
-te(O, "pluginName", Pe);
-te(O, "type", Y.UNIVER_SHEET);
-O = Ge([
-  ue(be),
-  q(1, E(le)),
-  q(2, M)
-], O);
-const ke = (e) => J.find((r) => e.includes(r)), et = () => J.map((e) => ({ label: e, value: e })), tt = (e) => Q.map((t) => ({
-  label: t.label(e),
-  value: t.suffix(e),
-  color: t.color
-})), nt = () => Te.map((e) => ({ label: e.label, value: e.suffix })), rt = () => xe.map((e) => ({ label: e.label, value: e.suffix, color: e.color }));
+}, __name(_a2, "UniverSheetsNumfmtPlugin"), _a2);
+__publicField2(UniverSheetsNumfmtPlugin, "pluginName", SHEET_NUMFMT_PLUGIN);
+__publicField2(UniverSheetsNumfmtPlugin, "type", UniverInstanceType.UNIVER_SHEET);
+UniverSheetsNumfmtPlugin = __decorateClass([
+  DependentOn(UniverSheetsPlugin),
+  __decorateParam(1, Inject(Injector)),
+  __decorateParam(2, ICommandService)
+], UniverSheetsNumfmtPlugin);
+const getCurrencyType = /* @__PURE__ */ __name((pattern) => currencySymbols.find((code) => pattern.includes(code)), "getCurrencyType"), getCurrencyOptions = /* @__PURE__ */ __name(() => currencySymbols.map((item) => ({ label: item, value: item })), "getCurrencyOptions"), getCurrencyFormatOptions = /* @__PURE__ */ __name((suffix) => CURRENCYFORMAT.map((item) => ({
+  label: item.label(suffix),
+  value: item.suffix(suffix),
+  color: item.color
+})), "getCurrencyFormatOptions"), getDateFormatOptions = /* @__PURE__ */ __name(() => DATEFMTLISG.map((item) => ({ label: item.label, value: item.suffix })), "getDateFormatOptions"), getNumberFormatOptions = /* @__PURE__ */ __name(() => NUMBERFORMAT.map((item) => ({ label: item.label, value: item.suffix, color: item.color })), "getNumberFormatOptions");
 export {
-  Ue as AddDecimalCommand,
-  Q as CURRENCYFORMAT,
-  Te as DATEFMTLISG,
-  k as MenuCurrencyService,
-  xe as NUMBERFORMAT,
-  Oe as SetCurrencyCommand,
-  T as SetNumfmtCommand,
-  De as SetPercentCommand,
-  U as SheetsNumfmtCellContentController,
-  Ve as SubtractDecimalCommand,
-  O as UniverSheetsNumfmtPlugin,
-  Ie as countryCurrencyMap,
-  J as currencySymbols,
-  tt as getCurrencyFormatOptions,
-  et as getCurrencyOptions,
-  ke as getCurrencyType,
-  nt as getDateFormatOptions,
-  x as getDecimalFromPattern,
-  z as getDecimalString,
-  rt as getNumberFormatOptions,
-  Ae as getPatternPreview,
-  we as getPatternPreviewIgnoreGeneral,
-  Qe as getPatternType,
-  Ze as isPatternEqualWithoutDecimal,
-  Je as isPatternHasDecimal,
-  P as setPatternDecimal
+  AddDecimalCommand,
+  CURRENCYFORMAT,
+  DATEFMTLISG,
+  MenuCurrencyService,
+  NUMBERFORMAT,
+  SetCurrencyCommand,
+  SetNumfmtCommand,
+  SetPercentCommand,
+  SheetsNumfmtCellContentController,
+  SubtractDecimalCommand,
+  UniverSheetsNumfmtPlugin,
+  countryCurrencyMap,
+  currencySymbols,
+  getCurrencyFormatOptions,
+  getCurrencyOptions,
+  getCurrencyType,
+  getDateFormatOptions,
+  getDecimalFromPattern,
+  getDecimalString,
+  getNumberFormatOptions,
+  getPatternPreview,
+  getPatternPreviewIgnoreGeneral,
+  getPatternType,
+  isPatternEqualWithoutDecimal,
+  isPatternHasDecimal,
+  setPatternDecimal
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/sheets-numfmt",
-  "version": "0.5.5-nightly.202501210734",
+  "version": "0.5.5-nightly.202501210925",
   "private": false,
   "description": "UniverSheet numfmt plugin",
   "author": "DreamNum <developer@univer.ai>",
@@ -53,10 +53,10 @@
     "rxjs": ">=7.0.0"
   },
   "dependencies": {
-    "@univerjs/core": "0.5.5-nightly.202501210734",
-    "@univerjs/engine-formula": "0.5.5-nightly.202501210734",
-    "@univerjs/engine-numfmt": "0.5.5-nightly.202501210734",
-    "@univerjs/sheets": "0.5.5-nightly.202501210734"
+    "@univerjs/core": "0.5.5-nightly.202501210925",
+    "@univerjs/engine-formula": "0.5.5-nightly.202501210925",
+    "@univerjs/engine-numfmt": "0.5.5-nightly.202501210925",
+    "@univerjs/sheets": "0.5.5-nightly.202501210925"
   },
   "devDependencies": {
     "rxjs": "^7.8.1",