@univerjs/sheets-data-validation 0.2.4-alpha.0 → 0.2.4

package/lib/es/index.js

@@ -1,21 +1,23 @@
-var fo = Object.defineProperty;
-var po = (a, t, e) => t in a ? fo(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e;
-var S = (a, t, e) => po(a, typeof t != "symbol" ? t + "" : t, e);
-import { DEFAULT_EMPTY_DOCUMENT_VALUE as cr, useDependency as $, Inject as I, Disposable as ue, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as go, DisposableCollection as ur, IUniverInstanceService as J, UniverInstanceType as re, toDisposable as Ea, CommandType as Ie, ICommandService as ee, ObjectMatrix as ke, Range as W, isFormulaString as A, ThemeService as vo, VerticalAlign as me, HorizontalAlign as Be, createInternalEditorID as ba, LocaleService as ie, OnLifecycle as ve, LifecycleStages as _e, IPermissionService as _o, DataValidationType as B, Tools as Y, DataValidationOperator as V, DataValidationErrorStyle as st, UndoCommand as So, RedoCommand as Ro, isUnitRangesEqual as Co, isValidRange as Vo, debounce as Mo, shallowEqual as Ga, Injector as Ee, DataValidationRenderMode as le, WrapStrategy as se, DocumentDataModel as Io, BooleanNumber as ot, Rectangle as Ue, IUndoRedoService as Ht, sequenceExecuteAsync as hr, sequenceExecute as Oa, Optional as wo, RxDisposable as Na, DataValidationStatus as Ce, isRangesEqual as yo, queryObjectMatrix as Kt, IResourceManagerService as Do, DependentOn as mr, Plugin as fr } from "@univerjs/core";
-import { ICommandService as Gl, LocaleService as ql, Plugin as zl } from "@univerjs/core";
-import { DataValidatorRegistryService as we, DataValidationModel as z, BaseDataValidator as Ye, DataValidatorRegistryScope as Eo, TWO_FORMULA_OPERATOR_COUNT as bo, getRuleOptions as ma, getRuleSetting as fa, RemoveDataValidationCommand as pr, createDefaultNewRule as gr, RemoveAllDataValidationCommand as Oo, TextLengthErrorTitleMap as No, AddDataValidationMutation as pa, RemoveDataValidationMutation as Ot, UpdateRuleType as fe, UpdateDataValidationMutation as pe, removeDataValidationUndoFactory as To, DataValidationManager as Fo, AddDataValidationCommand as Lo, UniverDataValidationPlugin as vr } from "@univerjs/data-validation";
-import { getSheetCommandTarget as Wt, SetRangeValuesCommand as Ta, WorksheetViewPermission as Po, SetRangeValuesMutation as Nt, SetRangeValuesUndoMutationFactory as _r, WorkbookEditablePermission as ga, WorksheetSetCellStylePermission as va, WorksheetEditPermission as _a, RangeProtectionPermissionEditPoint as Sa, SheetInterceptorService as Fa, INTERCEPTOR_POINT as Sr, SheetsSelectionsService as Ao, ClearSelectionAllCommand as xo, RefRangeService as jo, handleCommonDefaultRangeChangeWithEffectRefCommands as $o, UniverSheetsPlugin as Rr } from "@univerjs/sheets";
-import { SheetCanvasPopManagerService as Bo, IMarkSelectionService as Uo, IEditorBridgeService as La, getCurrentRangeDisable$ as Ho, AutoHeightController as Cr, SheetSkeletonManagerService as Tt, HoverManagerService as Wo, CellAlertManagerService as ko, CellAlertType as Yo, IAutoFillService as Xo, APPLY_TYPE as Ct, virtualizeDiscreteRanges as Ra, getAutoFillRepeatRange as Go, COPY_TYPE as qa, rangeToDiscreteRange as qo, PREDEFINED_HOOK_NAME as Vt, getRepeatRange as za, ISheetClipboardService as zo, SheetPermissionInterceptorBaseController as Ko, UniverSheetsUIPlugin as Vr } from "@univerjs/sheets-ui";
-import { useObservable as Xe, ComponentManager as St, IZenZoneService as Qo, ISidebarService as Mr, TextEditor as Ir, useEvent as wr, RangeSelector as Zo, KeyCode as Jo, IDialogService as en, MenuItemType as Pa, MenuPosition as tn, MenuGroup as an, getMenuHiddenObservable as rn, IMenuService as on } from "@univerjs/ui";
-import { IRenderManagerService as Aa, fixLineWidthByScale as Ka, Transform as nn, Checkbox as sn, DeviceInputEventType as ln, getDocsSkeletonPageSize as Mt, Rect as yr, DocumentViewModel as dn, DocumentSkeleton as cn, Documents as un, FontCache as hn, Shape as mn, getFontStyleString as Qa } from "@univerjs/engine-render";
-import { Subject as Dr, filter as fn, BehaviorSubject as Za, distinctUntilChanged as pn, debounceTime as gn } from "rxjs";
-import Ca, { forwardRef as Te, useRef as xa, createElement as Fe, useState as te, useEffect as Ze, useMemo as Ft } from "react";
-import { RegisterOtherFormulaService as Er, FormulaRefRangeService as vn } from "@univerjs/sheets-formula";
-import { FormLayout as Z, Input as je, RadioGroup as ja, Radio as $e, DraggableList as _n, Select as Va, Checkbox as $a, Button as He, RectPopup as Sn, Scrollbar as Rn, DatePanel as Cn } from "@univerjs/design";
-import Vn from "clsx";
-import { LexerTreeBuilder as Ba, deserializeRangeWithSheet as br, serializeRange as Or, isReferenceString as Ua, sequenceNodeType as Mn, isFormulaTransformable as In, transformFormula as Ja } from "@univerjs/engine-formula";
+var vo = Object.defineProperty;
+var _o = (a, t, e) => t in a ? vo(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e;
+var S = (a, t, e) => _o(a, typeof t != "symbol" ? t + "" : t, e);
+import { DEFAULT_EMPTY_DOCUMENT_VALUE as hr, Disposable as ue, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as So, DisposableCollection as mr, IUniverInstanceService as J, UniverInstanceType as re, toDisposable as Oa, CommandType as Ie, ICommandService as ee, ObjectMatrix as Ye, Range as W, isFormulaString as A, ThemeService as Ro, VerticalAlign as me, HorizontalAlign as Be, createInternalEditorID as Na, LocaleService as ie, OnLifecycle as ve, LifecycleStages as _e, IPermissionService as Co, DataValidationType as H, Tools as X, DataValidationOperator as V, DataValidationErrorStyle as ct, UndoCommand as Vo, RedoCommand as Mo, isUnitRangesEqual as Io, isValidRange as wo, debounce as yo, shallowEqual as za, DataValidationRenderMode as le, WrapStrategy as se, DocumentDataModel as Do, BooleanNumber as st, Rectangle as Ue, IUndoRedoService as kt, sequenceExecuteAsync as fr, sequenceExecute as Ta, RxDisposable as Fa, DataValidationStatus as Ce, isRangesEqual as Eo, queryObjectMatrix as Zt, IResourceManagerService as bo, DependentOn as pr, Plugin as gr } from "@univerjs/core";
+import { ICommandService as Ql, LocaleService as Zl, Plugin as Jl } from "@univerjs/core";
+import { Inject as w, Injector as De, Optional as Oo } from "@wendellhu/redi";
+import { DataValidatorRegistryService as we, DataValidationModel as q, BaseDataValidator as Xe, DataValidatorRegistryScope as No, TWO_FORMULA_OPERATOR_COUNT as To, getRuleOptions as pa, getRuleSetting as ga, RemoveDataValidationCommand as vr, createDefaultNewRule as _r, RemoveAllDataValidationCommand as Fo, TextLengthErrorTitleMap as Lo, AddDataValidationMutation as va, RemoveDataValidationMutation as Ft, UpdateRuleType as fe, UpdateDataValidationMutation as pe, removeDataValidationUndoFactory as Po, DataValidationManager as Ao, AddDataValidationCommand as xo, UniverDataValidationPlugin as Sr } from "@univerjs/data-validation";
+import { getSheetCommandTarget as Yt, SetRangeValuesCommand as La, WorksheetViewPermission as jo, SetRangeValuesMutation as Lt, SetRangeValuesUndoMutationFactory as Rr, WorkbookEditablePermission as _a, WorksheetSetCellStylePermission as Sa, WorksheetEditPermission as Ra, RangeProtectionPermissionEditPoint as Ca, SheetInterceptorService as Pa, INTERCEPTOR_POINT as Cr, SheetsSelectionsService as $o, ClearSelectionAllCommand as Bo, RefRangeService as Uo, handleCommonDefaultRangeChangeWithEffectRefCommands as Ho, UniverSheetsPlugin as Vr } from "@univerjs/sheets";
+import { SheetCanvasPopManagerService as Wo, IMarkSelectionService as ko, IEditorBridgeService as Aa, getCurrentRangeDisable$ as Yo, AutoHeightController as Mr, SheetSkeletonManagerService as Pt, HoverManagerService as Xo, CellAlertManagerService as Go, CellAlertType as qo, IAutoFillService as zo, APPLY_TYPE as It, virtualizeDiscreteRanges as Va, getAutoFillRepeatRange as Ko, COPY_TYPE as Ka, rangeToDiscreteRange as Qo, PREDEFINED_HOOK_NAME as wt, getRepeatRange as Qa, ISheetClipboardService as Zo, SheetPermissionInterceptorBaseController as Jo, UniverSheetsUIPlugin as Ir } from "@univerjs/sheets-ui";
+import { useObservable as Ge, ComponentManager as Vt, IZenZoneService as en, ISidebarService as wr, TextEditor as yr, useEvent as Dr, RangeSelector as tn, KeyCode as an, IDialogService as rn, MenuItemType as xa, MenuPosition as on, MenuGroup as nn, getMenuHiddenObservable as sn, IMenuService as ln } from "@univerjs/ui";
+import { IRenderManagerService as ja, fixLineWidthByScale as Za, Transform as dn, Checkbox as cn, DeviceInputEventType as un, getDocsSkeletonPageSize as yt, Rect as Er, DocumentViewModel as hn, DocumentSkeleton as mn, Documents as fn, FontCache as pn, Shape as gn, getFontStyleString as Ja } from "@univerjs/engine-render";
+import { Subject as br, filter as vn, BehaviorSubject as er, distinctUntilChanged as _n, debounceTime as He, bufferTime as Or } from "rxjs";
+import Ma, { forwardRef as Ne, useRef as $a, createElement as Te, useState as te, useMemo as Je, useEffect as et } from "react";
+import { useDependency as j } from "@wendellhu/redi/react-bindings";
+import { RegisterOtherFormulaService as Nr, FormulaRefRangeService as Sn } from "@univerjs/sheets-formula";
+import { FormLayout as Z, Input as je, RadioGroup as Ba, Radio as $e, DraggableList as Rn, Select as Ia, Checkbox as Ua, Button as We, RectPopup as Cn, Scrollbar as Vn, DatePanel as Mn } from "@univerjs/design";
+import In from "clsx";
+import { LexerTreeBuilder as Ha, deserializeRangeWithSheet as Tr, serializeRange as Fr, isReferenceString as Wa, sequenceNodeType as wn, isFormulaTransformable as yn, transformFormula as tr } from "@univerjs/engine-formula";
 import Ve from "dayjs";
-import wn from "@univerjs/engine-numfmt";
+import { numfmt as Dn } from "@univerjs/engine-numfmt";
 function ae(a) {
   if (a === null)
     return "";
@@ -24,19 +26,19 @@ function ae(a) {
     if (t == null)
       return "";
     const e = t.dataStream;
-    return e.substring(e.length - 2, e.length) === cr ? e.substring(0, e.length - 2) : e;
+    return e.substring(e.length - 2, e.length) === hr ? e.substring(0, e.length - 2) : e;
   }
   return a == null ? void 0 : a.v;
 }
-function Nr(a) {
+function Lr(a) {
   var t;
   return String((t = ae(a)) != null ? t : "");
 }
-var yn = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
-function Dn(a) {
+var En = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
+function bn(a) {
   return a && a.__esModule && Object.prototype.hasOwnProperty.call(a, "default") ? a.default : a;
 }
-var Tr = { exports: {} }, kt = {};
+var Pr = { exports: {} }, Xt = {};
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -46,21 +48,21 @@ var Tr = { exports: {} }, kt = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var En = Ca, bn = Symbol.for("react.element"), On = Symbol.for("react.fragment"), Nn = Object.prototype.hasOwnProperty, Tn = En.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, Fn = { key: !0, ref: !0, __self: !0, __source: !0 };
-function Fr(a, t, e) {
+var On = Ma, Nn = Symbol.for("react.element"), Tn = Symbol.for("react.fragment"), Fn = Object.prototype.hasOwnProperty, Ln = On.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, Pn = { key: !0, ref: !0, __self: !0, __source: !0 };
+function Ar(a, t, e) {
   var r, o = {}, n = null, i = null;
   e !== void 0 && (n = "" + e), t.key !== void 0 && (n = "" + t.key), t.ref !== void 0 && (i = t.ref);
-  for (r in t) Nn.call(t, r) && !Fn.hasOwnProperty(r) && (o[r] = t[r]);
+  for (r in t) Fn.call(t, r) && !Pn.hasOwnProperty(r) && (o[r] = t[r]);
   if (a && a.defaultProps) for (r in t = a.defaultProps, t) o[r] === void 0 && (o[r] = t[r]);
-  return { $$typeof: bn, type: a, key: n, ref: i, props: o, _owner: Tn.current };
+  return { $$typeof: Nn, type: a, key: n, ref: i, props: o, _owner: Ln.current };
 }
-kt.Fragment = On;
-kt.jsx = Fr;
-kt.jsxs = Fr;
-Tr.exports = kt;
-var v = Tr.exports;
-function Ln() {
-  const a = $(Ne), t = Xe(a.activeDropdown$, a.activeDropdown), e = $(St);
+Xt.Fragment = Tn;
+Xt.jsx = Ar;
+Xt.jsxs = Ar;
+Pr.exports = Xt;
+var v = Pr.exports;
+function An() {
+  const a = j(Oe), t = Ge(a.activeDropdown$, a.activeDropdown), e = j(Vt);
   if (!t)
     return null;
   const { location: r, componentKey: o } = t, n = e.get(o), i = `${r.unitId}-${r.subUnitId}-${r.row}-${r.col}`;
@@ -78,17 +80,17 @@ function Ln() {
     i
   );
 }
-const Lr = "sheet.ui.dropdown";
-var Pn = Object.defineProperty, An = Object.getOwnPropertyDescriptor, xn = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? An(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+const xr = "sheet.ui.dropdown";
+var xn = Object.defineProperty, jn = Object.getOwnPropertyDescriptor, $n = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? jn(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && Pn(t, e, o), o;
-}, Ge = (a, t) => (e, r) => t(e, r, a);
-let Ne = class extends ue {
+  return r && o && xn(t, e, o), o;
+}, qe = (a, t) => (e, r) => t(e, r, a);
+let Oe = class extends ue {
   constructor(t, e, r, o, n, i) {
     super();
     S(this, "_activeDropdown");
-    S(this, "_activeDropdown$", new Dr());
+    S(this, "_activeDropdown$", new br());
     S(this, "_currentPopup", null);
     S(this, "activeDropdown$", this._activeDropdown$.asObservable());
     S(this, "_zenVisible", !1);
@@ -109,11 +111,11 @@ let Ne = class extends ue {
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
     this._activeDropdown = t, this._activeDropdown$.next(this._activeDropdown);
-    const i = this._renderManagerService.getRenderById(go), s = this._canvasPopupManagerService.attachPopupToCell(
+    const i = this._renderManagerService.getRenderById(So), s = this._canvasPopupManagerService.attachPopupToCell(
       o,
       n,
       {
-        componentKey: Lr,
+        componentKey: xr,
         onClickOutside: () => {
           e && this.hideDropdown();
         },
@@ -123,7 +125,7 @@ let Ne = class extends ue {
     );
     if (!s)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
-    const l = new ur();
+    const l = new mr();
     l.add(s), l.add({
       dispose: () => {
         var d, c;
@@ -163,30 +165,30 @@ let Ne = class extends ue {
     });
   }
 };
-Ne = xn([
-  Ge(0, I(Bo)),
-  Ge(1, J),
-  Ge(2, I(we)),
-  Ge(3, Qo),
-  Ge(4, Aa),
-  Ge(5, I(z))
-], Ne);
-var jn = Object.defineProperty, $n = Object.getOwnPropertyDescriptor, Bn = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? $n(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+Oe = $n([
+  qe(0, w(Wo)),
+  qe(1, J),
+  qe(2, w(we)),
+  qe(3, en),
+  qe(4, ja),
+  qe(5, w(q))
+], Oe);
+var Bn = Object.defineProperty, Un = Object.getOwnPropertyDescriptor, Hn = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? Un(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && jn(t, e, o), o;
-}, er = (a, t) => (e, r) => t(e, r, a);
+  return r && o && Bn(t, e, o), o;
+}, ar = (a, t) => (e, r) => t(e, r, a);
 let Me = class extends ue {
   constructor(t, e) {
     super();
-    S(this, "_open$", new Za(!1));
-    S(this, "open$", this._open$.pipe(pn()));
+    S(this, "_open$", new er(!1));
+    S(this, "open$", this._open$.pipe(_n()));
     S(this, "_activeRule");
-    S(this, "_activeRule$", new Za(void 0));
+    S(this, "_activeRule$", new er(void 0));
     S(this, "activeRule$", this._activeRule$.asObservable());
     S(this, "_closeDisposable", null);
     this._univerInstanceService = t, this._sidebarService = e, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(re.UNIVER_SHEET).pipe(fn((r) => !r)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(re.UNIVER_SHEET).pipe(vn((r) => !r)).subscribe(() => {
         this.close();
       })
     );
@@ -209,7 +211,7 @@ let Me = class extends ue {
     this._open$.next(!1), (t = this._closeDisposable) == null || t.dispose();
   }
   setCloseDisposable(t) {
-    this._closeDisposable = Ea(() => {
+    this._closeDisposable = Oa(() => {
       t.dispose(), this._closeDisposable = null;
     });
   }
@@ -217,17 +219,17 @@ let Me = class extends ue {
     this._activeRule = t, this._activeRule$.next(t);
   }
 };
-Me = Bn([
-  er(0, J),
-  er(1, Mr)
+Me = Hn([
+  ar(0, J),
+  ar(1, wr)
 ], Me);
-const Pr = "DataValidationPanel", at = {
+const jr = "DataValidationPanel", ot = {
   id: "data-validation.operation.open-validation-panel",
   type: Ie.OPERATION,
   handler(a, t) {
     if (!t)
       return !1;
-    const { ruleId: e, isAdd: r } = t, o = a.get(Me), n = a.get(z), i = a.get(J), s = a.get(Mr), l = Wt(i);
+    const { ruleId: e, isAdd: r } = t, o = a.get(Me), n = a.get(q), i = a.get(J), s = a.get(wr), l = Yt(i);
     if (!l) return !1;
     const { unitId: d, subUnitId: c } = l, u = e ? n.getRuleById(d, c, e) : void 0;
     o.open(), o.setActiveRule(u && {
@@ -237,32 +239,32 @@ const Pr = "DataValidationPanel", at = {
     });
     const f = s.open({
       header: { title: r ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
-      children: { label: Pr },
+      children: { label: jr },
       width: 312,
       onClose: () => o.close()
     });
     return o.setCloseDisposable(f), !0;
   }
-}, Ha = {
+}, ka = {
   id: "data-validation.operation.close-validation-panel",
   type: Ie.OPERATION,
   handler(a) {
     return a.get(Me).close(), !0;
   }
-}, Ar = {
+}, $r = {
   id: "data-validation.operation.toggle-validation-panel",
   type: Ie.OPERATION,
   handler(a) {
     const t = a.get(ee), e = a.get(Me);
-    return e.open(), e.isOpen ? t.executeCommand(Ha.id) : t.executeCommand(at.id), !0;
+    return e.open(), e.isOpen ? t.executeCommand(ka.id) : t.executeCommand(ot.id), !0;
   }
-}, Yt = {
+}, Gt = {
   type: Ie.OPERATION,
   id: "sheet.operation.show-data-validation-dropdown",
   handler(a, t) {
     if (!t)
       return !1;
-    const e = a.get(Ne), { unitId: r, subUnitId: o, row: n, column: i } = t, s = e.activeDropdown, l = s == null ? void 0 : s.location;
+    const e = a.get(Oe), { unitId: r, subUnitId: o, row: n, column: i } = t, s = e.activeDropdown, l = s == null ? void 0 : s.location;
     return l && l.unitId === r && l.subUnitId === o && l.row === n && l.col === i || e.showDataValidationDropdown(
       r,
       o,
@@ -270,14 +272,14 @@ const Pr = "DataValidationPanel", at = {
       i
     ), !0;
   }
-}, xr = {
+}, Br = {
   type: Ie.OPERATION,
   id: "sheet.operation.hide-data-validation-dropdown",
   handler(a, t) {
-    return t ? (a.get(Ne).hideDropdown(), !0) : !1;
+    return t ? (a.get(Oe).hideDropdown(), !0) : !1;
   }
 };
-class rt {
+class nt {
   constructor() {
     S(this, "_cacheMatrix", /* @__PURE__ */ new Map());
   }
@@ -285,7 +287,7 @@ class rt {
     let r = this._cacheMatrix.get(t);
     r || (r = /* @__PURE__ */ new Map(), this._cacheMatrix.set(t, r));
     let o = r.get(e);
-    return o || (o = new ke(), r.set(e, o)), o;
+    return o || (o = new Ye(), r.set(e, o)), o;
   }
   ensureCache(t, e) {
     return this._ensureCache(t, e);
@@ -341,11 +343,11 @@ class rt {
     return this._ensureCache(t, e).setValue(r, o, n);
   }
 }
-var Un = Object.defineProperty, Hn = Object.getOwnPropertyDescriptor, Wn = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? Hn(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+var Wn = Object.defineProperty, kn = Object.getOwnPropertyDescriptor, Yn = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? kn(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && Un(t, e, o), o;
-}, Qt = (a, t) => (e, r) => t(e, r, a);
+  return r && o && Wn(t, e, o), o;
+}, Jt = (a, t) => (e, r) => t(e, r, a);
 let ce = class extends ue {
   constructor(t, e, r) {
     super();
@@ -445,28 +447,28 @@ let ce = class extends ue {
     return this._ensureRuleFormulaMap(t, e).get(r);
   }
 };
-ce = Wn([
-  Qt(0, I(Er)),
-  Qt(1, I(rt)),
-  Qt(2, I(z))
+ce = Yn([
+  Jt(0, w(Nr)),
+  Jt(1, w(nt)),
+  Jt(2, w(q))
 ], ce);
 function ge(a) {
   var t, e;
   return (e = (t = a == null ? void 0 : a[0]) == null ? void 0 : t[0]) == null ? void 0 : e.v;
 }
-var kn = Object.defineProperty, Yn = Object.getOwnPropertyDescriptor, Xn = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? Yn(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+var Xn = Object.defineProperty, Gn = Object.getOwnPropertyDescriptor, qn = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? Gn(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && kn(t, e, o), o;
-}, Zt = (a, t) => (e, r) => t(e, r, a);
-const It = 6;
-let Ma = class {
+  return r && o && Xn(t, e, o), o;
+}, ea = (a, t) => (e, r) => t(e, r, a);
+const Dt = 6;
+let wa = class {
   constructor(a, t, e) {
     this._commandService = a, this._formulaService = t, this._themeService = e;
   }
   _calc(a, t) {
     var d, c, u;
-    const { vt: e, ht: r } = t || {}, o = a.endX - a.startX - It * 2, n = a.endY - a.startY, i = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
+    const { vt: e, ht: r } = t || {}, o = a.endX - a.startX - Dt * 2, n = a.endY - a.startY, i = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
     let s = 0, l = 0;
     switch (e) {
       case me.TOP:
@@ -481,13 +483,13 @@ let Ma = class {
     }
     switch (r) {
       case Be.LEFT:
-        s = It;
+        s = Dt;
         break;
       case Be.RIGHT:
-        s = It + (o - i);
+        s = Dt + (o - i);
         break;
       default:
-        s = It + (o - i) / 2;
+        s = Dt + (o - i) / 2;
         break;
     }
     return {
@@ -504,21 +506,21 @@ let Ma = class {
   }
   async _parseFormula(a, t, e) {
     var i, s;
-    const { formula1: r = gt, formula2: o = vt } = a, n = await this._formulaService.getRuleFormulaResult(t, e, a.uid);
+    const { formula1: r = St, formula2: o = Rt } = a, n = await this._formulaService.getRuleFormulaResult(t, e, a.uid);
     return {
       formula1: A(r) ? ge((i = n == null ? void 0 : n[0]) == null ? void 0 : i.result) : r,
       formula2: A(o) ? ge((s = n == null ? void 0 : n[1]) == null ? void 0 : s.result) : o
     };
   }
   drawWith(a, t) {
-    var F, b, P, U, O;
-    const { style: e, data: r, primaryWithCoord: o, unitId: n, subUnitId: i } = t, s = o.isMergedMainCell ? o.mergeInfo : o, l = ae(r), d = (F = r.dataValidation) == null ? void 0 : F.rule, c = (b = r.dataValidation) == null ? void 0 : b.validator;
+    var O, F, L, B, U;
+    const { style: e, data: r, primaryWithCoord: o, unitId: n, subUnitId: i } = t, s = o.isMergedMainCell ? o.mergeInfo : o, l = ae(r), d = (O = r.dataValidation) == null ? void 0 : O.rule, c = (F = r.dataValidation) == null ? void 0 : F.validator;
     if (!d || !c)
       return;
     const u = this._themeService.getCurrentTheme();
     if (!c.skipDefaultFontRender(d, l, { unitId: n, subUnitId: i }))
       return;
-    const f = c.parseFormulaSync(d, n, i), { formula1: p } = f, m = this._calc(s, e), { a: h, d: R } = a.getTransform(), g = Ka(m.left, h), C = Ka(m.top, R), _ = nn.create().composeMatrix({
+    const f = c.parseFormulaSync(d, n, i), { formula1: p } = f, m = this._calc(s, e), { a: h, d: R } = a.getTransform(), g = Za(m.left, h), C = Za(m.top, R), _ = dn.create().composeMatrix({
       left: g,
       top: C,
       scaleX: 1,
@@ -528,16 +530,16 @@ let Ma = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), M = s.endX - s.startX, y = s.endY - s.startY;
-    a.save(), a.beginPath(), a.rect(s.startX, s.startY, M, y), a.clip();
+    }), M = s.endX - s.startX, I = s.endY - s.startY;
+    a.save(), a.beginPath(), a.rect(s.startX, s.startY, M, I), a.clip();
     const D = _.getMatrix();
     a.transform(D[0], D[1], D[2], D[3], D[4], D[5]);
-    const E = ((P = e == null ? void 0 : e.fs) != null ? P : 10) * 1.6, x = String(l) === String(p), T = u.hyacinth500;
-    sn.drawWith(a, {
+    const E = ((L = e == null ? void 0 : e.fs) != null ? L : 10) * 1.6, x = String(l) === String(p), T = u.hyacinth500;
+    cn.drawWith(a, {
       checked: x,
       width: E,
       height: E,
-      fill: (O = (U = e == null ? void 0 : e.cl) == null ? void 0 : U.rgb) != null ? O : T
+      fill: (U = (B = e == null ? void 0 : e.cl) == null ? void 0 : B.rgb) != null ? U : T
     }), a.restore();
   }
   isHit(a, t) {
@@ -564,24 +566,24 @@ let Ma = class {
       }
     };
     this._commandService.executeCommand(
-      Ta.id,
+      La.id,
       u
     );
   }
 };
-Ma = Xn([
-  Zt(0, ee),
-  Zt(1, I(ce)),
-  Zt(2, I(vo))
-], Ma);
-function Gn(a) {
+wa = qn([
+  ea(0, ee),
+  ea(1, w(ce)),
+  ea(2, w(Ro))
+], wa);
+function zn(a) {
   var l;
   const { unitId: t, subUnitId: e, value: r, onChange: o, showError: n, validResult: i } = a, s = n ? i == null ? void 0 : i.formula1 : "";
   return /* @__PURE__ */ v.jsx(Z, { error: s, children: /* @__PURE__ */ v.jsx(
-    Ir,
+    yr,
     {
       value: (l = r == null ? void 0 : r.formula1) != null ? l : "",
-      id: ba(`dataValidation-custom-formula-${t}-${e}`),
+      id: Na(`dataValidation-custom-formula-${t}-${e}`),
       onChange: (d) => {
         o == null || o({
           ...r,
@@ -594,18 +596,18 @@ function Gn(a) {
     }
   ) });
 }
-const qn = "univer-data-validation-formula", zn = "univer-data-validation-formula-and", Kn = "univer-data-validation-formula-list-item", Qn = "univer-data-validation-formula-list-item-icon", Zn = "univer-data-validation-formula-list-item-drag", Jn = "univer-data-validation-formula-list-add", ei = "univer-data-validation-formula-color-select", ti = "univer-data-validation-formula-color-select-panel", ai = "univer-data-validation-formula-color-item", de = {
-  dataValidationFormula: qn,
-  dataValidationFormulaAnd: zn,
-  dataValidationFormulaListItem: Kn,
-  dataValidationFormulaListItemIcon: Qn,
-  dataValidationFormulaListItemDrag: Zn,
-  dataValidationFormulaListAdd: Jn,
-  dataValidationFormulaColorSelect: ei,
-  dataValidationFormulaColorSelectPanel: ti,
-  dataValidationFormulaColorItem: ai
-}, ri = (a) => {
-  const { isTwoFormula: t = !1, value: e, onChange: r, showError: o, validResult: n } = a, i = $(ie), s = o ? n == null ? void 0 : n.formula1 : "", l = o ? n == null ? void 0 : n.formula2 : "";
+const Kn = "univer-data-validation-formula", Qn = "univer-data-validation-formula-and", Zn = "univer-data-validation-formula-list-item", Jn = "univer-data-validation-formula-list-item-icon", ei = "univer-data-validation-formula-list-item-drag", ti = "univer-data-validation-formula-list-add", ai = "univer-data-validation-formula-color-select", ri = "univer-data-validation-formula-color-select-panel", oi = "univer-data-validation-formula-color-item", de = {
+  dataValidationFormula: Kn,
+  dataValidationFormulaAnd: Qn,
+  dataValidationFormulaListItem: Zn,
+  dataValidationFormulaListItemIcon: Jn,
+  dataValidationFormulaListItemDrag: ei,
+  dataValidationFormulaListAdd: ti,
+  dataValidationFormulaColorSelect: ai,
+  dataValidationFormulaColorSelectPanel: ri,
+  dataValidationFormulaColorItem: oi
+}, ni = (a) => {
+  const { isTwoFormula: t = !1, value: e, onChange: r, showError: o, validResult: n } = a, i = j(ie), s = o ? n == null ? void 0 : n.formula1 : "", l = o ? n == null ? void 0 : n.formula2 : "";
   return t ? /* @__PURE__ */ v.jsxs(v.Fragment, { children: [
     /* @__PURE__ */ v.jsx(Z, { error: s, children: /* @__PURE__ */ v.jsx(
       je,
@@ -656,23 +658,23 @@ var he = function() {
     }
     return a;
   }, he.apply(this, arguments);
-}, oi = function(a, t) {
+}, ii = function(a, t) {
   var e = {};
   for (var r in a) Object.prototype.hasOwnProperty.call(a, r) && t.indexOf(r) < 0 && (e[r] = a[r]);
   if (a != null && typeof Object.getOwnPropertySymbols == "function")
     for (var o = 0, r = Object.getOwnPropertySymbols(a); o < r.length; o++)
       t.indexOf(r[o]) < 0 && Object.prototype.propertyIsEnumerable.call(a, r[o]) && (e[r[o]] = a[r[o]]);
   return e;
-}, Le = Te(function(a, t) {
-  var e = a.icon, r = a.id, o = a.className, n = a.extend, i = oi(a, ["icon", "id", "className", "extend"]), s = "univerjs-icon univerjs-icon-".concat(r, " ").concat(o || "").trim(), l = xa("_".concat(si()));
-  return jr(e, "".concat(r), { defIds: e.defIds, idSuffix: l.current }, he({ ref: t, className: s }, i), n);
+}, Fe = Ne(function(a, t) {
+  var e = a.icon, r = a.id, o = a.className, n = a.extend, i = ii(a, ["icon", "id", "className", "extend"]), s = "univerjs-icon univerjs-icon-".concat(r, " ").concat(o || "").trim(), l = $a("_".concat(di()));
+  return Ur(e, "".concat(r), { defIds: e.defIds, idSuffix: l.current }, he({ ref: t, className: s }, i), n);
 });
-function jr(a, t, e, r, o) {
-  return Fe(a.tag, he(he({ key: t }, ni(a, e, o)), r), (ii(a, e).children || []).map(function(n, i) {
-    return jr(n, "".concat(t, "-").concat(a.tag, "-").concat(i), e, void 0, o);
+function Ur(a, t, e, r, o) {
+  return Te(a.tag, he(he({ key: t }, si(a, e, o)), r), (li(a, e).children || []).map(function(n, i) {
+    return Ur(n, "".concat(t, "-").concat(a.tag, "-").concat(i), e, void 0, o);
   }));
 }
-function ni(a, t, e) {
+function si(a, t, e) {
   var r = he({}, a.attrs);
   e != null && e.colorChannel1 && r.fill === "colorChannel1" && (r.fill = e.colorChannel1);
   var o = t.defIds;
@@ -681,89 +683,89 @@ function ni(a, t, e) {
     typeof s == "string" && (r[i] = s.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
   })), r;
 }
-function ii(a, t) {
+function li(a, t) {
   var e, r = t.defIds;
   return !r || r.length === 0 ? a : a.tag === "defs" && (!((e = a.children) === null || e === void 0) && e.length) ? he(he({}, a), { children: a.children.map(function(o) {
     return typeof o.attrs.id == "string" && r && r.indexOf(o.attrs.id) > -1 ? he(he({}, o), { attrs: he(he({}, o.attrs), { id: o.attrs.id + t.idSuffix }) }) : o;
   }) }) : a;
 }
-function si() {
+function di() {
   return Math.random().toString(36).substring(2, 8);
 }
-Le.displayName = "UniverIcon";
-var li = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M14.1544 3.75557C14.3887 3.98988 14.3887 4.36978 14.1544 4.6041L6.51409 12.2444C6.40157 12.3569 6.24896 12.4201 6.08983 12.4201C5.9307 12.4201 5.77808 12.3569 5.66556 12.2444L1.84541 8.42425C1.6111 8.18993 1.6111 7.81003 1.84541 7.57572C2.07973 7.34141 2.45963 7.34141 2.69394 7.57572L6.08983 10.9716L13.3059 3.75557C13.5402 3.52126 13.9201 3.52126 14.1544 3.75557Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, $r = Te(function(a, t) {
-  return Fe(Le, Object.assign({}, a, {
+Fe.displayName = "UniverIcon";
+var ci = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M14.1544 3.75557C14.3887 3.98988 14.3887 4.36978 14.1544 4.6041L6.51409 12.2444C6.40157 12.3569 6.24896 12.4201 6.08983 12.4201C5.9307 12.4201 5.77808 12.3569 5.66556 12.2444L1.84541 8.42425C1.6111 8.18993 1.6111 7.81003 1.84541 7.57572C2.07973 7.34141 2.45963 7.34141 2.69394 7.57572L6.08983 10.9716L13.3059 3.75557C13.5402 3.52126 13.9201 3.52126 14.1544 3.75557Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Hr = Ne(function(a, t) {
+  return Te(Fe, Object.assign({}, a, {
     id: "check-mark-single",
     ref: t,
-    icon: li
+    icon: ci
   }));
 });
-$r.displayName = "CheckMarkSingle";
-var di = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M1.4917 3.07803C1.4917 2.19437 2.20804 1.47803 3.0917 1.47803H5.6917C6.57536 1.47803 7.2917 2.19437 7.2917 3.07803V5.67803C7.2917 6.56168 6.57535 7.27803 5.6917 7.27803H3.0917C2.20804 7.27803 1.4917 6.56168 1.4917 5.67803V3.07803ZM3.0917 2.67803C2.87078 2.67803 2.6917 2.85711 2.6917 3.07803V5.67803C2.6917 5.89894 2.87079 6.07803 3.0917 6.07803H5.6917C5.91261 6.07803 6.0917 5.89894 6.0917 5.67803V3.07803C6.0917 2.85711 5.91261 2.67803 5.6917 2.67803H3.0917Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M14.6175 2.45279C14.8518 2.68711 14.8518 3.06701 14.6175 3.30132L11.6151 6.30365C11.3957 6.52307 11.0451 6.53897 10.8067 6.34031L8.80915 4.67566C8.55458 4.46352 8.52019 4.08518 8.73233 3.83062 8.94447 3.57605 9.32281 3.54166 9.57737 3.7538L11.154 5.06767 13.769 2.45278C14.0033 2.21847 14.3832 2.21848 14.6175 2.45279zM14.1175 9.19746C14.3518 9.43178 14.3518 9.81168 14.1175 10.046L12.5418 11.6217 14.1175 13.1975C14.3518 13.4318 14.3518 13.8117 14.1175 14.046 13.8832 14.2803 13.5033 14.2803 13.269 14.046L11.6933 12.4703 10.1175 14.046C9.88321 14.2803 9.50331 14.2803 9.269 14.046 9.03468 13.8117 9.03468 13.4318 9.269 13.1975L10.8447 11.6217 9.269 10.046C9.03468 9.81168 9.03468 9.43178 9.269 9.19746 9.50331 8.96315 9.88321 8.96315 10.1175 9.19746L11.6933 10.7732 13.269 9.19746C13.5033 8.96315 13.8832 8.96315 14.1175 9.19746z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M3.0917 8.72168C2.20804 8.72168 1.4917 9.43802 1.4917 10.3217V12.9217C1.4917 13.8053 2.20804 14.5217 3.0917 14.5217H5.6917C6.57535 14.5217 7.2917 13.8053 7.2917 12.9217V10.3217C7.2917 9.43802 6.57536 8.72168 5.6917 8.72168H3.0917ZM2.6917 10.3217C2.6917 10.1008 2.87078 9.92168 3.0917 9.92168H5.6917C5.91261 9.92168 6.0917 10.1008 6.0917 10.3217V12.9217C6.0917 13.1426 5.91261 13.3217 5.6917 13.3217H3.0917C2.87079 13.3217 2.6917 13.1426 2.6917 12.9217V10.3217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Br = Te(function(a, t) {
-  return Fe(Le, Object.assign({}, a, {
+Hr.displayName = "CheckMarkSingle";
+var ui = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M1.4917 3.07803C1.4917 2.19437 2.20804 1.47803 3.0917 1.47803H5.6917C6.57536 1.47803 7.2917 2.19437 7.2917 3.07803V5.67803C7.2917 6.56168 6.57535 7.27803 5.6917 7.27803H3.0917C2.20804 7.27803 1.4917 6.56168 1.4917 5.67803V3.07803ZM3.0917 2.67803C2.87078 2.67803 2.6917 2.85711 2.6917 3.07803V5.67803C2.6917 5.89894 2.87079 6.07803 3.0917 6.07803H5.6917C5.91261 6.07803 6.0917 5.89894 6.0917 5.67803V3.07803C6.0917 2.85711 5.91261 2.67803 5.6917 2.67803H3.0917Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M14.6175 2.45279C14.8518 2.68711 14.8518 3.06701 14.6175 3.30132L11.6151 6.30365C11.3957 6.52307 11.0451 6.53897 10.8067 6.34031L8.80915 4.67566C8.55458 4.46352 8.52019 4.08518 8.73233 3.83062 8.94447 3.57605 9.32281 3.54166 9.57737 3.7538L11.154 5.06767 13.769 2.45278C14.0033 2.21847 14.3832 2.21848 14.6175 2.45279zM14.1175 9.19746C14.3518 9.43178 14.3518 9.81168 14.1175 10.046L12.5418 11.6217 14.1175 13.1975C14.3518 13.4318 14.3518 13.8117 14.1175 14.046 13.8832 14.2803 13.5033 14.2803 13.269 14.046L11.6933 12.4703 10.1175 14.046C9.88321 14.2803 9.50331 14.2803 9.269 14.046 9.03468 13.8117 9.03468 13.4318 9.269 13.1975L10.8447 11.6217 9.269 10.046C9.03468 9.81168 9.03468 9.43178 9.269 9.19746 9.50331 8.96315 9.88321 8.96315 10.1175 9.19746L11.6933 10.7732 13.269 9.19746C13.5033 8.96315 13.8832 8.96315 14.1175 9.19746z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M3.0917 8.72168C2.20804 8.72168 1.4917 9.43802 1.4917 10.3217V12.9217C1.4917 13.8053 2.20804 14.5217 3.0917 14.5217H5.6917C6.57535 14.5217 7.2917 13.8053 7.2917 12.9217V10.3217C7.2917 9.43802 6.57536 8.72168 5.6917 8.72168H3.0917ZM2.6917 10.3217C2.6917 10.1008 2.87078 9.92168 3.0917 9.92168H5.6917C5.91261 9.92168 6.0917 10.1008 6.0917 10.3217V12.9217C6.0917 13.1426 5.91261 13.3217 5.6917 13.3217H3.0917C2.87079 13.3217 2.6917 13.1426 2.6917 12.9217V10.3217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Wr = Ne(function(a, t) {
+  return Te(Fe, Object.assign({}, a, {
     id: "data-validation-single",
     ref: t,
-    icon: di
+    icon: ui
   }));
 });
-Br.displayName = "DataValidationSingle";
-var ci = { tag: "svg", attrs: { 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.866699 5.9313.866699H10.069C10.4004.866699 10.669 1.13533 10.669 1.4667 10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667zM1.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.64443 14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443zM6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928 9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171 10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778 9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539 9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263 6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539 5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778 6.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" } }] }, Wa = Te(function(a, t) {
-  return Fe(Le, Object.assign({}, a, {
+Wr.displayName = "DataValidationSingle";
+var hi = { tag: "svg", attrs: { 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.866699 5.9313.866699H10.069C10.4004.866699 10.669 1.13533 10.669 1.4667 10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667zM1.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.64443 14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443zM6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928 9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171 10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778 9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539 9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263 6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539 5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778 6.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" } }] }, Ya = Ne(function(a, t) {
+  return Te(Fe, Object.assign({}, a, {
     id: "delete-single",
     ref: t,
-    icon: ci
+    icon: hi
   }));
 });
-Wa.displayName = "DeleteSingle";
-var ui = { tag: "svg", attrs: { 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" } }] }, Ur = Te(function(a, t) {
-  return Fe(Le, Object.assign({}, a, {
+Ya.displayName = "DeleteSingle";
+var mi = { tag: "svg", attrs: { 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" } }] }, kr = Ne(function(a, t) {
+  return Te(Fe, Object.assign({}, a, {
     id: "increase-single",
     ref: t,
-    icon: ui
+    icon: mi
   }));
 });
-Ur.displayName = "IncreaseSingle";
-var hi = { tag: "svg", attrs: { 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" } }] }, Hr = Te(function(a, t) {
-  return Fe(Le, Object.assign({}, a, {
+kr.displayName = "IncreaseSingle";
+var fi = { tag: "svg", attrs: { 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" } }] }, Yr = Ne(function(a, t) {
+  return Te(Fe, Object.assign({}, a, {
     id: "more-down-single",
     ref: t,
-    icon: hi
+    icon: fi
   }));
 });
-Hr.displayName = "MoreDownSingle";
-var mi = { tag: "svg", attrs: { 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" } }] }, Wr = Te(function(a, t) {
-  return Fe(Le, Object.assign({}, a, {
+Yr.displayName = "MoreDownSingle";
+var pi = { tag: "svg", attrs: { 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" } }] }, Xr = Ne(function(a, t) {
+  return Te(Fe, Object.assign({}, a, {
     id: "more-up-single",
     ref: t,
-    icon: mi
+    icon: pi
   }));
 });
-Wr.displayName = "MoreUpSingle";
-var fi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "mask", attrs: { id: "mask0_622_8", style: { maskType: "alpha" }, width: 16, height: 16, x: 0, y: 0, maskUnits: "userSpaceOnUse" }, children: [{ tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }] }, { tag: "g", attrs: { fill: "currentColor", mask: "url(#mask0_622_8)" }, children: [{ tag: "path", attrs: { d: "M6 5C6.55228 5 7 4.55228 7 4 7 3.44772 6.55228 3 6 3 5.44772 3 5 3.44772 5 4 5 4.55228 5.44772 5 6 5zM6 9C6.55228 9 7 8.55229 7 8 7 7.44772 6.55228 7 6 7 5.44772 7 5 7.44772 5 8 5 8.55229 5.44772 9 6 9zM7 12C7 12.5523 6.55228 13 6 13 5.44772 13 5 12.5523 5 12 5 11.4477 5.44772 11 6 11 6.55228 11 7 11.4477 7 12zM10 5C10.5523 5 11 4.55228 11 4 11 3.44772 10.5523 3 10 3 9.44771 3 9 3.44772 9 4 9 4.55228 9.44771 5 10 5zM11 8C11 8.55229 10.5523 9 10 9 9.44771 9 9 8.55229 9 8 9 7.44772 9.44771 7 10 7 10.5523 7 11 7.44772 11 8zM10 13C10.5523 13 11 12.5523 11 12 11 11.4477 10.5523 11 10 11 9.44771 11 9 11.4477 9 12 9 12.5523 9.44771 13 10 13z" } }] }] }, kr = Te(function(a, t) {
-  return Fe(Le, Object.assign({}, a, {
+Xr.displayName = "MoreUpSingle";
+var gi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "mask", attrs: { id: "mask0_622_8", style: { maskType: "alpha" }, width: 16, height: 16, x: 0, y: 0, maskUnits: "userSpaceOnUse" }, children: [{ tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }] }, { tag: "g", attrs: { fill: "currentColor", mask: "url(#mask0_622_8)" }, children: [{ tag: "path", attrs: { d: "M6 5C6.55228 5 7 4.55228 7 4 7 3.44772 6.55228 3 6 3 5.44772 3 5 3.44772 5 4 5 4.55228 5.44772 5 6 5zM6 9C6.55228 9 7 8.55229 7 8 7 7.44772 6.55228 7 6 7 5.44772 7 5 7.44772 5 8 5 8.55229 5.44772 9 6 9zM7 12C7 12.5523 6.55228 13 6 13 5.44772 13 5 12.5523 5 12 5 11.4477 5.44772 11 6 11 6.55228 11 7 11.4477 7 12zM10 5C10.5523 5 11 4.55228 11 4 11 3.44772 10.5523 3 10 3 9.44771 3 9 3.44772 9 4 9 4.55228 9.44771 5 10 5zM11 8C11 8.55229 10.5523 9 10 9 9.44771 9 9 8.55229 9 8 9 7.44772 9.44771 7 10 7 10.5523 7 11 7.44772 11 8zM10 13C10.5523 13 11 12.5523 11 12 11 11.4477 10.5523 11 10 11 9.44771 11 9 11.4477 9 12 9 12.5523 9.44771 13 10 13z" } }] }] }, Gr = Ne(function(a, t) {
+  return Te(Fe, Object.assign({}, a, {
     id: "sequence-single",
     ref: t,
-    icon: fi
+    icon: gi
   }));
 });
-kr.displayName = "SequenceSingle";
-function Yr(a) {
+Gr.displayName = "SequenceSingle";
+function qr(a) {
   return a.filter(Boolean).join(",");
 }
-function Qe(a) {
+function Ze(a) {
   return a.split(",").filter(Boolean);
 }
-function pi(a) {
+function vi(a) {
   const t = ae(a);
   return t == null ? "" : t.toString();
 }
-const Xt = "SHEET_DATA_VALIDATION_PLUGIN", xe = "#ECECEC";
-var Lt = /* @__PURE__ */ ((a) => (a[a.View = 0] = "View", a[a.Edit = 1] = "Edit", a[a.ManageCollaborator = 2] = "ManageCollaborator", a[a.Print = 3] = "Print", a[a.Duplicate = 4] = "Duplicate", a[a.Comment = 5] = "Comment", a[a.Copy = 6] = "Copy", a[a.Share = 7] = "Share", a[a.Export = 8] = "Export", a[a.MoveWorksheet = 9] = "MoveWorksheet", a[a.DeleteWorksheet = 10] = "DeleteWorksheet", a[a.HideWorksheet = 11] = "HideWorksheet", a[a.RenameWorksheet = 12] = "RenameWorksheet", a[a.CreateWorksheet = 13] = "CreateWorksheet", a[a.SetWorksheetStyle = 14] = "SetWorksheetStyle", a[a.EditWorksheetCell = 15] = "EditWorksheetCell", a[a.InsertHyperlink = 16] = "InsertHyperlink", a[a.Sort = 17] = "Sort", a[a.Filter = 18] = "Filter", a[a.PivotTable = 19] = "PivotTable", a[a.FloatImg = 20] = "FloatImg", a[a.History = 21] = "History", a[a.RwHgtClWdt = 22] = "RwHgtClWdt", a[a.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", a[a.ViewFilter = 24] = "ViewFilter", a[a.MoveSheet = 25] = "MoveSheet", a[a.DeleteSheet = 26] = "DeleteSheet", a[a.HideSheet = 27] = "HideSheet", a[a.CopySheet = 28] = "CopySheet", a[a.RenameSheet = 29] = "RenameSheet", a[a.CreateSheet = 30] = "CreateSheet", a[a.SelectProtectedCells = 31] = "SelectProtectedCells", a[a.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", a[a.SetCellStyle = 33] = "SetCellStyle", a[a.SetCellValue = 34] = "SetCellValue", a[a.SetRowStyle = 35] = "SetRowStyle", a[a.SetColumnStyle = 36] = "SetColumnStyle", a[a.InsertRow = 37] = "InsertRow", a[a.InsertColumn = 38] = "InsertColumn", a[a.DeleteRow = 39] = "DeleteRow", a[a.DeleteColumn = 40] = "DeleteColumn", a[a.EditExtraObject = 41] = "EditExtraObject", a[a.Delete = 42] = "Delete", a[a.RecoverHistory = 43] = "RecoverHistory", a[a.ViewHistory = 44] = "ViewHistory", a[a.UNRECOGNIZED = -1] = "UNRECOGNIZED", a))(Lt || {}), gi = Object.defineProperty, vi = Object.getOwnPropertyDescriptor, _i = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? vi(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+const qt = "SHEET_DATA_VALIDATION_PLUGIN", xe = "#ECECEC";
+var At = /* @__PURE__ */ ((a) => (a[a.View = 0] = "View", a[a.Edit = 1] = "Edit", a[a.ManageCollaborator = 2] = "ManageCollaborator", a[a.Print = 3] = "Print", a[a.Duplicate = 4] = "Duplicate", a[a.Comment = 5] = "Comment", a[a.Copy = 6] = "Copy", a[a.Share = 7] = "Share", a[a.Export = 8] = "Export", a[a.MoveWorksheet = 9] = "MoveWorksheet", a[a.DeleteWorksheet = 10] = "DeleteWorksheet", a[a.HideWorksheet = 11] = "HideWorksheet", a[a.RenameWorksheet = 12] = "RenameWorksheet", a[a.CreateWorksheet = 13] = "CreateWorksheet", a[a.SetWorksheetStyle = 14] = "SetWorksheetStyle", a[a.EditWorksheetCell = 15] = "EditWorksheetCell", a[a.InsertHyperlink = 16] = "InsertHyperlink", a[a.Sort = 17] = "Sort", a[a.Filter = 18] = "Filter", a[a.PivotTable = 19] = "PivotTable", a[a.FloatImg = 20] = "FloatImg", a[a.History = 21] = "History", a[a.RwHgtClWdt = 22] = "RwHgtClWdt", a[a.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", a[a.ViewFilter = 24] = "ViewFilter", a[a.MoveSheet = 25] = "MoveSheet", a[a.DeleteSheet = 26] = "DeleteSheet", a[a.HideSheet = 27] = "HideSheet", a[a.CopySheet = 28] = "CopySheet", a[a.RenameSheet = 29] = "RenameSheet", a[a.CreateSheet = 30] = "CreateSheet", a[a.SelectProtectedCells = 31] = "SelectProtectedCells", a[a.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", a[a.SetCellStyle = 33] = "SetCellStyle", a[a.SetCellValue = 34] = "SetCellValue", a[a.SetRowStyle = 35] = "SetRowStyle", a[a.SetColumnStyle = 36] = "SetColumnStyle", a[a.InsertRow = 37] = "InsertRow", a[a.InsertColumn = 38] = "InsertColumn", a[a.DeleteRow = 39] = "DeleteRow", a[a.DeleteColumn = 40] = "DeleteColumn", a[a.EditExtraObject = 41] = "EditExtraObject", a[a.Delete = 42] = "Delete", a[a.RecoverHistory = 43] = "RecoverHistory", a[a.ViewHistory = 44] = "ViewHistory", a[a.UNRECOGNIZED = -1] = "UNRECOGNIZED", a))(At || {}), _i = Object.defineProperty, Si = Object.getOwnPropertyDescriptor, Ri = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? Si(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && gi(t, e, o), o;
-}, Jt = (a, t) => (e, r) => t(e, r, a);
-let Je = class extends ue {
+  return r && o && _i(t, e, o), o;
+}, ta = (a, t) => (e, r) => t(e, r, a);
+let tt = class extends ue {
   constructor(a, t, e) {
     super(), this._univerInstanceService = a, this._permissionService = t, this._lexerTreeBuilder = e;
   }
@@ -776,14 +778,14 @@ let Je = class extends ue {
       const n = t[o];
       if (typeof n == "string")
         continue;
-      const { token: i } = n, s = br(i), l = this._univerInstanceService.getCurrentUnitForType(re.UNIVER_SHEET);
+      const { token: i } = n, s = Tr(i), l = this._univerInstanceService.getCurrentUnitForType(re.UNIVER_SHEET);
       let d = l.getActiveSheet();
       const c = l.getUnitId();
       if (s.sheetName) {
         if (d = l.getSheetBySheetName(s.sheetName), !d)
           return !1;
         const h = d == null ? void 0 : d.getSheetId();
-        if (!this._permissionService.getPermissionPoint(new Po(c, h).id)) return !1;
+        if (!this._permissionService.getPermissionPoint(new jo(c, h).id)) return !1;
       }
       if (!d)
         return !1;
@@ -791,20 +793,20 @@ let Je = class extends ue {
       for (let h = u; h <= f; h++)
         for (let R = p; R <= m; R++) {
           const g = (r = (e = d.getCell(h, R)) == null ? void 0 : e.selectionProtection) == null ? void 0 : r[0];
-          if ((g == null ? void 0 : g[Lt.View]) === !1)
+          if ((g == null ? void 0 : g[At.View]) === !1)
             return !1;
         }
     }
     return !0;
   }
 };
-Je = _i([
-  ve(_e.Rendered, Je),
-  Jt(0, J),
-  Jt(1, _o),
-  Jt(2, I(Ba))
-], Je);
-const Si = [
+tt = Ri([
+  ve(_e.Rendered, tt),
+  ta(0, J),
+  ta(1, Co),
+  ta(2, w(Ha))
+], tt);
+const Ci = [
   "#FFFFFF",
   "#FEE7E7",
   "#FEF0E6",
@@ -829,10 +831,10 @@ const Si = [
   "#3A60F7",
   "#9E6DE3",
   "#F248A6"
-], Ri = (a) => {
+], Vi = (a) => {
   const { value: t, onChange: e, disabled: r } = a, [o, n] = te(!1);
   return /* @__PURE__ */ v.jsx(
-    Va,
+    Ia,
     {
       disabled: r,
       open: o,
@@ -848,7 +850,7 @@ const Si = [
           style: { background: i.value, marginTop: 5 }
         }
       ),
-      dropdownRender: () => /* @__PURE__ */ v.jsx("div", { className: de.dataValidationFormulaColorSelectPanel, children: Si.map(
+      dropdownRender: () => /* @__PURE__ */ v.jsx("div", { className: de.dataValidationFormulaColorSelectPanel, children: Ci.map(
         (i) => /* @__PURE__ */ v.jsx(
           "div",
           {
@@ -863,12 +865,12 @@ const Si = [
       ) })
     }
   );
-}, tr = (a) => {
+}, rr = (a) => {
   const { item: t, commonProps: e, style: r } = a, { onItemChange: o, onItemDelete: n } = e;
   return /* @__PURE__ */ v.jsxs("div", { className: de.dataValidationFormulaListItem, style: r, children: [
-    t.isRef ? null : /* @__PURE__ */ v.jsx("div", { className: Vn(de.dataValidationFormulaListItemDrag, "draggableHandle"), children: /* @__PURE__ */ v.jsx(kr, {}) }),
+    t.isRef ? null : /* @__PURE__ */ v.jsx("div", { className: In(de.dataValidationFormulaListItemDrag, "draggableHandle"), children: /* @__PURE__ */ v.jsx(Gr, {}) }),
     /* @__PURE__ */ v.jsx(
-      Ri,
+      Vi,
       {
         value: t.color,
         onChange: (i) => {
@@ -886,109 +888,109 @@ const Si = [
         }
       }
     ),
-    t.isRef ? null : /* @__PURE__ */ v.jsx("div", { className: de.dataValidationFormulaListItemIcon, children: /* @__PURE__ */ v.jsx(Wa, { onClick: () => n(t.id) }) })
+    t.isRef ? null : /* @__PURE__ */ v.jsx("div", { className: de.dataValidationFormulaListItemIcon, children: /* @__PURE__ */ v.jsx(Ya, { onClick: () => n(t.id) }) })
   ] });
 };
-function Ci(a) {
+function Mi(a) {
   const { value: t, onChange: e = () => {
-  }, unitId: r, subUnitId: o, validResult: n, showError: i, ruleId: s } = a, { formula1: l = "", formula2: d = "" } = t || {}, c = xa(null), [u, f] = te(() => A(l) ? "1" : "0"), [p, m] = te(u === "1" ? l : "="), [h, R] = te(u === "1" ? l : "="), g = $(ie), C = $(we), _ = $(z), M = $(Je), [y, D] = te(() => d.split(",")), E = C.getValidatorItem(B.LIST), [x, T] = te([]), [F, b] = te(""), P = i ? n == null ? void 0 : n.formula1 : "", U = Xe(_.ruleChange$), O = wr(e);
-  Ze(() => {
+  }, unitId: r, subUnitId: o, validResult: n, showError: i, ruleId: s } = a, { formula1: l = "", formula2: d = "" } = t || {}, c = $a(null), [u, f] = te(() => A(l) ? "1" : "0"), [p, m] = te(u === "1" ? l : "="), [h, R] = te(u === "1" ? l : "="), g = j(ie), C = j(we), _ = j(q), M = j(tt), [I, D] = te(() => d.split(",")), E = C.getValidatorItem(H.LIST), [x, T] = te([]), [O, F] = te(""), L = i ? n == null ? void 0 : n.formula1 : "", B = Je(() => _.ruleChange$.pipe(He(16)), []), U = Ge(B), b = Dr(e);
+  et(() => {
     (async () => {
-      await new Promise((q) => {
-        setTimeout(() => q(!0), 100);
+      await new Promise((Y) => {
+        setTimeout(() => Y(!0), 100);
       });
-      const N = _.getRuleById(r, o, s), X = N == null ? void 0 : N.formula1;
-      if (A(X) && E && N) {
-        const q = await E.getListAsync(N, r, o);
-        T(q);
+      const N = _.getRuleById(r, o, s), K = N == null ? void 0 : N.formula1;
+      if (A(K) && E && N) {
+        const Y = await E.getListAsync(N, r, o);
+        T(Y);
       }
     })();
-  }, [_, U, E, s, o, r]), Ze(() => {
+  }, [_, U, E, s, o, r]), et(() => {
     A(l) && l !== h && (m(l), R(h));
   }, [h, l]);
-  const [L, H] = te(() => {
-    const N = u !== "1" ? Qe(l) : [], X = d.split(",");
-    return N.map((q, ne) => ({
-      label: q,
-      color: X[ne] || xe,
+  const [$, z] = te(() => {
+    const N = u !== "1" ? Ze(l) : [], K = d.split(",");
+    return N.map((Y, ne) => ({
+      label: Y,
+      color: K[ne] || xe,
       isRef: !1,
-      id: Y.generateRandomId(4)
+      id: X.generateRandomId(4)
     }));
-  }), K = (N, X, q) => {
-    const ne = L.find((ye) => ye.id === N);
-    ne && (ne.label = X, ne.color = q, H([...L]));
-  }, k = (N) => {
-    const X = L.findIndex((q) => q.id === N);
-    X !== -1 && (L.splice(X, 1), H([...L]));
-  }, w = d.split(","), j = Ft(() => x.map((N, X) => ({
+  }), k = (N, K, Y) => {
+    const ne = $.find((it) => it.id === N);
+    ne && (ne.label = K, ne.color = Y, z([...$]));
+  }, y = (N) => {
+    const K = $.findIndex((Y) => Y.id === N);
+    K !== -1 && ($.splice(K, 1), z([...$]));
+  }, P = d.split(","), oe = Je(() => x.map((N, K) => ({
     label: N,
-    color: w[X] || xe,
-    id: `${X}`,
+    color: P[K] || xe,
+    id: `${K}`,
     isRef: !0
-  })), [w, x]), oe = (N, X, q) => {
-    const ne = [...y];
-    ne[+N] = q, D(ne), O({
+  })), [P, x]), G = (N, K, Y) => {
+    const ne = [...I];
+    ne[+N] = Y, D(ne), b({
       formula1: l,
       formula2: ne.join(",")
     });
-  }, G = () => {
-    H([
-      ...L,
+  }, Se = () => {
+    z([
+      ...$,
       {
         label: "",
         color: xe,
         isRef: !1,
-        id: Y.generateRandomId(4)
+        id: X.generateRandomId(4)
       }
     ]);
   };
-  Ze(() => {
+  et(() => {
     if (u === "1")
       return;
-    const N = /* @__PURE__ */ new Set(), X = [];
-    L.map((q) => ({
-      labelList: q.label.split(","),
-      item: q
-    })).forEach(({ item: q, labelList: ne }) => {
-      ne.forEach((ye) => {
-        N.has(ye) || (N.add(ye), X.push({
-          label: ye,
-          color: q.color
+    const N = /* @__PURE__ */ new Set(), K = [];
+    $.map((Y) => ({
+      labelList: Y.label.split(","),
+      item: Y
+    })).forEach(({ item: Y, labelList: ne }) => {
+      ne.forEach((it) => {
+        N.has(it) || (N.add(it), K.push({
+          label: it,
+          color: Y.color
         }));
       });
-    }), O({
-      formula1: Yr(X.map((q) => q.label)),
-      formula2: X.map((q) => q.color === xe ? "" : q.color).join(",")
+    }), b({
+      formula1: qr(K.map((Y) => Y.label)),
+      formula2: K.map((Y) => Y.color === xe ? "" : Y.color).join(",")
     });
-  }, [L, O, u, h, y]);
-  const Se = Ft(
+  }, [$, b, u, h, I]);
+  const Le = Je(
     () => async (N) => {
       if (!A(N)) {
-        O == null || O({
+        b == null || b({
           formula1: "",
           formula2: d
         });
         return;
       }
-      M.getFormulaRefCheck(N) ? (O == null || O({
+      M.getFormulaRefCheck(N) ? (b == null || b({
         formula1: A(N) ? N : "",
         formula2: d
-      }), b("")) : (O == null || O({
+      }), F("")) : (b == null || b({
         formula1: "",
         formula2: d
-      }), m("="), b(g.t("dataValidation.validFail.formulaError")));
+      }), m("="), F(g.t("dataValidation.validFail.formulaError")));
     },
-    [d, O]
+    [d, b]
   );
   return /* @__PURE__ */ v.jsxs(v.Fragment, { children: [
     /* @__PURE__ */ v.jsx(Z, { label: g.t("dataValidation.list.options"), children: /* @__PURE__ */ v.jsxs(
-      ja,
+      Ba,
       {
         value: u,
         onChange: (N) => {
-          f(N), m(h), N === "1" && O({
+          f(N), m(h), N === "1" && b({
             formula1: h === "=" ? "" : h,
-            formula2: y.join(",")
+            formula2: I.join(",")
           });
         },
         children: [
@@ -998,37 +1000,37 @@ function Ci(a) {
       }
     ) }),
     u === "1" ? /* @__PURE__ */ v.jsxs(v.Fragment, { children: [
-      /* @__PURE__ */ v.jsx(Z, { error: P || F, children: /* @__PURE__ */ v.jsx(
-        Ir,
+      /* @__PURE__ */ v.jsx(Z, { error: L || O, children: /* @__PURE__ */ v.jsx(
+        yr,
         {
-          id: ba(`list-ref-range-${r}-${o}`),
+          id: Na(`list-ref-range-${r}-${o}`),
           value: p,
           openForSheetUnitId: r,
           openForSheetSubUnitId: o,
           onlyInputFormula: !0,
           onChange: async (N) => {
-            const X = N != null ? N : "";
-            R(X), Se(X);
+            const K = N != null ? N : "";
+            R(K), Le(K);
           }
         }
       ) }),
-      /* @__PURE__ */ v.jsx(Z, { children: /* @__PURE__ */ v.jsx("div", { ref: c, children: j.map((N) => /* @__PURE__ */ v.jsx(tr, { item: N, commonProps: { onItemChange: oe }, style: { marginBottom: 12 } }, N.id)) }) })
-    ] }) : /* @__PURE__ */ v.jsx(Z, { error: P, children: /* @__PURE__ */ v.jsxs("div", { ref: c, style: { marginTop: "-12px" }, children: [
+      /* @__PURE__ */ v.jsx(Z, { children: /* @__PURE__ */ v.jsx("div", { ref: c, children: oe.map((N) => /* @__PURE__ */ v.jsx(rr, { item: N, commonProps: { onItemChange: G }, style: { marginBottom: 12 } }, N.id)) }) })
+    ] }) : /* @__PURE__ */ v.jsx(Z, { error: L, children: /* @__PURE__ */ v.jsxs("div", { ref: c, style: { marginTop: "-12px" }, children: [
       /* @__PURE__ */ v.jsx(
-        _n,
+        Rn,
         {
-          list: L,
-          onListChange: H,
+          list: $,
+          onListChange: z,
           rowHeight: 32,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
           itemRender: (N) => /* @__PURE__ */ v.jsx(
-            tr,
+            rr,
             {
               item: N,
               commonProps: {
-                onItemChange: K,
-                onItemDelete: k
+                onItemChange: k,
+                onItemDelete: y
               }
             },
             N.id
@@ -1036,18 +1038,18 @@ function Ci(a) {
           idKey: "id"
         }
       ),
-      /* @__PURE__ */ v.jsxs("a", { className: de.dataValidationFormulaListAdd, onClick: G, children: [
-        /* @__PURE__ */ v.jsx(Ur, {}),
+      /* @__PURE__ */ v.jsxs("a", { className: de.dataValidationFormulaListAdd, onClick: Se, children: [
+        /* @__PURE__ */ v.jsx(kr, {}),
         g.t("dataValidation.list.add")
       ] })
     ] }) })
   ] });
 }
-function Vi(a) {
-  const { value: t, onChange: e, showError: r, validResult: o } = a, n = $(ie), i = r ? o == null ? void 0 : o.formula1 : "", s = r ? o == null ? void 0 : o.formula2 : "", [l, d] = te(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
+function Ii(a) {
+  const { value: t, onChange: e, showError: r, validResult: o } = a, n = j(ie), i = r ? o == null ? void 0 : o.formula1 : "", s = r ? o == null ? void 0 : o.formula2 : "", [l, d] = te(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
   return /* @__PURE__ */ v.jsxs(v.Fragment, { children: [
     /* @__PURE__ */ v.jsx(Z, { children: /* @__PURE__ */ v.jsx(
-      $a,
+      Ua,
       {
         checked: l,
         onChange: (c) => {
@@ -1090,36 +1092,36 @@ function Vi(a) {
     ) }) : null
   ] });
 }
-const Xr = "data-validation.custom-formula-input", Rt = "data-validation.formula-input", Gr = "data-validation.list-formula-input", qr = "data-validation.checkbox-formula-input", Mi = [
+const zr = "data-validation.custom-formula-input", Mt = "data-validation.formula-input", Kr = "data-validation.list-formula-input", Qr = "data-validation.checkbox-formula-input", wi = [
   [
-    Xr,
-    Gn
+    zr,
+    zn
   ],
   [
-    Rt,
-    ri
+    Mt,
+    ni
   ],
   [
-    Gr,
-    Ci
+    Kr,
+    Mi
   ],
   [
-    qr,
-    Vi
+    Qr,
+    Ii
   ]
-], gt = 1, vt = 0;
-function ar(a, t) {
-  return Y.isBlank(a) ? t.t("dataValidation.validFail.value") : A(a) ? t.t("dataValidation.validFail.primitive") : "";
+], St = 1, Rt = 0;
+function or(a, t) {
+  return X.isBlank(a) ? t.t("dataValidation.validFail.value") : A(a) ? t.t("dataValidation.validFail.primitive") : "";
 }
-class Ii extends Ye {
+class yi extends Xe {
   constructor() {
     super(...arguments);
-    S(this, "id", B.CHECKBOX);
+    S(this, "id", H.CHECKBOX);
     S(this, "title", "dataValidation.checkbox.title");
     S(this, "operators", []);
     S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", qr);
-    S(this, "canvasRender", this.injector.createInstance(Ma));
+    S(this, "formulaInput", Qr);
+    S(this, "canvasRender", this.injector.createInstance(wa));
     S(this, "_formulaService", this.injector.get(ce));
   }
   skipDefaultFontRender(e, r, o) {
@@ -1128,7 +1130,7 @@ class Ii extends Ye {
   }
   validatorFormula(e, r, o) {
     const { formula1: n, formula2: i } = e, s = n === i;
-    if (Y.isBlank(n) && Y.isBlank(i))
+    if (X.isBlank(n) && X.isBlank(i))
       return {
         success: !0
       };
@@ -1138,7 +1140,7 @@ class Ii extends Ye {
         formula1: this.localeService.t("dataValidation.validFail.checkboxEqual"),
         formula2: this.localeService.t("dataValidation.validFail.checkboxEqual")
       };
-    const l = ar(n, this.localeService), d = ar(i, this.localeService);
+    const l = or(n, this.localeService), d = or(i, this.localeService);
     return {
       success: !l && !d,
       formula1: l,
@@ -1147,7 +1149,7 @@ class Ii extends Ye {
   }
   async parseFormula(e, r, o) {
     var l, d;
-    const { formula1: n = gt, formula2: i = vt } = e, s = await this._formulaService.getRuleFormulaResult(r, o, e.uid);
+    const { formula1: n = St, formula2: i = Rt } = e, s = await this._formulaService.getRuleFormulaResult(r, o, e.uid);
     return {
       formula1: A(n) ? ge((l = s == null ? void 0 : s[0]) == null ? void 0 : l.result) : n,
       formula2: A(i) ? ge((d = s == null ? void 0 : s[1]) == null ? void 0 : d.result) : i
@@ -1155,7 +1157,7 @@ class Ii extends Ye {
   }
   parseFormulaSync(e, r, o) {
     var l, d;
-    const { formula1: n = gt, formula2: i = vt } = e, s = this._formulaService.getRuleFormulaResultSync(r, o, e.uid);
+    const { formula1: n = St, formula2: i = Rt } = e, s = this._formulaService.getRuleFormulaResultSync(r, o, e.uid);
     return {
       formula1: A(n) ? ge((l = s == null ? void 0 : s[0]) == null ? void 0 : l.result) : n,
       formula2: A(i) ? ge((d = s == null ? void 0 : s[1]) == null ? void 0 : d.result) : i
@@ -1163,30 +1165,30 @@ class Ii extends Ye {
   }
   async isValidType(e, r, o) {
     const { value: n, unitId: i, subUnitId: s } = e, { formula1: l, formula2: d } = await this.parseFormula(o, i, s);
-    return !Y.isDefine(l) || !Y.isDefine(d) ? !0 : Y.isDefine(n) && (String(n) === String(l) || String(n) === String(d));
+    return !X.isDefine(l) || !X.isDefine(d) ? !0 : X.isDefine(n) && (String(n) === String(l) || String(n) === String(d));
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.checkbox.error");
   }
 }
-const Gt = [
+const zt = [
   V.BETWEEN,
   V.NOT_BETWEEN
 ];
-function wi(a) {
+function Di(a) {
   return new Date((a - 25569) * 86400).getTime();
 }
-const zr = (a) => a / 86400 + 25569, yi = "univer-data-validation-options-button", Di = "univer-data-validation-options-button-icon", ea = {
-  dataValidationOptionsButton: yi,
-  dataValidationOptionsButtonIcon: Di
+const Zr = (a) => a / 86400 + 25569, Ei = "univer-data-validation-options-button", bi = "univer-data-validation-options-button-icon", aa = {
+  dataValidationOptionsButton: Ei,
+  dataValidationOptionsButtonIcon: bi
 };
-function Ei(a) {
+function Oi(a) {
   var d;
-  const t = $(ie), e = $(St), { value: r, onChange: o, extraComponent: n } = a, [i, s] = te(!1), l = n ? e.get(n) : null;
+  const t = j(ie), e = j(Vt), { value: r, onChange: o, extraComponent: n } = a, [i, s] = te(!1), l = n ? e.get(n) : null;
   return /* @__PURE__ */ v.jsxs(v.Fragment, { children: [
-    /* @__PURE__ */ v.jsxs("div", { className: ea.dataValidationOptionsButton, onClick: () => s(!i), children: [
+    /* @__PURE__ */ v.jsxs("div", { className: aa.dataValidationOptionsButton, onClick: () => s(!i), children: [
       t.t("dataValidation.panel.options"),
-      i ? /* @__PURE__ */ v.jsx(Wr, { className: ea.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ v.jsx(Hr, { className: ea.dataValidationOptionsButtonIcon })
+      i ? /* @__PURE__ */ v.jsx(Xr, { className: aa.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ v.jsx(Yr, { className: aa.dataValidationOptionsButtonIcon })
     ] }),
     i && /* @__PURE__ */ v.jsxs(v.Fragment, { children: [
       l ? /* @__PURE__ */ v.jsx(l, { value: r, onChange: o }) : null,
@@ -1195,13 +1197,13 @@ function Ei(a) {
         {
           label: t.t("dataValidation.panel.invalid"),
           children: /* @__PURE__ */ v.jsxs(
-            ja,
+            Ba,
             {
-              value: `${(d = r.errorStyle) != null ? d : st.WARNING}`,
+              value: `${(d = r.errorStyle) != null ? d : ct.WARNING}`,
               onChange: (c) => o({ ...r, errorStyle: +c }),
               children: [
-                /* @__PURE__ */ v.jsx($e, { value: `${st.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ v.jsx($e, { value: `${st.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
+                /* @__PURE__ */ v.jsx($e, { value: `${ct.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ v.jsx($e, { value: `${ct.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
               ]
             }
           )
@@ -1212,7 +1214,7 @@ function Ei(a) {
         {
           label: t.t("dataValidation.panel.messageInfo"),
           children: /* @__PURE__ */ v.jsx(
-            $a,
+            Ua,
             {
               checked: r.showInputMessage,
               onChange: () => o({
@@ -1228,167 +1230,167 @@ function Ei(a) {
     ] })
   ] });
 }
-const bi = "univer-data-validation-detail-form-item", Oi = "univer-data-validation-detail-buttons", Ni = "univer-data-validation-detail-button", qe = {
-  dataValidationDetailFormItem: bi,
-  dataValidationDetailButtons: Oi,
-  dataValidationDetailButton: Ni
-}, Ti = (a) => Mo(
+const Ni = "univer-data-validation-detail-form-item", Ti = "univer-data-validation-detail-buttons", Fi = "univer-data-validation-detail-button", ze = {
+  dataValidationDetailFormItem: Ni,
+  dataValidationDetailButtons: Ti,
+  dataValidationDetailButton: Fi
+}, Li = (a) => yo(
   async (t, e, r, o) => {
     const n = await a.executeCommand(t, e, r);
     o == null || o(n);
   },
   275
 );
-function Fi() {
-  const [a, t] = te(0), e = $(Me), r = Xe(e.activeRule$, e.activeRule), { unitId: o, subUnitId: n, rule: i } = r || {}, s = i.uid, l = $(we), d = $(St), c = $(ee), u = $(z), f = $(ie), [p, m] = te(i), h = l.getValidatorItem(p.type), [R, g] = te(!1), C = l.getValidatorsByScope(Eo.SHEET), [_, M] = te(() => p.ranges.map((w) => ({ unitId: "", sheetId: "", range: w }))), y = Ft(() => Ti(c), [c]);
-  if (Ze(() => {
-    c.onCommandExecuted((w) => {
-      (w.id === So.id || w.id === Ro.id) && setTimeout(() => {
-        const j = u.getRuleById(o, n, s);
-        t((oe) => oe + 1), j && (m(j), M(j.ranges.map((oe) => ({ unitId: "", sheetId: "", range: oe }))));
+function Pi() {
+  const [a, t] = te(0), e = j(Me), r = Ge(e.activeRule$, e.activeRule), { unitId: o, subUnitId: n, rule: i } = r || {}, s = i.uid, l = j(we), d = j(Vt), c = j(ee), u = j(q), f = j(ie), [p, m] = te(i), h = l.getValidatorItem(p.type), [R, g] = te(!1), C = l.getValidatorsByScope(No.SHEET), [_, M] = te(() => p.ranges.map((y) => ({ unitId: "", sheetId: "", range: y }))), I = Je(() => Li(c), [c]);
+  if (et(() => {
+    c.onCommandExecuted((y) => {
+      (y.id === Vo.id || y.id === Mo.id) && setTimeout(() => {
+        const P = u.getRuleById(o, n, s);
+        t((oe) => oe + 1), P && (m(P), M(P.ranges.map((oe) => ({ unitId: "", sheetId: "", range: oe }))));
       }, 20);
     });
   }, [c, u, s, n, o]), !h)
     return null;
-  const D = h.operators, E = h.operatorNames, x = p.operator ? bo.includes(p.operator) : !1, T = () => {
+  const D = h.operators, E = h.operatorNames, x = p.operator ? To.includes(p.operator) : !1, T = () => {
     h.validatorFormula(p, o, n).success ? e.setActiveRule(null) : g(!0);
-  }, F = wr((w) => {
-    if (Co(w, _))
+  }, O = Dr((y) => {
+    if (Io(y, _))
       return;
-    M(w);
-    const j = w.filter((G) => (!G.unitId || G.unitId === o) && (!G.sheetId || G.sheetId === n)).map((G) => G.range);
+    M(y);
+    const P = y.filter((G) => (!G.unitId || G.unitId === o) && (!G.sheetId || G.sheetId === n)).map((G) => G.range);
     if (m({
       ...p,
-      ranges: j
-    }), j.length === 0)
+      ranges: P
+    }), P.length === 0)
       return;
     const oe = {
       unitId: o,
       subUnitId: n,
       ruleId: s,
-      ranges: j
+      ranges: P
     };
-    y(qt.id, oe);
-  }), b = (w) => {
-    if (Ga(w, fa(p)))
+    I(Kt.id, oe);
+  }), F = (y) => {
+    if (za(y, ga(p)))
       return;
     m({
       ...p,
-      ...w
+      ...y
     });
-    const j = {
+    const P = {
       unitId: o,
       subUnitId: n,
       ruleId: s,
-      setting: w
+      setting: y
     };
-    y(
-      wa.id,
-      j,
+    I(
+      Da.id,
+      P,
       void 0
     );
-  }, P = async () => {
-    await c.executeCommand(pr.id, {
+  }, L = async () => {
+    await c.executeCommand(vr.id, {
       ruleId: s,
       unitId: o,
       subUnitId: n
     }), e.setActiveRule(null);
-  }, U = {
+  }, B = {
     type: p.type,
     operator: p.operator,
     formula1: p.formula1,
     formula2: p.formula2,
     allowBlank: p.allowBlank
-  }, O = (w) => {
-    const j = l.getValidatorItem(w);
-    if (!j)
+  }, U = (y) => {
+    const P = l.getValidatorItem(y);
+    if (!P)
       return;
-    const oe = j.operators, G = u.getRuleById(o, n, s), Se = w === (G == null ? void 0 : G.type) || w.includes("list") && (G != null && G.type.includes("list")) ? {
+    const oe = P.operators, G = u.getRuleById(o, n, s), Se = y === (G == null ? void 0 : G.type) || y.includes("list") && (G != null && G.type.includes("list")) ? {
       ...G,
-      type: w
+      type: y
     } : {
       ...p,
-      type: w,
+      type: y,
       operator: oe[0],
       formula1: void 0,
       formula2: void 0
     };
-    m(Se), c.executeCommand(wa.id, {
+    m(Se), c.executeCommand(Da.id, {
       unitId: o,
       subUnitId: n,
       ruleId: p.uid,
-      setting: fa(Se)
+      setting: ga(Se)
     });
-  }, L = d.get(h.formulaInput), H = Ft(() => _.map((w) => Or(w.range)).join(","), []), K = ma(p), k = (w) => {
-    Ga(w, ma(p)) || (m({
+  }, b = d.get(h.formulaInput), $ = Je(() => _.map((y) => Fr(y.range)).join(","), []), z = pa(p), k = (y) => {
+    za(y, pa(p)) || (m({
       ...p,
-      ...w
-    }), y(
-      ao.id,
+      ...y
+    }), I(
+      no.id,
       {
         unitId: o,
         subUnitId: n,
         ruleId: s,
-        options: w
+        options: y
       }
     ));
   };
   return /* @__PURE__ */ v.jsxs("div", { children: [
     /* @__PURE__ */ v.jsx(Z, { label: f.t("dataValidation.panel.range"), children: /* @__PURE__ */ v.jsx(
-      Zo,
+      tn,
       {
-        className: qe.dataValidationDetailFormItem,
-        value: H,
-        id: ba("data-validation-detail"),
+        className: ze.dataValidationDetailFormItem,
+        value: $,
+        id: Na("data-validation-detail"),
         openForSheetUnitId: o,
         openForSheetSubUnitId: n,
-        onChange: (w) => {
-          w.some((j) => !Vo(j.range) || j.range.endColumn < j.range.startColumn || j.range.endRow < j.range.startRow) || F(w);
+        onChange: (y) => {
+          y.some((P) => !wo(P.range) || P.range.endColumn < P.range.startColumn || P.range.endRow < P.range.startRow) || O(y);
         }
       },
       a
     ) }),
     /* @__PURE__ */ v.jsx(Z, { label: f.t("dataValidation.panel.type"), children: /* @__PURE__ */ v.jsx(
-      Va,
+      Ia,
       {
-        options: C == null ? void 0 : C.map((w) => ({
-          label: f.t(w.title),
-          value: w.id
+        options: C == null ? void 0 : C.map((y) => ({
+          label: f.t(y.title),
+          value: y.id
         })),
         value: p.type,
-        onChange: O,
-        className: qe.dataValidationDetailFormItem
+        onChange: U,
+        className: ze.dataValidationDetailFormItem
       }
     ) }),
     D != null && D.length ? /* @__PURE__ */ v.jsx(Z, { label: f.t("dataValidation.panel.operator"), children: /* @__PURE__ */ v.jsx(
-      Va,
+      Ia,
       {
-        options: D.map((w, j) => ({
-          value: `${w}`,
-          label: E[j]
+        options: D.map((y, P) => ({
+          value: `${y}`,
+          label: E[P]
         })),
         value: `${p.operator}`,
-        onChange: (w) => {
-          b({
-            ...U,
-            operator: w
+        onChange: (y) => {
+          F({
+            ...B,
+            operator: y
           });
         },
-        className: qe.dataValidationDetailFormItem
+        className: ze.dataValidationDetailFormItem
       }
     ) }) : null,
-    L ? /* @__PURE__ */ v.jsx(
-      L,
+    b ? /* @__PURE__ */ v.jsx(
+      b,
       {
         isTwoFormula: x,
         value: {
           formula1: p.formula1,
           formula2: p.formula2
         },
-        onChange: (w) => {
-          b({
-            ...U,
-            ...w
+        onChange: (y) => {
+          F({
+            ...B,
+            ...y
           });
         },
         showError: R,
@@ -1399,27 +1401,27 @@ function Fi() {
       },
       a + p.type
     ) : null,
-    /* @__PURE__ */ v.jsx(Ei, { value: K, onChange: k, extraComponent: h.optionsInput }),
-    /* @__PURE__ */ v.jsxs("div", { className: qe.dataValidationDetailButtons, children: [
-      /* @__PURE__ */ v.jsx(He, { className: qe.dataValidationDetailButton, onClick: P, children: f.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ v.jsx(He, { className: qe.dataValidationDetailButton, type: "primary", onClick: T, children: f.t("dataValidation.panel.done") })
+    /* @__PURE__ */ v.jsx(Oi, { value: z, onChange: k, extraComponent: h.optionsInput }),
+    /* @__PURE__ */ v.jsxs("div", { className: ze.dataValidationDetailButtons, children: [
+      /* @__PURE__ */ v.jsx(We, { className: ze.dataValidationDetailButton, onClick: L, children: f.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ v.jsx(We, { className: ze.dataValidationDetailButton, type: "primary", onClick: T, children: f.t("dataValidation.panel.done") })
     ] })
   ] });
 }
-const Li = "univer-data-validation-item-container", Pi = "univer-data-validation-item-title", Ai = "univer-data-validation-item-content", xi = "univer-data-validation-item-icon", wt = {
-  dataValidationItemContainer: Li,
-  dataValidationItemTitle: Pi,
-  dataValidationItemContent: Ai,
-  dataValidationItemIcon: xi
-}, ji = (a) => {
-  const { rule: t, onClick: e, unitId: r, subUnitId: o, disable: n } = a, i = $(we), s = $(ee), l = $(Uo), d = i.getValidatorItem(t.type), c = xa(), [u, f] = te(!1), p = (m) => {
-    s.executeCommand(pr.id, {
+const Ai = "univer-data-validation-item-container", xi = "univer-data-validation-item-title", ji = "univer-data-validation-item-content", $i = "univer-data-validation-item-icon", Et = {
+  dataValidationItemContainer: Ai,
+  dataValidationItemTitle: xi,
+  dataValidationItemContent: ji,
+  dataValidationItemIcon: $i
+}, Bi = (a) => {
+  const { rule: t, onClick: e, unitId: r, subUnitId: o, disable: n } = a, i = j(we), s = j(ee), l = j(ko), d = i.getValidatorItem(t.type), c = $a(), [u, f] = te(!1), p = (m) => {
+    s.executeCommand(vr.id, {
       ruleId: t.uid,
       unitId: r,
       subUnitId: o
     }), m.stopPropagation();
   };
-  return Ze(() => () => {
+  return et(() => () => {
     var m;
     c.current && ((m = c.current) == null || m.forEach((h) => {
       h && l.removeShape(h);
@@ -1427,7 +1429,7 @@ const Li = "univer-data-validation-item-container", Pi = "univer-data-validation
   }, [l]), /* @__PURE__ */ v.jsxs(
     "div",
     {
-      className: wt.dataValidationItemContainer,
+      className: Et.dataValidationItemContainer,
       onClick: e,
       onMouseEnter: () => {
         n || (f(!0), c.current = t.ranges.map((m) => l.addShape({
@@ -1458,28 +1460,28 @@ const Li = "univer-data-validation-item-container", Pi = "univer-data-validation
         }), c.current = void 0;
       },
       children: [
-        /* @__PURE__ */ v.jsx("div", { className: wt.dataValidationItemTitle, children: d == null ? void 0 : d.generateRuleName(t) }),
-        /* @__PURE__ */ v.jsx("div", { className: wt.dataValidationItemContent, children: t.ranges.map((m) => Or(m)).join(",") }),
-        u ? /* @__PURE__ */ v.jsx("div", { className: wt.dataValidationItemIcon, onClick: p, children: /* @__PURE__ */ v.jsx(Wa, {}) }) : null
+        /* @__PURE__ */ v.jsx("div", { className: Et.dataValidationItemTitle, children: d == null ? void 0 : d.generateRuleName(t) }),
+        /* @__PURE__ */ v.jsx("div", { className: Et.dataValidationItemContent, children: t.ranges.map((m) => Fr(m)).join(",") }),
+        u ? /* @__PURE__ */ v.jsx("div", { className: Et.dataValidationItemIcon, onClick: p, children: /* @__PURE__ */ v.jsx(Ya, {}) }) : null
       ]
     }
   );
-}, $i = "univer-data-validation-list-buttons", Bi = "univer-data-validation-list-button", ta = {
-  dataValidationListButtons: $i,
-  dataValidationListButton: Bi
+}, Ui = "univer-data-validation-list-buttons", Hi = "univer-data-validation-list-button", ra = {
+  dataValidationListButtons: Ui,
+  dataValidationListButton: Hi
 };
-function Ui() {
-  const a = $(J), t = Xe(
+function Wi() {
+  const a = j(J), t = Ge(
     () => a.getCurrentTypeOfUnit$(re.UNIVER_SHEET),
     void 0,
     void 0,
     []
   );
-  return t ? /* @__PURE__ */ v.jsx(Hi, { workbook: t }) : null;
+  return t ? /* @__PURE__ */ v.jsx(ki, { workbook: t }) : null;
 }
-function Hi(a) {
-  const t = $(z), e = $(J), r = $(ee), o = $(Ee), n = $(Me), i = $(ie), [s, l] = te([]), { workbook: d } = a, c = Xe(d.activeSheet$, void 0, !0), u = d.getUnitId(), f = c == null ? void 0 : c.getSheetId(), p = t.ensureManager(u, f);
-  Ze(() => {
+function ki(a) {
+  const t = j(q), e = j(J), r = j(ee), o = j(De), n = j(Me), i = j(ie), [s, l] = te([]), { workbook: d } = a, c = Ge(d.activeSheet$, void 0, !0), u = d.getUnitId(), f = c == null ? void 0 : c.getSheetId(), p = t.ensureManager(u, f);
+  et(() => {
     l(p.getDataValidations());
     const _ = p.dataValidations$.subscribe((M) => {
       l([...M]);
@@ -1489,32 +1491,32 @@ function Hi(a) {
     };
   }, [p]);
   const m = async () => {
-    const _ = gr(o), M = {
+    const _ = _r(o), M = {
       unitId: u,
       subUnitId: f,
       rule: _
     };
-    await r.executeCommand(zt.id, M), n.setActiveRule({
+    await r.executeCommand(Qt.id, M), n.setActiveRule({
       unitId: u,
       subUnitId: f,
       rule: _
     });
   }, h = () => {
-    r.executeCommand(Oo.id, {
+    r.executeCommand(Fo.id, {
       unitId: u,
       subUnitId: f
     });
   }, g = ((_) => {
-    const y = e.getCurrentUnitForType(re.UNIVER_SHEET).getActiveSheet();
+    const I = e.getCurrentUnitForType(re.UNIVER_SHEET).getActiveSheet();
     return _.map((E) => {
       const { ranges: x } = E;
-      return (x == null ? void 0 : x.some((F) => {
-        var L, H;
-        const { startRow: b, startColumn: P, endRow: U, endColumn: O } = F;
-        for (let K = b; K <= U; K++)
-          for (let k = P; k <= O; k++) {
-            const w = (H = (L = y == null ? void 0 : y.getCell(K, k)) == null ? void 0 : L.selectionProtection) == null ? void 0 : H[0];
-            if ((w == null ? void 0 : w[Lt.Edit]) === !1 || (w == null ? void 0 : w[Lt.View]) === !1)
+      return (x == null ? void 0 : x.some((O) => {
+        var b, $;
+        const { startRow: F, startColumn: L, endRow: B, endColumn: U } = O;
+        for (let z = F; z <= B; z++)
+          for (let k = L; k <= U; k++) {
+            const y = ($ = (b = I == null ? void 0 : I.getCell(z, k)) == null ? void 0 : b.selectionProtection) == null ? void 0 : $[0];
+            if ((y == null ? void 0 : y[At.Edit]) === !1 || (y == null ? void 0 : y[At.View]) === !1)
               return !0;
           }
         return !1;
@@ -1525,7 +1527,7 @@ function Hi(a) {
     g == null ? void 0 : g.map((_) => {
       var M;
       return /* @__PURE__ */ v.jsx(
-        ji,
+        Bi,
         {
           unitId: u,
           subUnitId: f,
@@ -1542,30 +1544,30 @@ function Hi(a) {
         _.uid
       );
     }),
-    /* @__PURE__ */ v.jsxs("div", { className: ta.dataValidationListButtons, children: [
-      s.length && !C ? /* @__PURE__ */ v.jsx(He, { className: ta.dataValidationListButton, onClick: h, children: i.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ v.jsx(He, { className: ta.dataValidationListButton, type: "primary", onClick: m, children: i.t("dataValidation.panel.add") })
+    /* @__PURE__ */ v.jsxs("div", { className: ra.dataValidationListButtons, children: [
+      s.length && !C ? /* @__PURE__ */ v.jsx(We, { className: ra.dataValidationListButton, onClick: h, children: i.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ v.jsx(We, { className: ra.dataValidationListButton, type: "primary", onClick: m, children: i.t("dataValidation.panel.add") })
     ] })
   ] });
 }
-const Wi = () => {
-  const a = $(Me), t = Xe(a.activeRule$, a.activeRule);
-  return t ? /* @__PURE__ */ v.jsx(Fi, {}, t.rule.uid) : /* @__PURE__ */ v.jsx(Ui, {});
-}, ki = "univer-dv-list-dropdown", Yi = "univer-dv-list-dropdown-title", Xi = "univer-dv-list-dropdown-list", Gi = "univer-dv-list-dropdown-list-container", qi = "univer-dv-list-dropdown-selected-icon", zi = "univer-dv-list-dropdown-item-container", Ki = "univer-dv-list-dropdown-item", Qi = "univer-dv-list-dropdown-split", Zi = "univer-dv-list-dropdown-edit", De = {
-  dvListDropdown: ki,
-  dvListDropdownTitle: Yi,
-  dvListDropdownList: Xi,
-  dvListDropdownListContainer: Gi,
-  dvListDropdownSelectedIcon: qi,
-  dvListDropdownItemContainer: zi,
-  dvListDropdownItem: Ki,
-  dvListDropdownSplit: Qi,
-  dvListDropdownEdit: Zi
-}, Ji = (a) => {
+const Yi = () => {
+  const a = j(Me), t = Ge(a.activeRule$, a.activeRule);
+  return t ? /* @__PURE__ */ v.jsx(Pi, {}, t.rule.uid) : /* @__PURE__ */ v.jsx(Wi, {});
+}, Xi = "univer-dv-list-dropdown", Gi = "univer-dv-list-dropdown-title", qi = "univer-dv-list-dropdown-list", zi = "univer-dv-list-dropdown-list-container", Ki = "univer-dv-list-dropdown-selected-icon", Qi = "univer-dv-list-dropdown-item-container", Zi = "univer-dv-list-dropdown-item", Ji = "univer-dv-list-dropdown-split", es = "univer-dv-list-dropdown-edit", ye = {
+  dvListDropdown: Xi,
+  dvListDropdownTitle: Gi,
+  dvListDropdownList: qi,
+  dvListDropdownListContainer: zi,
+  dvListDropdownSelectedIcon: Ki,
+  dvListDropdownItemContainer: Qi,
+  dvListDropdownItem: Zi,
+  dvListDropdownSplit: Ji,
+  dvListDropdownEdit: es
+}, ts = (a) => {
   const { value: t, onChange: e, multiple: r, options: o, title: n, onEdit: i, style: s } = a;
-  return /* @__PURE__ */ v.jsxs("div", { className: De.dvListDropdown, style: s, children: [
-    /* @__PURE__ */ v.jsx("div", { className: De.dvListDropdownTitle, children: n }),
-    /* @__PURE__ */ v.jsx("div", { className: De.dvListDropdownList, children: /* @__PURE__ */ v.jsx(Rn, { children: /* @__PURE__ */ v.jsx("div", { className: De.dvListDropdownListContainer, children: o.map((l, d) => {
+  return /* @__PURE__ */ v.jsxs("div", { className: ye.dvListDropdown, style: s, children: [
+    /* @__PURE__ */ v.jsx("div", { className: ye.dvListDropdownTitle, children: n }),
+    /* @__PURE__ */ v.jsx("div", { className: ye.dvListDropdownList, children: /* @__PURE__ */ v.jsx(Vn, { children: /* @__PURE__ */ v.jsx("div", { className: ye.dvListDropdownListContainer, children: o.map((l, d) => {
       const c = t.indexOf(l.value) > -1, u = () => {
         let f;
         c ? f = new Set(t.filter((m) => m !== l.value)) : f = new Set(r ? [...t, l.value] : [l.value]);
@@ -1574,39 +1576,39 @@ const Wi = () => {
           f.has(m.value) && p.push(m.value);
         }), e(p);
       };
-      return /* @__PURE__ */ v.jsxs("div", { className: De.dvListDropdownItemContainer, onClick: u, children: [
-        /* @__PURE__ */ v.jsx("div", { className: De.dvListDropdownItem, style: { background: l.color || xe }, children: l.label }),
-        /* @__PURE__ */ v.jsx("div", { className: De.dvListDropdownSelectedIcon, children: c ? /* @__PURE__ */ v.jsx($r, {}) : null })
+      return /* @__PURE__ */ v.jsxs("div", { className: ye.dvListDropdownItemContainer, onClick: u, children: [
+        /* @__PURE__ */ v.jsx("div", { className: ye.dvListDropdownItem, style: { background: l.color || xe }, children: l.label }),
+        /* @__PURE__ */ v.jsx("div", { className: ye.dvListDropdownSelectedIcon, children: c ? /* @__PURE__ */ v.jsx(Hr, {}) : null })
       ] }, d);
     }) }) }) }),
-    /* @__PURE__ */ v.jsx("div", { className: De.dvListDropdownSplit }),
-    /* @__PURE__ */ v.jsx("div", { className: De.dvListDropdownEdit, children: /* @__PURE__ */ v.jsx("a", { onClick: i, children: "编辑" }) })
+    /* @__PURE__ */ v.jsx("div", { className: ye.dvListDropdownSplit }),
+    /* @__PURE__ */ v.jsx("div", { className: ye.dvListDropdownEdit, children: /* @__PURE__ */ v.jsx("a", { onClick: i, children: "编辑" }) })
   ] });
 };
-function es(a) {
-  var T, F;
-  const { location: t, hideFn: e } = a, { worksheet: r, row: o, col: n, unitId: i, subUnitId: s } = t, l = $(z), d = $(ee), c = $(ie), [u, f] = te(""), p = $(La);
-  Xe(l.ruleChange$);
-  const m = Sn.useContext(), h = m.right - m.left;
+function as(a) {
+  var O, F;
+  const { location: t, hideFn: e } = a, { worksheet: r, row: o, col: n, unitId: i, subUnitId: s } = t, l = j(q), d = j(ee), c = j(ie), [u, f] = te(""), p = j(Aa), m = Je(() => l.ruleChange$.pipe(He(16)), []);
+  Ge(m);
+  const h = Cn.useContext(), R = h.right - h.left;
   if (!r)
     return null;
-  const R = r.getCell(o, n), g = (T = R == null ? void 0 : R.dataValidation) == null ? void 0 : T.rule, C = (F = R == null ? void 0 : R.dataValidation) == null ? void 0 : F.validator, _ = (g == null ? void 0 : g.renderMode) === le.CUSTOM || (g == null ? void 0 : g.renderMode) === void 0;
-  if (!R || !g || !C)
+  const g = r.getCell(o, n), C = (O = g == null ? void 0 : g.dataValidation) == null ? void 0 : O.rule, _ = (F = g == null ? void 0 : g.dataValidation) == null ? void 0 : F.validator, M = (C == null ? void 0 : C.renderMode) === le.CUSTOM || (C == null ? void 0 : C.renderMode) === void 0;
+  if (!g || !C || !_)
     return;
-  const M = g.type === B.LIST_MULTIPLE, y = C.getListWithColor(g, i, s), D = u || pi(R), E = Qe(D), x = () => {
-    d.executeCommand(at.id, {
-      ruleId: g.uid
+  const I = C.type === H.LIST_MULTIPLE, D = _.getListWithColor(C, i, s), E = u || vi(g), x = Ze(E), T = () => {
+    d.executeCommand(ot.id, {
+      ruleId: C.uid
     }), e();
   };
   return /* @__PURE__ */ v.jsx(
-    Ji,
+    ts,
     {
-      style: { minWidth: h, maxWidth: Math.max(h, 200) },
-      title: M ? c.t("dataValidation.listMultiple.dropdown") : c.t("dataValidation.list.dropdown"),
-      value: E,
-      multiple: M,
-      onChange: (b) => {
-        const P = Yr(b), U = {
+      style: { minWidth: R, maxWidth: Math.max(R, 200) },
+      title: I ? c.t("dataValidation.listMultiple.dropdown") : c.t("dataValidation.list.dropdown"),
+      value: x,
+      multiple: I,
+      onChange: (L) => {
+        const B = qr(L), U = {
           unitId: i,
           subUnitId: s,
           range: {
@@ -1616,7 +1618,7 @@ function es(a) {
             endRow: o
           },
           value: {
-            v: P,
+            v: B,
             p: null,
             f: null,
             si: null,
@@ -1627,25 +1629,25 @@ function es(a) {
         };
         p.isVisible() && p.changeVisible({
           visible: !1,
-          keycode: Jo.ESC,
-          eventType: ln.Keyboard,
+          keycode: an.ESC,
+          eventType: un.Keyboard,
           unitId: i
-        }), d.executeCommand(Ta.id, U), f(P), M || e();
+        }), d.executeCommand(La.id, U), f(B), I || e();
       },
-      options: y.map((b) => ({
-        label: b.label,
-        value: b.label,
-        color: _ ? b.color : "transparent"
+      options: D.map((L) => ({
+        label: L.label,
+        value: L.label,
+        color: M ? L.color : "transparent"
       })),
-      onEdit: x
+      onEdit: T
     }
   );
 }
-var Kr = { exports: {} };
+var Jr = { exports: {} };
 (function(a, t) {
   (function(e, r) {
     a.exports = r();
-  })(yn, function() {
+  })(En, function() {
     var e = "minute", r = /[+-]\d\d(?::?\d\d)?/g, o = /([+-]|\d\d)/g;
     return function(n, i, s) {
       var l = i.prototype;
@@ -1673,9 +1675,9 @@ var Kr = { exports: {} };
       l.utcOffset = function(h, R) {
         var g = this.$utils().u;
         if (g(h)) return this.$u ? 0 : g(this.$offset) ? u.call(this) : this.$offset;
-        if (typeof h == "string" && (h = function(y) {
-          y === void 0 && (y = "");
-          var D = y.match(r);
+        if (typeof h == "string" && (h = function(I) {
+          I === void 0 && (I = "");
+          var D = I.match(r);
           if (!D) return null;
           var E = ("" + D[0]).match(o) || ["-", 0, 0], x = E[0], T = 60 * +E[1] + +E[2];
           return T === 0 ? 0 : x === "+" ? T : -T;
@@ -1714,15 +1716,15 @@ var Kr = { exports: {} };
       };
     };
   });
-})(Kr);
-var ts = Kr.exports;
-const as = /* @__PURE__ */ Dn(ts);
-var rs = Object.defineProperty, os = Object.getOwnPropertyDescriptor, ns = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? os(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+})(Jr);
+var rs = Jr.exports;
+const os = /* @__PURE__ */ bn(rs);
+var ns = Object.defineProperty, is = Object.getOwnPropertyDescriptor, ss = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? is(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && rs(t, e, o), o;
-}, nt = (a, t) => (e, r) => t(e, r, a);
-let lt = class extends ue {
+  return r && o && ns(t, e, o), o;
+}, lt = (a, t) => (e, r) => t(e, r, a);
+let ut = class extends ue {
   constructor(a, t, e, r, o) {
     super(), this._editorBridgeService = a, this._dataValidationModel = t, this._dataValidatorRegistryService = e, this._dialogService = r, this._localeService = o, this._initEditorBridgeInterceptor();
   }
@@ -1732,7 +1734,7 @@ let lt = class extends ue {
       {
         handler: async (a, t, e) => {
           const r = await a, { worksheet: o, row: n, col: i, unitId: s, subUnitId: l } = t, d = this._dataValidationModel.ensureManager(s, l), c = d.getRuleIdByLocation(n, i), u = c ? d.getRuleById(c) : void 0;
-          if (!u || u.errorStyle !== st.STOP)
+          if (!u || u.errorStyle !== ct.STOP)
             return e(Promise.resolve(r));
           const f = await this._dataValidatorRegistryService.getValidatorItem(u.type);
           if (!f || await f.validator(
@@ -1757,8 +1759,8 @@ let lt = class extends ue {
               title: f.getRuleFinalError(u)
             },
             footer: {
-              title: Ca.createElement(
-                He,
+              title: Ma.createElement(
+                We,
                 {
                   type: "primary",
                   onClick: () => this._dialogService.close("reject-input-dialog")
@@ -1785,8 +1787,8 @@ let lt = class extends ue {
         title: a
       },
       footer: {
-        title: Ca.createElement(
-          He,
+        title: Ma.createElement(
+          We,
           {
             type: "primary",
             onClick: () => this._dialogService.close("reject-input-dialog")
@@ -1800,46 +1802,46 @@ let lt = class extends ue {
     });
   }
 };
-lt = ns([
-  ve(_e.Ready, lt),
-  nt(0, La),
-  nt(1, I(z)),
-  nt(2, I(we)),
-  nt(3, en),
-  nt(4, I(ie))
-], lt);
-const is = "univer-dv-date-dropdown", ss = "univer-dv-date-dropdown-btns", rr = {
-  dvDateDropdown: is,
-  dvDateDropdownBtns: ss
+ut = ss([
+  ve(_e.Ready, ut),
+  lt(0, Aa),
+  lt(1, w(q)),
+  lt(2, w(we)),
+  lt(3, rn),
+  lt(4, w(ie))
+], ut);
+const ls = "univer-dv-date-dropdown", ds = "univer-dv-date-dropdown-btns", nr = {
+  dvDateDropdown: ls,
+  dvDateDropdownBtns: ds
 };
-Ve.extend(as);
-const ls = (a) => {
+Ve.extend(os);
+const cs = (a) => {
   if (a == null || typeof a == "boolean")
     return;
   if (typeof a == "number" || !Number.isNaN(+a)) {
-    const e = Ve.unix(wi(+a)).utc().format().slice(0, -1);
+    const e = Ve.unix(Di(+a)).utc().format().slice(0, -1);
     return Ve(e);
   }
   const t = Ve(a);
   if (t.isValid())
     return t;
 };
-function ds(a) {
-  var M, y, D;
-  const { location: t, hideFn: e } = a, { worksheet: r, row: o, col: n, unitId: i, subUnitId: s } = t, l = $(ee), d = $(lt), c = r.getCell(o, n), u = (M = c == null ? void 0 : c.dataValidation) == null ? void 0 : M.rule, f = (y = c == null ? void 0 : c.dataValidation) == null ? void 0 : y.validator, p = ae(c), m = ls(p), [h, R] = te(m), g = !!((D = u == null ? void 0 : u.bizInfo) != null && D.showTime), C = h && h.isValid() ? h : Ve();
+function us(a) {
+  var M, I, D;
+  const { location: t, hideFn: e } = a, { worksheet: r, row: o, col: n, unitId: i, subUnitId: s } = t, l = j(ee), d = j(ut), c = r.getCell(o, n), u = (M = c == null ? void 0 : c.dataValidation) == null ? void 0 : M.rule, f = (I = c == null ? void 0 : c.dataValidation) == null ? void 0 : I.validator, p = ae(c), m = cs(p), [h, R] = te(m), g = !!((D = u == null ? void 0 : u.bizInfo) != null && D.showTime), C = h && h.isValid() ? h : Ve();
   if (!c || !u || !f)
     return;
   const _ = async () => {
     if (!h)
       return;
-    const x = `${h.format(g ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00").split(" ").join("T")}Z`, T = zr(Ve(x).unix());
-    u.errorStyle !== st.STOP || await f.validator({
+    const x = `${h.format(g ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00").split(" ").join("T")}Z`, T = Zr(Ve(x).unix());
+    u.errorStyle !== ct.STOP || await f.validator({
       value: T,
       unitId: i,
       subUnitId: s,
       row: o,
       column: n
-    }, u) ? (l.executeCommand(Ta.id, {
+    }, u) ? (l.executeCommand(La.id, {
       unitId: i,
       subUnitId: s,
       range: {
@@ -1862,9 +1864,9 @@ function ds(a) {
       }
     }), e()) : d.showReject(f.getRuleFinalError(u));
   };
-  return /* @__PURE__ */ v.jsxs("div", { className: rr.dvDateDropdown, children: [
+  return /* @__PURE__ */ v.jsxs("div", { className: nr.dvDateDropdown, children: [
     /* @__PURE__ */ v.jsx(
-      Cn,
+      Mn,
       {
         defaultValue: h,
         pickerValue: h != null ? h : C,
@@ -1877,10 +1879,10 @@ function ds(a) {
         }
       }
     ),
-    /* @__PURE__ */ v.jsx("div", { className: rr.dvDateDropdownBtns, children: /* @__PURE__ */ v.jsx(He, { size: "small", type: "primary", onClick: _, disabled: !h, children: "确定" }) })
+    /* @__PURE__ */ v.jsx("div", { className: nr.dvDateDropdownBtns, children: /* @__PURE__ */ v.jsx(We, { size: "small", type: "primary", onClick: _, disabled: !h, children: "确定" }) })
   ] });
 }
-const Qr = "data-validation.list.dropdown", Zr = "data-validation.date.dropdown", cs = {
+const eo = "data-validation.list.dropdown", to = "data-validation.date.dropdown", hs = {
   [V.BETWEEN]: "dataValidation.date.operators.between",
   [V.EQUAL]: "dataValidation.date.operators.equal",
   [V.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
@@ -1891,7 +1893,7 @@ const Qr = "data-validation.list.dropdown", Zr = "data-validation.date.dropdown"
   [V.NOT_EQUAL]: "dataValidation.date.operators.notEqual"
 };
 V.BETWEEN + "", V.EQUAL + "", V.GREATER_THAN + "", V.GREATER_THAN_OR_EQUAL + "", V.LESS_THAN + "", V.LESS_THAN_OR_EQUAL + "", V.NOT_BETWEEN + "", V.NOT_EQUAL + "";
-const us = {
+const ms = {
   [V.BETWEEN]: "dataValidation.date.ruleName.between",
   [V.EQUAL]: "dataValidation.date.ruleName.equal",
   [V.GREATER_THAN]: "dataValidation.date.ruleName.greaterThan",
@@ -1900,7 +1902,7 @@ const us = {
   [V.LESS_THAN_OR_EQUAL]: "dataValidation.date.ruleName.lessThanOrEqual",
   [V.NOT_BETWEEN]: "dataValidation.date.ruleName.notBetween",
   [V.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual"
-}, hs = {
+}, fs = {
   [V.BETWEEN]: "dataValidation.date.errorMsg.between",
   [V.EQUAL]: "dataValidation.date.errorMsg.equal",
   [V.GREATER_THAN]: "dataValidation.date.errorMsg.greaterThan",
@@ -1909,12 +1911,12 @@ const us = {
   [V.LESS_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.lessThanOrEqual",
   [V.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
   [V.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual"
-}, ms = "DATE_SHOW_TIME_OPTION";
-function Pt(a) {
+}, ps = "DATE_SHOW_TIME_OPTION";
+function xt(a) {
   var o;
-  const { value: t, onChange: e } = a, r = $(ie);
+  const { value: t, onChange: e } = a, r = j(ie);
   return /* @__PURE__ */ v.jsx(Z, { children: /* @__PURE__ */ v.jsx(
-    $a,
+    Ua,
     {
       checked: (o = t.bizInfo) == null ? void 0 : o.showTime,
       onChange: (n) => {
@@ -1930,19 +1932,19 @@ function Pt(a) {
     }
   ) });
 }
-Pt.componentKey = ms;
-const or = "{FORMULA1}", nr = "{FORMULA2}", it = (a) => {
+xt.componentKey = ps;
+const ir = "{FORMULA1}", sr = "{FORMULA2}", dt = (a) => {
   if (a == null || typeof a == "boolean")
     return;
   if (typeof a == "number" || !Number.isNaN(+a))
     return +a;
   const t = `${Ve(a).format("YYYY-MM-DD HH:mm:ss").split(" ").join("T")}Z`;
-  return zr(Ve(t).unix());
+  return Zr(Ve(t).unix());
 };
-class fs extends Ye {
+class gs extends Xe {
   constructor() {
     super(...arguments);
-    S(this, "id", B.DATE);
+    S(this, "id", H.DATE);
     S(this, "title", "dataValidation.date.title");
     S(this, "operators", [
       V.BETWEEN,
@@ -1955,25 +1957,25 @@ class fs extends Ye {
       V.NOT_EQUAL
     ]);
     S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", Rt);
-    S(this, "optionsInput", Pt.componentKey);
-    S(this, "dropdown", Zr);
+    S(this, "formulaInput", Mt);
+    S(this, "optionsInput", xt.componentKey);
+    S(this, "dropdown", to);
     S(this, "_formulaService", this.injector.get(ce));
   }
   async parseFormula(e, r, o) {
     var l, d;
     const n = await this._formulaService.getRuleFormulaResult(r, o, e.uid), { formula1: i, formula2: s } = e;
     return {
-      formula1: it(A(i) ? ge((l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) : i),
-      formula2: it(A(s) ? ge((d = n == null ? void 0 : n[1]) == null ? void 0 : d.result) : s)
+      formula1: dt(A(i) ? ge((l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) : i),
+      formula2: dt(A(s) ? ge((d = n == null ? void 0 : n[1]) == null ? void 0 : d.result) : s)
     };
   }
   parseFormulaSync(e, r, o) {
     var l, d;
     const n = this._formulaService.getRuleFormulaResultSync(r, o, e.uid), { formula1: i, formula2: s } = e;
     return {
-      formula1: it(A(i) ? ge((l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) : i),
-      formula2: it(A(s) ? ge((d = n == null ? void 0 : n[1]) == null ? void 0 : d.result) : s)
+      formula1: dt(A(i) ? ge((l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) : i),
+      formula2: dt(A(s) ? ge((d = n == null ? void 0 : n[1]) == null ? void 0 : d.result) : s)
     };
   }
   async isValidType(e) {
@@ -1981,7 +1983,7 @@ class fs extends Ye {
     return typeof r == "string" ? Ve(r, "YYYY-MM-DD HH:mm:ss", !0).isValid() : typeof r == "number";
   }
   _validatorSingleFormula(e) {
-    return !Y.isBlank(e) && (A(e) || !Number.isNaN(+e) || !!e && Ve(e).isValid());
+    return !X.isBlank(e) && (A(e) || !Number.isNaN(+e) || !!e && Ve(e).isValid());
   }
   validatorFormula(e, r, o) {
     const n = e.operator;
@@ -1990,7 +1992,7 @@ class fs extends Ye {
         success: !1
       };
     const i = this._validatorSingleFormula(e.formula1), s = this.localeService.t("dataValidation.validFail.date");
-    if (Gt.includes(n)) {
+    if (zt.includes(n)) {
       const d = this._validatorSingleFormula(e.formula2);
       return {
         success: i && d,
@@ -2007,7 +2009,7 @@ class fs extends Ye {
     const { value: n } = e;
     return {
       ...e,
-      value: it(n)
+      value: dt(n)
     };
   }
   async validatorIsEqual(e, r, o) {
@@ -2049,47 +2051,47 @@ class fs extends Ye {
     return Number.isNaN(n) ? !0 : e.value <= n;
   }
   get operatorNames() {
-    return this.operators.map((e) => this.localeService.t(cs[e]));
+    return this.operators.map((e) => this.localeService.t(hs[e]));
   }
   generateRuleName(e) {
     var o, n;
     if (!e.operator)
       return this.titleStr;
-    const r = this.localeService.t(us[e.operator]).replace(or, (o = e.formula1) != null ? o : "").replace(nr, (n = e.formula2) != null ? n : "");
+    const r = this.localeService.t(ms[e.operator]).replace(ir, (o = e.formula1) != null ? o : "").replace(sr, (n = e.formula2) != null ? n : "");
     return `${this.titleStr} ${r}`;
   }
   generateRuleErrorMessage(e) {
     var o, n;
-    return e.operator ? `${this.localeService.t(hs[e.operator]).replace(or, (o = e.formula1) != null ? o : "").replace(nr, (n = e.formula2) != null ? n : "")}` : this.titleStr;
+    return e.operator ? `${this.localeService.t(fs[e.operator]).replace(ir, (o = e.formula1) != null ? o : "").replace(sr, (n = e.formula2) != null ? n : "")}` : this.titleStr;
   }
 }
-var ps = Object.defineProperty, gs = Object.getOwnPropertyDescriptor, vs = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? gs(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+var vs = Object.defineProperty, _s = Object.getOwnPropertyDescriptor, Ss = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? _s(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && ps(t, e, o), o;
-}, ir = (a, t) => (e, r) => t(e, r, a);
-const ze = 4, _s = 6, Re = 14, Pe = 6, Oe = 4, Ss = "#565656", sr = 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 Rs(a, t) {
+  return r && o && vs(t, e, o), o;
+}, lr = (a, t) => (e, r) => t(e, r, a);
+const Ke = 4, Rs = 6, Re = 14, Pe = 6, be = 4, Cs = "#565656", dr = 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 Vs(a, t) {
   const e = a.length;
   return {
     id: "d",
     body: {
-      dataStream: `${a}${cr}`,
+      dataStream: `${a}${hr}`,
       textRuns: [
         {
           ts: {
             fs: 11,
             ff: void 0,
-            it: ot.FALSE,
-            bl: ot.FALSE,
+            it: st.FALSE,
+            bl: st.FALSE,
             ul: {
-              s: ot.FALSE
+              s: st.FALSE
             },
             st: {
-              s: ot.FALSE
+              s: st.FALSE
             },
             ol: {
-              s: ot.FALSE
+              s: st.FALSE
             },
             cl: void 0,
             ...t,
@@ -2109,22 +2111,22 @@ function Rs(a, t) {
     }
   };
 }
-function Jr(a, t, e) {
-  const r = Rs(a, e), o = new Io(r), n = new dn(o);
+function ao(a, t, e) {
+  const r = Vs(a, e), o = new Do(r), n = new hn(o);
   return {
-    documentSkeleton: cn.create(n, t),
+    documentSkeleton: mn.create(n, t),
     docModel: o,
     docViewModel: n
   };
 }
-function aa(a, t, e) {
+function oa(a, t, e) {
   const {
     documentSkeleton: r,
     docModel: o,
     docViewModel: n
-  } = Jr(a, t, e);
+  } = ao(a, t, e);
   return {
-    documents: new un(`DOCUMENTS_${Y.generateRandomId()}`, r, {
+    documents: new fn(`DOCUMENTS_${X.generateRandomId()}`, r, {
       pageMarginLeft: 0,
       pageMarginTop: 0
     }),
@@ -2133,17 +2135,17 @@ function aa(a, t, e) {
     docViewModel: n
   };
 }
-function lr(a, t, e, r, o, n) {
+function cr(a, t, e, r, o, n) {
   let i = 0;
   switch (o) {
     case me.BOTTOM:
-      i = t - Oe * 2 - r + Oe;
+      i = t - be * 2 - r + be;
       break;
     case me.MIDDLE:
-      i = (t - Oe * 2 - r) / 2 + Oe;
+      i = (t - be * 2 - r) / 2 + be;
       break;
     default:
-      i = Oe;
+      i = be;
       break;
   }
   let s = 0;
@@ -2160,8 +2162,8 @@ function lr(a, t, e, r, o, n) {
     paddingTop: i
   };
 }
-var ha;
-let Ia = (ha = class {
+var fa;
+let ya = (fa = class {
   constructor(a, t) {
     S(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     S(this, "zIndex");
@@ -2187,12 +2189,12 @@ let Ia = (ha = class {
         i = r - Re - 1;
         break;
     }
-    a.save(), a.translateWithPrecision(t.startX + n, t.startY + i), a.fillStyle = "#565656", a.fill(sr), a.restore();
+    a.save(), a.translateWithPrecision(t.startX + n, t.startY + i), a.fillStyle = "#565656", a.fill(dr), a.restore();
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(a, t, e) {
-    var U, O;
-    const { primaryWithCoord: r, row: o, col: n, style: i, data: s, subUnitId: l } = t, d = r.isMergedMainCell ? r.mergeInfo : r, c = (U = s.dataValidation) == null ? void 0 : U.rule, u = (O = s.dataValidation) == null ? void 0 : O.validator, f = s.fontRenderExtension, { leftOffset: p = 0, rightOffset: m = 0, topOffset: h = 0, downOffset: R = 0 } = f || {};
+    var B, U;
+    const { primaryWithCoord: r, row: o, col: n, style: i, data: s, subUnitId: l } = t, d = r.isMergedMainCell ? r.mergeInfo : r, c = (B = s.dataValidation) == null ? void 0 : B.rule, u = (U = s.dataValidation) == null ? void 0 : U.validator, f = s.fontRenderExtension, { leftOffset: p = 0, rightOffset: m = 0, topOffset: h = 0, downOffset: R = 0 } = f || {};
     if (!c || !u || !u.skipDefaultFontRender(c))
       return;
     const g = {
@@ -2200,14 +2202,14 @@ let Ia = (ha = class {
       endX: d.endX - m,
       startY: d.startY + h,
       endY: d.endY - R
-    }, C = g.endX - g.startX, _ = g.endY - g.startY, M = this._ensureMap(l), y = this._generateKey(o, n), D = u.getListWithColor(c), E = ae(s), x = `${E != null ? E : ""}`, T = D.find((L) => L.label === x);
-    let { tb: F, vt: b, ht: P } = i || {};
-    if (F = F != null ? F : se.WRAP, b = b != null ? b : me.BOTTOM, P = P != null ? P : Be.LEFT, c.renderMode === le.ARROW) {
-      this._drawDownIcon(a, g, C, _, b), a.save(), a.translateWithPrecision(g.startX, g.startY), a.beginPath(), a.rect(0, 0, C, _), a.clip();
-      const L = C - Re, { documentSkeleton: H, documents: K, docModel: k } = aa(x, this._localeService, i);
-      F === se.WRAP && k.updateDocumentDataPageSize(Math.max(L, 1)), H.calculate(), H.getActualSize();
-      const w = Mt(H), { height: j, width: oe } = w, { paddingTop: G, paddingLeft: Se } = lr(L, _, oe, j, b, P);
-      a.translate(0, G), a.save(), a.translateWithPrecision(ze, 0), a.beginPath(), a.rect(0, 0, L, j), a.clip(), K.render(a), a.translateWithPrecision(Se, 0), a.restore(), a.restore(), M.set(y, {
+    }, C = g.endX - g.startX, _ = g.endY - g.startY, M = this._ensureMap(l), I = this._generateKey(o, n), D = u.getListWithColor(c), E = ae(s), x = `${E != null ? E : ""}`, T = D.find((b) => b.label === x);
+    let { tb: O, vt: F, ht: L } = i || {};
+    if (O = O != null ? O : se.WRAP, F = F != null ? F : me.BOTTOM, L = L != null ? L : Be.LEFT, c.renderMode === le.ARROW) {
+      this._drawDownIcon(a, g, C, _, F), a.save(), a.translateWithPrecision(g.startX, g.startY), a.beginPath(), a.rect(0, 0, C, _), a.clip();
+      const b = C - Re, { documentSkeleton: $, documents: z, docModel: k } = oa(x, this._localeService, i);
+      O === se.WRAP && k.updateDocumentDataPageSize(Math.max(b, 1)), $.calculate(), $.getActualSize();
+      const y = yt($), { height: P, width: oe } = y, { paddingTop: G, paddingLeft: Se } = cr(b, _, oe, P, F, L);
+      a.translate(0, G), a.save(), a.translateWithPrecision(Ke, 0), a.beginPath(), a.rect(0, 0, b, P), a.clip(), z.render(a), a.translateWithPrecision(Se, 0), a.restore(), a.restore(), M.set(I, {
         left: g.endX + e.rowHeaderWidth - Re,
         top: g.startY + e.columnHeaderHeight,
         width: Re,
@@ -2215,21 +2217,21 @@ let Ia = (ha = class {
       });
     } else {
       a.save(), a.translateWithPrecision(g.startX, g.startY), a.beginPath(), a.rect(0, 0, C, _), a.clip();
-      const L = C - Pe * 2 - ze - Re, { documentSkeleton: H, documents: K, docModel: k } = aa(x, this._localeService, i);
-      F === se.WRAP && k.updateDocumentDataPageSize(Math.max(L, 1)), H.calculate();
-      const w = Mt(H), { height: j, width: oe } = w, { paddingTop: G, paddingLeft: Se } = lr(L, _, oe, j, b, P);
+      const b = C - Pe * 2 - Ke - Re, { documentSkeleton: $, documents: z, docModel: k } = oa(x, this._localeService, i);
+      O === se.WRAP && k.updateDocumentDataPageSize(Math.max(b, 1)), $.calculate();
+      const y = yt($), { height: P, width: oe } = y, { paddingTop: G, paddingLeft: Se } = cr(b, _, oe, P, F, L);
       a.translate(Pe, G);
-      const N = Math.max(C - Pe * 2, 1), X = j;
-      yr.drawWith(a, {
-        width: N,
-        height: X,
+      const Le = Math.max(C - Pe * 2, 1), N = P;
+      Er.drawWith(a, {
+        width: Le,
+        height: N,
         fill: (T == null ? void 0 : T.color) || xe,
         radius: 8
-      }), a.save(), a.translateWithPrecision(ze, 0), a.beginPath(), a.rect(0, 0, L, j), a.clip(), a.translateWithPrecision(Se, 0), K.render(a), a.restore(), a.translate(L + ze + 4, (j - _s) / 2), a.fillStyle = Ss, a.fill(sr), a.restore(), M.set(y, {
+      }), a.save(), a.translateWithPrecision(Ke, 0), a.beginPath(), a.rect(0, 0, b, P), a.clip(), a.translateWithPrecision(Se, 0), z.render(a), a.restore(), a.translate(b + Ke + 4, (P - Rs) / 2), a.fillStyle = Cs, a.fill(dr), a.restore(), M.set(I, {
         left: g.startX + Pe + e.rowHeaderWidth,
         top: g.startY + G + e.columnHeaderHeight,
-        width: N,
-        height: X
+        width: Le,
+        height: N
       });
     }
   }
@@ -2246,17 +2248,17 @@ let Ia = (ha = class {
     }, f = u.endX - u.startX, p = ae(r), m = `${p != null ? p : ""}`;
     let { tb: h } = e || {};
     if (h = h != null ? h : se.WRAP, c.renderMode === le.ARROW) {
-      const g = f - Re, { documentSkeleton: C, docModel: _ } = aa(m, this._localeService, e);
+      const g = f - Re, { documentSkeleton: C, docModel: _ } = oa(m, this._localeService, e);
       h === se.WRAP && _.updateDocumentDataPageSize(Math.max(g, 1)), C.calculate(), C.getActualSize();
-      const M = Mt(C), { height: y } = M;
-      return y;
+      const M = yt(C), { height: I } = M;
+      return I;
     } else {
-      const g = f - Pe * 2 - ze - Re, { documentSkeleton: C, docModel: _ } = Jr(m, this._localeService, e);
+      const g = f - Pe * 2 - Ke - Re, { documentSkeleton: C, docModel: _ } = ao(m, this._localeService, e);
       h === se.WRAP && _.updateDocumentDataPageSize(Math.max(g, 1)), C.calculate();
-      const M = Mt(C), {
-        height: y
+      const M = yt(C), {
+        height: I
       } = M;
-      return y + Oe * 2;
+      return I + be * 2;
     }
   }
   isHit(a, t) {
@@ -2275,30 +2277,30 @@ let Ia = (ha = class {
       row: o,
       column: n
     };
-    this._commandService.executeCommand(Yt.id, i);
+    this._commandService.executeCommand(Gt.id, i);
   }
-}, S(ha, "padding", {
-  l: Pe + ze,
+}, S(fa, "padding", {
+  l: Pe + Ke,
   r: Re + Pe,
-  t: Oe,
-  b: Oe
-}), ha);
-Ia = vs([
-  ir(0, I(ie)),
-  ir(1, ee)
-], Ia);
-const Cs = "LIST_RENDER_MODE_OPTION_INPUT";
-function At(a) {
+  t: be,
+  b: be
+}), fa);
+ya = Ss([
+  lr(0, w(ie)),
+  lr(1, ee)
+], ya);
+const Ms = "LIST_RENDER_MODE_OPTION_INPUT";
+function jt(a) {
   var o;
-  const { value: t, onChange: e } = a, r = $(ie);
-  return /* @__PURE__ */ v.jsx(Z, { label: r.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ v.jsxs(ja, { value: `${(o = t.renderMode) != null ? o : le.CUSTOM}`, onChange: (n) => e({ ...t, renderMode: +n }), children: [
+  const { value: t, onChange: e } = a, r = j(ie);
+  return /* @__PURE__ */ v.jsx(Z, { label: r.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ v.jsxs(Ba, { value: `${(o = t.renderMode) != null ? o : le.CUSTOM}`, onChange: (n) => e({ ...t, renderMode: +n }), children: [
     /* @__PURE__ */ v.jsx($e, { value: `${le.CUSTOM}`, children: r.t("dataValidation.renderMode.chip") }),
     /* @__PURE__ */ v.jsx($e, { value: `${le.ARROW}`, children: r.t("dataValidation.renderMode.arrow") }),
     /* @__PURE__ */ v.jsx($e, { value: `${le.TEXT}`, children: r.t("dataValidation.renderMode.text") })
   ] }) });
 }
-At.componentKey = Cs;
-function ra(a) {
+jt.componentKey = Ms;
+function na(a) {
   if (!a)
     return [];
   const t = /* @__PURE__ */ new Set();
@@ -2309,7 +2311,7 @@ function ra(a) {
         const o = ae(r);
         if (o != null) {
           if (typeof o != "string" && typeof (r == null ? void 0 : r.s) == "object" && ((i = (n = r.s) == null ? void 0 : n.n) != null && i.pattern)) {
-            t.add(wn.format(r.s.n.pattern, o));
+            t.add(Dn.format(r.s.n.pattern, o));
             return;
           }
           t.add(o.toString());
@@ -2318,48 +2320,48 @@ function ra(a) {
     }
   ), [...t];
 }
-const Vs = [
+const Is = [
   "if",
   "indirect",
   "choose",
   "offset"
 ];
-function Ms(a, t) {
-  if (!A(a) || Ua(a.slice(1)))
+function ws(a, t) {
+  if (!A(a) || Wa(a.slice(1)))
     return !0;
   const r = t.sequenceNodesBuilder(a);
-  return r && r.some((o) => typeof o == "object" && o.nodeType === Mn.FUNCTION && Vs.indexOf(o.token.toLowerCase()) > -1);
+  return r && r.some((o) => typeof o == "object" && o.nodeType === wn.FUNCTION && Is.indexOf(o.token.toLowerCase()) > -1);
 }
-function Is(a, t) {
+function ys(a, t) {
   const { formula1: e = "", ranges: r } = a;
-  if (Ua(e.slice(1))) {
-    const n = br(e.slice(1));
+  if (Wa(e.slice(1))) {
+    const n = Tr(e.slice(1));
     if ((!n.sheetName || n.sheetName === t) && r.some((i) => Ue.intersects(i, n.range)))
       return !0;
   }
   return !1;
 }
-class eo extends Ye {
+class ro extends Xe {
   constructor() {
     super(...arguments);
     S(this, "formulaService", this.injector.get(ce));
-    S(this, "_lexer", this.injector.get(Ba));
+    S(this, "_lexer", this.injector.get(Ha));
     S(this, "_univerInstanceService", this.injector.get(J));
-    S(this, "id", B.LIST);
+    S(this, "id", H.LIST);
     S(this, "title", "dataValidation.list.title");
     S(this, "operators", []);
     S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", Gr);
-    S(this, "canvasRender", this.injector.createInstance(Ia));
-    S(this, "dropdown", Qr);
-    S(this, "optionsInput", At.componentKey);
+    S(this, "formulaInput", Kr);
+    S(this, "canvasRender", this.injector.createInstance(ya));
+    S(this, "dropdown", eo);
+    S(this, "optionsInput", jt.componentKey);
   }
   skipDefaultFontRender(e) {
     return e.renderMode !== le.TEXT;
   }
   validatorFormula(e, r, o) {
     var d, c, u;
-    const n = !Y.isBlank(e.formula1), i = Ms((d = e.formula1) != null ? d : "", this._lexer), s = (u = (c = this._univerInstanceService.getUnit(r, re.UNIVER_SHEET)) == null ? void 0 : c.getSheetBySheetId(o)) == null ? void 0 : u.getName(), l = Is(e, s != null ? s : "");
+    const n = !X.isBlank(e.formula1), i = ws((d = e.formula1) != null ? d : "", this._lexer), s = (u = (c = this._univerInstanceService.getUnit(r, re.UNIVER_SHEET)) == null ? void 0 : c.getSheetBySheetId(o)) == null ? void 0 : u.getName(), l = ys(e, s != null ? s : "");
     return {
       success: !!(n && i && !l),
       formula1: n ? i ? l ? this.localeService.t("dataValidation.validFail.listIntersects") : void 0 : this.localeService.t("dataValidation.validFail.listInvalid") : this.localeService.t("dataValidation.validFail.list")
@@ -2367,13 +2369,13 @@ class eo extends Ye {
   }
   parseCellValue(e) {
     const r = e.toString();
-    return Qe(r);
+    return Ze(r);
   }
   async parseFormula(e, r, o) {
     var s;
     const { formula1: n = "" } = e, i = await this.formulaService.getRuleFormulaResult(r, o, e.uid);
     return {
-      formula1: A(n) ? ra((s = i == null ? void 0 : i[0]) == null ? void 0 : s.result) : Qe(n),
+      formula1: A(n) ? na((s = i == null ? void 0 : i[0]) == null ? void 0 : s.result) : Ze(n),
       formula2: void 0
     };
   }
@@ -2394,7 +2396,7 @@ class eo extends Ye {
     const l = (p = o ? s.getSheetBySheetId(o) : void 0) != null ? p : s.getActiveSheet();
     if (!l) return [];
     const d = s.getUnitId(), c = l.getSheetId(), u = this.formulaService.getRuleFormulaResultSync(d, c, e.uid);
-    return A(n) ? ra((m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) : Qe(n);
+    return A(n) ? na((m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) : Ze(n);
   }
   async getListAsync(e, r, o) {
     var f, p, m;
@@ -2403,7 +2405,7 @@ class eo extends Ye {
     const l = (p = o ? s.getSheetBySheetId(o) : void 0) != null ? p : s.getActiveSheet();
     if (!l) return [];
     const d = s.getUnitId(), c = l.getSheetId(), u = await this.formulaService.getRuleFormulaResult(d, c, e.uid);
-    return A(n) ? ra((m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) : Qe(n);
+    return A(n) ? na((m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) : Ze(n);
   }
   getListWithColor(e, r, o) {
     const n = this.getList(e, r, o), i = (e.formula2 || "").split(",");
@@ -2416,15 +2418,15 @@ class eo extends Ye {
     }), i;
   }
 }
-function xt(a) {
+function $t(a) {
   let t = a;
   return typeof a == "string" ? ((a.startsWith("¥") || a.startsWith("$")) && (t = a.slice(1)), +t) : +a;
 }
-class ws extends Ye {
+class Ds extends Xe {
   constructor() {
     super(...arguments);
     S(this, "_formulaService", this.injector.get(ce));
-    S(this, "id", B.DECIMAL);
+    S(this, "id", H.DECIMAL);
     S(this, "title", "dataValidation.decimal.title");
     S(this, "operators", [
       V.BETWEEN,
@@ -2437,21 +2439,21 @@ class ws extends Ye {
       V.NOT_EQUAL
     ]);
     S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", Rt);
+    S(this, "formulaInput", Mt);
     S(this, "dropDownInput");
   }
   _isFormulaOrNumber(e) {
-    return !Y.isBlank(e) && (A(e) || !Number.isNaN(+e));
+    return !X.isBlank(e) && (A(e) || !Number.isNaN(+e));
   }
   async isValidType(e, r, o) {
     const { value: n } = e;
-    return !Number.isNaN(xt(n));
+    return !Number.isNaN($t(n));
   }
   transform(e, r, o) {
     const { value: n } = e;
     return {
       ...e,
-      value: xt(n)
+      value: $t(n)
     };
   }
   _parseNumber(e) {
@@ -2471,7 +2473,7 @@ class ws extends Ye {
       return {
         success: !1
       };
-    const i = Y.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), s = Y.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = Gt.includes(n), d = this.localeService.t("dataValidation.validFail.number");
+    const i = X.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), s = X.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = zt.includes(n), d = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: i && s,
       formula1: i ? void 0 : d,
@@ -2520,11 +2522,11 @@ class ws extends Ye {
     return Number.isNaN(n) ? !0 : e.value <= n;
   }
 }
-const ys = "{FORMULA1}", Ds = "{FORMULA2}";
-class Es extends Ye {
+const Es = "{FORMULA1}", bs = "{FORMULA2}";
+class Os extends Xe {
   constructor() {
     super(...arguments);
-    S(this, "id", B.TEXT_LENGTH);
+    S(this, "id", H.TEXT_LENGTH);
     S(this, "title", "dataValidation.textLength.title");
     S(this, "operators", [
       V.BETWEEN,
@@ -2537,11 +2539,11 @@ class Es extends Ye {
       V.NOT_EQUAL
     ]);
     S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", Rt);
+    S(this, "formulaInput", Mt);
     S(this, "_formulaService", this.injector.get(ce));
   }
   _isFormulaOrInt(e) {
-    return !Y.isBlank(e) && (A(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !X.isBlank(e) && (A(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   validatorFormula(e, r, o) {
     const n = e.operator;
@@ -2549,7 +2551,7 @@ class Es extends Ye {
       return {
         success: !1
       };
-    const i = Y.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), s = Y.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Gt.includes(n), d = this.localeService.t("dataValidation.validFail.number");
+    const i = X.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), s = X.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = zt.includes(n), d = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: i && s,
       formula1: i ? void 0 : d,
@@ -2585,11 +2587,11 @@ class Es extends Ye {
   }
   async validatorIsEqual(e, r, o) {
     const { formula1: n } = r;
-    return Y.isDefine(n) ? e.value === n : !1;
+    return X.isDefine(n) ? e.value === n : !1;
   }
   async validatorIsNotEqual(e, r, o) {
     const { formula1: n } = r;
-    return Y.isDefine(n) ? e.value !== n : !1;
+    return X.isDefine(n) ? e.value !== n : !1;
   }
   async validatorIsBetween(e, r, o) {
     const { formula1: n, formula2: i } = r, { value: s } = e;
@@ -2623,26 +2625,26 @@ class Es extends Ye {
   }
   generateRuleErrorMessage(e) {
     var o, n;
-    return e.operator ? `${this.localeService.t(No[e.operator]).replace(ys, (o = e.formula1) != null ? o : "").replace(Ds, (n = e.formula2) != null ? n : "")}` : this.titleStr;
+    return e.operator ? `${this.localeService.t(Lo[e.operator]).replace(Es, (o = e.formula1) != null ? o : "").replace(bs, (n = e.formula2) != null ? n : "")}` : this.titleStr;
   }
 }
-function to(a) {
+function oo(a) {
   var e, r;
-  return a ? a.p ? !((r = (e = a.p.body) == null ? void 0 : e.dataStream) != null ? r : "").slice(0, -2).trim() : Y.isBlank(a.v) : !0;
+  return a ? a.p ? !((r = (e = a.p.body) == null ? void 0 : e.dataStream) != null ? r : "").slice(0, -2).trim() : X.isBlank(a.v) : !0;
 }
-function tt(a, t, e, r) {
-  const o = [], n = [], s = r.get(z).ensureManager(a, t), l = r.get(J), d = Wt(l, { unitId: a, subUnitId: t });
+function rt(a, t, e, r) {
+  const o = [], n = [], s = r.get(q).ensureManager(a, t), l = r.get(J), d = Yt(l, { unitId: a, subUnitId: t });
   if (!d)
     return {
       redoMutations: o,
       undoMutations: n
     };
-  const { worksheet: c } = d, u = new ke();
+  const { worksheet: c } = d, u = new Ye();
   function f(h, R) {
     h.forEach((g) => {
       W.foreach(g, (C, _) => {
-        const M = c.getCellRaw(C, _), y = Nr(M);
-        (to(M) || y === R) && u.setValue(C, _, {
+        const M = c.getCellRaw(C, _), I = Lr(M);
+        (oo(M) || I === R) && u.setValue(C, _, {
           v: R,
           p: null
         });
@@ -2653,14 +2655,14 @@ function tt(a, t, e, r) {
     switch (h.type) {
       case "delete":
         o.push({
-          id: Ot.id,
+          id: Ft.id,
           params: {
             unitId: a,
             subUnitId: t,
             ruleId: h.rule.uid
           }
         }), n.unshift({
-          id: pa.id,
+          id: va.id,
           params: {
             unitId: a,
             subUnitId: t,
@@ -2694,29 +2696,29 @@ function tt(a, t, e, r) {
           }
         });
         const R = s.getRuleById(h.ruleId);
-        if (R && R.type === B.CHECKBOX) {
-          const C = s.getValidator(B.CHECKBOX).parseFormulaSync(R, a, t);
+        if (R && R.type === H.CHECKBOX) {
+          const C = s.getValidator(H.CHECKBOX).parseFormulaSync(R, a, t);
           f(h.newRanges, C.formula2);
         }
         break;
       }
       case "add": {
         if (o.push({
-          id: pa.id,
+          id: va.id,
           params: {
             unitId: a,
             subUnitId: t,
             rule: h.rule
           }
         }), n.unshift({
-          id: Ot.id,
+          id: Ft.id,
           params: {
             unitId: a,
             subUnitId: t,
             ruleId: h.rule.uid
           }
-        }), h.rule.type === B.CHECKBOX) {
-          const g = s.getValidator(B.CHECKBOX).parseFormulaSync(h.rule, a, t);
+        }), h.rule.type === H.CHECKBOX) {
+          const g = s.getValidator(H.CHECKBOX).parseFormulaSync(h.rule, a, t);
           f(h.rule.ranges, g.formula2);
         }
         break;
@@ -2724,57 +2726,57 @@ function tt(a, t, e, r) {
     }
   });
   const p = {
-    id: Nt.id,
+    id: Lt.id,
     params: {
       unitId: a,
       subUnitId: t,
       cellValue: u.getData()
     }
   }, m = {
-    id: Nt.id,
-    params: _r(r, p.params)
+    id: Lt.id,
+    params: Rr(r, p.params)
   };
   return o.push(p), n.push(m), {
     redoMutations: o,
     undoMutations: n
   };
 }
-const qt = {
+const Kt = {
   type: Ie.COMMAND,
   id: "sheet.command.updateDataValidationRuleRange",
   async handler(a, t) {
     if (!t)
       return !1;
-    const { unitId: e, subUnitId: r, ranges: o, ruleId: n } = t, i = a.get(z), s = a.get(ee), l = a.get(Ht), d = i.ensureManager(e, r), c = d.getRuleById(n);
+    const { unitId: e, subUnitId: r, ranges: o, ruleId: n } = t, i = a.get(q), s = a.get(ee), l = a.get(kt), d = i.ensureManager(e, r), c = d.getRuleById(n);
     if (!c)
       return !1;
     const u = c.ranges, f = d.getRuleObjectMatrix().clone();
     f.updateRange(n, u, o);
-    const p = f.diff(d.getDataValidations()), { redoMutations: m, undoMutations: h } = tt(e, r, p, a);
+    const p = f.diff(d.getDataValidations()), { redoMutations: m, undoMutations: h } = rt(e, r, p, a);
     return l.pushUndoRedo({
       undoMutations: h,
       redoMutations: m,
       unitID: e
-    }), await hr(m, s), !0;
+    }), await fr(m, s), !0;
   }
-}, zt = {
+}, Qt = {
   type: Ie.COMMAND,
   id: "sheet.command.addDataValidation",
   async handler(a, t) {
     if (!t)
       return !1;
-    const { unitId: e, subUnitId: r, rule: o } = t, n = a.get(z), i = a.get(ee), s = a.get(Ht), l = n.ensureManager(e, r), d = l.getRuleObjectMatrix().clone();
+    const { unitId: e, subUnitId: r, rule: o } = t, n = a.get(q), i = a.get(ee), s = a.get(kt), l = n.ensureManager(e, r), d = l.getRuleObjectMatrix().clone();
     d.addRule(o);
     const c = d.diff(l.getDataValidations()), u = {
       unitId: e,
       subUnitId: r,
       rule: o
-    }, { redoMutations: f, undoMutations: p } = tt(e, r, c, a);
+    }, { redoMutations: f, undoMutations: p } = rt(e, r, c, a);
     return f.push({
-      id: pa.id,
+      id: va.id,
       params: u
     }), p.unshift({
-      id: Ot.id,
+      id: Ft.id,
       params: {
         unitId: e,
         subUnitId: r,
@@ -2784,32 +2786,32 @@ const qt = {
       unitID: e,
       redoMutations: f,
       undoMutations: p
-    }), await hr(f, i), !0;
+    }), await fr(f, i), !0;
   }
-}, ka = {
+}, Xa = {
   type: Ie.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   async handler(a) {
-    const t = a.get(J), e = Wt(t);
+    const t = a.get(J), e = Yt(t);
     if (!e) return !1;
-    const { workbook: r, worksheet: o } = e, n = gr(a), i = a.get(ee), s = r.getUnitId(), l = o.getSheetId(), d = {
+    const { workbook: r, worksheet: o } = e, n = _r(a), i = a.get(ee), s = r.getUnitId(), l = o.getSheetId(), d = {
       rule: n,
       unitId: s,
       subUnitId: l
     };
-    return await i.executeCommand(zt.id, d) ? (i.executeCommand(at.id, {
+    return await i.executeCommand(Qt.id, d) ? (i.executeCommand(ot.id, {
       ruleId: n.uid,
       isAdd: !0
     }), !0) : !1;
   }
-}, wa = {
+}, Da = {
   type: Ie.COMMAND,
   id: "sheets.command.update-data-validation-setting",
   // eslint-disable-next-line max-lines-per-function
   handler(a, t) {
     if (!t)
       return !1;
-    const e = a.get(ee), r = a.get(Ht), o = a.get(z), n = a.get(we), { unitId: i, subUnitId: s, ruleId: l, setting: d } = t, c = n.getValidatorItem(d.type);
+    const e = a.get(ee), r = a.get(kt), o = a.get(q), n = a.get(we), { unitId: i, subUnitId: s, ruleId: l, setting: d } = t, c = n.getValidatorItem(d.type);
     if (!c)
       return !1;
     const u = o.getRuleById(i, s, l);
@@ -2832,55 +2834,55 @@ const qt = {
       ruleId: l,
       payload: {
         type: fe.SETTING,
-        payload: fa(u)
+        payload: ga(u)
       }
     }, h = [{
       id: pe.id,
       params: m
     }];
-    if (d.type === B.CHECKBOX) {
-      const g = u.ranges, C = a.get(J), _ = Wt(C, { unitId: i, subUnitId: s });
+    if (d.type === H.CHECKBOX) {
+      const g = u.ranges, C = a.get(J), _ = Yt(C, { unitId: i, subUnitId: s });
       if (_) {
-        const M = new ke(), { worksheet: y } = _, { formula2: D = vt, formula1: E = gt } = u, { formula2: x = vt, formula1: T = gt } = d;
-        g.forEach((P) => {
-          W.foreach(P, (U, O) => {
-            const L = y.getCellRaw(U, O), H = Nr(L);
-            to(L) || H === String(D) ? M.setValue(U, O, {
+        const M = new Ye(), { worksheet: I } = _, { formula2: D = Rt, formula1: E = St } = u, { formula2: x = Rt, formula1: T = St } = d;
+        g.forEach((L) => {
+          W.foreach(L, (B, U) => {
+            const b = I.getCellRaw(B, U), $ = Lr(b);
+            oo(b) || $ === String(D) ? M.setValue(B, U, {
               v: x,
               p: null
-            }) : H === String(E) && M.setValue(U, O, {
+            }) : $ === String(E) && M.setValue(B, U, {
               v: T,
               p: null
             });
           });
         });
-        const F = {
-          id: Nt.id,
+        const O = {
+          id: Lt.id,
           params: {
             unitId: i,
             subUnitId: s,
             cellValue: M.getData()
           }
-        }, b = {
-          id: Nt.id,
-          params: _r(a, F.params)
+        }, F = {
+          id: Lt.id,
+          params: Rr(a, O.params)
         };
-        p.push(F), h.push(b);
+        p.push(O), h.push(F);
       }
     }
-    return Oa(p, e).result ? (r.pushUndoRedo({
+    return Ta(p, e).result ? (r.pushUndoRedo({
       unitID: i,
       redoMutations: p,
       undoMutations: h
     }), !0) : !1;
   }
-}, ao = {
+}, no = {
   type: Ie.COMMAND,
   id: "sheets.command.update-data-validation-options",
   handler(a, t) {
     if (!t)
       return !1;
-    const e = a.get(ee), r = a.get(Ht), o = a.get(z), { unitId: n, subUnitId: i, ruleId: s, options: l } = t, d = o.getRuleById(n, i, s);
+    const e = a.get(ee), r = a.get(kt), o = a.get(q), { unitId: n, subUnitId: i, ruleId: s, options: l } = t, d = o.getRuleById(n, i, s);
     if (!d)
       return !1;
     const c = {
@@ -2900,7 +2902,7 @@ const qt = {
       ruleId: s,
       payload: {
         type: fe.OPTIONS,
-        payload: ma(d)
+        payload: pa(d)
       }
     }, p = [{
       id: pe.id,
@@ -2912,56 +2914,56 @@ const qt = {
       undoMutations: p
     }), e.executeCommand(pe.id, c), !0;
   }
-}, ro = "data-validation-single", Ya = "sheet.menu.data-validation";
-function bs(a) {
+}, io = "data-validation-single", Ga = "sheet.menu.data-validation";
+function Ns(a) {
   return {
-    id: Ya,
-    type: Pa.SUBITEMS,
-    positions: [tn.TOOLBAR_START],
-    group: an.TOOLBAR_FORMULAS_INSERT,
-    icon: ro,
+    id: Ga,
+    type: xa.SUBITEMS,
+    positions: [on.TOOLBAR_START],
+    group: nn.TOOLBAR_FORMULAS_INSERT,
+    icon: io,
     tooltip: "dataValidation.title",
-    hidden$: rn(a, re.UNIVER_SHEET),
-    disabled$: Ho(a, { workbookTypes: [ga], worksheetTypes: [va, _a], rangeTypes: [Sa] })
+    hidden$: sn(a, re.UNIVER_SHEET),
+    disabled$: Yo(a, { workbookTypes: [_a], worksheetTypes: [Sa, Ra], rangeTypes: [Ca] })
   };
 }
-function Os(a) {
+function Ts(a) {
   return {
-    id: at.id,
+    id: ot.id,
     title: "dataValidation.panel.title",
-    type: Pa.BUTTON,
-    positions: [Ya]
+    type: xa.BUTTON,
+    positions: [Ga]
   };
 }
-function Ns(a) {
+function Fs(a) {
   return {
-    id: ka.id,
+    id: Xa.id,
     title: "dataValidation.panel.add",
-    type: Pa.BUTTON,
-    positions: [Ya]
+    type: xa.BUTTON,
+    positions: [Ga]
   };
 }
-var Ts = Object.defineProperty, Fs = Object.getOwnPropertyDescriptor, oo = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? Fs(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+var Ls = Object.defineProperty, Ps = Object.getOwnPropertyDescriptor, so = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? Ps(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && Ts(t, e, o), o;
+  return r && o && Ls(t, e, o), o;
 }, Q = (a, t) => (e, r) => t(e, r, a);
-const no = {}, io = {
+const lo = {}, co = {
   tr: {
     size: 6,
     color: "#fe4b4b"
   }
 };
-let dt = class extends Na {
+let ht = class extends Fa {
   constructor(a, t, e, r, o, n, i, s, l, d, c, u, f) {
     super(), this._config = a, this._commandService = t, this._menuService = e, this._renderManagerService = r, this._univerInstanceService = o, this._autoHeightController = n, this._componentManager = i, this._dropdownManagerService = s, this._dataValidationModel = l, this._dataValidatorRegistryService = d, this._injector = c, this._sheetInterceptorService = u, this._editorBridgeService = f, this._initMenu(), this._initSkeletonChange(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
     const { menu: a = {} } = this._config;
     [
-      bs,
-      Os,
-      Ns
+      Ns,
+      Ts,
+      Fs
     ].forEach((t) => {
       this.disposeWithMe(
         this._menuService.addMenuItem(t(this._injector), a)
@@ -3016,25 +3018,25 @@ let dt = class extends Na {
       if (!t) return;
       const e = t.getUnitId(), r = (i = t.getActiveSheet()) == null ? void 0 : i.getSheetId();
       if (!r) return;
-      const o = (l = (s = this._renderManagerService.getRenderById(e)) == null ? void 0 : s.with(Tt).getWorksheetSkeleton(r)) == null ? void 0 : l.skeleton, n = this._renderManagerService.getRenderById(e);
+      const o = (l = (s = this._renderManagerService.getRenderById(e)) == null ? void 0 : s.with(Pt).getWorksheetSkeleton(r)) == null ? void 0 : l.skeleton, n = this._renderManagerService.getRenderById(e);
       o == null || o.makeDirty(!0), o == null || o.calculate(), n && n.mainComponent.makeForceDirty();
     };
-    this.disposeWithMe(this._dataValidationModel.ruleChange$.subscribe(() => a())), this.disposeWithMe(this._dataValidationModel.validStatusChange$.subscribe(() => a()));
+    this.disposeWithMe(this._dataValidationModel.ruleChange$.pipe(He(16)).subscribe(() => a())), this.disposeWithMe(this._dataValidationModel.validStatusChange$.pipe(He(16)).subscribe(() => a()));
   }
   // eslint-disable-next-line max-lines-per-function
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        Sr.CELL_CONTENT,
+        Cr.CELL_CONTENT,
         {
           priority: 200,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (a, t, e) => {
-            var M, y, D, E, x, T;
+            var M, I, D, E, x, T;
             const { row: r, col: o, unitId: n, subUnitId: i, workbook: s, worksheet: l } = t, d = this._dataValidationModel.ensureManager(n, i);
             if (!d)
               return e(a);
-            const c = (y = (M = this._renderManagerService.getRenderById(n)) == null ? void 0 : M.with(Tt).getWorksheetSkeleton(i)) == null ? void 0 : y.skeleton;
+            const c = (I = (M = this._renderManagerService.getRenderById(n)) == null ? void 0 : M.with(Pt).getWorksheetSkeleton(i)) == null ? void 0 : I.skeleton;
             if (!c)
               return e(a);
             const u = t.workbook.getStyles(), f = (typeof (a == null ? void 0 : a.s) == "string" ? u.get(a == null ? void 0 : a.s) : a == null ? void 0 : a.s) || {}, p = d.getRuleIdByLocation(r, o);
@@ -3045,24 +3047,24 @@ let dt = class extends Na {
               return e(a);
             const h = l.getCellRaw(t.row, t.col), R = this._dataValidationModel.validator(ae(h), m, t), g = this._dataValidatorRegistryService.getValidatorItem(m.type), C = ae(a);
             let _ = {};
-            if ((m.type === B.LIST || m.type === B.LIST_MULTIPLE) && (_ = {
+            if ((m.type === H.LIST || m.type === H.LIST_MULTIPLE) && (_ = {
               interceptorStyle: {
                 ...a == null ? void 0 : a.interceptorStyle,
                 tb: (D = f.tb !== se.OVERFLOW ? f.tb : se.CLIP) != null ? D : se.WRAP
               }
-            }), m.type === B.CHECKBOX && (_ = {
+            }), m.type === H.CHECKBOX && (_ = {
               interceptorStyle: {
                 ...a == null ? void 0 : a.interceptorStyle,
                 tb: se.CLIP
               }
-            }), m.type === B.LIST && (m.renderMode === le.ARROW || m.renderMode === le.TEXT)) {
-              const F = g.getListWithColorMap(m), b = `${(E = ae(a)) != null ? E : ""}`, P = F[b];
-              P && (_ = {
+            }), m.type === H.LIST && (m.renderMode === le.ARROW || m.renderMode === le.TEXT)) {
+              const O = g.getListWithColorMap(m), F = `${(E = ae(a)) != null ? E : ""}`, L = O[F];
+              L && (_ = {
                 ..._,
                 interceptorStyle: {
                   ..._.interceptorStyle,
                   bg: {
-                    rgb: P
+                    rgb: L
                   }
                 }
               });
@@ -3078,7 +3080,7 @@ let dt = class extends Na {
               },
               markers: {
                 ...a == null ? void 0 : a.markers,
-                ...R === Ce.INVALID ? io : null
+                ...R === Ce.INVALID ? co : null
               },
               customRender: [
                 ...(x = a == null ? void 0 : a.customRender) != null ? x : [],
@@ -3095,11 +3097,11 @@ let dt = class extends Na {
                 ..._.interceptorStyle
               },
               get interceptorAutoHeight() {
-                var P, U, O, L;
-                const F = c.mergeData.find((H) => {
-                  const { startColumn: K, startRow: k, endColumn: w, endRow: j } = H;
-                  return r >= k && o >= K && r <= j && o <= w;
-                }), b = {
+                var L, B, U, b;
+                const O = c.mergeData.find(($) => {
+                  const { startColumn: z, startRow: k, endColumn: y, endRow: P } = $;
+                  return r >= k && o >= z && r <= P && o <= y;
+                }), F = {
                   data: {
                     ...a,
                     dataValidation: {
@@ -3110,7 +3112,7 @@ let dt = class extends Na {
                     }
                   },
                   style: c.getsStyles().getStyleByCell(a),
-                  primaryWithCoord: c.getCellByIndex((P = F == null ? void 0 : F.startRow) != null ? P : r, (U = F == null ? void 0 : F.startColumn) != null ? U : o),
+                  primaryWithCoord: c.getCellByIndex((L = O == null ? void 0 : O.startRow) != null ? L : r, (B = O == null ? void 0 : O.startColumn) != null ? B : o),
                   unitId: n,
                   subUnitId: i,
                   row: r,
@@ -3118,9 +3120,9 @@ let dt = class extends Na {
                   workbook: s,
                   worksheet: l
                 };
-                return (L = (O = g == null ? void 0 : g.canvasRender) == null ? void 0 : O.calcCellAutoHeight) == null ? void 0 : L.call(O, b);
+                return (b = (U = g == null ? void 0 : g.canvasRender) == null ? void 0 : U.calcCellAutoHeight) == null ? void 0 : b.call(U, F);
               },
-              coverable: ((T = a == null ? void 0 : a.coverable) != null ? T : !0) && !(m.type === B.LIST || m.type === B.LIST_MULTIPLE)
+              coverable: ((T = a == null ? void 0 : a.coverable) != null ? T : !0) && !(m.type === H.LIST || m.type === H.LIST_MULTIPLE)
             });
           }
         }
@@ -3128,31 +3130,34 @@ let dt = class extends Na {
     );
   }
   _initAutoHeight() {
-    this._dataValidationModel.ruleChange$.subscribe((a) => {
-      var t;
-      if ((t = a.rule) != null && t.ranges) {
-        const e = this._autoHeightController.getUndoRedoParamsOfAutoHeight(a.rule.ranges);
-        Oa(e.redos, this._commandService);
+    this._dataValidationModel.ruleChange$.pipe(Or(16)).subscribe((a) => {
+      const t = [];
+      if (a.forEach((e) => {
+        var r;
+        (r = e.rule) != null && r.ranges && t.push(...e.rule.ranges);
+      }), t.length) {
+        const e = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
+        Ta(e.redos, this._commandService);
       }
     });
   }
 };
-dt = oo([
-  ve(_e.Rendered, dt),
+ht = so([
+  ve(_e.Rendered, ht),
   Q(1, ee),
-  Q(2, on),
-  Q(3, Aa),
+  Q(2, ln),
+  Q(3, ja),
   Q(4, J),
-  Q(5, I(Cr)),
-  Q(6, I(St)),
-  Q(7, I(Ne)),
-  Q(8, I(z)),
-  Q(9, I(we)),
-  Q(10, I(Ee)),
-  Q(11, I(Fa)),
-  Q(12, wo(La))
-], dt);
-let ct = class extends Na {
+  Q(5, w(Mr)),
+  Q(6, w(Vt)),
+  Q(7, w(Oe)),
+  Q(8, w(q)),
+  Q(9, w(we)),
+  Q(10, w(De)),
+  Q(11, w(Pa)),
+  Q(12, Oo(Aa))
+], ht);
+let mt = class extends Fa {
   constructor(a, t, e, r, o, n, i, s) {
     super(), this._config = a, this._commandService = t, this._renderManagerService = e, this._univerInstanceService = r, this._autoHeightController = o, this._dataValidationModel = n, this._dataValidatorRegistryService = i, this._sheetInterceptorService = s, this._initSkeletonChange(), this._initViewModelIntercept(), this._initAutoHeight();
   }
@@ -3163,25 +3168,25 @@ let ct = class extends Na {
       if (!t) return;
       const e = t.getUnitId(), r = (i = t.getActiveSheet()) == null ? void 0 : i.getSheetId();
       if (!r) return;
-      const o = (l = (s = this._renderManagerService.getRenderById(e)) == null ? void 0 : s.with(Tt).getWorksheetSkeleton(r)) == null ? void 0 : l.skeleton, n = this._renderManagerService.getRenderById(e);
+      const o = (l = (s = this._renderManagerService.getRenderById(e)) == null ? void 0 : s.with(Pt).getWorksheetSkeleton(r)) == null ? void 0 : l.skeleton, n = this._renderManagerService.getRenderById(e);
       o == null || o.makeDirty(!0), o == null || o.calculate(), n && n.mainComponent.makeForceDirty();
     };
-    this.disposeWithMe(this._dataValidationModel.ruleChange$.subscribe(() => a())), this.disposeWithMe(this._dataValidationModel.validStatusChange$.subscribe(() => a()));
+    this.disposeWithMe(this._dataValidationModel.ruleChange$.pipe(He(16)).subscribe(() => a())), this.disposeWithMe(this._dataValidationModel.validStatusChange$.pipe(He(16)).subscribe(() => a()));
   }
   // eslint-disable-next-line max-lines-per-function
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        Sr.CELL_CONTENT,
+        Cr.CELL_CONTENT,
         {
           priority: 200,
           // eslint-disable-next-line max-lines-per-function
           handler: (a, t, e) => {
-            var M, y, D, E, x;
+            var M, I, D, E, x;
             const { row: r, col: o, unitId: n, subUnitId: i, workbook: s, worksheet: l } = t, d = this._dataValidationModel.ensureManager(n, i);
             if (!d)
               return e(a);
-            const c = (y = (M = this._renderManagerService.getRenderById(n)) == null ? void 0 : M.with(Tt).getWorksheetSkeleton(i)) == null ? void 0 : y.skeleton;
+            const c = (I = (M = this._renderManagerService.getRenderById(n)) == null ? void 0 : M.with(Pt).getWorksheetSkeleton(i)) == null ? void 0 : I.skeleton;
             if (!c)
               return e(a);
             const u = t.workbook.getStyles(), f = (typeof (a == null ? void 0 : a.s) == "string" ? u.get(a == null ? void 0 : a.s) : a == null ? void 0 : a.s) || {}, p = d.getRuleIdByLocation(r, o);
@@ -3192,24 +3197,24 @@ let ct = class extends Na {
               return e(a);
             const h = t.worksheet.getCellRaw(t.row, t.col), R = this._dataValidationModel.validator(ae(h), m, t), g = this._dataValidatorRegistryService.getValidatorItem(m.type), C = ae(a);
             let _ = {};
-            if ((m.type === B.LIST || m.type === B.LIST_MULTIPLE) && (_ = {
+            if ((m.type === H.LIST || m.type === H.LIST_MULTIPLE) && (_ = {
               interceptorStyle: {
                 ...a == null ? void 0 : a.interceptorStyle,
                 tb: (D = f.tb !== se.OVERFLOW ? f.tb : se.CLIP) != null ? D : se.WRAP
               }
-            }), m.type === B.CHECKBOX && (_ = {
+            }), m.type === H.CHECKBOX && (_ = {
               interceptorStyle: {
                 ...a == null ? void 0 : a.interceptorStyle,
                 tb: se.CLIP
               }
-            }), m.type === B.LIST && (m.renderMode === le.ARROW || m.renderMode === le.TEXT)) {
-              const T = g.getListWithColorMap(m), F = `${(E = ae(a)) != null ? E : ""}`, b = T[F];
-              b && (_ = {
+            }), m.type === H.LIST && (m.renderMode === le.ARROW || m.renderMode === le.TEXT)) {
+              const T = g.getListWithColorMap(m), O = `${(E = ae(a)) != null ? E : ""}`, F = T[O];
+              F && (_ = {
                 ..._,
                 interceptorStyle: {
                   ..._.interceptorStyle,
                   bg: {
-                    rgb: b
+                    rgb: F
                   }
                 }
               });
@@ -3225,7 +3230,7 @@ let ct = class extends Na {
               },
               markers: {
                 ...a == null ? void 0 : a.markers,
-                ...R === Ce.INVALID ? io : null
+                ...R === Ce.INVALID ? co : null
               },
               customRender: [
                 ...(x = a == null ? void 0 : a.customRender) != null ? x : [],
@@ -3242,11 +3247,11 @@ let ct = class extends Na {
                 ..._.interceptorStyle
               },
               get interceptorAutoHeight() {
-                var b, P, U, O;
-                const T = c.mergeData.find((L) => {
-                  const { startColumn: H, startRow: K, endColumn: k, endRow: w } = L;
-                  return r >= K && o >= H && r <= w && o <= k;
-                }), F = {
+                var F, L, B, U;
+                const T = c.mergeData.find((b) => {
+                  const { startColumn: $, startRow: z, endColumn: k, endRow: y } = b;
+                  return r >= z && o >= $ && r <= y && o <= k;
+                }), O = {
                   data: {
                     ...a,
                     dataValidation: {
@@ -3257,7 +3262,7 @@ let ct = class extends Na {
                     }
                   },
                   style: c.getsStyles().getStyleByCell(a),
-                  primaryWithCoord: c.getCellByIndex((b = T == null ? void 0 : T.startRow) != null ? b : r, (P = T == null ? void 0 : T.startColumn) != null ? P : o),
+                  primaryWithCoord: c.getCellByIndex((F = T == null ? void 0 : T.startRow) != null ? F : r, (L = T == null ? void 0 : T.startColumn) != null ? L : o),
                   unitId: n,
                   subUnitId: i,
                   row: r,
@@ -3265,7 +3270,7 @@ let ct = class extends Na {
                   worksheet: l,
                   workbook: s
                 };
-                return (O = (U = g == null ? void 0 : g.canvasRender) == null ? void 0 : U.calcCellAutoHeight) == null ? void 0 : O.call(U, F);
+                return (U = (B = g == null ? void 0 : g.canvasRender) == null ? void 0 : B.calcCellAutoHeight) == null ? void 0 : U.call(B, O);
               }
             });
           }
@@ -3274,35 +3279,38 @@ let ct = class extends Na {
     );
   }
   _initAutoHeight() {
-    this._dataValidationModel.ruleChange$.subscribe((a) => {
-      var t;
-      if ((t = a.rule) != null && t.ranges) {
-        const e = this._autoHeightController.getUndoRedoParamsOfAutoHeight(a.rule.ranges);
-        Oa(e.redos, this._commandService);
+    this._dataValidationModel.ruleChange$.pipe(Or(16)).subscribe((a) => {
+      const t = [];
+      if (a.forEach((e) => {
+        var r;
+        (r = e.rule) != null && r.ranges && t.push(...e.rule.ranges);
+      }), t.length) {
+        const e = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
+        Ta(e.redos, this._commandService);
       }
     });
   }
 };
-ct = oo([
-  ve(_e.Rendered, ct),
+mt = so([
+  ve(_e.Rendered, mt),
   Q(1, ee),
-  Q(2, Aa),
+  Q(2, ja),
   Q(3, J),
-  Q(4, I(Cr)),
-  Q(5, I(z)),
-  Q(6, I(we)),
-  Q(7, I(Fa))
-], ct);
-var Ls = Object.defineProperty, Ps = Object.getOwnPropertyDescriptor, As = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? Ps(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+  Q(4, w(Mr)),
+  Q(5, w(q)),
+  Q(6, w(we)),
+  Q(7, w(Pa))
+], mt);
+var As = Object.defineProperty, xs = Object.getOwnPropertyDescriptor, js = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? xs(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && Ls(t, e, o), o;
-}, xs = (a, t) => (e, r) => t(e, r, a);
-let _t = class extends ue {
+  return r && o && As(t, e, o), o;
+}, $s = (a, t) => (e, r) => t(e, r, a);
+let Ct = class extends ue {
   constructor(t) {
     super();
     S(this, "_currentManager");
-    S(this, "_currentManager$", new Dr());
+    S(this, "_currentManager$", new br());
     S(this, "currentManager$", this._currentManager$.asObservable());
     this._dataValidationModel = t, this.disposeWithMe(() => {
       this._currentManager$.complete();
@@ -3329,15 +3337,15 @@ let _t = class extends ue {
     return this._ensureManager(t, e);
   }
 };
-_t = As([
-  xs(0, I(z))
-], _t);
-var js = Object.defineProperty, $s = Object.getOwnPropertyDescriptor, Bs = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? $s(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+Ct = js([
+  $s(0, w(q))
+], Ct);
+var Bs = Object.defineProperty, Us = Object.getOwnPropertyDescriptor, Hs = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? Us(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && js(t, e, o), o;
-}, yt = (a, t) => (e, r) => t(e, r, a);
-let We = class extends ue {
+  return r && o && Bs(t, e, o), o;
+}, bt = (a, t) => (e, r) => t(e, r, a);
+let ke = class extends ue {
   constructor(t, e, r, o) {
     super();
     S(this, "_formulaMap", /* @__PURE__ */ new Map());
@@ -3370,7 +3378,7 @@ let We = class extends ue {
     let r = this._formulaMap.get(t), o = this._ruleFormulaMap.get(t), n = this._formulaCellMap.get(t);
     (!r || !o || !n) && (r = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map(), this._formulaMap.set(t, r), this._ruleFormulaMap.set(t, o), this._formulaCellMap.set(t, n));
     let i = r.get(e), s = o.get(e), l = n.get(e);
-    return (!i || !s || !l) && (i = new ke(), r.set(e, i), s = /* @__PURE__ */ new Map(), o.set(e, s), l = /* @__PURE__ */ new Map(), n.set(e, l)), {
+    return (!i || !s || !l) && (i = new Ye(), r.set(e, i), s = /* @__PURE__ */ new Map(), o.set(e, s), l = /* @__PURE__ */ new Map(), n.set(e, l)), {
       formulaMap: i,
       ruleFormulaMap: s,
       formulaCellMap: l
@@ -3395,14 +3403,14 @@ let We = class extends ue {
     const { formulaMap: i, ruleFormulaMap: s, formulaCellMap: l } = this._ensureMaps(t, e);
     if (!o)
       return;
-    const d = In(
+    const d = yn(
       this._lexerTreeBuilder,
       o
     ), c = n[0].startRow, u = n[0].startColumn;
     let f;
     d ? n.forEach((p) => {
       W.foreach(p, (m, h) => {
-        const R = Ja(
+        const R = tr(
           this._lexerTreeBuilder,
           o,
           c,
@@ -3434,7 +3442,7 @@ let We = class extends ue {
   }
   addRule(t, e, r) {
     const { ranges: o, formula1: n, uid: i, type: s } = r;
-    s !== B.CUSTOM || !n || !A(n) || this._addFormulaByRange(t, e, i, n, o);
+    s !== H.CUSTOM || !n || !A(n) || this._addFormulaByRange(t, e, i, n, o);
   }
   updateRuleRanges(t, e, r, o, n) {
     const { formulaMap: i, ruleFormulaMap: s, formulaCellMap: l } = this._ensureMaps(t, e), d = s.get(r);
@@ -3451,9 +3459,9 @@ let We = class extends ue {
         var M;
         const _ = (M = i.getValue(g, C)) != null ? M : {};
         if (_.ruleId !== r) {
-          const y = s.get(_.ruleId);
-          if (y != null && y.isTransformable && h.add(_.formulaId), p) {
-            const D = Ja(this._lexerTreeBuilder, c, f, u, g, C), E = this._registerFormula(t, e, r, D);
+          const I = s.get(_.ruleId);
+          if (I != null && I.isTransformable && h.add(_.formulaId), p) {
+            const D = tr(this._lexerTreeBuilder, c, f, u, g, C), E = this._registerFormula(t, e, r, D);
             i.setValue(g, C, {
               // formulaText: relativeText,
               ruleId: r,
@@ -3490,21 +3498,21 @@ let We = class extends ue {
     return o.get(r);
   }
 };
-We = Bs([
-  yt(0, I(Er)),
-  yt(1, I(Ba)),
-  yt(2, I(z)),
-  yt(3, I(rt))
-], We);
-class Us extends Ye {
+ke = Hs([
+  bt(0, w(Nr)),
+  bt(1, w(Ha)),
+  bt(2, w(q)),
+  bt(3, w(nt))
+], ke);
+class Ws extends Xe {
   constructor() {
     super(...arguments);
-    S(this, "id", B.CUSTOM);
+    S(this, "id", H.CUSTOM);
     S(this, "title", "dataValidation.custom.title");
     S(this, "operators", []);
     S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", Xr);
-    S(this, "_customFormulaService", this.injector.get(We));
+    S(this, "formulaInput", zr);
+    S(this, "_customFormulaService", this.injector.get(ke));
   }
   validatorFormula(e, r, o) {
     const n = A(e.formula1);
@@ -3527,11 +3535,11 @@ class Us extends Ye {
     return this.localeService.t("dataValidation.custom.error");
   }
 }
-class Hs extends Ye {
+class ks extends Xe {
   constructor() {
     super(...arguments);
     S(this, "_formulaService", this.injector.get(ce));
-    S(this, "id", B.WHOLE);
+    S(this, "id", H.WHOLE);
     S(this, "title", "dataValidation.whole.title");
     S(this, "operators", [
       V.BETWEEN,
@@ -3544,21 +3552,21 @@ class Hs extends Ye {
       V.NOT_EQUAL
     ]);
     S(this, "scopes", ["sheet"]);
-    S(this, "formulaInput", Rt);
+    S(this, "formulaInput", Mt);
     S(this, "dropDownInput");
   }
   _isFormulaOrInt(e) {
-    return !Y.isBlank(e) && (A(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !X.isBlank(e) && (A(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   async isValidType(e, r, o) {
-    const { value: n } = e, i = xt(n);
+    const { value: n } = e, i = $t(n);
     return !Number.isNaN(i) && Number.isInteger(i);
   }
   transform(e, r, o) {
     const { value: n } = e;
     return {
       ...e,
-      value: xt(n)
+      value: $t(n)
     };
   }
   _parseNumber(e) {
@@ -3578,7 +3586,7 @@ class Hs extends Ye {
       return {
         success: !1
       };
-    const i = Y.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), s = Y.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = Gt.includes(n), d = this.localeService.t("dataValidation.validFail.number");
+    const i = X.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), s = X.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = zt.includes(n), d = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: i && s,
       formula1: i ? void 0 : d,
@@ -3627,25 +3635,25 @@ class Hs extends Ye {
     return Number.isNaN(n) ? !0 : e.value <= n;
   }
 }
-const so = 4, Ws = 0, oa = 4, lo = 4, ya = 6, jt = 6, Ae = 14;
-function ks(a, t) {
-  const e = hn.getTextSize(a, t), r = e.width + so * 2, { ba: o, bd: n } = e, i = o + n;
+const uo = 4, Ys = 0, ia = 4, ho = 4, Ea = 6, Bt = 6, Ae = 14;
+function Xs(a, t) {
+  const e = pn.getTextSize(a, t), r = e.width + uo * 2, { ba: o, bd: n } = e, i = o + n;
   return {
     width: r,
-    height: i + Ws * 2,
+    height: i + Ys * 2,
     ba: o
   };
 }
-function dr(a, t, e, r) {
-  const o = e - Ae - ya, n = r - jt * 2, i = a.map((c) => ({
-    layout: ks(c, t),
+function ur(a, t, e, r) {
+  const o = e - Ae - Ea, n = r - Bt * 2, i = a.map((c) => ({
+    layout: Xs(c, t),
     text: c
   }));
   let s;
   const l = [];
   i.forEach((c) => {
     const { layout: u } = c, { width: f, height: p } = u;
-    !s || s.width + f + oa > o ? (s = {
+    !s || s.width + f + ia > o ? (s = {
       width: f,
       height: p,
       items: [{
@@ -3654,39 +3662,39 @@ function dr(a, t, e, r) {
       }]
     }, l.push(s)) : (s.items.push({
       ...c,
-      left: s.width + oa
-    }), s.width = s.width + f + oa);
+      left: s.width + ia
+    }), s.width = s.width + f + ia);
   });
   let d = 0;
   return l.forEach((c, u) => {
-    u === l.length - 1 ? d += c.height : d += c.height + lo;
+    u === l.length - 1 ? d += c.height : d += c.height + ho;
   }), {
     lines: l,
     totalHeight: d,
     contentWidth: o,
     contentHeight: n,
-    cellAutoHeight: d + jt * 2
+    cellAutoHeight: d + Bt * 2
   };
 }
-const Ys = 8;
-class Xs extends mn {
+const Gs = 8;
+class qs extends gn {
   static drawWith(t, e) {
     const { fontFamily: r, fontString: o, fontSize: n, info: i, fill: s, color: l } = e, { layout: d, text: c } = i;
-    t.save(), yr.drawWith(t, {
+    t.save(), Er.drawWith(t, {
       width: d.width,
       height: d.height,
-      radius: Ys,
+      radius: Gs,
       fill: s || xe
-    }), t.translateWithPrecision(so, d.ba), t.font = o, t.fillStyle = l, t.fillText(c, 0, 0), t.restore();
+    }), t.translateWithPrecision(uo, d.ba), t.font = o, t.fillStyle = l, t.fillText(c, 0, 0), t.restore();
   }
 }
-var Gs = Object.defineProperty, qs = Object.getOwnPropertyDescriptor, zs = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? qs(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+var zs = Object.defineProperty, Ks = Object.getOwnPropertyDescriptor, Qs = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? Ks(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && Gs(t, e, o), o;
-}, Ks = (a, t) => (e, r) => t(e, r, a);
-const Qs = 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 Da = class {
+  return r && o && zs(t, e, o), o;
+}, Zs = (a, t) => (e, r) => t(e, r, a);
+const Js = 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 ba = class {
   constructor(a) {
     S(this, "zIndex");
     S(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
@@ -3710,11 +3718,11 @@ let Da = class {
         i = r - Ae + 4;
         break;
     }
-    a.save(), a.translateWithPrecision(t.startX + n, t.startY + i), a.fillStyle = "#565656", a.fill(Qs), a.restore();
+    a.save(), a.translateWithPrecision(t.startX + n, t.startY + i), a.fillStyle = "#565656", a.fill(Js), a.restore();
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(a, t, e, r) {
-    var j, oe;
+    var P, oe;
     const { primaryWithCoord: o, row: n, col: i, style: s, data: l, subUnitId: d } = t, c = o.isMergedMainCell ? o.mergeInfo : o, u = l.fontRenderExtension, { leftOffset: f = 0, rightOffset: p = 0, topOffset: m = 0, downOffset: h = 0 } = u || {}, R = l.dataValidation, g = this._ensureMap(d), C = this._generateKey(n, i);
     if (!R)
       return;
@@ -3723,42 +3731,42 @@ let Da = class {
       endX: c.endX - p,
       startY: c.startY + m,
       endY: c.endY - h
-    }, M = _.endX - _.startX, y = _.endY - _.startY, { cl: D } = s || {}, E = (j = typeof D == "object" ? D == null ? void 0 : D.rgb : D) != null ? j : "#000", x = Qa(s != null ? s : void 0), { rule: T, validator: F } = R, b = F, { vt: P, ht: U } = s || {}, O = P != null ? P : me.MIDDLE, L = (oe = ae(l)) != null ? oe : "", H = b.parseCellValue(L), K = b.getListWithColorMap(T), k = dr(H, x, M, y);
-    this._drawDownIcon(a, _, M, y, O), a.save(), a.translateWithPrecision(_.startX, _.startY), a.beginPath(), a.rect(0, 0, M - Ae, y), a.clip(), a.translateWithPrecision(ya, jt);
-    let w = 0;
-    switch (O) {
+    }, M = _.endX - _.startX, I = _.endY - _.startY, { cl: D } = s || {}, E = (P = typeof D == "object" ? D == null ? void 0 : D.rgb : D) != null ? P : "#000", x = Ja(s != null ? s : void 0), { rule: T, validator: O } = R, F = O, { vt: L, ht: B } = s || {}, U = L != null ? L : me.MIDDLE, b = (oe = ae(l)) != null ? oe : "", $ = F.parseCellValue(b), z = F.getListWithColorMap(T), k = ur($, x, M, I);
+    this._drawDownIcon(a, _, M, I, U), a.save(), a.translateWithPrecision(_.startX, _.startY), a.beginPath(), a.rect(0, 0, M - Ae, I), a.clip(), a.translateWithPrecision(Ea, Bt);
+    let y = 0;
+    switch (U) {
       case me.MIDDLE:
-        w = (k.contentHeight - k.totalHeight) / 2;
+        y = (k.contentHeight - k.totalHeight) / 2;
         break;
       case me.BOTTOM:
-        w = k.contentHeight - k.totalHeight;
+        y = k.contentHeight - k.totalHeight;
         break;
     }
-    a.translateWithPrecision(0, w), k.lines.forEach((G, Se) => {
+    a.translateWithPrecision(0, y), k.lines.forEach((G, Se) => {
       a.save();
-      const { width: N, height: X, items: q } = G;
-      let ne = 0;
-      switch (U) {
+      const { width: Le, height: N, items: K } = G;
+      let Y = 0;
+      switch (B) {
         case Be.RIGHT:
-          ne = k.contentWidth - N;
+          Y = k.contentWidth - Le;
           break;
         case Be.CENTER:
-          ne = (k.contentWidth - N) / 2;
+          Y = (k.contentWidth - Le) / 2;
           break;
       }
-      a.translate(ne, Se * (X + lo)), q.forEach((ye) => {
-        a.save(), a.translateWithPrecision(ye.left, 0), Xs.drawWith(a, {
+      a.translate(Y, Se * (N + ho)), K.forEach((ne) => {
+        a.save(), a.translateWithPrecision(ne.left, 0), qs.drawWith(a, {
           ...x,
-          info: ye,
+          info: ne,
           color: E,
-          fill: K[ye.text]
+          fill: z[ne.text]
         }), a.restore();
       }), a.restore();
     }), a.restore(), g.set(C, {
       left: _.startX,
       top: _.startY,
-      width: k.contentWidth + ya + Ae,
-      height: k.contentHeight + jt * 2
+      width: k.contentWidth + Ea + Ae,
+      height: k.contentHeight + Bt * 2
     });
   }
   calcCellAutoHeight(a) {
@@ -3771,8 +3779,8 @@ let Da = class {
     }, u = r.dataValidation;
     if (!u)
       return;
-    const f = c.endX - c.startX, p = c.endY - c.startY, m = (M = ae(r)) != null ? M : "", { validator: h } = u, g = h.parseCellValue(m), C = Qa(e != null ? e : void 0);
-    return dr(g, C, f, p).cellAutoHeight;
+    const f = c.endX - c.startX, p = c.endY - c.startY, m = (M = ae(r)) != null ? M : "", { validator: h } = u, g = h.parseCellValue(m), C = Ja(e != null ? e : void 0);
+    return ur(g, C, f, p).cellAutoHeight;
   }
   isHit(a, t) {
     const { primaryWithCoord: e } = t, r = e.isMergedMainCell ? e.mergeInfo : e, { endX: o } = r, { x: n } = a;
@@ -3787,29 +3795,29 @@ let Da = class {
       row: o,
       column: n
     };
-    this._commandService.executeCommand(Yt.id, i);
+    this._commandService.executeCommand(Gt.id, i);
   }
 };
-Da = zs([
-  Ks(0, ee)
-], Da);
-class Zs extends eo {
+ba = Qs([
+  Zs(0, ee)
+], ba);
+class el extends ro {
   constructor() {
     super(...arguments);
-    S(this, "id", B.LIST_MULTIPLE);
+    S(this, "id", H.LIST_MULTIPLE);
     S(this, "title", "dataValidation.listMultiple.title");
-    S(this, "canvasRender", this.injector.createInstance(Da));
+    S(this, "canvasRender", this.injector.createInstance(ba));
   }
   skipDefaultFontRender() {
     return !0;
   }
 }
-var Js = Object.defineProperty, el = Object.getOwnPropertyDescriptor, tl = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? el(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+var tl = Object.defineProperty, al = Object.getOwnPropertyDescriptor, rl = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? al(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && Js(t, e, o), o;
-}, be = (a, t) => (e, r) => t(e, r, a);
-let ut = class extends Na {
+  return r && o && tl(t, e, o), o;
+}, Ee = (a, t) => (e, r) => t(e, r, a);
+let ft = class extends Fa {
   constructor(a, t, e, r, o, n, i, s) {
     super(), this._univerInstanceService = a, this._sheetDataValidationService = t, this._dataValidatorRegistryService = e, this._injector = r, this._componentManger = o, this._selectionManagerService = n, this._sheetInterceptorService = i, this._dataValidationModel = s, this._init();
   }
@@ -3818,14 +3826,14 @@ let ut = class extends Na {
   }
   _registerValidators() {
     [
-      ws,
-      Hs,
-      Es,
-      fs,
-      Ii,
-      eo,
-      Zs,
-      Us
+      Ds,
+      ks,
+      Os,
+      gs,
+      yi,
+      ro,
+      el,
+      Ws
     ].forEach((a) => {
       const t = this._injector.createInstance(a);
       this.disposeWithMe(
@@ -3838,12 +3846,12 @@ let ut = class extends Na {
     });
   }
   _initInstanceChange() {
-    const a = new ur();
+    const a = new mr();
     this.disposeWithMe(this._univerInstanceService.getCurrentTypeOfUnit$(re.UNIVER_SHEET).subscribe((t) => {
       if (a.dispose(), !t)
         return;
       const e = t.getActiveSheet();
-      e && (this._sheetDataValidationService.switchCurrent(t.getUnitId(), e.getSheetId()), a.add(Ea(
+      e && (this._sheetDataValidationService.switchCurrent(t.getUnitId(), e.getSheetId()), a.add(Oa(
         t.activeSheet$.subscribe((r) => {
           if (r) {
             const o = t.getUnitId(), n = r.getSheetId();
@@ -3857,13 +3865,13 @@ let ut = class extends Na {
     this._sheetInterceptorService.interceptCommand({
       getMutations: (a) => {
         var t;
-        if (a.id === xo.id) {
+        if (a.id === Bo.id) {
           const e = this._univerInstanceService.getCurrentUnitForType(re.UNIVER_SHEET), r = e.getUnitId(), o = e.getActiveSheet();
           if (!o)
             throw new Error("No active sheet found");
           const n = o.getSheetId(), i = (t = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : t.map((f) => f.range), s = this._dataValidationModel.ensureManager(r, n), l = s.getRuleObjectMatrix().clone();
           i && l.removeRange(i);
-          const d = l.diff(s.getDataValidations()), { redoMutations: c, undoMutations: u } = tt(r, n, d, this._injector);
+          const d = l.diff(s.getDataValidations()), { redoMutations: c, undoMutations: u } = rt(r, n, d, this._injector);
           return {
             undos: u,
             redos: c
@@ -3878,14 +3886,14 @@ let ut = class extends Na {
   }
   _initComponents() {
     [
-      [ro, Br],
-      [Pr, Wi],
-      [Lr, Ln],
-      [Qr, es],
-      [Zr, ds],
-      [At.componentKey, At],
-      [Pt.componentKey, Pt],
-      ...Mi
+      [io, Wr],
+      [jr, Yi],
+      [xr, An],
+      [eo, as],
+      [to, us],
+      [jt.componentKey, jt],
+      [xt.componentKey, xt],
+      ...wi
     ].forEach(([a, t]) => {
       this.disposeWithMe(this._componentManger.register(
         a,
@@ -3894,24 +3902,24 @@ let ut = class extends Na {
     });
   }
 };
-ut = tl([
-  ve(_e.Rendered, ut),
-  be(0, J),
-  be(1, I(_t)),
-  be(2, I(we)),
-  be(3, I(Ee)),
-  be(4, I(St)),
-  be(5, I(Ao)),
-  be(6, I(Fa)),
-  be(7, I(z))
-], ut);
-var al = Object.defineProperty, rl = Object.getOwnPropertyDescriptor, ol = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? rl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+ft = rl([
+  ve(_e.Rendered, ft),
+  Ee(0, J),
+  Ee(1, w(Ct)),
+  Ee(2, w(we)),
+  Ee(3, w(De)),
+  Ee(4, w(Vt)),
+  Ee(5, w($o)),
+  Ee(6, w(Pa)),
+  Ee(7, w(q))
+], ft);
+var ol = Object.defineProperty, nl = Object.getOwnPropertyDescriptor, il = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? nl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && al(t, e, o), o;
-}, Dt = (a, t) => (e, r) => t(e, r, a);
-const na = "SHEET_DATA_VALIDATION_ALERT";
-let ht = class extends ue {
+  return r && o && ol(t, e, o), o;
+}, Ot = (a, t) => (e, r) => t(e, r, a);
+const sa = "SHEET_DATA_VALIDATION_ALERT";
+let pt = class extends ue {
   constructor(a, t, e, r) {
     super(), this._hoverManagerService = a, this._cellAlertManagerService = t, this._univerInstanceService = e, this._localeService = r, this._init();
   }
@@ -3919,48 +3927,48 @@ let ht = class extends ue {
     this._initCellAlertPopup();
   }
   _initCellAlertPopup() {
-    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(gn(100)).subscribe((a) => {
+    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(He(100)).subscribe((a) => {
       var t, e;
       if (a) {
         const o = this._univerInstanceService.getCurrentUnitForType(re.UNIVER_SHEET).getActiveSheet();
         if (!o) return;
         const n = o.getCell(a.location.row, a.location.col);
         if (((t = n == null ? void 0 : n.dataValidation) == null ? void 0 : t.validStatus) === Ce.INVALID) {
-          const i = this._cellAlertManagerService.currentAlert.get(na), s = (e = i == null ? void 0 : i.alert) == null ? void 0 : e.location;
+          const i = this._cellAlertManagerService.currentAlert.get(sa), s = (e = i == null ? void 0 : i.alert) == null ? void 0 : e.location;
           if (s && s.row === a.location.row && s.col === a.location.col && s.subUnitId === a.location.subUnitId && s.unitId === a.location.unitId)
             return;
           const l = n.dataValidation.validator, d = n.dataValidation.rule;
           if (!l)
             return;
           this._cellAlertManagerService.showAlert({
-            type: Yo.ERROR,
+            type: qo.ERROR,
             title: this._localeService.t("dataValidation.error.title"),
             message: l == null ? void 0 : l.getRuleFinalError(d),
             location: a.location,
             width: 200,
             height: 74,
-            key: na
+            key: sa
           });
           return;
         }
       }
-      this._cellAlertManagerService.removeAlert(na);
+      this._cellAlertManagerService.removeAlert(sa);
     }));
   }
 };
-ht = ol([
-  ve(_e.Rendered, ht),
-  Dt(0, I(Wo)),
-  Dt(1, I(ko)),
-  Dt(2, J),
-  Dt(3, I(ie))
-], ht);
-var nl = Object.defineProperty, il = Object.getOwnPropertyDescriptor, sl = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? il(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+pt = il([
+  ve(_e.Rendered, pt),
+  Ot(0, w(Xo)),
+  Ot(1, w(Go)),
+  Ot(2, J),
+  Ot(3, w(ie))
+], pt);
+var sl = Object.defineProperty, ll = Object.getOwnPropertyDescriptor, dl = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? ll(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && nl(t, e, o), o;
-}, Ke = (a, t) => (e, r) => t(e, r, a);
-let et = class extends ue {
+  return r && o && sl(t, e, o), o;
+}, Qe = (a, t) => (e, r) => t(e, r, a);
+let at = class extends ue {
   constructor(t, e, r, o, n, i) {
     super();
     S(this, "_disposableMap", /* @__PURE__ */ new Map());
@@ -4020,7 +4028,7 @@ let et = class extends ue {
       ];
       return { redos: h, undos: R };
     };
-    if (r.type === B.CUSTOM) {
+    if (r.type === H.CUSTOM) {
       const d = this._dataValidationCustomFormulaService.getRuleFormulaInfo(t, e, o);
       if (d) {
         const c = this._formulaRefRangeService.registerFormula(
@@ -4030,7 +4038,7 @@ let et = class extends ue {
         i.add(() => c.dispose());
       }
     }
-    if (r.type !== B.CUSTOM) {
+    if (r.type !== H.CUSTOM) {
       const d = this._dataValidationFormulaService.getRuleFormulaInfo(t, e, o);
       if (d) {
         const [c, u] = d;
@@ -4054,8 +4062,8 @@ let et = class extends ue {
   register(t, e, r) {
     var l;
     const o = (d) => {
-      const c = [...r.ranges], f = c.map((m) => $o(m, d)).filter((m) => !!m).flat();
-      if (yo(f, c))
+      const c = [...r.ranges], f = c.map((m) => Ho(m, d)).filter((m) => !!m).flat();
+      if (Eo(f, c))
         return { redos: [], undos: [] };
       if (f.length) {
         const m = {
@@ -4080,7 +4088,7 @@ let et = class extends ue {
         }];
         return { redos: h, undos: R };
       } else {
-        const m = { unitId: t, subUnitId: e, ruleId: r.uid }, h = [{ id: Ot.id, params: m }], R = To(this._injector, m);
+        const m = { unitId: t, subUnitId: e, ruleId: r.uid }, h = [{ id: Ft.id, params: m }], R = Po(this._injector, m);
         return { redos: h, undos: R };
       }
     }, n = [];
@@ -4113,113 +4121,113 @@ let et = class extends ue {
           }
         }
       })
-    ), this.disposeWithMe(Ea(() => {
+    ), this.disposeWithMe(Oa(() => {
       this._disposableMap.forEach((t) => {
         t.forEach((e) => e());
       }), this._disposableMap.clear();
     }));
   }
 };
-et = sl([
-  ve(_e.Ready, et),
-  Ke(0, I(z)),
-  Ke(1, I(Ee)),
-  Ke(2, I(jo)),
-  Ke(3, I(We)),
-  Ke(4, I(ce)),
-  Ke(5, I(vn))
-], et);
-var ll = Object.defineProperty, dl = Object.getOwnPropertyDescriptor, cl = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? dl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+at = dl([
+  ve(_e.Ready, at),
+  Qe(0, w(q)),
+  Qe(1, w(De)),
+  Qe(2, w(Uo)),
+  Qe(3, w(ke)),
+  Qe(4, w(ce)),
+  Qe(5, w(Sn))
+], at);
+var cl = Object.defineProperty, ul = Object.getOwnPropertyDescriptor, hl = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? ul(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && ll(t, e, o), o;
-}, ia = (a, t) => (e, r) => t(e, r, a);
-let bt = class extends ue {
+  return r && o && cl(t, e, o), o;
+}, la = (a, t) => (e, r) => t(e, r, a);
+let Tt = class extends ue {
   constructor(a, t, e) {
     super(), this._autoFillService = a, this._dataValidationModel = t, this._injector = e, this._initAutoFill();
   }
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const a = () => ({ redos: [], undos: [] }), t = (o) => {
-      const { source: n, target: i, unitId: s, subUnitId: l } = o, d = this._dataValidationModel.ensureManager(s, l), c = d.getRuleObjectMatrix().clone(), u = Ra([n, i]), [f, p] = u.ranges, { mapFunc: m } = u, h = {
+      const { source: n, target: i, unitId: s, subUnitId: l } = o, d = this._dataValidationModel.ensureManager(s, l), c = d.getRuleObjectMatrix().clone(), u = Va([n, i]), [f, p] = u.ranges, { mapFunc: m } = u, h = {
         row: f.startRow,
         col: f.startColumn
       };
-      Go(f, p).forEach((M) => {
-        const y = M.repeatStartCell, D = M.relativeRange, E = {
+      Ko(f, p).forEach((M) => {
+        const I = M.repeatStartCell, D = M.relativeRange, E = {
           startRow: h.row,
           startColumn: h.col,
           endColumn: h.col,
           endRow: h.row
         }, x = {
-          startRow: y.row,
-          startColumn: y.col,
-          endColumn: y.col,
-          endRow: y.row
+          startRow: I.row,
+          startColumn: I.col,
+          endColumn: I.col,
+          endRow: I.row
         };
-        W.foreach(D, (T, F) => {
-          const b = Ue.getPositionRange(
+        W.foreach(D, (T, O) => {
+          const F = Ue.getPositionRange(
             {
               startRow: T,
-              startColumn: F,
-              endColumn: F,
+              startColumn: O,
+              endColumn: O,
               endRow: T
             },
             E
-          ), { row: P, col: U } = m(b.startRow, b.startColumn), O = d.getRuleIdByLocation(P, U);
-          if (O) {
-            const L = Ue.getPositionRange(
+          ), { row: L, col: B } = m(F.startRow, F.startColumn), U = d.getRuleIdByLocation(L, B);
+          if (U) {
+            const b = Ue.getPositionRange(
               {
                 startRow: T,
-                startColumn: F,
-                endColumn: F,
+                startColumn: O,
+                endColumn: O,
                 endRow: T
               },
               x
-            ), { row: H, col: K } = m(L.startRow, L.startColumn);
-            c.setValue(H, K, O);
+            ), { row: $, col: z } = m(b.startRow, b.startColumn);
+            c.setValue($, z, U);
           }
         });
       });
-      const g = c.diff(d.getDataValidations()), { redoMutations: C, undoMutations: _ } = tt(s, l, g, this._injector);
+      const g = c.diff(d.getDataValidations()), { redoMutations: C, undoMutations: _ } = rt(s, l, g, this._injector);
       return {
         undos: _,
         redos: C
       };
     }, e = [
-      B.CHECKBOX
+      H.CHECKBOX
     ], r = {
-      id: Xt,
+      id: qt,
       onBeforeFillData: (o) => {
         const { source: n, unitId: i, subUnitId: s } = o, l = this._dataValidationModel.ensureManager(i, s);
         for (const d of n.rows)
           for (const c of n.cols) {
             const u = l.getRuleByLocation(d, c);
             if (u && e.indexOf(u.type) > -1) {
-              this._autoFillService.setDisableApplyType(Ct.SERIES, !0);
+              this._autoFillService.setDisableApplyType(It.SERIES, !0);
               return;
             }
           }
       },
-      onFillData: (o, n, i) => i === Ct.COPY || i === Ct.ONLY_FORMAT || i === Ct.SERIES ? t(o) : a(),
+      onFillData: (o, n, i) => i === It.COPY || i === It.ONLY_FORMAT || i === It.SERIES ? t(o) : a(),
       onAfterFillData: () => {
       }
     };
     this.disposeWithMe(this._autoFillService.addHook(r));
   }
 };
-bt = cl([
-  ve(_e.Ready, bt),
-  ia(0, Xo),
-  ia(1, I(z)),
-  ia(2, I(Ee))
-], bt);
-var ul = Object.defineProperty, hl = Object.getOwnPropertyDescriptor, ml = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? hl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+Tt = hl([
+  ve(_e.Ready, Tt),
+  la(0, zo),
+  la(1, w(q)),
+  la(2, w(De))
+], Tt);
+var ml = Object.defineProperty, fl = Object.getOwnPropertyDescriptor, pl = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? fl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && ul(t, e, o), o;
-}, sa = (a, t) => (e, r) => t(e, r, a);
-let mt = class extends ue {
+  return r && o && ml(t, e, o), o;
+}, da = (a, t) => (e, r) => t(e, r, a);
+let gt = class extends ue {
   constructor(t, e, r) {
     super();
     S(this, "_copyInfo");
@@ -4227,16 +4235,16 @@ let mt = class extends ue {
   }
   _initCopyPaste() {
     this._sheetClipboardService.addClipboardHook({
-      id: Xt,
+      id: qt,
       onBeforeCopy: (t, e, r) => this._collect(t, e, r),
       onPasteCells: (t, e, r, o) => {
-        const { copyType: n = qa.COPY, pasteType: i } = o, { range: s } = t || {}, { range: l, unitId: d, subUnitId: c } = e;
+        const { copyType: n = Ka.COPY, pasteType: i } = o, { range: s } = t || {}, { range: l, unitId: d, subUnitId: c } = e;
         return this._generateMutations(l, { copyType: n, pasteType: i, copyRange: s, unitId: d, subUnitId: c });
       }
     });
   }
   _collect(t, e, r) {
-    const o = new ke();
+    const o = new Ye();
     this._copyInfo = {
       unitId: t,
       subUnitId: e,
@@ -4244,7 +4252,7 @@ let mt = class extends ue {
     };
     const n = this._dataValidationModel.ensureManager(t, e), i = {
       get: this._injector.get.bind(this._injector)
-    }, s = qo(r, i, t, e);
+    }, s = Qo(r, i, t, e);
     if (!s)
       return;
     const { rows: l, cols: d } = s;
@@ -4259,22 +4267,22 @@ let mt = class extends ue {
   _generateMutations(t, e) {
     if (!this._copyInfo)
       return { redos: [], undos: [] };
-    if (e.copyType === qa.CUT)
+    if (e.copyType === Ka.CUT)
       return this._copyInfo = null, { redos: [], undos: [] };
     if (!this._copyInfo || !this._copyInfo.matrix.getSizeOf() || !e.copyRange)
       return { redos: [], undos: [] };
     if ([
-      Vt.SPECIAL_PASTE_COL_WIDTH,
-      Vt.SPECIAL_PASTE_VALUE,
-      Vt.SPECIAL_PASTE_FORMAT,
-      Vt.SPECIAL_PASTE_FORMULA
+      wt.SPECIAL_PASTE_COL_WIDTH,
+      wt.SPECIAL_PASTE_VALUE,
+      wt.SPECIAL_PASTE_FORMAT,
+      wt.SPECIAL_PASTE_FORMULA
     ].includes(
       e.pasteType
     ))
       return { redos: [], undos: [] };
     const { unitId: r, subUnitId: o } = this._copyInfo;
     if (e.unitId !== r || o !== e.subUnitId) {
-      const n = this._dataValidationModel.ensureManager(r, o), i = this._dataValidationModel.ensureManager(e.unitId, e.subUnitId), s = i.getRuleObjectMatrix().clone(), { ranges: [l, d], mapFunc: c } = Ra([e.copyRange, t]), u = za(l, d, !0), f = /* @__PURE__ */ new Map();
+      const n = this._dataValidationModel.ensureManager(r, o), i = this._dataValidationModel.ensureManager(e.unitId, e.subUnitId), s = i.getRuleObjectMatrix().clone(), { ranges: [l, d], mapFunc: c } = Va([e.copyRange, t]), u = Qa(l, d, !0), f = /* @__PURE__ */ new Map();
       u.forEach(({ startRange: h }) => {
         var R;
         (R = this._copyInfo) == null || R.matrix.forValue((g, C, _) => {
@@ -4286,13 +4294,13 @@ let mt = class extends ue {
               endColumn: C
             },
             h
-          ), y = `${o}-${_}`, D = n.getRuleById(_);
-          !i.getRuleById(y) && D && f.set(y, { ...D, uid: y });
+          ), I = `${o}-${_}`, D = n.getRuleById(_);
+          !i.getRuleById(I) && D && f.set(I, { ...D, uid: I });
           const { row: E, col: x } = c(M.startRow, M.startColumn);
-          s.setValue(E, x, y);
+          s.setValue(E, x, I);
         });
       });
-      const { redoMutations: p, undoMutations: m } = tt(
+      const { redoMutations: p, undoMutations: m } = rt(
         e.unitId,
         e.subUnitId,
         s.diffWithAddition(i.getDataValidations(), f.values()),
@@ -4303,8 +4311,8 @@ let mt = class extends ue {
         undos: m
       };
     } else {
-      const n = this._dataValidationModel.ensureManager(r, o), i = n.getRuleObjectMatrix().clone(), { ranges: [s, l], mapFunc: d } = Ra([e.copyRange, t]);
-      za(s, l, !0).forEach(({ startRange: p }) => {
+      const n = this._dataValidationModel.ensureManager(r, o), i = n.getRuleObjectMatrix().clone(), { ranges: [s, l], mapFunc: d } = Va([e.copyRange, t]);
+      Qa(s, l, !0).forEach(({ startRange: p }) => {
         var m;
         (m = this._copyInfo) == null || m.matrix.forValue((h, R, g) => {
           const C = Ue.getPositionRange(
@@ -4319,7 +4327,7 @@ let mt = class extends ue {
           i.setValue(_, M, g);
         });
       });
-      const { redoMutations: u, undoMutations: f } = tt(
+      const { redoMutations: u, undoMutations: f } = rt(
         r,
         o,
         i.diff(n.getDataValidations()),
@@ -4332,13 +4340,13 @@ let mt = class extends ue {
     }
   }
 };
-mt = ml([
-  ve(_e.Ready, mt),
-  sa(0, zo),
-  sa(1, I(z)),
-  sa(2, I(Ee))
-], mt);
-class Xa {
+gt = pl([
+  ve(_e.Ready, gt),
+  da(0, Zo),
+  da(1, w(q)),
+  da(2, w(De))
+], gt);
+class qa {
   constructor(t, e) {
     S(this, "value");
     this._worksheet = e, this.value = t;
@@ -4388,7 +4396,7 @@ class Xa {
     const e = [];
     let r = 0;
     return t.forEach((o, n) => {
-      const i = Kt(this.value, (l) => l === o.uid), s = o.ranges;
+      const i = Zt(this.value, (l) => l === o.uid), s = o.ranges;
       (i.length !== s.length || i.some((l, d) => !Ue.equals(l, s[d]))) && e.push({
         type: "update",
         ruleId: o.uid,
@@ -4405,7 +4413,7 @@ class Xa {
     const r = [];
     let o = 0;
     return t.forEach((n, i) => {
-      const s = Kt(this.value, (d) => d === n.uid), l = n.ranges;
+      const s = Zt(this.value, (d) => d === n.uid), l = n.ranges;
       (s.length !== l.length || s.some((d, c) => !Ue.equals(d, l[c]))) && r.push({
         type: "update",
         ruleId: n.uid,
@@ -4417,7 +4425,7 @@ class Xa {
         index: i - o
       }), o++);
     }), Array.from(e).forEach((n) => {
-      const i = Kt(this.value, (s) => s === n.uid);
+      const i = Zt(this.value, (s) => s === n.uid);
       r.push({
         type: "add",
         rule: {
@@ -4428,7 +4436,7 @@ class Xa {
     }), r;
   }
   clone() {
-    return new Xa(new ke(this.value.clone()), this._worksheet);
+    return new qa(new Ye(this.value.clone()), this._worksheet);
   }
   getValue(t, e) {
     return this.value.getValue(t, e);
@@ -4437,7 +4445,7 @@ class Xa {
     return this.value.setValue(t, e, r);
   }
 }
-class fl extends Fo {
+class gl extends Ao {
   constructor(e, r, o, n) {
     super(e, r, o);
     /**
@@ -4450,8 +4458,8 @@ class fl extends Fo {
     S(this, "_dataValidationCustomFormulaService");
     S(this, "_cache");
     S(this, "_dataValidationRefRangeController");
-    this._injector = n, this._dataValidatorRegistryService = this._injector.get(we), this._dataValidationCacheService = this._injector.get(rt), this._dataValidationFormulaService = this._injector.get(ce), this._dataValidationCustomFormulaService = this._injector.get(We), this._dataValidationRefRangeController = this._injector.get(et), this._cache = this._dataValidationCacheService.ensureCache(e, r);
-    const s = this._injector.get(J).getUnit(e, re.UNIVER_SHEET).getSheetBySheetId(r), l = new ke();
+    this._injector = n, this._dataValidatorRegistryService = this._injector.get(we), this._dataValidationCacheService = this._injector.get(nt), this._dataValidationFormulaService = this._injector.get(ce), this._dataValidationCustomFormulaService = this._injector.get(ke), this._dataValidationRefRangeController = this._injector.get(at), this._cache = this._dataValidationCacheService.ensureCache(e, r);
+    const s = this._injector.get(J).getUnit(e, re.UNIVER_SHEET).getSheetBySheetId(r), l = new Ye();
     o == null || o.forEach((d) => {
       const c = d.uid;
       d.ranges.forEach((u) => {
@@ -4461,12 +4469,12 @@ class fl extends Fo {
       });
     }), o == null || o.forEach((d) => {
       this._dataValidationRefRangeController.register(e, r, d);
-    }), this._ruleMatrix = new Xa(l, s);
+    }), this._ruleMatrix = new qa(l, s);
   }
   _addRuleSideEffect(e) {
     var n;
     const { unitId: r, subUnitId: o } = this;
-    (e.type === B.LIST || e.type === B.LIST_MULTIPLE) && Ua((n = e.formula1) != null ? n : "") && (e.formula1 = `=${e.formula1}`), this._ruleMatrix.addRule(e), this._dataValidationCacheService.addRule(r, o, e), this._dataValidationFormulaService.addRule(r, o, e.uid, e.formula1, e.formula2), this._dataValidationCustomFormulaService.addRule(r, o, e);
+    (e.type === H.LIST || e.type === H.LIST_MULTIPLE) && Wa((n = e.formula1) != null ? n : "") && (e.formula1 = `=${e.formula1}`), this._ruleMatrix.addRule(e), this._dataValidationCacheService.addRule(r, o, e), this._dataValidationFormulaService.addRule(r, o, e.uid, e.formula1, e.formula2), this._dataValidationCustomFormulaService.addRule(r, o, e);
   }
   addRule(e, r) {
     (Array.isArray(e) ? e : [e]).forEach((n) => {
@@ -4524,17 +4532,17 @@ class fl extends Fo {
     return this._ruleMatrix;
   }
 }
-var pl = Object.defineProperty, gl = Object.getOwnPropertyDescriptor, vl = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? gl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+var vl = Object.defineProperty, _l = Object.getOwnPropertyDescriptor, Sl = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? _l(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && pl(t, e, o), o;
-}, Et = (a, t) => (e, r) => t(e, r, a);
-let ft = class extends ue {
+  return r && o && vl(t, e, o), o;
+}, Nt = (a, t) => (e, r) => t(e, r, a);
+let vt = class extends ue {
   constructor(a, t, e, r) {
     super(), this._resourceManagerService = a, this._univerInstanceService = t, this._dataValidationModel = e, this._injector = r, this._initDataValidationDataSource();
   }
   _createSheetDataValidationManager(a, t) {
-    return new fl(
+    return new gl(
       a,
       t,
       [],
@@ -4545,50 +4553,50 @@ let ft = class extends ue {
     this._dataValidationModel.setManagerCreator(this._createSheetDataValidationManager.bind(this));
   }
 };
-ft = vl([
-  ve(_e.Starting, ft),
-  Et(0, Do),
-  Et(1, J),
-  Et(2, I(z)),
-  Et(3, I(Ee))
-], ft);
-var _l = Object.defineProperty, Sl = Object.getOwnPropertyDescriptor, Rl = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? Sl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+vt = Sl([
+  ve(_e.Starting, vt),
+  Nt(0, bo),
+  Nt(1, J),
+  Nt(2, w(q)),
+  Nt(3, w(De))
+], vt);
+var Rl = Object.defineProperty, Cl = Object.getOwnPropertyDescriptor, Vl = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? Cl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && _l(t, e, o), o;
-}, la = (a, t) => (e, r) => t(e, r, a);
-let pt = class extends ue {
+  return r && o && Rl(t, e, o), o;
+}, ca = (a, t) => (e, r) => t(e, r, a);
+let _t = class extends ue {
   constructor(a, t, e) {
     super(), this._localeService = a, this._commandService = t, this._sheetPermissionInterceptorBaseController = e, this._commandExecutedListener();
   }
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((a) => {
-        a.id === Lo.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-          workbookTypes: [ga],
-          rangeTypes: [Sa],
-          worksheetTypes: [_a, va]
-        }) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.setStyleErr"))), a.id === qt.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-          workbookTypes: [ga],
-          rangeTypes: [Sa],
-          worksheetTypes: [_a, va]
+        a.id === xo.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+          workbookTypes: [_a],
+          rangeTypes: [Ca],
+          worksheetTypes: [Ra, Sa]
+        }) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.setStyleErr"))), a.id === Kt.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+          workbookTypes: [_a],
+          rangeTypes: [Ca],
+          worksheetTypes: [Ra, Sa]
         }, a.params.ranges) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.setStyleErr")));
       })
     );
   }
 };
-pt = Rl([
-  ve(_e.Ready, pt),
-  la(0, I(ie)),
-  la(1, ee),
-  la(2, I(Ko))
-], pt);
-var Cl = Object.defineProperty, Vl = Object.getOwnPropertyDescriptor, Ml = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? Vl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+_t = Vl([
+  ve(_e.Ready, _t),
+  ca(0, w(ie)),
+  ca(1, ee),
+  ca(2, w(Jo))
+], _t);
+var Ml = Object.defineProperty, Il = Object.getOwnPropertyDescriptor, wl = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? Il(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && Cl(t, e, o), o;
-}, da = (a, t) => (e, r) => t(e, r, a);
-let $t = class {
+  return r && o && Ml(t, e, o), o;
+}, ua = (a, t) => (e, r) => t(e, r, a);
+let Ut = class {
   constructor(a, t, e) {
     this._univerInstanceService = a, this._dataValidationModel = t, this._dataValidationCacheService = e;
   }
@@ -4620,155 +4628,155 @@ let $t = class {
     }), r;
   }
 };
-$t = Ml([
-  da(0, J),
-  da(1, I(z)),
-  da(2, I(rt))
-], $t);
-var co = Object.defineProperty, Il = Object.getOwnPropertyDescriptor, wl = (a, t, e) => t in a ? co(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e, yl = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? Il(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+Ut = wl([
+  ua(0, J),
+  ua(1, w(q)),
+  ua(2, w(nt))
+], Ut);
+var mo = Object.defineProperty, yl = Object.getOwnPropertyDescriptor, Dl = (a, t, e) => t in a ? mo(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e, El = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? yl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && co(t, e, o), o;
-}, ca = (a, t) => (e, r) => t(e, r, a), uo = (a, t, e) => wl(a, typeof t != "symbol" ? t + "" : t, e);
-let Bt = class extends fr {
+  return r && o && mo(t, e, o), o;
+}, ha = (a, t) => (e, r) => t(e, r, a), fo = (a, t, e) => Dl(a, typeof t != "symbol" ? t + "" : t, e);
+let Ht = class extends gr {
   constructor(a = {}, t, e, r) {
-    super(), this._config = a, this._injector = t, this._commandService = e, this._localeService = r, this._config = Y.deepMerge({}, no, this._config);
+    super(), this._config = a, this._injector = t, this._commandService = e, this._localeService = r, this._config = X.deepMerge({}, lo, this._config);
   }
   onStarting(a) {
     [
       [Me],
-      [_t],
-      [rt],
+      [Ct],
+      [nt],
       [ce],
-      [We],
-      [Ne],
-      [$t],
+      [ke],
+      [Oe],
+      [Ut],
       // controller
+      [vt],
       [ft],
-      [ut],
       [
-        dt,
+        ht,
         {
-          useFactory: () => this._injector.createInstance(dt, this._config)
+          useFactory: () => this._injector.createInstance(ht, this._config)
         }
       ],
-      [ht],
-      [et],
       [pt],
-      [bt],
-      [mt],
-      [Je],
-      [lt]
+      [at],
+      [_t],
+      [Tt],
+      [gt],
+      [tt],
+      [ut]
     ].forEach((t) => {
       a.add(t);
     }), [
-      zt,
-      ka,
-      qt,
-      wa,
-      ao,
+      Qt,
+      Xa,
+      Kt,
+      Da,
+      no,
       // operation
-      Yt,
-      xr,
-      Ha,
-      at,
-      Ar
+      Gt,
+      Br,
+      ka,
+      ot,
+      $r
     ].forEach((t) => {
       this._commandService.registerCommand(t);
     });
   }
 };
-uo(Bt, "pluginName", Xt);
-uo(Bt, "type", re.UNIVER_SHEET);
-Bt = yl([
-  mr(vr, Rr, Vr),
-  ca(1, I(Ee)),
-  ca(2, ee),
-  ca(3, I(ie))
-], Bt);
-var ho = Object.defineProperty, Dl = Object.getOwnPropertyDescriptor, El = (a, t, e) => t in a ? ho(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e, bl = (a, t, e, r) => {
-  for (var o = r > 1 ? void 0 : r ? Dl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
+fo(Ht, "pluginName", qt);
+fo(Ht, "type", re.UNIVER_SHEET);
+Ht = El([
+  pr(Sr, Vr, Ir),
+  ha(1, w(De)),
+  ha(2, ee),
+  ha(3, w(ie))
+], Ht);
+var po = Object.defineProperty, bl = Object.getOwnPropertyDescriptor, Ol = (a, t, e) => t in a ? po(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e, Nl = (a, t, e, r) => {
+  for (var o = r > 1 ? void 0 : r ? bl(t, e) : t, n = a.length - 1, i; n >= 0; n--)
     (i = a[n]) && (o = (r ? i(t, e, o) : i(o)) || o);
-  return r && o && ho(t, e, o), o;
-}, ua = (a, t) => (e, r) => t(e, r, a), mo = (a, t, e) => El(a, typeof t != "symbol" ? t + "" : t, e);
-let Ut = class extends fr {
+  return r && o && po(t, e, o), o;
+}, ma = (a, t) => (e, r) => t(e, r, a), go = (a, t, e) => Ol(a, typeof t != "symbol" ? t + "" : t, e);
+let Wt = class extends gr {
   constructor(a = {}, t, e, r) {
-    super(), this._config = a, this._injector = t, this._commandService = e, this._localeService = r, this._config = Y.deepMerge({}, no, this._config);
+    super(), this._config = a, this._injector = t, this._commandService = e, this._localeService = r, this._config = X.deepMerge({}, lo, this._config);
   }
   onStarting(a) {
     [
       [Me],
-      [_t],
-      [rt],
+      [Ct],
+      [nt],
       [ce],
-      [We],
-      [Ne],
-      [$t],
+      [ke],
+      [Oe],
+      [Ut],
       // controller
+      [vt],
       [ft],
-      [ut],
       [
-        ct,
+        mt,
         {
-          useFactory: () => this._injector.createInstance(ct, this._config)
+          useFactory: () => this._injector.createInstance(mt, this._config)
         }
       ],
-      [ht],
-      [et],
       [pt],
-      [mt],
-      [Je]
+      [at],
+      [_t],
+      [gt],
+      [tt]
     ].forEach((t) => {
       a.add(t);
     }), [
-      zt,
-      ka,
-      qt,
+      Qt,
+      Xa,
+      Kt,
       // operation
-      Yt,
-      xr,
-      Ha,
-      at,
-      Ar
+      Gt,
+      Br,
+      ka,
+      ot,
+      $r
     ].forEach((t) => {
       this._commandService.registerCommand(t);
     });
   }
 };
-mo(Ut, "pluginName", Xt);
-mo(Ut, "type", re.UNIVER_SHEET);
-Ut = bl([
-  mr(vr, Rr, Vr),
-  ua(1, I(Ee)),
-  ua(2, ee),
-  ua(3, I(ie))
-], Ut);
+go(Wt, "pluginName", qt);
+go(Wt, "type", re.UNIVER_SHEET);
+Wt = Nl([
+  pr(Sr, Vr, Ir),
+  ma(1, w(De)),
+  ma(2, ee),
+  ma(3, w(ie))
+], Wt);
 export {
-  ka as AddSheetDataValidationAndOpenCommand,
-  zt as AddSheetDataValidationCommand,
-  Ha as CloseValidationPanelOperation,
-  Xt as DATA_VALIDATION_PLUGIN_NAME,
-  ht as DataValidationAlertController,
-  bt as DataValidationAutoFillController,
-  rt as DataValidationCacheService,
-  ut as DataValidationController,
-  mt as DataValidationCopyPasteController,
-  We as DataValidationCustomFormulaService,
-  Je as DataValidationFormulaController,
+  Xa as AddSheetDataValidationAndOpenCommand,
+  Qt as AddSheetDataValidationCommand,
+  ka as CloseValidationPanelOperation,
+  qt as DATA_VALIDATION_PLUGIN_NAME,
+  pt as DataValidationAlertController,
+  Tt as DataValidationAutoFillController,
+  nt as DataValidationCacheService,
+  ft as DataValidationController,
+  gt as DataValidationCopyPasteController,
+  ke as DataValidationCustomFormulaService,
+  tt as DataValidationFormulaController,
   ce as DataValidationFormulaService,
-  et as DataValidationRefRangeController,
-  lt as DataValidationRejectInputController,
-  xr as HideDataValidationDropdown,
-  Gl as ICommandService,
-  ql as LocaleService,
-  at as OpenValidationPanelOperation,
-  zl as Plugin,
-  _t as SheetDataValidationService,
-  dt as SheetsDataValidationRenderController,
-  $t as SheetsDataValidationValidatorService,
-  Yt as ShowDataValidationDropdown,
-  Ar as ToggleValidationPanelOperation,
-  Ut as UniverSheetsDataValidationMobilePlugin,
-  Bt as UniverSheetsDataValidationPlugin,
-  qt as UpdateSheetDataValidationRangeCommand
+  at as DataValidationRefRangeController,
+  ut as DataValidationRejectInputController,
+  Br as HideDataValidationDropdown,
+  Ql as ICommandService,
+  Zl as LocaleService,
+  ot as OpenValidationPanelOperation,
+  Jl as Plugin,
+  Ct as SheetDataValidationService,
+  ht as SheetsDataValidationRenderController,
+  Ut as SheetsDataValidationValidatorService,
+  Gt as ShowDataValidationDropdown,
+  $r as ToggleValidationPanelOperation,
+  Wt as UniverSheetsDataValidationMobilePlugin,
+  Ht as UniverSheetsDataValidationPlugin,
+  Kt as UpdateSheetDataValidationRangeCommand
 };