@univerjs/sheets-numfmt 0.2.9 → 0.2.11

package/lib/es/index.js

@@ -2,16 +2,16 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key2, value) => key2 in obj ? __defProp(obj, key2, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key2] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key2, value) => __defNormalProp(obj, typeof key2 != "symbol" ? key2 + "" : key2, value);
-import { numfmt, LocaleType, Disposable, ObjectMatrix, CellValueType, Range, UniverInstanceType, OnLifecycle, LifecycleStages, Inject, ThemeService, ICommandService, LocaleService, IUniverInstanceService, CommandType, IUndoRedoService, sequenceExecute, createIdentifier, runOnLifecycle, useDependency, useInjector, Injector, ILocalStorageService, toDisposable, DisposableCollection, Optional, Plugin, Tools, DependentOn } from "@univerjs/core";
-import { INTERCEPTOR_POINT, InterceptCellContentPriority, SetNumfmtMutation, SetRangeValuesMutation, SheetInterceptorService, INumfmtService, getSheetCommandTarget, transformCellsToRange, rangeMerge, factorySetNumfmtUndoMutation, RemoveNumfmtMutation, factoryRemoveNumfmtUndoMutation, SheetsSelectionsService, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, RangeProtectionPermissionEditPoint, SetRangeValuesCommand, UniverSheetsPlugin } from "@univerjs/sheets";
-import { getCurrentRangeDisable$, deriveStateFromActiveSheet$, SheetSkeletonManagerService, IEditorBridgeService, UniverSheetsUIPlugin } from "@univerjs/sheets-ui";
-import { switchMap, of, skip, Observable, merge, BehaviorSubject, combineLatest } from "rxjs";
-import { ITextSelectionRenderManager, IRenderManagerService } from "@univerjs/engine-render";
-import { MenuItemType, MenuGroup, MenuPosition, getMenuHiddenObservable, ComponentManager, IMenuService, ISidebarService } from "@univerjs/ui";
+import { numfmt, LocaleType, Disposable, ObjectMatrix, CellValueType, Range, UniverInstanceType, OnLifecycle, LifecycleStages, Inject, ThemeService, ICommandService, LocaleService, IUniverInstanceService, CommandType, IUndoRedoService, sequenceExecute, createIdentifier, runOnLifecycle, ILocalStorageService, useDependency, toDisposable, DisposableCollection, Injector, Optional, useInjector, Plugin, Tools, DependentOn } from "@univerjs/core";
+import { INTERCEPTOR_POINT, InterceptCellContentPriority, SetNumfmtMutation, SetRangeValuesMutation, SheetInterceptorService, INumfmtService, getSheetCommandTarget, transformCellsToRange, rangeMerge, factorySetNumfmtUndoMutation, RemoveNumfmtMutation, factoryRemoveNumfmtUndoMutation, SheetsSelectionsService, SetRangeValuesCommand, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, RangeProtectionPermissionEditPoint, UniverSheetsPlugin } from "@univerjs/sheets";
+import { SheetSkeletonManagerService, IEditorBridgeService, getCurrentRangeDisable$, deriveStateFromActiveSheet$, UniverSheetsUIPlugin } from "@univerjs/sheets-ui";
+import { switchMap, of, skip, BehaviorSubject, Observable, combineLatest, merge } from "rxjs";
+import { IRenderManagerService, ITextSelectionRenderManager } from "@univerjs/engine-render";
+import { ComponentManager, ISidebarService, MenuItemType, MenuGroup, MenuPosition, getMenuHiddenObservable, IMenuService } from "@univerjs/ui";
 import { map, switchMap as switchMap$1, tap, debounceTime } from "rxjs/operators";
-import { DEFAULT_TEXT_FORMAT } from "@univerjs/engine-numfmt";
 import require$$0, { createContext, useState, useEffect, useRef, useContext, useMemo, forwardRef, createElement } from "react";
 import { InputNumber, Select, SelectList, Input, Button } from "@univerjs/design";
