@univerjs/sheets-data-validation 0.1.13 → 0.1.14

package/lib/es/index.js

@@ -1,24 +1,23 @@
-var jr = Object.defineProperty;
-var Br = (o, a, e) => a in o ? jr(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e;
-var g = (o, a, e) => (Br(o, typeof a != "symbol" ? a + "" : a, e), e);
-import { Disposable as me, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as $r, DisposableCollection as ma, IUniverInstanceService as ne, UniverInstanceType as ue, toDisposable as yt, CommandType as De, ICommandService as te, IUndoRedoService as za, sequenceExecuteAsync as Qa, LocaleService as le, DataValidationErrorStyle as tt, UndoCommand as Ur, RedoCommand as Wr, isUnitRangesEqual as Hr, createInternalEditorID as fa, isValidRange as kr, debounce as Yr, shallowEqual as Ea, DEFAULT_EMPTY_DOCUMENT_VALUE as Ka, OnLifecycle as ge, LifecycleStages as _e, IPermissionService as Gr, isFormulaString as T, DataValidationType as z, Tools as $, ObjectMatrix as lt, Range as q, ThemeService as Xr, VerticalAlign as re, HorizontalAlign as Ve, DataValidationOperator as C, WrapStrategy as ve, DataValidationRenderMode as ce, DocumentDataModel as qr, BooleanNumber as Je, RxDisposable as Za, DataValidationStatus as Ae, sequenceExecute as zr, isRangesEqual as Qr, Rectangle as qe, queryObjectMatrix as Pt, IResourceManagerService as Kr, Plugin as Zr } from "@univerjs/core";
-import { ICommandService as El, LocaleService as Ol, Plugin as bl } from "@univerjs/core";
-import { Inject as V, Injector as Ue } from "@wendellhu/redi";
-import { DataValidatorRegistryService as Ee, DataValidationModel as J, AddDataValidationMutation as Zt, RemoveDataValidationMutation as Dt, createDefaultNewRule as Ja, UpdateDataValidationMutation as Ye, UpdateRuleType as ye, DataValidatorRegistryScope as Jr, TWO_FORMULA_OPERATOR_COUNT as eo, getRuleOptions as Oa, getRuleSetting as ba, UpdateDataValidationSettingCommand as Ta, RemoveDataValidationCommand as er, UpdateDataValidationOptionsCommand as to, BaseDataValidator as We, TextLengthErrorTitleMap as ao, RemoveAllDataValidationCommand as ro, removeDataValidationUndoFactory as oo, DataValidationManager as no, AddDataValidationCommand as io } from "@univerjs/data-validation";
-import { useObservable as Ze, ComponentManager as dt, IZenZoneService as so, ISidebarService as tr, useEvent as ar, RangeSelector as lo, TextEditor as rr, MenuItemType as pa, MenuPosition as co, MenuGroup as uo, getMenuHiddenObservable as ho, KeyCode as mo, IDialogService as fo, IMenuService as po } from "@univerjs/ui";
-import { SheetCanvasPopManagerService as vo, SheetSkeletonManagerService as va, IMarkSelectionService as go, getCurrentRangeDisable$ as _o, IEditorBridgeService as ga, AutoHeightController as So, HoverManagerService as Ro, CellAlertManagerService as Co, CellAlertType as Vo, IAutoFillService as Mo, APPLY_TYPE as xt, virtualizeDiscreteRanges as Jt, getAutoFillRepeatRange as wo, COPY_TYPE as Fa, rangeToDiscreteRange as Io, PREDEFINED_HOOK_NAME as jt, getRepeatRange as Na, ISheetClipboardService as yo, SheetPermissionInterceptorBaseController as Do } from "@univerjs/sheets-ui";
-import { IRenderManagerService as or, fixLineWidthByScale as La, Transform as Eo, Checkbox as Oo, getDocsSkeletonPageSize as mt, Rect as nr, DocumentViewModel as bo, DocumentSkeleton as To, Documents as Fo, FontCache as No, Shape as Lo, getFontStyleString as Aa, DeviceInputEventType as Ao } from "@univerjs/engine-render";
-import { getSheetCommandTarget as ir, WorksheetViewPermission as Po, SetRangeValuesCommand as _a, WorkbookEditablePermission as ea, WorksheetSetCellStylePermission as ta, WorksheetEditPermission as aa, RangeProtectionPermissionEditPoint as ra, SelectionManagerService as xo, SheetInterceptorService as sr, ClearSelectionAllCommand as jo, INTERCEPTOR_POINT as Bo, RefRangeService as $o, handleCommonDefaultRangeChangeWithEffectRefCommands as Uo } from "@univerjs/sheets";
-import oa, { forwardRef as Oe, useRef as Sa, createElement as be, useState as Q, useMemo as na, useEffect as Xe } from "react";
-import { useDependency as O } from "@wendellhu/redi/react-bindings";
-import { FormLayout as K, RadioGroup as Ra, Radio as xe, Checkbox as lr, Input as je, Select as ia, Button as ze, DraggableList as Wo, RectPopup as Ho, Scrollbar as ko, DatePanel as Yo } from "@univerjs/design";
-import { serializeRange as dr, LexerTreeBuilder as Ca, deserializeRangeWithSheet as Go, isFormulaTransformable as Xo, transformFormula as Pa, isReferenceString as cr, sequenceNodeType as qo } from "@univerjs/engine-formula";
-import { Subject as ur, filter as zo, BehaviorSubject as xa, distinctUntilChanged as Qo, debounceTime as Ko, merge as Zo, Observable as Jo } from "rxjs";
-import en from "clsx";
-import { RegisterOtherFormulaService as hr, FormulaRefRangeService as tn, SPECIAL_PASTE_FORMULA as an } from "@univerjs/sheets-formula";
-import Be from "dayjs";
-import { map as rn, distinctUntilChanged as on, switchMap as nn } from "rxjs/operators";
-var mr = { exports: {} }, Lt = {};
+var $r = Object.defineProperty;
+var Ur = (o, a, e) => a in o ? $r(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e;
+var g = (o, a, e) => (Ur(o, typeof a != "symbol" ? a + "" : a, e), e);
+import { Disposable as me, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Wr, DisposableCollection as qa, IUniverInstanceService as ie, UniverInstanceType as se, toDisposable as ma, CommandType as ye, ICommandService as te, IUndoRedoService as za, sequenceExecuteAsync as Qa, LocaleService as le, DataValidationErrorStyle as tt, UndoCommand as Hr, RedoCommand as kr, isUnitRangesEqual as Yr, createInternalEditorID as fa, isValidRange as Gr, debounce as Xr, shallowEqual as ya, DEFAULT_EMPTY_DOCUMENT_VALUE as Ka, OnLifecycle as ve, LifecycleStages as ge, IPermissionService as qr, isFormulaString as F, DataValidationType as q, Tools as U, ObjectMatrix as lt, Range as G, ThemeService as zr, VerticalAlign as re, HorizontalAlign as Ve, DataValidationOperator as C, WrapStrategy as pe, DataValidationRenderMode as ue, DocumentDataModel as Qr, BooleanNumber as Je, RxDisposable as Za, DataValidationStatus as Ce, sequenceExecute as Kr, isRangesEqual as Zr, Rectangle as qe, queryObjectMatrix as Lt, IResourceManagerService as Jr, DependentOn as eo, Plugin as to } from "@univerjs/core";
+import { ICommandService as Tl, LocaleService as Nl, Plugin as Fl } from "@univerjs/core";
+import { Inject as w, Injector as Be } from "@wendellhu/redi";
+import { DataValidatorRegistryService as Ee, DataValidationModel as Z, AddDataValidationMutation as Kt, RemoveDataValidationMutation as It, createDefaultNewRule as Ja, UpdateDataValidationMutation as Ye, UpdateRuleType as De, DataValidatorRegistryScope as ao, TWO_FORMULA_OPERATOR_COUNT as ro, getRuleOptions as Ea, getRuleSetting as Oa, UpdateDataValidationSettingCommand as ba, RemoveDataValidationCommand as er, UpdateDataValidationOptionsCommand as oo, BaseDataValidator as $e, TextLengthErrorTitleMap as no, RemoveAllDataValidationCommand as io, removeDataValidationUndoFactory as so, DataValidationManager as lo, AddDataValidationCommand as co, UniverDataValidationPlugin as uo } from "@univerjs/data-validation";
+import { getSheetCommandTarget as tr, WorksheetViewPermission as ho, SetRangeValuesCommand as pa, WorkbookEditablePermission as Zt, WorksheetSetCellStylePermission as Jt, WorksheetEditPermission as ea, RangeProtectionPermissionEditPoint as ta, SelectionManagerService as mo, SheetInterceptorService as ar, ClearSelectionAllCommand as fo, INTERCEPTOR_POINT as po, RefRangeService as vo, handleCommonDefaultRangeChangeWithEffectRefCommands as go, UniverSheetsPlugin as _o } from "@univerjs/sheets";
+import { SheetCanvasPopManagerService as So, IMarkSelectionService as Ro, getCurrentRangeDisable$ as Co, IEditorBridgeService as va, AutoHeightController as Vo, SheetSkeletonManagerService as Ta, HoverManagerService as Mo, CellAlertManagerService as wo, CellAlertType as Io, IAutoFillService as Do, APPLY_TYPE as Pt, virtualizeDiscreteRanges as aa, getAutoFillRepeatRange as yo, COPY_TYPE as Na, rangeToDiscreteRange as Eo, PREDEFINED_HOOK_NAME as At, getRepeatRange as Fa, ISheetClipboardService as Oo, SheetPermissionInterceptorBaseController as bo, UniverSheetsUIPlugin as To } from "@univerjs/sheets-ui";
+import { useObservable as Ze, ComponentManager as dt, IZenZoneService as No, ISidebarService as rr, useEvent as or, RangeSelector as Fo, TextEditor as nr, MenuItemType as ga, MenuPosition as Lo, MenuGroup as Po, getMenuHiddenObservable as Ao, KeyCode as xo, IDialogService as jo, IMenuService as Bo } from "@univerjs/ui";
+import { IRenderManagerService as ir, fixLineWidthByScale as La, Transform as $o, Checkbox as Uo, getDocsSkeletonPageSize as mt, Rect as sr, DocumentViewModel as Wo, DocumentSkeleton as Ho, Documents as ko, FontCache as Yo, Shape as Go, getFontStyleString as Pa, DeviceInputEventType as Xo } from "@univerjs/engine-render";
+import ra, { forwardRef as Oe, useRef as _a, createElement as be, useState as Q, useMemo as oa, useEffect as Xe } from "react";
+import { useDependency as T } from "@wendellhu/redi/react-bindings";
+import { FormLayout as K, RadioGroup as Sa, Radio as Pe, Checkbox as lr, Input as Ae, Select as na, Button as ze, DraggableList as qo, RectPopup as zo, Scrollbar as Qo, DatePanel as Ko } from "@univerjs/design";
+import { serializeRange as dr, LexerTreeBuilder as Ra, deserializeRangeWithSheet as Zo, isFormulaTransformable as Jo, transformFormula as Aa, isReferenceString as cr, sequenceNodeType as en } from "@univerjs/engine-formula";
+import { Subject as ur, filter as tn, BehaviorSubject as xa, distinctUntilChanged as an, debounceTime as rn } from "rxjs";
+import on from "clsx";
+import { RegisterOtherFormulaService as hr, FormulaRefRangeService as nn, SPECIAL_PASTE_FORMULA as sn } from "@univerjs/sheets-formula";
+import xe from "dayjs";
+var mr = { exports: {} }, Ft = {};
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -28,24 +27,24 @@ var mr = { exports: {} }, Lt = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var sn = oa, ln = Symbol.for("react.element"), dn = Symbol.for("react.fragment"), cn = Object.prototype.hasOwnProperty, un = sn.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, hn = { key: !0, ref: !0, __self: !0, __source: !0 };
+var ln = ra, dn = Symbol.for("react.element"), cn = Symbol.for("react.fragment"), un = Object.prototype.hasOwnProperty, hn = ln.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, mn = { key: !0, ref: !0, __self: !0, __source: !0 };
 function fr(o, a, e) {
   var t, r = {}, n = null, i = null;
   e !== void 0 && (n = "" + e), a.key !== void 0 && (n = "" + a.key), a.ref !== void 0 && (i = a.ref);
   for (t in a)
-    cn.call(a, t) && !hn.hasOwnProperty(t) && (r[t] = a[t]);
+    un.call(a, t) && !mn.hasOwnProperty(t) && (r[t] = a[t]);
   if (o && o.defaultProps)
     for (t in a = o.defaultProps, a)
       r[t] === void 0 && (r[t] = a[t]);
-  return { $$typeof: ln, type: o, key: n, ref: i, props: r, _owner: un.current };
+  return { $$typeof: dn, type: o, key: n, ref: i, props: r, _owner: hn.current };
 }
-Lt.Fragment = dn;
-Lt.jsx = fr;
-Lt.jsxs = fr;
-mr.exports = Lt;
+Ft.Fragment = cn;
+Ft.jsx = fr;
+Ft.jsxs = fr;
+mr.exports = Ft;
 var p = mr.exports;
-function mn() {
-  const o = O($e), a = Ze(o.activeDropdown$, o.activeDropdown), e = O(dt);
+function fn() {
+  const o = T(je), a = Ze(o.activeDropdown$, o.activeDropdown), e = T(dt);
   if (!a)
     return null;
   const { location: t, componentKey: r } = a, n = e.get(r), i = `${t.unitId}-${t.subUnitId}-${t.row}-${t.col}`;
@@ -64,20 +63,20 @@ function mn() {
   );
 }
 const pr = "sheet.ui.dropdown";
-var fn = Object.defineProperty, pn = Object.getOwnPropertyDescriptor, vn = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? pn(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+var pn = Object.defineProperty, vn = Object.getOwnPropertyDescriptor, gn = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? vn(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && fn(a, e, r), r;
-}, Fe = (o, a) => (e, t) => a(e, t, o);
-let $e = class extends me {
-  constructor(a, e, t, r, n, i, s) {
+  return t && r && pn(a, e, r), r;
+}, Ue = (o, a) => (e, t) => a(e, t, o);
+let je = class extends me {
+  constructor(a, e, t, r, n, i) {
     super();
     g(this, "_activeDropdown");
     g(this, "_activeDropdown$", new ur());
     g(this, "_currentPopup", null);
     g(this, "activeDropdown$", this._activeDropdown$.asObservable());
     g(this, "_zenVisible", !1);
-    this._canvasPopupManagerService = a, this._univerInstanceService = e, this._sheetSkeletonManagerService = t, this._dataValidatorRegistryService = r, this._zenZoneService = n, this._renderManagerService = i, this._dataValidationModel = s, this._init();
+    this._canvasPopupManagerService = a, this._univerInstanceService = e, this._dataValidatorRegistryService = t, this._zenZoneService = r, this._renderManagerService = n, this._dataValidationModel = i, this._init();
   }
   get activeDropdown() {
     return this._activeDropdown;
@@ -92,7 +91,7 @@ let $e = class extends me {
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
     this._activeDropdown = a, this._activeDropdown$.next(this._activeDropdown);
-    const n = this._renderManagerService.getRenderById($r), i = this._canvasPopupManagerService.attachPopupToCell(
+    const n = this._renderManagerService.getRenderById(Wr), i = this._canvasPopupManagerService.attachPopupToCell(
       t,
       r,
       {
@@ -106,7 +105,7 @@ let $e = class extends me {
     );
     if (!i)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
-    const s = new ma();
+    const s = new qa();
     s.add(i), s.add({
       dispose: () => {
         var l, d;
@@ -125,13 +124,10 @@ let $e = class extends me {
     if (!s)
       return;
     const d = this._dataValidationModel.ensureManager(a, e).getRuleByLocation(t, r);
-    if (!this._sheetSkeletonManagerService.getOrCreateSkeleton({
-      unitId: a,
-      sheetId: e
-    }) || !d)
+    if (!d)
       return;
-    const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
-    if (!u || !u.dropdown) {
+    const c = this._dataValidatorRegistryService.getValidatorItem(d.type);
+    if (!c || !c.dropdown) {
       this.hideDropdown();
       return;
     }
@@ -144,36 +140,35 @@ let $e = class extends me {
         unitId: a,
         subUnitId: e
       },
-      componentKey: u.dropdown,
+      componentKey: c.dropdown,
       onHide: n
     });
   }
 };
-$e = vn([
-  Fe(0, V(vo)),
-  Fe(1, ne),
-  Fe(2, V(va)),
-  Fe(3, V(Ee)),
-  Fe(4, so),
-  Fe(5, or),
-  Fe(6, V(J))
-], $e);
-var gn = Object.defineProperty, _n = Object.getOwnPropertyDescriptor, Sn = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? _n(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+je = gn([
+  Ue(0, w(So)),
+  Ue(1, ie),
+  Ue(2, w(Ee)),
+  Ue(3, No),
+  Ue(4, ir),
+  Ue(5, w(Z))
+], je);
+var _n = Object.defineProperty, Sn = Object.getOwnPropertyDescriptor, Rn = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Sn(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && gn(a, e, r), r;
+  return t && r && _n(a, e, r), r;
 }, ja = (o, a) => (e, t) => a(e, t, o);
 let we = class extends me {
   constructor(a, e) {
     super();
     g(this, "_open$", new xa(!1));
-    g(this, "open$", this._open$.pipe(Qo()));
+    g(this, "open$", this._open$.pipe(an()));
     g(this, "_activeRule");
     g(this, "_activeRule$", new xa(void 0));
     g(this, "activeRule$", this._activeRule$.asObservable());
     g(this, "_closeDisposable", null);
     this._univerInstanceService = a, this._sidebarService = e, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(ue.UNIVER_SHEET).pipe(zo((t) => !t)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(se.UNIVER_SHEET).pipe(tn((t) => !t)).subscribe(() => {
         this.close();
       })
     );
@@ -196,7 +191,7 @@ let we = class extends me {
     this._open$.next(!1), (a = this._closeDisposable) == null || a.dispose();
   }
   setCloseDisposable(a) {
-    this._closeDisposable = yt(() => {
+    this._closeDisposable = ma(() => {
       a.dispose(), this._closeDisposable = null;
     });
   }
@@ -204,53 +199,53 @@ let we = class extends me {
     this._activeRule = a, this._activeRule$.next(a);
   }
 };
-we = Sn([
-  ja(0, ne),
-  ja(1, tr)
+we = Rn([
+  ja(0, ie),
+  ja(1, rr)
 ], we);
 const vr = "DataValidationPanel", ct = {
   id: "data-validation.operation.open-validation-panel",
-  type: De.OPERATION,
+  type: ye.OPERATION,
   handler(o, a) {
     if (!a)
       return !1;
-    const { ruleId: e, isAdd: t } = a, r = o.get(we), n = o.get(J), i = o.get(ne), s = o.get(tr), l = ir(i);
+    const { ruleId: e, isAdd: t } = a, r = o.get(we), n = o.get(Z), i = o.get(ie), s = o.get(rr), l = tr(i);
     if (!l)
       return !1;
-    const { unitId: d, subUnitId: c } = l, u = e ? n.getRuleById(d, c, e) : void 0;
-    r.open(), r.setActiveRule(u && {
+    const { unitId: d, subUnitId: c } = l, h = e ? n.getRuleById(d, c, e) : void 0;
+    r.open(), r.setActiveRule(h && {
       unitId: d,
       subUnitId: c,
-      rule: u
+      rule: h
     });
-    const h = s.open({
+    const u = s.open({
       header: { title: t ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
       children: { label: vr },
       width: 312,
       onClose: () => r.close()
     });
-    return r.setCloseDisposable(h), !0;
+    return r.setCloseDisposable(u), !0;
   }
 }, gr = {
   id: "data-validation.operation.close-validation-panel",
-  type: De.OPERATION,
+  type: ye.OPERATION,
   handler(o) {
     return o.get(we).close(), !0;
   }
-}, Rn = {
+}, Cn = {
   id: "data-validation.operation.toggle-validation-panel",
-  type: De.OPERATION,
+  type: ye.OPERATION,
   handler(o) {
     const a = o.get(te), e = o.get(we);
     return e.open(), e.isOpen ? a.executeCommand(gr.id) : a.executeCommand(ct.id), !0;
   }
-}, Va = {
-  type: De.OPERATION,
+}, Ca = {
+  type: ye.OPERATION,
   id: "sheet.operation.show-data-validation-dropdown",
   handler(o, a) {
     if (!a)
       return !1;
-    const e = o.get($e), { unitId: t, subUnitId: r, row: n, column: i } = a, s = e.activeDropdown, l = s == null ? void 0 : s.location;
+    const e = o.get(je), { unitId: t, subUnitId: r, row: n, column: i } = a, s = e.activeDropdown, l = s == null ? void 0 : s.location;
     return l && l.unitId === t && l.subUnitId === r && l.row === n && l.col === i || e.showDataValidationDropdown(
       t,
       r,
@@ -258,11 +253,11 @@ const vr = "DataValidationPanel", ct = {
       i
     ), !0;
   }
-}, Cn = {
-  type: De.OPERATION,
+}, Vn = {
+  type: ye.OPERATION,
   id: "sheet.operation.hide-data-validation-dropdown",
   handler(o, a) {
-    return a ? (o.get($e).hideDropdown(), !0) : !1;
+    return a ? (o.get(je).hideDropdown(), !0) : !1;
   }
 };
 function Qe(o, a, e) {
@@ -271,14 +266,14 @@ function Qe(o, a, e) {
     switch (n.type) {
       case "delete":
         t.push({
-          id: Dt.id,
+          id: It.id,
           params: {
             unitId: o,
             subUnitId: a,
             ruleId: n.rule.uid
           }
         }), r.unshift({
-          id: Zt.id,
+          id: Kt.id,
           params: {
             unitId: o,
             subUnitId: a,
@@ -295,7 +290,7 @@ function Qe(o, a, e) {
             subUnitId: a,
             ruleId: n.ruleId,
             payload: {
-              type: ye.RANGE,
+              type: De.RANGE,
               payload: n.newRanges
             }
           }
@@ -306,7 +301,7 @@ function Qe(o, a, e) {
             subUnitId: a,
             ruleId: n.ruleId,
             payload: {
-              type: ye.RANGE,
+              type: De.RANGE,
               payload: n.oldRanges
             }
           }
@@ -315,14 +310,14 @@ function Qe(o, a, e) {
       }
       case "add": {
         t.push({
-          id: Zt.id,
+          id: Kt.id,
           params: {
             unitId: o,
             subUnitId: a,
             rule: n.rule
           }
         }), r.unshift({
-          id: Dt.id,
+          id: It.id,
           params: {
             unitId: o,
             subUnitId: a,
@@ -337,42 +332,42 @@ function Qe(o, a, e) {
     undoMutations: r
   };
 }
-const Ma = {
-  type: De.COMMAND,
+const Va = {
+  type: ye.COMMAND,
   id: "sheet.command.updateDataValidationRuleRange",
   async handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, ranges: r, ruleId: n } = a, i = o.get(J), s = o.get(te), l = o.get(za), d = i.ensureManager(e, t), c = d.getRuleById(n);
+    const { unitId: e, subUnitId: t, ranges: r, ruleId: n } = a, i = o.get(Z), s = o.get(te), l = o.get(za), d = i.ensureManager(e, t), c = d.getRuleById(n);
     if (!c)
       return !1;
-    const u = c.ranges, h = d.getRuleObjectMatrix().clone();
-    h.updateRange(n, u, r);
-    const f = h.diff(d.getDataValidations()), { redoMutations: m, undoMutations: v } = Qe(e, t, f);
+    const h = c.ranges, u = d.getRuleObjectMatrix().clone();
+    u.updateRange(n, h, r);
+    const f = u.diff(d.getDataValidations()), { redoMutations: m, undoMutations: v } = Qe(e, t, f);
     return l.pushUndoRedo({
       undoMutations: v,
       redoMutations: m,
       unitID: e
     }), await Qa(m, s), !0;
   }
-}, wa = {
-  type: De.COMMAND,
+}, Ma = {
+  type: ye.COMMAND,
   id: "sheet.command.addDataValidation",
   async handler(o, a) {
     if (!a)
       return !1;
-    const { unitId: e, subUnitId: t, rule: r } = a, n = o.get(J), i = o.get(te), s = o.get(za), l = n.ensureManager(e, t), d = l.getRuleObjectMatrix().clone();
+    const { unitId: e, subUnitId: t, rule: r } = a, n = o.get(Z), i = o.get(te), s = o.get(za), l = n.ensureManager(e, t), d = l.getRuleObjectMatrix().clone();
     d.addRule(r);
-    const c = d.diff(l.getDataValidations()), u = {
+    const c = d.diff(l.getDataValidations()), h = {
       unitId: e,
       subUnitId: t,
       rule: r
-    }, { redoMutations: h, undoMutations: f } = Qe(e, t, c);
-    return h.push({
-      id: Zt.id,
-      params: u
+    }, { redoMutations: u, undoMutations: f } = Qe(e, t, c);
+    return u.push({
+      id: Kt.id,
+      params: h
     }), f.unshift({
-      id: Dt.id,
+      id: It.id,
       params: {
         unitId: e,
         subUnitId: t,
@@ -380,15 +375,15 @@ const Ma = {
       }
     }), s.pushUndoRedo({
       unitID: e,
-      redoMutations: h,
+      redoMutations: u,
       undoMutations: f
-    }), await Qa(h, i), !0;
+    }), await Qa(u, i), !0;
   }
 }, _r = {
-  type: De.COMMAND,
+  type: ye.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   async handler(o) {
-    const a = o.get(ne), e = ir(a);
+    const a = o.get(ie), e = tr(a);
     if (!e)
       return !1;
     const { workbook: t, worksheet: r } = e, n = Ja(o), i = o.get(te), s = t.getUnitId(), l = r.getSheetId(), d = {
@@ -396,22 +391,22 @@ const Ma = {
       unitId: s,
       subUnitId: l
     };
-    return await i.executeCommand(wa.id, d) ? (i.executeCommand(ct.id, {
+    return await i.executeCommand(Ma.id, d) ? (i.executeCommand(ct.id, {
       ruleId: n.uid,
       isAdd: !0
     }), !0) : !1;
   }
 };
-var de = function() {
-  return de = Object.assign || function(o) {
+var ce = function() {
+  return ce = Object.assign || function(o) {
     for (var a, e = 1, t = arguments.length; e < t; e++) {
       a = arguments[e];
       for (var r in a)
         Object.prototype.hasOwnProperty.call(a, r) && (o[r] = a[r]);
     }
     return o;
-  }, de.apply(this, arguments);
-}, Vn = function(o, a) {
+  }, ce.apply(this, arguments);
+}, Mn = function(o, a) {
   var e = {};
   for (var t in o)
     Object.prototype.hasOwnProperty.call(o, t) && a.indexOf(t) < 0 && (e[t] = o[t]);
@@ -420,16 +415,16 @@ var de = function() {
       a.indexOf(t[r]) < 0 && Object.prototype.propertyIsEnumerable.call(o, t[r]) && (e[t[r]] = o[t[r]]);
   return e;
 }, Te = Oe(function(o, a) {
-  var e = o.icon, t = o.id, r = o.className, n = o.extend, i = Vn(o, ["icon", "id", "className", "extend"]), s = "univerjs-icon univerjs-icon-".concat(t, " ").concat(r || "").trim(), l = Sa("_".concat(In()));
-  return Sr(e, "".concat(t), { defIds: e.defIds, idSuffix: l.current }, de({ ref: a, className: s }, i), n);
+  var e = o.icon, t = o.id, r = o.className, n = o.extend, i = Mn(o, ["icon", "id", "className", "extend"]), s = "univerjs-icon univerjs-icon-".concat(t, " ").concat(r || "").trim(), l = _a("_".concat(Dn()));
+  return Sr(e, "".concat(t), { defIds: e.defIds, idSuffix: l.current }, ce({ ref: a, className: s }, i), n);
 });
 function Sr(o, a, e, t, r) {
-  return be(o.tag, de(de({ key: a }, Mn(o, e, r)), t), (wn(o, e).children || []).map(function(n, i) {
+  return be(o.tag, ce(ce({ key: a }, wn(o, e, r)), t), (In(o, e).children || []).map(function(n, i) {
     return Sr(n, "".concat(a, "-").concat(o.tag, "-").concat(i), e, void 0, r);
   }));
 }
-function Mn(o, a, e) {
-  var t = de({}, o.attrs);
+function wn(o, a, e) {
+  var t = ce({}, o.attrs);
   e != null && e.colorChannel1 && t.fill === "colorChannel1" && (t.fill = e.colorChannel1);
   var r = a.defIds;
   return !r || r.length === 0 || (o.tag === "use" && t["xlink:href"] && (t["xlink:href"] = t["xlink:href"] + a.idSuffix), Object.entries(t).forEach(function(n) {
@@ -437,13 +432,13 @@ function Mn(o, a, e) {
     typeof s == "string" && (t[i] = s.replace(/url\(#(.*)\)/, "url(#$1".concat(a.idSuffix, ")")));
   })), t;
 }
-function wn(o, a) {
+function In(o, a) {
   var e, t = a.defIds;
-  return !t || t.length === 0 ? o : o.tag === "defs" && (!((e = o.children) === null || e === void 0) && e.length) ? de(de({}, o), { children: o.children.map(function(r) {
-    return typeof r.attrs.id == "string" && t && t.indexOf(r.attrs.id) > -1 ? de(de({}, r), { attrs: de(de({}, r.attrs), { id: r.attrs.id + a.idSuffix }) }) : r;
+  return !t || t.length === 0 ? o : o.tag === "defs" && (!((e = o.children) === null || e === void 0) && e.length) ? ce(ce({}, o), { children: o.children.map(function(r) {
+    return typeof r.attrs.id == "string" && t && t.indexOf(r.attrs.id) > -1 ? ce(ce({}, r), { attrs: ce(ce({}, r.attrs), { id: r.attrs.id + a.idSuffix }) }) : r;
   }) }) : o;
 }
-function In() {
+function Dn() {
   return Math.random().toString(36).substring(2, 8);
 }
 Te.displayName = "UniverIcon";
@@ -455,33 +450,33 @@ var yn = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em"
   }));
 });
 Rr.displayName = "CheckMarkSingle";
-const Dn = Rr;
-var En = { 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" } }] }, Cr = Oe(function(o, a) {
+const En = Rr;
+var On = { 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" } }] }, Cr = Oe(function(o, a) {
   return be(Te, Object.assign({}, o, {
     id: "data-validation-single",
     ref: a,
-    icon: En
+    icon: On
   }));
 });
 Cr.displayName = "DataValidationSingle";
-var On = { 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" } }] }, Vr = Oe(function(o, a) {
+var bn = { 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" } }] }, Vr = Oe(function(o, a) {
   return be(Te, Object.assign({}, o, {
     id: "delete-single",
     ref: a,
-    icon: On
+    icon: bn
   }));
 });
 Vr.displayName = "DeleteSingle";
 const Mr = Vr;
-var bn = { 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" } }] }, wr = Oe(function(o, a) {
+var Tn = { 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" } }] }, wr = Oe(function(o, a) {
   return be(Te, Object.assign({}, o, {
     id: "increase-single",
     ref: a,
-    icon: bn
+    icon: Tn
   }));
 });
 wr.displayName = "IncreaseSingle";
-const Tn = wr;
+const Nn = wr;
 var Fn = { 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" } }] }, Ir = Oe(function(o, a) {
   return be(Te, Object.assign({}, o, {
     id: "more-down-single",
@@ -490,35 +485,35 @@ var Fn = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em"
   }));
 });
 Ir.displayName = "MoreDownSingle";
-const Nn = Ir;
-var Ln = { 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" } }] }, yr = Oe(function(o, a) {
+const Ln = Ir;
+var Pn = { 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" } }] }, Dr = Oe(function(o, a) {
   return be(Te, Object.assign({}, o, {
     id: "more-up-single",
     ref: a,
-    icon: Ln
+    icon: Pn
   }));
 });
-yr.displayName = "MoreUpSingle";
-const An = yr;
-var Pn = { 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" } }] }] }, Dr = Oe(function(o, a) {
+Dr.displayName = "MoreUpSingle";
+const An = Dr;
+var xn = { 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" } }] }] }, yr = Oe(function(o, a) {
   return be(Te, Object.assign({}, o, {
     id: "sequence-single",
     ref: a,
-    icon: Pn
+    icon: xn
   }));
 });
-Dr.displayName = "SequenceSingle";
-const xn = Dr, jn = "univer-data-validation-options-button", Bn = "univer-data-validation-options-button-icon", Bt = {
-  dataValidationOptionsButton: jn,
-  dataValidationOptionsButtonIcon: Bn
+yr.displayName = "SequenceSingle";
+const jn = yr, Bn = "univer-data-validation-options-button", $n = "univer-data-validation-options-button-icon", xt = {
+  dataValidationOptionsButton: Bn,
+  dataValidationOptionsButtonIcon: $n
 };
-function $n(o) {
+function Un(o) {
   var d;
-  const a = O(le), e = O(dt), { value: t, onChange: r, extraComponent: n } = o, [i, s] = Q(!1), l = n ? e.get(n) : null;
+  const a = T(le), e = T(dt), { value: t, onChange: r, extraComponent: n } = o, [i, s] = Q(!1), l = n ? e.get(n) : null;
   return /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
-    /* @__PURE__ */ p.jsxs("div", { className: Bt.dataValidationOptionsButton, onClick: () => s(!i), children: [
+    /* @__PURE__ */ p.jsxs("div", { className: xt.dataValidationOptionsButton, onClick: () => s(!i), children: [
       a.t("dataValidation.panel.options"),
-      i ? /* @__PURE__ */ p.jsx(An, { className: Bt.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ p.jsx(Nn, { className: Bt.dataValidationOptionsButtonIcon })
+      i ? /* @__PURE__ */ p.jsx(An, { className: xt.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ p.jsx(Ln, { className: xt.dataValidationOptionsButtonIcon })
     ] }),
     i && /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
       l ? /* @__PURE__ */ p.jsx(l, { value: t, onChange: r }) : null,
@@ -527,13 +522,13 @@ function $n(o) {
         {
           label: a.t("dataValidation.panel.invalid"),
           children: /* @__PURE__ */ p.jsxs(
-            Ra,
+            Sa,
             {
               value: `${(d = t.errorStyle) != null ? d : tt.WARNING}`,
               onChange: (c) => r({ ...t, errorStyle: +c }),
               children: [
-                /* @__PURE__ */ p.jsx(xe, { value: `${tt.WARNING}`, children: a.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ p.jsx(xe, { value: `${tt.STOP}`, children: a.t("dataValidation.panel.rejectInput") })
+                /* @__PURE__ */ p.jsx(Pe, { value: `${tt.WARNING}`, children: a.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ p.jsx(Pe, { value: `${tt.STOP}`, children: a.t("dataValidation.panel.rejectInput") })
               ]
             }
           )
@@ -556,70 +551,70 @@ function $n(o) {
           )
         }
       ),
-      t.showInputMessage ? /* @__PURE__ */ p.jsx(K, { children: /* @__PURE__ */ p.jsx(je, { value: t.error, onChange: (c) => r({ ...t, error: c }) }) }) : null
+      t.showInputMessage ? /* @__PURE__ */ p.jsx(K, { children: /* @__PURE__ */ p.jsx(Ae, { value: t.error, onChange: (c) => r({ ...t, error: c }) }) }) : null
     ] })
   ] });
 }
-const Un = "univer-data-validation-detail-form-item", Wn = "univer-data-validation-detail-buttons", Hn = "univer-data-validation-detail-button", He = {
-  dataValidationDetailFormItem: Un,
-  dataValidationDetailButtons: Wn,
-  dataValidationDetailButton: Hn
-}, kn = (o) => Yr(
+const Wn = "univer-data-validation-detail-form-item", Hn = "univer-data-validation-detail-buttons", kn = "univer-data-validation-detail-button", We = {
+  dataValidationDetailFormItem: Wn,
+  dataValidationDetailButtons: Hn,
+  dataValidationDetailButton: kn
+}, Yn = (o) => Xr(
   async (a, e, t, r) => {
     const n = await o.executeCommand(a, e, t);
     r == null || r(n);
   },
   275
 );
-function Yn() {
-  const [o, a] = Q(0), e = O(we), t = Ze(e.activeRule$, e.activeRule), { unitId: r, subUnitId: n, rule: i } = t || {}, s = i.uid, l = O(Ee), d = O(dt), c = O(te), u = O(J), h = O(le), [f, m] = Q(i), v = l.getValidatorItem(f.type), [R, S] = Q(!1), M = l.getValidatorsByScope(Jr.SHEET), [_, I] = Q(() => f.ranges.map((w) => ({ unitId: "", sheetId: "", range: w }))), y = na(() => kn(c), [c]);
+function Gn() {
+  const [o, a] = Q(0), e = T(we), t = Ze(e.activeRule$, e.activeRule), { unitId: r, subUnitId: n, rule: i } = t || {}, s = i.uid, l = T(Ee), d = T(dt), c = T(te), h = T(Z), u = T(le), [f, m] = Q(i), v = l.getValidatorItem(f.type), [R, S] = Q(!1), V = l.getValidatorsByScope(ao.SHEET), [_, I] = Q(() => f.ranges.map((M) => ({ unitId: "", sheetId: "", range: M }))), D = oa(() => Yn(c), [c]);
   if (Xe(() => {
-    c.onCommandExecuted((w) => {
-      (w.id === Ur.id || w.id === Wr.id) && setTimeout(() => {
-        const P = u.getRuleById(r, n, s);
-        a((k) => k + 1), P && (m(P), I(P.ranges.map((k) => ({ unitId: "", sheetId: "", range: k }))));
+    c.onCommandExecuted((M) => {
+      (M.id === Hr.id || M.id === kr.id) && setTimeout(() => {
+        const O = h.getRuleById(r, n, s);
+        a((z) => z + 1), O && (m(O), I(O.ranges.map((z) => ({ unitId: "", sheetId: "", range: z }))));
       }, 20);
     });
-  }, [c, u, s, n, r]), !v)
+  }, [c, h, s, n, r]), !v)
     return null;
-  const E = v.operators, L = v.operatorNames, b = f.operator ? eo.includes(f.operator) : !1, W = () => {
+  const N = v.operators, E = v.operatorNames, L = f.operator ? ro.includes(f.operator) : !1, j = () => {
     v.validatorFormula(f).success ? e.setActiveRule(null) : S(!0);
-  }, N = ar((w) => {
-    if (Hr(w, _))
+  }, A = or((M) => {
+    if (Yr(M, _))
       return;
-    I(w);
-    const P = w.filter((Y) => (!Y.unitId || Y.unitId === r) && (!Y.sheetId || Y.sheetId === n)).map((Y) => Y.range);
+    I(M);
+    const O = M.filter(($) => (!$.unitId || $.unitId === r) && (!$.sheetId || $.sheetId === n)).map(($) => $.range);
     if (m({
       ...f,
-      ranges: P
-    }), P.length === 0)
+      ranges: O
+    }), O.length === 0)
       return;
-    const k = {
+    const z = {
       unitId: r,
       subUnitId: n,
       ruleId: s,
-      ranges: P
+      ranges: O
     };
-    y(Ma.id, k);
-  }), A = (w) => {
-    if (Ea(w, ba(f)))
+    D(Va.id, z);
+  }), P = (M) => {
+    if (ya(M, Oa(f)))
       return;
     m({
       ...f,
-      ...w
+      ...M
     });
-    const P = {
+    const O = {
       unitId: r,
       subUnitId: n,
       ruleId: s,
-      setting: w
+      setting: M
     };
-    y(
-      Ta.id,
-      P,
+    D(
+      ba.id,
+      O,
       void 0
     );
-  }, j = async () => {
+  }, B = async () => {
     await c.executeCommand(er.id, {
       ruleId: s,
       unitId: r,
@@ -631,95 +626,95 @@ function Yn() {
     formula1: f.formula1,
     formula2: f.formula2,
     allowBlank: f.allowBlank
-  }, F = (w) => {
-    const P = l.getValidatorItem(w);
-    if (!P)
+  }, x = (M) => {
+    const O = l.getValidatorItem(M);
+    if (!O)
       return;
-    const k = P.operators, Y = u.getRuleById(r, n, s), Z = w === (Y == null ? void 0 : Y.type) ? {
-      ...Y
+    const z = O.operators, $ = h.getRuleById(r, n, s), ae = M === ($ == null ? void 0 : $.type) ? {
+      ...$
     } : {
       ...f,
-      type: w,
-      operator: k[0],
+      type: M,
+      operator: z[0],
       formula1: void 0,
       formula2: void 0
     };
-    m(Z), c.executeCommand(Ta.id, {
+    m(ae), c.executeCommand(ba.id, {
       unitId: r,
       subUnitId: n,
       ruleId: f.uid,
-      setting: ba(Z)
+      setting: Oa(ae)
     });
-  }, H = d.get(v.formulaInput), x = _.map((w) => dr(w.range)).join(","), ee = Oa(f), G = (w) => {
-    Ea(w, Oa(f)) || (m({
+  }, b = d.get(v.formulaInput), k = _.map((M) => dr(M.range)).join(","), ee = Ea(f), Y = (M) => {
+    ya(M, Ea(f)) || (m({
       ...f,
-      ...w
-    }), y(
-      to.id,
+      ...M
+    }), D(
+      oo.id,
       {
         unitId: r,
         subUnitId: n,
         ruleId: s,
-        options: w
+        options: M
       }
     ));
   };
   return /* @__PURE__ */ p.jsxs("div", { children: [
-    /* @__PURE__ */ p.jsx(K, { label: h.t("dataValidation.panel.range"), children: /* @__PURE__ */ p.jsx(
-      lo,
+    /* @__PURE__ */ p.jsx(K, { label: u.t("dataValidation.panel.range"), children: /* @__PURE__ */ p.jsx(
+      Fo,
       {
-        className: He.dataValidationDetailFormItem,
-        value: x,
+        className: We.dataValidationDetailFormItem,
+        value: k,
         id: fa("data-validation-detail"),
         openForSheetUnitId: r,
         openForSheetSubUnitId: n,
-        onChange: (w) => {
-          w.some((P) => !kr(P.range) || P.range.endColumn < P.range.startColumn || P.range.endRow < P.range.startRow) || N(w);
+        onChange: (M) => {
+          M.some((O) => !Gr(O.range) || O.range.endColumn < O.range.startColumn || O.range.endRow < O.range.startRow) || A(M);
         }
       },
       o
     ) }),
-    /* @__PURE__ */ p.jsx(K, { label: h.t("dataValidation.panel.type"), children: /* @__PURE__ */ p.jsx(
-      ia,
+    /* @__PURE__ */ p.jsx(K, { label: u.t("dataValidation.panel.type"), children: /* @__PURE__ */ p.jsx(
+      na,
       {
-        options: M == null ? void 0 : M.map((w) => ({
-          label: h.t(w.title),
-          value: w.id
+        options: V == null ? void 0 : V.map((M) => ({
+          label: u.t(M.title),
+          value: M.id
         })),
         value: f.type,
-        onChange: F,
-        className: He.dataValidationDetailFormItem
+        onChange: x,
+        className: We.dataValidationDetailFormItem
       }
     ) }),
-    E != null && E.length ? /* @__PURE__ */ p.jsx(K, { label: h.t("dataValidation.panel.operator"), children: /* @__PURE__ */ p.jsx(
-      ia,
+    N != null && N.length ? /* @__PURE__ */ p.jsx(K, { label: u.t("dataValidation.panel.operator"), children: /* @__PURE__ */ p.jsx(
+      na,
       {
-        options: E.map((w, P) => ({
-          value: `${w}`,
-          label: L[P]
+        options: N.map((M, O) => ({
+          value: `${M}`,
+          label: E[O]
         })),
         value: `${f.operator}`,
-        onChange: (w) => {
-          A({
+        onChange: (M) => {
+          P({
             ...X,
-            operator: w
+            operator: M
           });
         },
-        className: He.dataValidationDetailFormItem
+        className: We.dataValidationDetailFormItem
       }
     ) }) : null,
-    H ? /* @__PURE__ */ p.jsx(
-      H,
+    b ? /* @__PURE__ */ p.jsx(
+      b,
       {
-        isTwoFormula: b,
+        isTwoFormula: L,
         value: {
           formula1: f.formula1,
           formula2: f.formula2
         },
-        onChange: (w) => {
-          A({
+        onChange: (M) => {
+          P({
             ...X,
-            ...w
+            ...M
           });
         },
         showError: R,
@@ -730,21 +725,21 @@ function Yn() {
       },
       o
     ) : null,
-    /* @__PURE__ */ p.jsx($n, { value: ee, onChange: G, extraComponent: v.optionsInput }),
-    /* @__PURE__ */ p.jsxs("div", { className: He.dataValidationDetailButtons, children: [
-      /* @__PURE__ */ p.jsx(ze, { className: He.dataValidationDetailButton, onClick: j, children: h.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ p.jsx(ze, { className: He.dataValidationDetailButton, type: "primary", onClick: W, children: h.t("dataValidation.panel.done") })
+    /* @__PURE__ */ p.jsx(Un, { value: ee, onChange: Y, extraComponent: v.optionsInput }),
+    /* @__PURE__ */ p.jsxs("div", { className: We.dataValidationDetailButtons, children: [
+      /* @__PURE__ */ p.jsx(ze, { className: We.dataValidationDetailButton, onClick: B, children: u.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ p.jsx(ze, { className: We.dataValidationDetailButton, type: "primary", onClick: j, children: u.t("dataValidation.panel.done") })
     ] })
   ] });
 }
-var Et = /* @__PURE__ */ ((o) => (o[o.View = 0] = "View", o[o.Edit = 1] = "Edit", o[o.ManageCollaborator = 2] = "ManageCollaborator", o[o.Print = 3] = "Print", o[o.Duplicate = 4] = "Duplicate", o[o.Comment = 5] = "Comment", o[o.Copy = 6] = "Copy", o[o.Share = 7] = "Share", o[o.Export = 8] = "Export", o[o.MoveWorksheet = 9] = "MoveWorksheet", o[o.DeleteWorksheet = 10] = "DeleteWorksheet", o[o.HideWorksheet = 11] = "HideWorksheet", o[o.RenameWorksheet = 12] = "RenameWorksheet", o[o.CreateWorksheet = 13] = "CreateWorksheet", o[o.SetWorksheetStyle = 14] = "SetWorksheetStyle", o[o.EditWorksheetCell = 15] = "EditWorksheetCell", o[o.InsertHyperlink = 16] = "InsertHyperlink", o[o.Sort = 17] = "Sort", o[o.Filter = 18] = "Filter", o[o.PivotTable = 19] = "PivotTable", o[o.FloatImg = 20] = "FloatImg", o[o.History = 21] = "History", o[o.RwHgtClWdt = 22] = "RwHgtClWdt", o[o.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", o[o.ViewFilter = 24] = "ViewFilter", o[o.MoveSheet = 25] = "MoveSheet", o[o.DeleteSheet = 26] = "DeleteSheet", o[o.HideSheet = 27] = "HideSheet", o[o.CopySheet = 28] = "CopySheet", o[o.RenameSheet = 29] = "RenameSheet", o[o.CreateSheet = 30] = "CreateSheet", o[o.SelectProtectedCells = 31] = "SelectProtectedCells", o[o.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", o[o.SetCellStyle = 33] = "SetCellStyle", o[o.SetCellValue = 34] = "SetCellValue", o[o.SetRowStyle = 35] = "SetRowStyle", o[o.SetColumnStyle = 36] = "SetColumnStyle", o[o.InsertRow = 37] = "InsertRow", o[o.InsertColumn = 38] = "InsertColumn", o[o.DeleteRow = 39] = "DeleteRow", o[o.DeleteColumn = 40] = "DeleteColumn", o[o.EditExtraObject = 41] = "EditExtraObject", o[o.UNRECOGNIZED = -1] = "UNRECOGNIZED", o))(Et || {});
-const Gn = "univer-data-validation-item-container", Xn = "univer-data-validation-item-title", qn = "univer-data-validation-item-content", zn = "univer-data-validation-item-icon", ft = {
-  dataValidationItemContainer: Gn,
-  dataValidationItemTitle: Xn,
-  dataValidationItemContent: qn,
-  dataValidationItemIcon: zn
-}, Qn = (o) => {
-  const { rule: a, onClick: e, unitId: t, subUnitId: r, disable: n } = o, i = O(Ee), s = O(te), l = O(go), d = i.getValidatorItem(a.type), c = Sa(), [u, h] = Q(!1), f = (m) => {
+var Dt = /* @__PURE__ */ ((o) => (o[o.View = 0] = "View", o[o.Edit = 1] = "Edit", o[o.ManageCollaborator = 2] = "ManageCollaborator", o[o.Print = 3] = "Print", o[o.Duplicate = 4] = "Duplicate", o[o.Comment = 5] = "Comment", o[o.Copy = 6] = "Copy", o[o.Share = 7] = "Share", o[o.Export = 8] = "Export", o[o.MoveWorksheet = 9] = "MoveWorksheet", o[o.DeleteWorksheet = 10] = "DeleteWorksheet", o[o.HideWorksheet = 11] = "HideWorksheet", o[o.RenameWorksheet = 12] = "RenameWorksheet", o[o.CreateWorksheet = 13] = "CreateWorksheet", o[o.SetWorksheetStyle = 14] = "SetWorksheetStyle", o[o.EditWorksheetCell = 15] = "EditWorksheetCell", o[o.InsertHyperlink = 16] = "InsertHyperlink", o[o.Sort = 17] = "Sort", o[o.Filter = 18] = "Filter", o[o.PivotTable = 19] = "PivotTable", o[o.FloatImg = 20] = "FloatImg", o[o.History = 21] = "History", o[o.RwHgtClWdt = 22] = "RwHgtClWdt", o[o.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", o[o.ViewFilter = 24] = "ViewFilter", o[o.MoveSheet = 25] = "MoveSheet", o[o.DeleteSheet = 26] = "DeleteSheet", o[o.HideSheet = 27] = "HideSheet", o[o.CopySheet = 28] = "CopySheet", o[o.RenameSheet = 29] = "RenameSheet", o[o.CreateSheet = 30] = "CreateSheet", o[o.SelectProtectedCells = 31] = "SelectProtectedCells", o[o.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", o[o.SetCellStyle = 33] = "SetCellStyle", o[o.SetCellValue = 34] = "SetCellValue", o[o.SetRowStyle = 35] = "SetRowStyle", o[o.SetColumnStyle = 36] = "SetColumnStyle", o[o.InsertRow = 37] = "InsertRow", o[o.InsertColumn = 38] = "InsertColumn", o[o.DeleteRow = 39] = "DeleteRow", o[o.DeleteColumn = 40] = "DeleteColumn", o[o.EditExtraObject = 41] = "EditExtraObject", o[o.Delete = 42] = "Delete", o[o.UNRECOGNIZED = -1] = "UNRECOGNIZED", o))(Dt || {});
+const Xn = "univer-data-validation-item-container", qn = "univer-data-validation-item-title", zn = "univer-data-validation-item-content", Qn = "univer-data-validation-item-icon", ft = {
+  dataValidationItemContainer: Xn,
+  dataValidationItemTitle: qn,
+  dataValidationItemContent: zn,
+  dataValidationItemIcon: Qn
+}, Kn = (o) => {
+  const { rule: a, onClick: e, unitId: t, subUnitId: r, disable: n } = o, i = T(Ee), s = T(te), l = T(Ro), d = i.getValidatorItem(a.type), c = _a(), [h, u] = Q(!1), f = (m) => {
     s.executeCommand(er.id, {
       ruleId: a.uid,
       unitId: t,
@@ -762,7 +757,7 @@ const Gn = "univer-data-validation-item-container", Xn = "univer-data-validation
       className: ft.dataValidationItemContainer,
       onClick: e,
       onMouseEnter: () => {
-        n || (h(!0), c.current = a.ranges.map((m) => l.addShape({
+        n || (u(!0), c.current = a.ranges.map((m) => l.addShape({
           range: m,
           style: {
             hasAutoFill: !1,
@@ -785,24 +780,24 @@ const Gn = "univer-data-validation-item-container", Xn = "univer-data-validation
       },
       onMouseLeave: () => {
         var m;
-        h(!1), (m = c.current) == null || m.forEach((v) => {
+        u(!1), (m = c.current) == null || m.forEach((v) => {
           v && l.removeShape(v);
         }), c.current = void 0;
       },
       children: [
         /* @__PURE__ */ p.jsx("div", { className: ft.dataValidationItemTitle, children: d == null ? void 0 : d.generateRuleName(a) }),
         /* @__PURE__ */ p.jsx("div", { className: ft.dataValidationItemContent, children: a.ranges.map((m) => dr(m)).join(",") }),
-        u ? /* @__PURE__ */ p.jsx("div", { className: ft.dataValidationItemIcon, onClick: f, children: /* @__PURE__ */ p.jsx(Mr, {}) }) : null
+        h ? /* @__PURE__ */ p.jsx("div", { className: ft.dataValidationItemIcon, onClick: f, children: /* @__PURE__ */ p.jsx(Mr, {}) }) : null
       ]
     }
   );
 };
-var Kn = Object.defineProperty, Zn = Object.getOwnPropertyDescriptor, Jn = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Zn(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+var Zn = Object.defineProperty, Jn = Object.getOwnPropertyDescriptor, ei = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Jn(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && Kn(a, e, r), r;
-}, ei = (o, a) => (e, t) => a(e, t, o);
-let Ot = class {
+  return t && r && Zn(a, e, r), r;
+}, ti = (o, a) => (e, t) => a(e, t, o);
+let yt = class {
   constructor(o) {
     g(this, "_currentManager");
     g(this, "_currentManager$", new ur());
@@ -830,14 +825,14 @@ let Ot = class {
     return this._ensureManager(o, a);
   }
 };
-Ot = Jn([
-  ei(0, V(J))
-], Ot);
-function ti(o) {
+yt = ei([
+  ti(0, w(Z))
+], yt);
+function ai(o) {
   var l;
   const { unitId: a, subUnitId: e, value: t, onChange: r, showError: n, validResult: i } = o, s = n ? i == null ? void 0 : i.formula1 : "";
   return /* @__PURE__ */ p.jsx(K, { error: s, children: /* @__PURE__ */ p.jsx(
-    rr,
+    nr,
     {
       value: (l = t == null ? void 0 : t.formula1) != null ? l : "",
       id: fa(`dataValidation-custom-formula-${a}-${e}`),
@@ -853,21 +848,21 @@ function ti(o) {
     }
   ) });
 }
-const ai = "univer-data-validation-formula", ri = "univer-data-validation-formula-and", oi = "univer-data-validation-formula-list-item", ni = "univer-data-validation-formula-list-item-icon", ii = "univer-data-validation-formula-list-item-drag", si = "univer-data-validation-formula-list-add", li = "univer-data-validation-formula-color-select", di = "univer-data-validation-formula-color-select-panel", ci = "univer-data-validation-formula-color-item", oe = {
-  dataValidationFormula: ai,
-  dataValidationFormulaAnd: ri,
-  dataValidationFormulaListItem: oi,
-  dataValidationFormulaListItemIcon: ni,
-  dataValidationFormulaListItemDrag: ii,
-  dataValidationFormulaListAdd: si,
-  dataValidationFormulaColorSelect: li,
-  dataValidationFormulaColorSelectPanel: di,
-  dataValidationFormulaColorItem: ci
-}, ui = (o) => {
-  const { isTwoFormula: a = !1, value: e, onChange: t, showError: r, validResult: n } = o, i = O(le), s = r ? n == null ? void 0 : n.formula1 : "", l = r ? n == null ? void 0 : n.formula2 : "";
+const ri = "univer-data-validation-formula", oi = "univer-data-validation-formula-and", ni = "univer-data-validation-formula-list-item", ii = "univer-data-validation-formula-list-item-icon", si = "univer-data-validation-formula-list-item-drag", li = "univer-data-validation-formula-list-add", di = "univer-data-validation-formula-color-select", ci = "univer-data-validation-formula-color-select-panel", ui = "univer-data-validation-formula-color-item", oe = {
+  dataValidationFormula: ri,
+  dataValidationFormulaAnd: oi,
+  dataValidationFormulaListItem: ni,
+  dataValidationFormulaListItemIcon: ii,
+  dataValidationFormulaListItemDrag: si,
+  dataValidationFormulaListAdd: li,
+  dataValidationFormulaColorSelect: di,
+  dataValidationFormulaColorSelectPanel: ci,
+  dataValidationFormulaColorItem: ui
+}, hi = (o) => {
+  const { isTwoFormula: a = !1, value: e, onChange: t, showError: r, validResult: n } = o, i = T(le), s = r ? n == null ? void 0 : n.formula1 : "", l = r ? n == null ? void 0 : n.formula2 : "";
   return a ? /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
     /* @__PURE__ */ p.jsx(K, { error: s, children: /* @__PURE__ */ p.jsx(
-      je,
+      Ae,
       {
         className: oe.dataValidationFormula,
         placeholder: i.t("dataValidation.panel.formulaPlaceholder"),
@@ -882,7 +877,7 @@ const ai = "univer-data-validation-formula", ri = "univer-data-validation-formul
     ) }),
     /* @__PURE__ */ p.jsx("div", { className: oe.dataValidationFormulaAnd, children: i.t("dataValidation.panel.formulaAnd") }),
     /* @__PURE__ */ p.jsx(K, { error: l, children: /* @__PURE__ */ p.jsx(
-      je,
+      Ae,
       {
         className: oe.dataValidationFormula,
         placeholder: i.t("dataValidation.panel.formulaPlaceholder"),
@@ -896,7 +891,7 @@ const ai = "univer-data-validation-formula", ri = "univer-data-validation-formul
       }
     ) })
   ] }) : /* @__PURE__ */ p.jsx(K, { error: s, children: /* @__PURE__ */ p.jsx(
-    je,
+    Ae,
     {
       className: oe.dataValidationFormula,
       placeholder: i.t("dataValidation.panel.formulaPlaceholder"),
@@ -907,7 +902,7 @@ const ai = "univer-data-validation-formula", ri = "univer-data-validation-formul
     }
   ) });
 };
-function se(o) {
+function ne(o) {
   if (o === null)
     return "";
   if (o != null && o.p) {
@@ -925,16 +920,16 @@ function Er(o) {
 function Ge(o) {
   return o.split(",").filter(Boolean);
 }
-function hi(o) {
-  const a = se(o);
+function mi(o) {
+  const a = ne(o);
   return a == null ? "" : a.toString();
 }
-const Ia = "SHEET_DATA_VALIDATION_PLUGIN", Pe = "#ECECEC";
-var mi = Object.defineProperty, fi = Object.getOwnPropertyDescriptor, pi = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? fi(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+const wa = "SHEET_DATA_VALIDATION_PLUGIN", Le = "#ECECEC";
+var fi = Object.defineProperty, pi = Object.getOwnPropertyDescriptor, vi = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? pi(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && mi(a, e, r), r;
-}, $t = (o, a) => (e, t) => a(e, t, o);
+  return t && r && fi(a, e, r), r;
+}, jt = (o, a) => (e, t) => a(e, t, o);
 let at = class extends me {
   constructor(o, a, e) {
     super(), this._univerInstanceService = o, this._permissionService = a, this._lexerTreeBuilder = e;
@@ -948,36 +943,36 @@ let at = class extends me {
       const n = a[r];
       if (typeof n == "string")
         continue;
-      const { token: i } = n, s = Go(i), l = this._univerInstanceService.getCurrentUnitForType(ue.UNIVER_SHEET);
+      const { token: i } = n, s = Zo(i), l = this._univerInstanceService.getCurrentUnitForType(se.UNIVER_SHEET);
       let d = l.getActiveSheet();
       const c = l.getUnitId();
       if (s.sheetName) {
         if (d = l.getSheetBySheetName(s.sheetName), !d)
           return !1;
         const v = d == null ? void 0 : d.getSheetId();
-        if (!this._permissionService.getPermissionPoint(new Po(c, v).id))
+        if (!this._permissionService.getPermissionPoint(new ho(c, v).id))
           return !1;
       }
       if (!d)
         return !1;
-      const { startRow: u, endRow: h, startColumn: f, endColumn: m } = s.range;
-      for (let v = u; v <= h; v++)
+      const { startRow: h, endRow: u, startColumn: f, endColumn: m } = s.range;
+      for (let v = h; v <= u; v++)
         for (let R = f; R <= m; R++) {
           const S = (t = (e = d.getCell(v, R)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
-          if ((S == null ? void 0 : S[Et.View]) === !1)
+          if ((S == null ? void 0 : S[Dt.View]) === !1)
             return !1;
         }
     }
     return !0;
   }
 };
-at = pi([
-  ge(_e.Rendered, at),
-  $t(0, ne),
-  $t(1, Gr),
-  $t(2, V(Ca))
+at = vi([
+  ve(ge.Rendered, at),
+  jt(0, ie),
+  jt(1, qr),
+  jt(2, w(Ra))
 ], at);
-const vi = [
+const gi = [
   "#FFFFFF",
   "#FEE7E7",
   "#FEF0E6",
@@ -1002,10 +997,10 @@ const vi = [
   "#3A60F7",
   "#9E6DE3",
   "#F248A6"
-], gi = (o) => {
+], _i = (o) => {
   const { value: a, onChange: e, disabled: t } = o, [r, n] = Q(!1);
   return /* @__PURE__ */ p.jsx(
-    ia,
+    na,
     {
       disabled: t,
       open: r,
@@ -1015,7 +1010,7 @@ const vi = [
       value: a,
       onChange: e,
       labelRender: (i) => /* @__PURE__ */ p.jsx("div", { className: oe.dataValidationFormulaColorItem, style: { background: i.value } }),
-      dropdownRender: () => /* @__PURE__ */ p.jsx("div", { className: oe.dataValidationFormulaColorSelectPanel, children: vi.map(
+      dropdownRender: () => /* @__PURE__ */ p.jsx("div", { className: oe.dataValidationFormulaColorSelectPanel, children: gi.map(
         (i) => /* @__PURE__ */ p.jsx(
           "div",
           {
@@ -1033,9 +1028,9 @@ const vi = [
 }, Ba = (o) => {
   const { item: a, commonProps: e, style: t } = o, { onItemChange: r, onItemDelete: n } = e;
   return /* @__PURE__ */ p.jsxs("div", { className: oe.dataValidationFormulaListItem, style: t, children: [
-    a.isRef ? null : /* @__PURE__ */ p.jsx("div", { className: en(oe.dataValidationFormulaListItemDrag, "draggableHandle"), children: /* @__PURE__ */ p.jsx(xn, {}) }),
+    a.isRef ? null : /* @__PURE__ */ p.jsx("div", { className: on(oe.dataValidationFormulaListItemDrag, "draggableHandle"), children: /* @__PURE__ */ p.jsx(jn, {}) }),
     /* @__PURE__ */ p.jsx(
-      gi,
+      _i,
       {
         value: a.color,
         onChange: (i) => {
@@ -1044,7 +1039,7 @@ const vi = [
       }
     ),
     /* @__PURE__ */ p.jsx(
-      je,
+      Ae,
       {
         disabled: a.isRef,
         value: a.label,
@@ -1056,162 +1051,162 @@ const vi = [
     a.isRef ? null : /* @__PURE__ */ p.jsx("div", { className: oe.dataValidationFormulaListItemIcon, children: /* @__PURE__ */ p.jsx(Mr, { onClick: () => n(a.id) }) })
   ] });
 };
-function _i(o) {
+function Si(o) {
   const { value: a, onChange: e = () => {
-  }, unitId: t, subUnitId: r, validResult: n, showError: i, ruleId: s } = o, { formula1: l = "", formula2: d = "" } = a || {}, c = Sa(null), [u, h] = Q(() => T(l) ? "1" : "0"), [f, m] = Q(u === "1" ? l : "="), [v, R] = Q(u === "1" ? l : "="), S = O(le), M = O(Ee), _ = O(J), I = O(at), [y, E] = Q(() => d.split(",")), L = M.getValidatorItem(z.LIST), [b, W] = Q([]), [N, A] = Q(""), j = i ? n == null ? void 0 : n.formula1 : "", X = Ze(_.ruleChange$), F = ar(e);
+  }, unitId: t, subUnitId: r, validResult: n, showError: i, ruleId: s } = o, { formula1: l = "", formula2: d = "" } = a || {}, c = _a(null), [h, u] = Q(() => F(l) ? "1" : "0"), [f, m] = Q(h === "1" ? l : "="), [v, R] = Q(h === "1" ? l : "="), S = T(le), V = T(Ee), _ = T(Z), I = T(at), [D, N] = Q(() => d.split(",")), E = V.getValidatorItem(q.LIST), [L, j] = Q([]), [A, P] = Q(""), B = i ? n == null ? void 0 : n.formula1 : "", X = Ze(_.ruleChange$), x = or(e);
   Xe(() => {
     (async () => {
-      await new Promise((B) => {
-        setTimeout(() => B(!0), 100);
+      await new Promise((H) => {
+        setTimeout(() => H(!0), 100);
       });
-      const D = _.getRuleById(t, r, s), U = D == null ? void 0 : D.formula1;
-      if (T(U) && L && D) {
-        const B = await L.getListAsync(D, t, r);
-        W(B);
+      const y = _.getRuleById(t, r, s), W = y == null ? void 0 : y.formula1;
+      if (F(W) && E && y) {
+        const H = await E.getListAsync(y, t, r);
+        j(H);
       }
     })();
-  }, [_, X, L, s, r, t]), Xe(() => {
-    T(l) && l !== v && (m(l), R(v));
+  }, [_, X, E, s, r, t]), Xe(() => {
+    F(l) && l !== v && (m(l), R(v));
   }, [v, l]);
-  const [H, x] = Q(() => {
-    const D = u !== "1" ? Ge(l) : [], U = d.split(",");
-    return D.map((B, ae) => ({
-      label: B,
-      color: U[ae] || Pe,
+  const [b, k] = Q(() => {
+    const y = h !== "1" ? Ge(l) : [], W = d.split(",");
+    return y.map((H, J) => ({
+      label: H,
+      color: W[J] || Le,
       isRef: !1,
-      id: $.generateRandomId(4)
+      id: U.generateRandomId(4)
     }));
-  }), ee = (D, U, B) => {
-    const ae = H.find((Se) => Se.id === D);
-    ae && (ae.label = U, ae.color = B, x([...H]));
-  }, G = (D) => {
-    const U = H.findIndex((B) => B.id === D);
-    U !== -1 && (H.splice(U, 1), x([...H]));
-  }, w = d.split(","), P = na(() => b.map((D, U) => ({
-    label: D,
-    color: w[U] || Pe,
-    id: `${U}`,
+  }), ee = (y, W, H) => {
+    const J = b.find((_e) => _e.id === y);
+    J && (J.label = W, J.color = H, k([...b]));
+  }, Y = (y) => {
+    const W = b.findIndex((H) => H.id === y);
+    W !== -1 && (b.splice(W, 1), k([...b]));
+  }, M = d.split(","), O = oa(() => L.map((y, W) => ({
+    label: y,
+    color: M[W] || Le,
+    id: `${W}`,
     isRef: !0
-  })), [w, b]), k = (D, U, B) => {
-    const ae = [...y];
-    ae[+D] = B, E(ae), F({
+  })), [M, L]), z = (y, W, H) => {
+    const J = [...D];
+    J[+y] = H, N(J), x({
       formula1: l,
-      formula2: ae.join(",")
+      formula2: J.join(",")
     });
-  }, Y = () => {
-    x([
-      ...H,
+  }, $ = () => {
+    k([
+      ...b,
       {
         label: "",
-        color: Pe,
+        color: Le,
         isRef: !1,
-        id: $.generateRandomId(4)
+        id: U.generateRandomId(4)
       }
     ]);
   };
   Xe(() => {
-    if (u === "1")
+    if (h === "1")
       return;
-    const D = /* @__PURE__ */ new Set(), U = [];
-    H.map((B) => ({
-      labelList: B.label.split(","),
-      item: B
-    })).forEach(({ item: B, labelList: ae }) => {
-      ae.forEach((Se) => {
-        D.has(Se) || (D.add(Se), U.push({
-          label: Se,
-          color: B.color
+    const y = /* @__PURE__ */ new Set(), W = [];
+    b.map((H) => ({
+      labelList: H.label.split(","),
+      item: H
+    })).forEach(({ item: H, labelList: J }) => {
+      J.forEach((_e) => {
+        y.has(_e) || (y.add(_e), W.push({
+          label: _e,
+          color: H.color
         }));
       });
-    }), F({
-      formula1: Er(U.map((B) => B.label)),
-      formula2: U.map((B) => B.color === Pe ? "" : B.color).join(",")
+    }), x({
+      formula1: Er(W.map((H) => H.label)),
+      formula2: W.map((H) => H.color === Le ? "" : H.color).join(",")
     });
-  }, [H, F, u, v, y]);
-  const Z = na(
-    () => async (D) => {
-      if (!T(D)) {
-        F == null || F({
+  }, [b, x, h, v, D]);
+  const ae = oa(
+    () => async (y) => {
+      if (!F(y)) {
+        x == null || x({
           formula1: "",
           formula2: d
         });
         return;
       }
-      I.getFormulaRefCheck(D) ? (F == null || F({
-        formula1: T(D) ? D : "",
+      I.getFormulaRefCheck(y) ? (x == null || x({
+        formula1: F(y) ? y : "",
         formula2: d
-      }), A("")) : (F == null || F({
+      }), P("")) : (x == null || x({
         formula1: "",
         formula2: d
-      }), m("="), A(S.t("dataValidation.validFail.formulaError")));
+      }), m("="), P(S.t("dataValidation.validFail.formulaError")));
     },
-    [d, F]
+    [d, x]
   );
   return /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
     /* @__PURE__ */ p.jsx(K, { label: S.t("dataValidation.list.options"), children: /* @__PURE__ */ p.jsxs(
-      Ra,
+      Sa,
       {
-        value: u,
-        onChange: (D) => {
-          h(D), m(v), D === "1" && F({
+        value: h,
+        onChange: (y) => {
+          u(y), m(v), y === "1" && x({
             formula1: v === "=" ? "" : v,
-            formula2: y.join(",")
+            formula2: D.join(",")
           });
         },
         children: [
-          /* @__PURE__ */ p.jsx(xe, { value: "0", children: S.t("dataValidation.list.customOptions") }),
-          /* @__PURE__ */ p.jsx(xe, { value: "1", children: S.t("dataValidation.list.refOptions") })
+          /* @__PURE__ */ p.jsx(Pe, { value: "0", children: S.t("dataValidation.list.customOptions") }),
+          /* @__PURE__ */ p.jsx(Pe, { value: "1", children: S.t("dataValidation.list.refOptions") })
         ]
       }
     ) }),
-    u === "1" ? /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
-      /* @__PURE__ */ p.jsx(K, { error: j || N, children: /* @__PURE__ */ p.jsx(
-        rr,
+    h === "1" ? /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
+      /* @__PURE__ */ p.jsx(K, { error: B || A, children: /* @__PURE__ */ p.jsx(
+        nr,
         {
           id: fa(`list-ref-range-${t}-${r}`),
           value: f,
           openForSheetUnitId: t,
           openForSheetSubUnitId: r,
           onlyInputFormula: !0,
-          onChange: async (D) => {
-            const U = D != null ? D : "";
-            R(U), Z(U);
+          onChange: async (y) => {
+            const W = y != null ? y : "";
+            R(W), ae(W);
           }
         }
       ) }),
-      /* @__PURE__ */ p.jsx(K, { children: /* @__PURE__ */ p.jsx("div", { ref: c, children: P.map((D) => /* @__PURE__ */ p.jsx(Ba, { item: D, commonProps: { onItemChange: k }, style: { marginBottom: 12 } }, D.id)) }) })
-    ] }) : /* @__PURE__ */ p.jsx(K, { error: j, children: /* @__PURE__ */ p.jsxs("div", { ref: c, style: { marginTop: "-12px" }, children: [
+      /* @__PURE__ */ p.jsx(K, { children: /* @__PURE__ */ p.jsx("div", { ref: c, children: O.map((y) => /* @__PURE__ */ p.jsx(Ba, { item: y, commonProps: { onItemChange: z }, style: { marginBottom: 12 } }, y.id)) }) })
+    ] }) : /* @__PURE__ */ p.jsx(K, { error: B, children: /* @__PURE__ */ p.jsxs("div", { ref: c, style: { marginTop: "-12px" }, children: [
       /* @__PURE__ */ p.jsx(
-        Wo,
+        qo,
         {
-          list: H,
-          onListChange: x,
+          list: b,
+          onListChange: k,
           rowHeight: 32,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
-          itemRender: (D) => /* @__PURE__ */ p.jsx(
+          itemRender: (y) => /* @__PURE__ */ p.jsx(
             Ba,
             {
-              item: D,
+              item: y,
               commonProps: {
                 onItemChange: ee,
-                onItemDelete: G
+                onItemDelete: Y
               }
             },
-            D.id
+            y.id
           ),
           idKey: "id"
         }
       ),
-      /* @__PURE__ */ p.jsxs("a", { className: oe.dataValidationFormulaListAdd, onClick: Y, children: [
-        /* @__PURE__ */ p.jsx(Tn, {}),
+      /* @__PURE__ */ p.jsxs("a", { className: oe.dataValidationFormulaListAdd, onClick: $, children: [
+        /* @__PURE__ */ p.jsx(Nn, {}),
         S.t("dataValidation.list.add")
       ] })
     ] }) })
   ] });
 }
-function Si(o) {
-  const { value: a, onChange: e, showError: t, validResult: r } = o, n = O(le), i = t ? r == null ? void 0 : r.formula1 : "", s = t ? r == null ? void 0 : r.formula2 : "", [l, d] = Q(!((a == null ? void 0 : a.formula1) === void 0 && (a == null ? void 0 : a.formula2) === void 0));
+function Ri(o) {
+  const { value: a, onChange: e, showError: t, validResult: r } = o, n = T(le), i = t ? r == null ? void 0 : r.formula1 : "", s = t ? r == null ? void 0 : r.formula2 : "", [l, d] = Q(!((a == null ? void 0 : a.formula1) === void 0 && (a == null ? void 0 : a.formula2) === void 0));
   return /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
     /* @__PURE__ */ p.jsx(K, { children: /* @__PURE__ */ p.jsx(
       lr,
@@ -1228,7 +1223,7 @@ function Si(o) {
       }
     ) }),
     l ? /* @__PURE__ */ p.jsx(K, { label: n.t("dataValidation.checkbox.checked"), error: i, children: /* @__PURE__ */ p.jsx(
-      je,
+      Ae,
       {
         className: oe.dataValidationFormula,
         placeholder: n.t("dataValidation.panel.formulaPlaceholder"),
@@ -1242,7 +1237,7 @@ function Si(o) {
       }
     ) }) : null,
     l ? /* @__PURE__ */ p.jsx(K, { label: n.t("dataValidation.checkbox.unchecked"), error: s, children: /* @__PURE__ */ p.jsx(
-      je,
+      Ae,
       {
         className: oe.dataValidationFormula,
         placeholder: n.t("dataValidation.panel.formulaPlaceholder"),
@@ -1257,22 +1252,22 @@ function Si(o) {
     ) }) : null
   ] });
 }
-const Or = "data-validation.custom-formula-input", ut = "data-validation.formula-input", br = "data-validation.list-formula-input", Tr = "data-validation.checkbox-formula-input", Ri = [
+const Or = "data-validation.custom-formula-input", ut = "data-validation.formula-input", br = "data-validation.list-formula-input", Tr = "data-validation.checkbox-formula-input", Ci = [
   [
     Or,
-    ti
+    ai
   ],
   [
     ut,
-    ui
+    hi
   ],
   [
     br,
-    _i
+    Si
   ],
   [
     Tr,
-    Si
+    Ri
   ]
 ];
 class ht {
@@ -1297,17 +1292,17 @@ class ht {
   updateRuleRanges(a, e, t, r, n) {
     const i = this._ensureCache(a, e);
     n.forEach((s) => {
-      q.foreach(s, (l, d) => {
+      G.foreach(s, (l, d) => {
         const c = i.getValue(l, d);
         c && (c.temp = !0);
       });
     }), r.forEach((s) => {
-      q.foreach(s, (l, d) => {
+      G.foreach(s, (l, d) => {
         const c = i.getValue(l, d);
         c && c.ruleId === t ? c.temp = !1 : i.setValue(l, d, void 0);
       });
     }), n.forEach((s) => {
-      q.foreach(s, (l, d) => {
+      G.foreach(s, (l, d) => {
         const c = i.getValue(l, d);
         c && c.temp === !0 && i.realDeleteValue(l, d);
       });
@@ -1316,7 +1311,7 @@ class ht {
   markRangeDirty(a, e, t) {
     const r = this._ensureCache(a, e);
     t.forEach((n) => {
-      q.foreach(n, (i, s) => {
+      G.foreach(n, (i, s) => {
         r.setValue(i, s, void 0);
       });
     });
@@ -1327,7 +1322,7 @@ class ht {
   _deleteRange(a, e, t) {
     const r = this._ensureCache(a, e);
     t.forEach((n) => {
-      q.foreach(n, (i, s) => {
+      G.foreach(n, (i, s) => {
         r.realDeleteValue(i, s);
       });
     });
@@ -1339,10 +1334,10 @@ class ht {
     return this._ensureCache(a, e).setValue(t, r, n);
   }
 }
-var Ci = Object.defineProperty, Vi = Object.getOwnPropertyDescriptor, Mi = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Vi(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+var Vi = Object.defineProperty, Mi = Object.getOwnPropertyDescriptor, wi = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Mi(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && Ci(a, e, r), r;
+  return t && r && Vi(a, e, r), r;
 }, pt = (o, a) => (e, t) => a(e, t, o);
 let Ke = class extends me {
   constructor(a, e, t, r) {
@@ -1366,8 +1361,8 @@ let Ke = class extends me {
           const n = t[r], { formulaCellMap: i, ruleFormulaMap: s } = this._ensureMaps(e, r), l = this._dataValidationModel.ensureManager(e, r);
           n.forEach((d) => {
             var f, m;
-            const c = s.get((f = d.extra) == null ? void 0 : f.ruleId), u = i.get(d.formulaId), h = l.getRuleById((m = d.extra) == null ? void 0 : m.ruleId);
-            h && c && !c.isTransformable && this._dataValidationCacheService.markRangeDirty(e, r, h.ranges), u && this._dataValidationCacheService.markCellDirty(e, r, u.row, u.column);
+            const c = s.get((f = d.extra) == null ? void 0 : f.ruleId), h = i.get(d.formulaId), u = l.getRuleById((m = d.extra) == null ? void 0 : m.ruleId);
+            u && c && !c.isTransformable && this._dataValidationCacheService.markRangeDirty(e, r, u.ranges), h && this._dataValidationCacheService.markCellDirty(e, r, h.row, h.column);
           });
         }
       }
@@ -1389,11 +1384,11 @@ let Ke = class extends me {
   deleteByRuleId(a, e, t) {
     const { formulaMap: r, formulaCellMap: n, ruleFormulaMap: i } = this._ensureMaps(a, e), s = this._dataValidationModel.getRuleById(a, e, t), l = /* @__PURE__ */ new Set(), d = i.get(t);
     !s || !d || (i.delete(t), s.ranges.forEach((c) => {
-      q.foreach(c, (u, h) => {
-        const f = r.getValue(u, h);
+      G.foreach(c, (h, u) => {
+        const f = r.getValue(h, u);
         if (f && f.ruleId === t) {
           const { formulaId: m } = f;
-          r.realDeleteValue(u, h), l.add(m), n.delete(m);
+          r.realDeleteValue(h, u), l.add(m), n.delete(m);
         }
       });
     }), this._registerOtherFormulaService.deleteFormula(a, e, Array.from(l.values())));
@@ -1402,18 +1397,18 @@ let Ke = class extends me {
     const { formulaMap: i, ruleFormulaMap: s, formulaCellMap: l } = this._ensureMaps(a, e);
     if (!r)
       return;
-    const d = Xo(
+    const d = Jo(
       this._lexerTreeBuilder,
       r
-    ), c = n[0].startRow, u = n[0].startColumn;
-    let h;
+    ), c = n[0].startRow, h = n[0].startColumn;
+    let u;
     d ? n.forEach((f) => {
-      q.foreach(f, (m, v) => {
-        const R = Pa(
+      G.foreach(f, (m, v) => {
+        const R = Aa(
           this._lexerTreeBuilder,
           r,
           c,
-          u,
+          h,
           m,
           v
         ), S = this._registerFormula(a, e, t, R);
@@ -1423,51 +1418,51 @@ let Ke = class extends me {
           ruleId: t
         }), l.set(S, { row: m, column: v });
       });
-    }) : (h = this._registerFormula(a, e, t, r), n.forEach((f) => {
-      q.foreach(f, (m, v) => {
+    }) : (u = this._registerFormula(a, e, t, r), n.forEach((f) => {
+      G.foreach(f, (m, v) => {
         i.setValue(m, v, {
-          formulaId: h,
+          formulaId: u,
           // formulaText: formula,
           ruleId: t
         });
       });
     })), s.set(t, {
       formula: r,
-      originCol: u,
+      originCol: h,
       originRow: c,
       isTransformable: d,
-      formulaId: h
+      formulaId: u
     });
   }
   addRule(a, e, t) {
     const { ranges: r, formula1: n, uid: i, type: s } = t;
-    s !== z.CUSTOM || !n || !T(n) || this._addFormulaByRange(a, e, i, n, r);
+    s !== q.CUSTOM || !n || !F(n) || this._addFormulaByRange(a, e, i, n, r);
   }
   updateRuleRanges(a, e, t, r, n) {
     const { formulaMap: i, ruleFormulaMap: s, formulaCellMap: l } = this._ensureMaps(a, e), d = s.get(t);
     if (!d)
       return;
-    const { formula: c, originCol: u, originRow: h, isTransformable: f, formulaId: m } = d, v = /* @__PURE__ */ new Set();
+    const { formula: c, originCol: h, originRow: u, isTransformable: f, formulaId: m } = d, v = /* @__PURE__ */ new Set();
     r.forEach((R) => {
-      q.foreach(R, (S, M) => {
-        const _ = i.getValue(S, M);
+      G.foreach(R, (S, V) => {
+        const _ = i.getValue(S, V);
         _ && _.ruleId === t && (_.temp = !0);
       });
     }), n.forEach((R) => {
-      q.foreach(R, (S, M) => {
+      G.foreach(R, (S, V) => {
         var I;
-        const _ = (I = i.getValue(S, M)) != null ? I : {};
+        const _ = (I = i.getValue(S, V)) != null ? I : {};
         if (_.ruleId !== t) {
-          const y = s.get(_.ruleId);
-          if (y != null && y.isTransformable && v.add(_.formulaId), f) {
-            const E = Pa(this._lexerTreeBuilder, c, h, u, S, M), L = this._registerFormula(a, e, t, E);
-            i.setValue(S, M, {
+          const D = s.get(_.ruleId);
+          if (D != null && D.isTransformable && v.add(_.formulaId), f) {
+            const N = Aa(this._lexerTreeBuilder, c, u, h, S, V), E = this._registerFormula(a, e, t, N);
+            i.setValue(S, V, {
               // formulaText: relativeText,
               ruleId: t,
-              formulaId: L
-            }), l.set(L, { row: S, column: M });
+              formulaId: E
+            }), l.set(E, { row: S, column: V });
           } else
-            i.setValue(S, M, {
+            i.setValue(S, V, {
               // formulaText: formula,
               ruleId: t,
               formulaId: m
@@ -1476,9 +1471,9 @@ let Ke = class extends me {
           _.temp = !1;
       });
     }), r.forEach((R) => {
-      q.foreach(R, (S, M) => {
-        const _ = i.getValue(S, M);
-        _ && _.ruleId === t && _.temp === !0 && (i.realDeleteValue(S, M), f && v.add(_.formulaId));
+      G.foreach(R, (S, V) => {
+        const _ = i.getValue(S, V);
+        _ && _.ruleId === t && _.temp === !0 && (i.realDeleteValue(S, V), f && v.add(_.formulaId));
       });
     }), v.forEach((R) => {
       l.delete(R);
@@ -1497,20 +1492,20 @@ let Ke = class extends me {
     return r.get(t);
   }
 };
-Ke = Mi([
-  pt(0, V(hr)),
-  pt(1, V(Ca)),
-  pt(2, V(J)),
-  pt(3, V(ht))
+Ke = wi([
+  pt(0, w(hr)),
+  pt(1, w(Ra)),
+  pt(2, w(Z)),
+  pt(3, w(ht))
 ], Ke);
 function Me(o) {
   var a, e;
   return (e = (a = o == null ? void 0 : o[0]) == null ? void 0 : a[0]) == null ? void 0 : e.v;
 }
-class wi extends We {
+class Ii extends $e {
   constructor() {
     super(...arguments);
-    g(this, "id", z.CUSTOM);
+    g(this, "id", q.CUSTOM);
     g(this, "title", "dataValidation.custom.title");
     g(this, "operators", []);
     g(this, "scopes", ["sheet"]);
@@ -1518,7 +1513,7 @@ class wi extends We {
     g(this, "_customFormulaService", this.injector.get(Ke));
   }
   validatorFormula(e) {
-    const t = T(e.formula1);
+    const t = F(e.formula1);
     return {
       success: t,
       formula1: t ? "" : this.localeService.t("dataValidation.validFail.formula")
@@ -1538,11 +1533,11 @@ class wi extends We {
     return this.localeService.t("dataValidation.custom.error");
   }
 }
-var Ii = Object.defineProperty, yi = Object.getOwnPropertyDescriptor, Di = (o, a, e, t) => {
+var Di = Object.defineProperty, yi = Object.getOwnPropertyDescriptor, Ei = (o, a, e, t) => {
   for (var r = t > 1 ? void 0 : t ? yi(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && Ii(a, e, r), r;
-}, Ut = (o, a) => (e, t) => a(e, t, o);
+  return t && r && Di(a, e, r), r;
+}, Bt = (o, a) => (e, t) => a(e, t, o);
 let he = class extends me {
   constructor(a, e, t) {
     super();
@@ -1558,8 +1553,8 @@ let he = class extends me {
           n.forEach((l) => {
             var d, c;
             if (i.get((d = l.extra) == null ? void 0 : d.ruleId)) {
-              const u = s.getRuleById((c = l.extra) == null ? void 0 : c.ruleId);
-              u && this._dataValidationCacheService.markRangeDirty(e, r, u.ranges);
+              const h = s.getRuleById((c = l.extra) == null ? void 0 : c.ruleId);
+              h && this._dataValidationCacheService.markRangeDirty(e, r, h.ranges);
             }
           });
         }
@@ -1573,7 +1568,7 @@ let he = class extends me {
     return r || (r = /* @__PURE__ */ new Map(), t.set(e, r)), r;
   }
   addRule(a, e, t, r, n) {
-    const i = T(r), s = T(n);
+    const i = F(r), s = F(n);
     if (!i && !s)
       return;
     const l = this._ensureRuleFormulaMap(a, e), d = [void 0, void 0];
@@ -1602,7 +1597,7 @@ let he = class extends me {
     }
     const [l, d] = s;
     if ((l == null ? void 0 : l.text) !== r)
-      if (l && this._registerOtherFormulaService.deleteFormula(a, e, [l.id]), T(r)) {
+      if (l && this._registerOtherFormulaService.deleteFormula(a, e, [l.id]), F(r)) {
         const c = this._registerOtherFormulaService.registerFormula(a, e, r, { ruleId: t });
         s[0] = {
           text: r,
@@ -1611,7 +1606,7 @@ let he = class extends me {
       } else
         s[0] = void 0;
     if ((d == null ? void 0 : d.text) !== n)
-      if (d && this._registerOtherFormulaService.deleteFormula(a, e, [d.id]), T(n)) {
+      if (d && this._registerOtherFormulaService.deleteFormula(a, e, [d.id]), F(n)) {
         const c = this._registerOtherFormulaService.registerFormula(a, e, n, { ruleId: t });
         s[1] = {
           text: n,
@@ -1642,23 +1637,23 @@ let he = class extends me {
     return this._ensureRuleFormulaMap(a, e).get(t);
   }
 };
-he = Di([
-  Ut(0, V(hr)),
-  Ut(1, V(ht)),
-  Ut(2, V(J))
+he = Ei([
+  Bt(0, w(hr)),
+  Bt(1, w(ht)),
+  Bt(2, w(Z))
 ], he);
-var Ei = Object.defineProperty, Oi = Object.getOwnPropertyDescriptor, bi = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Oi(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+var Oi = Object.defineProperty, bi = Object.getOwnPropertyDescriptor, Ti = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? bi(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && Ei(a, e, r), r;
-}, Wt = (o, a) => (e, t) => a(e, t, o);
+  return t && r && Oi(a, e, r), r;
+}, $t = (o, a) => (e, t) => a(e, t, o);
 const vt = 6;
-let sa = class {
+let ia = class {
   constructor(o, a, e) {
     this._commandService = o, this._formulaService = a, this._themeService = e;
   }
   _calc(o, a) {
-    var d, c, u;
+    var d, c, h;
     const { vt: e, ht: t } = a || {}, r = o.endX - o.startX - vt * 2, n = o.endY - o.startY, i = ((d = a == null ? void 0 : a.fs) != null ? d : 10) * 1.6;
     let s = 0, l = 0;
     switch (e) {
@@ -1687,7 +1682,7 @@ let sa = class {
       left: o.startX + s,
       top: o.startY + l,
       width: ((c = a == null ? void 0 : a.fs) != null ? c : 10) * 1.6,
-      height: ((u = a == null ? void 0 : a.fs) != null ? u : 10) * 1.6
+      height: ((h = a == null ? void 0 : a.fs) != null ? h : 10) * 1.6
     };
   }
   calcCellAutoHeight(o) {
@@ -1697,21 +1692,21 @@ let sa = class {
   }
   async _parseFormula(o, a, e) {
     var i, s;
-    const { formula1: t = bt, formula2: r = la } = o, n = await this._formulaService.getRuleFormulaResult(a, e, o.uid);
+    const { formula1: t = Et, formula2: r = sa } = o, n = await this._formulaService.getRuleFormulaResult(a, e, o.uid);
     return {
-      formula1: T(t) ? Me((i = n == null ? void 0 : n[0]) == null ? void 0 : i.result) : t,
-      formula2: T(r) ? Me((s = n == null ? void 0 : n[1]) == null ? void 0 : s.result) : r
+      formula1: F(t) ? Me((i = n == null ? void 0 : n[0]) == null ? void 0 : i.result) : t,
+      formula2: F(r) ? Me((s = n == null ? void 0 : n[1]) == null ? void 0 : s.result) : r
     };
   }
   drawWith(o, a) {
-    var W, N, A, j, X, F;
-    const { style: e, data: t, primaryWithCoord: r, unitId: n, subUnitId: i } = a, s = r.isMergedMainCell ? r.mergeInfo : r, l = se(t), d = (W = t.dataValidation) == null ? void 0 : W.rule, c = (N = t.dataValidation) == null ? void 0 : N.validator;
-    if (!d || !c || (A = t.dataValidation) != null && A.isSkip)
+    var j, A, P, B, X;
+    const { style: e, data: t, primaryWithCoord: r, unitId: n, subUnitId: i } = a, s = r.isMergedMainCell ? r.mergeInfo : r, l = ne(t), d = (j = t.dataValidation) == null ? void 0 : j.rule, c = (A = t.dataValidation) == null ? void 0 : A.validator;
+    if (!d || !c)
       return;
-    const u = this._themeService.getCurrentTheme();
+    const h = this._themeService.getCurrentTheme();
     if (!c.skipDefaultFontRender(d, l, { unitId: n, subUnitId: i }))
       return;
-    const { formula1: h = bt } = d, f = this._calc(s, e), { a: m, d: v } = o.getTransform(), R = La(f.left, m), S = La(f.top, v), M = Eo.create().composeMatrix({
+    const { formula1: u = Et } = d, f = this._calc(s, e), { a: m, d: v } = o.getTransform(), R = La(f.left, m), S = La(f.top, v), V = $o.create().composeMatrix({
       left: R,
       top: S,
       scaleX: 1,
@@ -1723,14 +1718,14 @@ let sa = class {
       flipY: !1
     }), _ = s.endX - s.startX, I = s.endY - s.startY;
     o.save(), o.beginPath(), o.rect(s.startX, s.startY, _, I), o.clip();
-    const y = M.getMatrix();
-    o.transform(y[0], y[1], y[2], y[3], y[4], y[5]);
-    const E = ((j = e == null ? void 0 : e.fs) != null ? j : 10) * 1.6, L = String(l) === String(h), b = u.hyacinth500;
-    Oo.drawWith(o, {
-      checked: L,
-      width: E,
-      height: E,
-      fill: (F = (X = e == null ? void 0 : e.cl) == null ? void 0 : X.rgb) != null ? F : b
+    const D = V.getMatrix();
+    o.transform(D[0], D[1], D[2], D[3], D[4], D[5]);
+    const N = ((P = e == null ? void 0 : e.fs) != null ? P : 10) * 1.6, E = String(l) === String(u), L = h.hyacinth500;
+    Uo.drawWith(o, {
+      checked: E,
+      width: N,
+      height: N,
+      fill: (X = (B = e == null ? void 0 : e.cl) == null ? void 0 : B.rgb) != null ? X : L
     }), o.restore();
   }
   isHit(o, a) {
@@ -1738,13 +1733,13 @@ let sa = class {
     return l <= s && l >= i && d <= n && d >= r;
   }
   async onPointerDown(o, a) {
-    var h, f;
+    var u, f;
     if (a.button === 2)
       return;
-    const { primaryWithCoord: e, unitId: t, subUnitId: r, data: n } = o, i = se(n), s = (h = n.dataValidation) == null ? void 0 : h.rule, l = (f = n.dataValidation) == null ? void 0 : f.validator;
+    const { primaryWithCoord: e, unitId: t, subUnitId: r, data: n } = o, i = ne(n), s = (u = n.dataValidation) == null ? void 0 : u.rule, l = (f = n.dataValidation) == null ? void 0 : f.validator;
     if (!s || !l || !l.skipDefaultFontRender(s, i, { unitId: t, subUnitId: r }))
       return;
-    const { formula1: d, formula2: c } = await this._parseFormula(s, t, r), u = {
+    const { formula1: d, formula2: c } = await this._parseFormula(s, t, r), h = {
       range: {
         startColumn: e.actualColumn,
         endColumn: e.actualColumn,
@@ -1757,26 +1752,26 @@ let sa = class {
       }
     };
     this._commandService.executeCommand(
-      _a.id,
-      u
+      pa.id,
+      h
     );
   }
 };
-sa = bi([
-  Wt(0, te),
-  Wt(1, V(he)),
-  Wt(2, V(Xr))
-], sa);
-const bt = 1, la = 0;
-class Ti extends We {
+ia = Ti([
+  $t(0, te),
+  $t(1, w(he)),
+  $t(2, w(zr))
+], ia);
+const Et = 1, sa = 0;
+class Ni extends $e {
   constructor() {
     super(...arguments);
-    g(this, "id", z.CHECKBOX);
+    g(this, "id", q.CHECKBOX);
     g(this, "title", "dataValidation.checkbox.title");
     g(this, "operators", []);
     g(this, "scopes", ["sheet"]);
     g(this, "formulaInput", Tr);
-    g(this, "canvasRender", this.injector.createInstance(sa));
+    g(this, "canvasRender", this.injector.createInstance(ia));
     g(this, "_formulaService", this.injector.get(he));
   }
   skipDefaultFontRender(e, t, r) {
@@ -1784,7 +1779,7 @@ class Ti extends We {
     return !s || s === `${n}` || s === `${i}`;
   }
   validatorFormula(e) {
-    const { formula1: t, formula2: r } = e, n = !$.isBlank(t), i = !$.isBlank(r), s = t === r;
+    const { formula1: t, formula2: r } = e, n = !U.isBlank(t), i = !U.isBlank(r), s = t === r;
     return {
       success: n && i && !s || !n && !i,
       formula1: n ? s ? this.localeService.t("dataValidation.validFail.checkboxEqual") : "" : this.localeService.t("dataValidation.validFail.common"),
@@ -1793,23 +1788,23 @@ class Ti extends We {
   }
   async parseFormula(e, t, r) {
     var l, d;
-    const { formula1: n = bt, formula2: i = la } = e, s = await this._formulaService.getRuleFormulaResult(t, r, e.uid);
+    const { formula1: n = Et, formula2: i = sa } = e, s = await this._formulaService.getRuleFormulaResult(t, r, e.uid);
     return {
-      formula1: T(n) ? Me((l = s == null ? void 0 : s[0]) == null ? void 0 : l.result) : n,
-      formula2: T(i) ? Me((d = s == null ? void 0 : s[1]) == null ? void 0 : d.result) : i
+      formula1: F(n) ? Me((l = s == null ? void 0 : s[0]) == null ? void 0 : l.result) : n,
+      formula2: F(i) ? Me((d = s == null ? void 0 : s[1]) == null ? void 0 : d.result) : i
     };
   }
   parseFormulaSync(e, t, r) {
     var l, d;
-    const { formula1: n = bt, formula2: i = la } = e, s = this._formulaService.getRuleFormulaResultSync(t, r, e.uid);
+    const { formula1: n = Et, formula2: i = sa } = e, s = this._formulaService.getRuleFormulaResultSync(t, r, e.uid);
     return {
-      formula1: T(n) ? Me((l = s == null ? void 0 : s[0]) == null ? void 0 : l.result) : n,
-      formula2: T(i) ? Me((d = s == null ? void 0 : s[1]) == null ? void 0 : d.result) : i
+      formula1: F(n) ? Me((l = s == null ? void 0 : s[0]) == null ? void 0 : l.result) : n,
+      formula2: F(i) ? Me((d = s == null ? void 0 : s[1]) == null ? void 0 : d.result) : i
     };
   }
   async isValidType(e, t, r) {
     const { value: n, unitId: i, subUnitId: s } = e, { formula1: l, formula2: d } = await this.parseFormula(r, i, s);
-    return !$.isDefine(l) || !$.isDefine(d) ? !0 : $.isDefine(n) && (String(n) === String(l) || String(n) === String(d));
+    return !U.isDefine(l) || !U.isDefine(d) ? !0 : U.isDefine(n) && (String(n) === String(l) || String(n) === String(d));
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.checkbox.error");
@@ -1818,7 +1813,7 @@ class Ti extends We {
 const st = [
   C.BETWEEN,
   C.NOT_BETWEEN
-], Ht = 86400;
+], Ut = 86400;
 function Fi(o, a = !0) {
   if (a && o >= 0) {
     if (o === 0)
@@ -1838,14 +1833,14 @@ function Fi(o, a = !0) {
   const s = n + 2 - 12 * e;
   return [100 * (t - 49) + r + e | 0, s | 0, i | 0];
 }
-const Ni = (o) => {
+const Li = (o) => {
   let a = o | 0;
-  const e = Ht * (o - a);
+  const e = Ut * (o - a);
   let t = Math.floor(e);
-  e - t > 0.9999 && (t += 1, t === Ht && (t = 0, a += 1));
-  const r = t < 0 ? Ht + t : t, [n, i, s] = Fi(o, !0), l = Math.floor(r / 60 / 60) % 60, d = Math.floor(r / 60) % 60, c = Math.floor(r) % 60, u = /* @__PURE__ */ new Date(0);
-  return u.setUTCFullYear(n, i - 1, s), u.setUTCHours(l, d, c), u.getTime();
-}, Li = {
+  e - t > 0.9999 && (t += 1, t === Ut && (t = 0, a += 1));
+  const r = t < 0 ? Ut + t : t, [n, i, s] = Fi(o, !0), l = Math.floor(r / 60 / 60) % 60, d = Math.floor(r / 60) % 60, c = Math.floor(r) % 60, h = /* @__PURE__ */ new Date(0);
+  return h.setUTCFullYear(n, i - 1, s), h.setUTCHours(l, d, c), h.getTime();
+}, Pi = {
   [C.BETWEEN]: "dataValidation.date.operators.between",
   [C.EQUAL]: "dataValidation.date.operators.equal",
   [C.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
@@ -1865,7 +1860,7 @@ const Ai = {
   [C.LESS_THAN_OR_EQUAL]: "dataValidation.date.ruleName.lessThanOrEqual",
   [C.NOT_BETWEEN]: "dataValidation.date.ruleName.notBetween",
   [C.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual"
-}, Pi = {
+}, xi = {
   [C.BETWEEN]: "dataValidation.date.errorMsg.between",
   [C.EQUAL]: "dataValidation.date.errorMsg.equal",
   [C.GREATER_THAN]: "dataValidation.date.errorMsg.greaterThan",
@@ -1874,14 +1869,14 @@ const Ai = {
   [C.LESS_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.lessThanOrEqual",
   [C.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
   [C.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual"
-}, $a = "{FORMULA1}", Ua = "{FORMULA2}", Wa = (o) => Be(o).isValid(), gt = (o) => {
+}, $a = "{FORMULA1}", Ua = "{FORMULA2}", Wa = (o) => xe(o).isValid(), gt = (o) => {
   if (!(o == null || typeof o == "boolean"))
-    return typeof o == "number" || !Number.isNaN(+o) ? Be(Ni(+o)) : Be(o);
+    return typeof o == "number" || !Number.isNaN(+o) ? xe(Li(+o)) : xe(o);
 };
-class xi extends We {
+class ji extends $e {
   constructor() {
     super(...arguments);
-    g(this, "id", z.DATE);
+    g(this, "id", q.DATE);
     g(this, "title", "dataValidation.date.title");
     g(this, "operators", [
       C.BETWEEN,
@@ -1903,16 +1898,16 @@ class xi extends We {
     var l, d;
     const n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), { formula1: i, formula2: s } = e;
     return {
-      formula1: gt(T(i) ? Me((l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) : i),
-      formula2: gt(T(s) ? Me((d = n == null ? void 0 : n[1]) == null ? void 0 : d.result) : s)
+      formula1: gt(F(i) ? Me((l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) : i),
+      formula2: gt(F(s) ? Me((d = n == null ? void 0 : n[1]) == null ? void 0 : d.result) : s)
     };
   }
   async isValidType(e) {
     const { value: t } = e;
-    return typeof t == "string" ? Be(t).isValid() : typeof t == "number";
+    return typeof t == "string" ? xe(t).isValid() : typeof t == "number";
   }
   _validatorSingleFormula(e) {
-    return !$.isBlank(e) && (T(e) || !Number.isNaN(+e) || !!e && Be(e).isValid());
+    return !U.isBlank(e) && (F(e) || !Number.isNaN(+e) || !!e && xe(e).isValid());
   }
   validatorFormula(e) {
     const t = e.operator;
@@ -1980,18 +1975,18 @@ class xi extends We {
     return n ? r.isBefore(n) || r.isSame(n) : !0;
   }
   validatorFormulaValue(e) {
-    if (!$.isDefine(e.operator))
+    if (!U.isDefine(e.operator))
       return;
     if (st.includes(e.operator)) {
-      if ($.isBlank(e.formula1) || $.isBlank(e.formula2))
+      if (U.isBlank(e.formula1) || U.isBlank(e.formula2))
         return "";
       if (!Wa(e.formula1) || !Wa(e.formula2))
         return "";
-    } else if ($.isBlank(e.formula1))
+    } else if (U.isBlank(e.formula1))
       return "";
   }
   get operatorNames() {
-    return this.operators.map((e) => this.localeService.t(Li[e]));
+    return this.operators.map((e) => this.localeService.t(Pi[e]));
   }
   generateRuleName(e) {
     var r, n;
@@ -2002,16 +1997,16 @@ class xi extends We {
   }
   generateRuleErrorMessage(e) {
     var r, n;
-    return e.operator ? `${this.localeService.t(Pi[e.operator]).replace($a, (r = e.formula1) != null ? r : "").replace(Ua, (n = e.formula2) != null ? n : "")}` : this.titleStr;
+    return e.operator ? `${this.localeService.t(xi[e.operator]).replace($a, (r = e.formula1) != null ? r : "").replace(Ua, (n = e.formula2) != null ? n : "")}` : this.titleStr;
   }
 }
-var ji = Object.defineProperty, Bi = Object.getOwnPropertyDescriptor, $i = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Bi(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+var Bi = Object.defineProperty, $i = Object.getOwnPropertyDescriptor, Ui = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? $i(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && ji(a, e, r), r;
+  return t && r && Bi(a, e, r), r;
 }, Ha = (o, a) => (e, t) => a(e, t, o);
-const ke = 4, Ui = 6, fe = 14, Ne = 6, Re = 2, Wi = "#565656", ka = 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 Hi(o, a) {
+const He = 4, Wi = 6, fe = 14, Ne = 6, Se = 2, Hi = "#565656", ka = 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 ki(o, a) {
   const e = o.length;
   return {
     id: "d",
@@ -2051,10 +2046,10 @@ function Hi(o, a) {
     }
   };
 }
-function da(o, a, e) {
-  const t = Hi(o, e), r = new qr(t), n = new bo(r);
+function la(o, a, e) {
+  const t = ki(o, e), r = new Qr(t), n = new Wo(r);
   return {
-    documentSkeleton: To.create(n, a),
+    documentSkeleton: Ho.create(n, a),
     docModel: r,
     docViewModel: n
   };
@@ -2064,9 +2059,9 @@ function Ya(o, a, e) {
     documentSkeleton: t,
     docModel: r,
     docViewModel: n
-  } = da(o, a, e);
+  } = la(o, a, e);
   return {
-    documents: new Fo(`DOCUMENTS_${$.generateRandomId()}`, t, {
+    documents: new ko(`DOCUMENTS_${U.generateRandomId()}`, t, {
       pageMarginLeft: 0,
       pageMarginTop: 0
     }),
@@ -2075,8 +2070,8 @@ function Ya(o, a, e) {
     docViewModel: n
   };
 }
-var Kt;
-let ca = (Kt = class {
+var Qt;
+let da = (Qt = class {
   constructor(o, a) {
     g(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     g(this, "zIndex");
@@ -2106,122 +2101,122 @@ let ca = (Kt = class {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(o, a, e) {
-    var X, F, H;
-    const { primaryWithCoord: t, row: r, col: n, style: i, data: s, subUnitId: l } = a, d = t.isMergedMainCell ? t.mergeInfo : t, c = (X = s.dataValidation) == null ? void 0 : X.rule, u = (F = s.dataValidation) == null ? void 0 : F.validator, h = s.fontRenderExtension, { leftOffset: f = 0, rightOffset: m = 0, topOffset: v = 0, downOffset: R = 0 } = h || {};
-    if (!c || !u || !u.skipDefaultFontRender(c) || (H = s.dataValidation) != null && H.isSkip)
+    var X, x;
+    const { primaryWithCoord: t, row: r, col: n, style: i, data: s, subUnitId: l } = a, d = t.isMergedMainCell ? t.mergeInfo : t, c = (X = s.dataValidation) == null ? void 0 : X.rule, h = (x = s.dataValidation) == null ? void 0 : x.validator, u = s.fontRenderExtension, { leftOffset: f = 0, rightOffset: m = 0, topOffset: v = 0, downOffset: R = 0 } = u || {};
+    if (!c || !h || !h.skipDefaultFontRender(c))
       return;
     const S = {
       startX: d.startX + f,
       endX: d.endX - m,
       startY: d.startY + v,
       endY: d.endY - R
-    }, M = S.endX - S.startX, _ = S.endY - S.startY, I = this._ensureMap(l), y = this._generateKey(r, n), E = u.getListWithColor(c), L = se(s), b = `${L != null ? L : ""}`, W = E.find((x) => x.label === b);
-    let { tb: N, vt: A, ht: j } = i || {};
-    if (N = N != null ? N : ve.WRAP, A = A != null ? A : re.TOP, j = j != null ? j : Ve.LEFT, c.renderMode === ce.ARROW) {
-      this._drawDownIcon(o, S, M, _, A), o.save(), o.translateWithPrecision(S.startX, S.startY), o.beginPath(), o.rect(0, 0, M, _), o.clip();
-      const x = M - fe, { documentSkeleton: ee, documents: G, docModel: w } = Ya(b, this._localeService, i);
-      N === ve.WRAP && w.updateDocumentDataPageSize(Math.max(x, 1)), ee.calculate(), ee.getActualSize();
-      const P = mt(ee), { height: k, width: Y } = P;
-      let Z = 0;
-      switch (A) {
+    }, V = S.endX - S.startX, _ = S.endY - S.startY, I = this._ensureMap(l), D = this._generateKey(r, n), N = h.getListWithColor(c), E = ne(s), L = `${E != null ? E : ""}`, j = N.find((b) => b.label === L);
+    let { tb: A, vt: P, ht: B } = i || {};
+    if (A = A != null ? A : pe.WRAP, P = P != null ? P : re.TOP, B = B != null ? B : Ve.LEFT, c.renderMode === ue.ARROW) {
+      this._drawDownIcon(o, S, V, _, P), o.save(), o.translateWithPrecision(S.startX, S.startY), o.beginPath(), o.rect(0, 0, V, _), o.clip();
+      const b = V - fe, { documentSkeleton: k, documents: ee, docModel: Y } = Ya(L, this._localeService, i);
+      A === pe.WRAP && Y.updateDocumentDataPageSize(Math.max(b, 1)), k.calculate(), k.getActualSize();
+      const M = mt(k), { height: O, width: z } = M;
+      let $ = 0;
+      switch (P) {
         case re.BOTTOM:
-          Z = _ - Re - k;
+          $ = _ - Se - O;
           break;
         case re.MIDDLE:
-          Z = (_ - Re - k) / 2;
+          $ = (_ - Se - O) / 2;
           break;
         default:
-          Z = Re;
+          $ = Se;
           break;
       }
-      let D = 0;
-      switch (j) {
+      let ae = 0;
+      switch (B) {
         case Ve.CENTER:
-          D = (x - Y) / 2;
+          ae = (b - z) / 2;
           break;
         case Ve.RIGHT:
-          D = x - Y;
+          ae = b - z;
           break;
       }
-      o.translate(0, Z), o.save(), o.translateWithPrecision(ke, 0), o.beginPath(), o.rect(0, 0, x, k), o.clip(), G.render(o), o.translateWithPrecision(D, 0), o.restore(), o.restore(), I.set(y, {
+      o.translate(0, $), o.save(), o.translateWithPrecision(He, 0), o.beginPath(), o.rect(0, 0, b, O), o.clip(), ee.render(o), o.translateWithPrecision(ae, 0), o.restore(), o.restore(), I.set(D, {
         left: S.endX + e.rowHeaderWidth - fe,
         top: S.startY + e.columnHeaderHeight,
         width: fe,
         height: _
       });
     } else {
-      o.save(), o.translateWithPrecision(S.startX, S.startY), o.beginPath(), o.rect(0, 0, M, _), o.clip();
-      const x = M - Ne * 2 - ke - fe, { documentSkeleton: ee, documents: G, docModel: w } = Ya(b, this._localeService, i);
-      N === ve.WRAP && w.updateDocumentDataPageSize(Math.max(x, 1)), ee.calculate();
-      const P = mt(ee), { height: k, width: Y } = P;
-      let Z = 0;
-      switch (A) {
+      o.save(), o.translateWithPrecision(S.startX, S.startY), o.beginPath(), o.rect(0, 0, V, _), o.clip();
+      const b = V - Ne * 2 - He - fe, { documentSkeleton: k, documents: ee, docModel: Y } = Ya(L, this._localeService, i);
+      A === pe.WRAP && Y.updateDocumentDataPageSize(Math.max(b, 1)), k.calculate();
+      const M = mt(k), { height: O, width: z } = M;
+      let $ = 0;
+      switch (P) {
         case re.BOTTOM:
-          Z = _ - Re - k;
+          $ = _ - Se - O;
           break;
         case re.MIDDLE:
-          Z = (_ - Re - k) / 2;
+          $ = (_ - Se - O) / 2;
           break;
         default:
-          Z = Re;
+          $ = Se;
           break;
       }
-      let D = 0;
-      switch (j) {
+      let ae = 0;
+      switch (B) {
         case Ve.CENTER:
-          D = (x - Y) / 2;
+          ae = (b - z) / 2;
           break;
         case Ve.RIGHT:
-          D = x - Y;
+          ae = b - z;
           break;
       }
-      o.translate(Ne, Z);
-      const U = Math.max(M - Ne * 2, 1), B = k;
-      nr.drawWith(o, {
-        width: U,
-        height: B,
-        fill: (W == null ? void 0 : W.color) || Pe,
+      o.translate(Ne, $);
+      const y = Math.max(V - Ne * 2, 1), W = O;
+      sr.drawWith(o, {
+        width: y,
+        height: W,
+        fill: (j == null ? void 0 : j.color) || Le,
         radius: 8
-      }), o.save(), o.translateWithPrecision(ke, 0), o.beginPath(), o.rect(0, 0, x, k), o.clip(), o.translateWithPrecision(D, 0), G.render(o), o.restore(), o.translate(x + ke + 4, (k - Ui) / 2), o.fillStyle = Wi, o.fill(ka), o.restore(), I.set(y, {
+      }), o.save(), o.translateWithPrecision(He, 0), o.beginPath(), o.rect(0, 0, b, O), o.clip(), o.translateWithPrecision(ae, 0), ee.render(o), o.restore(), o.translate(b + He + 4, (O - Wi) / 2), o.fillStyle = Hi, o.fill(ka), o.restore(), I.set(D, {
         left: S.startX + Ne + e.rowHeaderWidth,
-        top: S.startY + Z + e.columnHeaderHeight,
-        width: U,
-        height: B
+        top: S.startY + $ + e.columnHeaderHeight,
+        width: y,
+        height: W
       });
     }
   }
   calcCellAutoHeight(o) {
     var R;
     const { primaryWithCoord: a, style: e, data: t } = o, r = a.isMergedMainCell ? a.mergeInfo : a, n = t.fontRenderExtension, { leftOffset: i = 0, rightOffset: s = 0, topOffset: l = 0, downOffset: d = 0 } = n || {}, c = (R = t.dataValidation) == null ? void 0 : R.rule;
-    if (!c || c.renderMode === ce.TEXT)
+    if (!c || c.renderMode === ue.TEXT)
       return;
-    const u = {
+    const h = {
       startX: r.startX + i,
       endX: r.endX - s,
       startY: r.startY + l,
       endY: r.endY - d
-    }, h = u.endX - u.startX, f = se(t), m = `${f != null ? f : ""}`;
+    }, u = h.endX - h.startX, f = ne(t), m = `${f != null ? f : ""}`;
     let { tb: v } = e || {};
-    if (v = v != null ? v : ve.WRAP, c.renderMode === ce.ARROW) {
-      const S = h - fe, { documentSkeleton: M, docModel: _ } = da(m, this._localeService, e);
-      v === ve.WRAP && _.updateDocumentDataPageSize(Math.max(S, 1)), M.calculate(), M.getActualSize();
-      const I = mt(M), { height: y } = I;
-      return y;
+    if (v = v != null ? v : pe.WRAP, c.renderMode === ue.ARROW) {
+      const S = u - fe, { documentSkeleton: V, docModel: _ } = la(m, this._localeService, e);
+      v === pe.WRAP && _.updateDocumentDataPageSize(Math.max(S, 1)), V.calculate(), V.getActualSize();
+      const I = mt(V), { height: D } = I;
+      return D;
     } else {
-      const S = h - Ne * 2 - ke - fe, { documentSkeleton: M, docModel: _ } = da(m, this._localeService, e);
-      v === ve.WRAP && _.updateDocumentDataPageSize(Math.max(S, 1)), M.calculate();
-      const I = mt(M), {
-        height: y
+      const S = u - Ne * 2 - He - fe, { documentSkeleton: V, docModel: _ } = la(m, this._localeService, e);
+      v === pe.WRAP && _.updateDocumentDataPageSize(Math.max(S, 1)), V.calculate();
+      const I = mt(V), {
+        height: D
       } = I;
-      return y + Re * 2;
+      return D + Se * 2;
     }
   }
   isHit(o, a) {
     const { data: e, subUnitId: t, row: r, col: n } = a, s = this._ensureMap(t).get(this._generateKey(r, n)), l = e.dataValidation;
-    if (!l || !s || l.rule.renderMode === ce.TEXT)
+    if (!l || !s || l.rule.renderMode === ue.TEXT)
       return !1;
-    const { top: d, left: c, width: u, height: h } = s, { x: f, y: m } = o;
-    return f >= c && f <= c + u && m >= d && m <= d + h;
+    const { top: d, left: c, width: h, height: u } = s, { x: f, y: m } = o;
+    return f >= c && f <= c + h && m >= d && m <= d + u;
   }
   onPointerDown(o, a) {
     if (a.button === 2)
@@ -2232,74 +2227,74 @@ let ca = (Kt = class {
       row: r,
       column: n
     };
-    this._commandService.executeCommand(Va.id, i);
+    this._commandService.executeCommand(Ca.id, i);
   }
-}, g(Kt, "padding", {
-  l: Ne + ke,
+}, g(Qt, "padding", {
+  l: Ne + He,
   r: fe + Ne,
-  t: Re,
-  b: Re
-}), Kt);
-ca = $i([
-  Ha(0, V(le)),
+  t: Se,
+  b: Se
+}), Qt);
+da = Ui([
+  Ha(0, w(le)),
   Ha(1, te)
-], ca);
-const ki = "LIST_RENDER_MODE_OPTION_INPUT";
-function Tt(o) {
+], da);
+const Yi = "LIST_RENDER_MODE_OPTION_INPUT";
+function Ot(o) {
   var r;
-  const { value: a, onChange: e } = o, t = O(le);
-  return /* @__PURE__ */ p.jsx(K, { label: t.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ p.jsxs(Ra, { value: `${(r = a.renderMode) != null ? r : ce.CUSTOM}`, onChange: (n) => e({ ...a, renderMode: +n }), children: [
-    /* @__PURE__ */ p.jsx(xe, { value: `${ce.CUSTOM}`, children: t.t("dataValidation.renderMode.chip") }),
-    /* @__PURE__ */ p.jsx(xe, { value: `${ce.ARROW}`, children: t.t("dataValidation.renderMode.arrow") }),
-    /* @__PURE__ */ p.jsx(xe, { value: `${ce.TEXT}`, children: t.t("dataValidation.renderMode.text") })
+  const { value: a, onChange: e } = o, t = T(le);
+  return /* @__PURE__ */ p.jsx(K, { label: t.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ p.jsxs(Sa, { value: `${(r = a.renderMode) != null ? r : ue.CUSTOM}`, onChange: (n) => e({ ...a, renderMode: +n }), children: [
+    /* @__PURE__ */ p.jsx(Pe, { value: `${ue.CUSTOM}`, children: t.t("dataValidation.renderMode.chip") }),
+    /* @__PURE__ */ p.jsx(Pe, { value: `${ue.ARROW}`, children: t.t("dataValidation.renderMode.arrow") }),
+    /* @__PURE__ */ p.jsx(Pe, { value: `${ue.TEXT}`, children: t.t("dataValidation.renderMode.text") })
   ] }) });
 }
-Tt.componentKey = ki;
-function kt(o) {
+Ot.componentKey = Yi;
+function Wt(o) {
   if (!o)
     return [];
   const a = /* @__PURE__ */ new Set();
   return o.forEach(
     (e) => {
       e.forEach((t) => {
-        const r = se(t);
+        const r = ne(t);
         r != null && a.add(r.toString());
       });
     }
   ), [...a];
 }
-const Yi = [
+const Gi = [
   "if",
   "indirect",
   "choose",
   "offset"
 ];
-function Gi(o, a) {
-  if (!T(o) || cr(o.slice(1)))
+function Xi(o, a) {
+  if (!F(o) || cr(o.slice(1)))
     return !0;
   const t = a.sequenceNodesBuilder(o);
-  return t && t.some((r) => typeof r == "object" && r.nodeType === qo.FUNCTION && Yi.indexOf(r.token.toLowerCase()) > -1);
+  return t && t.some((r) => typeof r == "object" && r.nodeType === en.FUNCTION && Gi.indexOf(r.token.toLowerCase()) > -1);
 }
-class Fr extends We {
+class Nr extends $e {
   constructor() {
     super(...arguments);
     g(this, "formulaService", this.injector.get(he));
-    g(this, "_lexer", this.injector.get(Ca));
-    g(this, "id", z.LIST);
+    g(this, "_lexer", this.injector.get(Ra));
+    g(this, "id", q.LIST);
     g(this, "title", "dataValidation.list.title");
     g(this, "operators", []);
     g(this, "scopes", ["sheet"]);
     g(this, "formulaInput", br);
-    g(this, "canvasRender", this.injector.createInstance(ca));
-    g(this, "dropdown", Pr);
-    g(this, "optionsInput", Tt.componentKey);
+    g(this, "canvasRender", this.injector.createInstance(da));
+    g(this, "dropdown", Ar);
+    g(this, "optionsInput", Ot.componentKey);
   }
   skipDefaultFontRender(e) {
-    return e.renderMode !== ce.TEXT;
+    return e.renderMode !== ue.TEXT;
   }
   validatorFormula(e) {
     var n;
-    const t = !$.isBlank(e.formula1), r = Gi((n = e.formula1) != null ? n : "", this._lexer);
+    const t = !U.isBlank(e.formula1), r = Xi((n = e.formula1) != null ? n : "", this._lexer);
     return {
       success: !!(t && r),
       formula1: t ? r ? void 0 : this.localeService.t("dataValidation.validFail.listInvalid") : this.localeService.t("dataValidation.validFail.list")
@@ -2313,7 +2308,7 @@ class Fr extends We {
     var s;
     const { formula1: n = "" } = e, i = await this.formulaService.getRuleFormulaResult(t, r, e.uid);
     return {
-      formula1: T(n) ? kt((s = i == null ? void 0 : i[0]) == null ? void 0 : s.result) : Ge(n),
+      formula1: F(n) ? Wt((s = i == null ? void 0 : i[0]) == null ? void 0 : s.result) : Ge(n),
       formula2: void 0
     };
   }
@@ -2328,20 +2323,20 @@ class Fr extends We {
     return this.localeService.t("dataValidation.list.error");
   }
   getList(e, t, r) {
-    var h, f, m;
-    const { formula1: n = "" } = e, i = this.injector.get(ne), s = (h = t ? i.getUniverSheetInstance(t) : void 0) != null ? h : i.getCurrentUnitForType(ue.UNIVER_SHEET);
+    var u, f, m;
+    const { formula1: n = "" } = e, i = this.injector.get(ie), s = (u = t ? i.getUniverSheetInstance(t) : void 0) != null ? u : i.getCurrentUnitForType(se.UNIVER_SHEET);
     if (!s)
       return [];
-    const l = (f = r ? s.getSheetBySheetId(r) : void 0) != null ? f : s.getActiveSheet(), d = s.getUnitId(), c = l.getSheetId(), u = this.formulaService.getRuleFormulaResultSync(d, c, e.uid);
-    return T(n) ? kt((m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) : Ge(n);
+    const l = (f = r ? s.getSheetBySheetId(r) : void 0) != null ? f : s.getActiveSheet(), d = s.getUnitId(), c = l.getSheetId(), h = this.formulaService.getRuleFormulaResultSync(d, c, e.uid);
+    return F(n) ? Wt((m = h == null ? void 0 : h[0]) == null ? void 0 : m.result) : Ge(n);
   }
   async getListAsync(e, t, r) {
-    var h, f, m;
-    const { formula1: n = "" } = e, i = this.injector.get(ne), s = (h = t ? i.getUniverSheetInstance(t) : void 0) != null ? h : i.getCurrentUnitForType(ue.UNIVER_SHEET);
+    var u, f, m;
+    const { formula1: n = "" } = e, i = this.injector.get(ie), s = (u = t ? i.getUniverSheetInstance(t) : void 0) != null ? u : i.getCurrentUnitForType(se.UNIVER_SHEET);
     if (!s)
       return [];
-    const l = (f = r ? s.getSheetBySheetId(r) : void 0) != null ? f : s.getActiveSheet(), d = s.getUnitId(), c = l.getSheetId(), u = await this.formulaService.getRuleFormulaResult(d, c, e.uid);
-    return T(n) ? kt((m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) : Ge(n);
+    const l = (f = r ? s.getSheetBySheetId(r) : void 0) != null ? f : s.getActiveSheet(), d = s.getUnitId(), c = l.getSheetId(), h = await this.formulaService.getRuleFormulaResult(d, c, e.uid);
+    return F(n) ? Wt((m = h == null ? void 0 : h[0]) == null ? void 0 : m.result) : Ge(n);
   }
   getListWithColor(e, t, r) {
     const n = this.getList(e, t, r), i = (e.formula2 || "").split(",");
@@ -2354,15 +2349,15 @@ class Fr extends We {
     }), i;
   }
 }
-function Ft(o) {
+function bt(o) {
   let a = o;
   return typeof o == "string" ? ((o.startsWith("¥") || o.startsWith("$")) && (a = o.slice(1)), +a) : +o;
 }
-class Xi extends We {
+class qi extends $e {
   constructor() {
     super(...arguments);
     g(this, "_formulaService", this.injector.get(he));
-    g(this, "id", z.DECIMAL);
+    g(this, "id", q.DECIMAL);
     g(this, "title", "dataValidation.decimal.title");
     g(this, "operators", [
       C.BETWEEN,
@@ -2379,28 +2374,28 @@ class Xi extends We {
     g(this, "dropDownInput");
   }
   _isFormulaOrNumber(e) {
-    return !$.isBlank(e) && (T(e) || !Number.isNaN(+e));
+    return !U.isBlank(e) && (F(e) || !Number.isNaN(+e));
   }
   async isValidType(e, t, r) {
     const { value: n } = e;
-    return !Number.isNaN(Ft(n));
+    return !Number.isNaN(bt(n));
   }
   transform(e, t, r) {
     const { value: n } = e;
     return {
       ...e,
-      value: Ft(n)
+      value: bt(n)
     };
   }
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
   async parseFormula(e, t, r) {
-    var d, c, u, h, f, m, v, R;
+    var d, c, h, u, f, m, v, R;
     const n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), { formula1: i, formula2: s } = e;
     return {
-      formula1: this._parseNumber(T(i) ? (h = (u = (c = (d = n == null ? void 0 : n[0]) == null ? void 0 : d.result) == null ? void 0 : c[0]) == null ? void 0 : u[0]) == null ? void 0 : h.v : i),
-      formula2: this._parseNumber(T(s) ? (R = (v = (m = (f = n == null ? void 0 : n[1]) == null ? void 0 : f.result) == null ? void 0 : m[0]) == null ? void 0 : v[0]) == null ? void 0 : R.v : s)
+      formula1: this._parseNumber(F(i) ? (u = (h = (c = (d = n == null ? void 0 : n[0]) == null ? void 0 : d.result) == null ? void 0 : c[0]) == null ? void 0 : h[0]) == null ? void 0 : u.v : i),
+      formula2: this._parseNumber(F(s) ? (R = (v = (m = (f = n == null ? void 0 : n[1]) == null ? void 0 : f.result) == null ? void 0 : m[0]) == null ? void 0 : v[0]) == null ? void 0 : R.v : s)
     };
   }
   validatorFormula(e) {
@@ -2409,7 +2404,7 @@ class Xi extends We {
       return {
         success: !1
       };
-    const r = $.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = $.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), i = st.includes(t), s = this.localeService.t("dataValidation.validFail.number");
+    const r = U.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), n = U.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), i = st.includes(t), s = this.localeService.t("dataValidation.validFail.number");
     return i ? {
       success: r && n,
       formula1: r ? void 0 : s,
@@ -2458,11 +2453,11 @@ class Xi extends We {
     return Number.isNaN(n) ? !0 : e.value <= n;
   }
 }
-const qi = "{FORMULA1}", zi = "{FORMULA2}";
-class Qi extends We {
+const zi = "{FORMULA1}", Qi = "{FORMULA2}";
+class Ki extends $e {
   constructor() {
     super(...arguments);
-    g(this, "id", z.TEXT_LENGTH);
+    g(this, "id", q.TEXT_LENGTH);
     g(this, "title", "dataValidation.textLength.title");
     g(this, "operators", [
       C.BETWEEN,
@@ -2479,7 +2474,7 @@ class Qi extends We {
     g(this, "_formulaService", this.injector.get(he));
   }
   _isFormulaOrInt(e) {
-    return !$.isBlank(e) && (T(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !U.isBlank(e) && (F(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   validatorFormula(e) {
     const t = e.operator;
@@ -2487,7 +2482,7 @@ class Qi extends We {
       return {
         success: !1
       };
-    const r = $.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = $.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), i = st.includes(t), s = this.localeService.t("dataValidation.validFail.number");
+    const r = U.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = U.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), i = st.includes(t), s = this.localeService.t("dataValidation.validFail.number");
     return i ? {
       success: r && n,
       formula1: r ? void 0 : s,
@@ -2504,11 +2499,11 @@ class Qi extends We {
     return !Number.isNaN(e);
   }
   async parseFormula(e, t, r) {
-    var l, d, c, u, h, f, m, v;
+    var l, d, c, h, u, f, m, v;
     const n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), { formula1: i, formula2: s } = e;
     return {
-      formula1: this._parseNumber(T(i) ? (u = (c = (d = (l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) == null ? void 0 : d[0]) == null ? void 0 : c[0]) == null ? void 0 : u.v : i),
-      formula2: this._parseNumber(T(s) ? (v = (m = (f = (h = n == null ? void 0 : n[1]) == null ? void 0 : h.result) == null ? void 0 : f[0]) == null ? void 0 : m[0]) == null ? void 0 : v.v : s)
+      formula1: this._parseNumber(F(i) ? (h = (c = (d = (l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) == null ? void 0 : d[0]) == null ? void 0 : c[0]) == null ? void 0 : h.v : i),
+      formula2: this._parseNumber(F(s) ? (v = (m = (f = (u = n == null ? void 0 : n[1]) == null ? void 0 : u.result) == null ? void 0 : f[0]) == null ? void 0 : m[0]) == null ? void 0 : v.v : s)
     };
   }
   transform(e, t, r) {
@@ -2523,11 +2518,11 @@ class Qi extends We {
   }
   async validatorIsEqual(e, t, r) {
     const { formula1: n } = t;
-    return $.isDefine(n) ? e.value === n : !1;
+    return U.isDefine(n) ? e.value === n : !1;
   }
   async validatorIsNotEqual(e, t, r) {
     const { formula1: n } = t;
-    return $.isDefine(n) ? e.value !== n : !1;
+    return U.isDefine(n) ? e.value !== n : !1;
   }
   async validatorIsBetween(e, t, r) {
     const { formula1: n, formula2: i } = t, { value: s } = e;
@@ -2561,14 +2556,14 @@ class Qi extends We {
   }
   generateRuleErrorMessage(e) {
     var r, n;
-    return e.operator ? `${this.localeService.t(ao[e.operator]).replace(qi, (r = e.formula1) != null ? r : "").replace(zi, (n = e.formula2) != null ? n : "")}` : this.titleStr;
+    return e.operator ? `${this.localeService.t(no[e.operator]).replace(zi, (r = e.formula1) != null ? r : "").replace(Qi, (n = e.formula2) != null ? n : "")}` : this.titleStr;
   }
 }
-class Ki extends We {
+class Zi extends $e {
   constructor() {
     super(...arguments);
     g(this, "_formulaService", this.injector.get(he));
-    g(this, "id", z.WHOLE);
+    g(this, "id", q.WHOLE);
     g(this, "title", "dataValidation.whole.title");
     g(this, "operators", [
       C.BETWEEN,
@@ -2585,28 +2580,28 @@ class Ki extends We {
     g(this, "dropDownInput");
   }
   _isFormulaOrInt(e) {
-    return !$.isBlank(e) && (T(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !U.isBlank(e) && (F(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   async isValidType(e, t, r) {
-    const { value: n } = e, i = Ft(n);
+    const { value: n } = e, i = bt(n);
     return !Number.isNaN(i) && Number.isInteger(i);
   }
   transform(e, t, r) {
     const { value: n } = e;
     return {
       ...e,
-      value: Ft(n)
+      value: bt(n)
     };
   }
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
   async parseFormula(e, t, r) {
-    var d, c, u, h, f, m, v, R;
+    var d, c, h, u, f, m, v, R;
     const n = await this._formulaService.getRuleFormulaResult(t, r, e.uid), { formula1: i, formula2: s } = e;
     return {
-      formula1: this._parseNumber(T(i) ? (h = (u = (c = (d = n == null ? void 0 : n[0]) == null ? void 0 : d.result) == null ? void 0 : c[0]) == null ? void 0 : u[0]) == null ? void 0 : h.v : i),
-      formula2: this._parseNumber(T(s) ? (R = (v = (m = (f = n == null ? void 0 : n[1]) == null ? void 0 : f.result) == null ? void 0 : m[0]) == null ? void 0 : v[0]) == null ? void 0 : R.v : s)
+      formula1: this._parseNumber(F(i) ? (u = (h = (c = (d = n == null ? void 0 : n[0]) == null ? void 0 : d.result) == null ? void 0 : c[0]) == null ? void 0 : h[0]) == null ? void 0 : u.v : i),
+      formula2: this._parseNumber(F(s) ? (R = (v = (m = (f = n == null ? void 0 : n[1]) == null ? void 0 : f.result) == null ? void 0 : m[0]) == null ? void 0 : v[0]) == null ? void 0 : R.v : s)
     };
   }
   validatorFormula(e) {
@@ -2615,7 +2610,7 @@ class Ki extends We {
       return {
         success: !1
       };
-    const r = $.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = $.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), i = st.includes(t), s = this.localeService.t("dataValidation.validFail.number");
+    const r = U.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), n = U.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), i = st.includes(t), s = this.localeService.t("dataValidation.validFail.number");
     return i ? {
       success: r && n,
       formula1: r ? void 0 : s,
@@ -2664,26 +2659,26 @@ class Ki extends We {
     return Number.isNaN(n) ? !0 : e.value <= n;
   }
 }
-const Nr = 4, Zi = 0, Yt = 4, Lr = 4, ua = 6, Nt = 6, Le = 14;
-function Ji(o, a) {
-  const e = No.getTextSize(o, a), t = e.width + Nr * 2, { ba: r, bd: n } = e, i = r + n;
+const Fr = 4, Ji = 0, Ht = 4, Lr = 4, ca = 6, Tt = 6, Fe = 14;
+function es(o, a) {
+  const e = Yo.getTextSize(o, a), t = e.width + Fr * 2, { ba: r, bd: n } = e, i = r + n;
   return {
     width: t,
-    height: i + Zi * 2,
+    height: i + Ji * 2,
     ba: r
   };
 }
 function Ga(o, a, e, t) {
-  const r = e - Le - ua, n = t - Nt * 2, i = o.map((c) => ({
-    layout: Ji(c, a),
+  const r = e - Fe - ca, n = t - Tt * 2, i = o.map((c) => ({
+    layout: es(c, a),
     text: c
   }));
   let s;
   const l = [];
   i.forEach((c) => {
-    const { layout: u } = c, { width: h, height: f } = u;
-    !s || s.width + h + Yt > r ? (s = {
-      width: h,
+    const { layout: h } = c, { width: u, height: f } = h;
+    !s || s.width + u + Ht > r ? (s = {
+      width: u,
       height: f,
       items: [{
         ...c,
@@ -2691,39 +2686,39 @@ function Ga(o, a, e, t) {
       }]
     }, l.push(s)) : (s.items.push({
       ...c,
-      left: s.width + Yt
-    }), s.width = s.width + h + Yt);
+      left: s.width + Ht
+    }), s.width = s.width + u + Ht);
   });
   let d = 0;
-  return l.forEach((c, u) => {
-    u === l.length - 1 ? d += c.height : d += c.height + Lr;
+  return l.forEach((c, h) => {
+    h === l.length - 1 ? d += c.height : d += c.height + Lr;
   }), {
     lines: l,
     totalHeight: d,
     contentWidth: r,
     contentHeight: n,
-    cellAutoHeight: d + Nt * 2
+    cellAutoHeight: d + Tt * 2
   };
 }
-const es = 8;
-class ts extends Lo {
+const ts = 8;
+class as extends Go {
   static drawWith(a, e) {
     const { fontFamily: t, fontString: r, fontSize: n, info: i, fill: s, color: l } = e, { layout: d, text: c } = i;
-    a.save(), nr.drawWith(a, {
+    a.save(), sr.drawWith(a, {
       width: d.width,
       height: d.height,
-      radius: es,
-      fill: s || Pe
-    }), a.translateWithPrecision(Nr, d.ba), a.font = r, a.fillStyle = l, a.fillText(c, 0, 0), a.restore();
+      radius: ts,
+      fill: s || Le
+    }), a.translateWithPrecision(Fr, d.ba), a.font = r, a.fillStyle = l, a.fillText(c, 0, 0), a.restore();
   }
 }
-var as = Object.defineProperty, rs = Object.getOwnPropertyDescriptor, os = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? rs(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+var rs = Object.defineProperty, os = Object.getOwnPropertyDescriptor, ns = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? os(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && as(a, e, r), r;
-}, ns = (o, a) => (e, t) => a(e, t, o);
-const is = 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 ha = class {
+  return t && r && rs(a, e, r), r;
+}, is = (o, a) => (e, t) => a(e, t, o);
+const ss = 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 ua = class {
   constructor(o) {
     g(this, "zIndex");
     g(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
@@ -2737,65 +2732,65 @@ let ha = class {
     return `${o}.${a}`;
   }
   _drawDownIcon(o, a, e, t, r) {
-    const n = e - Le + 4;
+    const n = e - Fe + 4;
     let i = 4;
     switch (r) {
       case re.MIDDLE:
-        i = (t - Le) / 2 + 4;
+        i = (t - Fe) / 2 + 4;
         break;
       case re.BOTTOM:
-        i = t - Le + 4;
+        i = t - Fe + 4;
         break;
     }
-    o.save(), o.translateWithPrecision(a.startX + n, a.startY + i), o.fillStyle = "#565656", o.fill(is), o.restore();
+    o.save(), o.translateWithPrecision(a.startX + n, a.startY + i), o.fillStyle = "#565656", o.fill(ss), o.restore();
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(o, a, e, t) {
-    var P, k, Y;
-    const { primaryWithCoord: r, row: n, col: i, style: s, data: l, subUnitId: d } = a, c = r.isMergedMainCell ? r.mergeInfo : r, u = l.fontRenderExtension, { leftOffset: h = 0, rightOffset: f = 0, topOffset: m = 0, downOffset: v = 0 } = u || {}, R = l.dataValidation, S = this._ensureMap(d), M = this._generateKey(n, i);
-    if (!R || (P = l.dataValidation) != null && P.isSkip)
+    var O, z;
+    const { primaryWithCoord: r, row: n, col: i, style: s, data: l, subUnitId: d } = a, c = r.isMergedMainCell ? r.mergeInfo : r, h = l.fontRenderExtension, { leftOffset: u = 0, rightOffset: f = 0, topOffset: m = 0, downOffset: v = 0 } = h || {}, R = l.dataValidation, S = this._ensureMap(d), V = this._generateKey(n, i);
+    if (!R)
       return;
     const _ = {
-      startX: c.startX + h,
+      startX: c.startX + u,
       endX: c.endX - f,
       startY: c.startY + m,
       endY: c.endY - v
-    }, I = _.endX - _.startX, y = _.endY - _.startY, { cl: E } = s || {}, L = (k = typeof E == "object" ? E == null ? void 0 : E.rgb : E) != null ? k : "#000", b = Aa(s != null ? s : void 0), { rule: W, validator: N } = R, A = N, { vt: j, ht: X } = s || {}, F = j != null ? j : re.MIDDLE, H = (Y = se(l)) != null ? Y : "", x = A.parseCellValue(H), ee = A.getListWithColorMap(W), G = Ga(x, b, I, y);
-    this._drawDownIcon(o, _, I, y, F), o.save(), o.translateWithPrecision(_.startX, _.startY), o.beginPath(), o.rect(0, 0, I - Le, y), o.clip(), o.translateWithPrecision(ua, Nt);
-    let w = 0;
-    switch (F) {
+    }, I = _.endX - _.startX, D = _.endY - _.startY, { cl: N } = s || {}, E = (O = typeof N == "object" ? N == null ? void 0 : N.rgb : N) != null ? O : "#000", L = Pa(s != null ? s : void 0), { rule: j, validator: A } = R, P = A, { vt: B, ht: X } = s || {}, x = B != null ? B : re.MIDDLE, b = (z = ne(l)) != null ? z : "", k = P.parseCellValue(b), ee = P.getListWithColorMap(j), Y = Ga(k, L, I, D);
+    this._drawDownIcon(o, _, I, D, x), o.save(), o.translateWithPrecision(_.startX, _.startY), o.beginPath(), o.rect(0, 0, I - Fe, D), o.clip(), o.translateWithPrecision(ca, Tt);
+    let M = 0;
+    switch (x) {
       case re.MIDDLE:
-        w = (G.contentHeight - G.totalHeight) / 2;
+        M = (Y.contentHeight - Y.totalHeight) / 2;
         break;
       case re.BOTTOM:
-        w = G.contentHeight - G.totalHeight;
+        M = Y.contentHeight - Y.totalHeight;
         break;
     }
-    o.translateWithPrecision(0, w), G.lines.forEach((Z, D) => {
+    o.translateWithPrecision(0, M), Y.lines.forEach(($, ae) => {
       o.save();
-      const { width: U, height: B, items: ae } = Z;
-      let Se = 0;
+      const { width: y, height: W, items: H } = $;
+      let J = 0;
       switch (X) {
         case Ve.RIGHT:
-          Se = G.contentWidth - U;
+          J = Y.contentWidth - y;
           break;
         case Ve.CENTER:
-          Se = (G.contentWidth - U) / 2;
+          J = (Y.contentWidth - y) / 2;
           break;
       }
-      o.translate(Se, D * (B + Lr)), ae.forEach((At) => {
-        o.save(), o.translateWithPrecision(At.left, 0), ts.drawWith(o, {
-          ...b,
-          info: At,
-          color: L,
-          fill: ee[At.text]
+      o.translate(J, ae * (W + Lr)), H.forEach((_e) => {
+        o.save(), o.translateWithPrecision(_e.left, 0), as.drawWith(o, {
+          ...L,
+          info: _e,
+          color: E,
+          fill: ee[_e.text]
         }), o.restore();
       }), o.restore();
-    }), o.restore(), S.set(M, {
+    }), o.restore(), S.set(V, {
       left: _.startX,
       top: _.startY,
-      width: G.contentWidth + ua + Le,
-      height: G.contentHeight + Nt * 2
+      width: Y.contentWidth + ca + Fe,
+      height: Y.contentHeight + Tt * 2
     });
   }
   calcCellAutoHeight(o) {
@@ -2805,15 +2800,15 @@ let ha = class {
       endX: d.endX - i,
       startY: d.startY + s,
       endY: d.endY - l
-    }, u = t.dataValidation;
-    if (!u)
+    }, h = t.dataValidation;
+    if (!h)
       return;
-    const h = c.endX - c.startX, f = c.endY - c.startY, m = (I = se(t)) != null ? I : "", { validator: v } = u, S = v.parseCellValue(m), M = Aa(e != null ? e : void 0);
-    return Ga(S, M, h, f).cellAutoHeight;
+    const u = c.endX - c.startX, f = c.endY - c.startY, m = (I = ne(t)) != null ? I : "", { validator: v } = h, S = v.parseCellValue(m), V = Pa(e != null ? e : void 0);
+    return Ga(S, V, u, f).cellAutoHeight;
   }
   isHit(o, a) {
     const { primaryWithCoord: e } = a, t = e.isMergedMainCell ? e.mergeInfo : e, { endX: r } = t, { x: n } = o;
-    return n >= r - Le && n <= r;
+    return n >= r - Fe && n <= r;
   }
   onPointerDown(o, a) {
     if (a.button === 2)
@@ -2824,74 +2819,74 @@ let ha = class {
       row: r,
       column: n
     };
-    this._commandService.executeCommand(Va.id, i);
+    this._commandService.executeCommand(Ca.id, i);
   }
 };
-ha = os([
-  ns(0, te)
-], ha);
-class ss extends Fr {
+ua = ns([
+  is(0, te)
+], ua);
+class ls extends Nr {
   constructor() {
     super(...arguments);
-    g(this, "id", z.LIST_MULTIPLE);
+    g(this, "id", q.LIST_MULTIPLE);
     g(this, "title", "dataValidation.listMultiple.title");
-    g(this, "canvasRender", this.injector.createInstance(ha));
+    g(this, "canvasRender", this.injector.createInstance(ua));
   }
   skipDefaultFontRender() {
     return !0;
   }
 }
-const Ar = "data-validation-single", ya = "sheet.menu.data-validation";
-function ls(o) {
+const Pr = "data-validation-single", Ia = "sheet.menu.data-validation";
+function ds(o) {
   return {
-    id: ya,
-    type: pa.SUBITEMS,
-    positions: [co.TOOLBAR_START],
-    group: uo.TOOLBAR_FORMULAS_INSERT,
-    icon: Ar,
+    id: Ia,
+    type: ga.SUBITEMS,
+    positions: [Lo.TOOLBAR_START],
+    group: Po.TOOLBAR_FORMULAS_INSERT,
+    icon: Pr,
     tooltip: "dataValidation.title",
-    hidden$: ho(o, ue.UNIVER_SHEET),
-    disabled$: _o(o, { workbookTypes: [ea], worksheetTypes: [ta, aa], rangeTypes: [ra] })
+    hidden$: Ao(o, se.UNIVER_SHEET),
+    disabled$: Co(o, { workbookTypes: [Zt], worksheetTypes: [Jt, ea], rangeTypes: [ta] })
   };
 }
-function ds(o) {
+function cs(o) {
   return {
     id: ct.id,
     title: "dataValidation.panel.title",
-    type: pa.BUTTON,
-    positions: [ya]
+    type: ga.BUTTON,
+    positions: [Ia]
   };
 }
-function cs(o) {
+function us(o) {
   return {
     id: _r.id,
     title: "dataValidation.panel.add",
-    type: pa.BUTTON,
-    positions: [ya]
+    type: ga.BUTTON,
+    positions: [Ia]
   };
 }
-var us = Object.defineProperty, hs = Object.getOwnPropertyDescriptor, ms = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? hs(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+var hs = Object.defineProperty, ms = Object.getOwnPropertyDescriptor, fs = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? ms(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && us(a, e, r), r;
+  return t && r && hs(a, e, r), r;
 }, Ie = (o, a) => (e, t) => a(e, t, o);
 let rt = class extends Za {
   constructor(o, a, e, t, r, n, i, s) {
     super(), this._univerInstanceService = o, this._sheetDataValidationService = a, this._dataValidatorRegistryService = e, this._injector = t, this._componentManger = r, this._selectionManagerService = n, this._sheetInterceptorService = i, this._dataValidationModel = s, this._init();
   }
   _init() {
-    this._registerValidators(), this._initInstanceChange(), this._componentManger.register(Ar, Cr), this._initCommandInterceptor();
+    this._registerValidators(), this._initInstanceChange(), this._componentManger.register(Pr, Cr), this._initCommandInterceptor();
   }
   _registerValidators() {
     [
-      Xi,
+      qi,
+      Zi,
       Ki,
-      Qi,
-      xi,
-      Ti,
-      Fr,
-      ss,
-      wi
+      ji,
+      Ni,
+      Nr,
+      ls,
+      Ii
     ].forEach((o) => {
       const a = this._injector.createInstance(o);
       this.disposeWithMe(
@@ -2904,9 +2899,9 @@ let rt = class extends Za {
     });
   }
   _initInstanceChange() {
-    const o = new ma();
-    this._univerInstanceService.getCurrentTypeOfUnit$(ue.UNIVER_SHEET).subscribe((a) => {
-      o.dispose(), a && (this._sheetDataValidationService.switchCurrent(a.getUnitId(), a.getActiveSheet().getSheetId()), o.add(yt(
+    const o = new qa();
+    this._univerInstanceService.getCurrentTypeOfUnit$(se.UNIVER_SHEET).subscribe((a) => {
+      o.dispose(), a && (this._sheetDataValidationService.switchCurrent(a.getUnitId(), a.getActiveSheet().getSheetId()), o.add(ma(
         a.activeSheet$.subscribe((e) => {
           if (e) {
             const t = a.getUnitId(), r = e.getSheetId();
@@ -2919,8 +2914,8 @@ let rt = class extends Za {
   _initCommandInterceptor() {
     this._sheetInterceptorService.interceptCommand({
       getMutations: (o) => {
-        if (o.id === jo.id) {
-          const a = this._univerInstanceService.getCurrentUnitForType(ue.UNIVER_SHEET), e = a.getUnitId(), r = a.getActiveSheet().getSheetId(), n = this._selectionManagerService.getSelectionRanges(), i = this._dataValidationModel.ensureManager(e, r), s = i.getRuleObjectMatrix().clone();
+        if (o.id === fo.id) {
+          const a = this._univerInstanceService.getCurrentUnitForType(se.UNIVER_SHEET), e = a.getUnitId(), r = a.getActiveSheet().getSheetId(), n = this._selectionManagerService.getSelectionRanges(), i = this._dataValidationModel.ensureManager(e, r), s = i.getRuleObjectMatrix().clone();
           n && s.removeRange(n);
           const l = s.diff(i.getDataValidations()), { redoMutations: d, undoMutations: c } = Qe(e, r, l);
           return {
@@ -2936,34 +2931,34 @@ let rt = class extends Za {
     });
   }
 };
-rt = ms([
-  ge(_e.Rendered, rt),
-  Ie(0, ne),
-  Ie(1, V(Ot)),
-  Ie(2, V(Ee)),
-  Ie(3, V(Ue)),
-  Ie(4, V(dt)),
-  Ie(5, V(xo)),
-  Ie(6, V(sr)),
-  Ie(7, V(J))
+rt = fs([
+  ve(ge.Rendered, rt),
+  Ie(0, ie),
+  Ie(1, w(yt)),
+  Ie(2, w(Ee)),
+  Ie(3, w(Be)),
+  Ie(4, w(dt)),
+  Ie(5, w(mo)),
+  Ie(6, w(ar)),
+  Ie(7, w(Z))
 ], rt);
-const fs = "univer-data-validation-list-buttons", ps = "univer-data-validation-list-button", Gt = {
-  dataValidationListButtons: fs,
-  dataValidationListButton: ps
+const ps = "univer-data-validation-list-buttons", vs = "univer-data-validation-list-button", kt = {
+  dataValidationListButtons: ps,
+  dataValidationListButton: vs
 };
-function vs() {
-  const o = O(ne), a = Ze(
-    () => o.getCurrentTypeOfUnit$(ue.UNIVER_SHEET),
+function gs() {
+  const o = T(ie), a = Ze(
+    () => o.getCurrentTypeOfUnit$(se.UNIVER_SHEET),
     void 0,
     void 0,
     []
   );
-  return a ? /* @__PURE__ */ p.jsx(gs, { workbook: a }) : null;
+  return a ? /* @__PURE__ */ p.jsx(_s, { workbook: a }) : null;
 }
-function gs(o) {
-  const a = O(J), e = O(ne), t = O(te), r = O(Ue), n = O(we);
-  O(rt);
-  const i = O(le), [s, l] = Q([]), { workbook: d } = o, c = Ze(d.activeSheet$, void 0, !0), u = d.getUnitId(), h = c == null ? void 0 : c.getSheetId(), f = a.ensureManager(u, h);
+function _s(o) {
+  const a = T(Z), e = T(ie), t = T(te), r = T(Be), n = T(we);
+  T(rt);
+  const i = T(le), [s, l] = Q([]), { workbook: d } = o, c = Ze(d.activeSheet$, void 0, !0), h = d.getUnitId(), u = c == null ? void 0 : c.getSheetId(), f = a.ensureManager(h, u);
   Xe(() => {
     l(f.getDataValidations());
     const _ = f.dataValidations$.subscribe((I) => {
@@ -2975,49 +2970,49 @@ function gs(o) {
   }, [f]);
   const m = async () => {
     const _ = Ja(r), I = {
-      unitId: u,
-      subUnitId: h,
+      unitId: h,
+      subUnitId: u,
       rule: _
     };
-    await t.executeCommand(wa.id, I), n.setActiveRule({
-      unitId: u,
-      subUnitId: h,
+    await t.executeCommand(Ma.id, I), n.setActiveRule({
+      unitId: h,
+      subUnitId: u,
       rule: _
     });
   }, v = () => {
-    t.executeCommand(ro.id, {
-      unitId: u,
-      subUnitId: h
+    t.executeCommand(io.id, {
+      unitId: h,
+      subUnitId: u
     });
   }, S = ((_) => {
-    const y = e.getCurrentUnitForType(ue.UNIVER_SHEET).getActiveSheet();
-    return _.map((L) => {
-      const { ranges: b } = L;
-      return (b == null ? void 0 : b.some((N) => {
-        var H, x;
-        const { startRow: A, startColumn: j, endRow: X, endColumn: F } = N;
-        for (let ee = A; ee <= X; ee++)
-          for (let G = j; G <= F; G++) {
-            const w = (x = (H = y.getCell(ee, G)) == null ? void 0 : H.selectionProtection) == null ? void 0 : x[0];
-            if ((w == null ? void 0 : w[Et.Edit]) === !1 || (w == null ? void 0 : w[Et.View]) === !1)
+    const D = e.getCurrentUnitForType(se.UNIVER_SHEET).getActiveSheet();
+    return _.map((E) => {
+      const { ranges: L } = E;
+      return (L == null ? void 0 : L.some((A) => {
+        var b, k;
+        const { startRow: P, startColumn: B, endRow: X, endColumn: x } = A;
+        for (let ee = P; ee <= X; ee++)
+          for (let Y = B; Y <= x; Y++) {
+            const M = (k = (b = D.getCell(ee, Y)) == null ? void 0 : b.selectionProtection) == null ? void 0 : k[0];
+            if ((M == null ? void 0 : M[Dt.Edit]) === !1 || (M == null ? void 0 : M[Dt.View]) === !1)
               return !0;
           }
         return !1;
-      })) ? { ...L, disable: !0 } : { ...L };
+      })) ? { ...E, disable: !0 } : { ...E };
     });
-  })(s), M = S == null ? void 0 : S.some((_) => _.disable);
+  })(s), V = S == null ? void 0 : S.some((_) => _.disable);
   return /* @__PURE__ */ p.jsxs("div", { children: [
     S == null ? void 0 : S.map((_) => {
       var I;
       return /* @__PURE__ */ p.jsx(
-        Qn,
+        Kn,
         {
-          unitId: u,
-          subUnitId: h,
+          unitId: h,
+          subUnitId: u,
           onClick: () => {
             _.disable || n.setActiveRule({
-              unitId: u,
-              subUnitId: h,
+              unitId: h,
+              subUnitId: u,
               rule: _
             });
           },
@@ -3027,69 +3022,69 @@ function gs(o) {
         _.uid
       );
     }),
-    /* @__PURE__ */ p.jsxs("div", { className: Gt.dataValidationListButtons, children: [
-      s.length && !M ? /* @__PURE__ */ p.jsx(ze, { className: Gt.dataValidationListButton, onClick: v, children: i.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ p.jsx(ze, { className: Gt.dataValidationListButton, type: "primary", onClick: m, children: i.t("dataValidation.panel.add") })
+    /* @__PURE__ */ p.jsxs("div", { className: kt.dataValidationListButtons, children: [
+      s.length && !V ? /* @__PURE__ */ p.jsx(ze, { className: kt.dataValidationListButton, onClick: v, children: i.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ p.jsx(ze, { className: kt.dataValidationListButton, type: "primary", onClick: m, children: i.t("dataValidation.panel.add") })
     ] })
   ] });
 }
-const _s = () => {
-  const o = O(we), a = Ze(o.activeRule$, o.activeRule);
-  return a ? /* @__PURE__ */ p.jsx(Yn, {}, a.rule.uid) : /* @__PURE__ */ p.jsx(vs, {});
-}, Ss = "univer-dv-list-dropdown", Rs = "univer-dv-list-dropdown-title", Cs = "univer-dv-list-dropdown-list", Vs = "univer-dv-list-dropdown-list-container", Ms = "univer-dv-list-dropdown-selected-icon", ws = "univer-dv-list-dropdown-item-container", Is = "univer-dv-list-dropdown-item", ys = "univer-dv-list-dropdown-split", Ds = "univer-dv-list-dropdown-edit", Ce = {
-  dvListDropdown: Ss,
-  dvListDropdownTitle: Rs,
-  dvListDropdownList: Cs,
-  dvListDropdownListContainer: Vs,
-  dvListDropdownSelectedIcon: Ms,
-  dvListDropdownItemContainer: ws,
-  dvListDropdownItem: Is,
+const Ss = () => {
+  const o = T(we), a = Ze(o.activeRule$, o.activeRule);
+  return a ? /* @__PURE__ */ p.jsx(Gn, {}, a.rule.uid) : /* @__PURE__ */ p.jsx(gs, {});
+}, Rs = "univer-dv-list-dropdown", Cs = "univer-dv-list-dropdown-title", Vs = "univer-dv-list-dropdown-list", Ms = "univer-dv-list-dropdown-list-container", ws = "univer-dv-list-dropdown-selected-icon", Is = "univer-dv-list-dropdown-item-container", Ds = "univer-dv-list-dropdown-item", ys = "univer-dv-list-dropdown-split", Es = "univer-dv-list-dropdown-edit", Re = {
+  dvListDropdown: Rs,
+  dvListDropdownTitle: Cs,
+  dvListDropdownList: Vs,
+  dvListDropdownListContainer: Ms,
+  dvListDropdownSelectedIcon: ws,
+  dvListDropdownItemContainer: Is,
+  dvListDropdownItem: Ds,
   dvListDropdownSplit: ys,
-  dvListDropdownEdit: Ds
-}, Es = (o) => {
+  dvListDropdownEdit: Es
+}, Os = (o) => {
   const { value: a, onChange: e, multiple: t, options: r, title: n, onEdit: i, style: s } = o;
-  return /* @__PURE__ */ p.jsxs("div", { className: Ce.dvListDropdown, style: s, children: [
-    /* @__PURE__ */ p.jsx("div", { className: Ce.dvListDropdownTitle, children: n }),
-    /* @__PURE__ */ p.jsx("div", { className: Ce.dvListDropdownList, children: /* @__PURE__ */ p.jsx(ko, { children: /* @__PURE__ */ p.jsx("div", { className: Ce.dvListDropdownListContainer, children: r.map((l, d) => {
-      const c = a.indexOf(l.value) > -1, u = () => {
-        let h;
-        c ? h = new Set(a.filter((m) => m !== l.value)) : h = new Set(t ? [...a, l.value] : [l.value]);
+  return /* @__PURE__ */ p.jsxs("div", { className: Re.dvListDropdown, style: s, children: [
+    /* @__PURE__ */ p.jsx("div", { className: Re.dvListDropdownTitle, children: n }),
+    /* @__PURE__ */ p.jsx("div", { className: Re.dvListDropdownList, children: /* @__PURE__ */ p.jsx(Qo, { children: /* @__PURE__ */ p.jsx("div", { className: Re.dvListDropdownListContainer, children: r.map((l, d) => {
+      const c = a.indexOf(l.value) > -1, h = () => {
+        let u;
+        c ? u = new Set(a.filter((m) => m !== l.value)) : u = new Set(t ? [...a, l.value] : [l.value]);
         const f = [];
         r.forEach((m) => {
-          h.has(m.value) && f.push(m.value);
+          u.has(m.value) && f.push(m.value);
         }), e(f);
       };
-      return /* @__PURE__ */ p.jsxs("div", { className: Ce.dvListDropdownItemContainer, onClick: u, children: [
-        /* @__PURE__ */ p.jsx("div", { className: Ce.dvListDropdownItem, style: { background: l.color || Pe }, children: l.label }),
-        /* @__PURE__ */ p.jsx("div", { className: Ce.dvListDropdownSelectedIcon, children: c ? /* @__PURE__ */ p.jsx(Dn, {}) : null })
+      return /* @__PURE__ */ p.jsxs("div", { className: Re.dvListDropdownItemContainer, onClick: h, children: [
+        /* @__PURE__ */ p.jsx("div", { className: Re.dvListDropdownItem, style: { background: l.color || Le }, children: l.label }),
+        /* @__PURE__ */ p.jsx("div", { className: Re.dvListDropdownSelectedIcon, children: c ? /* @__PURE__ */ p.jsx(En, {}) : null })
       ] }, d);
     }) }) }) }),
-    /* @__PURE__ */ p.jsx("div", { className: Ce.dvListDropdownSplit }),
-    /* @__PURE__ */ p.jsx("div", { className: Ce.dvListDropdownEdit, children: /* @__PURE__ */ p.jsx("a", { onClick: i, children: "编辑" }) })
+    /* @__PURE__ */ p.jsx("div", { className: Re.dvListDropdownSplit }),
+    /* @__PURE__ */ p.jsx("div", { className: Re.dvListDropdownEdit, children: /* @__PURE__ */ p.jsx("a", { onClick: i, children: "编辑" }) })
   ] });
 };
-function Os(o) {
-  var b, W;
-  const { location: a, hideFn: e } = o, { worksheet: t, row: r, col: n, unitId: i, subUnitId: s } = a, l = O(te), d = O(le), [c, u] = Q(""), h = O(ga), f = Ho.useContext(), m = f.right - f.left;
+function bs(o) {
+  var L, j;
+  const { location: a, hideFn: e } = o, { worksheet: t, row: r, col: n, unitId: i, subUnitId: s } = a, l = T(te), d = T(le), [c, h] = Q(""), u = T(va), f = zo.useContext(), m = f.right - f.left;
   if (!t)
     return null;
-  const v = t.getCell(r, n), R = (b = v == null ? void 0 : v.dataValidation) == null ? void 0 : b.rule, S = (W = v == null ? void 0 : v.dataValidation) == null ? void 0 : W.validator, M = (R == null ? void 0 : R.renderMode) === ce.CUSTOM || (R == null ? void 0 : R.renderMode) === void 0;
+  const v = t.getCell(r, n), R = (L = v == null ? void 0 : v.dataValidation) == null ? void 0 : L.rule, S = (j = v == null ? void 0 : v.dataValidation) == null ? void 0 : j.validator, V = (R == null ? void 0 : R.renderMode) === ue.CUSTOM || (R == null ? void 0 : R.renderMode) === void 0;
   if (!v || !R || !S)
     return;
-  const _ = R.type === z.LIST_MULTIPLE, I = S.getListWithColor(R, i, s), y = c || hi(v), E = Ge(y), L = () => {
+  const _ = R.type === q.LIST_MULTIPLE, I = S.getListWithColor(R, i, s), D = c || mi(v), N = Ge(D), E = () => {
     l.executeCommand(ct.id, {
       ruleId: R.uid
     }), e();
   };
   return /* @__PURE__ */ p.jsx(
-    Es,
+    Os,
     {
       style: { minWidth: m, maxWidth: Math.max(m, 200) },
       title: _ ? d.t("dataValidation.listMultiple.dropdown") : d.t("dataValidation.list.dropdown"),
-      value: E,
+      value: N,
       multiple: _,
-      onChange: (N) => {
-        const A = Er(N), j = {
+      onChange: (A) => {
+        const P = Er(A), B = {
           unitId: i,
           subUnitId: s,
           range: {
@@ -3099,31 +3094,31 @@ function Os(o) {
             endRow: r
           },
           value: {
-            v: A,
+            v: P,
             p: null,
             f: null,
             si: null
           }
         };
-        h.isVisible() && h.changeVisible({
+        u.isVisible() && u.changeVisible({
           visible: !1,
-          keycode: mo.ESC,
-          eventType: Ao.Keyboard
-        }), l.executeCommand(_a.id, j), u(A), _ || e();
+          keycode: xo.ESC,
+          eventType: Xo.Keyboard
+        }), l.executeCommand(pa.id, B), h(P), _ || e();
       },
-      options: I.map((N) => ({
-        label: N.label,
-        value: N.label,
-        color: M ? N.color : "transparent"
+      options: I.map((A) => ({
+        label: A.label,
+        value: A.label,
+        color: V ? A.color : "transparent"
       })),
-      onEdit: L
+      onEdit: E
     }
   );
 }
-var bs = Object.defineProperty, Ts = Object.getOwnPropertyDescriptor, Fs = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Ts(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+var Ts = Object.defineProperty, Ns = Object.getOwnPropertyDescriptor, Fs = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Ns(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && bs(a, e, r), r;
+  return t && r && Ts(a, e, r), r;
 }, et = (o, a) => (e, t) => a(e, t, o);
 let ot = class extends me {
   constructor(o, a, e, t, r) {
@@ -3134,19 +3129,19 @@ let ot = class extends me {
       this._editorBridgeService.interceptor.getInterceptPoints().AFTER_CELL_EDIT_ASYNC,
       {
         handler: async (o, a, e) => {
-          const t = await o, { worksheet: r, row: n, col: i, unitId: s, subUnitId: l } = a, d = this._dataValidationModel.ensureManager(s, l), c = d.getRuleIdByLocation(n, i), u = c ? d.getRuleById(c) : void 0;
-          if (!u || u.errorStyle !== tt.STOP)
+          const t = await o, { worksheet: r, row: n, col: i, unitId: s, subUnitId: l } = a, d = this._dataValidationModel.ensureManager(s, l), c = d.getRuleIdByLocation(n, i), h = c ? d.getRuleById(c) : void 0;
+          if (!h || h.errorStyle !== tt.STOP)
             return e(Promise.resolve(t));
-          const h = await this._dataValidatorRegistryService.getValidatorItem(u.type);
-          if (!h || await h.validator(
+          const u = await this._dataValidatorRegistryService.getValidatorItem(h.type);
+          if (!u || await u.validator(
             {
-              value: se(t),
+              value: ne(t),
               row: n,
               column: i,
               unitId: s,
               subUnitId: l
             },
-            u
+            h
           ))
             return e(Promise.resolve(t));
           const m = r.getCellRaw(n, i);
@@ -3157,10 +3152,10 @@ let ot = class extends me {
             },
             id: "reject-input-dialog",
             children: {
-              title: h.getRuleFinalError(u)
+              title: u.getRuleFinalError(h)
             },
             footer: {
-              title: oa.createElement(
+              title: ra.createElement(
                 ze,
                 {
                   type: "primary",
@@ -3188,7 +3183,7 @@ let ot = class extends me {
         title: o
       },
       footer: {
-        title: oa.createElement(
+        title: ra.createElement(
           ze,
           {
             type: "primary",
@@ -3204,38 +3199,38 @@ let ot = class extends me {
   }
 };
 ot = Fs([
-  ge(_e.Ready, ot),
-  et(0, ga),
-  et(1, V(J)),
-  et(2, V(Ee)),
-  et(3, fo),
-  et(4, V(le))
+  ve(ge.Ready, ot),
+  et(0, va),
+  et(1, w(Z)),
+  et(2, w(Ee)),
+  et(3, jo),
+  et(4, w(le))
 ], ot);
-const Ns = "univer-dv-date-dropdown", Ls = {
-  dvDateDropdown: Ns
+const Ls = "univer-dv-date-dropdown", Ps = {
+  dvDateDropdown: Ls
 };
 function As(o) {
-  var M, _, I;
-  const { location: a, hideFn: e } = o, { worksheet: t, row: r, col: n, unitId: i, subUnitId: s } = a, l = O(te), d = O(ot), [c, u] = Q();
+  var V, _, I;
+  const { location: a, hideFn: e } = o, { worksheet: t, row: r, col: n, unitId: i, subUnitId: s } = a, l = T(te), d = T(ot), [c, h] = Q();
   if (!t)
     return null;
-  const h = t.getCell(r, n), f = (M = h == null ? void 0 : h.dataValidation) == null ? void 0 : M.rule, m = (_ = h == null ? void 0 : h.dataValidation) == null ? void 0 : _.validator;
-  if (!h || !f || !m)
+  const u = t.getCell(r, n), f = (V = u == null ? void 0 : u.dataValidation) == null ? void 0 : V.rule, m = (_ = u == null ? void 0 : u.dataValidation) == null ? void 0 : _.validator;
+  if (!u || !f || !m)
     return;
-  const v = se(h), R = (I = m.transformDate(v)) != null ? I : Be(), S = R.isValid() ? R : Be();
-  return /* @__PURE__ */ p.jsx("div", { className: Ls.dvDateDropdown, children: /* @__PURE__ */ p.jsx(
-    Yo,
+  const v = ne(u), R = (I = m.transformDate(v)) != null ? I : xe(), S = R.isValid() ? R : xe();
+  return /* @__PURE__ */ p.jsx("div", { className: Ps.dvDateDropdown, children: /* @__PURE__ */ p.jsx(
+    Ko,
     {
       pickerValue: c != null ? c : S,
-      onSelect: async (y) => {
-        const E = y.format("YYYY/MM/DD");
+      onSelect: async (D) => {
+        const N = D.format("YYYY/MM/DD");
         f.errorStyle !== tt.STOP || await m.validator({
-          value: E,
+          value: N,
           unitId: i,
           subUnitId: s,
           row: r,
           column: n
-        }, f) ? l.executeCommand(_a.id, {
+        }, f) ? l.executeCommand(pa.id, {
           unitId: i,
           subUnitId: s,
           range: {
@@ -3245,44 +3240,41 @@ function As(o) {
             endRow: r
           },
           value: {
-            v: E,
+            v: N,
             p: null,
             f: null,
             si: null
           }
         }) : d.showReject(m.getRuleFinalError(f)), e();
       },
-      onPanelChange: (y) => {
-        u(y);
+      onPanelChange: (D) => {
+        h(D);
       }
     }
   ) });
 }
-const Pr = "data-validation.list.dropdown", xr = "data-validation.date.dropdown";
-var Ps = Object.defineProperty, xs = Object.getOwnPropertyDescriptor, js = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? xs(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+const Ar = "data-validation.list.dropdown", xr = "data-validation.date.dropdown";
+var xs = Object.defineProperty, js = Object.getOwnPropertyDescriptor, Bs = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? js(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && Ps(a, e, r), r;
-}, ie = (o, a) => (e, t) => a(e, t, o);
-const Bs = {}, $s = {
+  return t && r && xs(a, e, r), r;
+}, de = (o, a) => (e, t) => a(e, t, o);
+const $s = {}, Us = {
   tr: {
     size: 6,
     color: "#fe4b4b"
   }
 };
 let nt = class extends Za {
-  constructor(o, a, e, t, r, n, i, s, l, d, c, u, h, f) {
-    super(), this._config = o, this._componentManager = a, this._menuService = e, this._dataValidationModel = t, this._sheetSkeletonManagerService = r, this._renderManagerService = n, this._univerInstanceService = i, this._dataValidatorRegistryService = s, this._editorBridgeService = l, this._dropdownManagerService = d, this._sheetInterceptorService = c, this._injector = u, this._autoHeightController = h, this._commandService = f, this._init();
-  }
-  _init() {
-    this._initComponents(), this._initMenu(), this._initSkeletonChange(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
+  constructor(o, a, e, t, r, n, i, s, l, d, c, h, u) {
+    super(), this._config = o, this._commandService = a, this._editorBridgeService = e, this._menuService = t, this._renderManagerService = r, this._univerInstanceService = n, this._autoHeightController = i, this._componentManager = s, this._dropdownManagerService = l, this._dataValidationModel = d, this._dataValidatorRegistryService = c, this._injector = h, this._sheetInterceptorService = u, this._initComponents(), this._initMenu(), this._initSkeletonChange(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
     const { menu: o = {} } = this._config;
     [
-      ls,
       ds,
-      cs
+      cs,
+      us
     ].forEach((a) => {
       this.disposeWithMe(
         this._menuService.addMenuItem(a(this._injector), o)
@@ -3293,25 +3285,25 @@ let nt = class extends Za {
     [
       [
         vr,
-        _s
+        Ss
       ],
       [
         pr,
-        mn
+        fn
       ],
       [
-        Pr,
-        Os
+        Ar,
+        bs
       ],
       [
         xr,
         As
       ],
       [
-        Tt.componentKey,
-        Tt
+        Ot.componentKey,
+        Ot
       ],
-      ...Ri
+      ...Ci
     ].forEach(([o, a]) => {
       this.disposeWithMe(this._componentManager.register(
         o,
@@ -3334,8 +3326,8 @@ let nt = class extends Za {
         const d = this._dataValidatorRegistryService.getValidatorItem(l.type);
         if (!(d != null && d.dropdown))
           return;
-        const c = i.getActiveSheet(), u = this._dropdownManagerService.activeDropdown, h = u == null ? void 0 : u.location;
-        if (h && h.unitId === e && h.subUnitId === t && h.row === r && h.col === n)
+        const c = i.getActiveSheet(), h = this._dropdownManagerService.activeDropdown, u = h == null ? void 0 : h.location;
+        if (u && u.unitId === e && u.subUnitId === t && u.row === r && u.col === n)
           return;
         this._dropdownManagerService.showDropdown({
           location: {
@@ -3355,64 +3347,64 @@ let nt = class extends Za {
   }
   _initSkeletonChange() {
     const o = () => {
-      const a = this._univerInstanceService.getCurrentUnitForType(ue.UNIVER_SHEET);
+      var i, s;
+      const a = this._univerInstanceService.getCurrentUnitForType(se.UNIVER_SHEET);
       if (!a)
         return;
-      const e = a.getUnitId(), t = a.getActiveSheet().getSheetId(), r = this._sheetSkeletonManagerService.getOrCreateSkeleton({ unitId: e, sheetId: t }), n = this._renderManagerService.getRenderById(e);
+      const e = a.getUnitId(), t = a.getActiveSheet().getSheetId(), r = (s = (i = this._renderManagerService.getRenderById(e)) == null ? void 0 : i.with(Ta).getUnitSkeleton(e, t)) == null ? void 0 : s.skeleton, n = this._renderManagerService.getRenderById(e);
       r == null || r.makeDirty(!0), r == null || r.calculate(), n && n.mainComponent.makeForceDirty();
     };
-    this.disposeWithMe(this._dataValidationModel.ruleChange$.subscribe(() => {
-      o();
-    })), this.disposeWithMe(this._dataValidationModel.validStatusChange$.subscribe(() => {
-      o();
-    }));
+    this.disposeWithMe(this._dataValidationModel.ruleChange$.subscribe(() => o())), this.disposeWithMe(this._dataValidationModel.validStatusChange$.subscribe(() => o()));
   }
   // eslint-disable-next-line max-lines-per-function
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        Bo.CELL_CONTENT,
+        po.CELL_CONTENT,
         {
           priority: 200,
-          // eslint-disable-next-line max-lines-per-function, complexity
+          // eslint-disable-next-line max-lines-per-function
           handler: (o, a, e) => {
-            var M, _, I, y;
-            const { row: t, col: r, unitId: n, subUnitId: i } = a, s = this._dataValidationModel.ensureManager(n, i), l = (M = this._sheetSkeletonManagerService.getCurrent()) == null ? void 0 : M.skeleton;
-            if (!s || !l)
+            var V, _, I, D, N;
+            const { row: t, col: r, unitId: n, subUnitId: i } = a, s = this._dataValidationModel.ensureManager(n, i);
+            if (!s)
               return e(o);
-            const d = a.workbook.getStyles(), c = (typeof (o == null ? void 0 : o.s) == "string" ? d.get(o == null ? void 0 : o.s) : o == null ? void 0 : o.s) || {}, u = s.getRuleIdByLocation(t, r);
-            if (!u)
+            const l = (_ = (V = this._renderManagerService.getRenderById(n)) == null ? void 0 : V.with(Ta).getUnitSkeleton(n, i)) == null ? void 0 : _.skeleton;
+            if (!l)
               return e(o);
-            const h = s.getRuleById(u);
+            const d = a.workbook.getStyles(), c = (typeof (o == null ? void 0 : o.s) == "string" ? d.get(o == null ? void 0 : o.s) : o == null ? void 0 : o.s) || {}, h = s.getRuleIdByLocation(t, r);
             if (!h)
               return e(o);
-            const f = a.worksheet.getCellRaw(a.row, a.col), m = this._dataValidationModel.validator(se(f), h, a), v = this._dataValidatorRegistryService.getValidatorItem(h.type), R = se(o);
+            const u = s.getRuleById(h);
+            if (!u)
+              return e(o);
+            const f = a.worksheet.getCellRaw(a.row, a.col), m = this._dataValidationModel.validator(ne(f), u, a), v = this._dataValidatorRegistryService.getValidatorItem(u.type), R = ne(o);
             let S = {};
-            if ((h.type === z.LIST || h.type === z.LIST_MULTIPLE) && (S = {
+            if ((u.type === q.LIST || u.type === q.LIST_MULTIPLE) && (S = {
               interceptorStyle: {
                 ...o == null ? void 0 : o.interceptorStyle,
-                tb: (_ = c.tb !== ve.OVERFLOW ? c.tb : ve.CLIP) != null ? _ : ve.WRAP
+                tb: (I = c.tb !== pe.OVERFLOW ? c.tb : pe.CLIP) != null ? I : pe.WRAP
               }
-            }), h.type === z.CHECKBOX) {
-              const { formula2: E } = v.parseFormulaSync(h, a.unitId, a.subUnitId);
+            }), u.type === q.CHECKBOX) {
+              const { formula2: E } = v.parseFormulaSync(u, a.unitId, a.subUnitId);
               R || (S = {
                 v: E,
                 t: 1,
                 p: null,
                 interceptorStyle: {
                   ...o == null ? void 0 : o.interceptorStyle,
-                  tb: ve.CLIP
+                  tb: pe.CLIP
                 }
               });
             }
-            if (h.type === z.LIST && (h.renderMode === ce.ARROW || h.renderMode === ce.TEXT)) {
-              const E = v.getListWithColorMap(h), L = `${(I = se(o)) != null ? I : ""}`, b = E[L];
-              b && (S = {
+            if (u.type === q.LIST && (u.renderMode === ue.ARROW || u.renderMode === ue.TEXT)) {
+              const E = v.getListWithColorMap(u), L = `${(D = ne(o)) != null ? D : ""}`, j = E[L];
+              j && (S = {
                 ...S,
                 interceptorStyle: {
                   ...S.interceptorStyle,
                   bg: {
-                    rgb: b
+                    rgb: j
                   }
                 }
               });
@@ -3421,52 +3413,52 @@ let nt = class extends Za {
               ...o,
               ...S,
               dataValidation: {
-                ruleId: u,
+                ruleId: h,
                 validStatus: m,
-                rule: h,
+                rule: u,
                 validator: v
               },
               markers: {
                 ...o == null ? void 0 : o.markers,
-                ...m === Ae.INVALID ? $s : null
+                ...m === Ce.INVALID ? Us : null
               },
               customRender: [
-                ...(y = o == null ? void 0 : o.customRender) != null ? y : [],
+                ...(N = o == null ? void 0 : o.customRender) != null ? N : [],
                 ...v != null && v.canvasRender ? [v.canvasRender] : []
               ],
               // @ts-ignore
               fontRenderExtension: {
                 // @ts-ignore
                 ...o == null ? void 0 : o.fontRenderExtension,
-                isSkip: v == null ? void 0 : v.skipDefaultFontRender(h, R, a)
+                isSkip: v == null ? void 0 : v.skipDefaultFontRender(u, R, a)
               },
               interceptorStyle: {
                 ...o == null ? void 0 : o.interceptorStyle,
                 ...S.interceptorStyle
               },
               get interceptorAutoHeight() {
-                var b, W, N, A;
-                const E = l.mergeData.find((j) => {
-                  const { startColumn: X, startRow: F, endColumn: H, endRow: x } = j;
-                  return t >= F && r >= X && t <= x && r <= H;
+                var j, A, P, B;
+                const E = l.mergeData.find((X) => {
+                  const { startColumn: x, startRow: b, endColumn: k, endRow: ee } = X;
+                  return t >= b && r >= x && t <= ee && r <= k;
                 }), L = {
                   data: {
                     ...o,
                     dataValidation: {
-                      ruleId: u,
+                      ruleId: h,
                       validStatus: m,
-                      rule: h,
+                      rule: u,
                       validator: v
                     }
                   },
                   style: l.getsStyles().getStyleByCell(o),
-                  primaryWithCoord: l.getCellByIndex((b = E == null ? void 0 : E.startRow) != null ? b : t, (W = E == null ? void 0 : E.startColumn) != null ? W : r),
+                  primaryWithCoord: l.getCellByIndex((j = E == null ? void 0 : E.startRow) != null ? j : t, (A = E == null ? void 0 : E.startColumn) != null ? A : r),
                   unitId: n,
                   subUnitId: i,
                   row: t,
                   col: r
                 };
-                return (A = (N = v == null ? void 0 : v.canvasRender) == null ? void 0 : N.calcCellAutoHeight) == null ? void 0 : A.call(N, L);
+                return (B = (P = v == null ? void 0 : v.canvasRender) == null ? void 0 : P.calcCellAutoHeight) == null ? void 0 : B.call(P, L);
               }
             });
           }
@@ -3479,34 +3471,33 @@ let nt = class extends Za {
       var a;
       if ((a = o.rule) != null && a.ranges) {
         const e = this._autoHeightController.getUndoRedoParamsOfAutoHeight(o.rule.ranges);
-        zr(e.redos, this._commandService);
+        Kr(e.redos, this._commandService);
       }
     });
   }
 };
-nt = js([
-  ge(_e.Rendered, nt),
-  ie(1, V(dt)),
-  ie(2, po),
-  ie(3, V(J)),
-  ie(4, V(va)),
-  ie(5, or),
-  ie(6, ne),
-  ie(7, V(Ee)),
-  ie(8, ga),
-  ie(9, V($e)),
-  ie(10, V(sr)),
-  ie(11, V(Ue)),
-  ie(12, V(So)),
-  ie(13, te)
+nt = Bs([
+  ve(ge.Rendered, nt),
+  de(1, te),
+  de(2, va),
+  de(3, Bo),
+  de(4, ir),
+  de(5, ie),
+  de(6, w(Vo)),
+  de(7, w(dt)),
+  de(8, w(je)),
+  de(9, w(Z)),
+  de(10, w(Ee)),
+  de(11, w(Be)),
+  de(12, w(ar))
 ], nt);
-var Us = Object.defineProperty, Ws = Object.getOwnPropertyDescriptor, Hs = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Ws(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+var Ws = Object.defineProperty, Hs = Object.getOwnPropertyDescriptor, ks = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Hs(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && Us(a, e, r), r;
+  return t && r && Ws(a, e, r), r;
 }, _t = (o, a) => (e, t) => a(e, t, o);
-const Xt = "SHEET_DATA_VALIDATION_ALERT";
-let Ct = class extends me {
+const Yt = "SHEET_DATA_VALIDATION_ALERT";
+let Rt = class extends me {
   constructor(o, a, e, t) {
     super(), this._hoverManagerService = o, this._cellAlertManagerService = a, this._univerInstanceService = e, this._localeService = t, this._init();
   }
@@ -3514,55 +3505,53 @@ let Ct = class extends me {
     this._initCellAlertPopup();
   }
   _initCellAlertPopup() {
-    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(Ko(100)).subscribe((o) => {
-      var a, e, t;
+    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(rn(100)).subscribe((o) => {
+      var a, e;
       if (o) {
-        const i = this._univerInstanceService.getCurrentUnitForType(ue.UNIVER_SHEET).getActiveSheet().getCell(o.location.row, o.location.col);
-        if (((a = i == null ? void 0 : i.dataValidation) == null ? void 0 : a.validStatus) === Ae.INVALID) {
-          if ((e = i.dataValidation) != null && e.isSkip)
-            return;
-          const s = this._cellAlertManagerService.currentAlert.get(Xt), l = (t = s == null ? void 0 : s.alert) == null ? void 0 : t.location;
-          if (l && l.row === o.location.row && l.col === o.location.col && l.subUnitId === o.location.subUnitId && l.unitId === o.location.unitId)
+        const n = this._univerInstanceService.getCurrentUnitForType(se.UNIVER_SHEET).getActiveSheet().getCell(o.location.row, o.location.col);
+        if (((a = n == null ? void 0 : n.dataValidation) == null ? void 0 : a.validStatus) === Ce.INVALID) {
+          const i = this._cellAlertManagerService.currentAlert.get(Yt), s = (e = i == null ? void 0 : i.alert) == null ? void 0 : e.location;
+          if (s && s.row === o.location.row && s.col === o.location.col && s.subUnitId === o.location.subUnitId && s.unitId === o.location.unitId)
             return;
-          const d = i.dataValidation.validator, c = i.dataValidation.rule;
-          if (!d)
+          const l = n.dataValidation.validator, d = n.dataValidation.rule;
+          if (!l)
             return;
           this._cellAlertManagerService.showAlert({
-            type: Vo.ERROR,
+            type: Io.ERROR,
             title: this._localeService.t("dataValidation.error.title"),
-            message: d == null ? void 0 : d.getRuleFinalError(c),
+            message: l == null ? void 0 : l.getRuleFinalError(d),
             location: o.location,
             width: 200,
             height: 74,
-            key: Xt
+            key: Yt
           });
           return;
         }
       }
-      this._cellAlertManagerService.removeAlert(Xt);
+      this._cellAlertManagerService.removeAlert(Yt);
     }));
   }
 };
-Ct = Hs([
-  ge(_e.Rendered, Ct),
-  _t(0, V(Ro)),
-  _t(1, V(Co)),
-  _t(2, ne),
-  _t(3, V(le))
-], Ct);
-var ks = Object.defineProperty, Ys = Object.getOwnPropertyDescriptor, Gs = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Ys(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+Rt = ks([
+  ve(ge.Rendered, Rt),
+  _t(0, w(Mo)),
+  _t(1, w(wo)),
+  _t(2, ie),
+  _t(3, w(le))
+], Rt);
+var Ys = Object.defineProperty, Gs = Object.getOwnPropertyDescriptor, Xs = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Gs(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && ks(a, e, r), r;
-}, pe = (o, a) => (e, t) => a(e, t, o);
+  return t && r && Ys(a, e, r), r;
+}, ke = (o, a) => (e, t) => a(e, t, o);
 let it = class extends me {
-  constructor(a, e, t, r, n, i, s, l, d, c) {
+  constructor(a, e, t, r, n, i) {
     super();
     g(this, "_disposableMap", /* @__PURE__ */ new Map());
     g(this, "registerRule", (a, e, t) => {
       this.register(a, e, t), this.registerFormula(a, e, t);
     });
-    this._dataValidationModel = a, this._univerInstanceService = e, this._injector = t, this._sheetSkeletonManagerService = r, this._refRangeService = n, this._dataValidationCustomFormulaService = i, this._dataValidationFormulaService = s, this._formulaRefRangeService = l, this._commandService = d, this._dataValidationCacheService = c, this._initRefRange();
+    this._dataValidationModel = a, this._injector = e, this._refRangeService = t, this._dataValidationCustomFormulaService = r, this._dataValidationFormulaService = n, this._formulaRefRangeService = i, this._initRefRange();
   }
   _getIdWithUnitId(a, e, t) {
     return `${a}_${e}_${t}`;
@@ -3571,22 +3560,22 @@ let it = class extends me {
   registerFormula(a, e, t) {
     var l;
     const r = t.uid, n = this._getIdWithUnitId(a, e, r), i = (l = this._disposableMap.get(n)) != null ? l : /* @__PURE__ */ new Set(), s = (d, c) => {
-      const u = this._dataValidationModel.getRuleById(a, e, r);
-      if (!u)
+      const h = this._dataValidationModel.getRuleById(a, e, r);
+      if (!h)
         return { redos: [], undos: [] };
-      const h = u[d];
-      if (!h || h === c)
+      const u = h[d];
+      if (!u || u === c)
         return { redos: [], undos: [] };
       const f = {
         unitId: a,
         subUnitId: e,
         ruleId: t.uid,
         payload: {
-          type: ye.SETTING,
+          type: De.SETTING,
           payload: {
-            type: u.type,
-            formula1: u.formula1,
-            formula2: u.formula2,
+            type: h.type,
+            formula1: h.formula1,
+            formula2: h.formula2,
             [d]: c
           }
         }
@@ -3595,11 +3584,11 @@ let it = class extends me {
         subUnitId: e,
         ruleId: t.uid,
         payload: {
-          type: ye.SETTING,
+          type: De.SETTING,
           payload: {
-            type: u.type,
-            formula1: u.formula1,
-            formula2: u.formula2
+            type: h.type,
+            formula1: h.formula1,
+            formula2: h.formula2
           }
         }
       }, v = [
@@ -3615,33 +3604,33 @@ let it = class extends me {
       ];
       return { redos: v, undos: R };
     };
-    if (t.type === z.CUSTOM) {
+    if (t.type === q.CUSTOM) {
       const d = this._dataValidationCustomFormulaService.getRuleFormulaInfo(a, e, r);
       if (d) {
         const c = this._formulaRefRangeService.registerFormula(
           d.formula,
-          (u) => s("formula1", u)
+          (h) => s("formula1", h)
         );
         i.add(() => c.dispose());
       }
     }
-    if (t.type !== z.CUSTOM) {
+    if (t.type !== q.CUSTOM) {
       const d = this._dataValidationFormulaService.getRuleFormulaInfo(a, e, r);
       if (d) {
-        const [c, u] = d;
+        const [c, h] = d;
         if (c) {
-          const h = this._formulaRefRangeService.registerFormula(
+          const u = this._formulaRefRangeService.registerFormula(
             c.text,
             (f) => s("formula1", f)
           );
-          i.add(() => h.dispose());
+          i.add(() => u.dispose());
         }
-        if (u) {
-          const h = this._formulaRefRangeService.registerFormula(
-            u.text,
+        if (h) {
+          const u = this._formulaRefRangeService.registerFormula(
+            h.text,
             (f) => s("formula1", f)
           );
-          i.add(() => h.dispose());
+          i.add(() => u.dispose());
         }
       }
     }
@@ -3649,17 +3638,17 @@ let it = class extends me {
   register(a, e, t) {
     var l;
     const r = (d) => {
-      const c = [...t.ranges], h = c.map((m) => Uo(m, d)).filter((m) => !!m).flat();
-      if (Qr(h, c))
+      const c = [...t.ranges], u = c.map((m) => go(m, d)).filter((m) => !!m).flat();
+      if (Zr(u, c))
         return { redos: [], undos: [] };
-      if (h.length) {
+      if (u.length) {
         const m = {
           unitId: a,
           subUnitId: e,
           ruleId: t.uid,
           payload: {
-            type: ye.RANGE,
-            payload: h
+            type: De.RANGE,
+            payload: u
           }
         }, v = [{ id: Ye.id, params: m }], R = [{
           id: Ye.id,
@@ -3668,14 +3657,14 @@ let it = class extends me {
             subUnitId: e,
             ruleId: t.uid,
             payload: {
-              type: ye.RANGE,
+              type: De.RANGE,
               payload: c
             }
           }
         }];
         return { redos: v, undos: R };
       } else {
-        const m = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: Dt.id, params: m }], R = oo(this._injector, m);
+        const m = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: It.id, params: m }], R = so(this._injector, m);
         return { redos: v, undos: R };
       }
     }, n = [];
@@ -3688,141 +3677,117 @@ let it = class extends me {
   }
   _initRefRange() {
     this.disposeWithMe(
-      Zo(
-        this._sheetSkeletonManagerService.currentSkeleton$.pipe(
-          rn((a) => a == null ? void 0 : a.sheetId),
-          on()
-        )
-      ).pipe(
-        nn(
-          () => new Jo((a) => {
-            const e = new ma();
-            return a.next(e), () => {
-              e.dispose();
-            };
-          })
-        )
-      ).subscribe((a) => {
-        a.add(
-          yt(
-            this._dataValidationModel.ruleChange$.subscribe((e) => {
-              const { unitId: t, subUnitId: r, rule: n } = e;
-              switch (e.type) {
-                case "add": {
-                  const i = e.rule;
-                  this.registerRule(e.unitId, e.subUnitId, i);
-                  break;
-                }
-                case "remove": {
-                  const i = this._disposableMap.get(this._getIdWithUnitId(t, r, n.uid));
-                  i && i.forEach((s) => s());
-                  break;
-                }
-                case "update": {
-                  const i = e.rule, s = this._disposableMap.get(this._getIdWithUnitId(t, r, i.uid));
-                  s && s.forEach((l) => l()), this.registerRule(e.unitId, e.subUnitId, i);
-                  break;
-                }
-              }
-            })
-          )
-        );
+      this._dataValidationModel.ruleChange$.subscribe((a) => {
+        const { unitId: e, subUnitId: t, rule: r } = a;
+        switch (a.type) {
+          case "add": {
+            const n = a.rule;
+            this.registerRule(a.unitId, a.subUnitId, n);
+            break;
+          }
+          case "remove": {
+            const n = this._disposableMap.get(this._getIdWithUnitId(e, t, r.uid));
+            n && n.forEach((i) => i());
+            break;
+          }
+          case "update": {
+            const n = a.rule, i = this._disposableMap.get(this._getIdWithUnitId(e, t, n.uid));
+            i && i.forEach((s) => s()), this.registerRule(a.unitId, a.subUnitId, n);
+            break;
+          }
+        }
       })
-    ), this.disposeWithMe(yt(() => {
+    ), this.disposeWithMe(ma(() => {
       this._disposableMap.forEach((a) => {
         a.forEach((e) => e());
       }), this._disposableMap.clear();
     }));
   }
 };
-it = Gs([
-  ge(_e.Ready, it),
-  pe(0, V(J)),
-  pe(1, V(ne)),
-  pe(2, V(Ue)),
-  pe(3, V(va)),
-  pe(4, V($o)),
-  pe(5, V(Ke)),
-  pe(6, V(he)),
-  pe(7, V(tn)),
-  pe(8, te),
-  pe(9, V(ht))
+it = Xs([
+  ve(ge.Ready, it),
+  ke(0, w(Z)),
+  ke(1, w(Be)),
+  ke(2, w(vo)),
+  ke(3, w(Ke)),
+  ke(4, w(he)),
+  ke(5, w(nn))
 ], it);
-var Xs = Object.defineProperty, qs = Object.getOwnPropertyDescriptor, zs = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? qs(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+var qs = Object.defineProperty, zs = Object.getOwnPropertyDescriptor, Qs = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? zs(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && Xs(a, e, r), r;
+  return t && r && qs(a, e, r), r;
 }, Xa = (o, a) => (e, t) => a(e, t, o);
-let Vt = class extends me {
+let Ct = class extends me {
   constructor(o, a) {
     super(), this._autoFillService = o, this._dataValidationModel = a, this._initAutoFill();
   }
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const o = () => ({ redos: [], undos: [] }), a = (t) => {
-      const { source: r, target: n, unitId: i, subUnitId: s } = t, l = this._dataValidationModel.ensureManager(i, s), d = l.getRuleObjectMatrix().clone(), c = Jt([r, n]), [u, h] = c.ranges, { mapFunc: f } = c, m = {
-        row: u.startRow,
-        col: u.startColumn
+      const { source: r, target: n, unitId: i, subUnitId: s } = t, l = this._dataValidationModel.ensureManager(i, s), d = l.getRuleObjectMatrix().clone(), c = aa([r, n]), [h, u] = c.ranges, { mapFunc: f } = c, m = {
+        row: h.startRow,
+        col: h.startColumn
       };
-      wo(u, h).forEach((_) => {
-        const I = _.repeatStartCell, y = _.relativeRange, E = {
+      yo(h, u).forEach((_) => {
+        const I = _.repeatStartCell, D = _.relativeRange, N = {
           startRow: m.row,
           startColumn: m.col,
           endColumn: m.col,
           endRow: m.row
-        }, L = {
+        }, E = {
           startRow: I.row,
           startColumn: I.col,
           endColumn: I.col,
           endRow: I.row
         };
-        q.foreach(y, (b, W) => {
-          const N = qe.getPositionRange(
+        G.foreach(D, (L, j) => {
+          const A = qe.getPositionRange(
             {
-              startRow: b,
-              startColumn: W,
-              endColumn: W,
-              endRow: b
+              startRow: L,
+              startColumn: j,
+              endColumn: j,
+              endRow: L
             },
-            E
-          ), { row: A, col: j } = f(N.startRow, N.startColumn), X = l.getRuleIdByLocation(A, j);
+            N
+          ), { row: P, col: B } = f(A.startRow, A.startColumn), X = l.getRuleIdByLocation(P, B);
           if (X) {
-            const F = qe.getPositionRange(
+            const x = qe.getPositionRange(
               {
-                startRow: b,
-                startColumn: W,
-                endColumn: W,
-                endRow: b
+                startRow: L,
+                startColumn: j,
+                endColumn: j,
+                endRow: L
               },
-              L
-            ), { row: H, col: x } = f(F.startRow, F.startColumn);
-            d.setValue(H, x, X);
+              E
+            ), { row: b, col: k } = f(x.startRow, x.startColumn);
+            d.setValue(b, k, X);
           }
         });
       });
-      const R = d.diff(l.getDataValidations()), { redoMutations: S, undoMutations: M } = Qe(i, s, R);
+      const R = d.diff(l.getDataValidations()), { redoMutations: S, undoMutations: V } = Qe(i, s, R);
       return {
-        undos: M,
+        undos: V,
         redos: S
       };
     }, e = {
-      id: Ia,
-      onFillData: (t, r, n) => n === xt.COPY || n === xt.ONLY_FORMAT || n === xt.SERIES ? a(t) : o()
+      id: wa,
+      onFillData: (t, r, n) => n === Pt.COPY || n === Pt.ONLY_FORMAT || n === Pt.SERIES ? a(t) : o()
     };
     this.disposeWithMe(this._autoFillService.addHook(e));
   }
 };
-Vt = zs([
-  ge(_e.Ready, Vt),
-  Xa(0, Mo),
-  Xa(1, V(J))
-], Vt);
-var Qs = Object.defineProperty, Ks = Object.getOwnPropertyDescriptor, Zs = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? Ks(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+Ct = Qs([
+  ve(ge.Ready, Ct),
+  Xa(0, Do),
+  Xa(1, w(Z))
+], Ct);
+var Ks = Object.defineProperty, Zs = Object.getOwnPropertyDescriptor, Js = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? Zs(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && Qs(a, e, r), r;
-}, qt = (o, a) => (e, t) => a(e, t, o);
-let Mt = class extends me {
+  return t && r && Ks(a, e, r), r;
+}, Gt = (o, a) => (e, t) => a(e, t, o);
+let Vt = class extends me {
   constructor(a, e, t) {
     super();
     g(this, "_copyInfo");
@@ -3830,10 +3795,10 @@ let Mt = class extends me {
   }
   _initCopyPaste() {
     this._sheetClipboardService.addClipboardHook({
-      id: Ia,
+      id: wa,
       onBeforeCopy: (a, e, t) => this._collect(a, e, t),
       onPasteCells: (a, e, t, r) => {
-        const { copyType: n = Fa.COPY, pasteType: i } = r, { range: s } = a || {}, { range: l, unitId: d, subUnitId: c } = e;
+        const { copyType: n = Na.COPY, pasteType: i } = r, { range: s } = a || {}, { range: l, unitId: d, subUnitId: c } = e;
         return this._generateMutations(l, { copyType: n, pasteType: i, copyRange: s, unitId: d, subUnitId: c });
       }
     });
@@ -3847,14 +3812,14 @@ let Mt = class extends me {
     };
     const n = this._dataValidationModel.ensureManager(a, e), i = {
       get: this._injector.get.bind(this._injector)
-    }, s = Io(t, i, a, e);
+    }, s = Eo(t, i, a, e);
     if (!s)
       return;
     const { rows: l, cols: d } = s;
-    l.forEach((c, u) => {
-      d.forEach((h, f) => {
-        const m = n.getRuleIdByLocation(c, h);
-        r.setValue(u, f, m != null ? m : "");
+    l.forEach((c, h) => {
+      d.forEach((u, f) => {
+        const m = n.getRuleIdByLocation(c, u);
+        r.setValue(h, f, m != null ? m : "");
       });
     });
   }
@@ -3862,54 +3827,54 @@ let Mt = class extends me {
   _generateMutations(a, e) {
     if (!this._copyInfo)
       return { redos: [], undos: [] };
-    if (e.copyType === Fa.CUT)
+    if (e.copyType === Na.CUT)
       return this._copyInfo = null, { redos: [], undos: [] };
     if (!this._copyInfo || !this._copyInfo.matrix.getSizeOf() || !e.copyRange)
       return { redos: [], undos: [] };
     if ([
-      jt.SPECIAL_PASTE_COL_WIDTH,
-      jt.SPECIAL_PASTE_VALUE,
-      jt.SPECIAL_PASTE_FORMAT,
-      an
+      At.SPECIAL_PASTE_COL_WIDTH,
+      At.SPECIAL_PASTE_VALUE,
+      At.SPECIAL_PASTE_FORMAT,
+      sn
     ].includes(
       e.pasteType
     ))
       return { redos: [], undos: [] };
     const { unitId: t, subUnitId: r } = this._copyInfo;
     if (e.unitId !== t || r !== e.subUnitId) {
-      const n = this._dataValidationModel.ensureManager(t, r), i = this._dataValidationModel.ensureManager(e.unitId, e.subUnitId), s = i.getRuleObjectMatrix().clone(), { ranges: [l, d], mapFunc: c } = Jt([e.copyRange, a]), u = Na(l, d, !0), h = /* @__PURE__ */ new Map();
-      u.forEach(({ startRange: v }) => {
+      const n = this._dataValidationModel.ensureManager(t, r), i = this._dataValidationModel.ensureManager(e.unitId, e.subUnitId), s = i.getRuleObjectMatrix().clone(), { ranges: [l, d], mapFunc: c } = aa([e.copyRange, a]), h = Fa(l, d, !0), u = /* @__PURE__ */ new Map();
+      h.forEach(({ startRange: v }) => {
         var R;
-        (R = this._copyInfo) == null || R.matrix.forValue((S, M, _) => {
+        (R = this._copyInfo) == null || R.matrix.forValue((S, V, _) => {
           const I = qe.getPositionRange(
             {
               startRow: S,
               endRow: S,
-              startColumn: M,
-              endColumn: M
+              startColumn: V,
+              endColumn: V
             },
             v
-          ), y = `${r}-${_}`, E = n.getRuleById(_);
-          !i.getRuleById(y) && E && h.set(y, { ...E, uid: y });
-          const { row: L, col: b } = c(I.startRow, I.startColumn);
-          s.setValue(L, b, y);
+          ), D = `${r}-${_}`, N = n.getRuleById(_);
+          !i.getRuleById(D) && N && u.set(D, { ...N, uid: D });
+          const { row: E, col: L } = c(I.startRow, I.startColumn);
+          s.setValue(E, L, D);
         });
       });
       const { redoMutations: f, undoMutations: m } = Qe(
         e.unitId,
         e.subUnitId,
-        s.diffWithAddition(i.getDataValidations(), h.values())
+        s.diffWithAddition(i.getDataValidations(), u.values())
       );
       return {
         redos: f,
         undos: m
       };
     } else {
-      const n = this._dataValidationModel.ensureManager(t, r), i = n.getRuleObjectMatrix().clone(), { ranges: [s, l], mapFunc: d } = Jt([e.copyRange, a]);
-      Na(s, l, !0).forEach(({ startRange: f }) => {
+      const n = this._dataValidationModel.ensureManager(t, r), i = n.getRuleObjectMatrix().clone(), { ranges: [s, l], mapFunc: d } = aa([e.copyRange, a]);
+      Fa(s, l, !0).forEach(({ startRange: f }) => {
         var m;
         (m = this._copyInfo) == null || m.matrix.forValue((v, R, S) => {
-          const M = qe.getPositionRange(
+          const V = qe.getPositionRange(
             {
               startRow: v,
               endRow: v,
@@ -3917,28 +3882,28 @@ let Mt = class extends me {
               endColumn: R
             },
             f
-          ), { row: _, col: I } = d(M.startRow, M.startColumn);
+          ), { row: _, col: I } = d(V.startRow, V.startColumn);
           i.setValue(_, I, S);
         });
       });
-      const { redoMutations: u, undoMutations: h } = Qe(
+      const { redoMutations: h, undoMutations: u } = Qe(
         t,
         r,
         i.diff(n.getDataValidations())
       );
       return {
-        redos: u,
-        undos: h
+        redos: h,
+        undos: u
       };
     }
   }
 };
-Mt = Zs([
-  ge(_e.Ready, Mt),
-  qt(0, yo),
-  qt(1, V(J)),
-  qt(2, V(Ue))
-], Mt);
+Vt = Js([
+  ve(ge.Ready, Vt),
+  Gt(0, Oo),
+  Gt(1, w(Z)),
+  Gt(2, w(Be))
+], Vt);
 class Da {
   constructor(a) {
     g(this, "value");
@@ -3947,21 +3912,21 @@ class Da {
   addRule(a) {
     const e = a.uid;
     a.ranges.forEach((t) => {
-      q.foreach(t, (r, n) => {
+      G.foreach(t, (r, n) => {
         this.value.setValue(r, n, e);
       });
     });
   }
   removeRange(a) {
     a.forEach((e) => {
-      q.foreach(e, (t, r) => {
+      G.foreach(e, (t, r) => {
         this.value.realDeleteValue(t, r);
       });
     });
   }
   removeRule(a) {
     a.ranges.forEach((e) => {
-      q.foreach(e, (t, r) => {
+      G.foreach(e, (t, r) => {
         this.value.setValue(t, r, "");
       });
     });
@@ -3969,15 +3934,15 @@ class Da {
   updateRange(a, e, t) {
     const r = `${a}$`;
     e.forEach((n) => {
-      q.foreach(n, (i, s) => {
+      G.foreach(n, (i, s) => {
         this.value.getValue(i, s) === a && this.value.setValue(i, s, r);
       });
     }), t.forEach((n) => {
-      q.foreach(n, (i, s) => {
+      G.foreach(n, (i, s) => {
         this.value.setValue(i, s, a);
       });
     }), e.forEach((n) => {
-      q.foreach(n, (i, s) => {
+      G.foreach(n, (i, s) => {
         this.value.getValue(i, s) === r && this.value.realDeleteValue(i, s);
       });
     });
@@ -3986,7 +3951,7 @@ class Da {
     const e = [];
     let t = 0;
     return a.forEach((r, n) => {
-      const i = Pt(this.value, (l) => l === r.uid), s = r.ranges;
+      const i = Lt(this.value, (l) => l === r.uid), s = r.ranges;
       (i.length !== s.length || i.some((l, d) => !qe.equals(l, s[d]))) && e.push({
         type: "update",
         ruleId: r.uid,
@@ -4003,7 +3968,7 @@ class Da {
     const t = [];
     let r = 0;
     return a.forEach((n, i) => {
-      const s = Pt(this.value, (d) => d === n.uid), l = n.ranges;
+      const s = Lt(this.value, (d) => d === n.uid), l = n.ranges;
       (s.length !== l.length || s.some((d, c) => !qe.equals(d, l[c]))) && t.push({
         type: "update",
         ruleId: n.uid,
@@ -4015,7 +3980,7 @@ class Da {
         index: i - r
       }), r++);
     }), Array.from(e).forEach((n) => {
-      const i = Pt(this.value, (s) => s === n.uid);
+      const i = Lt(this.value, (s) => s === n.uid);
       t.push({
         type: "add",
         rule: {
@@ -4035,7 +4000,7 @@ class Da {
     return this.value.setValue(a, e, t);
   }
 }
-class Js extends no {
+class el extends lo {
   constructor(e, t, r, n) {
     super(e, t, r);
     /**
@@ -4053,8 +4018,8 @@ class Js extends no {
     r == null || r.forEach((s) => {
       const l = s.uid;
       s.ranges.forEach((d) => {
-        q.foreach(d, (c, u) => {
-          i.setValue(c, u, l);
+        G.foreach(d, (c, h) => {
+          i.setValue(c, h, l);
         });
       });
     }), r == null || r.forEach((s) => {
@@ -4064,7 +4029,7 @@ class Js extends no {
   _addRuleSideEffect(e) {
     var n;
     const { unitId: t, subUnitId: r } = this;
-    (e.type === z.LIST || e.type === z.LIST_MULTIPLE) && cr((n = e.formula1) != null ? n : "") && (e.formula1 = `=${e.formula1}`), this._ruleMatrix.addRule(e), this._dataValidationCacheService.addRule(t, r, e), this._dataValidationFormulaService.addRule(t, r, e.uid, e.formula1, e.formula2), this._dataValidationCustomFormulaService.addRule(t, r, e);
+    (e.type === q.LIST || e.type === q.LIST_MULTIPLE) && cr((n = e.formula1) != null ? n : "") && (e.formula1 = `=${e.formula1}`), this._ruleMatrix.addRule(e), this._dataValidationCacheService.addRule(t, r, e), this._dataValidationFormulaService.addRule(t, r, e.uid, e.formula1, e.formula2), this._dataValidationCustomFormulaService.addRule(t, r, e);
   }
   addRule(e, t) {
     (Array.isArray(e) ? e : [e]).forEach((n) => {
@@ -4075,7 +4040,7 @@ class Js extends no {
     const r = this.getRuleById(e);
     if (!r)
       throw new Error(`Rule not found! id: ${e}`);
-    return t.type === ye.RANGE ? (this._ruleMatrix.updateRange(e, r.ranges, t.payload), this._dataValidationCacheService.updateRuleRanges(this.unitId, this.subUnitId, e, t.payload, r.ranges), this._dataValidationCustomFormulaService.updateRuleRanges(this.unitId, this.subUnitId, e, r.ranges, t.payload)) : t.type === ye.SETTING && (this._dataValidationCacheService.markRangeDirty(this.unitId, this.subUnitId, r.ranges), this._dataValidationFormulaService.updateRuleFormulaText(this.unitId, this.subUnitId, e, t.payload.formula1, t.payload.formula2), this._dataValidationCustomFormulaService.updateRuleFormula(this.unitId, this.subUnitId, e, r.ranges, t.payload.formula1)), super.updateRule(e, t);
+    return t.type === De.RANGE ? (this._ruleMatrix.updateRange(e, r.ranges, t.payload), this._dataValidationCacheService.updateRuleRanges(this.unitId, this.subUnitId, e, t.payload, r.ranges), this._dataValidationCustomFormulaService.updateRuleRanges(this.unitId, this.subUnitId, e, r.ranges, t.payload)) : t.type === De.SETTING && (this._dataValidationCacheService.markRangeDirty(this.unitId, this.subUnitId, r.ranges), this._dataValidationFormulaService.updateRuleFormulaText(this.unitId, this.subUnitId, e, t.payload.formula1, t.payload.formula2), this._dataValidationCustomFormulaService.updateRuleFormula(this.unitId, this.subUnitId, e, r.ranges, t.payload.formula1)), super.updateRule(e, t);
   }
   removeRule(e) {
     const t = this.getRuleById(e);
@@ -4090,23 +4055,23 @@ class Js extends no {
       return this.getRuleById(r);
   }
   validator(e, t, r, n) {
-    const { col: i, row: s, unitId: l, subUnitId: d } = r, c = t.uid, u = this._dataValidatorRegistryService.getValidatorItem(t.type);
-    if (u) {
-      const h = this._cache.getValue(s, i);
-      return !h || h.value !== e ? (this._cache.setValue(s, i, {
+    const { col: i, row: s, unitId: l, subUnitId: d } = r, c = t.uid, h = this._dataValidatorRegistryService.getValidatorItem(t.type);
+    if (h) {
+      const u = this._cache.getValue(s, i);
+      return !u || u.value !== e ? (this._cache.setValue(s, i, {
         value: e,
-        status: Ae.VALIDATING,
+        status: Ce.VALIDATING,
         ruleId: c
-      }), u.validator({ value: e, unitId: l, subUnitId: d, row: s, column: i }, t).then((f) => {
-        const m = f ? Ae.VALID : Ae.INVALID;
+      }), h.validator({ value: e, unitId: l, subUnitId: d, row: s, column: i }, t).then((f) => {
+        const m = f ? Ce.VALID : Ce.INVALID;
         this._cache.setValue(s, i, {
           value: e,
           status: m,
           ruleId: c
-        }), n(m);
-      }), Ae.VALIDATING) : h.status;
+        }), n(m, !0);
+      }), Ce.VALIDATING) : (n(u.status, !1), u.status);
     } else
-      return Ae.VALID;
+      return n(Ce.VALID, !1), Ce.VALID;
   }
   getRuleErrorMsg(e) {
     const t = this.getRuleById(e);
@@ -4119,17 +4084,17 @@ class Js extends no {
     return this._ruleMatrix;
   }
 }
-var el = Object.defineProperty, tl = Object.getOwnPropertyDescriptor, al = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? tl(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+var tl = Object.defineProperty, al = Object.getOwnPropertyDescriptor, rl = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? al(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && el(a, e, r), r;
+  return t && r && tl(a, e, r), r;
 }, St = (o, a) => (e, t) => a(e, t, o);
-let wt = class extends me {
+let Mt = class extends me {
   constructor(o, a, e, t) {
     super(), this._resourceManagerService = o, this._univerInstanceService = a, this._dataValidationModel = e, this._injector = t, this._initDataValidationDataSource();
   }
   _createSheetDataValidationManager(o, a) {
-    return new Js(
+    return new el(
       o,
       a,
       [],
@@ -4140,63 +4105,106 @@ let wt = class extends me {
     this._dataValidationModel.setManagerCreator(this._createSheetDataValidationManager.bind(this));
   }
 };
-wt = al([
-  ge(_e.Starting, wt),
-  St(0, Kr),
-  St(1, ne),
-  St(2, V(J)),
-  St(3, V(Ue))
-], wt);
-var rl = Object.defineProperty, ol = Object.getOwnPropertyDescriptor, nl = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? ol(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+Mt = rl([
+  ve(ge.Starting, Mt),
+  St(0, Jr),
+  St(1, ie),
+  St(2, w(Z)),
+  St(3, w(Be))
+], Mt);
+var ol = Object.defineProperty, nl = Object.getOwnPropertyDescriptor, il = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? nl(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && rl(a, e, r), r;
-}, zt = (o, a) => (e, t) => a(e, t, o);
-let It = class extends me {
+  return t && r && ol(a, e, r), r;
+}, Xt = (o, a) => (e, t) => a(e, t, o);
+let wt = class extends me {
   constructor(o, a, e) {
     super(), this._localeService = o, this._commandService = a, this._sheetPermissionInterceptorBaseController = e, this._commandExecutedListener();
   }
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((o) => {
-        o.id === io.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-          workbookTypes: [ea],
-          rangeTypes: [ra],
-          worksheetTypes: [aa, ta]
-        }) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.setStyleErr"))), o.id === Ma.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-          workbookTypes: [ea],
-          rangeTypes: [ra],
-          worksheetTypes: [aa, ta]
+        o.id === co.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+          workbookTypes: [Zt],
+          rangeTypes: [ta],
+          worksheetTypes: [ea, Jt]
+        }) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.setStyleErr"))), o.id === Va.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+          workbookTypes: [Zt],
+          rangeTypes: [ta],
+          worksheetTypes: [ea, Jt]
         }, o.params.ranges) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.setStyleErr")));
       })
     );
   }
 };
-It = nl([
-  ge(_e.Ready, It),
-  zt(0, V(le)),
-  zt(1, te),
-  zt(2, V(Do))
-], It);
-var il = Object.defineProperty, sl = Object.getOwnPropertyDescriptor, ll = (o, a, e, t) => {
-  for (var r = t > 1 ? void 0 : t ? sl(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+wt = il([
+  ve(ge.Ready, wt),
+  Xt(0, w(le)),
+  Xt(1, te),
+  Xt(2, w(bo))
+], wt);
+var sl = Object.defineProperty, ll = Object.getOwnPropertyDescriptor, dl = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? ll(a, e) : a, n = o.length - 1, i; n >= 0; n--)
+    (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
+  return t && r && sl(a, e, r), r;
+}, qt = (o, a) => (e, t) => a(e, t, o);
+let ha = class {
+  constructor(o, a, e) {
+    this._univerInstanceService = o, this._dataValidationModel = a, this._dataValidationCacheService = e;
+  }
+  async validatorCell(o, a, e, t) {
+    const r = this._univerInstanceService.getUnit(o, se.UNIVER_SHEET);
+    if (!r)
+      throw new Error(`cannot find current workbook, unitId: ${o}`);
+    const n = r.getSheetBySheetId(a);
+    if (!n)
+      throw new Error(`cannot find current worksheet, sheetId: ${a}`);
+    const i = n.getCellRaw(e, t), s = this._dataValidationModel.ensureManager(o, a), l = s.getRuleByLocation(e, t);
+    return l ? new Promise((d) => {
+      s.validator(ne(i), l, { unitId: o, subUnitId: a, row: e, col: t }, d);
+    }) : Ce.VALID;
+  }
+  async validatorWorksheet(o, a) {
+    const t = this._dataValidationModel.ensureManager(o, a).getDataValidations();
+    return await Promise.all(t.map((r) => Promise.all(r.ranges.map((n) => {
+      const i = [];
+      return G.foreach(n, (s, l) => {
+        i.push(this.validatorCell(o, a, s, l));
+      }), i;
+    })))), this._dataValidationCacheService.ensureCache(o, a);
+  }
+  async validatorWorkbook(o) {
+    const a = this._dataValidationModel.getSubUnitIds(o), e = await Promise.all(a.map((r) => this.validatorWorksheet(o, r))), t = {};
+    return e.forEach((r, n) => {
+      t[a[n]] = r;
+    }), t;
+  }
+};
+ha = dl([
+  qt(0, ie),
+  qt(1, w(Z)),
+  qt(2, w(ht))
+], ha);
+var jr = Object.defineProperty, cl = Object.getOwnPropertyDescriptor, ul = (o, a, e) => a in o ? jr(o, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[a] = e, hl = (o, a, e, t) => {
+  for (var r = t > 1 ? void 0 : t ? cl(a, e) : a, n = o.length - 1, i; n >= 0; n--)
     (i = o[n]) && (r = (t ? i(a, e, r) : i(r)) || r);
-  return t && r && il(a, e, r), r;
-}, Qt = (o, a) => (e, t) => a(e, t, o), Rt;
-let qa = (Rt = class extends Zr {
+  return t && r && jr(a, e, r), r;
+}, zt = (o, a) => (e, t) => a(e, t, o), Br = (o, a, e) => (ul(o, typeof a != "symbol" ? a + "" : a, e), e);
+let Nt = class extends to {
   constructor(o = {}, a, e, t) {
-    super(), this._config = o, this._injector = a, this._commandService = e, this._localeService = t, this._config = $.deepMerge({}, Bs, this._config);
+    super(), this._config = o, this._injector = a, this._commandService = e, this._localeService = t, this._config = U.deepMerge({}, $s, this._config);
   }
   onStarting(o) {
     [
       [we],
-      [Ot],
+      [yt],
       [ht],
       [he],
       [Ke],
-      [$e],
+      [je],
+      [ha],
       // controller
-      [wt],
+      [Mt],
       [rt],
       [
         nt,
@@ -4204,56 +4212,60 @@ let qa = (Rt = class extends Zr {
           useFactory: () => this._injector.createInstance(nt, this._config)
         }
       ],
-      [Ct],
+      [Rt],
       [it],
-      [It],
+      [wt],
+      [Ct],
       [Vt],
-      [Mt],
       [at],
       [ot]
     ].forEach((a) => {
       o.add(a);
     }), [
-      wa,
-      _r,
       Ma,
-      // operation
+      _r,
       Va,
-      Cn,
+      // operation
+      Ca,
+      Vn,
       gr,
       ct,
-      Rn
+      Cn
     ].forEach((a) => {
       this._commandService.registerCommand(a);
     });
   }
-}, g(Rt, "pluginName", Ia), g(Rt, "type", ue.UNIVER_SHEET), Rt);
-qa = ll([
-  Qt(1, V(Ue)),
-  Qt(2, te),
-  Qt(3, V(le))
-], qa);
+};
+Br(Nt, "pluginName", wa);
+Br(Nt, "type", se.UNIVER_SHEET);
+Nt = hl([
+  eo(uo, _o, To),
+  zt(1, w(Be)),
+  zt(2, te),
+  zt(3, w(le))
+], Nt);
 export {
   _r as AddSheetDataValidationAndOpenCommand,
-  wa as AddSheetDataValidationCommand,
-  Ia as DATA_VALIDATION_PLUGIN_NAME,
-  Ct as DataValidationAlertController,
-  Vt as DataValidationAutoFillController,
+  Ma as AddSheetDataValidationCommand,
+  wa as DATA_VALIDATION_PLUGIN_NAME,
+  Rt as DataValidationAlertController,
+  Ct as DataValidationAutoFillController,
   ht as DataValidationCacheService,
   rt as DataValidationController,
-  Mt as DataValidationCopyPasteController,
+  Vt as DataValidationCopyPasteController,
   Ke as DataValidationCustomFormulaService,
   at as DataValidationFormulaController,
   he as DataValidationFormulaService,
   it as DataValidationRefRangeController,
   ot as DataValidationRejectInputController,
-  nt as DataValidationRenderController,
-  Cn as HideDataValidationDropdown,
-  El as ICommandService,
-  Ol as LocaleService,
-  bl as Plugin,
-  Ot as SheetDataValidationService,
-  Va as ShowDataValidationDropdown,
-  qa as UniverSheetsDataValidationPlugin,
-  Ma as UpdateSheetDataValidationRangeCommand
+  Vn as HideDataValidationDropdown,
+  Tl as ICommandService,
+  Nl as LocaleService,
+  Fl as Plugin,
+  yt as SheetDataValidationService,
+  nt as SheetsDataValidationRenderController,
+  ha as SheetsDataValidationValidatorService,
+  Ca as ShowDataValidationDropdown,
+  Nt as UniverSheetsDataValidationPlugin,
+  Va as UpdateSheetDataValidationRangeCommand
 };