@univerjs/sheets-data-validation 0.1.15 → 0.1.16

package/lib/es/index.js

@@ -1,23 +1,23 @@
 var $r = Object.defineProperty;
 var Wr = (r, a, e) => a in r ? $r(r, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[a] = e;
-var v = (r, a, e) => (Wr(r, typeof a != "symbol" ? a + "" : a, e), e);
-import { Disposable as he, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Hr, DisposableCollection as Qa, IUniverInstanceService as ee, UniverInstanceType as ae, toDisposable as ma, CommandType as ye, ICommandService as re, IUndoRedoService as Ka, sequenceExecuteAsync as Za, LocaleService as ie, DataValidationErrorStyle as tt, UndoCommand as kr, RedoCommand as Yr, isUnitRangesEqual as Gr, createInternalEditorID as fa, isValidRange as Xr, debounce as qr, shallowEqual as Oa, DEFAULT_EMPTY_DOCUMENT_VALUE as Ja, OnLifecycle as ve, LifecycleStages as ge, IPermissionService as zr, isFormulaString as T, DataValidationType as q, Tools as U, ObjectMatrix as lt, Range as $, ThemeService as Qr, VerticalAlign as de, HorizontalAlign as Ae, DataValidationOperator as C, WrapStrategy as pe, DataValidationRenderMode as ce, DocumentDataModel as Kr, BooleanNumber as Je, Rectangle as xe, RxDisposable as er, DataValidationStatus as Re, sequenceExecute as Zr, isRangesEqual as Jr, queryObjectMatrix as Pt, IResourceManagerService as eo, DependentOn as to, Plugin as ao } from "@univerjs/core";
+var g = (r, a, e) => Wr(r, typeof a != "symbol" ? a + "" : a, e);
+import { Disposable as he, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Hr, DisposableCollection as Qa, IUniverInstanceService as te, UniverInstanceType as ae, toDisposable as ma, CommandType as ye, ICommandService as re, IUndoRedoService as Ka, sequenceExecuteAsync as Za, LocaleService as ie, DataValidationErrorStyle as at, UndoCommand as kr, RedoCommand as Yr, isUnitRangesEqual as Xr, createInternalEditorID as fa, isValidRange as Gr, debounce as qr, shallowEqual as Oa, DEFAULT_EMPTY_DOCUMENT_VALUE as Ja, OnLifecycle as ve, LifecycleStages as ge, IPermissionService as zr, isFormulaString as N, DataValidationType as X, Tools as B, ObjectMatrix as dt, Range as U, ThemeService as Qr, VerticalAlign as de, HorizontalAlign as Ae, DataValidationOperator as C, WrapStrategy as pe, DataValidationRenderMode as ce, DocumentDataModel as Kr, BooleanNumber as Je, Rectangle as xe, RxDisposable as er, DataValidationStatus as Re, sequenceExecute as Zr, isRangesEqual as Jr, queryObjectMatrix as At, IResourceManagerService as eo, DependentOn as to, Plugin as ao } from "@univerjs/core";
 import { ICommandService as Dl, LocaleService as El, Plugin as Ol } from "@univerjs/core";
-import { Inject as w, Injector as Ue } from "@wendellhu/redi";
-import { DataValidatorRegistryService as De, DataValidationModel as K, AddDataValidationMutation as Jt, RemoveDataValidationMutation as It, createDefaultNewRule as tr, UpdateDataValidationMutation as Ge, UpdateRuleType as Ie, DataValidatorRegistryScope as ro, TWO_FORMULA_OPERATOR_COUNT as oo, getRuleOptions as ba, getRuleSetting as Ta, UpdateDataValidationSettingCommand as Na, RemoveDataValidationCommand as ar, UpdateDataValidationOptionsCommand as no, BaseDataValidator as $e, TextLengthErrorTitleMap as io, RemoveAllDataValidationCommand as so, removeDataValidationUndoFactory as lo, DataValidationManager as co, AddDataValidationCommand as uo, UniverDataValidationPlugin as ho } from "@univerjs/data-validation";
+import { Inject as I, Injector as Ue } from "@wendellhu/redi";
+import { DataValidatorRegistryService as De, DataValidationModel as K, AddDataValidationMutation as Jt, RemoveDataValidationMutation as yt, createDefaultNewRule as tr, UpdateDataValidationMutation as Xe, UpdateRuleType as Ie, DataValidatorRegistryScope as ro, TWO_FORMULA_OPERATOR_COUNT as oo, getRuleOptions as ba, getRuleSetting as Ta, UpdateDataValidationSettingCommand as Fa, RemoveDataValidationCommand as ar, UpdateDataValidationOptionsCommand as no, BaseDataValidator as $e, TextLengthErrorTitleMap as io, RemoveAllDataValidationCommand as so, removeDataValidationUndoFactory as lo, DataValidationManager as co, AddDataValidationCommand as uo, UniverDataValidationPlugin as ho } from "@univerjs/data-validation";
 import { getSheetCommandTarget as rr, WorksheetViewPermission as mo, SetRangeValuesCommand as pa, WorkbookEditablePermission as ea, WorksheetSetCellStylePermission as ta, WorksheetEditPermission as aa, RangeProtectionPermissionEditPoint as ra, SelectionManagerService as fo, SheetInterceptorService as or, ClearSelectionAllCommand as po, INTERCEPTOR_POINT as vo, RefRangeService as go, handleCommonDefaultRangeChangeWithEffectRefCommands as _o, UniverSheetsPlugin as So } from "@univerjs/sheets";
-import { SheetCanvasPopManagerService as Ro, IMarkSelectionService as Co, getCurrentRangeDisable$ as Vo, IEditorBridgeService as va, AutoHeightController as Mo, SheetSkeletonManagerService as Fa, HoverManagerService as wo, CellAlertManagerService as Io, CellAlertType as yo, IAutoFillService as Do, APPLY_TYPE as At, virtualizeDiscreteRanges as oa, getAutoFillRepeatRange as Eo, COPY_TYPE as La, rangeToDiscreteRange as Oo, PREDEFINED_HOOK_NAME as xt, getRepeatRange as Pa, ISheetClipboardService as bo, SheetPermissionInterceptorBaseController as To, UniverSheetsUIPlugin as No } from "@univerjs/sheets-ui";
-import { useObservable as Ze, ComponentManager as dt, IZenZoneService as Fo, ISidebarService as nr, useEvent as ir, RangeSelector as Lo, TextEditor as sr, MenuItemType as ga, MenuPosition as Po, MenuGroup as Ao, getMenuHiddenObservable as xo, KeyCode as jo, IDialogService as Bo, IMenuService as Uo } from "@univerjs/ui";
-import { IRenderManagerService as lr, fixLineWidthByScale as Aa, Transform as $o, Checkbox as Wo, getDocsSkeletonPageSize as mt, Rect as dr, DocumentViewModel as Ho, DocumentSkeleton as ko, Documents as Yo, FontCache as Go, Shape as Xo, getFontStyleString as xa, DeviceInputEventType as qo } from "@univerjs/engine-render";
-import na, { forwardRef as Ee, useRef as _a, createElement as Oe, useState as z, useMemo as yt, useEffect as qe } from "react";
-import { useDependency as E } from "@wendellhu/redi/react-bindings";
+import { SheetCanvasPopManagerService as Ro, IMarkSelectionService as Co, getCurrentRangeDisable$ as Vo, IEditorBridgeService as va, AutoHeightController as Mo, SheetSkeletonManagerService as Na, HoverManagerService as wo, CellAlertManagerService as Io, CellAlertType as yo, IAutoFillService as Do, APPLY_TYPE as et, virtualizeDiscreteRanges as oa, getAutoFillRepeatRange as Eo, COPY_TYPE as La, rangeToDiscreteRange as Oo, PREDEFINED_HOOK_NAME as xt, getRepeatRange as Pa, ISheetClipboardService as bo, SheetPermissionInterceptorBaseController as To, UniverSheetsUIPlugin as Fo } from "@univerjs/sheets-ui";
+import { useObservable as Ze, ComponentManager as ct, IZenZoneService as No, ISidebarService as nr, useEvent as ir, RangeSelector as Lo, TextEditor as sr, MenuItemType as ga, MenuPosition as Po, MenuGroup as Ao, getMenuHiddenObservable as xo, KeyCode as jo, IDialogService as Bo, IMenuService as Uo } from "@univerjs/ui";
+import { IRenderManagerService as lr, fixLineWidthByScale as Aa, Transform as $o, Checkbox as Wo, getDocsSkeletonPageSize as ft, Rect as dr, DocumentViewModel as Ho, DocumentSkeleton as ko, Documents as Yo, FontCache as Xo, Shape as Go, getFontStyleString as xa, DeviceInputEventType as qo } from "@univerjs/engine-render";
+import na, { forwardRef as Ee, useRef as _a, createElement as Oe, useState as z, useMemo as Dt, useEffect as qe } from "react";
+import { useDependency as T } from "@wendellhu/redi/react-bindings";
 import { FormLayout as Q, RadioGroup as Sa, Radio as Le, Checkbox as cr, Input as Pe, Select as ia, Button as ze, DraggableList as zo, RectPopup as Qo, Scrollbar as Ko, DatePanel as Zo } from "@univerjs/design";
 import { serializeRange as ur, LexerTreeBuilder as Ra, deserializeRangeWithSheet as hr, isFormulaTransformable as Jo, transformFormula as ja, isReferenceString as Ca, sequenceNodeType as en } from "@univerjs/engine-formula";
 import { Subject as mr, filter as tn, BehaviorSubject as Ba, distinctUntilChanged as an, debounceTime as rn } from "rxjs";
 import on from "clsx";
 import { RegisterOtherFormulaService as fr, FormulaRefRangeService as nn, SPECIAL_PASTE_FORMULA as sn } from "@univerjs/sheets-formula";
 import je from "dayjs";
-var pr = { exports: {} }, Lt = {};
+var pr = { exports: {} }, Pt = {};
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -31,20 +31,17 @@ var ln = na, dn = Symbol.for("react.element"), cn = Symbol.for("react.fragment")
 function vr(r, a, e) {
   var t, o = {}, 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)
-    un.call(a, t) && !mn.hasOwnProperty(t) && (o[t] = a[t]);
-  if (r && r.defaultProps)
-    for (t in a = r.defaultProps, a)
-      o[t] === void 0 && (o[t] = a[t]);
+  for (t in a) un.call(a, t) && !mn.hasOwnProperty(t) && (o[t] = a[t]);
+  if (r && r.defaultProps) for (t in a = r.defaultProps, a) o[t] === void 0 && (o[t] = a[t]);
   return { $$typeof: dn, type: r, key: n, ref: i, props: o, _owner: hn.current };
 }