+import { DEFAULT_TEXT_FORMAT } from "@univerjs/engine-numfmt";
 const SHEET_NUMFMT_PLUGIN = "SHEET_NUMFMT_PLUGIN", getPatternType = /* @__PURE__ */ __name((pattern) => numfmt.getInfo(pattern).type || "unknown", "getPatternType"), getPatternPreview = /* @__PURE__ */ __name((pattern, value, _locale) => {
   const info = numfmt.getInfo(pattern), locale = _locale === LocaleType.ZH_CN ? "zh-CN" : "en", negInfo = info._partitions[1], result = numfmt.format(pattern, value, { locale });
   return value < 0 ? {
@@ -44,7 +44,7 @@ let SheetsNumfmtCellContentController = (_a = class extends Disposable {
         if (numfmtValue || (numfmtValue = this._numfmtService.getValue(unitId, sheetId, location.row, location.col)), !numfmtValue)
           return next(cell);
         const originCellValue = cell;
-        if (!originCellValue || originCellValue.t !== CellValueType.NUMBER)
+        if (!originCellValue || originCellValue.t !== CellValueType.NUMBER || originCellValue.v == null || Number.isNaN(originCellValue.v))
           return next(cell);
         let numfmtRes = "";
         const cache = renderCache.getValue(location.row, location.col);
@@ -180,8 +180,19 @@ const getDecimalFromPattern = /* @__PURE__ */ __name((pattern, defaultValue = 0)
     selections.forEach((selection) => {
       Range.foreach(selection.range, (row, col) => {
         const numfmtValue = numfmtService.getValue(unitId, subUnitId, row, col);
-        if (!numfmtValue)
+        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;
+              maxDecimals = Math.max(maxDecimals, length);
+            }
+          }
           return;
+        }
         const decimals2 = getDecimalFromPattern(numfmtValue.pattern);
         maxDecimals = decimals2 > maxDecimals ? decimals2 : maxDecimals;
       });
@@ -376,60 +387,38 @@ const getDecimalFromPattern = /* @__PURE__ */ __name((pattern, defaultValue = 0)
   SI: "€",
   ES: "€"
   // Add more mappings as needed
-}, MENU_OPTIONS = [
-  {
-    label: "sheet.numfmt.general",
-    pattern: null
-  },
-  {
-    label: "sheet.numfmt.text",
-    pattern: DEFAULT_TEXT_FORMAT
-  },
-  "|",
-  {
-    label: "sheet.numfmt.number",
-    pattern: "0"
-  },
-  "|",
-  {
-    label: "sheet.numfmt.accounting",
-    pattern: '"¥" #,##0.00_);[Red]("¥"#,##0.00)'
-  },
-  {
-    label: "sheet.numfmt.financialValue",
-    pattern: "#,##0.00;[Red]#,##0.00"
-  },
-  {
-    label: "sheet.numfmt.currency",
-    pattern: '"¥"#,##0.00_);[Red]("¥"#,##0.00)'
-  },
-  {
-    label: "sheet.numfmt.roundingCurrency",
-    pattern: '"¥"#,##0;[Red]"¥"#,##0'
-  },
-  "|",
-  {
-    label: "sheet.numfmt.date",
-    pattern: "yyyy-mm-dd;@"
-  },
-  {
-    label: "sheet.numfmt.time",
-    pattern: 'am/pm h":"mm":"ss'
-  },
-  {
-    label: "sheet.numfmt.dateTime",
-    pattern: "yyyy-m-d am/pm h:mm"
-  },
-  {
-    label: "sheet.numfmt.timeDuration",
-    pattern: "h:mm:ss"
-  },
-  "|",
-  {
-    label: "sheet.numfmt.moreFmt",
-    pattern: ""
+}, _MenuCurrencyService = class _MenuCurrencyService {
+  constructor() {
+    __publicField(this, "_currencySymbol$", new BehaviorSubject("US"));
+    __publicField(this, "currencySymbol$", this._currencySymbol$.asObservable());
+  }
+  /**
+   * Set the currency symbol by setting the country code.
+   */
+  setCurrencySymbolByCountryCode(symbol) {
+    this._currencySymbol$.next(symbol);
+  }
+  getCurrencySymbol() {
+    return this._currencySymbol$.getValue();
   }
-], SubtractDecimalCommand = {
+};
+__name(_MenuCurrencyService, "MenuCurrencyService");
+let MenuCurrencyService = _MenuCurrencyService;
+const SetCurrencyCommand = {
+  id: "sheet.command.numfmt.set.currency",
+  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 values = [], suffix = CURRENCYFORMAT[0].suffix(symbol);
+    return selections.forEach((selection) => {
+      Range.foreach(selection.range, (row, col) => {
+        values.push({ row, col, pattern: suffix, type: "currency" });
+      });
+    }), await commandService.executeCommand(SetNumfmtCommand.id, { values });
+  }, "handler")
+}, SubtractDecimalCommand = {
   id: "sheet.command.numfmt.subtract.decimal.command",
   type: CommandType.COMMAND,
   handler: /* @__PURE__ */ __name(async (accessor) => {
@@ -443,8 +432,19 @@ const getDecimalFromPattern = /* @__PURE__ */ __name((pattern, defaultValue = 0)
     selections.forEach((selection) => {
       Range.foreach(selection.range, (row, col) => {
         const numfmtValue = numfmtService.getValue(unitId, subUnitId, row, col);
-        if (!numfmtValue)
+        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;
+              maxDecimals = Math.max(maxDecimals, length);
+            }
+          }
           return;
+        }
         const decimals2 = getDecimalFromPattern(numfmtValue.pattern);
         maxDecimals = decimals2 > maxDecimals ? decimals2 : maxDecimals;
       });
@@ -470,6 +470,13 @@ const getDecimalFromPattern = /* @__PURE__ */ __name((pattern, defaultValue = 0)
       });
     }), await commandService.executeCommand(SetNumfmtCommand.id, { values });
   }, "handler")
+}, CloseNumfmtPanelOperator = {
+  id: "sheet.operation.close.numfmt.panel",
+  type: CommandType.OPERATION,
+  handler: /* @__PURE__ */ __name(() => (
+    // do nothing,just notify panel is closed
+    !0
+  ), "handler")
 }, INumfmtController = createIdentifier("INumfmtController");
 runOnLifecycle(LifecycleStages.Rendered, INumfmtController);
 const OpenNumfmtPanelOperator = {
@@ -493,231 +500,21 @@ function q(c, a, g) {
   g !== void 0 && (e = "" + g), a.key !== void 0 && (e = "" + a.key), a.ref !== void 0 && (h = a.ref);
   for (b in a) m.call(a, b) && !p.hasOwnProperty(b) && (d[b] = a[b]);
   if (c && c.defaultProps) for (b in a = c.defaultProps, a) d[b] === void 0 && (d[b] = a[b]);
-  return { $$typeof: k, type: c, key: e, ref: h, props: d, _owner: n.current };
-}
-__name(q, "q");
-reactJsxRuntime_production_min.Fragment = l;
-reactJsxRuntime_production_min.jsx = q;
-reactJsxRuntime_production_min.jsxs = q;
-jsxRuntime.exports = reactJsxRuntime_production_min;
-var jsxRuntimeExports = jsxRuntime.exports;
-const MORE_NUMFMT_TYPE_KEY = "sheet.numfmt.moreNumfmtType", OPTIONS_KEY = "sheet.numfmt.moreNumfmtType.options", MoreNumfmtType = /* @__PURE__ */ __name((props) => {
-  var _a8;
-  const localeService = useDependency(LocaleService), value = (_a8 = props.value) != null ? _a8 : localeService.t("sheet.numfmt.general");
-  return /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "more-numfmt-type", children: value });
-}, "MoreNumfmtType"), Options = /* @__PURE__ */ __name(() => {
-  const commandService = useDependency(ICommandService), localeService = useDependency(LocaleService), injector = useInjector(), selectionManagerService = useDependency(SheetsSelectionsService), setNumfmt = /* @__PURE__ */ __name((pattern) => {
-    const selection = selectionManagerService.getCurrentLastSelection();
-    if (!selection)
-      return;
-    const textSelectionRenderManager = injector.get(ITextSelectionRenderManager), range = selection.range, values = [];
-    Range.foreach(range, (row, col) => {
-      pattern ? values.push({ row, col, pattern, type: getPatternType(pattern) }) : values.push({ row, col });
-    }), commandService.executeCommand(SetNumfmtCommand.id, { values }), textSelectionRenderManager.focus();
-  }, "setNumfmt"), handleOnclick = /* @__PURE__ */ __name((index) => {
-    if (index === 0)
-      setNumfmt(null);
-    else if (index === MENU_OPTIONS.length - 1)
-      commandService.executeCommand(OpenNumfmtPanelOperator.id);
-    else {
-      const item = MENU_OPTIONS[index];
-      item.pattern && setNumfmt(item.pattern);
-    }
-  }, "handleOnclick"), defaultValue = 1220;
-  return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "more-numfmt-type-options", children: MENU_OPTIONS.map((item, index) => item === "|" ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "line m-t-4", onClick: /* @__PURE__ */ __name((e) => e.stopPropagation(), "onClick") }, index) : /* @__PURE__ */ jsxRuntimeExports.jsxs(
-    "div",
-    {
-      className: "option-item m-t-4",
-      onClick: /* @__PURE__ */ __name(() => {
-        handleOnclick(index);
-      }, "onClick"),
-      children: [
-        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: localeService.t(item.label) }),
-        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "m-l-26", children: item.pattern ? getPatternPreview(item.pattern || "", defaultValue, localeService.getCurrentLocale()).result : "" })
-      ]
-    },
-    index
-  )) });
-}, "Options"), SetPercentCommand = {
-  id: "sheet.command.numfmt.set.percent",
-  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 values = [], suffix = "0%";
-    return selections.forEach((selection) => {
-      Range.foreach(selection.range, (row, col) => {
-        values.push({ row, col, pattern: suffix, type: "percent" });
-      });
-    }), await commandService.executeCommand(SetNumfmtCommand.id, { values });
-  }, "handler")
-}, CurrencyMenuItem = /* @__PURE__ */ __name((accessor) => ({
-  icon: new Observable((subscribe) => {
-    const numfmtMenuController = accessor.get(NumfmtMenuController);
-    function getIconKey(symbol2) {
-      return {
-        [countryCurrencyMap.US]: "DollarSingle",
-        [countryCurrencyMap.RU]: "RoubleSingle",
-        [countryCurrencyMap.CN]: "RmbSingle",
-        [countryCurrencyMap.AT]: "EuroSingle"
-      }[symbol2] || "DollarSingle";
-    }
-    __name(getIconKey, "getIconKey");
-    const symbol = countryCurrencyMap[numfmtMenuController.getCurrencySymbol()] || "$";
-    return subscribe.next(getIconKey(symbol)), numfmtMenuController.currencySymbol$.subscribe((code) => {
-      const symbol2 = countryCurrencyMap[code] || "$";
-      subscribe.next(getIconKey(symbol2));
-    });
-  }),
-  id: SetCurrencyCommand.id,
-  title: "sheet.numfmt.currency",
-  tooltip: "sheet.numfmt.currency",
-  type: MenuItemType.BUTTON,
-  group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
-  positions: [MenuPosition.TOOLBAR_START],
-  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
-  disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] })
-}), "CurrencyMenuItem"), AddDecimalMenuItem = /* @__PURE__ */ __name((accessor) => ({
-  icon: "AddDigitsSingle",
-  id: AddDecimalCommand.id,
-  title: "sheet.numfmt.addDecimal",
-  tooltip: "sheet.numfmt.addDecimal",
-  type: MenuItemType.BUTTON,
-  positions: [MenuPosition.TOOLBAR_START],
-  group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
-  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
-  disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] })
-}), "AddDecimalMenuItem"), SubtractDecimalMenuItem = /* @__PURE__ */ __name((accessor) => ({
-  icon: "ReduceDigitsSingle",
-  id: SubtractDecimalCommand.id,
-  title: "sheet.numfmt.subtractDecimal",
-  tooltip: "sheet.numfmt.subtractDecimal",
-  type: MenuItemType.BUTTON,
-  group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
-  positions: [MenuPosition.TOOLBAR_START],
-  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
-  disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] })
-}), "SubtractDecimalMenuItem"), PercentMenuItem = /* @__PURE__ */ __name((accessor) => ({
-  icon: "PercentSingle",
-  id: SetPercentCommand.id,
-  title: "sheet.numfmt.percent",
-  tooltip: "sheet.numfmt.percent",
-  type: MenuItemType.BUTTON,
-  group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
-  positions: [MenuPosition.TOOLBAR_START],
-  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
-  disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] })
-}), "PercentMenuItem"), FactoryOtherMenuItem = /* @__PURE__ */ __name((accessor) => {
-  const univerInstanceService = accessor.get(IUniverInstanceService), commandService = accessor.get(ICommandService), localeService = accessor.get(LocaleService), selectionManagerService = accessor.get(SheetsSelectionsService), value$ = deriveStateFromActiveSheet$(univerInstanceService, "", ({ workbook, worksheet }) => new Observable(
-    (subscribe) => merge(
-      selectionManagerService.selectionMoveEnd$,
-      new Observable((commandSubscribe) => {
-        const commandList = [RemoveNumfmtMutation.id, SetNumfmtMutation.id], disposable = commandService.onCommandExecuted((commandInfo) => {
-          commandList.includes(commandInfo.id) && commandSubscribe.next(null);
-        });
-        return () => disposable.dispose();
-      })
-    ).subscribe(() => {
-      var _a8, _b;
-      const selections = selectionManagerService.getCurrentSelections();
-      if (selections && selections[0]) {
-        const range = selections[0].range, row = range.startRow, col = range.startColumn, numfmtValue = (_b = workbook.getStyles().get((_a8 = worksheet.getCell(row, col)) == null ? void 0 : _a8.s)) == null ? void 0 : _b.n, pattern = numfmtValue == null ? void 0 : numfmtValue.pattern;
-        let value = localeService.t("sheet.numfmt.general");
-        if (pattern) {
-          const item = MENU_OPTIONS.filter((item2) => typeof item2 == "object" && item2.pattern).find(
-            (item2) => isPatternEqualWithoutDecimal(pattern, item2.pattern)
-          );
-          item && typeof item == "object" && item.pattern ? value = localeService.t(item.label) : value = localeService.t("sheet.numfmt.moreFmt");
-        }
-        subscribe.next(value);
-      }
-    })
-  ));
-  return {
-    label: MORE_NUMFMT_TYPE_KEY,
-    id: OpenNumfmtPanelOperator.id,
-    tooltip: "sheet.numfmt.title",
-    type: MenuItemType.SELECTOR,
-    group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
-    positions: [MenuPosition.TOOLBAR_START],
-    selections: [
-      {
-        label: {
-          name: OPTIONS_KEY,
-          hoverable: !1
-        }
-      }
-    ],
-    value$,
-    hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
-    disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] })
-  };
-}, "FactoryOtherMenuItem");
-var __defProp$5 = Object.defineProperty, __getOwnPropDesc$5 = Object.getOwnPropertyDescriptor, __decorateClass$5 = /* @__PURE__ */ __name((decorators, target, key2, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$5(target, key2) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key2, result) : decorator(result)) || result);
-  return kind && result && __defProp$5(target, key2, result), result;
-}, "__decorateClass$5"), __decorateParam$5 = /* @__PURE__ */ __name((index, decorator) => (target, key2) => decorator(target, key2, index), "__decorateParam$5");
-const DefaultSheetNumfmtConfig = {};
-var _a2;
-let NumfmtMenuController = (_a2 = class extends Disposable {
-  constructor(_config, _injector, _componentManager, _menuService) {
-    super();
-    __publicField(this, "_currencySymbol$", new BehaviorSubject("US"));
-    __publicField(this, "currencySymbol$", this._currencySymbol$.asObservable());
-    this._config = _config, this._injector = _injector, this._componentManager = _componentManager, this._menuService = _menuService, this._initMenu();
-  }
-  _initMenu() {
-    const { menu = {} } = this._config;
-    [PercentMenuItem, AddDecimalMenuItem, SubtractDecimalMenuItem, CurrencyMenuItem, FactoryOtherMenuItem].forEach((factory) => {
-      this.disposeWithMe(this._menuService.addMenuItem(factory(this._injector), menu));
-    }), this.disposeWithMe(this._componentManager.register(MORE_NUMFMT_TYPE_KEY, MoreNumfmtType)), this.disposeWithMe(this._componentManager.register(OPTIONS_KEY, Options));
-  }
-  /**
-   * Set the currency symbol by setting the country code.
-   */
-  setCurrencySymbolByCountryCode(symbol) {
-    this._currencySymbol$.next(symbol);
-  }
-  getCurrencySymbol() {
-    return this._currencySymbol$.getValue();
-  }
-}, __name(_a2, "NumfmtMenuController"), _a2);
-NumfmtMenuController = __decorateClass$5([
-  OnLifecycle(LifecycleStages.Rendered, NumfmtMenuController),
-  __decorateParam$5(1, Inject(Injector)),
-  __decorateParam$5(2, Inject(ComponentManager)),
-  __decorateParam$5(3, Inject(IMenuService))
-], NumfmtMenuController);
-const SetCurrencyCommand = {
-  id: "sheet.command.numfmt.set.currency",
-  type: CommandType.COMMAND,
-  handler: /* @__PURE__ */ __name(async (accessor) => {
-    const commandService = accessor.get(ICommandService), selectionManagerService = accessor.get(SheetsSelectionsService), numfmtMenuController = accessor.get(NumfmtMenuController), symbol = countryCurrencyMap[numfmtMenuController.getCurrencySymbol()] || "$", selections = selectionManagerService.getCurrentSelections();
-    if (!selections || !selections.length)
-      return !1;
-    const values = [], suffix = CURRENCYFORMAT[0].suffix(symbol);
-    return selections.forEach((selection) => {
-      Range.foreach(selection.range, (row, col) => {
-        values.push({ row, col, pattern: suffix, type: "currency" });
-      });
-    }), await commandService.executeCommand(SetNumfmtCommand.id, { values });
-  }, "handler")
-}, CloseNumfmtPanelOperator = {
-  id: "sheet.operation.close.numfmt.panel",
-  type: CommandType.OPERATION,
-  handler: /* @__PURE__ */ __name(() => (
-    // do nothing,just notify panel is closed
-    !0
-  ), "handler")
-}, UserHabitCurrencyContext = createContext([]);
-var __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor, __decorateClass$4 = /* @__PURE__ */ __name((decorators, target, key2, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key2) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+  return { $$typeof: k, type: c, key: e, ref: h, props: d, _owner: n.current };
+}
+__name(q, "q");
+reactJsxRuntime_production_min.Fragment = l;
+reactJsxRuntime_production_min.jsx = q;
+reactJsxRuntime_production_min.jsxs = q;
+jsxRuntime.exports = reactJsxRuntime_production_min;
+var jsxRuntimeExports = jsxRuntime.exports;
+const UserHabitCurrencyContext = createContext([]);
+var __defProp$5 = Object.defineProperty, __getOwnPropDesc$5 = Object.getOwnPropertyDescriptor, __decorateClass$5 = /* @__PURE__ */ __name((decorators, target, key2, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$5(target, key2) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key2, result) : decorator(result)) || result);
-  return kind && result && __defProp$4(target, key2, result), result;
-}, "__decorateClass$4"), __decorateParam$4 = /* @__PURE__ */ __name((index, decorator) => (target, key2) => decorator(target, key2, index), "__decorateParam$4"), _a3;
-let UserHabitController = (_a3 = class {
+  return kind && result && __defProp$5(target, key2, result), result;
+}, "__decorateClass$5"), __decorateParam$5 = /* @__PURE__ */ __name((index, decorator) => (target, key2) => decorator(target, key2, index), "__decorateParam$5"), _a2;
+let UserHabitController = (_a2 = class {
   constructor(_localStorageService) {
     this._localStorageService = _localStorageService;
   }
@@ -760,9 +557,9 @@ let UserHabitController = (_a3 = class {
   deleteHabit(habit) {
     this._localStorageService.removeItem(habit);
   }
-}, __name(_a3, "UserHabitController"), _a3);
-UserHabitController = __decorateClass$4([
-  __decorateParam$4(0, Inject(ILocalStorageService))
+}, __name(_a2, "UserHabitController"), _a2);
+UserHabitController = __decorateClass$5([
+  __decorateParam$5(0, Inject(ILocalStorageService))
 ], UserHabitController);
 const key$1 = "numfmtCurrency", useCurrencyOptions = /* @__PURE__ */ __name((onOptionChange) => {
   const userHabitController = useDependency(UserHabitController), [options, optionsSet] = useState(currencySymbols);
@@ -1046,13 +843,27 @@ const SheetNumfmtPanel = /* @__PURE__ */ __name((props) => {
       /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { type: "primary", size: "small", onClick: handleConfirm, children: t("sheet.numfmt.confirm") })
     ] })
   ] });
