@univerjs/sheets-data-validation-ui 0.10.5 → 0.10.6-experimental.20250904-44da50e

package/lib/es/index.js

@@ -1,16 +1,16 @@
 var Tr = Object.defineProperty;
 var Pr = (e, t, r) => t in e ? Tr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var V = (e, t, r) => Pr(e, typeof t != "symbol" ? t + "" : t, r);
-import { Disposable as ye, UniverInstanceType as X, toDisposable as Ar, IUniverInstanceService as ce, Inject as M, LocaleService as ue, DataValidationErrorStyle as lt, DataValidationStatus as Ze, ICommandService as te, Injector as be, IConfigService as sn, DataValidationRenderMode as se, DisposableCollection as Lr, dayjs as In, numfmt as $n, CellValueType as kr, CommandType as rt, DataValidationType as j, ObjectMatrix as It, Range as Nr, Rectangle as Rt, queryObjectMatrix as Kt, Optional as Ur, RxDisposable as ln, InterceptorEffectEnum as jn, sequenceExecute as Yn, bufferDebounceTime as Fr, debounce as xr, UndoCommand as Br, RedoCommand as Wr, isUnitRangesEqual as Hr, shallowEqual as Rn, ThemeService as Xn, ColorKit as $r, isFormulaString as Oe, generateRandomId as yn, VerticalAlign as de, HorizontalAlign as Re, DEFAULT_STYLES as ae, WrapStrategy as me, Plugin as Zn, merge as Kn, DependentOn as jr } from "@univerjs/core";
+import { Disposable as ye, UniverInstanceType as X, toDisposable as Ar, IUniverInstanceService as ce, Inject as M, LocaleService as ue, DataValidationErrorStyle as lt, DataValidationStatus as Ze, ICommandService as te, Injector as be, IConfigService as ln, DataValidationRenderMode as se, DisposableCollection as Lr, dayjs as Nt, numfmt as $n, CellValueType as kr, CommandType as rt, DataValidationType as j, ObjectMatrix as It, Range as Nr, Rectangle as Rt, queryObjectMatrix as zt, Optional as Ur, RxDisposable as dn, InterceptorEffectEnum as jn, sequenceExecute as Yn, bufferDebounceTime as Fr, debounce as xr, UndoCommand as Br, RedoCommand as Wr, isUnitRangesEqual as Hr, shallowEqual as Rn, ThemeService as Xn, ColorKit as $r, isFormulaString as Oe, generateRandomId as yn, VerticalAlign as de, HorizontalAlign as Re, DEFAULT_STYLES as ae, WrapStrategy as me, Plugin as Zn, merge as Kn, DependentOn as jr } from "@univerjs/core";
 import { DeviceInputEventType as gt, IRenderManagerService as xe, fixLineWidthByScale as bn, Transform as Yr, CheckboxShape as Xr, getCurrentTypeOfRenderer as Ke, CURSOR_TYPE as ze, FontCache as Zr, Shape as Kr, Rect as zn, getFontStyleString as Te, DocSimpleSkeleton as it, Text as Mn } from "@univerjs/engine-render";
-import { SheetInterceptorService as dn, VALIDATE_CELL as zr, SheetsSelectionsService as Gn, SetRangeValuesCommand as st, getSheetCommandTarget as qn, rangeToDiscreteRange as Gr, SheetPermissionCheckController as qr, WorksheetEditPermission as zt, WorksheetSetCellStylePermission as Gt, RangeProtectionPermissionEditPoint as qt, WorkbookEditablePermission as Jt, INTERCEPTOR_POINT as Jn, InterceptCellContentPriority as Qn, checkRangesEditablePermission as Jr } from "@univerjs/sheets";
-import { SheetDataValidationModel as ie, SheetsDataValidationValidatorService as Qr, getDataValidationCellValue as Nt, getCellValueOrigin as re, serializeListOptions as er, createDefaultNewRule as tr, AddSheetDataValidationCommand as cn, DATA_VALIDATION_PLUGIN_NAME as nr, getDataValidationDiffMutations as Qt, UpdateSheetDataValidationRangeCommand as rr, DataValidationCacheService as ir, UpdateSheetDataValidationSettingCommand as En, UpdateSheetDataValidationOptionsCommand as ei, RemoveSheetDataValidationCommand as or, RemoveSheetAllDataValidationCommand as ti, DataValidationFormulaController as ni, deserializeListOptions as ri, CUSTOM_FORMULA_INPUT_NAME as ar, BASE_FORMULA_INPUT_NAME as Pt, LIST_FORMULA_INPUT_NAME as un, CHECKBOX_FORMULA_INPUT_NAME as sr, DataValidationFormulaService as ii, CHECKBOX_FORMULA_2 as oi, CHECKBOX_FORMULA_1 as ai, getFormulaResult as Ut, isLegalFormulaResult as Dn, transformCheckboxValue as si, UniverSheetsDataValidationPlugin as li } from "@univerjs/sheets-data-validation";
-import { DataValidatorRegistryService as Me, DataValidatorDropdownType as ve, DataValidationModel as hn, DataValidatorRegistryScope as di, TWO_FORMULA_OPERATOR_COUNT as ci, getRuleOptions as Vn, getRuleSetting as On } from "@univerjs/data-validation";
-import { ISidebarService as lr, IDialogService as ui, IZenZoneService as dr, KeyCode as vt, MenuItemType as pn, getMenuHiddenObservable as hi, RibbonDataGroup as pi, IMenuManagerService as gi, useDependency as F, ComponentManager as gn, useObservable as Ae, useEvent as en, useSidebarClick as cr } from "@univerjs/ui";
-import { filter as vn, BehaviorSubject as Tn, distinctUntilChanged as vi, Subject as fi, debounceTime as ur, bufferTime as hr, of as mi } from "rxjs";
+import { SheetInterceptorService as cn, VALIDATE_CELL as zr, SheetsSelectionsService as Gn, SetRangeValuesCommand as st, getSheetCommandTarget as qn, rangeToDiscreteRange as Gr, SheetPermissionCheckController as qr, WorksheetEditPermission as Gt, WorksheetSetCellStylePermission as qt, RangeProtectionPermissionEditPoint as Jt, WorkbookEditablePermission as Qt, INTERCEPTOR_POINT as Jn, InterceptCellContentPriority as Qn, checkRangesEditablePermission as Jr } from "@univerjs/sheets";
+import { SheetDataValidationModel as ie, SheetsDataValidationValidatorService as Qr, getDataValidationCellValue as Ut, getCellValueOrigin as re, serializeListOptions as er, createDefaultNewRule as tr, AddSheetDataValidationCommand as un, DATA_VALIDATION_PLUGIN_NAME as nr, getDataValidationDiffMutations as en, UpdateSheetDataValidationRangeCommand as rr, DataValidationCacheService as ir, UpdateSheetDataValidationSettingCommand as En, UpdateSheetDataValidationOptionsCommand as ei, RemoveSheetDataValidationCommand as or, RemoveSheetAllDataValidationCommand as ti, DataValidationFormulaController as ni, deserializeListOptions as ri, CUSTOM_FORMULA_INPUT_NAME as ar, BASE_FORMULA_INPUT_NAME as Pt, LIST_FORMULA_INPUT_NAME as hn, CHECKBOX_FORMULA_INPUT_NAME as sr, DataValidationFormulaService as ii, CHECKBOX_FORMULA_2 as oi, CHECKBOX_FORMULA_1 as ai, getFormulaResult as Ft, isLegalFormulaResult as Dn, transformCheckboxValue as si, UniverSheetsDataValidationPlugin as li } from "@univerjs/sheets-data-validation";
+import { DataValidatorRegistryService as Me, DataValidatorDropdownType as ve, DataValidationModel as pn, DataValidatorRegistryScope as di, TWO_FORMULA_OPERATOR_COUNT as ci, getRuleOptions as Vn, getRuleSetting as On } from "@univerjs/data-validation";
+import { ISidebarService as lr, IDialogService as ui, IZenZoneService as dr, KeyCode as vt, MenuItemType as gn, getMenuHiddenObservable as hi, RibbonDataGroup as pi, IMenuManagerService as gi, useDependency as F, ComponentManager as vn, useObservable as Ae, useEvent as tn, useSidebarClick as cr } from "@univerjs/ui";
+import { filter as fn, BehaviorSubject as Tn, distinctUntilChanged as vi, Subject as fi, debounceTime as ur, bufferTime as hr, of as mi } from "rxjs";
 import { getPatternType as _i } from "@univerjs/sheets-numfmt";