-Lt.Fragment = cn;
-Lt.jsx = vr;
-Lt.jsxs = vr;
-pr.exports = Lt;
+Pt.Fragment = cn;
+Pt.jsx = vr;
+Pt.jsxs = vr;
+pr.exports = Pt;
 var p = pr.exports;
 function fn() {
-  const r = E(Be), a = Ze(r.activeDropdown$, r.activeDropdown), e = E(dt);
+  const r = T(Be), a = Ze(r.activeDropdown$, r.activeDropdown), e = T(ct);
   if (!a)
     return null;
   const { location: t, componentKey: o } = a, n = e.get(o), i = `${t.unitId}-${t.subUnitId}-${t.row}-${t.col}`;
@@ -71,11 +68,11 @@ var pn = Object.defineProperty, vn = Object.getOwnPropertyDescriptor, gn = (r, a
 let Be = class extends he {
   constructor(a, e, t, o, n, i) {
     super();
-    v(this, "_activeDropdown");
-    v(this, "_activeDropdown$", new mr());
-    v(this, "_currentPopup", null);
-    v(this, "activeDropdown$", this._activeDropdown$.asObservable());
-    v(this, "_zenVisible", !1);
+    g(this, "_activeDropdown");
+    g(this, "_activeDropdown$", new mr());
+    g(this, "_currentPopup", null);
+    g(this, "activeDropdown$", this._activeDropdown$.asObservable());
+    g(this, "_zenVisible", !1);
     this._canvasPopupManagerService = a, this._univerInstanceService = e, this._dataValidatorRegistryService = t, this._zenZoneService = o, this._renderManagerService = n, this._dataValidationModel = i, this._init();
   }
   get activeDropdown() {
@@ -146,12 +143,12 @@ let Be = class extends he {
   }
 };
 Be = gn([
-  We(0, w(Ro)),
-  We(1, ee),
-  We(2, w(De)),
-  We(3, Fo),
+  We(0, I(Ro)),
+  We(1, te),
+  We(2, I(De)),
+  We(3, No),
   We(4, lr),
-  We(5, w(K))
+  We(5, I(K))
 ], Be);
 var _n = Object.defineProperty, Sn = Object.getOwnPropertyDescriptor, Rn = (r, a, e, t) => {
   for (var o = t > 1 ? void 0 : t ? Sn(a, e) : a, n = r.length - 1, i; n >= 0; n--)
@@ -161,12 +158,12 @@ var _n = Object.defineProperty, Sn = Object.getOwnPropertyDescriptor, Rn = (r, a
 let Ve = class extends he {
   constructor(a, e) {
     super();
-    v(this, "_open$", new Ba(!1));
-    v(this, "open$", this._open$.pipe(an()));
-    v(this, "_activeRule");
-    v(this, "_activeRule$", new Ba(void 0));
-    v(this, "activeRule$", this._activeRule$.asObservable());
-    v(this, "_closeDisposable", null);
+    g(this, "_open$", new Ba(!1));
+    g(this, "open$", this._open$.pipe(an()));
+    g(this, "_activeRule");
+    g(this, "_activeRule$", new Ba(void 0));
+    g(this, "activeRule$", this._activeRule$.asObservable());
+    g(this, "_closeDisposable", null);
     this._univerInstanceService = a, this._sidebarService = e, this.disposeWithMe(
       this._univerInstanceService.getCurrentTypeOfUnit$(ae.UNIVER_SHEET).pipe(tn((t) => !t)).subscribe(() => {
         this.close();
@@ -200,31 +197,30 @@ let Ve = class extends he {
   }
 };
 Ve = Rn([
-  Ua(0, ee),
+  Ua(0, te),
   Ua(1, nr)
 ], Ve);
-const _r = "DataValidationPanel", ct = {
+const _r = "DataValidationPanel", ut = {
   id: "data-validation.operation.open-validation-panel",
   type: ye.OPERATION,
   handler(r, a) {
     if (!a)
       return !1;
-    const { ruleId: e, isAdd: t } = a, o = r.get(Ve), n = r.get(K), i = r.get(ee), s = r.get(nr), l = rr(i);
-    if (!l)
-      return !1;
+    const { ruleId: e, isAdd: t } = a, o = r.get(Ve), n = r.get(K), i = r.get(te), s = r.get(nr), l = rr(i);
+    if (!l) return !1;
     const { unitId: d, subUnitId: c } = l, u = e ? n.getRuleById(d, c, e) : void 0;
     o.open(), o.setActiveRule(u && {
       unitId: d,
       subUnitId: c,
       rule: u
     });
-    const m = s.open({
+    const h = s.open({
       header: { title: t ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
       children: { label: _r },
       width: 312,
       onClose: () => o.close()
     });
-    return o.setCloseDisposable(m), !0;
+    return o.setCloseDisposable(h), !0;
   }
 }, Sr = {
   id: "data-validation.operation.close-validation-panel",
@@ -237,7 +233,7 @@ const _r = "DataValidationPanel", ct = {
   type: ye.OPERATION,
   handler(r) {
     const a = r.get(re), e = r.get(Ve);
-    return e.open(), e.isOpen ? a.executeCommand(Sr.id) : a.executeCommand(ct.id), !0;
+    return e.open(), e.isOpen ? a.executeCommand(Sr.id) : a.executeCommand(ut.id), !0;
   }
 }, Va = {
   type: ye.OPERATION,
@@ -266,7 +262,7 @@ function Qe(r, a, e) {
     switch (n.type) {
       case "delete":
         t.push({
-          id: It.id,
+          id: yt.id,
           params: {
             unitId: r,
             subUnitId: a,
@@ -284,7 +280,7 @@ function Qe(r, a, e) {
         break;
       case "update": {
         t.push({
-          id: Ge.id,
+          id: Xe.id,
           params: {
             unitId: r,
             subUnitId: a,
@@ -295,7 +291,7 @@ function Qe(r, a, e) {
             }
           }
         }), o.unshift({
-          id: Ge.id,
+          id: Xe.id,
           params: {
             unitId: r,
             subUnitId: a,
@@ -317,7 +313,7 @@ function Qe(r, a, e) {
             rule: n.rule
           }
         }), o.unshift({
-          id: It.id,
+          id: yt.id,
           params: {
             unitId: r,
             subUnitId: a,
@@ -341,14 +337,14 @@ const Ma = {
     const { unitId: e, subUnitId: t, ranges: o, ruleId: n } = a, i = r.get(K), s = r.get(re), l = r.get(Ka), d = i.ensureManager(e, t), c = d.getRuleById(n);
     if (!c)
       return !1;
-    const u = c.ranges, m = d.getRuleObjectMatrix().clone();
-    m.updateRange(n, u, o);
-    const f = m.diff(d.getDataValidations()), { redoMutations: h, undoMutations: g } = Qe(e, t, f);
+    const u = c.ranges, h = d.getRuleObjectMatrix().clone();
+    h.updateRange(n, u, o);
+    const f = h.diff(d.getDataValidations()), { redoMutations: m, undoMutations: v } = Qe(e, t, f);
     return l.pushUndoRedo({
-      undoMutations: g,
-      redoMutations: h,
+      undoMutations: v,
+      redoMutations: m,
       unitID: e
-    }), await Za(h, s), !0;
+    }), await Za(m, s), !0;
   }
 }, wa = {
   type: ye.COMMAND,
@@ -362,12 +358,12 @@ const Ma = {
       unitId: e,
       subUnitId: t,
       rule: o
-    }, { redoMutations: m, undoMutations: f } = Qe(e, t, c);
-    return m.push({
+    }, { redoMutations: h, undoMutations: f } = Qe(e, t, c);
+    return h.push({
       id: Jt.id,
       params: u
     }), f.unshift({
-      id: It.id,
+      id: yt.id,
       params: {
         unitId: e,
         subUnitId: t,
@@ -375,23 +371,22 @@ const Ma = {
       }
     }), s.pushUndoRedo({
       unitID: e,
-      redoMutations: m,
+      redoMutations: h,
       undoMutations: f
-    }), await Za(m, i), !0;
+    }), await Za(h, i), !0;
   }
 }, Rr = {
   type: ye.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   async handler(r) {
-    const a = r.get(ee), e = rr(a);
-    if (!e)
-      return !1;
+    const a = r.get(te), e = rr(a);
+    if (!e) return !1;
     const { workbook: t, worksheet: o } = e, n = tr(r), i = r.get(re), s = t.getUnitId(), l = o.getSheetId(), d = {
       rule: n,
       unitId: s,
       subUnitId: l
     };
-    return await i.executeCommand(wa.id, d) ? (i.executeCommand(ct.id, {
+    return await i.executeCommand(wa.id, d) ? (i.executeCommand(ut.id, {
       ruleId: n.uid,
       isAdd: !0
     }), !0) : !1;
@@ -401,15 +396,13 @@ var le = function() {
   return le = Object.assign || function(r) {
     for (var a, e = 1, t = arguments.length; e < t; e++) {
       a = arguments[e];
-      for (var o in a)
-        Object.prototype.hasOwnProperty.call(a, o) && (r[o] = a[o]);
+      for (var o in a) Object.prototype.hasOwnProperty.call(a, o) && (r[o] = a[o]);
     }
     return r;
   }, le.apply(this, arguments);
 }, Mn = function(r, a) {
   var e = {};
-  for (var t in r)
-    Object.prototype.hasOwnProperty.call(r, t) && a.indexOf(t) < 0 && (e[t] = r[t]);
+  for (var t in r) Object.prototype.hasOwnProperty.call(r, t) && a.indexOf(t) < 0 && (e[t] = r[t]);
   if (r != null && typeof Object.getOwnPropertySymbols == "function")
     for (var o = 0, t = Object.getOwnPropertySymbols(r); o < t.length; o++)
       a.indexOf(t[o]) < 0 && Object.prototype.propertyIsEnumerable.call(r, t[o]) && (e[t[o]] = r[t[o]]);
@@ -482,19 +475,19 @@ var Tn = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em"
   }));
 });
 Ir.displayName = "MoreDownSingle";
-var Nn = { 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 = Ee(function(r, a) {
+var Fn = { 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 = Ee(function(r, a) {
   return Oe(be, Object.assign({}, r, {
     id: "more-up-single",
     ref: a,
-    icon: Nn
+    icon: Fn
   }));
 });
 yr.displayName = "MoreUpSingle";
-var Fn = { 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 = Ee(function(r, a) {
+var Nn = { 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 = Ee(function(r, a) {
   return Oe(be, Object.assign({}, r, {
     id: "sequence-single",
     ref: a,
-    icon: Fn
+    icon: Nn
   }));
 });
 Dr.displayName = "SequenceSingle";
@@ -504,7 +497,7 @@ const Ln = "univer-data-validation-options-button", Pn = "univer-data-validation
 };
 function An(r) {
   var d;
-  const a = E(ie), e = E(dt), { value: t, onChange: o, extraComponent: n } = r, [i, s] = z(!1), l = n ? e.get(n) : null;
+  const a = T(ie), e = T(ct), { value: t, onChange: o, extraComponent: n } = r, [i, s] = z(!1), l = n ? e.get(n) : null;
   return /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
     /* @__PURE__ */ p.jsxs("div", { className: jt.dataValidationOptionsButton, onClick: () => s(!i), children: [
       a.t("dataValidation.panel.options"),
@@ -519,11 +512,11 @@ function An(r) {
           children: /* @__PURE__ */ p.jsxs(
             Sa,
             {
-              value: `${(d = t.errorStyle) != null ? d : tt.WARNING}`,
+              value: `${(d = t.errorStyle) != null ? d : at.WARNING}`,
               onChange: (c) => o({ ...t, errorStyle: +c }),
               children: [
-                /* @__PURE__ */ p.jsx(Le, { value: `${tt.WARNING}`, children: a.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ p.jsx(Le, { value: `${tt.STOP}`, children: a.t("dataValidation.panel.rejectInput") })
+                /* @__PURE__ */ p.jsx(Le, { value: `${at.WARNING}`, children: a.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ p.jsx(Le, { value: `${at.STOP}`, children: a.t("dataValidation.panel.rejectInput") })
               ]
             }
           )
@@ -562,89 +555,89 @@ const xn = "univer-data-validation-detail-form-item", jn = "univer-data-validati
   275
 );
 function $n() {
-  const [r, a] = z(0), e = E(Ve), t = Ze(e.activeRule$, e.activeRule), { unitId: o, subUnitId: n, rule: i } = t || {}, s = i.uid, l = E(De), d = E(dt), c = E(re), u = E(K), m = E(ie), [f, h] = z(i), g = l.getValidatorItem(f.type), [R, _] = z(!1), V = l.getValidatorsByScope(ro.SHEET), [S, I] = z(() => f.ranges.map((M) => ({ unitId: "", sheetId: "", range: M }))), y = yt(() => Un(c), [c]);
+  const [r, a] = z(0), e = T(Ve), t = Ze(e.activeRule$, e.activeRule), { unitId: o, subUnitId: n, rule: i } = t || {}, s = i.uid, l = T(De), d = T(ct), c = T(re), u = T(K), h = T(ie), [f, m] = z(i), v = l.getValidatorItem(f.type), [R, _] = z(!1), V = l.getValidatorsByScope(ro.SHEET), [S, y] = z(() => f.ranges.map((M) => ({ unitId: "", sheetId: "", range: M }))), w = Dt(() => Un(c), [c]);
   if (qe(() => {
     c.onCommandExecuted((M) => {
       (M.id === kr.id || M.id === Yr.id) && setTimeout(() => {
-        const b = u.getRuleById(o, n, s);
-        a((Z) => Z + 1), b && (h(b), I(b.ranges.map((Z) => ({ unitId: "", sheetId: "", range: Z }))));
+        const O = u.getRuleById(o, n, s);
+        a((J) => J + 1), O && (m(O), y(O.ranges.map((J) => ({ unitId: "", sheetId: "", range: J }))));
       }, 20);
     });
-  }, [c, u, s, n, o]), !g)
+  }, [c, u, s, n, o]), !v)
     return null;
-  const O = g.operators, j = g.operatorNames, P = f.operator ? oo.includes(f.operator) : !1, N = () => {
-    g.validatorFormula(f, o, n).success ? e.setActiveRule(null) : _(!0);
-  }, A = ir((M) => {
-    if (Gr(M, S))
+  const F = v.operators, x = v.operatorNames, j = f.operator ? oo.includes(f.operator) : !1, $ = () => {
+    v.validatorFormula(f, o, n).success ? e.setActiveRule(null) : _(!0);
+  }, E = ir((M) => {
+    if (Xr(M, S))
       return;
-    I(M);
-    const b = M.filter((X) => (!X.unitId || X.unitId === o) && (!X.sheetId || X.sheetId === n)).map((X) => X.range);
-    if (h({
+    y(M);
+    const O = M.filter((G) => (!G.unitId || G.unitId === o) && (!G.sheetId || G.sheetId === n)).map((G) => G.range);
+    if (m({
       ...f,
-      ranges: b
-    }), b.length === 0)
+      ranges: O
+    }), O.length === 0)
       return;
-    const Z = {
+    const J = {
       unitId: o,
       subUnitId: n,
       ruleId: s,
-      ranges: b
+      ranges: O
     };
-    y(Ma.id, Z);
-  }), F = (M) => {
+    w(Ma.id, J);
+  }), P = (M) => {
     if (Oa(M, Ta(f)))
       return;
-    h({
+    m({
       ...f,
       ...M
     });
-    const b = {
+    const O = {
       unitId: o,
       subUnitId: n,
       ruleId: s,
       setting: M
     };
-    y(
-      Na.id,
-      b,
+    w(
+      Fa.id,
+      O,
       void 0
     );
-  }, B = async () => {
+  }, A = async () => {
     await c.executeCommand(ar.id, {
       ruleId: s,
       unitId: o,
       subUnitId: n
     }), e.setActiveRule(null);
-  }, Y = {
+  }, q = {
     type: f.type,
     operator: f.operator,
     formula1: f.formula1,
     formula2: f.formula2,
     allowBlank: f.allowBlank
-  }, x = (M) => {
-    const b = l.getValidatorItem(M);
-    if (!b)
+  }, L = (M) => {
+    const O = l.getValidatorItem(M);
+    if (!O)
       return;
-    const Z = b.operators, X = u.getRuleById(o, n, s), me = M === (X == null ? void 0 : X.type) ? {
-      ...X
+    const J = O.operators, G = u.getRuleById(o, n, s), me = M === (G == null ? void 0 : G.type) ? {
+      ...G
     } : {
       ...f,
       type: M,
-      operator: Z[0],
+      operator: J[0],
       formula1: void 0,
       formula2: void 0
     };
-    h(me), c.executeCommand(Na.id, {
+    m(me), c.executeCommand(Fa.id, {
       unitId: o,
       subUnitId: n,
       ruleId: f.uid,
       setting: Ta(me)
     });
-  }, L = d.get(g.formulaInput), G = yt(() => S.map((M) => ur(M.range)).join(","), []), te = ba(f), H = (M) => {
-    Oa(M, ba(f)) || (h({
+  }, b = d.get(v.formulaInput), Y = Dt(() => S.map((M) => ur(M.range)).join(","), []), Z = ba(f), H = (M) => {
+    Oa(M, ba(f)) || (m({
       ...f,
       ...M
-    }), y(
+    }), w(
       no.id,
       {
         unitId: o,
@@ -655,105 +648,105 @@ function $n() {
     ));
   };
   return /* @__PURE__ */ p.jsxs("div", { children: [
-    /* @__PURE__ */ p.jsx(Q, { label: m.t("dataValidation.panel.range"), children: /* @__PURE__ */ p.jsx(
+    /* @__PURE__ */ p.jsx(Q, { label: h.t("dataValidation.panel.range"), children: /* @__PURE__ */ p.jsx(
       Lo,
       {
         className: He.dataValidationDetailFormItem,
-        value: G,
+        value: Y,
         id: fa("data-validation-detail"),
         openForSheetUnitId: o,
         openForSheetSubUnitId: n,
         onChange: (M) => {
-          M.some((b) => !Xr(b.range) || b.range.endColumn < b.range.startColumn || b.range.endRow < b.range.startRow) || A(M);
+          M.some((O) => !Gr(O.range) || O.range.endColumn < O.range.startColumn || O.range.endRow < O.range.startRow) || E(M);
         }
       },
       r
     ) }),
-    /* @__PURE__ */ p.jsx(Q, { label: m.t("dataValidation.panel.type"), children: /* @__PURE__ */ p.jsx(
+    /* @__PURE__ */ p.jsx(Q, { label: h.t("dataValidation.panel.type"), children: /* @__PURE__ */ p.jsx(
       ia,
       {
         options: V == null ? void 0 : V.map((M) => ({
-          label: m.t(M.title),
+          label: h.t(M.title),
           value: M.id
         })),
         value: f.type,
-        onChange: x,
+        onChange: L,
         className: He.dataValidationDetailFormItem
       }
     ) }),
-    O != null && O.length ? /* @__PURE__ */ p.jsx(Q, { label: m.t("dataValidation.panel.operator"), children: /* @__PURE__ */ p.jsx(
+    F != null && F.length ? /* @__PURE__ */ p.jsx(Q, { label: h.t("dataValidation.panel.operator"), children: /* @__PURE__ */ p.jsx(
       ia,
       {
-        options: O.map((M, b) => ({
+        options: F.map((M, O) => ({
           value: `${M}`,
-          label: j[b]
+          label: x[O]
         })),
         value: `${f.operator}`,
         onChange: (M) => {
-          F({
-            ...Y,
+          P({
+            ...q,
             operator: M
           });
         },
         className: He.dataValidationDetailFormItem
       }
     ) }) : null,
-    L ? /* @__PURE__ */ p.jsx(
-      L,
+    b ? /* @__PURE__ */ p.jsx(
+      b,
       {
-        isTwoFormula: P,
+        isTwoFormula: j,
         value: {
           formula1: f.formula1,
           formula2: f.formula2
         },
         onChange: (M) => {
-          F({
-            ...Y,
+          P({
+            ...q,
             ...M
           });
         },
         showError: R,
-        validResult: g.validatorFormula(f, o, n),
+        validResult: v.validatorFormula(f, o, n),
         unitId: o,
         subUnitId: n,
         ruleId: s
       },
       r
     ) : null,
-    /* @__PURE__ */ p.jsx(An, { value: te, onChange: H, extraComponent: g.optionsInput }),
+    /* @__PURE__ */ p.jsx(An, { value: Z, onChange: H, extraComponent: v.optionsInput }),
     /* @__PURE__ */ p.jsxs("div", { className: He.dataValidationDetailButtons, children: [
-      /* @__PURE__ */ p.jsx(ze, { className: He.dataValidationDetailButton, onClick: B, children: m.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ p.jsx(ze, { className: He.dataValidationDetailButton, type: "primary", onClick: N, children: m.t("dataValidation.panel.done") })
+      /* @__PURE__ */ p.jsx(ze, { className: He.dataValidationDetailButton, onClick: A, children: h.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ p.jsx(ze, { className: He.dataValidationDetailButton, type: "primary", onClick: $, children: h.t("dataValidation.panel.done") })
     ] })
   ] });
 }
-var Dt = /* @__PURE__ */ ((r) => (r[r.View = 0] = "View", r[r.Edit = 1] = "Edit", r[r.ManageCollaborator = 2] = "ManageCollaborator", r[r.Print = 3] = "Print", r[r.Duplicate = 4] = "Duplicate", r[r.Comment = 5] = "Comment", r[r.Copy = 6] = "Copy", r[r.Share = 7] = "Share", r[r.Export = 8] = "Export", r[r.MoveWorksheet = 9] = "MoveWorksheet", r[r.DeleteWorksheet = 10] = "DeleteWorksheet", r[r.HideWorksheet = 11] = "HideWorksheet", r[r.RenameWorksheet = 12] = "RenameWorksheet", r[r.CreateWorksheet = 13] = "CreateWorksheet", r[r.SetWorksheetStyle = 14] = "SetWorksheetStyle", r[r.EditWorksheetCell = 15] = "EditWorksheetCell", r[r.InsertHyperlink = 16] = "InsertHyperlink", r[r.Sort = 17] = "Sort", r[r.Filter = 18] = "Filter", r[r.PivotTable = 19] = "PivotTable", r[r.FloatImg = 20] = "FloatImg", r[r.History = 21] = "History", r[r.RwHgtClWdt = 22] = "RwHgtClWdt", r[r.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", r[r.ViewFilter = 24] = "ViewFilter", r[r.MoveSheet = 25] = "MoveSheet", r[r.DeleteSheet = 26] = "DeleteSheet", r[r.HideSheet = 27] = "HideSheet", r[r.CopySheet = 28] = "CopySheet", r[r.RenameSheet = 29] = "RenameSheet", r[r.CreateSheet = 30] = "CreateSheet", r[r.SelectProtectedCells = 31] = "SelectProtectedCells", r[r.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", r[r.SetCellStyle = 33] = "SetCellStyle", r[r.SetCellValue = 34] = "SetCellValue", r[r.SetRowStyle = 35] = "SetRowStyle", r[r.SetColumnStyle = 36] = "SetColumnStyle", r[r.InsertRow = 37] = "InsertRow", r[r.InsertColumn = 38] = "InsertColumn", r[r.DeleteRow = 39] = "DeleteRow", r[r.DeleteColumn = 40] = "DeleteColumn", r[r.EditExtraObject = 41] = "EditExtraObject", r[r.Delete = 42] = "Delete", r[r.UNRECOGNIZED = -1] = "UNRECOGNIZED", r))(Dt || {});
-const Wn = "univer-data-validation-item-container", Hn = "univer-data-validation-item-title", kn = "univer-data-validation-item-content", Yn = "univer-data-validation-item-icon", ft = {
+var Et = /* @__PURE__ */ ((r) => (r[r.View = 0] = "View", r[r.Edit = 1] = "Edit", r[r.ManageCollaborator = 2] = "ManageCollaborator", r[r.Print = 3] = "Print", r[r.Duplicate = 4] = "Duplicate", r[r.Comment = 5] = "Comment", r[r.Copy = 6] = "Copy", r[r.Share = 7] = "Share", r[r.Export = 8] = "Export", r[r.MoveWorksheet = 9] = "MoveWorksheet", r[r.DeleteWorksheet = 10] = "DeleteWorksheet", r[r.HideWorksheet = 11] = "HideWorksheet", r[r.RenameWorksheet = 12] = "RenameWorksheet", r[r.CreateWorksheet = 13] = "CreateWorksheet", r[r.SetWorksheetStyle = 14] = "SetWorksheetStyle", r[r.EditWorksheetCell = 15] = "EditWorksheetCell", r[r.InsertHyperlink = 16] = "InsertHyperlink", r[r.Sort = 17] = "Sort", r[r.Filter = 18] = "Filter", r[r.PivotTable = 19] = "PivotTable", r[r.FloatImg = 20] = "FloatImg", r[r.History = 21] = "History", r[r.RwHgtClWdt = 22] = "RwHgtClWdt", r[r.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", r[r.ViewFilter = 24] = "ViewFilter", r[r.MoveSheet = 25] = "MoveSheet", r[r.DeleteSheet = 26] = "DeleteSheet", r[r.HideSheet = 27] = "HideSheet", r[r.CopySheet = 28] = "CopySheet", r[r.RenameSheet = 29] = "RenameSheet", r[r.CreateSheet = 30] = "CreateSheet", r[r.SelectProtectedCells = 31] = "SelectProtectedCells", r[r.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", r[r.SetCellStyle = 33] = "SetCellStyle", r[r.SetCellValue = 34] = "SetCellValue", r[r.SetRowStyle = 35] = "SetRowStyle", r[r.SetColumnStyle = 36] = "SetColumnStyle", r[r.InsertRow = 37] = "InsertRow", r[r.InsertColumn = 38] = "InsertColumn", r[r.DeleteRow = 39] = "DeleteRow", r[r.DeleteColumn = 40] = "DeleteColumn", r[r.EditExtraObject = 41] = "EditExtraObject", r[r.Delete = 42] = "Delete", r[r.UNRECOGNIZED = -1] = "UNRECOGNIZED", r))(Et || {});
+const Wn = "univer-data-validation-item-container", Hn = "univer-data-validation-item-title", kn = "univer-data-validation-item-content", Yn = "univer-data-validation-item-icon", pt = {
   dataValidationItemContainer: Wn,
   dataValidationItemTitle: Hn,
   dataValidationItemContent: kn,
   dataValidationItemIcon: Yn
-}, Gn = (r) => {
-  const { rule: a, onClick: e, unitId: t, subUnitId: o, disable: n } = r, i = E(De), s = E(re), l = E(Co), d = i.getValidatorItem(a.type), c = _a(), [u, m] = z(!1), f = (h) => {
+}, Xn = (r) => {
+  const { rule: a, onClick: e, unitId: t, subUnitId: o, disable: n } = r, i = T(De), s = T(re), l = T(Co), d = i.getValidatorItem(a.type), c = _a(), [u, h] = z(!1), f = (m) => {
     s.executeCommand(ar.id, {
       ruleId: a.uid,
       unitId: t,
       subUnitId: o
-    }), h.stopPropagation();
+    }), m.stopPropagation();
   };
   return qe(() => () => {
-    var h;
-    c.current && ((h = c.current) == null || h.forEach((g) => {
-      g && l.removeShape(g);
+    var m;
+    c.current && ((m = c.current) == null || m.forEach((v) => {
+      v && l.removeShape(v);
     }));
   }, [l]), /* @__PURE__ */ p.jsxs(
     "div",
     {
-      className: ft.dataValidationItemContainer,
+      className: pt.dataValidationItemContainer,
       onClick: e,
       onMouseEnter: () => {
-        n || (m(!0), c.current = a.ranges.map((h) => l.addShape({
-          range: h,
+        n || (h(!0), c.current = a.ranges.map((m) => l.addShape({
+          range: m,
           style: {
             hasAutoFill: !1,
             fill: "rgba(73, 184, 17, 0.05)",
@@ -762,41 +755,41 @@ const Wn = "univer-data-validation-item-container", Hn = "univer-data-validation
             widgets: {}
           },
           primary: {
-            startColumn: h.startColumn,
-            endColumn: h.endColumn,
-            startRow: h.startRow,
-            endRow: h.endRow,
-            actualRow: h.startRow,
-            actualColumn: h.startColumn,
+            startColumn: m.startColumn,
+            endColumn: m.endColumn,
+            startRow: m.startRow,
+            endRow: m.endRow,
+            actualRow: m.startRow,
+            actualColumn: m.startColumn,
             isMerged: !1,
             isMergedMainCell: !1
           }
         })));
       },
       onMouseLeave: () => {
-        var h;
-        m(!1), (h = c.current) == null || h.forEach((g) => {
-          g && l.removeShape(g);
+        var m;
+        h(!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((h) => ur(h)).join(",") }),
-        u ? /* @__PURE__ */ p.jsx("div", { className: ft.dataValidationItemIcon, onClick: f, children: /* @__PURE__ */ p.jsx(Ia, {}) }) : null
+        /* @__PURE__ */ p.jsx("div", { className: pt.dataValidationItemTitle, children: d == null ? void 0 : d.generateRuleName(a) }),
+        /* @__PURE__ */ p.jsx("div", { className: pt.dataValidationItemContent, children: a.ranges.map((m) => ur(m)).join(",") }),
+        u ? /* @__PURE__ */ p.jsx("div", { className: pt.dataValidationItemIcon, onClick: f, children: /* @__PURE__ */ p.jsx(Ia, {}) }) : null
       ]
     }
   );
 };
-var Xn = Object.defineProperty, qn = Object.getOwnPropertyDescriptor, zn = (r, a, e, t) => {
+var Gn = Object.defineProperty, qn = Object.getOwnPropertyDescriptor, zn = (r, a, e, t) => {
   for (var o = t > 1 ? void 0 : t ? qn(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
-  return t && o && Xn(a, e, o), o;
+  return t && o && Gn(a, e, o), o;
 }, Qn = (r, a) => (e, t) => a(e, t, r);
-let Et = class {
+let Ot = class {
   constructor(r) {
-    v(this, "_currentManager");
-    v(this, "_currentManager$", new mr());
-    v(this, "currentManager$", this._currentManager$.asObservable());
+    g(this, "_currentManager");
+    g(this, "_currentManager$", new mr());
+    g(this, "currentManager$", this._currentManager$.asObservable());
     this._dataValidationModel = r;
   }
   get currentManager() {
@@ -820,9 +813,9 @@ let Et = class {
     return this._ensureManager(r, a);
   }
 };
-Et = zn([
-  Qn(0, w(K))
-], Et);
+Ot = zn([
+  Qn(0, I(K))
+], Ot);
 function Kn(r) {
   var l;
   const { unitId: a, subUnitId: e, value: t, onChange: o, showError: n, validResult: i } = r, s = n ? i == null ? void 0 : i.formula1 : "";
@@ -854,7 +847,7 @@ const Zn = "univer-data-validation-formula", Jn = "univer-data-validation-formul
   dataValidationFormulaColorSelectPanel: ni,
   dataValidationFormulaColorItem: ii
 }, si = (r) => {
-  const { isTwoFormula: a = !1, value: e, onChange: t, showError: o, validResult: n } = r, i = E(ie), s = o ? n == null ? void 0 : n.formula1 : "", l = o ? n == null ? void 0 : n.formula2 : "";
+  const { isTwoFormula: a = !1, value: e, onChange: t, showError: o, validResult: n } = r, i = T(ie), s = o ? n == null ? void 0 : n.formula1 : "", l = o ? n == null ? void 0 : n.formula2 : "";
   return a ? /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
     /* @__PURE__ */ p.jsx(Q, { error: s, children: /* @__PURE__ */ p.jsx(
       Pe,
@@ -912,20 +905,20 @@ function ne(r) {
 function Er(r) {
   return r.filter(Boolean).join(",");
 }
-function Xe(r) {
+function Ge(r) {
   return r.split(",").filter(Boolean);
 }
 function li(r) {
   const a = ne(r);
   return a == null ? "" : a.toString();
 }
-const ya = "SHEET_DATA_VALIDATION_PLUGIN", Fe = "#ECECEC";
+const ya = "SHEET_DATA_VALIDATION_PLUGIN", Ne = "#ECECEC";
 var di = Object.defineProperty, ci = Object.getOwnPropertyDescriptor, ui = (r, a, e, t) => {
   for (var o = t > 1 ? void 0 : t ? ci(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
   return t && o && di(a, e, o), o;
 }, Bt = (r, a) => (e, t) => a(e, t, r);
-let at = class extends he {
+let rt = class extends he {
   constructor(r, a, e) {
     super(), this._univerInstanceService = r, this._permissionService = a, this._lexerTreeBuilder = e;
   }
@@ -944,29 +937,28 @@ let at = class extends he {
       if (s.sheetName) {
         if (d = l.getSheetBySheetName(s.sheetName), !d)
           return !1;
-        const g = d == null ? void 0 : d.getSheetId();
-        if (!this._permissionService.getPermissionPoint(new mo(c, g).id))
-          return !1;
+        const v = d == null ? void 0 : d.getSheetId();
+        if (!this._permissionService.getPermissionPoint(new mo(c, v).id)) return !1;
       }
       if (!d)
         return !1;
-      const { startRow: u, endRow: m, startColumn: f, endColumn: h } = s.range;
-      for (let g = u; g <= m; g++)
-        for (let R = f; R <= h; R++) {
-          const _ = (t = (e = d.getCell(g, R)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
-          if ((_ == null ? void 0 : _[Dt.View]) === !1)
+      const { startRow: u, endRow: h, startColumn: f, endColumn: m } = s.range;
+      for (let v = u; v <= h; v++)
+        for (let R = f; R <= m; R++) {
+          const _ = (t = (e = d.getCell(v, R)) == null ? void 0 : e.selectionProtection) == null ? void 0 : t[0];
+          if ((_ == null ? void 0 : _[Et.View]) === !1)
             return !1;
         }
     }
     return !0;
   }
 };
-at = ui([
-  ve(ge.Rendered, at),
-  Bt(0, ee),
+rt = ui([
+  ve(ge.Rendered, rt),
+  Bt(0, te),
   Bt(1, zr),
-  Bt(2, w(Ra))
-], at);
+  Bt(2, I(Ra))
+], rt);
 const hi = [
   "#FFFFFF",
   "#FEE7E7",
@@ -1054,54 +1046,54 @@ const hi = [
 };
 function fi(r) {
   const { value: a, onChange: e = () => {
-  }, unitId: t, subUnitId: o, validResult: n, showError: i, ruleId: s } = r, { formula1: l = "", formula2: d = "" } = a || {}, c = _a(null), [u, m] = z(() => T(l) ? "1" : "0"), [f, h] = z(u === "1" ? l : "="), [g, R] = z(u === "1" ? l : "="), _ = E(ie), V = E(De), S = E(K), I = E(at), [y, O] = z(() => d.split(",")), j = V.getValidatorItem(q.LIST), [P, N] = z([]), [A, F] = z(""), B = i ? n == null ? void 0 : n.formula1 : "", Y = Ze(S.ruleChange$), x = ir(e);
+  }, unitId: t, subUnitId: o, validResult: n, showError: i, ruleId: s } = r, { formula1: l = "", formula2: d = "" } = a || {}, c = _a(null), [u, h] = z(() => N(l) ? "1" : "0"), [f, m] = z(u === "1" ? l : "="), [v, R] = z(u === "1" ? l : "="), _ = T(ie), V = T(De), S = T(K), y = T(rt), [w, F] = z(() => d.split(",")), x = V.getValidatorItem(X.LIST), [j, $] = z([]), [E, P] = z(""), A = i ? n == null ? void 0 : n.formula1 : "", q = Ze(S.ruleChange$), L = ir(e);
   qe(() => {
     (async () => {
       await new Promise((k) => {
         setTimeout(() => k(!0), 100);
       });
       const D = S.getRuleById(t, o, s), W = D == null ? void 0 : D.formula1;
-      if (T(W) && j && D) {
-        const k = await j.getListAsync(D, t, o);
-        N(k);
+      if (N(W) && x && D) {
+        const k = await x.getListAsync(D, t, o);
+        $(k);
       }
     })();
-  }, [S, Y, j, s, o, t]), qe(() => {
-    T(l) && l !== g && (h(l), R(g));
-  }, [g, l]);
-  const [L, G] = z(() => {
-    const D = u !== "1" ? Xe(l) : [], W = d.split(",");
-    return D.map((k, J) => ({
+  }, [S, q, x, s, o, t]), qe(() => {
+    N(l) && l !== v && (m(l), R(v));
+  }, [v, l]);
+  const [b, Y] = z(() => {
+    const D = u !== "1" ? Ge(l) : [], W = d.split(",");
+    return D.map((k, ee) => ({
       label: k,
-      color: W[J] || Fe,
+      color: W[ee] || Ne,
       isRef: !1,
-      id: U.generateRandomId(4)
+      id: B.generateRandomId(4)
     }));
-  }), te = (D, W, k) => {
-    const J = L.find((_e) => _e.id === D);
-    J && (J.label = W, J.color = k, G([...L]));
+  }), Z = (D, W, k) => {
+    const ee = b.find((_e) => _e.id === D);
+    ee && (ee.label = W, ee.color = k, Y([...b]));
   }, H = (D) => {
-    const W = L.findIndex((k) => k.id === D);
-    W !== -1 && (L.splice(W, 1), G([...L]));
-  }, M = d.split(","), b = yt(() => P.map((D, W) => ({
+    const W = b.findIndex((k) => k.id === D);
+    W !== -1 && (b.splice(W, 1), Y([...b]));
+  }, M = d.split(","), O = Dt(() => j.map((D, W) => ({
     label: D,
-    color: M[W] || Fe,
+    color: M[W] || Ne,
     id: `${W}`,
     isRef: !0
-  })), [M, P]), Z = (D, W, k) => {
-    const J = [...y];
-    J[+D] = k, O(J), x({
+  })), [M, j]), J = (D, W, k) => {
+    const ee = [...w];
+    ee[+D] = k, F(ee), L({
       formula1: l,
-      formula2: J.join(",")
+      formula2: ee.join(",")
     });
-  }, X = () => {
-    G([
-      ...L,
+  }, G = () => {
+    Y([
+      ...b,
       {
         label: "",
-        color: Fe,
+        color: Ne,
         isRef: !1,
-        id: U.generateRandomId(4)
+        id: B.generateRandomId(4)
       }
     ]);
   };
@@ -1109,39 +1101,39 @@ function fi(r) {
     if (u === "1")
       return;
     const D = /* @__PURE__ */ new Set(), W = [];
-    L.map((k) => ({
+    b.map((k) => ({
       labelList: k.label.split(","),
       item: k
-    })).forEach(({ item: k, labelList: J }) => {
-      J.forEach((_e) => {
+    })).forEach(({ item: k, labelList: ee }) => {
+      ee.forEach((_e) => {
         D.has(_e) || (D.add(_e), W.push({
           label: _e,
           color: k.color
         }));
       });
-    }), x({
+    }), L({
       formula1: Er(W.map((k) => k.label)),
-      formula2: W.map((k) => k.color === Fe ? "" : k.color).join(",")
+      formula2: W.map((k) => k.color === Ne ? "" : k.color).join(",")
     });
-  }, [L, x, u, g, y]);
-  const me = yt(
+  }, [b, L, u, v, w]);
+  const me = Dt(
     () => async (D) => {
-      if (!T(D)) {
-        x == null || x({
+      if (!N(D)) {
+        L == null || L({
           formula1: "",
           formula2: d
         });
         return;
       }
-      I.getFormulaRefCheck(D) ? (x == null || x({
-        formula1: T(D) ? D : "",
+      y.getFormulaRefCheck(D) ? (L == null || L({
+        formula1: N(D) ? D : "",
         formula2: d
-      }), F("")) : (x == null || x({
+      }), P("")) : (L == null || L({
         formula1: "",
         formula2: d
-      }), h("="), F(_.t("dataValidation.validFail.formulaError")));
+      }), m("="), P(_.t("dataValidation.validFail.formulaError")));
     },
-    [d, x]
+    [d, L]
   );
   return /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
     /* @__PURE__ */ p.jsx(Q, { label: _.t("dataValidation.list.options"), children: /* @__PURE__ */ p.jsxs(
@@ -1149,9 +1141,9 @@ function fi(r) {
       {
         value: u,
         onChange: (D) => {
-          m(D), h(g), D === "1" && x({
-            formula1: g === "=" ? "" : g,
-            formula2: y.join(",")
+          h(D), m(v), D === "1" && L({
+            formula1: v === "=" ? "" : v,
+            formula2: w.join(",")
           });
         },
         children: [
@@ -1161,7 +1153,7 @@ function fi(r) {
       }
     ) }),
     u === "1" ? /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
-      /* @__PURE__ */ p.jsx(Q, { error: B || A, children: /* @__PURE__ */ p.jsx(
+      /* @__PURE__ */ p.jsx(Q, { error: A || E, children: /* @__PURE__ */ p.jsx(
         sr,
         {
           id: fa(`list-ref-range-${t}-${o}`),
@@ -1175,13 +1167,13 @@ function fi(r) {
           }
         }
       ) }),
-      /* @__PURE__ */ p.jsx(Q, { children: /* @__PURE__ */ p.jsx("div", { ref: c, children: b.map((D) => /* @__PURE__ */ p.jsx($a, { item: D, commonProps: { onItemChange: Z }, style: { marginBottom: 12 } }, D.id)) }) })
-    ] }) : /* @__PURE__ */ p.jsx(Q, { error: B, children: /* @__PURE__ */ p.jsxs("div", { ref: c, style: { marginTop: "-12px" }, children: [
+      /* @__PURE__ */ p.jsx(Q, { children: /* @__PURE__ */ p.jsx("div", { ref: c, children: O.map((D) => /* @__PURE__ */ p.jsx($a, { item: D, commonProps: { onItemChange: J }, style: { marginBottom: 12 } }, D.id)) }) })
+    ] }) : /* @__PURE__ */ p.jsx(Q, { error: A, children: /* @__PURE__ */ p.jsxs("div", { ref: c, style: { marginTop: "-12px" }, children: [
       /* @__PURE__ */ p.jsx(
         zo,
         {
-          list: L,
-          onListChange: G,
+          list: b,
+          onListChange: Y,
           rowHeight: 32,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
@@ -1190,7 +1182,7 @@ function fi(r) {
             {
               item: D,
               commonProps: {
-                onItemChange: te,
+                onItemChange: Z,
                 onItemDelete: H
               }
             },
@@ -1199,7 +1191,7 @@ function fi(r) {
           idKey: "id"
         }
       ),
-      /* @__PURE__ */ p.jsxs("a", { className: oe.dataValidationFormulaListAdd, onClick: X, children: [
+      /* @__PURE__ */ p.jsxs("a", { className: oe.dataValidationFormulaListAdd, onClick: G, children: [
         /* @__PURE__ */ p.jsx(wr, {}),
         _.t("dataValidation.list.add")
       ] })
@@ -1207,7 +1199,7 @@ function fi(r) {
   ] });
 }
 function pi(r) {
-  const { value: a, onChange: e, showError: t, validResult: o } = r, n = E(ie), i = t ? o == null ? void 0 : o.formula1 : "", s = t ? o == null ? void 0 : o.formula2 : "", [l, d] = z(!((a == null ? void 0 : a.formula1) === void 0 && (a == null ? void 0 : a.formula2) === void 0));
+  const { value: a, onChange: e, showError: t, validResult: o } = r, n = T(ie), i = t ? o == null ? void 0 : o.formula1 : "", s = t ? o == null ? void 0 : o.formula2 : "", [l, d] = z(!((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(Q, { children: /* @__PURE__ */ p.jsx(
       cr,
@@ -1253,13 +1245,13 @@ function pi(r) {
     ) }) : 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", vi = [
+const Or = "data-validation.custom-formula-input", ht = "data-validation.formula-input", br = "data-validation.list-formula-input", Tr = "data-validation.checkbox-formula-input", vi = [
   [
     Or,
     Kn
   ],
   [
-    ut,
+    ht,
     si
   ],
   [
@@ -1271,15 +1263,15 @@ const Or = "data-validation.custom-formula-input", ut = "data-validation.formula
     pi
   ]
 ];
-class ht {
+class mt {
   constructor() {
-    v(this, "_cacheMatrix", /* @__PURE__ */ new Map());
+    g(this, "_cacheMatrix", /* @__PURE__ */ new Map());
   }
   _ensureCache(a, e) {
     let t = this._cacheMatrix.get(a);
     t || (t = /* @__PURE__ */ new Map(), this._cacheMatrix.set(a, t));
     let o = t.get(e);
-    return o || (o = new lt(), t.set(e, o)), o;
+    return o || (o = new dt(), t.set(e, o)), o;
   }
   ensureCache(a, e) {
     return this._ensureCache(a, e);
@@ -1293,17 +1285,17 @@ class ht {
   updateRuleRanges(a, e, t, o, n) {
     const i = this._ensureCache(a, e);
     n.forEach((s) => {
-      $.foreach(s, (l, d) => {
+      U.foreach(s, (l, d) => {
         const c = i.getValue(l, d);
         c && (c.temp = !0);
       });
     }), o.forEach((s) => {
-      $.foreach(s, (l, d) => {
+      U.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) => {
-      $.foreach(s, (l, d) => {
+      U.foreach(s, (l, d) => {
         const c = i.getValue(l, d);
         c && c.temp === !0 && i.realDeleteValue(l, d);
       });
@@ -1312,7 +1304,7 @@ class ht {
   markRangeDirty(a, e, t) {
     const o = this._ensureCache(a, e);
     t.forEach((n) => {
-      $.foreach(n, (i, s) => {
+      U.foreach(n, (i, s) => {
         o.setValue(i, s, void 0);
       });
     });
@@ -1323,7 +1315,7 @@ class ht {
   _deleteRange(a, e, t) {
     const o = this._ensureCache(a, e);
     t.forEach((n) => {
-      $.foreach(n, (i, s) => {
+      U.foreach(n, (i, s) => {
         o.realDeleteValue(i, s);
       });
     });
@@ -1339,19 +1331,19 @@ var gi = Object.defineProperty, _i = Object.getOwnPropertyDescriptor, Si = (r, a
   for (var o = t > 1 ? void 0 : t ? _i(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
   return t && o && gi(a, e, o), o;
-}, pt = (r, a) => (e, t) => a(e, t, r);
+}, vt = (r, a) => (e, t) => a(e, t, r);
 let Ke = class extends he {
   constructor(a, e, t, o) {
     super();
-    v(this, "_formulaMap", /* @__PURE__ */ new Map());
+    g(this, "_formulaMap", /* @__PURE__ */ new Map());
     /**
      * Map of origin formula of rule
      */
-    v(this, "_ruleFormulaMap", /* @__PURE__ */ new Map());
+    g(this, "_ruleFormulaMap", /* @__PURE__ */ new Map());
     /**
      * reflect of formulaId to cell, only store transformable formula
      */
-    v(this, "_formulaCellMap", /* @__PURE__ */ new Map());
+    g(this, "_formulaCellMap", /* @__PURE__ */ new Map());
     this._registerOtherFormulaService = a, this._lexerTreeBuilder = e, this._dataValidationModel = t, this._dataValidationCacheService = o, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
@@ -1361,9 +1353,9 @@ let Ke = class extends he {
         for (const o in t) {
           const n = t[o], { formulaCellMap: i, ruleFormulaMap: s } = this._ensureMaps(e, o), l = this._dataValidationModel.ensureManager(e, o);
           n.forEach((d) => {
-            var f, h;
-            const c = s.get((f = d.extra) == null ? void 0 : f.ruleId), u = i.get(d.formulaId), m = l.getRuleById((h = d.extra) == null ? void 0 : h.ruleId);
-            m && c && !c.isTransformable && this._dataValidationCacheService.markRangeDirty(e, o, m.ranges), u && this._dataValidationCacheService.markCellDirty(e, o, u.row, u.column);
+            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, o, h.ranges), u && this._dataValidationCacheService.markCellDirty(e, o, u.row, u.column);
           });
         }
       }
@@ -1373,7 +1365,7 @@ let Ke = class extends he {
     let t = this._formulaMap.get(a), o = this._ruleFormulaMap.get(a), n = this._formulaCellMap.get(a);
     (!t || !o || !n) && (t = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map(), this._formulaMap.set(a, t), this._ruleFormulaMap.set(a, o), this._formulaCellMap.set(a, n));
     let i = t.get(e), s = o.get(e), l = n.get(e);
-    return (!i || !s || !l) && (i = new lt(), t.set(e, i), s = /* @__PURE__ */ new Map(), o.set(e, s), l = /* @__PURE__ */ new Map(), n.set(e, l)), {
+    return (!i || !s || !l) && (i = new dt(), t.set(e, i), s = /* @__PURE__ */ new Map(), o.set(e, s), l = /* @__PURE__ */ new Map(), n.set(e, l)), {
       formulaMap: i,
       ruleFormulaMap: s,
       formulaCellMap: l
@@ -1385,11 +1377,11 @@ let Ke = class extends he {
   deleteByRuleId(a, e, t) {
     const { formulaMap: o, 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) => {
-      $.foreach(c, (u, m) => {
-        const f = o.getValue(u, m);
+      U.foreach(c, (u, h) => {
+        const f = o.getValue(u, h);
         if (f && f.ruleId === t) {
-          const { formulaId: h } = f;
-          o.realDeleteValue(u, m), l.add(h), n.delete(h);
+          const { formulaId: m } = f;
+          o.realDeleteValue(u, h), l.add(m), n.delete(m);
         }
       });
     }), this._registerOtherFormulaService.deleteFormula(a, e, Array.from(l.values())));
@@ -1402,27 +1394,27 @@ let Ke = class extends he {
       this._lexerTreeBuilder,
       o
     ), c = n[0].startRow, u = n[0].startColumn;
-    let m;
+    let h;
     d ? n.forEach((f) => {
-      $.foreach(f, (h, g) => {
+      U.foreach(f, (m, v) => {
         const R = ja(
           this._lexerTreeBuilder,
           o,
           c,
           u,
-          h,
-          g
+          m,
+          v
         ), _ = this._registerFormula(a, e, t, R);
-        i.setValue(h, g, {
+        i.setValue(m, v, {
           formulaId: _,
           // formulaText: relativeFormula,
           ruleId: t
-        }), l.set(_, { row: h, column: g });
+        }), l.set(_, { row: m, column: v });
       });
-    }) : (m = this._registerFormula(a, e, t, o), n.forEach((f) => {
-      $.foreach(f, (h, g) => {
-        i.setValue(h, g, {
-          formulaId: m,
+    }) : (h = this._registerFormula(a, e, t, o), n.forEach((f) => {
+      U.foreach(f, (m, v) => {
+        i.setValue(m, v, {
+          formulaId: h,
           // formulaText: formula,
           ruleId: t
         });
@@ -1432,53 +1424,53 @@ let Ke = class extends he {
       originCol: u,
       originRow: c,
       isTransformable: d,
-      formulaId: m
+      formulaId: h
     });
   }
   addRule(a, e, t) {
     const { ranges: o, formula1: n, uid: i, type: s } = t;
-    s !== q.CUSTOM || !n || !T(n) || this._addFormulaByRange(a, e, i, n, o);
+    s !== X.CUSTOM || !n || !N(n) || this._addFormulaByRange(a, e, i, n, o);
   }
   updateRuleRanges(a, e, t, o, 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: m, isTransformable: f, formulaId: h } = d, g = /* @__PURE__ */ new Set();
+    const { formula: c, originCol: u, originRow: h, isTransformable: f, formulaId: m } = d, v = /* @__PURE__ */ new Set();
     o.forEach((R) => {
-      $.foreach(R, (_, V) => {
+      U.foreach(R, (_, V) => {
         const S = i.getValue(_, V);
         S && S.ruleId === t && (S.temp = !0);
       });
     }), n.forEach((R) => {
-      $.foreach(R, (_, V) => {
-        var I;
-        const S = (I = i.getValue(_, V)) != null ? I : {};
+      U.foreach(R, (_, V) => {
+        var y;
+        const S = (y = i.getValue(_, V)) != null ? y : {};
         if (S.ruleId !== t) {
-          const y = s.get(S.ruleId);
-          if (y != null && y.isTransformable && g.add(S.formulaId), f) {
-            const O = ja(this._lexerTreeBuilder, c, m, u, _, V), j = this._registerFormula(a, e, t, O);
+          const w = s.get(S.ruleId);
+          if (w != null && w.isTransformable && v.add(S.formulaId), f) {
+            const F = ja(this._lexerTreeBuilder, c, h, u, _, V), x = this._registerFormula(a, e, t, F);
             i.setValue(_, V, {
               // formulaText: relativeText,
               ruleId: t,
-              formulaId: j
-            }), l.set(j, { row: _, column: V });
+              formulaId: x
+            }), l.set(x, { row: _, column: V });
           } else
             i.setValue(_, V, {
               // formulaText: formula,
               ruleId: t,
-              formulaId: h
+              formulaId: m
             });
         } else
           S.temp = !1;
       });
     }), o.forEach((R) => {
-      $.foreach(R, (_, V) => {
+      U.foreach(R, (_, V) => {
         const S = i.getValue(_, V);
-        S && S.ruleId === t && S.temp === !0 && (i.realDeleteValue(_, V), f && g.add(S.formulaId));
+        S && S.ruleId === t && S.temp === !0 && (i.realDeleteValue(_, V), f && v.add(S.formulaId));
       });
-    }), g.forEach((R) => {
+    }), v.forEach((R) => {
       l.delete(R);
-    }), this._registerOtherFormulaService.deleteFormula(a, e, Array.from(g.values()));
+    }), this._registerOtherFormulaService.deleteFormula(a, e, Array.from(v.values()));
   }
   updateRuleFormula(a, e, t, o, n) {
     const { ruleFormulaMap: i } = this._ensureMaps(a, e), s = i.get(t);
@@ -1494,10 +1486,10 @@ let Ke = class extends he {
   }
 };
 Ke = Si([
-  pt(0, w(fr)),
-  pt(1, w(Ra)),
-  pt(2, w(K)),
-  pt(3, w(ht))
+  vt(0, I(fr)),
+  vt(1, I(Ra)),
+  vt(2, I(K)),
+  vt(3, I(mt))
 ], Ke);
 function Ce(r) {
   var a, e;
@@ -1506,15 +1498,15 @@ function Ce(r) {
 class Ri extends $e {
   constructor() {
     super(...arguments);
-    v(this, "id", q.CUSTOM);
-    v(this, "title", "dataValidation.custom.title");
-    v(this, "operators", []);
-    v(this, "scopes", ["sheet"]);
-    v(this, "formulaInput", Or);
-    v(this, "_customFormulaService", this.injector.get(Ke));
+    g(this, "id", X.CUSTOM);
+    g(this, "title", "dataValidation.custom.title");
+    g(this, "operators", []);
+    g(this, "scopes", ["sheet"]);
+    g(this, "formulaInput", Or);
+    g(this, "_customFormulaService", this.injector.get(Ke));
   }
   validatorFormula(e, t, o) {
-    const n = T(e.formula1);
+    const n = N(e.formula1);
     return {
       success: n,
       formula1: n ? "" : this.localeService.t("dataValidation.validFail.formula")
@@ -1542,7 +1534,7 @@ var Ci = Object.defineProperty, Vi = Object.getOwnPropertyDescriptor, Mi = (r, a
 let ue = class extends he {
   constructor(a, e, t) {
     super();
-    v(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
+    g(this, "_formulaRuleMap", /* @__PURE__ */ new Map());
     this._registerOtherFormulaService = a, this._dataValidationCacheService = e, this._dataValidationModel = t, this._initFormulaResultHandler();
   }
   _initFormulaResultHandler() {
@@ -1569,7 +1561,7 @@ let ue = class extends he {
     return o || (o = /* @__PURE__ */ new Map(), t.set(e, o)), o;
   }
   addRule(a, e, t, o, n) {
-    const i = T(o), s = T(n);
+    const i = N(o), s = N(n);
     if (!i && !s)
       return;
     const l = this._ensureRuleFormulaMap(a, e), d = [void 0, void 0];
@@ -1598,7 +1590,7 @@ let ue = class extends he {
     }
     const [l, d] = s;
     if ((l == null ? void 0 : l.text) !== o)
-      if (l && this._registerOtherFormulaService.deleteFormula(a, e, [l.id]), T(o)) {
+      if (l && this._registerOtherFormulaService.deleteFormula(a, e, [l.id]), N(o)) {
         const c = this._registerOtherFormulaService.registerFormula(a, e, o, { ruleId: t });
         s[0] = {
           text: o,
@@ -1607,7 +1599,7 @@ let ue = class extends he {
       } 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]), N(n)) {
         const c = this._registerOtherFormulaService.registerFormula(a, e, n, { ruleId: t });
         s[1] = {
           text: n,
@@ -1639,23 +1631,23 @@ let ue = class extends he {
   }
 };
 ue = Mi([
-  Ut(0, w(fr)),
-  Ut(1, w(ht)),
-  Ut(2, w(K))
+  Ut(0, I(fr)),
+  Ut(1, I(mt)),
+  Ut(2, I(K))
 ], ue);
 var wi = Object.defineProperty, Ii = Object.getOwnPropertyDescriptor, yi = (r, a, e, t) => {
   for (var o = t > 1 ? void 0 : t ? Ii(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
   return t && o && wi(a, e, o), o;
 }, $t = (r, a) => (e, t) => a(e, t, r);
-const vt = 6;
+const gt = 6;
 let sa = class {
   constructor(r, a, e) {
     this._commandService = r, this._formulaService = a, this._themeService = e;
   }
   _calc(r, a) {
     var d, c, u;
-    const { vt: e, ht: t } = a || {}, o = r.endX - r.startX - vt * 2, n = r.endY - r.startY, i = ((d = a == null ? void 0 : a.fs) != null ? d : 10) * 1.6;
+    const { vt: e, ht: t } = a || {}, o = r.endX - r.startX - gt * 2, n = r.endY - r.startY, i = ((d = a == null ? void 0 : a.fs) != null ? d : 10) * 1.6;
     let s = 0, l = 0;
     switch (e) {
       case de.TOP:
@@ -1670,13 +1662,13 @@ let sa = class {
     }
     switch (t) {
       case Ae.LEFT:
-        s = vt;
+        s = gt;
         break;
       case Ae.RIGHT:
-        s = vt + (o - i);
+        s = gt + (o - i);
         break;
       default:
-        s = vt + (o - i) / 2;
+        s = gt + (o - i) / 2;
         break;
     }
     return {
@@ -1693,21 +1685,21 @@ let sa = class {
   }
   async _parseFormula(r, a, e) {
     var i, s;
-    const { formula1: t = Ot, formula2: o = la } = r, n = await this._formulaService.getRuleFormulaResult(a, e, r.uid);
+    const { formula1: t = bt, formula2: o = la } = r, n = await this._formulaService.getRuleFormulaResult(a, e, r.uid);
     return {
-      formula1: T(t) ? Ce((i = n == null ? void 0 : n[0]) == null ? void 0 : i.result) : t,
-      formula2: T(o) ? Ce((s = n == null ? void 0 : n[1]) == null ? void 0 : s.result) : o
+      formula1: N(t) ? Ce((i = n == null ? void 0 : n[0]) == null ? void 0 : i.result) : t,
+      formula2: N(o) ? Ce((s = n == null ? void 0 : n[1]) == null ? void 0 : s.result) : o
     };
   }
   drawWith(r, a) {
-    var N, A, F, B, Y;
-    const { style: e, data: t, primaryWithCoord: o, unitId: n, subUnitId: i } = a, s = o.isMergedMainCell ? o.mergeInfo : o, l = ne(t), d = (N = t.dataValidation) == null ? void 0 : N.rule, c = (A = t.dataValidation) == null ? void 0 : A.validator;
+    var $, E, P, A, q;
+    const { style: e, data: t, primaryWithCoord: o, unitId: n, subUnitId: i } = a, s = o.isMergedMainCell ? o.mergeInfo : o, l = ne(t), d = ($ = t.dataValidation) == null ? void 0 : $.rule, c = (E = t.dataValidation) == null ? void 0 : E.validator;
     if (!d || !c)
       return;
     const u = this._themeService.getCurrentTheme();
     if (!c.skipDefaultFontRender(d, l, { unitId: n, subUnitId: i }))
       return;
-    const { formula1: m = Ot } = d, f = this._calc(s, e), { a: h, d: g } = r.getTransform(), R = Aa(f.left, h), _ = Aa(f.top, g), V = $o.create().composeMatrix({
+    const { formula1: h = bt } = d, f = this._calc(s, e), { a: m, d: v } = r.getTransform(), R = Aa(f.left, m), _ = Aa(f.top, v), V = $o.create().composeMatrix({
       left: R,
       top: _,
       scaleX: 1,
@@ -1717,16 +1709,16 @@ let sa = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), S = s.endX - s.startX, I = s.endY - s.startY;
-    r.save(), r.beginPath(), r.rect(s.startX, s.startY, S, I), r.clip();
-    const y = V.getMatrix();
-    r.transform(y[0], y[1], y[2], y[3], y[4], y[5]);
-    const O = ((F = e == null ? void 0 : e.fs) != null ? F : 10) * 1.6, j = String(l) === String(m), P = u.hyacinth500;
+    }), S = s.endX - s.startX, y = s.endY - s.startY;
+    r.save(), r.beginPath(), r.rect(s.startX, s.startY, S, y), r.clip();
+    const w = V.getMatrix();
+    r.transform(w[0], w[1], w[2], w[3], w[4], w[5]);
+    const F = ((P = e == null ? void 0 : e.fs) != null ? P : 10) * 1.6, x = String(l) === String(h), j = u.hyacinth500;
     Wo.drawWith(r, {
-      checked: j,
-      width: O,
-      height: O,
-      fill: (Y = (B = e == null ? void 0 : e.cl) == null ? void 0 : B.rgb) != null ? Y : P
+      checked: x,
+      width: F,
+      height: F,
+      fill: (q = (A = e == null ? void 0 : e.cl) == null ? void 0 : A.rgb) != null ? q : j
     }), r.restore();
   }
   isHit(r, a) {
@@ -1734,10 +1726,10 @@ let sa = class {
     return l <= s && l >= i && d <= n && d >= o;
   }
   async onPointerDown(r, a) {
-    var m, f;
+    var h, f;
     if (a.button === 2)
       return;
-    const { primaryWithCoord: e, unitId: t, subUnitId: o, data: n } = r, i = ne(n), s = (m = n.dataValidation) == null ? void 0 : m.rule, l = (f = n.dataValidation) == null ? void 0 : f.validator;
+    const { primaryWithCoord: e, unitId: t, subUnitId: o, data: n } = r, i = ne(n), s = (h = n.dataValidation) == null ? void 0 : h.rule, l = (f = n.dataValidation) == null ? void 0 : f.validator;
     if (!s || !l || !l.skipDefaultFontRender(s, i, { unitId: t, subUnitId: o }))
       return;
     const { formula1: d, formula2: c } = await this._parseFormula(s, t, o), u = {
@@ -1760,27 +1752,27 @@ let sa = class {
 };
 sa = yi([
   $t(0, re),
-  $t(1, w(ue)),
-  $t(2, w(Qr))
+  $t(1, I(ue)),
+  $t(2, I(Qr))
 ], sa);
-const Ot = 1, la = 0;
+const bt = 1, la = 0;
 class Di extends $e {
   constructor() {
     super(...arguments);
-    v(this, "id", q.CHECKBOX);
-    v(this, "title", "dataValidation.checkbox.title");
-    v(this, "operators", []);
-    v(this, "scopes", ["sheet"]);
-    v(this, "formulaInput", Tr);
-    v(this, "canvasRender", this.injector.createInstance(sa));
-    v(this, "_formulaService", this.injector.get(ue));
+    g(this, "id", X.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, "_formulaService", this.injector.get(ue));
   }
   skipDefaultFontRender(e, t, o) {
     const { formula1: n, formula2: i } = this.parseFormulaSync(e, o.unitId, o.subUnitId), s = `${t != null ? t : ""}`;
     return !s || s === `${n}` || s === `${i}`;
   }
   validatorFormula(e, t, o) {
-    const { formula1: n, formula2: i } = e, s = !U.isBlank(n), l = !U.isBlank(i), d = n === i;
+    const { formula1: n, formula2: i } = e, s = !B.isBlank(n), l = !B.isBlank(i), d = n === i;
     return {
       success: s && l && !d || !s && !l,
       formula1: s ? d ? this.localeService.t("dataValidation.validFail.checkboxEqual") : "" : this.localeService.t("dataValidation.validFail.common"),
@@ -1789,29 +1781,29 @@ class Di extends $e {
   }
   async parseFormula(e, t, o) {
     var l, d;
-    const { formula1: n = Ot, formula2: i = la } = e, s = await this._formulaService.getRuleFormulaResult(t, o, e.uid);
+    const { formula1: n = bt, formula2: i = la } = e, s = await this._formulaService.getRuleFormulaResult(t, o, e.uid);
     return {
-      formula1: T(n) ? Ce((l = s == null ? void 0 : s[0]) == null ? void 0 : l.result) : n,
-      formula2: T(i) ? Ce((d = s == null ? void 0 : s[1]) == null ? void 0 : d.result) : i
+      formula1: N(n) ? Ce((l = s == null ? void 0 : s[0]) == null ? void 0 : l.result) : n,
+      formula2: N(i) ? Ce((d = s == null ? void 0 : s[1]) == null ? void 0 : d.result) : i
     };
   }
   parseFormulaSync(e, t, o) {
     var l, d;
-    const { formula1: n = Ot, formula2: i = la } = e, s = this._formulaService.getRuleFormulaResultSync(t, o, e.uid);
+    const { formula1: n = bt, formula2: i = la } = e, s = this._formulaService.getRuleFormulaResultSync(t, o, e.uid);
     return {
-      formula1: T(n) ? Ce((l = s == null ? void 0 : s[0]) == null ? void 0 : l.result) : n,
-      formula2: T(i) ? Ce((d = s == null ? void 0 : s[1]) == null ? void 0 : d.result) : i
+      formula1: N(n) ? Ce((l = s == null ? void 0 : s[0]) == null ? void 0 : l.result) : n,
+      formula2: N(i) ? Ce((d = s == null ? void 0 : s[1]) == null ? void 0 : d.result) : i
     };
   }
   async isValidType(e, t, o) {
     const { value: n, unitId: i, subUnitId: s } = e, { formula1: l, formula2: d } = await this.parseFormula(o, i, s);
-    return !U.isDefine(l) || !U.isDefine(d) ? !0 : U.isDefine(n) && (String(n) === String(l) || String(n) === String(d));
+    return !B.isDefine(l) || !B.isDefine(d) ? !0 : B.isDefine(n) && (String(n) === String(l) || String(n) === String(d));
   }
   generateRuleErrorMessage(e) {
     return this.localeService.t("dataValidation.checkbox.error");
   }
 }
-const st = [
+const lt = [
   C.BETWEEN,
   C.NOT_BETWEEN
 ], Wt = 86400;
@@ -1861,7 +1853,7 @@ const Ti = {
   [C.LESS_THAN_OR_EQUAL]: "dataValidation.date.ruleName.lessThanOrEqual",
   [C.NOT_BETWEEN]: "dataValidation.date.ruleName.notBetween",
   [C.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual"
-}, Ni = {
+}, Fi = {
   [C.BETWEEN]: "dataValidation.date.errorMsg.between",
   [C.EQUAL]: "dataValidation.date.errorMsg.equal",
   [C.GREATER_THAN]: "dataValidation.date.errorMsg.greaterThan",
@@ -1870,16 +1862,16 @@ const Ti = {
   [C.LESS_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.lessThanOrEqual",
   [C.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
   [C.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual"
-}, Wa = "{FORMULA1}", Ha = "{FORMULA2}", ka = (r) => je(r).isValid(), gt = (r) => {
+}, Wa = "{FORMULA1}", Ha = "{FORMULA2}", ka = (r) => je(r).isValid(), _t = (r) => {
   if (!(r == null || typeof r == "boolean"))
     return typeof r == "number" || !Number.isNaN(+r) ? je(Oi(+r)) : je(r);
 };
-class Fi extends $e {
+class Ni extends $e {
   constructor() {
     super(...arguments);
-    v(this, "id", q.DATE);
-    v(this, "title", "dataValidation.date.title");
-    v(this, "operators", [
+    g(this, "id", X.DATE);
+    g(this, "title", "dataValidation.date.title");
+    g(this, "operators", [
       C.BETWEEN,
       C.EQUAL,
       C.GREATER_THAN,
@@ -1889,18 +1881,18 @@ class Fi extends $e {
       C.NOT_BETWEEN,
       C.NOT_EQUAL
     ]);
-    v(this, "scopes", ["sheet"]);
-    v(this, "formulaInput", ut);
-    v(this, "dropdown", jr);
-    v(this, "_formulaService", this.injector.get(ue));
-    v(this, "transformDate", gt);
+    g(this, "scopes", ["sheet"]);
+    g(this, "formulaInput", ht);
+    g(this, "dropdown", jr);
+    g(this, "_formulaService", this.injector.get(ue));
+    g(this, "transformDate", _t);
   }
   async parseFormula(e, t, o) {
     var l, d;
     const n = await this._formulaService.getRuleFormulaResult(t, o, e.uid), { formula1: i, formula2: s } = e;
     return {
-      formula1: gt(T(i) ? Ce((l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) : i),
-      formula2: gt(T(s) ? Ce((d = n == null ? void 0 : n[1]) == null ? void 0 : d.result) : s)
+      formula1: _t(N(i) ? Ce((l = n == null ? void 0 : n[0]) == null ? void 0 : l.result) : i),
+      formula2: _t(N(s) ? Ce((d = n == null ? void 0 : n[1]) == null ? void 0 : d.result) : s)
     };
   }
   async isValidType(e) {
@@ -1908,7 +1900,7 @@ class Fi extends $e {
     return typeof t == "string" ? je(t).isValid() : typeof t == "number";
   }
   _validatorSingleFormula(e) {
-    return !U.isBlank(e) && (T(e) || !Number.isNaN(+e) || !!e && je(e).isValid());
+    return !B.isBlank(e) && (N(e) || !Number.isNaN(+e) || !!e && je(e).isValid());
   }
   validatorFormula(e, t, o) {
     const n = e.operator;
@@ -1917,7 +1909,7 @@ class Fi extends $e {
         success: !1
       };
     const i = this._validatorSingleFormula(e.formula1), s = this.localeService.t("dataValidation.validFail.date");
-    if (st.includes(n)) {
+    if (lt.includes(n)) {
       const d = this._validatorSingleFormula(e.formula2);
       return {
         success: i && d,
@@ -1934,7 +1926,7 @@ class Fi extends $e {
     const { value: n } = e;
     return {
       ...e,
-      value: gt(n)
+      value: _t(n)
     };
   }
   async validatorIsEqual(e, t, o) {
@@ -1976,14 +1968,14 @@ class Fi extends $e {
     return n ? o.isBefore(n) || o.isSame(n) : !0;
   }
   validatorFormulaValue(e) {
-    if (!U.isDefine(e.operator))
+    if (!B.isDefine(e.operator))
       return;
-    if (st.includes(e.operator)) {
-      if (U.isBlank(e.formula1) || U.isBlank(e.formula2))
+    if (lt.includes(e.operator)) {
+      if (B.isBlank(e.formula1) || B.isBlank(e.formula2))
         return "";
       if (!ka(e.formula1) || !ka(e.formula2))
         return "";
-    } else if (U.isBlank(e.formula1))
+    } else if (B.isBlank(e.formula1))
       return "";
   }
   get operatorNames() {
@@ -1998,7 +1990,7 @@ class Fi extends $e {
   }
   generateRuleErrorMessage(e) {
     var o, n;
-    return e.operator ? `${this.localeService.t(Ni[e.operator]).replace(Wa, (o = e.formula1) != null ? o : "").replace(Ha, (n = e.formula2) != null ? n : "")}` : this.titleStr;
+    return e.operator ? `${this.localeService.t(Fi[e.operator]).replace(Wa, (o = e.formula1) != null ? o : "").replace(Ha, (n = e.formula2) != null ? n : "")}` : this.titleStr;
   }
 }
 var Li = Object.defineProperty, Pi = Object.getOwnPropertyDescriptor, Ai = (r, a, e, t) => {
@@ -2006,7 +1998,7 @@ var Li = Object.defineProperty, Pi = Object.getOwnPropertyDescriptor, Ai = (r, a
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
   return t && o && Li(a, e, o), o;
 }, Ya = (r, a) => (e, t) => a(e, t, r);
-const ke = 4, xi = 6, fe = 14, Te = 6, we = 4, ji = "#565656", Ga = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
+const ke = 4, xi = 6, fe = 14, Te = 6, we = 4, ji = "#565656", Xa = 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 Bi(r, a) {
   const e = r.length;
   return {
@@ -2047,7 +2039,7 @@ function Bi(r, a) {
     }
   };
 }
-function Nr(r, a, e) {
+function Fr(r, a, e) {
   const t = Bi(r, e), o = new Kr(t), n = new Ho(o);
   return {
     documentSkeleton: ko.create(n, a),
@@ -2060,9 +2052,9 @@ function Ht(r, a, e) {
     documentSkeleton: t,
     docModel: o,
     docViewModel: n
-  } = Nr(r, a, e);
+  } = Fr(r, a, e);
   return {
-    documents: new Yo(`DOCUMENTS_${U.generateRandomId()}`, t, {
+    documents: new Yo(`DOCUMENTS_${B.generateRandomId()}`, t, {
       pageMarginLeft: 0,
       pageMarginTop: 0
     }),
@@ -2071,7 +2063,7 @@ function Ht(r, a, e) {
     docViewModel: n
   };
 }
-function Xa(r, a, e, t, o, n) {
+function Ga(r, a, e, t, o, n) {
   let i = 0;
   switch (o) {
     case de.BOTTOM:
@@ -2101,10 +2093,10 @@ function Xa(r, a, e, t, o, n) {
 var Zt;
 let da = (Zt = class {
   constructor(r, a) {
-    v(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
-    v(this, "zIndex");
-    v(this, "onPointerEnter");
-    v(this, "onPointerLeave");
+    g(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    g(this, "zIndex");
+    g(this, "onPointerEnter");
+    g(this, "onPointerLeave");
     this._localeService = r, this._commandService = a;
   }
   _ensureMap(r) {
@@ -2116,36 +2108,36 @@ let da = (Zt = class {
   }
   _drawDownIcon(r, a, e, t, o) {
     const n = e - fe + 4;
-    let i = 4;
+    let i = 9;
     switch (o) {
       case de.MIDDLE:
         i = (t - fe) / 2 + 4;
         break;
       case de.BOTTOM:
-        i = t - fe + 4;
+        i = t - fe - 1;
         break;
     }
-    r.save(), r.translateWithPrecision(a.startX + n, a.startY + i), r.fillStyle = "#565656", r.fill(Ga), r.restore();
+    r.save(), r.translateWithPrecision(a.startX + n, a.startY + i), r.fillStyle = "#565656", r.fill(Xa), r.restore();
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(r, a, e) {
-    var Y, x;
-    const { primaryWithCoord: t, row: o, col: n, style: i, data: s, subUnitId: l } = a, d = t.isMergedMainCell ? t.mergeInfo : t, c = (Y = s.dataValidation) == null ? void 0 : Y.rule, u = (x = s.dataValidation) == null ? void 0 : x.validator, m = s.fontRenderExtension, { leftOffset: f = 0, rightOffset: h = 0, topOffset: g = 0, downOffset: R = 0 } = m || {};
+    var q, L;
+    const { primaryWithCoord: t, row: o, col: n, style: i, data: s, subUnitId: l } = a, d = t.isMergedMainCell ? t.mergeInfo : t, c = (q = s.dataValidation) == null ? void 0 : q.rule, u = (L = s.dataValidation) == null ? void 0 : L.validator, h = s.fontRenderExtension, { leftOffset: f = 0, rightOffset: m = 0, topOffset: v = 0, downOffset: R = 0 } = h || {};
     if (!c || !u || !u.skipDefaultFontRender(c))
       return;
     const _ = {
       startX: d.startX + f,
-      endX: d.endX - h,
-      startY: d.startY + g,
+      endX: d.endX - m,
+      startY: d.startY + v,
       endY: d.endY - R
-    }, V = _.endX - _.startX, S = _.endY - _.startY, I = this._ensureMap(l), y = this._generateKey(o, n), O = u.getListWithColor(c), j = ne(s), P = `${j != null ? j : ""}`, N = O.find((L) => L.label === P);
-    let { tb: A, vt: F, ht: B } = i || {};
-    if (A = A != null ? A : pe.WRAP, F = F != null ? F : de.BOTTOM, B = B != null ? B : Ae.LEFT, c.renderMode === ce.ARROW) {
-      this._drawDownIcon(r, _, V, S, F), r.save(), r.translateWithPrecision(_.startX, _.startY), r.beginPath(), r.rect(0, 0, V, S), r.clip();
-      const L = V - fe, { documentSkeleton: G, documents: te, docModel: H } = Ht(P, this._localeService, i);
-      A === pe.WRAP && H.updateDocumentDataPageSize(Math.max(L, 1)), G.calculate(), G.getActualSize();
-      const M = mt(G), { height: b, width: Z } = M, { paddingTop: X, paddingLeft: me } = Xa(L, S, Z, b, F, B);
-      r.translate(0, X), r.save(), r.translateWithPrecision(ke, 0), r.beginPath(), r.rect(0, 0, L, b), r.clip(), te.render(r), r.translateWithPrecision(me, 0), r.restore(), r.restore(), I.set(y, {
+    }, V = _.endX - _.startX, S = _.endY - _.startY, y = this._ensureMap(l), w = this._generateKey(o, n), F = u.getListWithColor(c), x = ne(s), j = `${x != null ? x : ""}`, $ = F.find((b) => b.label === j);
+    let { tb: E, vt: P, ht: A } = i || {};
+    if (E = E != null ? E : pe.WRAP, P = P != null ? P : de.BOTTOM, A = A != null ? A : Ae.LEFT, c.renderMode === ce.ARROW) {
+      this._drawDownIcon(r, _, V, S, P), r.save(), r.translateWithPrecision(_.startX, _.startY), r.beginPath(), r.rect(0, 0, V, S), r.clip();
+      const b = V - fe, { documentSkeleton: Y, documents: Z, docModel: H } = Ht(j, this._localeService, i);
+      E === pe.WRAP && H.updateDocumentDataPageSize(Math.max(b, 1)), Y.calculate(), Y.getActualSize();
+      const M = ft(Y), { height: O, width: J } = M, { paddingTop: G, paddingLeft: me } = Ga(b, S, J, O, P, A);
+      r.translate(0, G), r.save(), r.translateWithPrecision(ke, 0), r.beginPath(), r.rect(0, 0, b, O), r.clip(), Z.render(r), r.translateWithPrecision(me, 0), r.restore(), r.restore(), y.set(w, {
         left: _.endX + e.rowHeaderWidth - fe,
         top: _.startY + e.columnHeaderHeight,
         width: fe,
@@ -2153,19 +2145,19 @@ let da = (Zt = class {
       });
     } else {
       r.save(), r.translateWithPrecision(_.startX, _.startY), r.beginPath(), r.rect(0, 0, V, S), r.clip();
-      const L = V - Te * 2 - ke - fe, { documentSkeleton: G, documents: te, docModel: H } = Ht(P, this._localeService, i);
-      A === pe.WRAP && H.updateDocumentDataPageSize(Math.max(L, 1)), G.calculate();
-      const M = mt(G), { height: b, width: Z } = M, { paddingTop: X, paddingLeft: me } = Xa(L, S, Z, b, F, B);
-      r.translate(Te, X);
-      const D = Math.max(V - Te * 2, 1), W = b;
+      const b = V - Te * 2 - ke - fe, { documentSkeleton: Y, documents: Z, docModel: H } = Ht(j, this._localeService, i);
+      E === pe.WRAP && H.updateDocumentDataPageSize(Math.max(b, 1)), Y.calculate();
+      const M = ft(Y), { height: O, width: J } = M, { paddingTop: G, paddingLeft: me } = Ga(b, S, J, O, P, A);
+      r.translate(Te, G);
+      const D = Math.max(V - Te * 2, 1), W = O;
       dr.drawWith(r, {
         width: D,
         height: W,
-        fill: (N == null ? void 0 : N.color) || Fe,
+        fill: ($ == null ? void 0 : $.color) || Ne,
         radius: 8
-      }), r.save(), r.translateWithPrecision(ke, 0), r.beginPath(), r.rect(0, 0, L, b), r.clip(), r.translateWithPrecision(me, 0), te.render(r), r.restore(), r.translate(L + ke + 4, (b - xi) / 2), r.fillStyle = ji, r.fill(Ga), r.restore(), I.set(y, {
+      }), r.save(), r.translateWithPrecision(ke, 0), r.beginPath(), r.rect(0, 0, b, O), r.clip(), r.translateWithPrecision(me, 0), Z.render(r), r.restore(), r.translate(b + ke + 4, (O - xi) / 2), r.fillStyle = ji, r.fill(Xa), r.restore(), y.set(w, {
         left: _.startX + Te + e.rowHeaderWidth,
-        top: _.startY + X + e.columnHeaderHeight,
+        top: _.startY + G + e.columnHeaderHeight,
         width: D,
         height: W
       });
@@ -2181,28 +2173,28 @@ let da = (Zt = class {
       endX: o.endX - s,
       startY: o.startY + l,
       endY: o.endY - d
-    }, m = u.endX - u.startX, f = ne(t), h = `${f != null ? f : ""}`;
-    let { tb: g } = e || {};
-    if (g = g != null ? g : pe.WRAP, c.renderMode === ce.ARROW) {
-      const _ = m - fe, { documentSkeleton: V, docModel: S } = Ht(h, this._localeService, e);
-      g === pe.WRAP && S.updateDocumentDataPageSize(Math.max(_, 1)), V.calculate(), V.getActualSize();
-      const I = mt(V), { height: y } = I;
-      return y;
+    }, h = u.endX - u.startX, f = ne(t), m = `${f != null ? f : ""}`;
+    let { tb: v } = e || {};
+    if (v = v != null ? v : pe.WRAP, c.renderMode === ce.ARROW) {
+      const _ = h - fe, { documentSkeleton: V, docModel: S } = Ht(m, this._localeService, e);
+      v === pe.WRAP && S.updateDocumentDataPageSize(Math.max(_, 1)), V.calculate(), V.getActualSize();
+      const y = ft(V), { height: w } = y;
+      return w;
     } else {
-      const _ = m - Te * 2 - ke - fe, { documentSkeleton: V, docModel: S } = Nr(h, this._localeService, e);
-      g === pe.WRAP && S.updateDocumentDataPageSize(Math.max(_, 1)), V.calculate();
-      const I = mt(V), {
-        height: y
-      } = I;
-      return y + we * 2;
+      const _ = h - Te * 2 - ke - fe, { documentSkeleton: V, docModel: S } = Fr(m, this._localeService, e);
+      v === pe.WRAP && S.updateDocumentDataPageSize(Math.max(_, 1)), V.calculate();
+      const y = ft(V), {
+        height: w
+      } = y;
+      return w + we * 2;
     }
   }
   isHit(r, a) {
     const { data: e, subUnitId: t, row: o, col: n } = a, s = this._ensureMap(t).get(this._generateKey(o, n)), l = e.dataValidation;
     if (!l || !s || l.rule.renderMode === ce.TEXT)
       return !1;
-    const { top: d, left: c, width: u, height: m } = s, { x: f, y: h } = r;
-    return f >= c && f <= c + u && h >= d && h <= d + m;
+    const { top: d, left: c, width: u, height: h } = s, { x: f, y: m } = r;
+    return f >= c && f <= c + u && m >= d && m <= d + h;
   }
   onPointerDown(r, a) {
     if (a.button === 2)
@@ -2215,27 +2207,27 @@ let da = (Zt = class {
     };
     this._commandService.executeCommand(Va.id, i);
   }
-}, v(Zt, "padding", {
+}, g(Zt, "padding", {
   l: Te + ke,
   r: fe + Te,
   t: we,
   b: we
 }), Zt);
 da = Ai([
-  Ya(0, w(ie)),
+  Ya(0, I(ie)),
   Ya(1, re)
 ], da);
 const Ui = "LIST_RENDER_MODE_OPTION_INPUT";
-function bt(r) {
+function Tt(r) {
   var o;
-  const { value: a, onChange: e } = r, t = E(ie);
+  const { value: a, onChange: e } = r, t = T(ie);
   return /* @__PURE__ */ p.jsx(Q, { label: t.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ p.jsxs(Sa, { value: `${(o = a.renderMode) != null ? o : ce.CUSTOM}`, onChange: (n) => e({ ...a, renderMode: +n }), children: [
     /* @__PURE__ */ p.jsx(Le, { value: `${ce.CUSTOM}`, children: t.t("dataValidation.renderMode.chip") }),
     /* @__PURE__ */ p.jsx(Le, { value: `${ce.ARROW}`, children: t.t("dataValidation.renderMode.arrow") }),
     /* @__PURE__ */ p.jsx(Le, { value: `${ce.TEXT}`, children: t.t("dataValidation.renderMode.text") })
   ] }) });
 }
-bt.componentKey = Ui;
+Tt.componentKey = Ui;
 function kt(r) {
   if (!r)
     return [];
@@ -2256,7 +2248,7 @@ const $i = [
   "offset"
 ];
 function Wi(r, a) {
-  if (!T(r) || Ca(r.slice(1)))
+  if (!N(r) || Ca(r.slice(1)))
     return !0;
   const t = a.sequenceNodesBuilder(r);
   return t && t.some((o) => typeof o == "object" && o.nodeType === en.FUNCTION && $i.indexOf(o.token.toLowerCase()) > -1);
@@ -2270,27 +2262,27 @@ function Hi(r, a) {
   }
   return !1;
 }
-class Fr extends $e {
+class Nr extends $e {
   constructor() {
     super(...arguments);
-    v(this, "formulaService", this.injector.get(ue));
-    v(this, "_lexer", this.injector.get(Ra));
-    v(this, "_univerInstanceService", this.injector.get(ee));
-    v(this, "id", q.LIST);
-    v(this, "title", "dataValidation.list.title");
-    v(this, "operators", []);
-    v(this, "scopes", ["sheet"]);
-    v(this, "formulaInput", br);
-    v(this, "canvasRender", this.injector.createInstance(da));
-    v(this, "dropdown", xr);
-    v(this, "optionsInput", bt.componentKey);
+    g(this, "formulaService", this.injector.get(ue));
+    g(this, "_lexer", this.injector.get(Ra));
+    g(this, "_univerInstanceService", this.injector.get(te));
+    g(this, "id", X.LIST);
+    g(this, "title", "dataValidation.list.title");
+    g(this, "operators", []);
+    g(this, "scopes", ["sheet"]);
+    g(this, "formulaInput", br);
+    g(this, "canvasRender", this.injector.createInstance(da));
+    g(this, "dropdown", xr);
+    g(this, "optionsInput", Tt.componentKey);
   }
   skipDefaultFontRender(e) {
     return e.renderMode !== ce.TEXT;
   }
   validatorFormula(e, t, o) {
     var d, c, u;
-    const n = !U.isBlank(e.formula1), i = Wi((d = e.formula1) != null ? d : "", this._lexer), s = (u = (c = this._univerInstanceService.getUnit(t, ae.UNIVER_SHEET)) == null ? void 0 : c.getSheetBySheetId(o)) == null ? void 0 : u.getName(), l = Hi(e, s != null ? s : "");
+    const n = !B.isBlank(e.formula1), i = Wi((d = e.formula1) != null ? d : "", this._lexer), s = (u = (c = this._univerInstanceService.getUnit(t, ae.UNIVER_SHEET)) == null ? void 0 : c.getSheetBySheetId(o)) == null ? void 0 : u.getName(), l = Hi(e, s != null ? s : "");
     return {
       success: !!(n && i && !l),
       formula1: n ? i ? l ? this.localeService.t("dataValidation.validFail.listIntersects") : void 0 : this.localeService.t("dataValidation.validFail.listInvalid") : this.localeService.t("dataValidation.validFail.list")
@@ -2298,13 +2290,13 @@ class Fr extends $e {
   }
   parseCellValue(e) {
     const t = e.toString();
-    return Xe(t);
+    return Ge(t);
   }
   async parseFormula(e, t, o) {
     var s;
     const { formula1: n = "" } = e, i = await this.formulaService.getRuleFormulaResult(t, o, e.uid);
     return {
-      formula1: T(n) ? kt((s = i == null ? void 0 : i[0]) == null ? void 0 : s.result) : Xe(n),
+      formula1: N(n) ? kt((s = i == null ? void 0 : i[0]) == null ? void 0 : s.result) : Ge(n),
       formula2: void 0
     };
   }
@@ -2319,20 +2311,22 @@ class Fr extends $e {
     return this.localeService.t("dataValidation.list.error");
   }
   getList(e, t, o) {
-    var m, f, h;
-    const { formula1: n = "" } = e, i = this.injector.get(ee), s = (m = t ? i.getUniverSheetInstance(t) : void 0) != null ? m : i.getCurrentUnitForType(ae.UNIVER_SHEET);
-    if (!s)
-      return [];
-    const l = (f = o ? s.getSheetBySheetId(o) : void 0) != null ? f : s.getActiveSheet(), d = s.getUnitId(), c = l.getSheetId(), u = this.formulaService.getRuleFormulaResultSync(d, c, e.uid);
-    return T(n) ? kt((h = u == null ? void 0 : u[0]) == null ? void 0 : h.result) : Xe(n);
+    var h, f, m;
+    const { formula1: n = "" } = e, i = this.injector.get(te), s = (h = t ? i.getUniverSheetInstance(t) : void 0) != null ? h : i.getCurrentUnitForType(ae.UNIVER_SHEET);
+    if (!s) return [];
+    const l = (f = o ? s.getSheetBySheetId(o) : void 0) != null ? f : s.getActiveSheet();
+    if (!l) return [];
+    const d = s.getUnitId(), c = l.getSheetId(), u = this.formulaService.getRuleFormulaResultSync(d, c, e.uid);
+    return N(n) ? kt((m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) : Ge(n);
   }
   async getListAsync(e, t, o) {
-    var m, f, h;
-    const { formula1: n = "" } = e, i = this.injector.get(ee), s = (m = t ? i.getUniverSheetInstance(t) : void 0) != null ? m : i.getCurrentUnitForType(ae.UNIVER_SHEET);
-    if (!s)
-      return [];
-    const l = (f = o ? s.getSheetBySheetId(o) : 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((h = u == null ? void 0 : u[0]) == null ? void 0 : h.result) : Xe(n);
+    var h, f, m;
+    const { formula1: n = "" } = e, i = this.injector.get(te), s = (h = t ? i.getUniverSheetInstance(t) : void 0) != null ? h : i.getCurrentUnitForType(ae.UNIVER_SHEET);
+    if (!s) return [];
+    const l = (f = o ? s.getSheetBySheetId(o) : void 0) != null ? f : s.getActiveSheet();
+    if (!l) return [];
+    const d = s.getUnitId(), c = l.getSheetId(), u = await this.formulaService.getRuleFormulaResult(d, c, e.uid);
+    return N(n) ? kt((m = u == null ? void 0 : u[0]) == null ? void 0 : m.result) : Ge(n);
   }
   getListWithColor(e, t, o) {
     const n = this.getList(e, t, o), i = (e.formula2 || "").split(",");
@@ -2345,17 +2339,17 @@ class Fr extends $e {
     }), i;
   }
 }
-function Tt(r) {
+function Ft(r) {
   let a = r;
   return typeof r == "string" ? ((r.startsWith("¥") || r.startsWith("$")) && (a = r.slice(1)), +a) : +r;
 }
 class ki extends $e {
   constructor() {
     super(...arguments);
-    v(this, "_formulaService", this.injector.get(ue));
-    v(this, "id", q.DECIMAL);
-    v(this, "title", "dataValidation.decimal.title");
-    v(this, "operators", [
+    g(this, "_formulaService", this.injector.get(ue));
+    g(this, "id", X.DECIMAL);
+    g(this, "title", "dataValidation.decimal.title");
+    g(this, "operators", [
       C.BETWEEN,
       C.EQUAL,
       C.GREATER_THAN,
@@ -2365,33 +2359,33 @@ class ki extends $e {
       C.NOT_BETWEEN,
       C.NOT_EQUAL
     ]);
-    v(this, "scopes", ["sheet"]);
-    v(this, "formulaInput", ut);
-    v(this, "dropDownInput");
+    g(this, "scopes", ["sheet"]);
+    g(this, "formulaInput", ht);
+    g(this, "dropDownInput");
   }
   _isFormulaOrNumber(e) {
-    return !U.isBlank(e) && (T(e) || !Number.isNaN(+e));
+    return !B.isBlank(e) && (N(e) || !Number.isNaN(+e));
   }
   async isValidType(e, t, o) {
     const { value: n } = e;
-    return !Number.isNaN(Tt(n));
+    return !Number.isNaN(Ft(n));
   }
   transform(e, t, o) {
     const { value: n } = e;
     return {
       ...e,
-      value: Tt(n)
+      value: Ft(n)
     };
   }
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
   async parseFormula(e, t, o) {
-    var d, c, u, m, f, h, g, R;
+    var d, c, u, h, f, m, v, R;
     const n = await this._formulaService.getRuleFormulaResult(t, o, e.uid), { formula1: i, formula2: s } = e;
     return {
-      formula1: this._parseNumber(T(i) ? (m = (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 : m.v : i),
-      formula2: this._parseNumber(T(s) ? (R = (g = (h = (f = n == null ? void 0 : n[1]) == null ? void 0 : f.result) == null ? void 0 : h[0]) == null ? void 0 : g[0]) == null ? void 0 : R.v : s)
+      formula1: this._parseNumber(N(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(N(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, t, o) {
@@ -2400,7 +2394,7 @@ class ki extends $e {
       return {
         success: !1
       };
-    const i = U.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), s = U.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = st.includes(n), d = this.localeService.t("dataValidation.validFail.number");
+    const i = B.isDefine(e.formula1) && this._isFormulaOrNumber(e.formula1), s = B.isDefine(e.formula2) && this._isFormulaOrNumber(e.formula2), l = lt.includes(n), d = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: i && s,
       formula1: i ? void 0 : d,
@@ -2449,13 +2443,13 @@ class ki extends $e {
     return Number.isNaN(n) ? !0 : e.value <= n;
   }
 }
-const Yi = "{FORMULA1}", Gi = "{FORMULA2}";
-class Xi extends $e {
+const Yi = "{FORMULA1}", Xi = "{FORMULA2}";
+class Gi extends $e {
   constructor() {
     super(...arguments);
-    v(this, "id", q.TEXT_LENGTH);
-    v(this, "title", "dataValidation.textLength.title");
-    v(this, "operators", [
+    g(this, "id", X.TEXT_LENGTH);
+    g(this, "title", "dataValidation.textLength.title");
+    g(this, "operators", [
       C.BETWEEN,
       C.EQUAL,
       C.GREATER_THAN,
@@ -2465,12 +2459,12 @@ class Xi extends $e {
       C.NOT_BETWEEN,
       C.NOT_EQUAL
     ]);
-    v(this, "scopes", ["sheet"]);
-    v(this, "formulaInput", ut);
-    v(this, "_formulaService", this.injector.get(ue));
+    g(this, "scopes", ["sheet"]);
+    g(this, "formulaInput", ht);
+    g(this, "_formulaService", this.injector.get(ue));
   }
   _isFormulaOrInt(e) {
-    return !U.isBlank(e) && (T(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !B.isBlank(e) && (N(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   validatorFormula(e, t, o) {
     const n = e.operator;
@@ -2478,7 +2472,7 @@ class Xi extends $e {
       return {
         success: !1
       };
-    const i = U.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), s = U.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = st.includes(n), d = this.localeService.t("dataValidation.validFail.number");
+    const i = B.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), s = B.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = lt.includes(n), d = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: i && s,
       formula1: i ? void 0 : d,
@@ -2495,11 +2489,11 @@ class Xi extends $e {
     return !Number.isNaN(e);
   }
   async parseFormula(e, t, o) {
-    var l, d, c, u, m, f, h, g;
+    var l, d, c, u, h, f, m, v;
     const n = await this._formulaService.getRuleFormulaResult(t, o, 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) ? (g = (h = (f = (m = n == null ? void 0 : n[1]) == null ? void 0 : m.result) == null ? void 0 : f[0]) == null ? void 0 : h[0]) == null ? void 0 : g.v : s)
+      formula1: this._parseNumber(N(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(N(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)
     };
   }
   transform(e, t, o) {
@@ -2514,11 +2508,11 @@ class Xi extends $e {
   }
   async validatorIsEqual(e, t, o) {
     const { formula1: n } = t;
-    return U.isDefine(n) ? e.value === n : !1;
+    return B.isDefine(n) ? e.value === n : !1;
   }
   async validatorIsNotEqual(e, t, o) {
     const { formula1: n } = t;
-    return U.isDefine(n) ? e.value !== n : !1;
+    return B.isDefine(n) ? e.value !== n : !1;
   }
   async validatorIsBetween(e, t, o) {
     const { formula1: n, formula2: i } = t, { value: s } = e;
@@ -2552,16 +2546,16 @@ class Xi extends $e {
   }
   generateRuleErrorMessage(e) {
     var o, n;
-    return e.operator ? `${this.localeService.t(io[e.operator]).replace(Yi, (o = e.formula1) != null ? o : "").replace(Gi, (n = e.formula2) != null ? n : "")}` : this.titleStr;
+    return e.operator ? `${this.localeService.t(io[e.operator]).replace(Yi, (o = e.formula1) != null ? o : "").replace(Xi, (n = e.formula2) != null ? n : "")}` : this.titleStr;
   }
 }
 class qi extends $e {
   constructor() {
     super(...arguments);
-    v(this, "_formulaService", this.injector.get(ue));
-    v(this, "id", q.WHOLE);
-    v(this, "title", "dataValidation.whole.title");
-    v(this, "operators", [
+    g(this, "_formulaService", this.injector.get(ue));
+    g(this, "id", X.WHOLE);
+    g(this, "title", "dataValidation.whole.title");
+    g(this, "operators", [
       C.BETWEEN,
       C.EQUAL,
       C.GREATER_THAN,
@@ -2571,33 +2565,33 @@ class qi extends $e {
       C.NOT_BETWEEN,
       C.NOT_EQUAL
     ]);
-    v(this, "scopes", ["sheet"]);
-    v(this, "formulaInput", ut);
-    v(this, "dropDownInput");
+    g(this, "scopes", ["sheet"]);
+    g(this, "formulaInput", ht);
+    g(this, "dropDownInput");
   }
   _isFormulaOrInt(e) {
-    return !U.isBlank(e) && (T(e) || !Number.isNaN(+e) && Number.isInteger(+e));
+    return !B.isBlank(e) && (N(e) || !Number.isNaN(+e) && Number.isInteger(+e));
   }
   async isValidType(e, t, o) {
-    const { value: n } = e, i = Tt(n);
+    const { value: n } = e, i = Ft(n);
     return !Number.isNaN(i) && Number.isInteger(i);
   }
   transform(e, t, o) {
     const { value: n } = e;
     return {
       ...e,
-      value: Tt(n)
+      value: Ft(n)
     };
   }
   _parseNumber(e) {
     return e == null ? Number.NaN : +e;
   }
   async parseFormula(e, t, o) {
-    var d, c, u, m, f, h, g, R;
+    var d, c, u, h, f, m, v, R;
     const n = await this._formulaService.getRuleFormulaResult(t, o, e.uid), { formula1: i, formula2: s } = e;
     return {
-      formula1: this._parseNumber(T(i) ? (m = (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 : m.v : i),
-      formula2: this._parseNumber(T(s) ? (R = (g = (h = (f = n == null ? void 0 : n[1]) == null ? void 0 : f.result) == null ? void 0 : h[0]) == null ? void 0 : g[0]) == null ? void 0 : R.v : s)
+      formula1: this._parseNumber(N(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(N(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, t, o) {
@@ -2606,7 +2600,7 @@ class qi extends $e {
       return {
         success: !1
       };
-    const i = U.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), s = U.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = st.includes(n), d = this.localeService.t("dataValidation.validFail.number");
+    const i = B.isDefine(e.formula1) && this._isFormulaOrInt(e.formula1), s = B.isDefine(e.formula2) && this._isFormulaOrInt(e.formula2), l = lt.includes(n), d = this.localeService.t("dataValidation.validFail.number");
     return l ? {
       success: i && s,
       formula1: i ? void 0 : d,
@@ -2655,9 +2649,9 @@ class qi extends $e {
     return Number.isNaN(n) ? !0 : e.value <= n;
   }
 }
-const Lr = 4, zi = 0, Yt = 4, Pr = 4, ca = 6, Nt = 6, Ne = 14;
+const Lr = 4, zi = 0, Yt = 4, Pr = 4, ca = 6, Nt = 6, Fe = 14;
 function Qi(r, a) {
-  const e = Go.getTextSize(r, a), t = e.width + Lr * 2, { ba: o, bd: n } = e, i = o + n;
+  const e = Xo.getTextSize(r, a), t = e.width + Lr * 2, { ba: o, bd: n } = e, i = o + n;
   return {
     width: t,
     height: i + zi * 2,
@@ -2665,16 +2659,16 @@ function Qi(r, a) {
   };
 }
 function qa(r, a, e, t) {
-  const o = e - Ne - ca, n = t - Nt * 2, i = r.map((c) => ({
+  const o = e - Fe - ca, n = t - Nt * 2, i = r.map((c) => ({
     layout: Qi(c, a),
     text: c
   }));
   let s;
   const l = [];
   i.forEach((c) => {
-    const { layout: u } = c, { width: m, height: f } = u;
-    !s || s.width + m + Yt > o ? (s = {
-      width: m,
+    const { layout: u } = c, { width: h, height: f } = u;
+    !s || s.width + h + Yt > o ? (s = {
+      width: h,
       height: f,
       items: [{
         ...c,
@@ -2683,7 +2677,7 @@ function qa(r, a, e, t) {
     }, l.push(s)) : (s.items.push({
       ...c,
       left: s.width + Yt
-    }), s.width = s.width + m + Yt);
+    }), s.width = s.width + h + Yt);
   });
   let d = 0;
   return l.forEach((c, u) => {
@@ -2697,14 +2691,14 @@ function qa(r, a, e, t) {
   };
 }
 const Ki = 8;
-class Zi extends Xo {
+class Zi extends Go {
   static drawWith(a, e) {
     const { fontFamily: t, fontString: o, fontSize: n, info: i, fill: s, color: l } = e, { layout: d, text: c } = i;
     a.save(), dr.drawWith(a, {
       width: d.width,
       height: d.height,
       radius: Ki,
-      fill: s || Fe
+      fill: s || Ne
     }), a.translateWithPrecision(Lr, d.ba), a.font = o, a.fillStyle = l, a.fillText(c, 0, 0), a.restore();
   }
 }
@@ -2716,8 +2710,8 @@ var Ji = Object.defineProperty, es = Object.getOwnPropertyDescriptor, ts = (r, a
 const rs = 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(r) {
-    v(this, "zIndex");
-    v(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    g(this, "zIndex");
+    g(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     this._commandService = r;
   }
   _ensureMap(r) {
@@ -2728,33 +2722,33 @@ let ua = class {
     return `${r}.${a}`;
   }
   _drawDownIcon(r, a, e, t, o) {
-    const n = e - Ne + 4;
+    const n = e - Fe + 4;
     let i = 4;
     switch (o) {
       case de.MIDDLE:
-        i = (t - Ne) / 2 + 4;
+        i = (t - Fe) / 2 + 4;
         break;
       case de.BOTTOM:
-        i = t - Ne + 4;
+        i = t - Fe + 4;
         break;
     }
     r.save(), r.translateWithPrecision(a.startX + n, a.startY + i), r.fillStyle = "#565656", r.fill(rs), r.restore();
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(r, a, e, t) {
-    var b, Z;
-    const { primaryWithCoord: o, row: n, col: i, style: s, data: l, subUnitId: d } = a, c = o.isMergedMainCell ? o.mergeInfo : o, u = l.fontRenderExtension, { leftOffset: m = 0, rightOffset: f = 0, topOffset: h = 0, downOffset: g = 0 } = u || {}, R = l.dataValidation, _ = this._ensureMap(d), V = this._generateKey(n, i);
+    var O, J;
+    const { primaryWithCoord: o, row: n, col: i, style: s, data: l, subUnitId: d } = a, c = o.isMergedMainCell ? o.mergeInfo : o, u = l.fontRenderExtension, { leftOffset: h = 0, rightOffset: f = 0, topOffset: m = 0, downOffset: v = 0 } = u || {}, R = l.dataValidation, _ = this._ensureMap(d), V = this._generateKey(n, i);
     if (!R)
       return;
     const S = {
-      startX: c.startX + m,
+      startX: c.startX + h,
       endX: c.endX - f,
-      startY: c.startY + h,
-      endY: c.endY - g
-    }, I = S.endX - S.startX, y = S.endY - S.startY, { cl: O } = s || {}, j = (b = typeof O == "object" ? O == null ? void 0 : O.rgb : O) != null ? b : "#000", P = xa(s != null ? s : void 0), { rule: N, validator: A } = R, F = A, { vt: B, ht: Y } = s || {}, x = B != null ? B : de.MIDDLE, L = (Z = ne(l)) != null ? Z : "", G = F.parseCellValue(L), te = F.getListWithColorMap(N), H = qa(G, P, I, y);
-    this._drawDownIcon(r, S, I, y, x), r.save(), r.translateWithPrecision(S.startX, S.startY), r.beginPath(), r.rect(0, 0, I - Ne, y), r.clip(), r.translateWithPrecision(ca, Nt);
+      startY: c.startY + m,
+      endY: c.endY - v
+    }, y = S.endX - S.startX, w = S.endY - S.startY, { cl: F } = s || {}, x = (O = typeof F == "object" ? F == null ? void 0 : F.rgb : F) != null ? O : "#000", j = xa(s != null ? s : void 0), { rule: $, validator: E } = R, P = E, { vt: A, ht: q } = s || {}, L = A != null ? A : de.MIDDLE, b = (J = ne(l)) != null ? J : "", Y = P.parseCellValue(b), Z = P.getListWithColorMap($), H = qa(Y, j, y, w);
+    this._drawDownIcon(r, S, y, w, L), r.save(), r.translateWithPrecision(S.startX, S.startY), r.beginPath(), r.rect(0, 0, y - Fe, w), r.clip(), r.translateWithPrecision(ca, Nt);
     let M = 0;
-    switch (x) {
+    switch (L) {
       case de.MIDDLE:
         M = (H.contentHeight - H.totalHeight) / 2;
         break;
@@ -2762,35 +2756,35 @@ let ua = class {
         M = H.contentHeight - H.totalHeight;
         break;
     }
-    r.translateWithPrecision(0, M), H.lines.forEach((X, me) => {
+    r.translateWithPrecision(0, M), H.lines.forEach((G, me) => {
       r.save();
-      const { width: D, height: W, items: k } = X;
-      let J = 0;
-      switch (Y) {
+      const { width: D, height: W, items: k } = G;
+      let ee = 0;
+      switch (q) {
         case Ae.RIGHT:
-          J = H.contentWidth - D;
+          ee = H.contentWidth - D;
           break;
         case Ae.CENTER:
-          J = (H.contentWidth - D) / 2;
+          ee = (H.contentWidth - D) / 2;
           break;
       }
-      r.translate(J, me * (W + Pr)), k.forEach((_e) => {
+      r.translate(ee, me * (W + Pr)), k.forEach((_e) => {
         r.save(), r.translateWithPrecision(_e.left, 0), Zi.drawWith(r, {
-          ...P,
+          ...j,
           info: _e,
-          color: j,
-          fill: te[_e.text]
+          color: x,
+          fill: Z[_e.text]
         }), r.restore();
       }), r.restore();
     }), r.restore(), _.set(V, {
       left: S.startX,
       top: S.startY,
-      width: H.contentWidth + ca + Ne,
+      width: H.contentWidth + ca + Fe,
       height: H.contentHeight + Nt * 2
     });
   }
   calcCellAutoHeight(r) {
-    var I;
+    var y;
     const { primaryWithCoord: a, style: e, data: t } = r, o = t.fontRenderExtension, { leftOffset: n = 0, rightOffset: i = 0, topOffset: s = 0, downOffset: l = 0 } = o || {}, d = a.isMergedMainCell ? a.mergeInfo : a, c = {
       startX: d.startX + n,
       endX: d.endX - i,
@@ -2799,12 +2793,12 @@ let ua = class {
     }, u = t.dataValidation;
     if (!u)
       return;
-    const m = c.endX - c.startX, f = c.endY - c.startY, h = (I = ne(t)) != null ? I : "", { validator: g } = u, _ = g.parseCellValue(h), V = xa(e != null ? e : void 0);
-    return qa(_, V, m, f).cellAutoHeight;
+    const h = c.endX - c.startX, f = c.endY - c.startY, m = (y = ne(t)) != null ? y : "", { validator: v } = u, _ = v.parseCellValue(m), V = xa(e != null ? e : void 0);
+    return qa(_, V, h, f).cellAutoHeight;
   }
   isHit(r, a) {
     const { primaryWithCoord: e } = a, t = e.isMergedMainCell ? e.mergeInfo : e, { endX: o } = t, { x: n } = r;
-    return n >= o - Ne && n <= o;
+    return n >= o - Fe && n <= o;
   }
   onPointerDown(r, a) {
     if (a.button === 2)
@@ -2821,12 +2815,12 @@ let ua = class {
 ua = ts([
   as(0, re)
 ], ua);
-class os extends Fr {
+class os extends Nr {
   constructor() {
     super(...arguments);
-    v(this, "id", q.LIST_MULTIPLE);
-    v(this, "title", "dataValidation.listMultiple.title");
-    v(this, "canvasRender", this.injector.createInstance(ua));
+    g(this, "id", X.LIST_MULTIPLE);
+    g(this, "title", "dataValidation.listMultiple.title");
+    g(this, "canvasRender", this.injector.createInstance(ua));
   }
   skipDefaultFontRender() {
     return !0;
@@ -2847,7 +2841,7 @@ function ns(r) {
 }
 function is(r) {
   return {
-    id: ct.id,
+    id: ut.id,
     title: "dataValidation.panel.title",
     type: ga.BUTTON,
     positions: [Da]
@@ -2866,7 +2860,7 @@ var ls = Object.defineProperty, ds = Object.getOwnPropertyDescriptor, cs = (r, a
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
   return t && o && ls(a, e, o), o;
 }, Me = (r, a) => (e, t) => a(e, t, r);
-let rt = class extends er {
+let ot = class extends er {
   constructor(r, a, e, t, o, n, i, s) {
     super(), this._univerInstanceService = r, this._sheetDataValidationService = a, this._dataValidatorRegistryService = e, this._injector = t, this._componentManger = o, this._selectionManagerService = n, this._sheetInterceptorService = i, this._dataValidationModel = s, this._init();
   }
@@ -2877,10 +2871,10 @@ let rt = class extends er {
     [
       ki,
       qi,
-      Xi,
-      Fi,
+      Gi,
+      Ni,
       Di,
-      Fr,
+      Nr,
       os,
       Ri
     ].forEach((r) => {
@@ -2897,11 +2891,14 @@ let rt = class extends er {
   _initInstanceChange() {
     const r = new Qa();
     this._univerInstanceService.getCurrentTypeOfUnit$(ae.UNIVER_SHEET).subscribe((a) => {
-      r.dispose(), a && (this._sheetDataValidationService.switchCurrent(a.getUnitId(), a.getActiveSheet().getSheetId()), r.add(ma(
-        a.activeSheet$.subscribe((e) => {
-          if (e) {
-            const t = a.getUnitId(), o = e.getSheetId();
-            this._sheetDataValidationService.switchCurrent(t, o);
+      if (r.dispose(), !a)
+        return;
+      const e = a.getActiveSheet();
+      e && (this._sheetDataValidationService.switchCurrent(a.getUnitId(), e.getSheetId()), r.add(ma(
+        a.activeSheet$.subscribe((t) => {
+          if (t) {
+            const o = a.getUnitId(), n = t.getSheetId();
+            this._sheetDataValidationService.switchCurrent(o, n);
           }
         })
       )));
@@ -2911,7 +2908,10 @@ let rt = class extends er {
     this._sheetInterceptorService.interceptCommand({
       getMutations: (r) => {
         if (r.id === po.id) {
-          const a = this._univerInstanceService.getCurrentUnitForType(ae.UNIVER_SHEET), e = a.getUnitId(), o = a.getActiveSheet().getSheetId(), n = this._selectionManagerService.getSelectionRanges(), i = this._dataValidationModel.ensureManager(e, o), s = i.getRuleObjectMatrix().clone();
+          const a = this._univerInstanceService.getCurrentUnitForType(ae.UNIVER_SHEET), e = a.getUnitId(), t = a.getActiveSheet();
+          if (!t)
+            throw new Error("No active sheet found");
+          const o = t.getSheetId(), n = this._selectionManagerService.getSelectionRanges(), i = this._dataValidationModel.ensureManager(e, o), s = i.getRuleObjectMatrix().clone();
           n && s.removeRange(n);
           const l = s.diff(i.getDataValidations()), { redoMutations: d, undoMutations: c } = Qe(e, o, l);
           return {
@@ -2927,23 +2927,23 @@ let rt = class extends er {
     });
   }
 };
-rt = cs([
-  ve(ge.Rendered, rt),
-  Me(0, ee),
-  Me(1, w(Et)),
-  Me(2, w(De)),
-  Me(3, w(Ue)),
-  Me(4, w(dt)),
-  Me(5, w(fo)),
-  Me(6, w(or)),
-  Me(7, w(K))
-], rt);
-const us = "univer-data-validation-list-buttons", hs = "univer-data-validation-list-button", Gt = {
+ot = cs([
+  ve(ge.Rendered, ot),
+  Me(0, te),
+  Me(1, I(Ot)),
+  Me(2, I(De)),
+  Me(3, I(Ue)),
+  Me(4, I(ct)),
+  Me(5, I(fo)),
+  Me(6, I(or)),
+  Me(7, I(K))
+], ot);
+const us = "univer-data-validation-list-buttons", hs = "univer-data-validation-list-button", Xt = {
   dataValidationListButtons: us,
   dataValidationListButton: hs
 };
 function ms() {
-  const r = E(ee), a = Ze(
+  const r = T(te), a = Ze(
     () => r.getCurrentTypeOfUnit$(ae.UNIVER_SHEET),
     void 0,
     void 0,
@@ -2952,80 +2952,80 @@ function ms() {
   return a ? /* @__PURE__ */ p.jsx(fs, { workbook: a }) : null;
 }
 function fs(r) {
-  const a = E(K), e = E(ee), t = E(re), o = E(Ue), n = E(Ve);
-  E(rt);
-  const i = E(ie), [s, l] = z([]), { workbook: d } = r, c = Ze(d.activeSheet$, void 0, !0), u = d.getUnitId(), m = c == null ? void 0 : c.getSheetId(), f = a.ensureManager(u, m);
+  const a = T(K), e = T(te), t = T(re), o = T(Ue), n = T(Ve);
+  T(ot);
+  const i = T(ie), [s, l] = z([]), { workbook: d } = r, c = Ze(d.activeSheet$, void 0, !0), u = d.getUnitId(), h = c == null ? void 0 : c.getSheetId(), f = a.ensureManager(u, h);
   qe(() => {
     l(f.getDataValidations());
-    const S = f.dataValidations$.subscribe((I) => {
-      l([...I]);
+    const S = f.dataValidations$.subscribe((y) => {
+      l([...y]);
     });
     return () => {
       S.unsubscribe();
     };
   }, [f]);
-  const h = async () => {
-    const S = tr(o), I = {
+  const m = async () => {
+    const S = tr(o), y = {
       unitId: u,
-      subUnitId: m,
+      subUnitId: h,
       rule: S
     };
-    await t.executeCommand(wa.id, I), n.setActiveRule({
+    await t.executeCommand(wa.id, y), n.setActiveRule({
       unitId: u,
-      subUnitId: m,
+      subUnitId: h,
       rule: S
     });
-  }, g = () => {
+  }, v = () => {
     t.executeCommand(so.id, {
       unitId: u,
-      subUnitId: m
+      subUnitId: h
     });
   }, _ = ((S) => {
-    const y = e.getCurrentUnitForType(ae.UNIVER_SHEET).getActiveSheet();
-    return S.map((j) => {
-      const { ranges: P } = j;
-      return (P == null ? void 0 : P.some((A) => {
-        var L, G;
-        const { startRow: F, startColumn: B, endRow: Y, endColumn: x } = A;
-        for (let te = F; te <= Y; te++)
-          for (let H = B; H <= x; H++) {
-            const M = (G = (L = y.getCell(te, H)) == null ? void 0 : L.selectionProtection) == null ? void 0 : G[0];
-            if ((M == null ? void 0 : M[Dt.Edit]) === !1 || (M == null ? void 0 : M[Dt.View]) === !1)
+    const w = e.getCurrentUnitForType(ae.UNIVER_SHEET).getActiveSheet();
+    return S.map((x) => {
+      const { ranges: j } = x;
+      return (j == null ? void 0 : j.some((E) => {
+        var b, Y;
+        const { startRow: P, startColumn: A, endRow: q, endColumn: L } = E;
+        for (let Z = P; Z <= q; Z++)
+          for (let H = A; H <= L; H++) {
+            const M = (Y = (b = w == null ? void 0 : w.getCell(Z, H)) == null ? void 0 : b.selectionProtection) == null ? void 0 : Y[0];
+            if ((M == null ? void 0 : M[Et.Edit]) === !1 || (M == null ? void 0 : M[Et.View]) === !1)
               return !0;
           }
         return !1;
-      })) ? { ...j, disable: !0 } : { ...j };
+      })) ? { ...x, disable: !0 } : { ...x };
     });
   })(s), V = _ == null ? void 0 : _.some((S) => S.disable);
   return /* @__PURE__ */ p.jsxs("div", { children: [
     _ == null ? void 0 : _.map((S) => {
-      var I;
+      var y;
       return /* @__PURE__ */ p.jsx(
-        Gn,
+        Xn,
         {
           unitId: u,
-          subUnitId: m,
+          subUnitId: h,
           onClick: () => {
             S.disable || n.setActiveRule({
               unitId: u,
-              subUnitId: m,
+              subUnitId: h,
               rule: S
             });
           },
           rule: S,
-          disable: (I = S.disable) != null ? I : !1
+          disable: (y = S.disable) != null ? y : !1
         },
         S.uid
       );
     }),
-    /* @__PURE__ */ p.jsxs("div", { className: Gt.dataValidationListButtons, children: [
-      s.length && !V ? /* @__PURE__ */ p.jsx(ze, { className: Gt.dataValidationListButton, onClick: g, children: i.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ p.jsx(ze, { className: Gt.dataValidationListButton, type: "primary", onClick: h, children: i.t("dataValidation.panel.add") })
+    /* @__PURE__ */ p.jsxs("div", { className: Xt.dataValidationListButtons, children: [
+      s.length && !V ? /* @__PURE__ */ p.jsx(ze, { className: Xt.dataValidationListButton, onClick: v, children: i.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ p.jsx(ze, { className: Xt.dataValidationListButton, type: "primary", onClick: m, children: i.t("dataValidation.panel.add") })
     ] })
   ] });
 }
 const ps = () => {
-  const r = E(Ve), a = Ze(r.activeRule$, r.activeRule);
+  const r = T(Ve), a = Ze(r.activeRule$, r.activeRule);
   return a ? /* @__PURE__ */ p.jsx($n, {}, a.rule.uid) : /* @__PURE__ */ p.jsx(ms, {});
 }, vs = "univer-dv-list-dropdown", gs = "univer-dv-list-dropdown-title", _s = "univer-dv-list-dropdown-list", Ss = "univer-dv-list-dropdown-list-container", Rs = "univer-dv-list-dropdown-selected-icon", Cs = "univer-dv-list-dropdown-item-container", Vs = "univer-dv-list-dropdown-item", Ms = "univer-dv-list-dropdown-split", ws = "univer-dv-list-dropdown-edit", Se = {
   dvListDropdown: vs,
@@ -3043,15 +3043,15 @@ const ps = () => {
     /* @__PURE__ */ p.jsx("div", { className: Se.dvListDropdownTitle, children: n }),
     /* @__PURE__ */ p.jsx("div", { className: Se.dvListDropdownList, children: /* @__PURE__ */ p.jsx(Ko, { children: /* @__PURE__ */ p.jsx("div", { className: Se.dvListDropdownListContainer, children: o.map((l, d) => {
       const c = a.indexOf(l.value) > -1, u = () => {
-        let m;
-        c ? m = new Set(a.filter((h) => h !== l.value)) : m = new Set(t ? [...a, l.value] : [l.value]);
+        let h;
+        c ? h = new Set(a.filter((m) => m !== l.value)) : h = new Set(t ? [...a, l.value] : [l.value]);
         const f = [];
-        o.forEach((h) => {
-          m.has(h.value) && f.push(h.value);
+        o.forEach((m) => {
+          h.has(m.value) && f.push(m.value);
         }), e(f);
       };
       return /* @__PURE__ */ p.jsxs("div", { className: Se.dvListDropdownItemContainer, onClick: u, children: [
-        /* @__PURE__ */ p.jsx("div", { className: Se.dvListDropdownItem, style: { background: l.color || Fe }, children: l.label }),
+        /* @__PURE__ */ p.jsx("div", { className: Se.dvListDropdownItem, style: { background: l.color || Ne }, children: l.label }),
         /* @__PURE__ */ p.jsx("div", { className: Se.dvListDropdownSelectedIcon, children: c ? /* @__PURE__ */ p.jsx(Vr, {}) : null })
       ] }, d);
     }) }) }) }),
@@ -3060,27 +3060,27 @@ const ps = () => {
   ] });
 };
 function ys(r) {
-  var P, N;
-  const { location: a, hideFn: e } = r, { worksheet: t, row: o, col: n, unitId: i, subUnitId: s } = a, l = E(re), d = E(ie), [c, u] = z(""), m = E(va), f = Qo.useContext(), h = f.right - f.left;
+  var j, $;
+  const { location: a, hideFn: e } = r, { worksheet: t, row: o, col: n, unitId: i, subUnitId: s } = a, l = T(re), d = T(ie), [c, u] = z(""), h = T(va), f = Qo.useContext(), m = f.right - f.left;
   if (!t)
     return null;
-  const g = t.getCell(o, n), R = (P = g == null ? void 0 : g.dataValidation) == null ? void 0 : P.rule, _ = (N = g == null ? void 0 : g.dataValidation) == null ? void 0 : N.validator, V = (R == null ? void 0 : R.renderMode) === ce.CUSTOM || (R == null ? void 0 : R.renderMode) === void 0;
-  if (!g || !R || !_)
+  const v = t.getCell(o, n), R = (j = v == null ? void 0 : v.dataValidation) == null ? void 0 : j.rule, _ = ($ = v == null ? void 0 : v.dataValidation) == null ? void 0 : $.validator, V = (R == null ? void 0 : R.renderMode) === ce.CUSTOM || (R == null ? void 0 : R.renderMode) === void 0;
+  if (!v || !R || !_)
     return;
-  const S = R.type === q.LIST_MULTIPLE, I = _.getListWithColor(R, i, s), y = c || li(g), O = Xe(y), j = () => {
-    l.executeCommand(ct.id, {
+  const S = R.type === X.LIST_MULTIPLE, y = _.getListWithColor(R, i, s), w = c || li(v), F = Ge(w), x = () => {
+    l.executeCommand(ut.id, {
       ruleId: R.uid
     }), e();
   };
   return /* @__PURE__ */ p.jsx(
     Is,
     {
-      style: { minWidth: h, maxWidth: Math.max(h, 200) },
+      style: { minWidth: m, maxWidth: Math.max(m, 200) },
       title: S ? d.t("dataValidation.listMultiple.dropdown") : d.t("dataValidation.list.dropdown"),
-      value: O,
+      value: F,
       multiple: S,
-      onChange: (A) => {
-        const F = Er(A), B = {
+      onChange: (E) => {
+        const P = Er(E), A = {
           unitId: i,
           subUnitId: s,
           range: {
@@ -3090,24 +3090,24 @@ function ys(r) {
             endRow: o
           },
           value: {
-            v: F,
+            v: P,
             p: null,
             f: null,
             si: null
           }
         };
-        m.isVisible() && m.changeVisible({
+        h.isVisible() && h.changeVisible({
           visible: !1,
           keycode: jo.ESC,
           eventType: qo.Keyboard
-        }), l.executeCommand(pa.id, B), u(F), S || e();
+        }), l.executeCommand(pa.id, A), u(P), S || e();
       },
-      options: I.map((A) => ({
-        label: A.label,
-        value: A.label,
-        color: V ? A.color : "transparent"
+      options: y.map((E) => ({
+        label: E.label,
+        value: E.label,
+        color: V ? E.color : "transparent"
       })),
-      onEdit: j
+      onEdit: x
     }
   );
 }
@@ -3115,8 +3115,8 @@ var Ds = Object.defineProperty, Es = Object.getOwnPropertyDescriptor, Os = (r, a
   for (var o = t > 1 ? void 0 : t ? Es(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
   return t && o && Ds(a, e, o), o;
-}, et = (r, a) => (e, t) => a(e, t, r);
-let ot = class extends he {
+}, tt = (r, a) => (e, t) => a(e, t, r);
+let nt = class extends he {
   constructor(r, a, e, t, o) {
     super(), this._editorBridgeService = r, this._dataValidationModel = a, this._dataValidatorRegistryService = e, this._dialogService = t, this._localeService = o, this._initEditorBridgeInterceptor();
   }
@@ -3126,10 +3126,10 @@ let ot = class extends he {
       {
         handler: async (r, a, e) => {
           const t = await r, { worksheet: o, 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)
+          if (!u || u.errorStyle !== at.STOP)
             return e(Promise.resolve(t));
-          const m = await this._dataValidatorRegistryService.getValidatorItem(u.type);
-          if (!m || await m.validator(
+          const h = await this._dataValidatorRegistryService.getValidatorItem(u.type);
+          if (!h || await h.validator(
             {
               value: ne(t),
               row: n,
@@ -3140,7 +3140,7 @@ let ot = class extends he {
             u
           ))
             return e(Promise.resolve(t));
-          const h = o.getCellRaw(n, i);
+          const m = o.getCellRaw(n, i);
           return this._dialogService.open({
             width: 368,
             title: {
@@ -3148,7 +3148,7 @@ let ot = class extends he {
             },
             id: "reject-input-dialog",
             children: {
-              title: m.getRuleFinalError(u)
+              title: h.getRuleFinalError(u)
             },
             footer: {
               title: na.createElement(
@@ -3163,7 +3163,7 @@ let ot = class extends he {
             onClose: () => {
               this._dialogService.close("reject-input-dialog");
             }
-          }), e(Promise.resolve(h));
+          }), e(Promise.resolve(m));
         }
       }
     );
@@ -3194,34 +3194,34 @@ let ot = class extends he {
     });
   }
 };
-ot = Os([
-  ve(ge.Ready, ot),
-  et(0, va),
-  et(1, w(K)),
-  et(2, w(De)),
-  et(3, Bo),
-  et(4, w(ie))
-], ot);
+nt = Os([
+  ve(ge.Ready, nt),
+  tt(0, va),
+  tt(1, I(K)),
+  tt(2, I(De)),
+  tt(3, Bo),
+  tt(4, I(ie))
+], nt);
 const bs = "univer-dv-date-dropdown", Ts = {
   dvDateDropdown: bs
 };
-function Ns(r) {
-  var V, S, I;
-  const { location: a, hideFn: e } = r, { worksheet: t, row: o, col: n, unitId: i, subUnitId: s } = a, l = E(re), d = E(ot), [c, u] = z();
+function Fs(r) {
+  var V, S, y;
+  const { location: a, hideFn: e } = r, { worksheet: t, row: o, col: n, unitId: i, subUnitId: s } = a, l = T(re), d = T(nt), [c, u] = z();
   if (!t)
     return null;
-  const m = t.getCell(o, n), f = (V = m == null ? void 0 : m.dataValidation) == null ? void 0 : V.rule, h = (S = m == null ? void 0 : m.dataValidation) == null ? void 0 : S.validator;
-  if (!m || !f || !h)
+  const h = t.getCell(o, n), f = (V = h == null ? void 0 : h.dataValidation) == null ? void 0 : V.rule, m = (S = h == null ? void 0 : h.dataValidation) == null ? void 0 : S.validator;
+  if (!h || !f || !m)
     return;
-  const g = ne(m), R = (I = h.transformDate(g)) != null ? I : je(), _ = R.isValid() ? R : je();
+  const v = ne(h), R = (y = m.transformDate(v)) != null ? y : je(), _ = R.isValid() ? R : je();
   return /* @__PURE__ */ p.jsx("div", { className: Ts.dvDateDropdown, children: /* @__PURE__ */ p.jsx(
     Zo,
     {
       pickerValue: c != null ? c : _,
-      onSelect: async (y) => {
-        const O = y.format("YYYY/MM/DD");
-        f.errorStyle !== tt.STOP || await h.validator({
-          value: O,
+      onSelect: async (w) => {
+        const F = w.format("YYYY/MM/DD");
+        f.errorStyle !== at.STOP || await m.validator({
+          value: F,
           unitId: i,
           subUnitId: s,
           row: o,
@@ -3236,24 +3236,24 @@ function Ns(r) {
             endRow: o
           },
           value: {
-            v: O,
+            v: F,
             p: null,
             f: null,
             si: null
           }
-        }) : d.showReject(h.getRuleFinalError(f)), e();
+        }) : d.showReject(m.getRuleFinalError(f)), e();
       },
-      onPanelChange: (y) => {
-        u(y);
+      onPanelChange: (w) => {
+        u(w);
       }
     }
   ) });
 }
 const xr = "data-validation.list.dropdown", jr = "data-validation.date.dropdown";
-var Fs = Object.defineProperty, Ls = Object.getOwnPropertyDescriptor, Ps = (r, a, e, t) => {
+var Ns = Object.defineProperty, Ls = Object.getOwnPropertyDescriptor, Ps = (r, a, e, t) => {
   for (var o = t > 1 ? void 0 : t ? Ls(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
-  return t && o && Fs(a, e, o), o;
+  return t && o && Ns(a, e, o), o;
 }, se = (r, a) => (e, t) => a(e, t, r);
 const As = {}, xs = {
   tr: {
@@ -3261,9 +3261,9 @@ const As = {}, xs = {
     color: "#fe4b4b"
   }
 };
-let nt = class extends er {
-  constructor(r, a, e, t, o, n, i, s, l, d, c, u, m) {
-    super(), this._config = r, this._commandService = a, this._editorBridgeService = e, this._menuService = t, this._renderManagerService = o, this._univerInstanceService = n, this._autoHeightController = i, this._componentManager = s, this._dropdownManagerService = l, this._dataValidationModel = d, this._dataValidatorRegistryService = c, this._injector = u, this._sheetInterceptorService = m, this._initComponents(), this._initMenu(), this._initSkeletonChange(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
+let it = class extends er {
+  constructor(r, a, e, t, o, n, i, s, l, d, c, u, h) {
+    super(), this._config = r, this._commandService = a, this._editorBridgeService = e, this._menuService = t, this._renderManagerService = o, this._univerInstanceService = n, this._autoHeightController = i, this._componentManager = s, this._dropdownManagerService = l, this._dataValidationModel = d, this._dataValidatorRegistryService = c, this._injector = u, this._sheetInterceptorService = h, this._initComponents(), this._initMenu(), this._initSkeletonChange(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
     const { menu: r = {} } = this._config;
@@ -3293,11 +3293,11 @@ let nt = class extends er {
       ],
       [
         jr,
-        Ns
+        Fs
       ],
       [
-        bt.componentKey,
-        bt
+        Tt.componentKey,
+        Tt
       ],
       ...vi
     ].forEach(([r, a]) => {
@@ -3322,8 +3322,10 @@ let nt = class extends er {
         const d = this._dataValidatorRegistryService.getValidatorItem(l.type);
         if (!(d != null && d.dropdown))
           return;
-        const c = i.getActiveSheet(), u = this._dropdownManagerService.activeDropdown, m = u == null ? void 0 : u.location;
-        if (m && m.unitId === e && m.subUnitId === t && m.row === o && m.col === n)
+        const c = i.getActiveSheet();
+        if (!c) return;
+        const u = this._dropdownManagerService.activeDropdown, h = u == null ? void 0 : u.location;
+        if (h && h.unitId === e && h.subUnitId === t && h.row === o && h.col === n)
           return;
         this._dropdownManagerService.showDropdown({
           location: {
@@ -3343,11 +3345,12 @@ let nt = class extends er {
   }
   _initSkeletonChange() {
     const r = () => {
-      var i, s;
+      var i, s, l;
       const a = this._univerInstanceService.getCurrentUnitForType(ae.UNIVER_SHEET);
-      if (!a)
-        return;
-      const e = a.getUnitId(), t = a.getActiveSheet().getSheetId(), o = (s = (i = this._renderManagerService.getRenderById(e)) == null ? void 0 : i.with(Fa).getUnitSkeleton(e, t)) == null ? void 0 : s.skeleton, n = this._renderManagerService.getRenderById(e);
+      if (!a) return;
+      const e = a.getUnitId(), t = (i = a.getActiveSheet()) == null ? void 0 : i.getSheetId();
+      if (!t) return;
+      const o = (l = (s = this._renderManagerService.getRenderById(e)) == null ? void 0 : s.with(Na).getUnitSkeleton(e, t)) == null ? void 0 : l.skeleton, n = this._renderManagerService.getRenderById(e);
       o == null || o.makeDirty(!0), o == null || o.calculate(), n && n.mainComponent.makeForceDirty();
     };
     this.disposeWithMe(this._dataValidationModel.ruleChange$.subscribe(() => r())), this.disposeWithMe(this._dataValidationModel.validStatusChange$.subscribe(() => r()));
@@ -3359,32 +3362,32 @@ let nt = class extends er {
         vo.CELL_CONTENT,
         {
           priority: 200,
-          // eslint-disable-next-line max-lines-per-function
+          // eslint-disable-next-line max-lines-per-function, complexity
           handler: (r, a, e) => {
-            var I, y, O, j, P;
+            var y, w, F, x, j, $;
             const { row: t, col: o, unitId: n, subUnitId: i, workbook: s, worksheet: l } = a, d = this._dataValidationModel.ensureManager(n, i);
             if (!d)
               return e(r);
-            const c = (y = (I = this._renderManagerService.getRenderById(n)) == null ? void 0 : I.with(Fa).getUnitSkeleton(n, i)) == null ? void 0 : y.skeleton;
+            const c = (w = (y = this._renderManagerService.getRenderById(n)) == null ? void 0 : y.with(Na).getUnitSkeleton(n, i)) == null ? void 0 : w.skeleton;
             if (!c)
               return e(r);
-            const u = a.workbook.getStyles(), m = (typeof (r == null ? void 0 : r.s) == "string" ? u.get(r == null ? void 0 : r.s) : r == null ? void 0 : r.s) || {}, f = d.getRuleIdByLocation(t, o);
+            const u = a.workbook.getStyles(), h = (typeof (r == null ? void 0 : r.s) == "string" ? u.get(r == null ? void 0 : r.s) : r == null ? void 0 : r.s) || {}, f = d.getRuleIdByLocation(t, o);
             if (!f)
               return e(r);
-            const h = d.getRuleById(f);
-            if (!h)
+            const m = d.getRuleById(f);
+            if (!m)
               return e(r);
-            const g = l.getCellRaw(a.row, a.col), R = this._dataValidationModel.validator(ne(g), h, a), _ = this._dataValidatorRegistryService.getValidatorItem(h.type), V = ne(r);
+            const v = l.getCellRaw(a.row, a.col), R = this._dataValidationModel.validator(ne(v), m, a), _ = this._dataValidatorRegistryService.getValidatorItem(m.type), V = ne(r);
             let S = {};
-            if ((h.type === q.LIST || h.type === q.LIST_MULTIPLE) && (S = {
+            if ((m.type === X.LIST || m.type === X.LIST_MULTIPLE) && (S = {
               interceptorStyle: {
                 ...r == null ? void 0 : r.interceptorStyle,
-                tb: (O = m.tb !== pe.OVERFLOW ? m.tb : pe.CLIP) != null ? O : pe.WRAP
+                tb: (F = h.tb !== pe.OVERFLOW ? h.tb : pe.CLIP) != null ? F : pe.WRAP
               }
-            }), h.type === q.CHECKBOX) {
-              const { formula2: N } = _.parseFormulaSync(h, a.unitId, a.subUnitId);
+            }), m.type === X.CHECKBOX) {
+              const { formula2: E } = _.parseFormulaSync(m, a.unitId, a.subUnitId);
               V || (S = {
-                v: N,
+                v: E,
                 t: 1,
                 p: null,
                 interceptorStyle: {
@@ -3393,14 +3396,14 @@ let nt = class extends er {
                 }
               });
             }
-            if (h.type === q.LIST && (h.renderMode === ce.ARROW || h.renderMode === ce.TEXT)) {
-              const N = _.getListWithColorMap(h), A = `${(j = ne(r)) != null ? j : ""}`, F = N[A];
-              F && (S = {
+            if (m.type === X.LIST && (m.renderMode === ce.ARROW || m.renderMode === ce.TEXT)) {
+              const E = _.getListWithColorMap(m), P = `${(x = ne(r)) != null ? x : ""}`, A = E[P];
+              A && (S = {
                 ...S,
                 interceptorStyle: {
                   ...S.interceptorStyle,
                   bg: {
-                    rgb: F
+                    rgb: A
                   }
                 }
               });
@@ -3411,7 +3414,7 @@ let nt = class extends er {
               dataValidation: {
                 ruleId: f,
                 validStatus: R,
-                rule: h,
+                rule: m,
                 validator: _
               },
               markers: {
@@ -3419,36 +3422,36 @@ let nt = class extends er {
                 ...R === Re.INVALID ? xs : null
               },
               customRender: [
-                ...(P = r == null ? void 0 : r.customRender) != null ? P : [],
+                ...(j = r == null ? void 0 : r.customRender) != null ? j : [],
                 ..._ != null && _.canvasRender ? [_.canvasRender] : []
               ],
               // @ts-ignore
               fontRenderExtension: {
                 // @ts-ignore
                 ...r == null ? void 0 : r.fontRenderExtension,
-                isSkip: _ == null ? void 0 : _.skipDefaultFontRender(h, V, a)
+                isSkip: _ == null ? void 0 : _.skipDefaultFontRender(m, V, a)
               },
               interceptorStyle: {
                 ...r == null ? void 0 : r.interceptorStyle,
                 ...S.interceptorStyle
               },
               get interceptorAutoHeight() {
-                var F, B, Y, x;
-                const N = c.mergeData.find((L) => {
-                  const { startColumn: G, startRow: te, endColumn: H, endRow: M } = L;
-                  return t >= te && o >= G && t <= M && o <= H;
-                }), A = {
+                var A, q, L, b;
+                const E = c.mergeData.find((Y) => {
+                  const { startColumn: Z, startRow: H, endColumn: M, endRow: O } = Y;
+                  return t >= H && o >= Z && t <= O && o <= M;
+                }), P = {
                   data: {
                     ...r,
                     dataValidation: {
                       ruleId: f,
                       validStatus: R,
-                      rule: h,
+                      rule: m,
                       validator: _
                     }
                   },
                   style: c.getsStyles().getStyleByCell(r),
-                  primaryWithCoord: c.getCellByIndex((F = N == null ? void 0 : N.startRow) != null ? F : t, (B = N == null ? void 0 : N.startColumn) != null ? B : o),
+                  primaryWithCoord: c.getCellByIndex((A = E == null ? void 0 : E.startRow) != null ? A : t, (q = E == null ? void 0 : E.startColumn) != null ? q : o),
                   unitId: n,
                   subUnitId: i,
                   row: t,
@@ -3456,8 +3459,9 @@ let nt = class extends er {
                   workbook: s,
                   worksheet: l
                 };
-                return (x = (Y = _ == null ? void 0 : _.canvasRender) == null ? void 0 : Y.calcCellAutoHeight) == null ? void 0 : x.call(Y, A);
-              }
+                return (b = (L = _ == null ? void 0 : _.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : b.call(L, P);
+              },
+              coverable: (($ = r == null ? void 0 : r.coverable) != null ? $ : !0) && !(m.type === X.LIST || m.type === X.LIST_MULTIPLE)
             });
           }
         }
@@ -3474,28 +3478,28 @@ let nt = class extends er {
     });
   }
 };
-nt = Ps([
-  ve(ge.Rendered, nt),
+it = Ps([
+  ve(ge.Rendered, it),
   se(1, re),
   se(2, va),
   se(3, Uo),
   se(4, lr),
-  se(5, ee),
-  se(6, w(Mo)),
-  se(7, w(dt)),
-  se(8, w(Be)),
-  se(9, w(K)),
-  se(10, w(De)),
-  se(11, w(Ue)),
-  se(12, w(or))
-], nt);
+  se(5, te),
+  se(6, I(Mo)),
+  se(7, I(ct)),
+  se(8, I(Be)),
+  se(9, I(K)),
+  se(10, I(De)),
+  se(11, I(Ue)),
+  se(12, I(or))
+], it);
 var js = Object.defineProperty, Bs = Object.getOwnPropertyDescriptor, Us = (r, a, e, t) => {
   for (var o = t > 1 ? void 0 : t ? Bs(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
   return t && o && js(a, e, o), o;
-}, _t = (r, a) => (e, t) => a(e, t, r);
-const Xt = "SHEET_DATA_VALIDATION_ALERT";
-let Rt = class extends he {
+}, St = (r, a) => (e, t) => a(e, t, r);
+const Gt = "SHEET_DATA_VALIDATION_ALERT";
+let Ct = class extends he {
   constructor(r, a, e, t) {
     super(), this._hoverManagerService = r, this._cellAlertManagerService = a, this._univerInstanceService = e, this._localeService = t, this._init();
   }
@@ -3506,9 +3510,11 @@ let Rt = class extends he {
     this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(rn(100)).subscribe((r) => {
       var a, e;
       if (r) {
-        const n = this._univerInstanceService.getCurrentUnitForType(ae.UNIVER_SHEET).getActiveSheet().getCell(r.location.row, r.location.col);
+        const o = this._univerInstanceService.getCurrentUnitForType(ae.UNIVER_SHEET).getActiveSheet();
+        if (!o) return;
+        const n = o.getCell(r.location.row, r.location.col);
         if (((a = n == null ? void 0 : n.dataValidation) == null ? void 0 : a.validStatus) === Re.INVALID) {
-          const i = this._cellAlertManagerService.currentAlert.get(Xt), s = (e = i == null ? void 0 : i.alert) == null ? void 0 : e.location;
+          const i = this._cellAlertManagerService.currentAlert.get(Gt), s = (e = i == null ? void 0 : i.alert) == null ? void 0 : e.location;
           if (s && s.row === r.location.row && s.col === r.location.col && s.subUnitId === r.location.subUnitId && s.unitId === r.location.unitId)
             return;
           const l = n.dataValidation.validator, d = n.dataValidation.rule;
@@ -3521,32 +3527,32 @@ let Rt = class extends he {
             location: r.location,
             width: 200,
             height: 74,
-            key: Xt
+            key: Gt
           });
           return;
         }
       }
-      this._cellAlertManagerService.removeAlert(Xt);
+      this._cellAlertManagerService.removeAlert(Gt);
     }));
   }
 };
-Rt = Us([
-  ve(ge.Rendered, Rt),
-  _t(0, w(wo)),
-  _t(1, w(Io)),
-  _t(2, ee),
-  _t(3, w(ie))
-], Rt);
+Ct = Us([
+  ve(ge.Rendered, Ct),
+  St(0, I(wo)),
+  St(1, I(Io)),
+  St(2, te),
+  St(3, I(ie))
+], Ct);
 var $s = Object.defineProperty, Ws = Object.getOwnPropertyDescriptor, Hs = (r, a, e, t) => {
   for (var o = t > 1 ? void 0 : t ? Ws(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
   return t && o && $s(a, e, o), o;
 }, Ye = (r, a) => (e, t) => a(e, t, r);
-let it = class extends he {
+let st = class extends he {
   constructor(a, e, t, o, n, i) {
     super();
-    v(this, "_disposableMap", /* @__PURE__ */ new Map());
-    v(this, "registerRule", (a, e, t) => {
+    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._injector = e, this._refRangeService = t, this._dataValidationCustomFormulaService = o, this._dataValidationFormulaService = n, this._formulaRefRangeService = i, this._initRefRange();
@@ -3561,8 +3567,8 @@ let it = class extends he {
       const u = this._dataValidationModel.getRuleById(a, e, o);
       if (!u)
         return { redos: [], undos: [] };
-      const m = u[d];
-      if (!m || m === c)
+      const h = u[d];
+      if (!h || h === c)
         return { redos: [], undos: [] };
       const f = {
         unitId: a,
@@ -3577,7 +3583,7 @@ let it = class extends he {
             [d]: c
           }
         }
-      }, h = {
+      }, m = {
         unitId: a,
         subUnitId: e,
         ruleId: t.uid,
@@ -3589,20 +3595,20 @@ let it = class extends he {
             formula2: u.formula2
           }
         }
-      }, g = [
+      }, v = [
         {
-          id: Ge.id,
+          id: Xe.id,
           params: f
         }
       ], R = [
         {
-          id: Ge.id,
-          params: h
+          id: Xe.id,
+          params: m
         }
       ];
-      return { redos: g, undos: R };
+      return { redos: v, undos: R };
     };
-    if (t.type === q.CUSTOM) {
+    if (t.type === X.CUSTOM) {
       const d = this._dataValidationCustomFormulaService.getRuleFormulaInfo(a, e, o);
       if (d) {
         const c = this._formulaRefRangeService.registerFormula(
@@ -3612,23 +3618,23 @@ let it = class extends he {
         i.add(() => c.dispose());
       }
     }
-    if (t.type !== q.CUSTOM) {
+    if (t.type !== X.CUSTOM) {
       const d = this._dataValidationFormulaService.getRuleFormulaInfo(a, e, o);
       if (d) {
         const [c, u] = d;
         if (c) {
-          const m = this._formulaRefRangeService.registerFormula(
+          const h = this._formulaRefRangeService.registerFormula(
             c.text,
             (f) => s("formula1", f)
           );
-          i.add(() => m.dispose());
+          i.add(() => h.dispose());
         }
         if (u) {
-          const m = this._formulaRefRangeService.registerFormula(
+          const h = this._formulaRefRangeService.registerFormula(
             u.text,
             (f) => s("formula1", f)
           );
-          i.add(() => m.dispose());
+          i.add(() => h.dispose());
         }
       }
     }
@@ -3636,20 +3642,20 @@ let it = class extends he {
   register(a, e, t) {
     var l;
     const o = (d) => {
-      const c = [...t.ranges], m = c.map((h) => _o(h, d)).filter((h) => !!h).flat();
-      if (Jr(m, c))
+      const c = [...t.ranges], h = c.map((m) => _o(m, d)).filter((m) => !!m).flat();
+      if (Jr(h, c))
         return { redos: [], undos: [] };
-      if (m.length) {
-        const h = {
+      if (h.length) {
+        const m = {
           unitId: a,
           subUnitId: e,
           ruleId: t.uid,
           payload: {
             type: Ie.RANGE,
-            payload: m
+            payload: h
           }
-        }, g = [{ id: Ge.id, params: h }], R = [{
-          id: Ge.id,
+        }, v = [{ id: Xe.id, params: m }], R = [{
+          id: Xe.id,
           params: {
             unitId: a,
             subUnitId: e,
@@ -3660,10 +3666,10 @@ let it = class extends he {
             }
           }
         }];
-        return { redos: g, undos: R };
+        return { redos: v, undos: R };
       } else {
-        const h = { unitId: a, subUnitId: e, ruleId: t.uid }, g = [{ id: It.id, params: h }], R = lo(this._injector, h);
-        return { redos: g, undos: R };
+        const m = { unitId: a, subUnitId: e, ruleId: t.uid }, v = [{ id: yt.id, params: m }], R = lo(this._injector, m);
+        return { redos: v, undos: R };
       }
     }, n = [];
     t.ranges.forEach((d) => {
@@ -3702,93 +3708,109 @@ let it = class extends he {
     }));
   }
 };
-it = Hs([
-  ve(ge.Ready, it),
-  Ye(0, w(K)),
-  Ye(1, w(Ue)),
-  Ye(2, w(go)),
-  Ye(3, w(Ke)),
-  Ye(4, w(ue)),
-  Ye(5, w(nn))
-], it);
-var ks = Object.defineProperty, Ys = Object.getOwnPropertyDescriptor, Gs = (r, a, e, t) => {
+st = Hs([
+  ve(ge.Ready, st),
+  Ye(0, I(K)),
+  Ye(1, I(Ue)),
+  Ye(2, I(go)),
+  Ye(3, I(Ke)),
+  Ye(4, I(ue)),
+  Ye(5, I(nn))
+], st);
+var ks = Object.defineProperty, Ys = Object.getOwnPropertyDescriptor, Xs = (r, a, e, t) => {
   for (var o = t > 1 ? void 0 : t ? Ys(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
   return t && o && ks(a, e, o), o;
 }, za = (r, a) => (e, t) => a(e, t, r);
-let Ct = class extends he {
+let Vt = class extends he {
   constructor(r, a) {
     super(), this._autoFillService = r, this._dataValidationModel = a, this._initAutoFill();
   }
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
-    const r = () => ({ redos: [], undos: [] }), a = (t) => {
-      const { source: o, target: n, unitId: i, subUnitId: s } = t, l = this._dataValidationModel.ensureManager(i, s), d = l.getRuleObjectMatrix().clone(), c = oa([o, n]), [u, m] = c.ranges, { mapFunc: f } = c, h = {
-        row: u.startRow,
-        col: u.startColumn
+    const r = () => ({ redos: [], undos: [] }), a = (o) => {
+      const { source: n, target: i, unitId: s, subUnitId: l } = o, d = this._dataValidationModel.ensureManager(s, l), c = d.getRuleObjectMatrix().clone(), u = oa([n, i]), [h, f] = u.ranges, { mapFunc: m } = u, v = {
+        row: h.startRow,
+        col: h.startColumn
       };
-      Eo(u, m).forEach((S) => {
-        const I = S.repeatStartCell, y = S.relativeRange, O = {
-          startRow: h.row,
-          startColumn: h.col,
-          endColumn: h.col,
-          endRow: h.row
+      Eo(h, f).forEach((y) => {
+        const w = y.repeatStartCell, F = y.relativeRange, x = {
+          startRow: v.row,
+          startColumn: v.col,
+          endColumn: v.col,
+          endRow: v.row
         }, j = {
-          startRow: I.row,
-          startColumn: I.col,
-          endColumn: I.col,
-          endRow: I.row
+          startRow: w.row,
+          startColumn: w.col,
+          endColumn: w.col,
+          endRow: w.row
         };
-        $.foreach(y, (P, N) => {
-          const A = xe.getPositionRange(
+        U.foreach(F, ($, E) => {
+          const P = xe.getPositionRange(
             {
-              startRow: P,
-              startColumn: N,
-              endColumn: N,
-              endRow: P
+              startRow: $,
+              startColumn: E,
+              endColumn: E,
+              endRow: $
             },
-            O
-          ), { row: F, col: B } = f(A.startRow, A.startColumn), Y = l.getRuleIdByLocation(F, B);
-          if (Y) {
-            const x = xe.getPositionRange(
+            x
+          ), { row: A, col: q } = m(P.startRow, P.startColumn), L = d.getRuleIdByLocation(A, q);
+          if (L) {
+            const b = xe.getPositionRange(
               {
-                startRow: P,
-                startColumn: N,
-                endColumn: N,
-                endRow: P
+                startRow: $,
+                startColumn: E,
+                endColumn: E,
+                endRow: $
               },
               j
-            ), { row: L, col: G } = f(x.startRow, x.startColumn);
-            d.setValue(L, G, Y);
+            ), { row: Y, col: Z } = m(b.startRow, b.startColumn);
+            c.setValue(Y, Z, L);
           }
         });
       });
-      const R = d.diff(l.getDataValidations()), { redoMutations: _, undoMutations: V } = Qe(i, s, R);
+      const _ = c.diff(d.getDataValidations()), { redoMutations: V, undoMutations: S } = Qe(s, l, _);
       return {
-        undos: V,
-        redos: _
+        undos: S,
+        redos: V
       };
-    }, e = {
+    }, e = [
+      X.CHECKBOX
+    ], t = {
       id: ya,
-      onFillData: (t, o, n) => n === At.COPY || n === At.ONLY_FORMAT || n === At.SERIES ? a(t) : r()
+      onBeforeFillData: (o) => {
+        const { source: n, unitId: i, subUnitId: s } = o, l = this._dataValidationModel.ensureManager(i, s);
+        for (const d of n.rows)
+          for (const c of n.cols) {
+            const u = l.getRuleByLocation(d, c);
+            if (u && e.indexOf(u.type) > -1) {
+              this._autoFillService.setDisableApplyType(et.SERIES, !0);
+              return;
+            }
+          }
+      },
+      onFillData: (o, n, i) => i === et.COPY || i === et.ONLY_FORMAT || i === et.SERIES ? a(o) : r(),
+      onAfterFillData: () => {
+        this._autoFillService.setDisableApplyType(et.SERIES, !1);
+      }
     };
-    this.disposeWithMe(this._autoFillService.addHook(e));
+    this.disposeWithMe(this._autoFillService.addHook(t));
   }
 };
-Ct = Gs([
-  ve(ge.Ready, Ct),
+Vt = Xs([
+  ve(ge.Ready, Vt),
   za(0, Do),
-  za(1, w(K))
-], Ct);
-var Xs = Object.defineProperty, qs = Object.getOwnPropertyDescriptor, zs = (r, a, e, t) => {
+  za(1, I(K))
+], Vt);
+var Gs = Object.defineProperty, qs = Object.getOwnPropertyDescriptor, zs = (r, a, e, t) => {
   for (var o = t > 1 ? void 0 : t ? qs(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
-  return t && o && Xs(a, e, o), o;
+  return t && o && Gs(a, e, o), o;
 }, qt = (r, a) => (e, t) => a(e, t, r);
-let Vt = class extends he {
+let Mt = class extends he {
   constructor(a, e, t) {
     super();
-    v(this, "_copyInfo");
+    g(this, "_copyInfo");
     this._sheetClipboardService = a, this._dataValidationModel = e, this._injector = t, this._initCopyPaste();
   }
   _initCopyPaste() {
@@ -3802,7 +3824,7 @@ let Vt = class extends he {
     });
   }
   _collect(a, e, t) {
-    const o = new lt();
+    const o = new dt();
     this._copyInfo = {
       unitId: a,
       subUnitId: e,
@@ -3815,9 +3837,9 @@ let Vt = class extends he {
       return;
     const { rows: l, cols: d } = s;
     l.forEach((c, u) => {
-      d.forEach((m, f) => {
-        const h = n.getRuleIdByLocation(c, m);
-        o.setValue(u, f, h != null ? h : "");
+      d.forEach((h, f) => {
+        const m = n.getRuleIdByLocation(c, h);
+        o.setValue(u, f, m != null ? m : "");
       });
     });
   }
@@ -3840,78 +3862,78 @@ let Vt = class extends he {
       return { redos: [], undos: [] };
     const { unitId: t, subUnitId: o } = this._copyInfo;
     if (e.unitId !== t || o !== e.subUnitId) {
-      const n = this._dataValidationModel.ensureManager(t, o), i = this._dataValidationModel.ensureManager(e.unitId, e.subUnitId), s = i.getRuleObjectMatrix().clone(), { ranges: [l, d], mapFunc: c } = oa([e.copyRange, a]), u = Pa(l, d, !0), m = /* @__PURE__ */ new Map();
-      u.forEach(({ startRange: g }) => {
+      const n = this._dataValidationModel.ensureManager(t, o), i = this._dataValidationModel.ensureManager(e.unitId, e.subUnitId), s = i.getRuleObjectMatrix().clone(), { ranges: [l, d], mapFunc: c } = oa([e.copyRange, a]), u = Pa(l, d, !0), h = /* @__PURE__ */ new Map();
+      u.forEach(({ startRange: v }) => {
         var R;
         (R = this._copyInfo) == null || R.matrix.forValue((_, V, S) => {
-          const I = xe.getPositionRange(
+          const y = xe.getPositionRange(
             {
               startRow: _,
               endRow: _,
               startColumn: V,
               endColumn: V
             },
-            g
-          ), y = `${o}-${S}`, O = n.getRuleById(S);
-          !i.getRuleById(y) && O && m.set(y, { ...O, uid: y });
-          const { row: j, col: P } = c(I.startRow, I.startColumn);
-          s.setValue(j, P, y);
+            v
+          ), w = `${o}-${S}`, F = n.getRuleById(S);
+          !i.getRuleById(w) && F && h.set(w, { ...F, uid: w });
+          const { row: x, col: j } = c(y.startRow, y.startColumn);
+          s.setValue(x, j, w);
         });
       });
-      const { redoMutations: f, undoMutations: h } = Qe(
+      const { redoMutations: f, undoMutations: m } = Qe(
         e.unitId,
         e.subUnitId,
-        s.diffWithAddition(i.getDataValidations(), m.values())
+        s.diffWithAddition(i.getDataValidations(), h.values())
       );
       return {
         redos: f,
-        undos: h
+        undos: m
       };
     } else {
       const n = this._dataValidationModel.ensureManager(t, o), i = n.getRuleObjectMatrix().clone(), { ranges: [s, l], mapFunc: d } = oa([e.copyRange, a]);
       Pa(s, l, !0).forEach(({ startRange: f }) => {
-        var h;
-        (h = this._copyInfo) == null || h.matrix.forValue((g, R, _) => {
+        var m;
+        (m = this._copyInfo) == null || m.matrix.forValue((v, R, _) => {
           const V = xe.getPositionRange(
             {
-              startRow: g,
-              endRow: g,
+              startRow: v,
+              endRow: v,
               startColumn: R,
               endColumn: R
             },
             f
-          ), { row: S, col: I } = d(V.startRow, V.startColumn);
-          i.setValue(S, I, _);
+          ), { row: S, col: y } = d(V.startRow, V.startColumn);
+          i.setValue(S, y, _);
         });
       });
-      const { redoMutations: u, undoMutations: m } = Qe(
+      const { redoMutations: u, undoMutations: h } = Qe(
         t,
         o,
         i.diff(n.getDataValidations())
       );
       return {
         redos: u,
-        undos: m
+        undos: h
       };
     }
   }
 };
-Vt = zs([
-  ve(ge.Ready, Vt),
+Mt = zs([
+  ve(ge.Ready, Mt),
   qt(0, bo),
-  qt(1, w(K)),
-  qt(2, w(Ue))
-], Vt);
+  qt(1, I(K)),
+  qt(2, I(Ue))
+], Mt);
 class Ea {
   constructor(a, e) {
-    v(this, "value");
+    g(this, "value");
     this._worksheet = e, this.value = a;
   }
   addRule(a) {
     const e = a.uid;
     a.ranges.forEach((t) => {
-      $.foreach(
-        $.transformRange(t, this._worksheet),
+      U.foreach(
+        U.transformRange(t, this._worksheet),
         (o, n) => {
           this.value.setValue(o, n, e);
         }
@@ -3920,30 +3942,30 @@ class Ea {
   }
   removeRange(a) {
     a.forEach((e) => {
-      $.foreach($.transformRange(e, this._worksheet), (t, o) => {
+      U.foreach(U.transformRange(e, this._worksheet), (t, o) => {
         this.value.realDeleteValue(t, o);
       });
     });
   }
   removeRule(a) {
     a.ranges.forEach((e) => {
-      $.foreach($.transformRange(e, this._worksheet), (t, o) => {
+      U.foreach(U.transformRange(e, this._worksheet), (t, o) => {
         this.value.setValue(t, o, "");
       });
     });
   }
   updateRange(a, e, t) {
-    const o = `${a}$`, n = e.map((s) => $.transformRange(s, this._worksheet)), i = t.map((s) => $.transformRange(s, this._worksheet));
+    const o = `${a}$`, n = e.map((s) => U.transformRange(s, this._worksheet)), i = t.map((s) => U.transformRange(s, this._worksheet));
     n.forEach((s) => {
-      $.foreach(s, (l, d) => {
+      U.foreach(s, (l, d) => {
         this.value.getValue(l, d) === a && this.value.setValue(l, d, o);
       });
     }), i.forEach((s) => {
-      $.foreach(s, (l, d) => {
+      U.foreach(s, (l, d) => {
         this.value.setValue(l, d, a);
       });
     }), n.forEach((s) => {
-      $.foreach(s, (l, d) => {
+      U.foreach(s, (l, d) => {
         this.value.getValue(l, d) === o && this.value.realDeleteValue(l, d);
       });
     });
@@ -3952,7 +3974,7 @@ class Ea {
     const e = [];
     let t = 0;
     return a.forEach((o, n) => {
-      const i = Pt(this.value, (l) => l === o.uid), s = o.ranges;
+      const i = At(this.value, (l) => l === o.uid), s = o.ranges;
       (i.length !== s.length || i.some((l, d) => !xe.equals(l, s[d]))) && e.push({
         type: "update",
         ruleId: o.uid,
@@ -3969,7 +3991,7 @@ class Ea {
     const t = [];
     let o = 0;
     return a.forEach((n, i) => {
-      const s = Pt(this.value, (d) => d === n.uid), l = n.ranges;
+      const s = At(this.value, (d) => d === n.uid), l = n.ranges;
       (s.length !== l.length || s.some((d, c) => !xe.equals(d, l[c]))) && t.push({
         type: "update",
         ruleId: n.uid,
@@ -3981,7 +4003,7 @@ class Ea {
         index: i - o
       }), o++);
     }), Array.from(e).forEach((n) => {
-      const i = Pt(this.value, (s) => s === n.uid);
+      const i = At(this.value, (s) => s === n.uid);
       t.push({
         type: "add",
         rule: {
@@ -3992,7 +4014,7 @@ class Ea {
     }), t;
   }
   clone() {
-    return new Ea(new lt(this.value.clone()), this._worksheet);
+    return new Ea(new dt(this.value.clone()), this._worksheet);
   }
   getValue(a, e) {
     return this.value.getValue(a, e);
@@ -4007,20 +4029,20 @@ class Qs extends co {
     /**
      * save cell's ruleId
      */
-    v(this, "_ruleMatrix");
-    v(this, "_dataValidatorRegistryService");
-    v(this, "_dataValidationCacheService");
-    v(this, "_dataValidationFormulaService");
-    v(this, "_dataValidationCustomFormulaService");
-    v(this, "_cache");
-    v(this, "_dataValidationRefRangeController");
-    this._injector = n, this._dataValidatorRegistryService = this._injector.get(De), this._dataValidationCacheService = this._injector.get(ht), this._dataValidationFormulaService = this._injector.get(ue), this._dataValidationCustomFormulaService = this._injector.get(Ke), this._dataValidationRefRangeController = this._injector.get(it), this._cache = this._dataValidationCacheService.ensureCache(e, t);
-    const s = this._injector.get(ee).getUnit(e, ae.UNIVER_SHEET).getSheetBySheetId(t), l = new lt();
+    g(this, "_ruleMatrix");
+    g(this, "_dataValidatorRegistryService");
+    g(this, "_dataValidationCacheService");
+    g(this, "_dataValidationFormulaService");
+    g(this, "_dataValidationCustomFormulaService");
+    g(this, "_cache");
+    g(this, "_dataValidationRefRangeController");
+    this._injector = n, this._dataValidatorRegistryService = this._injector.get(De), this._dataValidationCacheService = this._injector.get(mt), this._dataValidationFormulaService = this._injector.get(ue), this._dataValidationCustomFormulaService = this._injector.get(Ke), this._dataValidationRefRangeController = this._injector.get(st), this._cache = this._dataValidationCacheService.ensureCache(e, t);
+    const s = this._injector.get(te).getUnit(e, ae.UNIVER_SHEET).getSheetBySheetId(t), l = new dt();
     o == null || o.forEach((d) => {
       const c = d.uid;
       d.ranges.forEach((u) => {
-        $.foreach(u, (m, f) => {
-          l.setValue(m, f, c);
+        U.foreach(u, (h, f) => {
+          l.setValue(h, f, c);
         });
       });
     }), o == null || o.forEach((d) => {
@@ -4030,7 +4052,7 @@ class Qs extends co {
   _addRuleSideEffect(e) {
     var n;
     const { unitId: t, subUnitId: o } = this;
-    (e.type === q.LIST || e.type === q.LIST_MULTIPLE) && Ca((n = e.formula1) != null ? n : "") && (e.formula1 = `=${e.formula1}`), this._ruleMatrix.addRule(e), this._dataValidationCacheService.addRule(t, o, e), this._dataValidationFormulaService.addRule(t, o, e.uid, e.formula1, e.formula2), this._dataValidationCustomFormulaService.addRule(t, o, e);
+    (e.type === X.LIST || e.type === X.LIST_MULTIPLE) && Ca((n = e.formula1) != null ? n : "") && (e.formula1 = `=${e.formula1}`), this._ruleMatrix.addRule(e), this._dataValidationCacheService.addRule(t, o, e), this._dataValidationFormulaService.addRule(t, o, e.uid, e.formula1, e.formula2), this._dataValidationCustomFormulaService.addRule(t, o, e);
   }
   addRule(e, t) {
     (Array.isArray(e) ? e : [e]).forEach((n) => {
@@ -4058,19 +4080,19 @@ class Qs extends co {
   validator(e, t, o, n) {
     const { col: i, row: s, unitId: l, subUnitId: d } = o, c = t.uid, u = this._dataValidatorRegistryService.getValidatorItem(t.type);
     if (u) {
-      const m = this._cache.getValue(s, i);
-      return !m || m.value !== e ? (this._cache.setValue(s, i, {
+      const h = this._cache.getValue(s, i);
+      return !h || h.value !== e ? (this._cache.setValue(s, i, {
         value: e,
         status: Re.VALIDATING,
         ruleId: c
       }), u.validator({ value: e, unitId: l, subUnitId: d, row: s, column: i }, t).then((f) => {
-        const h = f ? Re.VALID : Re.INVALID;
+        const m = f ? Re.VALID : Re.INVALID;
         this._cache.setValue(s, i, {
           value: e,
-          status: h,
+          status: m,
           ruleId: c
-        }), n(h, !0);
-      }), Re.VALIDATING) : (n(m.status, !1), m.status);
+        }), n(m, !0);
+      }), Re.VALIDATING) : (n(h.status, !1), h.status);
     } else
       return n(Re.VALID, !1), Re.VALID;
   }
@@ -4089,8 +4111,8 @@ var Ks = Object.defineProperty, Zs = Object.getOwnPropertyDescriptor, Js = (r, a
   for (var o = t > 1 ? void 0 : t ? Zs(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
   return t && o && Ks(a, e, o), o;
-}, St = (r, a) => (e, t) => a(e, t, r);
-let Mt = class extends he {
+}, Rt = (r, a) => (e, t) => a(e, t, r);
+let wt = class extends he {
   constructor(r, a, e, t) {
     super(), this._resourceManagerService = r, this._univerInstanceService = a, this._dataValidationModel = e, this._injector = t, this._initDataValidationDataSource();
   }
@@ -4106,19 +4128,19 @@ let Mt = class extends he {
     this._dataValidationModel.setManagerCreator(this._createSheetDataValidationManager.bind(this));
   }
 };
-Mt = Js([
-  ve(ge.Starting, Mt),
-  St(0, eo),
-  St(1, ee),
-  St(2, w(K)),
-  St(3, w(Ue))
-], Mt);
+wt = Js([
+  ve(ge.Starting, wt),
+  Rt(0, eo),
+  Rt(1, te),
+  Rt(2, I(K)),
+  Rt(3, I(Ue))
+], wt);
 var el = Object.defineProperty, tl = Object.getOwnPropertyDescriptor, al = (r, a, e, t) => {
   for (var o = t > 1 ? void 0 : t ? tl(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
   return t && o && el(a, e, o), o;
 }, zt = (r, a) => (e, t) => a(e, t, r);
-let wt = class extends he {
+let It = class extends he {
   constructor(r, a, e) {
     super(), this._localeService = r, this._commandService = a, this._sheetPermissionInterceptorBaseController = e, this._commandExecutedListener();
   }
@@ -4138,12 +4160,12 @@ let wt = class extends he {
     );
   }
 };
-wt = al([
-  ve(ge.Ready, wt),
-  zt(0, w(ie)),
+It = al([
+  ve(ge.Ready, It),
+  zt(0, I(ie)),
   zt(1, re),
-  zt(2, w(To))
-], wt);
+  zt(2, I(To))
+], It);
 var rl = Object.defineProperty, ol = Object.getOwnPropertyDescriptor, nl = (r, a, e, t) => {
   for (var o = t > 1 ? void 0 : t ? ol(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
@@ -4169,7 +4191,7 @@ let ha = class {
     const t = this._dataValidationModel.ensureManager(r, a).getDataValidations();
     return await Promise.all(t.map((o) => Promise.all(o.ranges.map((n) => {
       const i = [];
-      return $.foreach(n, (s, l) => {
+      return U.foreach(n, (s, l) => {
         i.push(this.validatorCell(r, a, s, l));
       }), i;
     })))), this._dataValidationCacheService.ensureCache(r, a);
@@ -4182,44 +4204,44 @@ let ha = class {
   }
 };
 ha = nl([
-  Qt(0, ee),
-  Qt(1, w(K)),
-  Qt(2, w(ht))
+  Qt(0, te),
+  Qt(1, I(K)),
+  Qt(2, I(mt))
 ], ha);
 var Br = Object.defineProperty, il = Object.getOwnPropertyDescriptor, sl = (r, a, e) => a in r ? Br(r, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[a] = e, ll = (r, a, e, t) => {
   for (var o = t > 1 ? void 0 : t ? il(a, e) : a, n = r.length - 1, i; n >= 0; n--)
     (i = r[n]) && (o = (t ? i(a, e, o) : i(o)) || o);
   return t && o && Br(a, e, o), o;
-}, Kt = (r, a) => (e, t) => a(e, t, r), Ur = (r, a, e) => (sl(r, typeof a != "symbol" ? a + "" : a, e), e);
-let Ft = class extends ao {
+}, Kt = (r, a) => (e, t) => a(e, t, r), Ur = (r, a, e) => sl(r, typeof a != "symbol" ? a + "" : a, e);
+let Lt = class extends ao {
   constructor(r = {}, a, e, t) {
-    super(), this._config = r, this._injector = a, this._commandService = e, this._localeService = t, this._config = U.deepMerge({}, As, this._config);
+    super(), this._config = r, this._injector = a, this._commandService = e, this._localeService = t, this._config = B.deepMerge({}, As, this._config);
   }
   onStarting(r) {
     [
       [Ve],
-      [Et],
-      [ht],
+      [Ot],
+      [mt],
       [ue],
       [Ke],
       [Be],
       [ha],
       // controller
-      [Mt],
-      [rt],
+      [wt],
+      [ot],
       [
-        nt,
+        it,
         {
-          useFactory: () => this._injector.createInstance(nt, this._config)
+          useFactory: () => this._injector.createInstance(it, this._config)
         }
       ],
-      [Rt],
-      [it],
-      [wt],
       [Ct],
+      [st],
+      [It],
       [Vt],
-      [at],
-      [ot]
+      [Mt],
+      [rt],
+      [nt]
     ].forEach((a) => {
       r.add(a);
     }), [
@@ -4230,43 +4252,43 @@ let Ft = class extends ao {
       Va,
       Vn,
       Sr,
-      ct,
+      ut,
       Cn
     ].forEach((a) => {
       this._commandService.registerCommand(a);
     });
   }
 };
-Ur(Ft, "pluginName", ya);
-Ur(Ft, "type", ae.UNIVER_SHEET);
-Ft = ll([
-  to(ho, So, No),
-  Kt(1, w(Ue)),
+Ur(Lt, "pluginName", ya);
+Ur(Lt, "type", ae.UNIVER_SHEET);
+Lt = ll([
+  to(ho, So, Fo),
+  Kt(1, I(Ue)),
   Kt(2, re),
-  Kt(3, w(ie))
-], Ft);
+  Kt(3, I(ie))
+], Lt);
 export {
   Rr as AddSheetDataValidationAndOpenCommand,
   wa as AddSheetDataValidationCommand,
   ya as DATA_VALIDATION_PLUGIN_NAME,
-  Rt as DataValidationAlertController,
-  Ct as DataValidationAutoFillController,
-  ht as DataValidationCacheService,
-  rt as DataValidationController,
-  Vt as DataValidationCopyPasteController,
+  Ct as DataValidationAlertController,
+  Vt as DataValidationAutoFillController,
+  mt as DataValidationCacheService,
+  ot as DataValidationController,
+  Mt as DataValidationCopyPasteController,
   Ke as DataValidationCustomFormulaService,
-  at as DataValidationFormulaController,
+  rt as DataValidationFormulaController,
   ue as DataValidationFormulaService,
-  it as DataValidationRefRangeController,
-  ot as DataValidationRejectInputController,
+  st as DataValidationRefRangeController,
+  nt as DataValidationRejectInputController,
   Vn as HideDataValidationDropdown,
   Dl as ICommandService,
   El as LocaleService,
   Ol as Plugin,
-  Et as SheetDataValidationService,
-  nt as SheetsDataValidationRenderController,
+  Ot as SheetDataValidationService,
+  it as SheetsDataValidationRenderController,
   ha as SheetsDataValidationValidatorService,
   Va as ShowDataValidationDropdown,
-  Ft as UniverSheetsDataValidationPlugin,
+  Lt as UniverSheetsDataValidationPlugin,
   Ma as UpdateSheetDataValidationRangeCommand
 };