-}, "SheetNumfmtPanel");
-var __defProp$3 = Object.defineProperty, __getOwnPropDesc$3 = Object.getOwnPropertyDescriptor, __decorateClass$3 = /* @__PURE__ */ __name((decorators, target, key2, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(target, key2) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+}, "SheetNumfmtPanel"), SetPercentCommand = {
+  id: "sheet.command.numfmt.set.percent",
+  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 values = [], suffix = "0%";
+    return selections.forEach((selection) => {
+      Range.foreach(selection.range, (row, col) => {
+        values.push({ row, col, pattern: suffix, type: "percent" });
+      });
+    }), await commandService.executeCommand(SetNumfmtCommand.id, { values });
+  }, "handler")
+};
+var __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor, __decorateClass$4 = /* @__PURE__ */ __name((decorators, target, key2, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key2) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key2, result) : decorator(result)) || result);
-  return kind && result && __defProp$3(target, key2, result), result;
-}, "__decorateClass$3"), __decorateParam$3 = /* @__PURE__ */ __name((index, decorator) => (target, key2) => decorator(target, key2, index), "__decorateParam$3"), _a4;
-let NumfmtController = (_a4 = class extends Disposable {
+  return kind && result && __defProp$4(target, key2, result), result;
+}, "__decorateClass$4"), __decorateParam$4 = /* @__PURE__ */ __name((index, decorator) => (target, key2) => decorator(target, key2, index), "__decorateParam$4"), _a3;
+let NumfmtController = (_a3 = class extends Disposable {
   constructor(_sheetInterceptorService, _themeService, _univerInstanceService, _commandService, _selectionManagerService, _renderManagerService, _numfmtService, _componentManager, _sidebarService, _localeService) {
     super();
     /**
@@ -1220,25 +1031,25 @@ let NumfmtController = (_a4 = class extends Disposable {
       unit || ((_a8 = this._sidebarDisposable) == null || _a8.dispose(), this._sidebarDisposable = null);
     });
   }
-}, __name(_a4, "NumfmtController"), _a4);
-NumfmtController = __decorateClass$3([
+}, __name(_a3, "NumfmtController"), _a3);
+NumfmtController = __decorateClass$4([
   OnLifecycle(LifecycleStages.Rendered, NumfmtController),
-  __decorateParam$3(0, Inject(SheetInterceptorService)),
-  __decorateParam$3(1, Inject(ThemeService)),
-  __decorateParam$3(2, IUniverInstanceService),
-  __decorateParam$3(3, ICommandService),
-  __decorateParam$3(4, Inject(SheetsSelectionsService)),
-  __decorateParam$3(5, IRenderManagerService),
-  __decorateParam$3(6, INumfmtService),
-  __decorateParam$3(7, Inject(ComponentManager)),
-  __decorateParam$3(8, ISidebarService),
-  __decorateParam$3(9, Inject(LocaleService))
+  __decorateParam$4(0, Inject(SheetInterceptorService)),
+  __decorateParam$4(1, Inject(ThemeService)),
+  __decorateParam$4(2, IUniverInstanceService),
+  __decorateParam$4(3, ICommandService),
+  __decorateParam$4(4, Inject(SheetsSelectionsService)),
+  __decorateParam$4(5, IRenderManagerService),
+  __decorateParam$4(6, INumfmtService),
+  __decorateParam$4(7, Inject(ComponentManager)),
+  __decorateParam$4(8, ISidebarService),
+  __decorateParam$4(9, Inject(LocaleService))
 ], NumfmtController);
-var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key2, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key2) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+var __defProp$3 = Object.defineProperty, __getOwnPropDesc$3 = Object.getOwnPropertyDescriptor, __decorateClass$3 = /* @__PURE__ */ __name((decorators, target, key2, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(target, key2) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key2, result) : decorator(result)) || result);
-  return kind && result && __defProp$2(target, key2, result), result;
-}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key2) => decorator(target, key2, index), "__decorateParam$2");
+  return kind && result && __defProp$3(target, key2, result), result;
+}, "__decorateClass$3"), __decorateParam$3 = /* @__PURE__ */ __name((index, decorator) => (target, key2) => decorator(target, key2, index), "__decorateParam$3");
 const createCollectEffectMutation = /* @__PURE__ */ __name(() => {
   let list = [];
   return {
@@ -1249,8 +1060,8 @@ const createCollectEffectMutation = /* @__PURE__ */ __name(() => {
     }, "clean")
   };
 }, "createCollectEffectMutation");