-import { ISheetCellDropdownManagerService as Si, IEditorBridgeService as pr, SetCellEditVisibleOperation as ft, HoverManagerService as Ci, CellAlertManagerService as wi, CellAlertType as Ii, IAutoFillService as Ri, APPLY_TYPE as ot, virtualizeDiscreteRanges as tn, getAutoFillRepeatRange as yi, ISheetClipboardService as bi, COPY_TYPE as Pn, PREDEFINED_HOOK_NAME as mt, getRepeatRange as An, getCurrentRangeDisable$ as Mi, AutoHeightController as gr, SheetSkeletonManagerService as dt, IMarkSelectionService as Ei } from "@univerjs/sheets-ui";
-import { Button as Ge, FormLayout as Y, RadioGroup as fn, Radio as Le, Checkbox as At, Input as ke, Select as Ln, clsx as Ue, borderClassName as yt, DraggableList as Di, Dropdown as Vi } from "@univerjs/design";
+import { ISheetCellDropdownManagerService as Si, IEditorBridgeService as pr, SetCellEditVisibleOperation as ft, HoverManagerService as Ci, CellAlertManagerService as wi, CellAlertType as Ii, IAutoFillService as Ri, APPLY_TYPE as ot, virtualizeDiscreteRanges as nn, getAutoFillRepeatRange as yi, ISheetClipboardService as bi, COPY_TYPE as Pn, PREDEFINED_HOOK_NAME as mt, getRepeatRange as An, getCurrentRangeDisable$ as Mi, AutoHeightController as gr, SheetSkeletonManagerService as dt, IMarkSelectionService as Ei } from "@univerjs/sheets-ui";
+import { Button as Ge, FormLayout as Y, RadioGroup as mn, Radio as Le, Checkbox as At, Input as ke, Select as Ln, clsx as Ue, borderClassName as yt, DraggableList as Di, Dropdown as Vi } from "@univerjs/design";
 import { createElement as Ie, forwardRef as Be, useRef as pt, useState as W, useMemo as ct, useEffect as Ne } from "react";
 import { jsxs as $, Fragment as ut, jsx as S } from "react/jsx-runtime";
 import { deserializeRangeWithSheet as Oi, serializeRange as vr } from "@univerjs/engine-formula";