-var _a5;
-let NumfmtEditorController = (_a5 = class extends Disposable {
+var _a4;
+let NumfmtEditorController = (_a4 = class extends Disposable {
   constructor(_sheetInterceptorService, _numfmtService, _univerInstanceService, _injector, _editorBridgeService) {
     super();
     // collect effect mutations when edit end and push this to  commands stack in next commands progress
@@ -1273,11 +1084,11 @@ let NumfmtEditorController = (_a5 = class extends Disposable {
               if (numfmtCell)
                 switch (getPatternType(numfmtCell.pattern)) {
                   case "scientific":
-                  case "percent":
                   case "currency":
                   case "grouped":
                   case "number":
                     return context.worksheet.getCellRaw(row, col);
+                  case "percent":
                   case "date":
                   case "time":
                   case "datetime":
@@ -1321,21 +1132,21 @@ let NumfmtEditorController = (_a5 = class extends Disposable {
               }, "clean");
               if (!(value != null && value.v))
                 return next(value);
-              const content = String(value.v), dateInfo = numfmt.parseDate(content) || numfmt.parseTime(content);
-              if (!!dateInfo) {
-                if (dateInfo && dateInfo.z) {
-                  const v = Number(dateInfo.v);
+              const content = String(value.v), numfmtInfo = numfmt.parseDate(content) || numfmt.parseTime(content) || numfmt.parseNumber(content);
+              if (numfmtInfo) {
+                if (numfmtInfo.z) {
+                  const v = Number(numfmtInfo.v);
                   return this._collectEffectMutation.add(
                     context.unitId,
                     context.subUnitId,
                     context.row,
                     context.col,
                     {
-                      pattern: dateInfo.z
+                      pattern: numfmtInfo.z
                     }
                   ), { ...value, v, t: CellValueType.NUMBER };
                 }
-              } else (["date", "time", "datetime"].includes(currentNumfmtType) || !isNumeric(content)) && clean();
+              } else (["date", "time", "datetime", "percent"].includes(currentNumfmtType) || !isNumeric(content)) && clean();
               return next(value);
             }, "handler")
           }
@@ -1411,33 +1222,252 @@ let NumfmtEditorController = (_a5 = class extends Disposable {
       })
     );
   }
-}, __name(_a5, "NumfmtEditorController"), _a5);
-NumfmtEditorController = __decorateClass$2([
+}, __name(_a4, "NumfmtEditorController"), _a4);
+NumfmtEditorController = __decorateClass$3([
   OnLifecycle(LifecycleStages.Rendered, NumfmtEditorController),
-  __decorateParam$2(0, Inject(SheetInterceptorService)),
-  __decorateParam$2(1, Inject(INumfmtService)),
-  __decorateParam$2(2, Inject(IUniverInstanceService)),
-  __decorateParam$2(3, Inject(Injector)),
-  __decorateParam$2(4, Optional(IEditorBridgeService))
+  __decorateParam$3(0, Inject(SheetInterceptorService)),
+  __decorateParam$3(1, Inject(INumfmtService)),
+  __decorateParam$3(2, Inject(IUniverInstanceService)),
+  __decorateParam$3(3, Inject(Injector)),
+  __decorateParam$3(4, Optional(IEditorBridgeService))
 ], NumfmtEditorController);
 function isNumeric(str) {
   return /^-?\d+(\.\d+)?$/.test(str);
 }
 __name(isNumeric, "isNumeric");
-var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key2, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key2) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key2, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key2) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key2, result) : decorator(result)) || result);
-  return kind && result && __defProp$1(target, key2, result), result;
-}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key2) => decorator(target, key2, index), "__decorateParam$1"), _a6;
-let NumfmtI18nController = (_a6 = class extends Disposable {
+  return kind && result && __defProp$2(target, key2, result), result;
+}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key2) => decorator(target, key2, index), "__decorateParam$2"), _a5;
+let NumfmtI18nController = (_a5 = class extends Disposable {
   constructor(_localeService) {
     super(), this._localeService = _localeService;
   }
-}, __name(_a6, "NumfmtI18nController"), _a6);
-NumfmtI18nController = __decorateClass$1([
+}, __name(_a5, "NumfmtI18nController"), _a5);
+NumfmtI18nController = __decorateClass$2([
   OnLifecycle(LifecycleStages.Rendered, NumfmtI18nController),
-  __decorateParam$1(0, Inject(LocaleService))
+  __decorateParam$2(0, Inject(LocaleService))
 ], NumfmtI18nController);
+const MENU_OPTIONS = [
+  {
+    label: "sheet.numfmt.general",
+    pattern: null
+  },
+  {
+    label: "sheet.numfmt.text",
+    pattern: DEFAULT_TEXT_FORMAT
+  },
+  "|",
+  {
+    label: "sheet.numfmt.number",
+    pattern: "0"
+  },
+  "|",
+  {
+    label: "sheet.numfmt.accounting",
+    pattern: '"¥" #,##0.00_);[Red]("¥"#,##0.00)'
+  },
+  {
+    label: "sheet.numfmt.financialValue",
+    pattern: "#,##0.00;[Red]#,##0.00"
+  },
+  {
+    label: "sheet.numfmt.currency",
+    pattern: '"¥"#,##0.00_);[Red]("¥"#,##0.00)'
+  },
+  {
+    label: "sheet.numfmt.roundingCurrency",
+    pattern: '"¥"#,##0;[Red]"¥"#,##0'
+  },
+  "|",
+  {
+    label: "sheet.numfmt.date",
+    pattern: "yyyy-mm-dd;@"
+  },
+  {
+    label: "sheet.numfmt.time",
+    pattern: 'am/pm h":"mm":"ss'
+  },
+  {
+    label: "sheet.numfmt.dateTime",
+    pattern: "yyyy-m-d am/pm h:mm"
+  },
+  {
+    label: "sheet.numfmt.timeDuration",
+    pattern: "h:mm:ss"
+  },
+  "|",
+  {
+    label: "sheet.numfmt.moreFmt",
+    pattern: ""
+  }
+], MORE_NUMFMT_TYPE_KEY = "sheet.numfmt.moreNumfmtType", OPTIONS_KEY = "sheet.numfmt.moreNumfmtType.options", MoreNumfmtType = /* @__PURE__ */ __name((props) => {
+  var _a8;
+  const localeService = useDependency(LocaleService), value = (_a8 = props.value) != null ? _a8 : localeService.t("sheet.numfmt.general");
+  return /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "more-numfmt-type", children: value });
+}, "MoreNumfmtType"), Options = /* @__PURE__ */ __name(() => {
+  const commandService = useDependency(ICommandService), localeService = useDependency(LocaleService), injector = useInjector(), selectionManagerService = useDependency(SheetsSelectionsService), setNumfmt = /* @__PURE__ */ __name((pattern) => {
+    const selection = selectionManagerService.getCurrentLastSelection();
+    if (!selection)
+      return;
+    const textSelectionRenderManager = injector.get(ITextSelectionRenderManager), range = selection.range, values = [];
+    Range.foreach(range, (row, col) => {
+      pattern ? values.push({ row, col, pattern, type: getPatternType(pattern) }) : values.push({ row, col });
+    }), commandService.executeCommand(SetNumfmtCommand.id, { values }), textSelectionRenderManager.focus();
+  }, "setNumfmt"), handleOnclick = /* @__PURE__ */ __name((index) => {
+    if (index === 0)
+      setNumfmt(null);
+    else if (index === MENU_OPTIONS.length - 1)
+      commandService.executeCommand(OpenNumfmtPanelOperator.id);
+    else {
+      const item = MENU_OPTIONS[index];
+      item.pattern && setNumfmt(item.pattern);
+    }
+  }, "handleOnclick"), defaultValue = 1220;
+  return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "more-numfmt-type-options", children: MENU_OPTIONS.map((item, index) => item === "|" ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "line m-t-4", onClick: /* @__PURE__ */ __name((e) => e.stopPropagation(), "onClick") }, index) : /* @__PURE__ */ jsxRuntimeExports.jsxs(
+    "div",
+    {
+      className: "option-item m-t-4",
+      onClick: /* @__PURE__ */ __name(() => {
+        handleOnclick(index);
+      }, "onClick"),
+      children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: localeService.t(item.label) }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "m-l-26", children: item.pattern ? getPatternPreview(item.pattern || "", defaultValue, localeService.getCurrentLocale()).result : "" })
+      ]
+    },
+    index
+  )) });
+}, "Options"), CurrencyMenuItem = /* @__PURE__ */ __name((accessor) => ({
+  icon: new Observable((subscribe) => {
+    const menuCurrencyService = accessor.get(MenuCurrencyService);
+    function getIconKey(symbol2) {
+      return {
+        [countryCurrencyMap.US]: "DollarSingle",
+        [countryCurrencyMap.RU]: "RoubleSingle",
+        [countryCurrencyMap.CN]: "RmbSingle",
+        [countryCurrencyMap.AT]: "EuroSingle"
+      }[symbol2] || "DollarSingle";
+    }
+    __name(getIconKey, "getIconKey");
+    const symbol = countryCurrencyMap[menuCurrencyService.getCurrencySymbol()] || "$";
+    return subscribe.next(getIconKey(symbol)), menuCurrencyService.currencySymbol$.subscribe((code) => {
+      const symbol2 = countryCurrencyMap[code] || "$";
+      subscribe.next(getIconKey(symbol2));
+    });
+  }),
+  id: SetCurrencyCommand.id,
+  title: "sheet.numfmt.currency",
+  tooltip: "sheet.numfmt.currency",
+  type: MenuItemType.BUTTON,
+  group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
+  positions: [MenuPosition.TOOLBAR_START],
+  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+  disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] })
+}), "CurrencyMenuItem"), AddDecimalMenuItem = /* @__PURE__ */ __name((accessor) => ({
+  icon: "AddDigitsSingle",
+  id: AddDecimalCommand.id,
+  title: "sheet.numfmt.addDecimal",
+  tooltip: "sheet.numfmt.addDecimal",
+  type: MenuItemType.BUTTON,
+  positions: [MenuPosition.TOOLBAR_START],
+  group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
+  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+  disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] })
+}), "AddDecimalMenuItem"), SubtractDecimalMenuItem = /* @__PURE__ */ __name((accessor) => ({
+  icon: "ReduceDigitsSingle",
+  id: SubtractDecimalCommand.id,
+  title: "sheet.numfmt.subtractDecimal",
+  tooltip: "sheet.numfmt.subtractDecimal",
+  type: MenuItemType.BUTTON,
+  group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
+  positions: [MenuPosition.TOOLBAR_START],
+  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+  disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] })
+}), "SubtractDecimalMenuItem"), PercentMenuItem = /* @__PURE__ */ __name((accessor) => ({
+  icon: "PercentSingle",
+  id: SetPercentCommand.id,
+  title: "sheet.numfmt.percent",
+  tooltip: "sheet.numfmt.percent",
+  type: MenuItemType.BUTTON,
+  group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
+  positions: [MenuPosition.TOOLBAR_START],
+  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+  disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] })
+}), "PercentMenuItem"), FactoryOtherMenuItem = /* @__PURE__ */ __name((accessor) => {
+  const univerInstanceService = accessor.get(IUniverInstanceService), commandService = accessor.get(ICommandService), localeService = accessor.get(LocaleService), selectionManagerService = accessor.get(SheetsSelectionsService), value$ = deriveStateFromActiveSheet$(univerInstanceService, "", ({ workbook, worksheet }) => new Observable(
+    (subscribe) => merge(
+      selectionManagerService.selectionMoveEnd$,
+      new Observable((commandSubscribe) => {
+        const commandList = [RemoveNumfmtMutation.id, SetNumfmtMutation.id], disposable = commandService.onCommandExecuted((commandInfo) => {
+          commandList.includes(commandInfo.id) && commandSubscribe.next(null);
+        });
+        return () => disposable.dispose();
+      })
+    ).subscribe(() => {
+      var _a8, _b;
+      const selections = selectionManagerService.getCurrentSelections();
+      if (selections && selections[0]) {
+        const range = selections[0].range, row = range.startRow, col = range.startColumn, numfmtValue = (_b = workbook.getStyles().get((_a8 = worksheet.getCell(row, col)) == null ? void 0 : _a8.s)) == null ? void 0 : _b.n, pattern = numfmtValue == null ? void 0 : numfmtValue.pattern;
+        let value = localeService.t("sheet.numfmt.general");
+        if (pattern) {
+          const item = MENU_OPTIONS.filter((item2) => typeof item2 == "object" && item2.pattern).find(
+            (item2) => isPatternEqualWithoutDecimal(pattern, item2.pattern)
+          );
+          item && typeof item == "object" && item.pattern ? value = localeService.t(item.label) : value = localeService.t("sheet.numfmt.moreFmt");
+        }
+        subscribe.next(value);
+      }
+    })
+  ));
+  return {
+    label: MORE_NUMFMT_TYPE_KEY,
+    id: OpenNumfmtPanelOperator.id,
+    tooltip: "sheet.numfmt.title",
+    type: MenuItemType.SELECTOR,
+    group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
+    positions: [MenuPosition.TOOLBAR_START],
+    selections: [
+      {
+        label: {
+          name: OPTIONS_KEY,
+          hoverable: !1
+        }
+      }
+    ],
+    value$,
+    hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+    disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] })
+  };
+}, "FactoryOtherMenuItem");
+var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key2, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key2) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key2, result) : decorator(result)) || result);
+  return kind && result && __defProp$1(target, key2, result), result;
+}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key2) => decorator(target, key2, index), "__decorateParam$1");
+const DefaultSheetNumfmtConfig = {};
+var _a6;
+let NumfmtMenuController = (_a6 = class extends Disposable {
+  constructor(_config, _injector, _componentManager, _menuService) {
+    super();
+    __publicField(this, "_currencySymbol$", new BehaviorSubject("US"));
+    __publicField(this, "currencySymbol$", this._currencySymbol$.asObservable());
+    this._config = _config, this._injector = _injector, this._componentManager = _componentManager, this._menuService = _menuService, this._initMenu();
+  }
+  _initMenu() {
+    const { menu = {} } = this._config;
+    [PercentMenuItem, AddDecimalMenuItem, SubtractDecimalMenuItem, CurrencyMenuItem, FactoryOtherMenuItem].forEach((factory) => {
+      this.disposeWithMe(this._menuService.addMenuItem(factory(this._injector), menu));
+    }), this.disposeWithMe(this._componentManager.register(MORE_NUMFMT_TYPE_KEY, MoreNumfmtType)), this.disposeWithMe(this._componentManager.register(OPTIONS_KEY, Options));
+  }
+}, __name(_a6, "NumfmtMenuController"), _a6);
+NumfmtMenuController = __decorateClass$1([
+  OnLifecycle(LifecycleStages.Rendered, NumfmtMenuController),
+  __decorateParam$1(1, Inject(Injector)),
+  __decorateParam$1(2, Inject(ComponentManager)),
+  __decorateParam$1(3, Inject(IMenuService))
+], NumfmtMenuController);
 var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __defNormalProp2 = /* @__PURE__ */ __name((obj, key2, value) => key2 in obj ? __defProp2(obj, key2, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key2] = value, "__defNormalProp"), __decorateClass = /* @__PURE__ */ __name((decorators, target, key2, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key2) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key2, result) : decorator(result)) || result);