@@ -30,7 +30,7 @@ let Se = class extends ye {
     V(this, "activeRule$", this._activeRule$.asObservable());
     V(this, "_closeDisposable", null);
     this._univerInstanceService = t, this._sidebarService = r, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(X.UNIVER_SHEET).pipe(vn((n) => !n)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(X.UNIVER_SHEET).pipe(fn((n) => !n)).subscribe(() => {
         this.close();
       })
     ), this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((n) => {
@@ -69,7 +69,7 @@ Se = Ai([
   kn(0, ce),
   kn(1, lr)
 ], Se);
-const Pe = "#ECECEC", mn = "sheets-data-validation-ui.config", bt = {};
+const Pe = "#ECECEC", _n = "sheets-data-validation-ui.config", bt = {};
 var Li = Object.getOwnPropertyDescriptor, ki = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Li(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
@@ -144,7 +144,7 @@ let qe = class extends ye {
   }
 };
 qe = ki([
-  $e(0, M(dn)),
+  $e(0, M(cn)),
   $e(1, M(ie)),
   $e(2, M(Me)),
   $e(3, ui),
@@ -156,12 +156,13 @@ var Ni = Object.getOwnPropertyDescriptor, Ui = (e, t, r, n) => {
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, pe = (e, t) => (r, n) => t(r, n, e);
-const Ft = (e) => {
+const xt = (e) => {
   if (e == null || typeof e == "boolean")
     return;
+  if (e === "") return Nt();
   if (typeof e == "number" || !Number.isNaN(+e))
-    return In($n.format("yyyy-MM-dd HH:mm:ss", Number(e)));
-  const t = In(e);
+    return Nt($n.format("yyyy-MM-dd HH:mm:ss", Number(e)));
+  const t = Nt(e);
   if (t.isValid())
     return t;
 };
@@ -276,7 +277,7 @@ let Fe = class extends ye {
     let m;
     switch (u.dropdownType) {
       case ve.DATE: {
-        const v = re(s.getCellRaw(n, i)), I = Ft(v), w = !!((b = d.bizInfo) != null && b.showTime);
+        const v = re(s.getCellRaw(n, i)), I = xt(v), w = !!((b = d.bizInfo) != null && b.showTime);
         m = {
           location: r,
           type: "datepicker",
@@ -290,7 +291,7 @@ let Fe = class extends ye {
         break;
       }
       case ve.TIME: {
-        const v = re(s.getCellRaw(n, i)), I = Ft(v);
+        const v = re(s.getCellRaw(n, i)), I = xt(v);
         m = {
           location: r,
           type: "datepicker",
@@ -303,7 +304,7 @@ let Fe = class extends ye {
         break;
       }
       case ve.DATETIME: {
-        const v = re(s.getCellRaw(n, i)), I = Ft(v);
+        const v = re(s.getCellRaw(n, i)), I = xt(v);
         m = {
           location: r,
           type: "datepicker",
@@ -340,7 +341,7 @@ let Fe = class extends ye {
             unitId: o,
             keycode: vt.ESC
           }), !v;
-        }, w = (d == null ? void 0 : d.renderMode) === se.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, _ = u.getListWithColor(d, o, a), R = Nt(s.getCellRaw(n, i)), L = () => {
+        }, w = (d == null ? void 0 : d.renderMode) === se.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, _ = u.getListWithColor(d, o, a), R = Ut(s.getCellRaw(n, i)), L = () => {
           this._commandService.executeCommand(We.id, {
             ruleId: d.uid
           }), h == null || h.dispose();
@@ -358,7 +359,7 @@ let Fe = class extends ye {
             onEdit: L,
             defaultValue: R,
             multiple: v,
-            showEdit: (g = (y = this._configService.getConfig(mn)) == null ? void 0 : y.showEditOnDropdown) != null ? g : !0
+            showEdit: (g = (y = this._configService.getConfig(_n)) == null ? void 0 : y.showEditOnDropdown) != null ? g : !0
           }
         };
         break;
@@ -391,7 +392,7 @@ let Fe = class extends ye {
                 keycode: vt.ESC
               }), !0;
             },
-            defaultValue: Nt(s.getCellRaw(n, i)).split("/"),
+            defaultValue: Ut(s.getCellRaw(n, i)).split("/"),
             options: JSON.parse((C = d.formula1) != null ? C : "[]")
           },
           location: r
@@ -426,7 +427,7 @@ let Fe = class extends ye {
                 keycode: vt.ESC
               }), !0;
             },
-            defaultValue: Nt(s.getCellRaw(n, i))
+            defaultValue: Ut(s.getCellRaw(n, i))
           },
           location: r
         };
@@ -492,7 +493,7 @@ Fe = Ui([
   pe(7, te),
   pe(8, pr),
   pe(9, M(be)),
-  pe(10, sn)
+  pe(10, ln)
 ], Fe);
 const Mt = "DataValidationPanel", We = {
   id: "data-validation.operation.open-validation-panel",
@@ -500,7 +501,7 @@ const Mt = "DataValidationPanel", We = {
   handler(e, t) {
     if (!t)
       return !1;
-    const { ruleId: r, isAdd: n } = t, i = e.get(Se), o = e.get(hn), a = e.get(ce), l = e.get(lr), s = qn(a);
+    const { ruleId: r, isAdd: n } = t, i = e.get(Se), o = e.get(pn), a = e.get(ce), l = e.get(lr), s = qn(a);
     if (!s) return !1;
     const { unitId: d, subUnitId: u } = s, h = r ? o.getRuleById(d, u, r) : void 0;
     i.open(), i.setActiveRule(h && {
@@ -517,7 +518,7 @@ const Mt = "DataValidationPanel", We = {
     });
     return i.setCloseDisposable(c), !0;
   }
-}, _n = {
+}, Sn = {
   id: "data-validation.operation.close-validation-panel",
   type: rt.OPERATION,
   handler(e) {
@@ -528,7 +529,7 @@ const Mt = "DataValidationPanel", We = {
   type: rt.OPERATION,
   handler(e) {
     const t = e.get(te), r = e.get(Se);
-    return r.open(), r.isOpen ? t.executeCommand(_n.id) : t.executeCommand(We.id), !0;
+    return r.open(), r.isOpen ? t.executeCommand(Sn.id) : t.executeCommand(We.id), !0;
   }
 }, Lt = {
   type: rt.OPERATION,
@@ -561,7 +562,7 @@ const Mt = "DataValidationPanel", We = {
       unitId: l,
       subUnitId: s
     };
-    return a.syncExecuteCommand(cn.id, d) ? (a.syncExecuteCommand(We.id, {
+    return a.syncExecuteCommand(un.id, d) ? (a.syncExecuteCommand(We.id, {
       ruleId: o.uid,
       isAdd: !0
     }), !0) : !1;
@@ -635,7 +636,7 @@ var Wi = Object.getOwnPropertyDescriptor, Hi = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Wi(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, xt = (e, t) => (r, n) => t(r, n, e);
+}, Bt = (e, t) => (r, n) => t(r, n, e);
 let Je = class extends ye {
   constructor(e, t, r) {
     super(), this._autoFillService = e, this._sheetDataValidationModel = t, this._injector = r, this._initAutoFill();
@@ -643,7 +644,7 @@ let Je = class extends ye {
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const e = () => ({ redos: [], undos: [] }), t = (n, i) => {
-      const { source: o, target: a, unitId: l, subUnitId: s } = n, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = tn([o, a]), [h, c] = u.ranges, { mapFunc: m } = u, p = {
+      const { source: o, target: a, unitId: l, subUnitId: s } = n, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = nn([o, a]), [h, c] = u.ranges, { mapFunc: m } = u, p = {
         row: h.startRow,
         col: h.startColumn
       }, b = yi(h, c), y = new It(), g = /* @__PURE__ */ new Set();
@@ -680,9 +681,9 @@ let Je = class extends ye {
           y.setValue(ne, oe, B), g.add(B);
         });
       });
-      const C = Array.from(g).map((_) => ({ id: _, ranges: Kt(y, (R) => R === _) }));
+      const C = Array.from(g).map((_) => ({ id: _, ranges: zt(y, (R) => R === _) }));
       d.addRangeRules(C);
-      const v = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: I, undoMutations: w } = Qt(l, s, v, this._injector, "patched", i === ot.ONLY_FORMAT);
+      const v = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: I, undoMutations: w } = en(l, s, v, this._injector, "patched", i === ot.ONLY_FORMAT);
       return {
         undos: w,
         redos: I
@@ -708,15 +709,15 @@ let Je = class extends ye {
   }
 };
 Je = Hi([
-  xt(0, Ri),
-  xt(1, M(ie)),
-  xt(2, M(be))
+  Bt(0, Ri),
+  Bt(1, M(ie)),
+  Bt(2, M(be))
 ], Je);
 var $i = Object.getOwnPropertyDescriptor, ji = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? $i(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Bt = (e, t) => (r, n) => t(r, n, e);
+}, Wt = (e, t) => (r, n) => t(r, n, e);
 let Qe = class extends ye {
   constructor(t, r, n) {
     super();
@@ -768,7 +769,7 @@ let Qe = class extends ye {
       return { redos: [], undos: [] };
     const { unitId: i, subUnitId: o } = this._copyInfo;
     if (r.unitId !== i || o !== r.subUnitId) {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(r.unitId, r.subUnitId).clone(), l = new It(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = tn([r.copyRange, t]), c = An(d, u, !0), m = /* @__PURE__ */ new Map();
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(r.unitId, r.subUnitId).clone(), l = new It(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = nn([r.copyRange, t]), c = An(d, u, !0), m = /* @__PURE__ */ new Map();
       c.forEach(({ startRange: g }) => {
         var C;
         (C = this._copyInfo) == null || C.matrix.forValue((v, I, w) => {
@@ -786,9 +787,9 @@ let Qe = class extends ye {
           s.add(R), l.setValue(N, E, R);
         });
       });
-      const p = Array.from(s).map((g) => ({ id: g, ranges: Kt(l, (C) => C === g) }));
+      const p = Array.from(s).map((g) => ({ id: g, ranges: zt(l, (C) => C === g) }));
       a.addRangeRules(p);
-      const { redoMutations: b, undoMutations: y } = Qt(
+      const { redoMutations: b, undoMutations: y } = en(
         r.unitId,
         r.subUnitId,
         a.diffWithAddition(this._sheetDataValidationModel.getRules(r.unitId, r.subUnitId), m.values()),
@@ -801,7 +802,7 @@ let Qe = class extends ye {
         undos: y
       };
     } else {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(i, o).clone(), l = new It(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = tn([r.copyRange, t]);
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(i, o).clone(), l = new It(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = nn([r.copyRange, t]);
       An(d, u, !0).forEach(({ startRange: y }) => {
         var g;
         (g = this._copyInfo) == null || g.matrix.forValue((C, v, I) => {
@@ -817,9 +818,9 @@ let Qe = class extends ye {
           l.setValue(_, R, I), s.add(I);
         });
       });
-      const m = Array.from(s).map((y) => ({ id: y, ranges: Kt(l, (g) => g === y) }));
+      const m = Array.from(s).map((y) => ({ id: y, ranges: zt(l, (g) => g === y) }));
       a.addRangeRules(m);
-      const { redoMutations: p, undoMutations: b } = Qt(
+      const { redoMutations: p, undoMutations: b } = en(
         i,
         o,
         a.diff(this._sheetDataValidationModel.getRules(i, o)),
@@ -835,15 +836,15 @@ let Qe = class extends ye {
   }
 };
 Qe = ji([
-  Bt(0, bi),
-  Bt(1, M(ie)),
-  Bt(2, M(be))
+  Wt(0, bi),
+  Wt(1, M(ie)),
+  Wt(2, M(be))
 ], Qe);
 var Yi = Object.getOwnPropertyDescriptor, Xi = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Yi(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Wt = (e, t) => (r, n) => t(r, n, e);
+}, Ht = (e, t) => (r, n) => t(r, n, e);
 let et = class extends ye {
   constructor(e, t, r) {
     super(), this._localeService = e, this._commandService = t, this._sheetPermissionCheckController = r, this._commandExecutedListener();
@@ -851,47 +852,47 @@ let et = class extends ye {
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((e) => {
-        e.id === cn.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
-          workbookTypes: [Jt],
-          rangeTypes: [qt],
-          worksheetTypes: [zt, Gt]
+        e.id === un.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
+          workbookTypes: [Qt],
+          rangeTypes: [Jt],
+          worksheetTypes: [Gt, qt]
         }) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"))), e.id === rr.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
-          workbookTypes: [Jt],
-          rangeTypes: [qt],
-          worksheetTypes: [zt, Gt]
+          workbookTypes: [Qt],
+          rangeTypes: [Jt],
+          worksheetTypes: [Gt, qt]
         }, e.params.ranges) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr")));
       })
     );
   }
 };
 et = Xi([
-  Wt(0, M(ue)),
-  Wt(1, te),
-  Wt(2, M(qr))
+  Ht(0, M(ue)),
+  Ht(1, te),
+  Ht(2, M(qr))
 ], et);
 const Sr = "sheet.menu.data-validation";
 function Zi(e) {
   return {
     id: Sr,
-    type: pn.SUBITEMS,
+    type: gn.SUBITEMS,
     icon: "DataValidationIcon",
     tooltip: "dataValidation.title",
     hidden$: hi(e, X.UNIVER_SHEET),
-    disabled$: Mi(e, { workbookTypes: [Jt], worksheetTypes: [Gt, zt], rangeTypes: [qt] })
+    disabled$: Mi(e, { workbookTypes: [Qt], worksheetTypes: [qt, Gt], rangeTypes: [Jt] })
   };
 }
 function Ki(e) {
   return {
     id: We.id,
     title: "dataValidation.panel.title",
-    type: pn.BUTTON
+    type: gn.BUTTON
   };
 }
 function zi(e) {
   return {
     id: kt.id,
     title: "dataValidation.panel.add",
-    type: pn.BUTTON
+    type: gn.BUTTON
   };
 }
 const Gi = {
@@ -921,7 +922,7 @@ const wr = {
     color: "#fe4b4b"
   }
 };
-let tt = class extends ln {
+let tt = class extends dn {
   constructor(e, t, r, n, i, o, a, l, s, d, u) {
     super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = r, this._univerInstanceService = n, this._autoHeightController = i, this._dropdownManagerService = o, this._sheetDataValidationModel = a, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = d, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
@@ -1060,7 +1061,7 @@ let tt = class extends ln {
     this._sheetDataValidationModel.ruleChange$.pipe(
       // patched data-validation change don't need to re-calc row height
       // re-calc of row height will be triggered precisely by the origin command
-      vn((e) => e.source === "command"),
+      fn((e) => e.source === "command"),
       hr(100)
     ).subscribe((e) => {
       if (e.length === 0)
@@ -1085,11 +1086,11 @@ tt = Cr([
   K(5, M(Fe)),
   K(6, M(ie)),
   K(7, M(Me)),
-  K(8, M(dn)),
+  K(8, M(cn)),
   K(9, M(ir)),
   K(10, Ur(pr))
 ], tt);
-let Nn = class extends ln {
+let Nn = class extends dn {
   constructor(e, t, r, n, i, o, a) {
     super(), this._commandService = e, this._renderManagerService = t, this._autoHeightController = r, this._dataValidatorRegistryService = n, this._sheetInterceptorService = i, this._sheetDataValidationModel = o, this._dataValidationCacheService = a, this._initViewModelIntercept(), this._initAutoHeight();
   }
@@ -1171,7 +1172,7 @@ let Nn = class extends ln {
   }
   _initAutoHeight() {
     this._sheetDataValidationModel.ruleChange$.pipe(
-      vn((e) => e.source === "command"),
+      fn((e) => e.source === "command"),
       hr(16)
     ).subscribe((e) => {
       const t = [];
@@ -1190,7 +1191,7 @@ Nn = Cr([
   K(1, xe),
   K(2, M(gr)),
   K(3, M(Me)),
-  K(4, M(dn)),
+  K(4, M(cn)),
   K(5, M(ie)),
   K(6, M(ir))
 ], Nn);
@@ -1277,14 +1278,14 @@ var io = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none
   }));
 });
 Rr.displayName = "DataValidationIcon";
-var oo = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993 0.866699 5.9313 0.866699H10.069C10.4004 0.866699 10.669 1.13533 10.669 1.4667C10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443C14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928L9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171C10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778L9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539C9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263L6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539C5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778L6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Sn = Be(function(e, t) {
+var oo = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993 0.866699 5.9313 0.866699H10.069C10.4004 0.866699 10.669 1.13533 10.669 1.4667C10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443C14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928L9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171C10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778L9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539C9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263L6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539C5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778L6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Cn = Be(function(e, t) {
   return Ie(He, Object.assign({}, e, {
     id: "delete-icon",
     ref: t,
     icon: oo
   }));
 });
-Sn.displayName = "DeleteIcon";
+Cn.displayName = "DeleteIcon";
 var ao = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z" } }] }, yr = Be(function(e, t) {
   return Ie(He, Object.assign({}, e, {
     id: "increase-icon",
@@ -1293,14 +1294,14 @@ var ao = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none
   }));
 });
 yr.displayName = "IncreaseIcon";
-var so = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M11.3536 6.14645C11.5488 6.34171 11.5488 6.65829 11.3536 6.85355L8.35355 9.85355C8.15829 10.0488 7.84171 10.0488 7.64645 9.85355L4.64645 6.85355C4.45118 6.65829 4.45118 6.34171 4.64645 6.14645C4.84171 5.95118 5.15829 5.95118 5.35355 6.14645L8 8.79289L10.6464 6.14645C10.8417 5.95118 11.1583 5.95118 11.3536 6.14645Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Cn = Be(function(e, t) {
+var so = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M11.3536 6.14645C11.5488 6.34171 11.5488 6.65829 11.3536 6.85355L8.35355 9.85355C8.15829 10.0488 7.84171 10.0488 7.64645 9.85355L4.64645 6.85355C4.45118 6.65829 4.45118 6.34171 4.64645 6.14645C4.84171 5.95118 5.15829 5.95118 5.35355 6.14645L8 8.79289L10.6464 6.14645C10.8417 5.95118 11.1583 5.95118 11.3536 6.14645Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, wn = Be(function(e, t) {
   return Ie(He, Object.assign({}, e, {
     id: "more-down-icon",
     ref: t,
     icon: so
   }));
 });
-Cn.displayName = "MoreDownIcon";
+wn.displayName = "MoreDownIcon";
 var lo = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M4.64645 9.85355C4.45118 9.65829 4.45118 9.34171 4.64645 9.14645L7.64645 6.14645C7.84171 5.95118 8.15829 5.95118 8.35355 6.14645L11.3536 9.14645C11.5488 9.34171 11.5488 9.65829 11.3536 9.85355C11.1583 10.0488 10.8417 10.0488 10.6464 9.85355L8 7.20711L5.35355 9.85355C5.15829 10.0488 4.84171 10.0488 4.64645 9.85355Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, br = Be(function(e, t) {
   return Ie(He, Object.assign({}, e, {
     id: "more-up-icon",
@@ -1319,7 +1320,7 @@ var co = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none
 Mr.displayName = "SequenceIcon";
 function uo(e) {
   var d;
-  const t = F(ue), r = F(gn), { value: n, onChange: i, extraComponent: o } = e, [a, l] = W(!1), s = o ? r.get(o) : null;
+  const t = F(ue), r = F(vn), { value: n, onChange: i, extraComponent: o } = e, [a, l] = W(!1), s = o ? r.get(o) : null;
   return /* @__PURE__ */ $(ut, { children: [
     /* @__PURE__ */ $(
       "div",
@@ -1328,7 +1329,7 @@ function uo(e) {
         onClick: () => l(!a),
         children: [
           t.t("dataValidation.panel.options"),
-          a ? /* @__PURE__ */ S(br, { className: "univer-ml-1" }) : /* @__PURE__ */ S(Cn, { className: "univer-ml-1" })
+          a ? /* @__PURE__ */ S(br, { className: "univer-ml-1" }) : /* @__PURE__ */ S(wn, { className: "univer-ml-1" })
         ]
       }
     ),
@@ -1339,7 +1340,7 @@ function uo(e) {
         {
           label: t.t("dataValidation.panel.invalid"),
           children: /* @__PURE__ */ $(
-            fn,
+            mn,
             {
               value: `${(d = n.errorStyle) != null ? d : lt.WARNING}`,
               onChange: (u) => i({ ...n, errorStyle: +u }),
@@ -1385,7 +1386,7 @@ function po(e, t, r) {
 }
 function go() {
   var D, U;
-  const [e, t] = W(0), r = F(Se), n = Ae(r.activeRule$, r.activeRule), { unitId: i, subUnitId: o, rule: a } = n || {}, l = a.uid, s = F(Me), d = F(ce), u = F(gn), h = F(te), c = F(hn), m = F(ue), [p, b] = W(a), y = s.getValidatorItem(p.type), [g, C] = W(!1), v = s.getValidatorsByScope(di.SHEET), [I, w] = W(() => p.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), _ = ct(() => ho(h), [h]), [R, L] = W(!1), [N, E] = W(!1), T = pt(null), O = F(Gn);
+  const [e, t] = W(0), r = F(Se), n = Ae(r.activeRule$, r.activeRule), { unitId: i, subUnitId: o, rule: a } = n || {}, l = a.uid, s = F(Me), d = F(ce), u = F(vn), h = F(te), c = F(pn), m = F(ue), [p, b] = W(a), y = s.getValidatorItem(p.type), [g, C] = W(!1), v = s.getValidatorsByScope(di.SHEET), [I, w] = W(() => p.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), _ = ct(() => ho(h), [h]), [R, L] = W(!1), [N, E] = W(!1), T = pt(null), O = F(Gn);
   if (Ne(() => () => {
     const f = O.getCurrentLastSelection();
     f && O.setSelections([f]);
@@ -1401,11 +1402,11 @@ function go() {
   const P = y.operators, k = y.operatorNames, H = p.operator ? ci.includes(p.operator) : !1, B = () => {
     var f, A, x;
     (A = (f = T.current) == null ? void 0 : f.editor) != null && A.isFocus() && J((x = T.current) == null ? void 0 : x.getValue()), !(!p.ranges.length || R) && (y.validatorFormula(p, i, o).success ? r.setActiveRule(null) : C(!0));
-  }, J = en((f) => {
+  }, J = tn((f) => {
     const A = f.split(",").filter(Boolean).map(Oi).map((ee) => {
-      const wn = ee.sheetName;
-      if (wn) {
-        const Or = po(d, ee.unitId, wn);
+      const In = ee.sheetName;
+      if (In) {
+        const Or = po(d, ee.unitId, In);
         return { ...ee, sheetId: Or };
       }
       return {
@@ -1665,7 +1666,7 @@ const vo = (e) => {
           {
             className: "univer-absolute univer-right-2 univer-top-[19px] univer-flex univer-h-5 univer-w-5 univer-items-center univer-justify-center univer-rounded hover:univer-bg-gray-200 dark:!univer-text-gray-300 dark:hover:!univer-bg-gray-700",
             onClick: y,
-            children: /* @__PURE__ */ S(Sn, {})
+            children: /* @__PURE__ */ S(Cn, {})
           }
         ) : null
       ]
@@ -1689,7 +1690,7 @@ function fo(e) {
       subUnitId: c,
       rule: C
     };
-    await n.executeCommand(cn.id, v), o.setActiveRule({
+    await n.executeCommand(un.id, v), o.setActiveRule({
       unitId: h,
       subUnitId: c,
       rule: C
@@ -1924,7 +1925,7 @@ const wo = [
                 style: { background: t }
               }
             ),
-            /* @__PURE__ */ S(Cn, {})
+            /* @__PURE__ */ S(wn, {})
           ]
         }
       )
@@ -1957,14 +1958,14 @@ const wo = [
       "div",
       {
         className: "univer-ml-1 univer-cursor-pointer univer-rounded univer-text-base hover:univer-bg-gray-200",
-        children: /* @__PURE__ */ S(Sn, { onClick: () => o(t.id) })
+        children: /* @__PURE__ */ S(Cn, { onClick: () => o(t.id) })
       }
     )
   ] });
 };
 function Ro(e) {
   const { value: t, onChange: r = () => {
-  }, unitId: n, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, h] = W(() => Oe(s) ? "1" : "0"), [c, m] = W(u === "1" ? s : "="), [p, b] = W(u === "1" ? s : "="), y = F(ue), g = F(Me), C = F(hn), v = F(ni), [I, w] = W(() => d.split(",")), _ = g.getValidatorItem(j.LIST), [R, L] = W([]), [N, E] = W(""), T = a ? o == null ? void 0 : o.formula1 : "", O = ct(() => C.ruleChange$.pipe(ur(16)), []), P = Ae(O), k = en(r);
+  }, unitId: n, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, h] = W(() => Oe(s) ? "1" : "0"), [c, m] = W(u === "1" ? s : "="), [p, b] = W(u === "1" ? s : "="), y = F(ue), g = F(Me), C = F(pn), v = F(ni), [I, w] = W(() => d.split(",")), _ = g.getValidatorItem(j.LIST), [R, L] = W([]), [N, E] = W(""), T = a ? o == null ? void 0 : o.formula1 : "", O = ct(() => C.ruleChange$.pipe(ur(16)), []), P = Ae(O), k = tn(r);
   Ne(() => {
     (async () => {
       await new Promise((f) => {
@@ -2034,7 +2035,7 @@ function Ro(e) {
       formula2: U.map((f) => f.color === Pe ? "" : f.color).join(",")
     });
   }, [H, k, u, p, I]);
-  const fe = en(async (D) => {
+  const fe = tn(async (D) => {
     if (!Oe(D)) {
       k == null || k({
         formula1: "",
@@ -2055,7 +2056,7 @@ function Ro(e) {
     ((f = Q.current) == null ? void 0 : f.isClickOutSide(D)) && G(!1);
   }), /* @__PURE__ */ $(ut, { children: [
     /* @__PURE__ */ S(Y, { label: y.t("dataValidation.list.options"), children: /* @__PURE__ */ $(
-      fn,
+      mn,
       {
         value: u,
         onChange: (D) => {
@@ -2144,7 +2145,7 @@ const yo = [
     _o
   ],
   [
-    un,
+    hn,
     Ro
   ],
   [
@@ -2155,7 +2156,7 @@ const yo = [
 function Dt(e) {
   var i;
   const { value: t, onChange: r } = e, n = F(ue);
-  return /* @__PURE__ */ S(Y, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ $(fn, { value: `${(i = t.renderMode) != null ? i : se.CUSTOM}`, onChange: (o) => r({ ...t, renderMode: +o }), children: [
+  return /* @__PURE__ */ S(Y, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ $(mn, { value: `${(i = t.renderMode) != null ? i : se.CUSTOM}`, onChange: (o) => r({ ...t, renderMode: +o }), children: [
     /* @__PURE__ */ S(Le, { value: `${se.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
     /* @__PURE__ */ S(Le, { value: `${se.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
     /* @__PURE__ */ S(Le, { value: `${se.TEXT}`, children: n.t("dataValidation.renderMode.text") })
@@ -2190,7 +2191,7 @@ var Eo = Object.getOwnPropertyDescriptor, Do = (e, t, r, n) => {
   return i;
 }, Ye = (e, t) => (r, n) => t(r, n, e);
 const _t = 6;
-let nn = class {
+let rn = class {
   constructor(e, t, r, n, i, o) {
     this._commandService = e, this._univerInstanceService = t, this._formulaService = r, this._themeService = n, this._renderManagerService = i, this._dataValidationModel = o;
   }
@@ -2239,9 +2240,9 @@ let nn = class {
   }
   async _parseFormula(e, t, r) {
     var d, u, h, c, m, p, b, y, g;
-    const { formula1: n = ai, formula2: i = oi } = e, o = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Ut((h = (u = (d = o == null ? void 0 : o[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Ut((p = (m = (c = o == null ? void 0 : o[1]) == null ? void 0 : c.result) == null ? void 0 : m[0]) == null ? void 0 : p[0]), s = Dn(String(a)) && Dn(String(l));
+    const { formula1: n = ai, formula2: i = oi } = e, o = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Ft((h = (u = (d = o == null ? void 0 : o[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Ft((p = (m = (c = o == null ? void 0 : o[1]) == null ? void 0 : c.result) == null ? void 0 : m[0]) == null ? void 0 : p[0]), s = Dn(String(a)) && Dn(String(l));
     return {
-      formula1: Oe(n) ? Ut((g = (y = (b = o == null ? void 0 : o[0]) == null ? void 0 : b.result) == null ? void 0 : y[0]) == null ? void 0 : g[0]) : n,
+      formula1: Oe(n) ? Ft((g = (y = (b = o == null ? void 0 : o[0]) == null ? void 0 : b.result) == null ? void 0 : y[0]) == null ? void 0 : g[0]) : n,
       formula2: Oe(i) ? l : i,
       isFormulaValid: s
     };
@@ -2316,14 +2317,14 @@ let nn = class {
     (n = (r = Ke(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(ze.DEFAULT);
   }
 };
-nn = Do([
+rn = Do([
   Ye(0, te),
   Ye(1, ce),
   Ye(2, M(ii)),
   Ye(3, M(Xn)),
   Ye(4, M(xe)),
   Ye(5, M(ie))
-], nn);
+], rn);
 var Vo = Object.getOwnPropertyDescriptor, Oo = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Vo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
@@ -2334,7 +2335,7 @@ let Ce = class {
     V(this, "canvasRender", null);
     V(this, "dropdownType");
     V(this, "optionsInput");
-    V(this, "formulaInput", un);
+    V(this, "formulaInput", hn);
     this.injector = e;
   }
 };
@@ -2345,7 +2346,7 @@ class Po extends Ce {
   constructor() {
     super(...arguments);
     V(this, "id", j.CHECKBOX);
-    V(this, "canvasRender", this.injector.createInstance(nn));
+    V(this, "canvasRender", this.injector.createInstance(rn));
     V(this, "formulaInput", sr);
   }
 }
@@ -2373,7 +2374,7 @@ class No extends Ce {
     V(this, "formulaInput", Pt);
   }
 }
-const Er = 4, Uo = 0, Ht = 4, Dr = 4, rn = 6, Ot = 6, Ve = 14;
+const Er = 4, Uo = 0, $t = 4, Dr = 4, on = 6, Ot = 6, Ve = 14;
 function Fo(e, t) {
   const r = Zr.getTextSize(e, t), n = r.width + Er * 2, { ba: i, bd: o } = r, a = i + o;
   return {
@@ -2382,8 +2383,8 @@ function Fo(e, t) {
     ba: i
   };
 }
-function $t(e, t, r, n) {
-  const i = Ve + rn * 2, o = r - i, a = n - Ot * 2, l = e.map((c) => ({
+function jt(e, t, r, n) {
+  const i = Ve + on * 2, o = r - i, a = n - Ot * 2, l = e.map((c) => ({
     layout: Fo(c, t),
     text: c
   }));
@@ -2391,7 +2392,7 @@ function $t(e, t, r, n) {
   const d = [];
   l.forEach((c) => {
     const { layout: m } = c, { width: p, height: b } = m;
-    !s || s.width + p + Ht > o ? (s = {
+    !s || s.width + p + $t > o ? (s = {
       width: p,
       height: b,
       items: [{
@@ -2400,8 +2401,8 @@ function $t(e, t, r, n) {
       }]
     }, d.push(s)) : (s.items.push({
       ...c,
-      left: s.width + Ht
-    }), s.width = s.width + p + Ht);
+      left: s.width + $t
+    }), s.width = s.width + p + $t);
   });
   let u = 0, h = 0;
   return d.forEach((c, m) => {
@@ -2433,7 +2434,7 @@ var Wo = Object.getOwnPropertyDescriptor, Ho = (e, t, r, n) => {
   return i;
 }, St = (e, t) => (r, n) => t(r, n, e);
 const $o = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
-let on = class {
+let an = class {
   constructor(e, t, r, n) {
     V(this, "zIndex");
     V(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
@@ -2473,8 +2474,8 @@ let on = class {
       endX: u.endX - m,
       startY: u.startY + p,
       endY: u.endY - b
-    }, w = I.endX - I.startX, _ = I.endY - I.startY, { cl: R } = l || {}, L = (ne = typeof R == "object" ? R == null ? void 0 : R.rgb : R) != null ? ne : "#000", N = Te(l != null ? l : void 0), { vt: E, ht: T } = l || {}, O = E != null ? E : de.MIDDLE, P = (oe = re(s)) != null ? oe : "", k = v.parseCellValue(P), H = v.getListWithColorMap(C), B = $t(k, N, w, _);
-    this._drawDownIcon(e, I, w, _, O), e.save(), e.translateWithPrecision(I.startX, I.startY), e.beginPath(), e.rect(0, 0, w - Ve, _), e.clip(), e.translateWithPrecision(rn, Ot);
+    }, w = I.endX - I.startX, _ = I.endY - I.startY, { cl: R } = l || {}, L = (ne = typeof R == "object" ? R == null ? void 0 : R.rgb : R) != null ? ne : "#000", N = Te(l != null ? l : void 0), { vt: E, ht: T } = l || {}, O = E != null ? E : de.MIDDLE, P = (oe = re(s)) != null ? oe : "", k = v.parseCellValue(P), H = v.getListWithColorMap(C), B = jt(k, N, w, _);
+    this._drawDownIcon(e, I, w, _, O), e.save(), e.translateWithPrecision(I.startX, I.startY), e.beginPath(), e.rect(0, 0, w - Ve, _), e.clip(), e.translateWithPrecision(on, Ot);
     let J = 0;
     switch (O) {
       case de.MIDDLE:
@@ -2507,7 +2508,7 @@ let on = class {
     }), e.restore(), y.set(g, {
       left: I.startX,
       top: I.startY,
-      width: B.contentWidth + rn + Ve,
+      width: B.contentWidth + on + Ve,
       height: B.contentHeight + Ot * 2
     });
   }
@@ -2525,7 +2526,7 @@ let on = class {
     if (!p)
       return;
     const b = c.endX - c.startX, y = c.endY - c.startY, g = (w = re(n)) != null ? w : "", C = p.parseCellValue(g), v = Te(r != null ? r : void 0);
-    return $t(C, v, b, y).cellAutoHeight;
+    return jt(C, v, b, y).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
     var w;
@@ -2541,7 +2542,7 @@ let on = class {
     if (!p)
       return;
     const b = c.endX - c.startX, y = c.endY - c.startY, g = (w = re(n)) != null ? w : "", C = p.parseCellValue(g), v = Te(r != null ? r : void 0);
-    return $t(C, v, b, y).calcAutoWidth;
+    return jt(C, v, b, y).calcAutoWidth;
   }
   isHit(e, t) {
     const { primaryWithCoord: r } = t, n = r.isMergedMainCell ? r.mergeInfo : r, { endX: i } = n, { x: o } = e;
@@ -2567,17 +2568,17 @@ let on = class {
     return (n = (r = Ke(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null ? void 0 : n.setCursor(ze.DEFAULT);
   }
 };
-on = Ho([
+an = Ho([
   St(0, te),
   St(1, ce),
   St(2, M(xe)),
   St(3, M(ie))
-], on);
+], an);
 class jo extends Ce {
   constructor() {
     super(...arguments);
     V(this, "id", j.LIST_MULTIPLE);
-    V(this, "canvasRender", this.injector.createInstance(on));
+    V(this, "canvasRender", this.injector.createInstance(an));
     V(this, "dropdownType", ve.MULTIPLE_LIST);
   }
 }
@@ -2586,7 +2587,7 @@ var Yo = Object.getOwnPropertyDescriptor, Xo = (e, t, r, n) => {
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, at = (e, t) => (r, n) => t(r, n, e);
-const De = 4, Ct = 4, ge = 14, xn = 1, _e = 6, Xe = 3, jt = 8, Zo = "#565656", Bn = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
+const De = 4, Ct = 4, ge = 14, xn = 1, _e = 6, Xe = 3, Yt = 8, Zo = "#565656", Bn = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
 function Wn(e, t, r, n, i, o, a = !0) {
   let l = 0;
   const s = a ? Xe : 0;
@@ -2616,7 +2617,7 @@ function Wn(e, t, r, n, i, o, a = !0) {
     paddingTop: l
   };
 }
-let an = class {
+let sn = class {
   constructor(e, t, r, n, i) {
     V(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     V(this, "zIndex");
@@ -2707,7 +2708,7 @@ let an = class {
         width: G,
         height: q,
         fill: (N == null ? void 0 : N.color) || Pe,
-        radius: jt
+        radius: Yt
       }), e.save(), e.translateWithPrecision(De, xn), e.beginPath(), e.rect(0, 0, z, Q), e.clip(), e.translateWithPrecision(U, 0), Mn.drawWith(e, {
         text: L,
         fontStyle: k,
@@ -2777,11 +2778,11 @@ let an = class {
         w = ge + _e * 2 + I + v;
         break;
       case se.CUSTOM:
-        w = ge + _e * 2 + De * 2 + I + v + jt / 2 + 1;
+        w = ge + _e * 2 + De * 2 + I + v + Yt / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        w = ge + _e * 2 + De * 2 + I + v + jt / 2 + 1;
+        w = ge + _e * 2 + De * 2 + I + v + Yt / 2 + 1;
     }
     const _ = p - w, R = new it(
       y,
@@ -2819,21 +2820,21 @@ let an = class {
     (n = (r = Ke(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(ze.DEFAULT);
   }
 };
-an = Xo([
+sn = Xo([
   at(0, ce),
   at(1, M(ue)),
   at(2, te),
   at(3, M(xe)),
   at(4, M(ie))
-], an);
+], sn);
 class Ko extends Ce {
   constructor() {
     super(...arguments);
     V(this, "id", j.LIST);
-    V(this, "canvasRender", this.injector.createInstance(an));
+    V(this, "canvasRender", this.injector.createInstance(sn));
     V(this, "dropdownType", ve.LIST);
     V(this, "optionsInput", Dt.componentKey);
-    V(this, "formulaInput", un);
+    V(this, "formulaInput", hn);
   }
 }
 class zo extends Ce {
@@ -2854,8 +2855,8 @@ var qo = Object.getOwnPropertyDescriptor, Jo = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? qo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Yt = (e, t) => (r, n) => t(r, n, e);
-let nt = class extends ln {
+}, Xt = (e, t) => (r, n) => t(r, n, e);
+let nt = class extends dn {
   constructor(e, t, r) {
     super(), this._injector = e, this._componentManger = t, this._dataValidatorRegistryService = r, this._initComponents(), this._registerValidatorViews();
   }
@@ -2890,15 +2891,15 @@ let nt = class extends ln {
   }
 };
 nt = Jo([
-  Yt(0, M(be)),
-  Yt(1, M(gn)),
-  Yt(2, M(Me))
+  Xt(0, M(be)),
+  Xt(1, M(vn)),
+  Xt(2, M(Me))
 ], nt);
 var Qo = Object.getOwnPropertyDescriptor, ea = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Qo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Xt = (e, t) => (r, n) => t(r, n, e);
+}, Zt = (e, t) => (r, n) => t(r, n, e);
 const ta = "SHEET_DATA_VALIDATION_UI_PLUGIN";
 var wt;
 let Hn = (wt = class extends Zn {
@@ -2909,7 +2910,7 @@ let Hn = (wt = class extends Zn {
       bt,
       this._config
     );
-    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(mn, o);
+    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(_n, o);
   }
   onStarting() {
     [
@@ -2927,7 +2928,7 @@ let Hn = (wt = class extends Zn {
       kt,
       Lt,
       _r,
-      _n,
+      Sn,
       We,
       mr
     ].forEach((e) => {
@@ -2948,15 +2949,15 @@ let Hn = (wt = class extends Zn {
   }
 }, V(wt, "pluginName", ta), V(wt, "type", X.UNIVER_SHEET), wt);
 Hn = ea([
-  Xt(1, M(be)),
-  Xt(2, te),
-  Xt(3, sn)
+  Zt(1, M(be)),
+  Zt(2, te),
+  Zt(3, ln)
 ], Hn);
 var na = Object.defineProperty, ra = Object.getOwnPropertyDescriptor, ia = (e, t, r) => t in e ? na(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, oa = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? ra(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Zt = (e, t) => (r, n) => t(r, n, e), Vr = (e, t, r) => ia(e, typeof t != "symbol" ? t + "" : t, r);
+}, Kt = (e, t) => (r, n) => t(r, n, e), Vr = (e, t, r) => ia(e, typeof t != "symbol" ? t + "" : t, r);
 const aa = "SHEET_DATA_VALIDATION_UI_PLUGIN";
 let Tt = class extends Zn {
   constructor(e = bt, t, r, n) {
@@ -2966,7 +2967,7 @@ let Tt = class extends Zn {
       bt,
       this._config
     );
-    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(mn, o);
+    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(_n, o);
   }
   onStarting() {
     [
@@ -2985,7 +2986,7 @@ let Tt = class extends Zn {
       kt,
       Lt,
       _r,
-      _n,
+      Sn,
       We,
       mr
     ].forEach((e) => {
@@ -3009,9 +3010,9 @@ Vr(Tt, "pluginName", aa);
 Vr(Tt, "type", X.UNIVER_SHEET);
 Tt = oa([
   jr(li),
-  Zt(1, M(be)),
-  Zt(2, te),
-  Zt(3, sn)
+  Kt(1, M(be)),
+  Kt(2, te),
+  Kt(3, ln)
 ], Tt);
 export {
   Ce as BaseSheetDataValidatorView,