@@ -1445,10 +1475,7 @@ var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnProperty
 }, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key2) => decorator(target, key2, index), "__decorateParam"), __publicField2 = /* @__PURE__ */ __name((obj, key2, value) => __defNormalProp2(obj, typeof key2 != "symbol" ? key2 + "" : key2, value), "__publicField"), _a7;
 let UniverSheetsNumfmtPlugin = (_a7 = class extends Plugin {
   constructor(_config = {}, _injector) {
-    super(), this._config = _config, this._injector = _injector, this._config = Tools.deepMerge({}, DefaultSheetNumfmtConfig, this._config);
-  }
-  onStarting() {
-    this._injector.add([INumfmtController, { useClass: NumfmtController, lazy: !1 }]), this._injector.add([NumfmtEditorController]), this._injector.add([UserHabitController]), this._injector.add([SheetsNumfmtCellContentController]), this._injector.add([NumfmtI18nController]), this._injector.add(
+    super(), this._config = _config, this._injector = _injector, this._config = Tools.deepMerge({}, DefaultSheetNumfmtConfig, this._config), this._injector.add([INumfmtController, { useClass: NumfmtController, lazy: !1 }]), this._injector.add([NumfmtEditorController]), this._injector.add([UserHabitController]), this._injector.add([SheetsNumfmtCellContentController]), this._injector.add([NumfmtI18nController]), this._injector.add([MenuCurrencyService]), this._injector.add(
       [
         NumfmtMenuController,
         {