@univerjs/sheets-data-validation-ui 0.5.0-nightly.202411221606 → 0.5.0-nightly.202411230545

package/lib/es/index.js

@@ -1,21 +1,21 @@
-var $o = Object.defineProperty;
-var Bo = (e, t, o) => t in e ? $o(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o;
-var E = (e, t, o) => Bo(e, typeof t != "symbol" ? t + "" : t, o);
-import Xt, { useState as Y, forwardRef as we, useRef as ke, createElement as Ie, useMemo as Te, useEffect as Se } from "react";
-import { Inject as L, LocaleService as ee, Disposable as Re, DataValidationErrorStyle as nt, useDependency as P, ICommandService as te, dayjs as zt, numfmt as Kt, CellValueType as ko, UniverInstanceType as z, toDisposable as Wo, IUniverInstanceService as fe, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Ho, DisposableCollection as Yo, CommandType as Ze, BuildTextUtils as Xo, DataValidationRenderMode as le, DataValidationType as q, IConfigService as ln, UndoCommand as zo, RedoCommand as Ko, isUnitRangesEqual as Go, debounce as Zo, shallowEqual as Dn, Injector as Fe, DataValidationStatus as ot, ObjectMatrix as gt, Range as qo, Rectangle as vt, queryObjectMatrix as Gt, Optional as Jo, RxDisposable as dn, InterceptorEffectEnum as Wn, sequenceExecute as Hn, bufferDebounceTime as Qo, isFormulaString as Pe, Tools as Zt, ThemeService as ea, VerticalAlign as ce, HorizontalAlign as We, DEFAULT_STYLES as se, WrapStrategy as _e, DocumentDataModel as ta, DEFAULT_EMPTY_DOCUMENT_VALUE as na, BooleanNumber as qe, Plugin as Yn } from "@univerjs/core";
-import { Button as je, DatePanel as oa, Scrollbar as aa, FormLayout as Z, RadioGroup as cn, Radio as Ae, Checkbox as yt, Input as xe, Select as qt, DraggableList as ia } from "@univerjs/design";
-import { DeviceInputEventType as Jt, IRenderManagerService as De, fixLineWidthByScale as Vn, Transform as ra, Checkbox as sa, CURSOR_TYPE as He, FontCache as la, Shape as da, Rect as Xn, getFontStyleString as Tt, getDocsSkeletonPageSize as Je, DocumentViewModel as ca, DocumentSkeleton as ua, Documents as ha } from "@univerjs/engine-render";
-import { SheetInterceptorService as un, AFTER_CELL_EDIT_ASYNC as pa, SetRangeValuesCommand as hn, SheetsSelectionsService as zn, getSheetCommandTarget as Kn, WorkbookEditablePermission as _t, RangeProtectionPermissionEditPoint as St, WorksheetEditPermission as Ct, checkRangesEditablePermission as ma, WorksheetSetCellStylePermission as Qt, INTERCEPTOR_POINT as Gn, InterceptCellContentPriority as Zn } from "@univerjs/sheets";
-import { SheetDataValidationModel as Ve, getCellValueOrigin as ie, getDataValidationCellValue as fa, deserializeListOptions as qn, serializeListOptions as Jn, UpdateSheetDataValidationRangeCommand as Qn, UpdateSheetDataValidationSettingCommand as yn, RemoveSheetDataValidationCommand as eo, UpdateSheetDataValidationOptionsCommand as ga, createDefaultNewRule as to, AddSheetDataValidationCommand as pn, RemoveSheetAllDataValidationCommand as va, DATA_VALIDATION_PLUGIN_NAME as no, getDataValidationDiffMutations as en, DataValidationCacheService as oo, DataValidationFormulaController as _a, DataValidationFormulaService as Sa, getFormulaResult as At, isLegalFormulaResult as bn, transformCheckboxValue as Ca, CHECKBOX_FORMULA_1 as wa, CHECKBOX_FORMULA_2 as Ia } from "@univerjs/sheets-data-validation";
+var Bo = Object.defineProperty;
+var $o = (e, t, o) => t in e ? Bo(e, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : e[t] = o;
+var M = (e, t, o) => $o(e, typeof t != "symbol" ? t + "" : t, o);
+import zt, { useState as H, forwardRef as we, useRef as We, createElement as Re, useMemo as Te, useEffect as Ce } from "react";
+import { Inject as b, LocaleService as J, Disposable as De, DataValidationErrorStyle as ot, useDependency as L, ICommandService as Q, dayjs as Kt, numfmt as Gt, CellValueType as ko, UniverInstanceType as z, toDisposable as Wo, IUniverInstanceService as ge, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Ho, DisposableCollection as Yo, CommandType as qe, BuildTextUtils as Xo, DataValidationRenderMode as de, DataValidationType as Z, IConfigService as dn, UndoCommand as zo, RedoCommand as Ko, isUnitRangesEqual as Go, debounce as Zo, shallowEqual as Vn, Injector as Fe, DataValidationStatus as at, ObjectMatrix as vt, Range as qo, Rectangle as _t, queryObjectMatrix as Zt, Optional as Jo, RxDisposable as cn, InterceptorEffectEnum as Wn, sequenceExecute as Hn, bufferDebounceTime as Qo, isFormulaString as Pe, Tools as qt, ThemeService as ea, VerticalAlign as ue, HorizontalAlign as He, DEFAULT_STYLES as le, WrapStrategy as Se, DocumentDataModel as ta, DEFAULT_EMPTY_DOCUMENT_VALUE as na, BooleanNumber as Je, Plugin as Yn } from "@univerjs/core";
+import { Button as je, DatePanel as oa, Scrollbar as aa, FormLayout as G, RadioGroup as un, Radio as Ae, Checkbox as Mt, Input as xe, Select as Jt, DraggableList as ia } from "@univerjs/design";
+import { DeviceInputEventType as Qt, IRenderManagerService as Ve, fixLineWidthByScale as yn, Transform as ra, Checkbox as sa, CURSOR_TYPE as Ye, FontCache as la, Shape as da, Rect as Xn, getFontStyleString as At, getDocsSkeletonPageSize as Qe, DocumentViewModel as ca, DocumentSkeleton as ua, Documents as ha } from "@univerjs/engine-render";
+import { SheetInterceptorService as hn, AFTER_CELL_EDIT_ASYNC as pa, SetRangeValuesCommand as pn, SheetsSelectionsService as zn, getSheetCommandTarget as Kn, WorkbookEditablePermission as St, RangeProtectionPermissionEditPoint as Ct, WorksheetEditPermission as It, checkRangesEditablePermission as ma, WorksheetSetCellStylePermission as en, INTERCEPTOR_POINT as Gn, InterceptCellContentPriority as Zn } from "@univerjs/sheets";
+import { SheetDataValidationModel as oe, getCellValueOrigin as ie, getDataValidationCellValue as fa, deserializeListOptions as qn, serializeListOptions as Jn, UpdateSheetDataValidationRangeCommand as Qn, UpdateSheetDataValidationSettingCommand as Mn, RemoveSheetDataValidationCommand as eo, UpdateSheetDataValidationOptionsCommand as ga, createDefaultNewRule as to, AddSheetDataValidationCommand as mn, RemoveSheetAllDataValidationCommand as va, DATA_VALIDATION_PLUGIN_NAME as no, getDataValidationDiffMutations as tn, DataValidationCacheService as oo, DataValidationFormulaController as _a, DataValidationFormulaService as Sa, getFormulaResult as xt, isLegalFormulaResult as bn, transformCheckboxValue as Ca, CHECKBOX_FORMULA_1 as Ia, CHECKBOX_FORMULA_2 as wa } from "@univerjs/sheets-data-validation";
 import { getPatternType as Ra } from "@univerjs/sheets-numfmt";
-import { SetCellEditVisibleOperation as ao, SheetCanvasPopManagerService as Da, IEditorBridgeService as io, SheetPermissionInterceptorBaseController as ro, IMarkSelectionService as Va, HoverManagerService as ya, CellAlertManagerService as ba, CellAlertType as Ea, IAutoFillService as Ma, APPLY_TYPE as Qe, virtualizeDiscreteRanges as tn, getAutoFillRepeatRange as Oa, COPY_TYPE as En, rangeToDiscreteRange as Pa, PREDEFINED_HOOK_NAME as rt, getRepeatRange as Mn, ISheetClipboardService as La, getCurrentRangeDisable$ as Ta, AutoHeightController as so, SheetSkeletonManagerService as wt } from "@univerjs/sheets-ui";
-import { IDialogService as Aa, KeyCode as nn, ISidebarService as lo, useObservable as Ne, ComponentManager as bt, IZenZoneService as co, RectPopup as xa, useEvent as uo, useSidebarClick as mn, MenuItemType as fn, getMenuHiddenObservable as ja, RibbonStartGroup as Fa, IMenuManagerService as Na } from "@univerjs/ui";
-import { DataValidatorRegistryService as ye, DataValidationModel as Et, DataValidatorRegistryScope as Ua, TWO_FORMULA_OPERATOR_COUNT as $a, getRuleOptions as On, getRuleSetting as Pn } from "@univerjs/data-validation";
-import { RichTextEditingMutation as Ba } from "@univerjs/docs";
-import { filter as gn, BehaviorSubject as Ln, distinctUntilChanged as ka, Subject as Wa, debounceTime as vn, bufferTime as ho } from "rxjs";
+import { SetCellEditVisibleOperation as ao, SheetCanvasPopManagerService as Da, IEditorBridgeService as io, SheetPermissionInterceptorBaseController as ro, IMarkSelectionService as Va, HoverManagerService as ya, CellAlertManagerService as Ma, CellAlertType as ba, IAutoFillService as Ea, APPLY_TYPE as et, virtualizeDiscreteRanges as nn, getAutoFillRepeatRange as Oa, COPY_TYPE as En, rangeToDiscreteRange as Pa, PREDEFINED_HOOK_NAME as st, getRepeatRange as On, ISheetClipboardService as La, getCurrentRangeDisable$ as Ta, AutoHeightController as so, SheetSkeletonManagerService as wt } from "@univerjs/sheets-ui";
+import { IDialogService as Aa, KeyCode as on, ISidebarService as lo, useObservable as Ne, ComponentManager as bt, IZenZoneService as co, RectPopup as xa, useEvent as uo, useSidebarClick as fn, MenuItemType as gn, getMenuHiddenObservable as ja, RibbonStartGroup as Fa, IMenuManagerService as Na } from "@univerjs/ui";
+import { DataValidatorRegistryService as ye, DataValidationModel as Et, DataValidatorRegistryScope as Ua, TWO_FORMULA_OPERATOR_COUNT as Ba, getRuleOptions as Pn, getRuleSetting as Ln } from "@univerjs/data-validation";
+import { RichTextEditingMutation as $a } from "@univerjs/docs";
+import { filter as vn, BehaviorSubject as Tn, distinctUntilChanged as ka, Subject as Wa, debounceTime as _n, bufferTime as ho } from "rxjs";
 import { deserializeRangeWithSheet as Ha, serializeRange as po } from "@univerjs/engine-formula";
 import { RangeSelector as Ya, FormulaEditor as mo } from "@univerjs/sheets-formula-ui";
-var fo = { exports: {} }, Mt = {};
+var fo = { exports: {} }, Ot = {};
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -25,7 +25,7 @@ var fo = { exports: {} }, Mt = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var Xa = Xt, za = Symbol.for("react.element"), Ka = Symbol.for("react.fragment"), Ga = Object.prototype.hasOwnProperty, Za = Xa.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, qa = { key: !0, ref: !0, __self: !0, __source: !0 };
+var Xa = zt, za = Symbol.for("react.element"), Ka = Symbol.for("react.fragment"), Ga = Object.prototype.hasOwnProperty, Za = Xa.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, qa = { key: !0, ref: !0, __self: !0, __source: !0 };
 function go(e, t, o) {
   var n, a = {}, i = null, r = null;
   o !== void 0 && (i = "" + o), t.key !== void 0 && (i = "" + t.key), t.ref !== void 0 && (r = t.ref);
@@ -33,16 +33,16 @@ function go(e, t, o) {
   if (e && e.defaultProps) for (n in t = e.defaultProps, t) a[n] === void 0 && (a[n] = t[n]);
   return { $$typeof: za, type: e, key: i, ref: r, props: a, _owner: Za.current };
 }
-Mt.Fragment = Ka;
-Mt.jsx = go;
-Mt.jsxs = go;
-fo.exports = Mt;
-var p = fo.exports, Ja = Object.defineProperty, Qa = Object.getOwnPropertyDescriptor, ei = (e, t, o, n) => {
+Ot.Fragment = Ka;
+Ot.jsx = go;
+Ot.jsxs = go;
+fo.exports = Ot;
+var h = fo.exports, Ja = Object.defineProperty, Qa = Object.getOwnPropertyDescriptor, ei = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? Qa(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && Ja(t, o, a), a;
-}, et = (e, t) => (o, n) => t(o, n, e);
-let at = class extends Re {
+}, tt = (e, t) => (o, n) => t(o, n, e);
+let it = class extends De {
   constructor(e, t, o, n, a) {
     super(), this._sheetInterceptorService = e, this._dataValidationModel = t, this._dataValidatorRegistryService = o, this._dialogService = n, this._localeService = a, this._initEditorBridgeInterceptor();
   }
@@ -52,10 +52,10 @@ let at = class extends Re {
       {
         handler: async (e, t, o) => {
           var f;
-          const n = await e, { worksheet: a, row: i, col: r, unitId: l, subUnitId: s, workbook: u } = t, c = this._dataValidationModel.getRuleIdByLocation(l, s, i, r), h = c ? this._dataValidationModel.getRuleById(l, s, c) : void 0;
-          if (!h || h.errorStyle !== nt.STOP)
+          const n = await e, { worksheet: a, row: i, col: r, unitId: l, subUnitId: s, workbook: c } = t, u = this._dataValidationModel.getRuleIdByLocation(l, s, i, r), p = u ? this._dataValidationModel.getRuleById(l, s, u) : void 0;
+          if (!p || p.errorStyle !== ot.STOP)
             return o(Promise.resolve(n));
-          const d = await this._dataValidatorRegistryService.getValidatorItem(h.type);
+          const d = await this._dataValidatorRegistryService.getValidatorItem(p.type);
           if (!d || await d.validator(
             {
               value: ie(n),
@@ -65,10 +65,10 @@ let at = class extends Re {
               unitId: l,
               subUnitId: s,
               worksheet: a,
-              workbook: u,
+              workbook: c,
               t: n == null ? void 0 : n.t
             },
-            h
+            p
           ))
             return o(Promise.resolve(n));
           const m = a.getCellRaw(i, r);
@@ -79,10 +79,10 @@ let at = class extends Re {
             },
             id: "reject-input-dialog",
             children: {
-              title: d.getRuleFinalError(h, { row: i, col: r, unitId: l, subUnitId: s })
+              title: d.getRuleFinalError(p, { row: i, col: r, unitId: l, subUnitId: s })
             },
             footer: {
-              title: Xt.createElement(
+              title: zt.createElement(
                 je,
                 {
                   type: "primary",
@@ -110,7 +110,7 @@ let at = class extends Re {
         title: e
       },
       footer: {
-        title: Xt.createElement(
+        title: zt.createElement(
           je,
           {
             type: "primary",
@@ -125,51 +125,54 @@ let at = class extends Re {
     });
   }
 };
-at = ei([
-  et(0, L(un)),
-  et(1, L(Ve)),
-  et(2, L(ye)),
-  et(3, Aa),
-  et(4, L(ee))
-], at);
-const ti = "univer-dv-date-dropdown", ni = "univer-dv-date-dropdown-btns", Tn = {
+it = ei([
+  tt(0, b(hn)),
+  tt(1, b(oe)),
+  tt(2, b(ye)),
+  tt(3, Aa),
+  tt(4, b(J))
+], it);
+const ti = "univer-dv-date-dropdown", ni = "univer-dv-date-dropdown-btns", An = {
   dvDateDropdown: ti,
   dvDateDropdownBtns: ni
 }, oi = (e) => {
   if (e == null || typeof e == "boolean")
     return;
   if (typeof e == "number" || !Number.isNaN(+e))
-    return zt(Kt.format("yyyy-MM-dd HH:mm:ss", Number(e)));
-  const t = zt(e);
+    return Kt(Gt.format("yyyy-MM-dd HH:mm:ss", Number(e)));
+  const t = Kt(e);
   if (t.isValid())
     return t;
 };
 function ai(e) {
-  var y, _, R;
-  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l, workbook: s } = t, u = P(te), c = P(at), h = n.getCell(a, i), d = (y = h == null ? void 0 : h.dataValidation) == null ? void 0 : y.rule, g = (_ = h == null ? void 0 : h.dataValidation) == null ? void 0 : _.validator, m = ie(n.getCellRaw(a, i)), f = oi(m), [C, S] = Y(f), w = !!((R = d == null ? void 0 : d.bizInfo) != null && R.showTime), v = C && C.isValid() ? C : zt(), V = P(ee);
-  if (!h || !d || !g)
+  var g;
+  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l, workbook: s } = t, c = L(Q), u = L(it), p = n.getCell(a, i), d = ie(n.getCellRaw(a, i)), S = oi(d), [m, f] = H(S), R = m && m.isValid() ? m : Kt(), v = L(J), w = L(oe), I = w.getRuleByLocation(r, l, a, i);
+  if (!I)
+    return null;
+  const y = w.getValidator(I.type);
+  if (!p || !y)
     return;
-  const D = async () => {
-    var j, F, B;
-    if (!v)
+  const _ = !!((g = I.bizInfo) != null && g.showTime), C = async () => {
+    var x, j, U;
+    if (!R)
       return;
-    const $ = v.format(w ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), A = (j = Kt.parseDate($)) == null ? void 0 : j.v, M = s.getStyles().getStyleByCell(h), O = (B = (F = M == null ? void 0 : M.n) == null ? void 0 : F.pattern) != null ? B : "", x = Ra(O);
-    d.errorStyle !== nt.STOP || await g.validator({
-      value: A,
+    const T = R.format(_ ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), N = (x = Gt.parseDate(T)) == null ? void 0 : x.v, A = s.getStyles().getStyleByCell(p), E = (U = (j = A == null ? void 0 : A.n) == null ? void 0 : j.pattern) != null ? U : "", O = Ra(E);
+    I.errorStyle !== ot.STOP || await y.validator({
+      value: N,
       unitId: r,
       subUnitId: l,
       row: a,
       column: i,
       worksheet: n,
       workbook: s,
-      interceptValue: $.replace("Z", "").replace("T", " "),
+      interceptValue: T.replace("Z", "").replace("T", " "),
       t: ko.NUMBER
-    }, d) ? (o(), await u.executeCommand(ao.id, {
+    }, I) ? (o(), await c.executeCommand(ao.id, {
       visible: !1,
-      eventType: Jt.Keyboard,
+      eventType: Qt.Keyboard,
       unitId: r,
-      keycode: nn.ESC
-    }), await u.executeCommand(hn.id, {
+      keycode: on.ESC
+    }), await c.executeCommand(pn.id, {
       unitId: r,
       subUnitId: l,
       range: {
@@ -179,46 +182,46 @@ function ai(e) {
         endRow: a
       },
       value: {
-        v: A,
+        v: N,
         t: 2,
         p: null,
         f: null,
         si: null,
         s: {
           n: {
-            pattern: w ? x === "datetime" ? O : "yyyy-MM-dd hh:mm:ss" : x === "date" ? O : "yyyy-MM-dd"
+            pattern: _ ? O === "datetime" ? E : "yyyy-MM-dd hh:mm:ss" : O === "date" ? E : "yyyy-MM-dd"
           }
         }
       }
-    })) : c.showReject(g.getRuleFinalError(d, { row: a, col: i, unitId: r, subUnitId: l }));
+    })) : u.showReject(y.getRuleFinalError(I, { row: a, col: i, unitId: r, subUnitId: l }));
   };
-  return /* @__PURE__ */ p.jsxs("div", { className: Tn.dvDateDropdown, children: [
-    /* @__PURE__ */ p.jsx(
+  return /* @__PURE__ */ h.jsxs("div", { className: An.dvDateDropdown, children: [
+    /* @__PURE__ */ h.jsx(
       oa,
       {
-        defaultValue: v,
-        pickerValue: v,
-        showTime: w || void 0,
-        onSelect: async (T) => {
-          S(T);
+        defaultValue: R,
+        pickerValue: R,
+        showTime: _ || void 0,
+        onSelect: async (V) => {
+          f(V);
         },
-        onPanelChange: (T) => {
-          S(T);
+        onPanelChange: (V) => {
+          f(V);
         },
-        disabledDate: (T) => !Kt.parseDate(T.format("YYYY-MM-DD"))
+        disabledDate: (V) => !Gt.parseDate(V.format("YYYY-MM-DD"))
       }
     ),
-    /* @__PURE__ */ p.jsx("div", { className: Tn.dvDateDropdownBtns, children: /* @__PURE__ */ p.jsx(je, { size: "small", type: "primary", onClick: D, disabled: !v.isValid(), children: V.t("dataValidation.alert.ok") }) })
+    /* @__PURE__ */ h.jsx("div", { className: An.dvDateDropdownBtns, children: /* @__PURE__ */ h.jsx(je, { size: "small", type: "primary", onClick: C, disabled: !R.isValid(), children: v.t("dataValidation.alert.ok") }) })
   ] });
 }
-var de = function() {
-  return de = Object.assign || function(e) {
+var ce = function() {
+  return ce = Object.assign || function(e) {
     for (var t, o = 1, n = arguments.length; o < n; o++) {
       t = arguments[o];
       for (var a in t) Object.prototype.hasOwnProperty.call(t, a) && (e[a] = t[a]);
     }
     return e;
-  }, de.apply(this, arguments);
+  }, ce.apply(this, arguments);
 }, ii = function(e, t) {
   var o = {};
   for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && t.indexOf(n) < 0 && (o[n] = e[n]);
@@ -226,17 +229,17 @@ var de = function() {
     for (var a = 0, n = Object.getOwnPropertySymbols(e); a < n.length; a++)
       t.indexOf(n[a]) < 0 && Object.prototype.propertyIsEnumerable.call(e, n[a]) && (o[n[a]] = e[n[a]]);
   return o;
-}, be = we(function(e, t) {
-  var o = e.icon, n = e.id, a = e.className, i = e.extend, r = ii(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(n, " ").concat(a || "").trim(), s = ke("_".concat(li()));
-  return vo(o, "".concat(n), { defIds: o.defIds, idSuffix: s.current }, de({ ref: t, className: l }, r), i);
+}, Me = we(function(e, t) {
+  var o = e.icon, n = e.id, a = e.className, i = e.extend, r = ii(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(n, " ").concat(a || "").trim(), s = We("_".concat(li()));
+  return vo(o, "".concat(n), { defIds: o.defIds, idSuffix: s.current }, ce({ ref: t, className: l }, r), i);
 });
 function vo(e, t, o, n, a) {
-  return Ie(e.tag, de(de({ key: t }, ri(e, o, a)), n), (si(e, o).children || []).map(function(i, r) {
+  return Re(e.tag, ce(ce({ key: t }, ri(e, o, a)), n), (si(e, o).children || []).map(function(i, r) {
     return vo(i, "".concat(t, "-").concat(e.tag, "-").concat(r), o, void 0, a);
   }));
 }
 function ri(e, t, o) {
-  var n = de({}, e.attrs);
+  var n = ce({}, e.attrs);
   o != null && o.colorChannel1 && n.fill === "colorChannel1" && (n.fill = o.colorChannel1);
   var a = t.defIds;
   return !a || a.length === 0 || (e.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + t.idSuffix), Object.entries(n).forEach(function(i) {
@@ -246,16 +249,16 @@ function ri(e, t, o) {
 }
 function si(e, t) {
   var o, n = t.defIds;
-  return !n || n.length === 0 ? e : e.tag === "defs" && (!((o = e.children) === null || o === void 0) && o.length) ? de(de({}, e), { children: e.children.map(function(a) {
-    return typeof a.attrs.id == "string" && n && n.indexOf(a.attrs.id) > -1 ? de(de({}, a), { attrs: de(de({}, a.attrs), { id: a.attrs.id + t.idSuffix }) }) : a;
+  return !n || n.length === 0 ? e : e.tag === "defs" && (!((o = e.children) === null || o === void 0) && o.length) ? ce(ce({}, e), { children: e.children.map(function(a) {
+    return typeof a.attrs.id == "string" && n && n.indexOf(a.attrs.id) > -1 ? ce(ce({}, a), { attrs: ce(ce({}, a.attrs), { id: a.attrs.id + t.idSuffix }) }) : a;
   }) }) : e;
 }
 function li() {
   return Math.random().toString(36).substring(2, 8);
 }
-be.displayName = "UniverIcon";
+Me.displayName = "UniverIcon";
 var di = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M14.1544 3.75557C14.3887 3.98988 14.3887 4.36978 14.1544 4.6041L6.51409 12.2444C6.40157 12.3569 6.24896 12.4201 6.08983 12.4201C5.9307 12.4201 5.77808 12.3569 5.66556 12.2444L1.84541 8.42425C1.6111 8.18993 1.6111 7.81003 1.84541 7.57572C2.07973 7.34141 2.45963 7.34141 2.69394 7.57572L6.08983 10.9716L13.3059 3.75557C13.5402 3.52126 13.9201 3.52126 14.1544 3.75557Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, _o = we(function(e, t) {
-  return Ie(be, Object.assign({}, e, {
+  return Re(Me, Object.assign({}, e, {
     id: "check-mark-single",
     ref: t,
     icon: di
@@ -263,47 +266,47 @@ var di = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em"
 });
 _o.displayName = "CheckMarkSingle";
 var ci = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M1.4917 3.07803C1.4917 2.19437 2.20804 1.47803 3.0917 1.47803H5.6917C6.57536 1.47803 7.2917 2.19437 7.2917 3.07803V5.67803C7.2917 6.56168 6.57535 7.27803 5.6917 7.27803H3.0917C2.20804 7.27803 1.4917 6.56168 1.4917 5.67803V3.07803ZM3.0917 2.67803C2.87078 2.67803 2.6917 2.85711 2.6917 3.07803V5.67803C2.6917 5.89894 2.87079 6.07803 3.0917 6.07803H5.6917C5.91261 6.07803 6.0917 5.89894 6.0917 5.67803V3.07803C6.0917 2.85711 5.91261 2.67803 5.6917 2.67803H3.0917Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M14.6175 2.45279C14.8518 2.68711 14.8518 3.06701 14.6175 3.30132L11.6151 6.30365C11.3957 6.52307 11.0451 6.53897 10.8067 6.34031L8.80915 4.67566C8.55458 4.46352 8.52019 4.08518 8.73233 3.83062 8.94447 3.57605 9.32281 3.54166 9.57737 3.7538L11.154 5.06767 13.769 2.45278C14.0033 2.21847 14.3832 2.21848 14.6175 2.45279zM14.1175 9.19746C14.3518 9.43178 14.3518 9.81168 14.1175 10.046L12.5418 11.6217 14.1175 13.1975C14.3518 13.4318 14.3518 13.8117 14.1175 14.046 13.8832 14.2803 13.5033 14.2803 13.269 14.046L11.6933 12.4703 10.1175 14.046C9.88321 14.2803 9.50331 14.2803 9.269 14.046 9.03468 13.8117 9.03468 13.4318 9.269 13.1975L10.8447 11.6217 9.269 10.046C9.03468 9.81168 9.03468 9.43178 9.269 9.19746 9.50331 8.96315 9.88321 8.96315 10.1175 9.19746L11.6933 10.7732 13.269 9.19746C13.5033 8.96315 13.8832 8.96315 14.1175 9.19746z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M3.0917 8.72168C2.20804 8.72168 1.4917 9.43802 1.4917 10.3217V12.9217C1.4917 13.8053 2.20804 14.5217 3.0917 14.5217H5.6917C6.57535 14.5217 7.2917 13.8053 7.2917 12.9217V10.3217C7.2917 9.43802 6.57536 8.72168 5.6917 8.72168H3.0917ZM2.6917 10.3217C2.6917 10.1008 2.87078 9.92168 3.0917 9.92168H5.6917C5.91261 9.92168 6.0917 10.1008 6.0917 10.3217V12.9217C6.0917 13.1426 5.91261 13.3217 5.6917 13.3217H3.0917C2.87079 13.3217 2.6917 13.1426 2.6917 12.9217V10.3217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, So = we(function(e, t) {
-  return Ie(be, Object.assign({}, e, {
+  return Re(Me, Object.assign({}, e, {
     id: "data-validation-single",
     ref: t,
     icon: ci
   }));
 });
 So.displayName = "DataValidationSingle";
-var ui = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993.866699 5.9313.866699H10.069C10.4004.866699 10.669 1.13533 10.669 1.4667 10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667zM1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443 14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443zM6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928 9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171 10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778 9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539 9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263 6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539 5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778 6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, _n = we(function(e, t) {
-  return Ie(be, Object.assign({}, e, {
+var ui = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993.866699 5.9313.866699H10.069C10.4004.866699 10.669 1.13533 10.669 1.4667 10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667zM1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443 14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443zM6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928 9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171 10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778 9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539 9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263 6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539 5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778 6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Sn = we(function(e, t) {
+  return Re(Me, Object.assign({}, e, {
     id: "delete-single",
     ref: t,
     icon: ui
   }));
 });
-_n.displayName = "DeleteSingle";
+Sn.displayName = "DeleteSingle";
 var hi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z" } }] }, Co = we(function(e, t) {
-  return Ie(be, Object.assign({}, e, {
+  return Re(Me, Object.assign({}, e, {
     id: "increase-single",
     ref: t,
     icon: hi
   }));
 });
 Co.displayName = "IncreaseSingle";
-var pi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M11.3536 6.14645C11.5488 6.34171 11.5488 6.65829 11.3536 6.85355L8.35355 9.85355C8.15829 10.0488 7.84171 10.0488 7.64645 9.85355L4.64645 6.85355C4.45118 6.65829 4.45118 6.34171 4.64645 6.14645C4.84171 5.95118 5.15829 5.95118 5.35355 6.14645L8 8.79289L10.6464 6.14645C10.8417 5.95118 11.1583 5.95118 11.3536 6.14645Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, wo = we(function(e, t) {
-  return Ie(be, Object.assign({}, e, {
+var pi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M11.3536 6.14645C11.5488 6.34171 11.5488 6.65829 11.3536 6.85355L8.35355 9.85355C8.15829 10.0488 7.84171 10.0488 7.64645 9.85355L4.64645 6.85355C4.45118 6.65829 4.45118 6.34171 4.64645 6.14645C4.84171 5.95118 5.15829 5.95118 5.35355 6.14645L8 8.79289L10.6464 6.14645C10.8417 5.95118 11.1583 5.95118 11.3536 6.14645Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Io = we(function(e, t) {
+  return Re(Me, Object.assign({}, e, {
     id: "more-down-single",
     ref: t,
     icon: pi
   }));
 });
-wo.displayName = "MoreDownSingle";
-var mi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M4.64645 9.85355C4.45118 9.65829 4.45118 9.34171 4.64645 9.14645L7.64645 6.14645C7.84171 5.95118 8.15829 5.95118 8.35355 6.14645L11.3536 9.14645C11.5488 9.34171 11.5488 9.65829 11.3536 9.85355C11.1583 10.0488 10.8417 10.0488 10.6464 9.85355L8 7.20711L5.35355 9.85355C5.15829 10.0488 4.84171 10.0488 4.64645 9.85355Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Io = we(function(e, t) {
-  return Ie(be, Object.assign({}, e, {
+Io.displayName = "MoreDownSingle";
+var mi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M4.64645 9.85355C4.45118 9.65829 4.45118 9.34171 4.64645 9.14645L7.64645 6.14645C7.84171 5.95118 8.15829 5.95118 8.35355 6.14645L11.3536 9.14645C11.5488 9.34171 11.5488 9.65829 11.3536 9.85355C11.1583 10.0488 10.8417 10.0488 10.6464 9.85355L8 7.20711L5.35355 9.85355C5.15829 10.0488 4.84171 10.0488 4.64645 9.85355Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, wo = we(function(e, t) {
+  return Re(Me, Object.assign({}, e, {
     id: "more-up-single",
     ref: t,
     icon: mi
   }));
 });
-Io.displayName = "MoreUpSingle";
+wo.displayName = "MoreUpSingle";
 var fi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "mask", attrs: { id: "mask0_622_8", style: { maskType: "alpha" }, width: 16, height: 16, x: 0, y: 0, maskUnits: "userSpaceOnUse" }, children: [{ tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }] }, { tag: "g", attrs: { fill: "currentColor", mask: "url(#mask0_622_8)" }, children: [{ tag: "path", attrs: { d: "M6 5C6.55228 5 7 4.55228 7 4 7 3.44772 6.55228 3 6 3 5.44772 3 5 3.44772 5 4 5 4.55228 5.44772 5 6 5zM6 9C6.55228 9 7 8.55229 7 8 7 7.44772 6.55228 7 6 7 5.44772 7 5 7.44772 5 8 5 8.55229 5.44772 9 6 9zM7 12C7 12.5523 6.55228 13 6 13 5.44772 13 5 12.5523 5 12 5 11.4477 5.44772 11 6 11 6.55228 11 7 11.4477 7 12zM10 5C10.5523 5 11 4.55228 11 4 11 3.44772 10.5523 3 10 3 9.44771 3 9 3.44772 9 4 9 4.55228 9.44771 5 10 5zM11 8C11 8.55229 10.5523 9 10 9 9.44771 9 9 8.55229 9 8 9 7.44772 9.44771 7 10 7 10.5523 7 11 7.44772 11 8zM10 13C10.5523 13 11 12.5523 11 12 11 11.4477 10.5523 11 10 11 9.44771 11 9 11.4477 9 12 9 12.5523 9.44771 13 10 13z" } }] }] }, Ro = we(function(e, t) {
-  return Ie(be, Object.assign({}, e, {
+  return Re(Me, Object.assign({}, e, {
     id: "sequence-single",
     ref: t,
     icon: fi
@@ -314,22 +317,22 @@ var gi = Object.defineProperty, vi = Object.getOwnPropertyDescriptor, _i = (e, t
   for (var a = n > 1 ? void 0 : n ? vi(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && gi(t, o, a), a;
-}, An = (e, t) => (o, n) => t(o, n, e);
-let pe = class extends Re {
+}, xn = (e, t) => (o, n) => t(o, n, e);
+let me = class extends De {
   constructor(t, o) {
     super();
-    E(this, "_open$", new Ln(!1));
-    E(this, "open$", this._open$.pipe(ka()));
-    E(this, "_activeRule");
-    E(this, "_activeRule$", new Ln(void 0));
-    E(this, "activeRule$", this._activeRule$.asObservable());
-    E(this, "_closeDisposable", null);
+    M(this, "_open$", new Tn(!1));
+    M(this, "open$", this._open$.pipe(ka()));
+    M(this, "_activeRule");
+    M(this, "_activeRule$", new Tn(void 0));
+    M(this, "activeRule$", this._activeRule$.asObservable());
+    M(this, "_closeDisposable", null);
     this._univerInstanceService = t, this._sidebarService = o, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(z.UNIVER_SHEET).pipe(gn((n) => !n)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(z.UNIVER_SHEET).pipe(vn((n) => !n)).subscribe(() => {
         this.close();
       })
     ), this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((n) => {
-      n.id === Sn && (n.visible || setTimeout(() => {
+      n.id === Cn && (n.visible || setTimeout(() => {
         this._sidebarService.sidebarOptions$.next({ visible: !1 });
       }));
     }));
@@ -360,12 +363,12 @@ let pe = class extends Re {
     this._activeRule = t, this._activeRule$.next(t);
   }
 };
-pe = _i([
-  An(0, fe),
-  An(1, lo)
-], pe);
+me = _i([
+  xn(0, ge),
+  xn(1, lo)
+], me);
 function Si() {
-  const e = P(Ce), t = Ne(e.activeDropdown$, e.activeDropdown), o = P(bt);
+  const e = L(Ie), t = Ne(e.activeDropdown$, e.activeDropdown), o = L(bt);
   if (!t)
     return null;
   const { location: n, componentKey: a } = t, i = o.get(a), r = `${n.unitId}-${n.subUnitId}-${n.row}-${n.col}`;
@@ -374,7 +377,7 @@ function Si() {
   const l = () => {
     e.hideDropdown();
   };
-  return /* @__PURE__ */ p.jsx(
+  return /* @__PURE__ */ h.jsx(
     i,
     {
       location: n,
@@ -384,19 +387,19 @@ function Si() {
   );
 }
 const Do = "sheet.ui.dropdown";
-var Ci = Object.defineProperty, wi = Object.getOwnPropertyDescriptor, Ii = (e, t, o, n) => {
-  for (var a = n > 1 ? void 0 : n ? wi(t, o) : t, i = e.length - 1, r; i >= 0; i--)
+var Ci = Object.defineProperty, Ii = Object.getOwnPropertyDescriptor, wi = (e, t, o, n) => {
+  for (var a = n > 1 ? void 0 : n ? Ii(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && Ci(t, o, a), a;
-}, Ee = (e, t) => (o, n) => t(o, n, e);
-let Ce = class extends Re {
+}, be = (e, t) => (o, n) => t(o, n, e);
+let Ie = class extends De {
   constructor(t, o, n, a, i, r, l) {
     super();
-    E(this, "_activeDropdown");
-    E(this, "_activeDropdown$", new Wa());
-    E(this, "_currentPopup", null);
-    E(this, "activeDropdown$", this._activeDropdown$.asObservable());
-    E(this, "_zenVisible", !1);
+    M(this, "_activeDropdown");
+    M(this, "_activeDropdown$", new Wa());
+    M(this, "_currentPopup", null);
+    M(this, "activeDropdown$", this._activeDropdown$.asObservable());
+    M(this, "_zenVisible", !1);
     this._canvasPopupManagerService = t, this._univerInstanceService = o, this._dataValidatorRegistryService = n, this._zenZoneService = a, this._renderManagerService = i, this._dataValidationModel = r, this._sheetsSelectionsService = l, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
@@ -432,7 +435,7 @@ let Ce = class extends Re {
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
     this._activeDropdown = t, this._activeDropdown$.next(this._activeDropdown);
-    const s = this._renderManagerService.getRenderById(Ho), u = this._canvasPopupManagerService.attachPopupToCell(
+    const s = this._renderManagerService.getRenderById(Ho), c = this._canvasPopupManagerService.attachPopupToCell(
       a,
       i,
       {
@@ -446,15 +449,15 @@ let Ce = class extends Re {
       r,
       l
     );
-    if (!u)
+    if (!c)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
-    const c = new Yo();
-    c.add(u), c.add({
+    const u = new Yo();
+    u.add(c), u.add({
       dispose: () => {
-        var h, d;
-        (d = (h = this._activeDropdown) == null ? void 0 : h.onHide) == null || d.call(h);
+        var p, d;
+        (d = (p = this._activeDropdown) == null ? void 0 : p.onHide) == null || d.call(p);
       }
-    }), this._currentPopup = c;
+    }), this._currentPopup = u;
   }
   hideDropdown() {
     this._activeDropdown && (this._currentPopup && this._currentPopup.dispose(), this._currentPopup = null, this._activeDropdown = null, this._activeDropdown$.next(null));
@@ -469,8 +472,8 @@ let Ce = class extends Re {
     const s = this._dataValidationModel.getRuleByLocation(r.getUnitId(), l.getSheetId(), n, a);
     if (!s)
       return;
-    const u = this._dataValidatorRegistryService.getValidatorItem(s.type);
-    if (!u || !u.dropdown) {
+    const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
+    if (!c || !c.dropdown) {
       this.hideDropdown();
       return;
     }
@@ -483,62 +486,62 @@ let Ce = class extends Re {
         unitId: t,
         subUnitId: o
       },
-      componentKey: u.dropdown,
+      componentKey: c.dropdown,
       onHide: i
     });
   }
 };
-Ce = Ii([
-  Ee(0, L(Da)),
-  Ee(1, fe),
-  Ee(2, L(ye)),
-  Ee(3, co),
-  Ee(4, De),
-  Ee(5, L(Ve)),
-  Ee(6, L(zn))
-], Ce);
-const Sn = "DataValidationPanel", Ue = {
+Ie = wi([
+  be(0, b(Da)),
+  be(1, ge),
+  be(2, b(ye)),
+  be(3, co),
+  be(4, Ve),
+  be(5, b(oe)),
+  be(6, b(zn))
+], Ie);
+const Cn = "DataValidationPanel", Ue = {
   id: "data-validation.operation.open-validation-panel",
-  type: Ze.OPERATION,
+  type: qe.OPERATION,
   handler(e, t) {
     if (!t)
       return !1;
-    const { ruleId: o, isAdd: n } = t, a = e.get(pe), i = e.get(Et), r = e.get(fe), l = e.get(lo), s = Kn(r);
+    const { ruleId: o, isAdd: n } = t, a = e.get(me), i = e.get(Et), r = e.get(ge), l = e.get(lo), s = Kn(r);
     if (!s) return !1;
-    const { unitId: u, subUnitId: c } = s, h = o ? i.getRuleById(u, c, o) : void 0;
-    a.open(), a.setActiveRule(h && {
-      unitId: u,
-      subUnitId: c,
-      rule: h
+    const { unitId: c, subUnitId: u } = s, p = o ? i.getRuleById(c, u, o) : void 0;
+    a.open(), a.setActiveRule(p && {
+      unitId: c,
+      subUnitId: u,
+      rule: p
     });
     const d = l.open({
       header: { title: n ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
-      children: { label: Sn },
+      children: { label: Cn },
       width: 312,
       onClose: () => a.close()
     });
     return a.setCloseDisposable(d), !0;
   }
-}, Cn = {
+}, In = {
   id: "data-validation.operation.close-validation-panel",
-  type: Ze.OPERATION,
+  type: qe.OPERATION,
   handler(e) {
-    return e.get(pe).close(), !0;
+    return e.get(me).close(), !0;
   }
 }, Vo = {
   id: "data-validation.operation.toggle-validation-panel",
-  type: Ze.OPERATION,
+  type: qe.OPERATION,
   handler(e) {
-    const t = e.get(te), o = e.get(pe);
-    return o.open(), o.isOpen ? t.executeCommand(Cn.id) : t.executeCommand(Ue.id), !0;
+    const t = e.get(Q), o = e.get(me);
+    return o.open(), o.isOpen ? t.executeCommand(In.id) : t.executeCommand(Ue.id), !0;
   }
-}, Ot = {
-  type: Ze.OPERATION,
+}, Pt = {
+  type: qe.OPERATION,
   id: "sheet.operation.show-data-validation-dropdown",
   handler(e, t) {
     if (!t)
       return !1;
-    const o = e.get(Ce), { unitId: n, subUnitId: a, row: i, column: r } = t, l = o.activeDropdown, s = l == null ? void 0 : l.location;
+    const o = e.get(Ie), { unitId: n, subUnitId: a, row: i, column: r } = t, l = o.activeDropdown, s = l == null ? void 0 : l.location;
     return s && s.unitId === n && s.subUnitId === a && s.row === i && s.col === r || o.showDataValidationDropdown(
       n,
       a,
@@ -547,101 +550,107 @@ const Sn = "DataValidationPanel", Ue = {
     ), !0;
   }
 }, yo = {
-  type: Ze.OPERATION,
+  type: qe.OPERATION,
   id: "sheet.operation.hide-data-validation-dropdown",
   handler(e, t) {
-    return t ? (e.get(Ce).hideDropdown(), !0) : !1;
+    return t ? (e.get(Ie).hideDropdown(), !0) : !1;
   }
-}, Le = "#ECECEC", wn = "sheets-data-validation-ui.config", bo = {}, Ri = "univer-dv-list-dropdown", Di = "univer-dv-list-dropdown-title", Vi = "univer-dv-list-dropdown-list", yi = "univer-dv-list-dropdown-list-container", bi = "univer-dv-list-dropdown-selected-icon", Ei = "univer-dv-list-dropdown-item-container", Mi = "univer-dv-list-dropdown-item", Oi = "univer-dv-list-dropdown-split", Pi = "univer-dv-list-dropdown-edit", ge = {
+}, Le = "#ECECEC", wn = "sheets-data-validation-ui.config", Mo = {}, Ri = "univer-dv-list-dropdown", Di = "univer-dv-list-dropdown-title", Vi = "univer-dv-list-dropdown-list", yi = "univer-dv-list-dropdown-list-container", Mi = "univer-dv-list-dropdown-selected-icon", bi = "univer-dv-list-dropdown-item-container", Ei = "univer-dv-list-dropdown-item", Oi = "univer-dv-list-dropdown-split", Pi = "univer-dv-list-dropdown-edit", ve = {
   dvListDropdown: Ri,
   dvListDropdownTitle: Di,
   dvListDropdownList: Vi,
   dvListDropdownListContainer: yi,
-  dvListDropdownSelectedIcon: bi,
-  dvListDropdownItemContainer: Ei,
-  dvListDropdownItem: Mi,
+  dvListDropdownSelectedIcon: Mi,
+  dvListDropdownItemContainer: bi,
+  dvListDropdownItem: Ei,
   dvListDropdownSplit: Oi,
   dvListDropdownEdit: Pi
 }, Li = (e) => {
-  var D, y;
-  const { value: t, onChange: o, multiple: n, options: a, title: i, onEdit: r, style: l, filter: s, location: u } = e, c = P(ee), h = P(ln), d = s == null ? void 0 : s.toLowerCase(), { row: g, col: m, unitId: f, subUnitId: C } = u, S = a.filter((_) => d ? _.label.toLowerCase().includes(d) : !0), w = (y = (D = h.getConfig(wn)) == null ? void 0 : D.showEditOnDropdown) != null ? y : !0, v = P(ro), V = Te(() => v.permissionCheckWithRanges(
+  var _, C;
+  const { value: t, onChange: o, multiple: n, options: a, title: i, onEdit: r, style: l, filter: s, location: c } = e, u = L(J), p = L(dn), d = s == null ? void 0 : s.toLowerCase(), { row: S, col: m, unitId: f, subUnitId: R } = c, v = a.filter((g) => d ? g.label.toLowerCase().includes(d) : !0), w = (C = (_ = p.getConfig(wn)) == null ? void 0 : _.showEditOnDropdown) != null ? C : !0, I = L(ro), y = Te(() => I.permissionCheckWithRanges(
     {
-      workbookTypes: [_t],
-      rangeTypes: [St],
-      worksheetTypes: [Ct]
+      workbookTypes: [St],
+      rangeTypes: [Ct],
+      worksheetTypes: [It]
     },
-    [{ startColumn: m, startRow: g, endColumn: m, endRow: g }],
+    [{ startColumn: m, startRow: S, endColumn: m, endRow: S }],
     f,
-    C
-  ), [v, m, g, f, C]);
-  return /* @__PURE__ */ p.jsxs("div", { className: ge.dvListDropdown, style: l, children: [
-    /* @__PURE__ */ p.jsx("div", { className: ge.dvListDropdownTitle, children: i }),
-    /* @__PURE__ */ p.jsx("div", { className: ge.dvListDropdownList, children: /* @__PURE__ */ p.jsx(aa, { children: /* @__PURE__ */ p.jsx("div", { className: ge.dvListDropdownListContainer, children: S.map((_, R) => {
-      const T = t.indexOf(_.value) > -1, $ = () => {
-        let M;
-        T ? M = new Set(t.filter((x) => x !== _.value)) : M = new Set(n ? [...t, _.value] : [_.value]);
+    R
+  ), [I, m, S, f, R]);
+  return /* @__PURE__ */ h.jsxs("div", { className: ve.dvListDropdown, style: l, children: [
+    /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownTitle, children: i }),
+    /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownList, children: /* @__PURE__ */ h.jsx(aa, { children: /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownListContainer, children: v.map((g, V) => {
+      const T = t.indexOf(g.value) > -1, N = () => {
+        let E;
+        T ? E = new Set(t.filter((x) => x !== g.value)) : E = new Set(n ? [...t, g.value] : [g.value]);
         const O = [];
         a.forEach((x) => {
-          M.has(x.value) && O.push(x.value);
+          E.has(x.value) && O.push(x.value);
         }), o(O);
-      }, A = _.label.toLocaleLowerCase().indexOf(d);
-      return /* @__PURE__ */ p.jsxs("div", { className: ge.dvListDropdownItemContainer, onClick: $, children: [
-        /* @__PURE__ */ p.jsx("div", { className: ge.dvListDropdownItem, style: { background: _.color || Le }, children: d && _.label.toLowerCase().includes(d) ? /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
-          /* @__PURE__ */ p.jsx("span", { children: _.label.substring(0, A) }),
-          /* @__PURE__ */ p.jsx("span", { style: { fontWeight: "bold" }, children: _.label.substring(A, A + d.length) }),
-          /* @__PURE__ */ p.jsx("span", { children: _.label.substring(A + d.length) })
-        ] }) : _.label }),
-        /* @__PURE__ */ p.jsx("div", { className: ge.dvListDropdownSelectedIcon, children: T ? /* @__PURE__ */ p.jsx(_o, {}) : null })
-      ] }, R);
+      }, A = g.label.toLocaleLowerCase().indexOf(d);
+      return /* @__PURE__ */ h.jsxs("div", { className: ve.dvListDropdownItemContainer, onClick: N, children: [
+        /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownItem, style: { background: g.color || Le }, children: d && g.label.toLowerCase().includes(d) ? /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
+          /* @__PURE__ */ h.jsx("span", { children: g.label.substring(0, A) }),
+          /* @__PURE__ */ h.jsx("span", { style: { fontWeight: "bold" }, children: g.label.substring(A, A + d.length) }),
+          /* @__PURE__ */ h.jsx("span", { children: g.label.substring(A + d.length) })
+        ] }) : g.label }),
+        /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownSelectedIcon, children: T ? /* @__PURE__ */ h.jsx(_o, {}) : null })
+      ] }, V);
     }) }) }, s) }),
-    w && V ? /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
-      /* @__PURE__ */ p.jsx("div", { className: ge.dvListDropdownSplit }),
-      /* @__PURE__ */ p.jsx("div", { className: ge.dvListDropdownEdit, children: /* @__PURE__ */ p.jsx("a", { onClick: r, children: c.t("dataValidation.list.edit") }) })
+    w && y ? /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
+      /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownSplit }),
+      /* @__PURE__ */ h.jsx("div", { className: ve.dvListDropdownEdit, children: /* @__PURE__ */ h.jsx("a", { onClick: r, children: u.t("dataValidation.list.edit") }) })
     ] }) : null
   ] });
 };
 function Ti(e) {
-  var x, j, F, B, k, K;
-  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l } = t, s = P(Et), [u, c] = Y(""), h = P(te), d = P(ee), [g, m] = Y(""), f = P(io), C = P(fe), S = Te(() => s.ruleChange$.pipe(vn(16)), []);
-  Ne(S);
-  const w = xa.useContext(), v = ((j = (x = w.current) == null ? void 0 : x.right) != null ? j : 0) - ((B = (F = w.current) == null ? void 0 : F.left) != null ? B : 0);
-  if (Se(() => {
-    const H = h.onCommandExecuted((X) => {
-      var J, ae;
-      if (X.id === Ba.id) {
-        const re = X.params, { unitId: Q } = re, ne = C.getUnit(Q, z.UNIVER_DOC);
-        if (!ne)
+  var j, U, W, Y;
+  const { location: t, hideFn: o } = e, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l } = t, s = L(Et), [c, u] = H(""), p = L(Q), d = L(J), [S, m] = H(""), f = L(io), R = L(ge), v = Te(() => s.ruleChange$.pipe(_n(16)), []), w = L(oe);
+  Ne(v);
+  const I = xa.useContext(), y = ((U = (j = I.current) == null ? void 0 : j.right) != null ? U : 0) - ((Y = (W = I.current) == null ? void 0 : W.left) != null ? Y : 0);
+  if (Ce(() => {
+    const k = p.onCommandExecuted((X) => {
+      var q, ee;
+      if (X.id === $a.id) {
+        const te = X.params, { unitId: re } = te, ae = R.getUnit(re, z.UNIVER_DOC);
+        if (!ae)
           return;
-        const b = Xo.transform.getPlainText((ae = (J = ne.getSnapshot().body) == null ? void 0 : J.dataStream) != null ? ae : "");
-        c(b);
+        const se = Xo.transform.getPlainText((ee = (q = ae.getSnapshot().body) == null ? void 0 : q.dataStream) != null ? ee : "");
+        u(se);
       }
     });
     return () => {
-      H.dispose();
+      k.dispose();
     };
-  }, [h, C]), !n)
+  }, [p, R]), !n)
+    return null;
+  const _ = w.getRuleByLocation(r, l, a, i);
+  if (!_)
+    return null;
+  const C = w.getValidator(_.type);
+  if (!C)
     return null;
-  const V = n.getCell(a, i), D = (k = V == null ? void 0 : V.dataValidation) == null ? void 0 : k.rule, y = (K = V == null ? void 0 : V.dataValidation) == null ? void 0 : K.validator, _ = (D == null ? void 0 : D.renderMode) === le.CUSTOM || (D == null ? void 0 : D.renderMode) === void 0;
-  if (!V || !D || !y || y.id.indexOf(q.LIST) !== 0)
+  const g = n.getCell(a, i), V = (_ == null ? void 0 : _.renderMode) === de.CUSTOM || (_ == null ? void 0 : _.renderMode) === void 0;
+  if (!g || !_ || !C || C.id.indexOf(Z.LIST) !== 0)
     return;
-  const R = D.type === q.LIST_MULTIPLE, T = y.getListWithColor(D, r, l), $ = g || fa(n.getCellRaw(a, i)), A = qn($), M = () => {
-    h.executeCommand(Ue.id, {
-      ruleId: D.uid
+  const T = _.type === Z.LIST_MULTIPLE, N = C.getListWithColor(_, r, l), A = S || fa(n.getCellRaw(a, i)), E = qn(A), O = () => {
+    p.executeCommand(Ue.id, {
+      ruleId: _.uid
     }), o();
-  }, O = T.map((H) => ({
-    label: H.label,
-    value: H.label,
-    color: _ || H.color ? H.color : "transparent"
+  }, x = N.map((k) => ({
+    label: k.label,
+    value: k.label,
+    color: V || k.color ? k.color : "transparent"
   }));
-  return /* @__PURE__ */ p.jsx(
+  return /* @__PURE__ */ h.jsx(
     Li,
     {
-      style: { minWidth: v, maxWidth: Math.max(v, 200) },
-      title: R ? d.t("dataValidation.listMultiple.dropdown") : d.t("dataValidation.list.dropdown"),
-      value: A,
-      multiple: R,
-      onChange: async (H) => {
-        const X = Jn(H), J = {
+      style: { minWidth: y, maxWidth: Math.max(y, 200) },
+      title: T ? d.t("dataValidation.listMultiple.dropdown") : d.t("dataValidation.list.dropdown"),
+      value: E,
+      multiple: T,
+      onChange: async (k) => {
+        const X = Jn(k), q = {
           unitId: r,
           subUnitId: l,
           range: {
@@ -659,60 +668,60 @@ function Ti(e) {
         };
         f.isVisible() && f.changeVisible({
           visible: !1,
-          keycode: nn.ESC,
-          eventType: Jt.Keyboard,
+          keycode: on.ESC,
+          eventType: Qt.Keyboard,
           unitId: r
-        }), m(X), R || o(), f.isVisible().visible && await h.executeCommand(ao.id, {
+        }), m(X), T || o(), f.isVisible().visible && await p.executeCommand(ao.id, {
           visible: !1,
-          eventType: Jt.Keyboard,
+          eventType: Qt.Keyboard,
           unitId: r,
-          keycode: nn.ESC
-        }), h.executeCommand(hn.id, J);
+          keycode: on.ESC
+        }), p.executeCommand(pn.id, q);
       },
-      options: O,
-      onEdit: M,
-      filter: u,
+      options: x,
+      onEdit: O,
+      filter: c,
       location: t
     }
   );
 }
-const Ai = "univer-data-validation-options-button", xi = "univer-data-validation-options-button-icon", xt = {
+const Ai = "univer-data-validation-options-button", xi = "univer-data-validation-options-button-icon", jt = {
   dataValidationOptionsButton: Ai,
   dataValidationOptionsButtonIcon: xi
 };
 function ji(e) {
-  var u;
-  const t = P(ee), o = P(bt), { value: n, onChange: a, extraComponent: i } = e, [r, l] = Y(!1), s = i ? o.get(i) : null;
-  return /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
-    /* @__PURE__ */ p.jsxs("div", { className: xt.dataValidationOptionsButton, onClick: () => l(!r), children: [
+  var c;
+  const t = L(J), o = L(bt), { value: n, onChange: a, extraComponent: i } = e, [r, l] = H(!1), s = i ? o.get(i) : null;
+  return /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
+    /* @__PURE__ */ h.jsxs("div", { className: jt.dataValidationOptionsButton, onClick: () => l(!r), children: [
       t.t("dataValidation.panel.options"),
-      r ? /* @__PURE__ */ p.jsx(Io, { className: xt.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ p.jsx(wo, { className: xt.dataValidationOptionsButtonIcon })
+      r ? /* @__PURE__ */ h.jsx(wo, { className: jt.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ h.jsx(Io, { className: jt.dataValidationOptionsButtonIcon })
     ] }),
-    r && /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
-      s ? /* @__PURE__ */ p.jsx(s, { value: n, onChange: a }) : null,
-      /* @__PURE__ */ p.jsx(
-        Z,
+    r && /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
+      s ? /* @__PURE__ */ h.jsx(s, { value: n, onChange: a }) : null,
+      /* @__PURE__ */ h.jsx(
+        G,
         {
           label: t.t("dataValidation.panel.invalid"),
-          children: /* @__PURE__ */ p.jsxs(
-            cn,
+          children: /* @__PURE__ */ h.jsxs(
+            un,
             {
-              value: `${(u = n.errorStyle) != null ? u : nt.WARNING}`,
-              onChange: (c) => a({ ...n, errorStyle: +c }),
+              value: `${(c = n.errorStyle) != null ? c : ot.WARNING}`,
+              onChange: (u) => a({ ...n, errorStyle: +u }),
               children: [
-                /* @__PURE__ */ p.jsx(Ae, { value: `${nt.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ p.jsx(Ae, { value: `${nt.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
+                /* @__PURE__ */ h.jsx(Ae, { value: `${ot.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ h.jsx(Ae, { value: `${ot.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
               ]
             }
           )
         }
       ),
-      /* @__PURE__ */ p.jsx(
-        Z,
+      /* @__PURE__ */ h.jsx(
+        G,
         {
           label: t.t("dataValidation.panel.messageInfo"),
-          children: /* @__PURE__ */ p.jsx(
-            yt,
+          children: /* @__PURE__ */ h.jsx(
+            Mt,
             {
               checked: n.showErrorMessage,
               onChange: () => a({
@@ -724,16 +733,16 @@ function ji(e) {
           )
         }
       ),
-      n.showErrorMessage ? /* @__PURE__ */ p.jsx(Z, { children: /* @__PURE__ */ p.jsx(xe, { value: n.error, onChange: (c) => a({ ...n, error: c }) }) }) : null
+      n.showErrorMessage ? /* @__PURE__ */ h.jsx(G, { children: /* @__PURE__ */ h.jsx(xe, { value: n.error, onChange: (u) => a({ ...n, error: u }) }) }) : null
     ] })
   ] });
 }
-const Fi = "univer-data-validation-detail", Ni = "univer-data-validation-detail-form-item", Ui = "univer-data-validation-detail-buttons", $i = "univer-data-validation-detail-button", $e = {
+const Fi = "univer-data-validation-detail", Ni = "univer-data-validation-detail-form-item", Ui = "univer-data-validation-detail-buttons", Bi = "univer-data-validation-detail-button", Be = {
   dataValidationDetail: Fi,
   dataValidationDetailFormItem: Ni,
   dataValidationDetailButtons: Ui,
-  dataValidationDetailButton: $i
-}, Bi = (e) => Zo(
+  dataValidationDetailButton: Bi
+}, $i = (e) => Zo(
   async (t, o, n, a) => {
     const i = await e.executeCommand(t, o, n);
     a == null || a(i);
@@ -745,236 +754,236 @@ function ki(e, t, o) {
   return t ? ((a = (n = e.getUnit(t)) == null ? void 0 : n.getSheetBySheetName(o)) == null ? void 0 : a.getSheetId()) || "" : ((r = (i = e.getCurrentUnitForType(z.UNIVER_SHEET)) == null ? void 0 : i.getSheetBySheetName(o)) == null ? void 0 : r.getSheetId()) || "";
 }
 function Wi() {
-  var ne;
-  const [e, t] = Y(0), o = P(pe), n = Ne(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, l = r.uid, s = P(ye), u = P(fe), c = P(bt), h = P(te), d = P(Et), g = P(ee), [m, f] = Y(r), C = s.getValidatorItem(m.type), [S, w] = Y(!1), v = s.getValidatorsByScope(Ua.SHEET), [V, D] = Y(() => m.ranges.map((b) => ({ unitId: "", sheetId: "", range: b }))), y = Te(() => Bi(h), [h]), [_, R] = Y(!1), T = ke({}), [$, A] = Y(!1), M = P(zn);
-  if (Se(() => () => {
-    const b = M.getCurrentLastSelection();
-    b && M.setSelections([b]);
-  }, [M]), Se(() => {
-    h.onCommandExecuted((b) => {
-      (b.id === zo.id || b.id === Ko.id) && setTimeout(() => {
-        const I = d.getRuleById(a, i, l);
-        t((N) => N + 1), I && (f(I), D(I.ranges.map((N) => ({ unitId: "", sheetId: "", range: N }))));
+  var se;
+  const [e, t] = H(0), o = L(me), n = Ne(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, l = r.uid, s = L(ye), c = L(ge), u = L(bt), p = L(Q), d = L(Et), S = L(J), [m, f] = H(r), R = s.getValidatorItem(m.type), [v, w] = H(!1), I = s.getValidatorsByScope(Ua.SHEET), [y, _] = H(() => m.ranges.map((P) => ({ unitId: "", sheetId: "", range: P }))), C = Te(() => $i(p), [p]), [g, V] = H(!1), T = We({}), [N, A] = H(!1), E = L(zn);
+  if (Ce(() => () => {
+    const P = E.getCurrentLastSelection();
+    P && E.setSelections([P]);
+  }, [E]), Ce(() => {
+    p.onCommandExecuted((P) => {
+      (P.id === zo.id || P.id === Ko.id) && setTimeout(() => {
+        const D = d.getRuleById(a, i, l);
+        t((F) => F + 1), D && (f(D), _(D.ranges.map((F) => ({ unitId: "", sheetId: "", range: F }))));
       }, 20);
     });
-  }, [h, d, l, i, a]), !C)
+  }, [p, d, l, i, a]), !R)
     return null;
-  const O = C.operators, x = C.operatorNames, j = m.operator ? $a.includes(m.operator) : !1, F = () => {
-    !m.ranges.length || _ || (C.validatorFormula(m, a, i).success ? o.setActiveRule(null) : w(!0));
-  }, B = uo((b) => {
-    const I = b.split(",").map(Ha).map((W) => {
-      const ve = W.sheetName;
-      if (ve) {
-        const Uo = ki(u, W.unitId, ve);
-        return { ...W, sheetId: Uo };
+  const O = R.operators, x = R.operatorNames, j = m.operator ? Ba.includes(m.operator) : !1, U = () => {
+    !m.ranges.length || g || (R.validatorFormula(m, a, i).success ? o.setActiveRule(null) : w(!0));
+  }, W = uo((P) => {
+    const D = P.split(",").map(Ha).map(($) => {
+      const _e = $.sheetName;
+      if (_e) {
+        const Uo = ki(c, $.unitId, _e);
+        return { ...$, sheetId: Uo };
       }
       return {
-        ...W,
+        ...$,
         sheetId: ""
       };
     });
-    if (Go(I, V))
+    if (Go(D, y))
       return;
-    D(I);
-    const N = I.filter((W) => (!W.unitId || W.unitId === a) && (!W.sheetId || W.sheetId === i)).map((W) => W.range);
+    _(D);
+    const F = D.filter(($) => (!$.unitId || $.unitId === a) && (!$.sheetId || $.sheetId === i)).map(($) => $.range);
     if (f({
       ...m,
-      ranges: N
-    }), N.length === 0)
+      ranges: F
+    }), F.length === 0)
       return;
-    const U = {
+    const B = {
       unitId: a,
       subUnitId: i,
       ruleId: l,
-      ranges: N
+      ranges: F
     };
-    y(Qn.id, U);
-  }), k = (b) => {
-    if (Dn(b, Pn(m)))
+    C(Qn.id, B);
+  }), Y = (P) => {
+    if (Vn(P, Ln(m)))
       return;
     f({
       ...m,
-      ...b
+      ...P
     });
-    const I = {
+    const D = {
       unitId: a,
       subUnitId: i,
       ruleId: l,
-      setting: b
+      setting: P
     };
-    y(
-      yn.id,
-      I,
+    C(
+      Mn.id,
+      D,
       void 0
     );
-  }, K = async () => {
-    await h.executeCommand(eo.id, {
+  }, k = async () => {
+    await p.executeCommand(eo.id, {
       ruleId: l,
       unitId: a,
       subUnitId: i
     }), o.setActiveRule(null);
-  }, H = {
+  }, X = {
     type: m.type,
     operator: m.operator,
     formula1: m.formula1,
     formula2: m.formula2,
     allowBlank: m.allowBlank
-  }, X = (b) => {
-    const I = s.getValidatorItem(b);
-    if (!I)
+  }, q = (P) => {
+    const D = s.getValidatorItem(P);
+    if (!D)
       return;
-    const N = I.operators, U = d.getRuleById(a, i, l), W = b === (U == null ? void 0 : U.type) || b.includes("list") && (U != null && U.type.includes("list")) ? {
-      ...U,
-      type: b
+    const F = D.operators, B = d.getRuleById(a, i, l), $ = P === (B == null ? void 0 : B.type) || P.includes("list") && (B != null && B.type.includes("list")) ? {
+      ...B,
+      type: P
     } : {
       ...m,
-      type: b,
-      operator: N[0],
+      type: P,
+      operator: F[0],
       formula1: void 0,
       formula2: void 0
     };
-    f(W), h.executeCommand(yn.id, {
+    f($), p.executeCommand(Mn.id, {
       unitId: a,
       subUnitId: i,
       ruleId: m.uid,
-      setting: Pn(W)
+      setting: Ln($)
     });
-  }, J = c.get(C.formulaInput), ae = Te(() => V.map((b) => po(b.range)).join(","), []), re = On(m), Q = (b) => {
-    Dn(b, On(m)) || (f({
+  }, ee = u.get(R.formulaInput), te = Te(() => y.map((P) => po(P.range)).join(","), []), re = Pn(m), ae = (P) => {
+    Vn(P, Pn(m)) || (f({
       ...m,
-      ...b
-    }), y(
+      ...P
+    }), C(
       ga.id,
       {
         unitId: a,
         subUnitId: i,
         ruleId: l,
-        options: b
+        options: P
       }
     ));
   };
-  return mn((b) => {
-    var N;
-    const I = (N = T.current) == null ? void 0 : N.handleOutClick;
-    I && I(b, () => A(!1));
-  }), /* @__PURE__ */ p.jsxs("div", { className: $e.dataValidationDetail, children: [
-    /* @__PURE__ */ p.jsx(
-      Z,
+  return fn((P) => {
+    var F;
+    const D = (F = T.current) == null ? void 0 : F.handleOutClick;
+    D && D(P, () => A(!1));
+  }), /* @__PURE__ */ h.jsxs("div", { className: Be.dataValidationDetail, children: [
+    /* @__PURE__ */ h.jsx(
+      G,
       {
-        label: g.t("dataValidation.panel.range"),
-        error: !m.ranges.length || _ ? g.t("dataValidation.panel.rangeError") : "",
-        children: /* @__PURE__ */ p.jsx(
+        label: S.t("dataValidation.panel.range"),
+        error: !m.ranges.length || g ? S.t("dataValidation.panel.rangeError") : "",
+        children: /* @__PURE__ */ h.jsx(
           Ya,
           {
             unitId: a,
             subUnitId: i,
-            initValue: ae,
-            onChange: B,
+            initValue: te,
+            onChange: W,
             onFocus: () => A(!0),
-            isFocus: $,
+            isFocus: N,
             actions: T.current,
-            onVerify: (b) => R(!b)
+            onVerify: (P) => V(!P)
           }
         )
       }
     ),
-    /* @__PURE__ */ p.jsx(Z, { label: g.t("dataValidation.panel.type"), children: /* @__PURE__ */ p.jsx(
-      qt,
+    /* @__PURE__ */ h.jsx(G, { label: S.t("dataValidation.panel.type"), children: /* @__PURE__ */ h.jsx(
+      Jt,
       {
-        options: v == null ? void 0 : v.map((b) => ({
-          label: g.t(b.title),
-          value: b.id
+        options: I == null ? void 0 : I.map((P) => ({
+          label: S.t(P.title),
+          value: P.id
         })),
         value: m.type,
-        onChange: X,
-        className: $e.dataValidationDetailFormItem
+        onChange: q,
+        className: Be.dataValidationDetailFormItem
       }
     ) }),
-    O != null && O.length ? /* @__PURE__ */ p.jsx(Z, { label: g.t("dataValidation.panel.operator"), children: /* @__PURE__ */ p.jsx(
-      qt,
+    O != null && O.length ? /* @__PURE__ */ h.jsx(G, { label: S.t("dataValidation.panel.operator"), children: /* @__PURE__ */ h.jsx(
+      Jt,
       {
-        options: O.map((b, I) => ({
-          value: `${b}`,
-          label: x[I]
+        options: O.map((P, D) => ({
+          value: `${P}`,
+          label: x[D]
         })),
         value: `${m.operator}`,
-        onChange: (b) => {
-          k({
-            ...H,
-            operator: b
+        onChange: (P) => {
+          Y({
+            ...X,
+            operator: P
           });
         },
-        className: $e.dataValidationDetailFormItem
+        className: Be.dataValidationDetailFormItem
       }
     ) }) : null,
-    J ? /* @__PURE__ */ p.jsx(
-      J,
+    ee ? /* @__PURE__ */ h.jsx(
+      ee,
       {
         isTwoFormula: j,
         value: {
           formula1: m.formula1,
           formula2: m.formula2
         },
-        onChange: (b) => {
-          k({
-            ...H,
-            ...b
+        onChange: (P) => {
+          Y({
+            ...X,
+            ...P
           });
         },
-        showError: S,
-        validResult: C.validatorFormula(m, a, i),
+        showError: v,
+        validResult: R.validatorFormula(m, a, i),
         unitId: a,
         subUnitId: i,
         ruleId: l
       },
       e + m.type
     ) : null,
-    /* @__PURE__ */ p.jsx(Z, { children: /* @__PURE__ */ p.jsx(
-      yt,
+    /* @__PURE__ */ h.jsx(G, { children: /* @__PURE__ */ h.jsx(
+      Mt,
       {
-        checked: (ne = m.allowBlank) != null ? ne : !0,
+        checked: (se = m.allowBlank) != null ? se : !0,
         onChange: () => {
-          var b;
-          return k({
-            ...H,
-            allowBlank: !((b = m.allowBlank) == null || b)
+          var P;
+          return Y({
+            ...X,
+            allowBlank: !((P = m.allowBlank) == null || P)
           });
         },
-        children: g.t("dataValidation.panel.allowBlank")
+        children: S.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ p.jsx(ji, { value: re, onChange: Q, extraComponent: C.optionsInput }),
-    /* @__PURE__ */ p.jsxs("div", { className: $e.dataValidationDetailButtons, children: [
-      /* @__PURE__ */ p.jsx(je, { className: $e.dataValidationDetailButton, onClick: K, children: g.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ p.jsx(je, { className: $e.dataValidationDetailButton, type: "primary", onClick: F, children: g.t("dataValidation.panel.done") })
+    /* @__PURE__ */ h.jsx(ji, { value: re, onChange: ae, extraComponent: R.optionsInput }),
+    /* @__PURE__ */ h.jsxs("div", { className: Be.dataValidationDetailButtons, children: [
+      /* @__PURE__ */ h.jsx(je, { className: Be.dataValidationDetailButton, onClick: k, children: S.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ h.jsx(je, { className: Be.dataValidationDetailButton, type: "primary", onClick: U, children: S.t("dataValidation.panel.done") })
     ] })
   ] });
 }
-const Hi = "univer-data-validation-item-container", Yi = "univer-data-validation-item-title", Xi = "univer-data-validation-item-content", zi = "univer-data-validation-item-icon", st = {
+const Hi = "univer-data-validation-item-container", Yi = "univer-data-validation-item-title", Xi = "univer-data-validation-item-content", zi = "univer-data-validation-item-icon", lt = {
   dataValidationItemContainer: Hi,
   dataValidationItemTitle: Yi,
   dataValidationItemContent: Xi,
   dataValidationItemIcon: zi
 }, Ki = (e) => {
-  const { rule: t, onClick: o, unitId: n, subUnitId: a, disable: i } = e, r = P(ye), l = P(te), s = P(Va), u = r.getValidatorItem(t.type), c = ke(), [h, d] = Y(!1), g = (m) => {
+  const { rule: t, onClick: o, unitId: n, subUnitId: a, disable: i } = e, r = L(ye), l = L(Q), s = L(Va), c = r.getValidatorItem(t.type), u = We(), [p, d] = H(!1), S = (m) => {
     l.executeCommand(eo.id, {
       ruleId: t.uid,
       unitId: n,
       subUnitId: a
     }), m.stopPropagation();
   };
-  return Se(() => () => {
+  return Ce(() => () => {
     var m;
-    c.current && ((m = c.current) == null || m.forEach((f) => {
+    u.current && ((m = u.current) == null || m.forEach((f) => {
       f && s.removeShape(f);
     }));
-  }, [s]), /* @__PURE__ */ p.jsxs(
+  }, [s]), /* @__PURE__ */ h.jsxs(
     "div",
     {
-      className: st.dataValidationItemContainer,
+      className: lt.dataValidationItemContainer,
       onClick: o,
       onMouseEnter: () => {
-        i || (d(!0), c.current = t.ranges.map((m) => s.addShape({
+        i || (d(!0), u.current = t.ranges.map((m) => s.addShape({
           range: m,
           style: {
             // hasAutoFill: false,
@@ -988,104 +997,104 @@ const Hi = "univer-data-validation-item-container", Yi = "univer-data-validation
       },
       onMouseLeave: () => {
         var m;
-        d(!1), (m = c.current) == null || m.forEach((f) => {
+        d(!1), (m = u.current) == null || m.forEach((f) => {
           f && s.removeShape(f);
-        }), c.current = void 0;
+        }), u.current = void 0;
       },
       children: [
-        /* @__PURE__ */ p.jsx("div", { className: st.dataValidationItemTitle, children: u == null ? void 0 : u.generateRuleName(t) }),
-        /* @__PURE__ */ p.jsx("div", { className: st.dataValidationItemContent, children: t.ranges.map((m) => po(m)).join(",") }),
-        h ? /* @__PURE__ */ p.jsx("div", { className: st.dataValidationItemIcon, onClick: g, children: /* @__PURE__ */ p.jsx(_n, {}) }) : null
+        /* @__PURE__ */ h.jsx("div", { className: lt.dataValidationItemTitle, children: c == null ? void 0 : c.generateRuleName(t) }),
+        /* @__PURE__ */ h.jsx("div", { className: lt.dataValidationItemContent, children: t.ranges.map((m) => po(m)).join(",") }),
+        p ? /* @__PURE__ */ h.jsx("div", { className: lt.dataValidationItemIcon, onClick: S, children: /* @__PURE__ */ h.jsx(Sn, {}) }) : null
       ]
     }
   );
-}, Gi = "univer-data-validation-list", Zi = "univer-data-validation-list-buttons", qi = "univer-data-validation-list-button", lt = {
+}, Gi = "univer-data-validation-list", Zi = "univer-data-validation-list-buttons", qi = "univer-data-validation-list-button", dt = {
   dataValidationList: Gi,
   dataValidationListButtons: Zi,
   dataValidationListButton: qi
 };
 function Ji() {
-  const e = P(fe), t = Ne(
+  const e = L(ge), t = Ne(
     () => e.getCurrentTypeOfUnit$(z.UNIVER_SHEET),
     void 0,
     void 0,
     []
   );
-  return t ? /* @__PURE__ */ p.jsx(Qi, { workbook: t }) : null;
+  return t ? /* @__PURE__ */ h.jsx(Qi, { workbook: t }) : null;
 }
 function Qi(e) {
-  const t = P(Ve), o = P(fe), n = P(te), a = P(Fe), i = P(pe), r = P(ee), [l, s] = Y([]), { workbook: u } = e, c = Ne(u.activeSheet$, void 0, !0), h = u.getUnitId(), d = c == null ? void 0 : c.getSheetId();
-  Se(() => {
-    s(t.getRules(h, d));
-    const w = t.ruleChange$.subscribe((v) => {
-      v.unitId === h && v.subUnitId === d && s(t.getRules(h, d));
+  const t = L(oe), o = L(ge), n = L(Q), a = L(Fe), i = L(me), r = L(J), [l, s] = H([]), { workbook: c } = e, u = Ne(c.activeSheet$, void 0, !0), p = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
+  Ce(() => {
+    s(t.getRules(p, d));
+    const w = t.ruleChange$.subscribe((I) => {
+      I.unitId === p && I.subUnitId === d && s(t.getRules(p, d));
     });
     return () => {
       w.unsubscribe();
     };
-  }, [h, d, t]);
-  const g = async () => {
-    const w = to(a), v = {
-      unitId: h,
+  }, [p, d, t]);
+  const S = async () => {
+    const w = to(a), I = {
+      unitId: p,
       subUnitId: d,
       rule: w
     };
-    await n.executeCommand(pn.id, v), i.setActiveRule({
-      unitId: h,
+    await n.executeCommand(mn.id, I), i.setActiveRule({
+      unitId: p,
       subUnitId: d,
       rule: w
     });
   }, m = () => {
     n.executeCommand(va.id, {
-      unitId: h,
+      unitId: p,
       subUnitId: d
     });
-  }, C = ((w) => {
-    const v = o.getCurrentUnitForType(z.UNIVER_SHEET), V = v.getActiveSheet(), D = v.getUnitId(), y = V.getSheetId();
-    return w.map((R) => ma(a, D, y, R.ranges) ? { ...R } : { ...R, disable: !0 });
-  })(l), S = C == null ? void 0 : C.some((w) => w.disable);
-  return /* @__PURE__ */ p.jsxs("div", { className: lt.dataValidationList, children: [
-    C == null ? void 0 : C.map((w) => {
-      var v;
-      return /* @__PURE__ */ p.jsx(
+  }, R = ((w) => {
+    const I = o.getCurrentUnitForType(z.UNIVER_SHEET), y = I.getActiveSheet(), _ = I.getUnitId(), C = y.getSheetId();
+    return w.map((V) => ma(a, _, C, V.ranges) ? { ...V } : { ...V, disable: !0 });
+  })(l), v = R == null ? void 0 : R.some((w) => w.disable);
+  return /* @__PURE__ */ h.jsxs("div", { className: dt.dataValidationList, children: [
+    R == null ? void 0 : R.map((w) => {
+      var I;
+      return /* @__PURE__ */ h.jsx(
         Ki,
         {
-          unitId: h,
+          unitId: p,
           subUnitId: d,
           onClick: () => {
             w.disable || i.setActiveRule({
-              unitId: h,
+              unitId: p,
               subUnitId: d,
               rule: w
             });
           },
           rule: w,
-          disable: (v = w.disable) != null ? v : !1
+          disable: (I = w.disable) != null ? I : !1
         },
         w.uid
       );
     }),
-    /* @__PURE__ */ p.jsxs("div", { className: lt.dataValidationListButtons, children: [
-      l.length && !S ? /* @__PURE__ */ p.jsx(je, { className: lt.dataValidationListButton, onClick: m, children: r.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ p.jsx(je, { className: lt.dataValidationListButton, type: "primary", onClick: g, children: r.t("dataValidation.panel.add") })
+    /* @__PURE__ */ h.jsxs("div", { className: dt.dataValidationListButtons, children: [
+      l.length && !v ? /* @__PURE__ */ h.jsx(je, { className: dt.dataValidationListButton, onClick: m, children: r.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ h.jsx(je, { className: dt.dataValidationListButton, type: "primary", onClick: S, children: r.t("dataValidation.panel.add") })
     ] })
   ] });
 }
 const er = () => {
-  const e = P(pe), t = Ne(e.activeRule$, e.activeRule);
-  return t ? /* @__PURE__ */ p.jsx(Wi, {}, t.rule.uid) : /* @__PURE__ */ p.jsx(Ji, {});
-}, In = "data-validation.list.dropdown", Eo = "data-validation.date.dropdown", Pt = {
-  type: Ze.COMMAND,
+  const e = L(me), t = Ne(e.activeRule$, e.activeRule);
+  return t ? /* @__PURE__ */ h.jsx(Wi, {}, t.rule.uid) : /* @__PURE__ */ h.jsx(Ji, {});
+}, Rn = "data-validation.list.dropdown", bo = "data-validation.date.dropdown", Lt = {
+  type: qe.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   handler(e) {
-    const t = e.get(fe), o = Kn(t);
+    const t = e.get(ge), o = Kn(t);
     if (!o) return !1;
-    const { workbook: n, worksheet: a } = o, i = to(e), r = e.get(te), l = n.getUnitId(), s = a.getSheetId(), u = {
+    const { workbook: n, worksheet: a } = o, i = to(e), r = e.get(Q), l = n.getUnitId(), s = a.getSheetId(), c = {
       rule: i,
       unitId: l,
       subUnitId: s
     };
-    return r.syncExecuteCommand(pn.id, u) ? (r.syncExecuteCommand(Ue.id, {
+    return r.syncExecuteCommand(mn.id, c) ? (r.syncExecuteCommand(Ue.id, {
       ruleId: i.uid,
       isAdd: !0
     }), !0) : !1;
@@ -1095,152 +1104,153 @@ var tr = Object.defineProperty, nr = Object.getOwnPropertyDescriptor, or = (e, t
   for (var a = n > 1 ? void 0 : n ? nr(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && tr(t, o, a), a;
-}, tt = (e, t) => (o, n) => t(o, n, e);
-const dt = "SHEET_DATA_VALIDATION_ALERT";
-let it = class extends Re {
-  constructor(e, t, o, n, a) {
-    super(), this._hoverManagerService = e, this._cellAlertManagerService = t, this._univerInstanceService = o, this._localeService = n, this._zenZoneService = a, this._init();
+}, $e = (e, t) => (o, n) => t(o, n, e);
+const ct = "SHEET_DATA_VALIDATION_ALERT";
+let rt = class extends De {
+  constructor(e, t, o, n, a, i) {
+    super(), this._hoverManagerService = e, this._cellAlertManagerService = t, this._univerInstanceService = o, this._localeService = n, this._zenZoneService = a, this._dataValidationModel = i, this._init();
   }
   _init() {
     this._initCellAlertPopup(), this._initZenService();
   }
   _initCellAlertPopup() {
-    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(vn(100)).subscribe((e) => {
-      var t, o;
+    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(_n(100)).subscribe((e) => {
+      var t;
       if (e) {
-        const a = this._univerInstanceService.getCurrentUnitForType(z.UNIVER_SHEET).getActiveSheet();
+        if (!this._univerInstanceService.getCurrentUnitForType(z.UNIVER_SHEET).getActiveSheet()) return;
+        const a = this._dataValidationModel.getRuleByLocation(e.location.unitId, e.location.subUnitId, e.location.row, e.location.col);
         if (!a) return;
-        const i = a.getCell(e.location.row, e.location.col);
-        if (((t = i == null ? void 0 : i.dataValidation) == null ? void 0 : t.validStatus) === ot.INVALID) {
-          const r = this._cellAlertManagerService.currentAlert.get(dt), l = (o = r == null ? void 0 : r.alert) == null ? void 0 : o.location;
+        if (this._dataValidationModel.validator(a, e.location) === at.INVALID) {
+          const r = this._cellAlertManagerService.currentAlert.get(ct), l = (t = r == null ? void 0 : r.alert) == null ? void 0 : t.location;
           if (l && l.row === e.location.row && l.col === e.location.col && l.subUnitId === e.location.subUnitId && l.unitId === e.location.unitId)
             return;
-          const s = i.dataValidation.validator, u = i.dataValidation.rule;
+          const s = this._dataValidationModel.getValidator(a.type);
           if (!s)
             return;
           this._cellAlertManagerService.showAlert({
-            type: Ea.ERROR,
+            type: ba.ERROR,
             title: this._localeService.t("dataValidation.error.title"),
-            message: s == null ? void 0 : s.getRuleFinalError(u, e.location),
+            message: s == null ? void 0 : s.getRuleFinalError(a, e.location),
             location: e.location,
             width: 200,
             height: 74,
-            key: dt
+            key: ct
           });
           return;
         }
       }
-      this._cellAlertManagerService.removeAlert(dt);
+      this._cellAlertManagerService.removeAlert(ct);
     }));
   }
   _initZenService() {
     this.disposeWithMe(this._zenZoneService.visible$.subscribe((e) => {
-      e && this._cellAlertManagerService.removeAlert(dt);
+      e && this._cellAlertManagerService.removeAlert(ct);
     }));
   }
 };
-it = or([
-  tt(0, L(ya)),
-  tt(1, L(ba)),
-  tt(2, fe),
-  tt(3, L(ee)),
-  tt(4, co)
-], it);
+rt = or([
+  $e(0, b(ya)),
+  $e(1, b(Ma)),
+  $e(2, ge),
+  $e(3, b(J)),
+  $e(4, co),
+  $e(5, b(oe))
+], rt);
 var ar = Object.defineProperty, ir = Object.getOwnPropertyDescriptor, rr = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? ir(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && ar(t, o, a), a;
-}, jt = (e, t) => (o, n) => t(o, n, e);
-let Ye = class extends Re {
+}, Ft = (e, t) => (o, n) => t(o, n, e);
+let Xe = class extends De {
   constructor(e, t, o) {
     super(), this._autoFillService = e, this._dataValidationModel = t, this._injector = o, this._initAutoFill();
   }
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const e = () => ({ redos: [], undos: [] }), t = (a, i) => {
-      const { source: r, target: l, unitId: s, subUnitId: u } = a, c = this._dataValidationModel.getRuleObjectMatrix(s, u).clone(), h = tn([r, l]), [d, g] = h.ranges, { mapFunc: m } = h, f = {
+      const { source: r, target: l, unitId: s, subUnitId: c } = a, u = this._dataValidationModel.getRuleObjectMatrix(s, c).clone(), p = nn([r, l]), [d, S] = p.ranges, { mapFunc: m } = p, f = {
         row: d.startRow,
         col: d.startColumn
-      }, C = Oa(d, g), S = new gt(), w = /* @__PURE__ */ new Set();
-      C.forEach((_) => {
-        const R = _.repeatStartCell, T = _.relativeRange, $ = {
+      }, R = Oa(d, S), v = new vt(), w = /* @__PURE__ */ new Set();
+      R.forEach((g) => {
+        const V = g.repeatStartCell, T = g.relativeRange, N = {
           startRow: f.row,
           startColumn: f.col,
           endColumn: f.col,
           endRow: f.row
         }, A = {
-          startRow: R.row,
-          startColumn: R.col,
-          endColumn: R.col,
-          endRow: R.row
+          startRow: V.row,
+          startColumn: V.col,
+          endColumn: V.col,
+          endRow: V.row
         };
-        qo.foreach(T, (M, O) => {
-          const x = vt.getPositionRange(
+        qo.foreach(T, (E, O) => {
+          const x = _t.getPositionRange(
             {
-              startRow: M,
+              startRow: E,
               startColumn: O,
               endColumn: O,
-              endRow: M
+              endRow: E
             },
-            $
-          ), { row: j, col: F } = m(x.startRow, x.startColumn), B = this._dataValidationModel.getRuleIdByLocation(s, u, j, F);
-          if (B) {
-            const k = vt.getPositionRange(
+            N
+          ), { row: j, col: U } = m(x.startRow, x.startColumn), W = this._dataValidationModel.getRuleIdByLocation(s, c, j, U);
+          if (W) {
+            const Y = _t.getPositionRange(
               {
-                startRow: M,
+                startRow: E,
                 startColumn: O,
                 endColumn: O,
-                endRow: M
+                endRow: E
               },
               A
-            ), { row: K, col: H } = m(k.startRow, k.startColumn);
-            S.setValue(K, H, B), w.add(B);
+            ), { row: k, col: X } = m(Y.startRow, Y.startColumn);
+            v.setValue(k, X, W), w.add(W);
           }
         });
       });
-      const v = Array.from(w).map((_) => ({ id: _, ranges: Gt(S, (R) => R === _) }));
-      c.addRangeRules(v);
-      const V = c.diff(this._dataValidationModel.getRules(s, u)), { redoMutations: D, undoMutations: y } = en(s, u, V, this._injector, "patched", i === Qe.ONLY_FORMAT);
+      const I = Array.from(w).map((g) => ({ id: g, ranges: Zt(v, (V) => V === g) }));
+      u.addRangeRules(I);
+      const y = u.diff(this._dataValidationModel.getRules(s, c)), { redoMutations: _, undoMutations: C } = tn(s, c, y, this._injector, "patched", i === et.ONLY_FORMAT);
       return {
-        undos: y,
-        redos: D
+        undos: C,
+        redos: _
       };
     }, o = [
-      q.CHECKBOX
+      Z.CHECKBOX
     ], n = {
       id: no,
       onBeforeFillData: (a) => {
         const { source: i, unitId: r, subUnitId: l } = a;
         for (const s of i.rows)
-          for (const u of i.cols) {
-            const c = this._dataValidationModel.getRuleByLocation(r, l, s, u);
-            if (c && o.indexOf(c.type) > -1) {
-              this._autoFillService.setDisableApplyType(Qe.SERIES, !0);
+          for (const c of i.cols) {
+            const u = this._dataValidationModel.getRuleByLocation(r, l, s, c);
+            if (u && o.indexOf(u.type) > -1) {
+              this._autoFillService.setDisableApplyType(et.SERIES, !0);
               return;
             }
           }
       },
-      onFillData: (a, i, r) => r === Qe.COPY || r === Qe.ONLY_FORMAT || r === Qe.SERIES ? t(a, r) : e(),
+      onFillData: (a, i, r) => r === et.COPY || r === et.ONLY_FORMAT || r === et.SERIES ? t(a, r) : e(),
       onAfterFillData: () => {
       }
     };
     this.disposeWithMe(this._autoFillService.addHook(n));
   }
 };
-Ye = rr([
-  jt(0, Ma),
-  jt(1, L(Ve)),
-  jt(2, L(Fe))
-], Ye);
+Xe = rr([
+  Ft(0, Ea),
+  Ft(1, b(oe)),
+  Ft(2, b(Fe))
+], Xe);
 var sr = Object.defineProperty, lr = Object.getOwnPropertyDescriptor, dr = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? lr(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && sr(t, o, a), a;
-}, Ft = (e, t) => (o, n) => t(o, n, e);
-let Xe = class extends Re {
+}, Nt = (e, t) => (o, n) => t(o, n, e);
+let ze = class extends De {
   constructor(t, o, n) {
     super();
-    E(this, "_copyInfo");
+    M(this, "_copyInfo");
     this._sheetClipboardService = t, this._sheetDataValidationModel = o, this._injector = n, this._initCopyPaste();
   }
   _initCopyPaste() {
@@ -1248,13 +1258,13 @@ let Xe = class extends Re {
       id: no,
       onBeforeCopy: (t, o, n) => this._collect(t, o, n),
       onPasteCells: (t, o, n, a) => {
-        const { copyType: i = En.COPY, pasteType: r } = a, { range: l } = t || {}, { range: s, unitId: u, subUnitId: c } = o;
-        return this._generateMutations(s, { copyType: i, pasteType: r, copyRange: l, unitId: u, subUnitId: c });
+        const { copyType: i = En.COPY, pasteType: r } = a, { range: l } = t || {}, { range: s, unitId: c, subUnitId: u } = o;
+        return this._generateMutations(s, { copyType: i, pasteType: r, copyRange: l, unitId: c, subUnitId: u });
       }
     });
   }
   _collect(t, o, n) {
-    const a = new gt();
+    const a = new vt();
     this._copyInfo = {
       unitId: t,
       subUnitId: o,
@@ -1264,10 +1274,10 @@ let Xe = class extends Re {
     if (!i)
       return;
     const { rows: r, cols: l } = i;
-    r.forEach((s, u) => {
-      l.forEach((c, h) => {
-        const d = this._sheetDataValidationModel.getRuleIdByLocation(t, o, s, c);
-        a.setValue(u, h, d != null ? d : "");
+    r.forEach((s, c) => {
+      l.forEach((u, p) => {
+        const d = this._sheetDataValidationModel.getRuleIdByLocation(t, o, s, u);
+        a.setValue(c, p, d != null ? d : "");
       });
     });
   }
@@ -1280,37 +1290,37 @@ let Xe = class extends Re {
     if (!this._copyInfo || !this._copyInfo.matrix.getSizeOf() || !o.copyRange)
       return { redos: [], undos: [] };
     if ([
-      rt.SPECIAL_PASTE_COL_WIDTH,
-      rt.SPECIAL_PASTE_VALUE,
-      rt.SPECIAL_PASTE_FORMAT,
-      rt.SPECIAL_PASTE_FORMULA
+      st.SPECIAL_PASTE_COL_WIDTH,
+      st.SPECIAL_PASTE_VALUE,
+      st.SPECIAL_PASTE_FORMAT,
+      st.SPECIAL_PASTE_FORMULA
     ].includes(
       o.pasteType
     ))
       return { redos: [], undos: [] };
     const { unitId: n, subUnitId: a } = this._copyInfo;
     if (o.unitId !== n || a !== o.subUnitId) {
-      const i = this._sheetDataValidationModel.getRuleObjectMatrix(o.unitId, o.subUnitId).clone(), r = new gt(), l = /* @__PURE__ */ new Set(), { ranges: [s, u], mapFunc: c } = tn([o.copyRange, t]), h = Mn(s, u, !0), d = /* @__PURE__ */ new Map();
-      h.forEach(({ startRange: C }) => {
-        var S;
-        (S = this._copyInfo) == null || S.matrix.forValue((w, v, V) => {
-          const D = vt.getPositionRange(
+      const i = this._sheetDataValidationModel.getRuleObjectMatrix(o.unitId, o.subUnitId).clone(), r = new vt(), l = /* @__PURE__ */ new Set(), { ranges: [s, c], mapFunc: u } = nn([o.copyRange, t]), p = On(s, c, !0), d = /* @__PURE__ */ new Map();
+      p.forEach(({ startRange: R }) => {
+        var v;
+        (v = this._copyInfo) == null || v.matrix.forValue((w, I, y) => {
+          const _ = _t.getPositionRange(
             {
               startRow: w,
               endRow: w,
-              startColumn: v,
-              endColumn: v
+              startColumn: I,
+              endColumn: I
             },
-            C
-          ), y = `${a}-${V}`, _ = this._sheetDataValidationModel.getRuleById(n, a, V);
-          !this._sheetDataValidationModel.getRuleById(o.unitId, o.subUnitId, y) && _ && d.set(y, { ..._, uid: y });
-          const { row: R, col: T } = c(D.startRow, D.startColumn);
-          l.add(y), r.setValue(R, T, y);
+            R
+          ), C = `${a}-${y}`, g = this._sheetDataValidationModel.getRuleById(n, a, y);
+          !this._sheetDataValidationModel.getRuleById(o.unitId, o.subUnitId, C) && g && d.set(C, { ...g, uid: C });
+          const { row: V, col: T } = u(_.startRow, _.startColumn);
+          l.add(C), r.setValue(V, T, C);
         });
       });
-      const g = Array.from(l).map((C) => ({ id: C, ranges: Gt(r, (S) => S === C) }));
-      i.addRangeRules(g);
-      const { redoMutations: m, undoMutations: f } = en(
+      const S = Array.from(l).map((R) => ({ id: R, ranges: Zt(r, (v) => v === R) }));
+      i.addRangeRules(S);
+      const { redoMutations: m, undoMutations: f } = tn(
         o.unitId,
         o.subUnitId,
         i.diffWithAddition(this._sheetDataValidationModel.getRules(o.unitId, o.subUnitId), d.values()),
@@ -1323,25 +1333,25 @@ let Xe = class extends Re {
         undos: f
       };
     } else {
-      const i = this._sheetDataValidationModel.getRuleObjectMatrix(n, a).clone(), r = new gt(), l = /* @__PURE__ */ new Set(), { ranges: [s, u], mapFunc: c } = tn([o.copyRange, t]);
-      Mn(s, u, !0).forEach(({ startRange: f }) => {
-        var C;
-        (C = this._copyInfo) == null || C.matrix.forValue((S, w, v) => {
-          const V = vt.getPositionRange(
+      const i = this._sheetDataValidationModel.getRuleObjectMatrix(n, a).clone(), r = new vt(), l = /* @__PURE__ */ new Set(), { ranges: [s, c], mapFunc: u } = nn([o.copyRange, t]);
+      On(s, c, !0).forEach(({ startRange: f }) => {
+        var R;
+        (R = this._copyInfo) == null || R.matrix.forValue((v, w, I) => {
+          const y = _t.getPositionRange(
             {
-              startRow: S,
-              endRow: S,
+              startRow: v,
+              endRow: v,
               startColumn: w,
               endColumn: w
             },
             f
-          ), { row: D, col: y } = c(V.startRow, V.startColumn);
-          r.setValue(D, y, v), l.add(v);
+          ), { row: _, col: C } = u(y.startRow, y.startColumn);
+          r.setValue(_, C, I), l.add(I);
         });
       });
-      const d = Array.from(l).map((f) => ({ id: f, ranges: Gt(r, (C) => C === f) }));
+      const d = Array.from(l).map((f) => ({ id: f, ranges: Zt(r, (R) => R === f) }));
       i.addRangeRules(d);
-      const { redoMutations: g, undoMutations: m } = en(
+      const { redoMutations: S, undoMutations: m } = tn(
         n,
         a,
         i.diff(this._sheetDataValidationModel.getRules(n, a)),
@@ -1350,70 +1360,70 @@ let Xe = class extends Re {
         !1
       );
       return {
-        redos: g,
+        redos: S,
         undos: m
       };
     }
   }
 };
-Xe = dr([
-  Ft(0, La),
-  Ft(1, L(Ve)),
-  Ft(2, L(Fe))
-], Xe);
+ze = dr([
+  Nt(0, La),
+  Nt(1, b(oe)),
+  Nt(2, b(Fe))
+], ze);
 var cr = Object.defineProperty, ur = Object.getOwnPropertyDescriptor, hr = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? ur(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && cr(t, o, a), a;
-}, Nt = (e, t) => (o, n) => t(o, n, e);
-let ze = class extends Re {
+}, Ut = (e, t) => (o, n) => t(o, n, e);
+let Ke = class extends De {
   constructor(e, t, o) {
     super(), this._localeService = e, this._commandService = t, this._sheetPermissionInterceptorBaseController = o, this._commandExecutedListener();
   }
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((e) => {
-        e.id === pn.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-          workbookTypes: [_t],
-          rangeTypes: [St],
-          worksheetTypes: [Ct, Qt]
+        e.id === mn.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+          workbookTypes: [St],
+          rangeTypes: [Ct],
+          worksheetTypes: [It, en]
         }) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.setStyleErr"))), e.id === Qn.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-          workbookTypes: [_t],
-          rangeTypes: [St],
-          worksheetTypes: [Ct, Qt]
+          workbookTypes: [St],
+          rangeTypes: [Ct],
+          worksheetTypes: [It, en]
         }, e.params.ranges) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.setStyleErr")));
       })
     );
   }
 };
-ze = hr([
-  Nt(0, L(ee)),
-  Nt(1, te),
-  Nt(2, L(ro))
-], ze);
-const Mo = "data-validation-single", Oo = "sheet.menu.data-validation";
+Ke = hr([
+  Ut(0, b(J)),
+  Ut(1, Q),
+  Ut(2, b(ro))
+], Ke);
+const Eo = "data-validation-single", Oo = "sheet.menu.data-validation";
 function pr(e) {
   return {
     id: Oo,
-    type: fn.SUBITEMS,
-    icon: Mo,
+    type: gn.SUBITEMS,
+    icon: Eo,
     tooltip: "dataValidation.title",
     hidden$: ja(e, z.UNIVER_SHEET),
-    disabled$: Ta(e, { workbookTypes: [_t], worksheetTypes: [Qt, Ct], rangeTypes: [St] })
+    disabled$: Ta(e, { workbookTypes: [St], worksheetTypes: [en, It], rangeTypes: [Ct] })
   };
 }
 function mr(e) {
   return {
     id: Ue.id,
     title: "dataValidation.panel.title",
-    type: fn.BUTTON
+    type: gn.BUTTON
   };
 }
 function fr(e) {
   return {
-    id: Pt.id,
+    id: Lt.id,
     title: "dataValidation.panel.add",
-    type: fn.BUTTON
+    type: gn.BUTTON
   };
 }
 const gr = {
@@ -1425,7 +1435,7 @@ const gr = {
         order: 0,
         menuItemFactory: mr
       },
-      [Pt.id]: {
+      [Lt.id]: {
         order: 1,
         menuItemFactory: fr
       }
@@ -1436,16 +1446,16 @@ var vr = Object.defineProperty, _r = Object.getOwnPropertyDescriptor, Po = (e, t
   for (var a = n > 1 ? void 0 : n ? _r(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && vr(t, o, a), a;
-}, G = (e, t) => (o, n) => t(o, n, e);
+}, K = (e, t) => (o, n) => t(o, n, e);
 const Lo = {
   tr: {
     size: 6,
     color: "#fe4b4b"
   }
 };
-let Ke = class extends dn {
-  constructor(e, t, o, n, a, i, r, l, s, u, c) {
-    super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = o, this._univerInstanceService = n, this._autoHeightController = a, this._dropdownManagerService = i, this._sheetDataValidationModel = r, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = u, this._editorBridgeService = c, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
+let Ge = class extends cn {
+  constructor(e, t, o, n, a, i, r, l, s, c, u) {
+    super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = o, this._univerInstanceService = n, this._autoHeightController = a, this._dropdownManagerService = i, this._sheetDataValidationModel = r, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = c, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
     this._menuManagerService.mergeMenu(gr);
@@ -1465,12 +1475,12 @@ let Ke = class extends dn {
         const s = this._sheetDataValidationModel.getRuleByLocation(n, a, i, r);
         if (!s)
           return;
-        const u = this._dataValidatorRegistryService.getValidatorItem(s.type);
-        if (!(u != null && u.dropdown))
+        const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
+        if (!(c != null && c.dropdown))
           return;
-        const c = l.getActiveSheet();
-        if (!c) return;
-        const h = this._dropdownManagerService.activeDropdown, d = h == null ? void 0 : h.location;
+        const u = l.getActiveSheet();
+        if (!u) return;
+        const p = this._dropdownManagerService.activeDropdown, d = p == null ? void 0 : p.location;
         if (d && d.unitId === n && d.subUnitId === a && d.row === i && d.col === r)
           return;
         this._dropdownManagerService.showDropdown(
@@ -1481,9 +1491,9 @@ let Ke = class extends dn {
               row: i,
               col: r,
               workbook: l,
-              worksheet: c
+              worksheet: u
             },
-            componentKey: u.dropdown,
+            componentKey: c.dropdown,
             onHide: () => {
             },
             trigger: "editor-bridge"
@@ -1504,72 +1514,58 @@ let Ke = class extends dn {
           priority: Zn.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, o) => {
-            var S, w, v, V, D, y;
-            const { row: n, col: a, unitId: i, subUnitId: r, workbook: l, worksheet: s } = t, u = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
-            if (!u)
-              return o(e);
-            const c = this._sheetDataValidationModel.getRuleById(i, r, u);
+            var v, w, I, y, _;
+            const { row: n, col: a, unitId: i, subUnitId: r, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
             if (!c)
               return o(e);
-            const h = (w = (S = this._dataValidationCacheService.getValue(i, r, n, a)) == null ? void 0 : S.status) != null ? w : ot.VALID, d = this._dataValidatorRegistryService.getValidatorItem(c.type), g = t.rawData;
+            const u = this._sheetDataValidationModel.getRuleById(i, r, c);
+            if (!u)
+              return o(e);
+            const p = (v = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? v : at.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), S = t.rawData;
             let m;
             const f = {
               get value() {
-                var _;
-                return m !== void 0 || (m = (_ = ie(g)) != null ? _ : null), m;
+                var C;
+                return m !== void 0 || (m = (C = ie(S)) != null ? C : null), m;
               }
-            }, C = {
+            }, R = {
               get value() {
-                var _;
-                return `${(_ = f.value) != null ? _ : ""}`;
+                var C;
+                return `${(C = f.value) != null ? C : ""}`;
               }
             };
             return o({
               ...e,
-              dataValidation: {
-                ruleId: u,
-                validStatus: h,
-                rule: c,
-                validator: d
-              },
               markers: {
                 ...e == null ? void 0 : e.markers,
-                ...h === ot.INVALID ? Lo : null
+                ...p === at.INVALID ? Lo : null
               },
               customRender: [
-                ...(v = e == null ? void 0 : e.customRender) != null ? v : [],
+                ...(w = e == null ? void 0 : e.customRender) != null ? w : [],
                 ...d != null && d.canvasRender ? [d.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((V = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : V.isSkip) || ((D = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : D.call(d, c, f.value, t))
+                isSkip: ((I = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : I.isSkip) || ((y = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : y.call(d, u, f.value, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(c, C.value, {
+                ...d == null ? void 0 : d.getExtraStyle(u, R.value, {
                   get style() {
-                    const _ = l.getStyles();
-                    return (typeof (e == null ? void 0 : e.s) == "string" ? _.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
+                    const C = l.getStyles();
+                    return (typeof (e == null ? void 0 : e.s) == "string" ? C.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                   }
                 }, n, a)
               },
               interceptorAutoHeight: () => {
-                var $, A, M, O, x, j;
-                const _ = (A = ($ = this._renderManagerService.getRenderById(i)) == null ? void 0 : $.with(wt).getWorksheetSkeleton(r)) == null ? void 0 : A.skeleton;
-                if (!_)
+                var T, N, A, E, O, x;
+                const C = (N = (T = this._renderManagerService.getRenderById(i)) == null ? void 0 : T.with(wt).getWorksheetSkeleton(r)) == null ? void 0 : N.skeleton;
+                if (!C)
                   return;
-                const R = _.worksheet.getMergedCell(n, a), T = {
-                  data: {
-                    ...e,
-                    dataValidation: {
-                      ruleId: u,
-                      validStatus: h,
-                      rule: c,
-                      validator: d
-                    }
-                  },
-                  style: _.getsStyles().getStyleByCell(e),
-                  primaryWithCoord: _.getCellWithCoordByIndex((M = R == null ? void 0 : R.startRow) != null ? M : n, (O = R == null ? void 0 : R.startColumn) != null ? O : a),
+                const g = C.worksheet.getMergedCell(n, a), V = {
+                  data: e,
+                  style: C.getsStyles().getStyleByCell(e),
+                  primaryWithCoord: C.getCellWithCoordByIndex((A = g == null ? void 0 : g.startRow) != null ? A : n, (E = g == null ? void 0 : g.startColumn) != null ? E : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1577,25 +1573,17 @@ let Ke = class extends dn {
                   workbook: l,
                   worksheet: s
                 };
-                return (j = (x = d == null ? void 0 : d.canvasRender) == null ? void 0 : x.calcCellAutoHeight) == null ? void 0 : j.call(x, T);
+                return (x = (O = d == null ? void 0 : d.canvasRender) == null ? void 0 : O.calcCellAutoHeight) == null ? void 0 : x.call(O, V);
               },
               interceptorAutoWidth: () => {
-                var $, A, M, O, x, j;
-                const _ = (A = ($ = this._renderManagerService.getRenderById(i)) == null ? void 0 : $.with(wt).getWorksheetSkeleton(r)) == null ? void 0 : A.skeleton;
-                if (!_)
+                var T, N, A, E, O, x;
+                const C = (N = (T = this._renderManagerService.getRenderById(i)) == null ? void 0 : T.with(wt).getWorksheetSkeleton(r)) == null ? void 0 : N.skeleton;
+                if (!C)
                   return;
-                const R = _.worksheet.getMergedCell(n, a), T = {
-                  data: {
-                    ...e,
-                    dataValidation: {
-                      ruleId: u,
-                      validStatus: h,
-                      rule: c,
-                      validator: d
-                    }
-                  },
-                  style: _.getsStyles().getStyleByCell(e),
-                  primaryWithCoord: _.getCellWithCoordByIndex((M = R == null ? void 0 : R.startRow) != null ? M : n, (O = R == null ? void 0 : R.startColumn) != null ? O : a),
+                const g = C.worksheet.getMergedCell(n, a), V = {
+                  data: e,
+                  style: C.getsStyles().getStyleByCell(e),
+                  primaryWithCoord: C.getCellWithCoordByIndex((A = g == null ? void 0 : g.startRow) != null ? A : n, (E = g == null ? void 0 : g.startColumn) != null ? E : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1603,9 +1591,9 @@ let Ke = class extends dn {
                   workbook: l,
                   worksheet: s
                 };
-                return (j = (x = d == null ? void 0 : d.canvasRender) == null ? void 0 : x.calcCellAutoWidth) == null ? void 0 : j.call(x, T);
+                return (x = (O = d == null ? void 0 : d.canvasRender) == null ? void 0 : O.calcCellAutoWidth) == null ? void 0 : x.call(O, V);
               },
-              coverable: ((y = e == null ? void 0 : e.coverable) != null ? y : !0) && !(c.type === q.LIST || c.type === q.LIST_MULTIPLE)
+              coverable: ((_ = e == null ? void 0 : e.coverable) != null ? _ : !0) && !(u.type === Z.LIST || u.type === Z.LIST_MULTIPLE)
             });
           }
         }
@@ -1616,7 +1604,7 @@ let Ke = class extends dn {
     this._sheetDataValidationModel.ruleChange$.pipe(
       // patched data-validation change don't need to re-calc row height
       // re-calc of row height will be triggered precisely by the origin command
-      gn((e) => e.source === "command"),
+      vn((e) => e.source === "command"),
       ho(16)
     ).subscribe((e) => {
       const t = [];
@@ -1630,24 +1618,23 @@ let Ke = class extends dn {
     });
   }
 };
-Ke = Po([
-  G(0, te),
-  G(1, Na),
-  G(2, De),
-  G(3, fe),
-  G(4, L(so)),
-  G(5, L(Ce)),
-  G(6, L(Ve)),
-  G(7, L(ye)),
-  G(8, L(un)),
-  G(9, L(oo)),
-  G(10, Jo(io))
-], Ke);
-let xn = class extends dn {
+Ge = Po([
+  K(0, Q),
+  K(1, Na),
+  K(2, Ve),
+  K(3, ge),
+  K(4, b(so)),
+  K(5, b(Ie)),
+  K(6, b(oe)),
+  K(7, b(ye)),
+  K(8, b(hn)),
+  K(9, b(oo)),
+  K(10, Jo(io))
+], Ge);
+let jn = class extends cn {
   constructor(e, t, o, n, a, i, r) {
     super(), this._commandService = e, this._renderManagerService = t, this._autoHeightController = o, this._dataValidatorRegistryService = n, this._sheetInterceptorService = a, this._sheetDataValidationModel = i, this._dataValidationCacheService = r, this._initViewModelIntercept(), this._initAutoHeight();
   }
-  // eslint-disable-next-line max-lines-per-function
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
@@ -1658,60 +1645,46 @@ let xn = class extends dn {
           priority: Zn.DATA_VALIDATION,
           // eslint-disable-next-line complexity
           handler: (e, t, o) => {
-            var C, S, w, v, V, D;
-            const { row: n, col: a, unitId: i, subUnitId: r, workbook: l, worksheet: s } = t, u = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
-            if (!u)
-              return o(e);
-            const c = this._sheetDataValidationModel.getRuleById(i, r, u);
+            var R, v, w, I, y;
+            const { row: n, col: a, unitId: i, subUnitId: r, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
             if (!c)
               return o(e);
-            const h = (S = (C = this._dataValidationCacheService.getValue(i, r, n, a)) == null ? void 0 : C.status) != null ? S : ot.VALID, d = this._dataValidatorRegistryService.getValidatorItem(c.type), g = s.getCellRaw(n, a), m = ie(g), f = `${m != null ? m : ""}`;
+            const u = this._sheetDataValidationModel.getRuleById(i, r, c);
+            if (!u)
+              return o(e);
+            const p = (R = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? R : at.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), S = s.getCellRaw(n, a), m = ie(S), f = `${m != null ? m : ""}`;
             return o({
               ...e,
-              dataValidation: {
-                ruleId: u,
-                validStatus: h,
-                rule: c,
-                validator: d
-              },
               markers: {
                 ...e == null ? void 0 : e.markers,
-                ...h === ot.INVALID ? Lo : null
+                ...p === at.INVALID ? Lo : null
               },
               customRender: [
-                ...(w = e == null ? void 0 : e.customRender) != null ? w : [],
+                ...(v = e == null ? void 0 : e.customRender) != null ? v : [],
                 ...d != null && d.canvasRender ? [d.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((v = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : v.isSkip) || ((V = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : V.call(d, c, m, t))
+                isSkip: ((w = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : w.isSkip) || ((I = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : I.call(d, u, m, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(c, f, {
+                ...d == null ? void 0 : d.getExtraStyle(u, f, {
                   get style() {
-                    const y = l.getStyles();
-                    return (typeof (e == null ? void 0 : e.s) == "string" ? y.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
+                    const _ = l.getStyles();
+                    return (typeof (e == null ? void 0 : e.s) == "string" ? _.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                   }
                 }, n, a)
               },
               interceptorAutoHeight: () => {
-                var T, $, A, M, O, x;
-                const y = ($ = (T = this._renderManagerService.getRenderById(i)) == null ? void 0 : T.with(wt).getWorksheetSkeleton(r)) == null ? void 0 : $.skeleton;
-                if (!y)
+                var V, T, N, A, E, O;
+                const _ = (T = (V = this._renderManagerService.getRenderById(i)) == null ? void 0 : V.with(wt).getWorksheetSkeleton(r)) == null ? void 0 : T.skeleton;
+                if (!_)
                   return;
-                const _ = y.worksheet.getMergedCell(n, a), R = {
-                  data: {
-                    ...e,
-                    dataValidation: {
-                      ruleId: u,
-                      validStatus: h,
-                      rule: c,
-                      validator: d
-                    }
-                  },
-                  style: y.getsStyles().getStyleByCell(e),
-                  primaryWithCoord: y.getCellWithCoordByIndex((A = _ == null ? void 0 : _.startRow) != null ? A : n, (M = _ == null ? void 0 : _.startColumn) != null ? M : a),
+                const C = _.worksheet.getMergedCell(n, a), g = {
+                  data: e,
+                  style: _.getsStyles().getStyleByCell(e),
+                  primaryWithCoord: _.getCellWithCoordByIndex((N = C == null ? void 0 : C.startRow) != null ? N : n, (A = C == null ? void 0 : C.startColumn) != null ? A : a),
                   unitId: i,
                   subUnitId: r,
                   row: n,
@@ -1719,9 +1692,9 @@ let xn = class extends dn {
                   workbook: l,
                   worksheet: s
                 };
-                return (x = (O = d == null ? void 0 : d.canvasRender) == null ? void 0 : O.calcCellAutoHeight) == null ? void 0 : x.call(O, R);
+                return (O = (E = d == null ? void 0 : d.canvasRender) == null ? void 0 : E.calcCellAutoHeight) == null ? void 0 : O.call(E, g);
               },
-              coverable: ((D = e == null ? void 0 : e.coverable) != null ? D : !0) && !(c.type === q.LIST || c.type === q.LIST_MULTIPLE)
+              coverable: ((y = e == null ? void 0 : e.coverable) != null ? y : !0) && !(u.type === Z.LIST || u.type === Z.LIST_MULTIPLE)
             });
           }
         }
@@ -1730,7 +1703,7 @@ let xn = class extends dn {
   }
   _initAutoHeight() {
     this._sheetDataValidationModel.ruleChange$.pipe(
-      gn((e) => e.source === "command"),
+      vn((e) => e.source === "command"),
       ho(16)
     ).subscribe((e) => {
       const t = [];
@@ -1744,21 +1717,21 @@ let xn = class extends dn {
     });
   }
 };
-xn = Po([
-  G(0, te),
-  G(1, De),
-  G(2, L(so)),
-  G(3, L(ye)),
-  G(4, L(un)),
-  G(5, L(Ve)),
-  G(6, L(oo))
-], xn);
-var Sr = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, wr = (e, t, o, n) => {
+jn = Po([
+  K(0, Q),
+  K(1, Ve),
+  K(2, b(so)),
+  K(3, b(ye)),
+  K(4, b(hn)),
+  K(5, b(oe)),
+  K(6, b(oo))
+], jn);
+var Sr = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, Ir = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? Cr(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && Sr(t, o, a), a;
-}, jn = (e, t) => (o, n) => t(o, n, e);
-let It = class extends Re {
+}, Fn = (e, t) => (o, n) => t(o, n, e);
+let Rt = class extends De {
   constructor(e, t, o) {
     super(), this._context = e, this._sheetDataValidationModel = t, this._sheetSkeletonManagerService = o, this._initSkeletonChange();
   }
@@ -1778,73 +1751,73 @@ let It = class extends Re {
     this.disposeWithMe(this._sheetDataValidationModel.validStatusChange$.pipe(Qo(16)).subscribe(e));
   }
 };
-It = wr([
-  jn(1, L(Ve)),
-  jn(2, L(wt))
-], It);
-const Ir = "univer-data-validation-formula", Rr = "univer-data-validation-formula-and", Dr = "univer-data-validation-formula-list-item", Vr = "univer-data-validation-formula-list-item-icon", yr = "univer-data-validation-formula-list-item-drag", br = "univer-data-validation-formula-list-add", Er = "univer-data-validation-formula-color-select", Mr = "univer-data-validation-formula-color-select-panel", Or = "univer-data-validation-formula-color-item", oe = {
-  dataValidationFormula: Ir,
+Rt = Ir([
+  Fn(1, b(oe)),
+  Fn(2, b(wt))
+], Rt);
+const wr = "univer-data-validation-formula", Rr = "univer-data-validation-formula-and", Dr = "univer-data-validation-formula-list-item", Vr = "univer-data-validation-formula-list-item-icon", yr = "univer-data-validation-formula-list-item-drag", Mr = "univer-data-validation-formula-list-add", br = "univer-data-validation-formula-color-select", Er = "univer-data-validation-formula-color-select-panel", Or = "univer-data-validation-formula-color-item", ne = {
+  dataValidationFormula: wr,
   dataValidationFormulaAnd: Rr,
   dataValidationFormulaListItem: Dr,
   dataValidationFormulaListItemIcon: Vr,
   dataValidationFormulaListItemDrag: yr,
-  dataValidationFormulaListAdd: br,
-  dataValidationFormulaColorSelect: Er,
-  dataValidationFormulaColorSelectPanel: Mr,
+  dataValidationFormulaListAdd: Mr,
+  dataValidationFormulaColorSelect: br,
+  dataValidationFormulaColorSelectPanel: Er,
   dataValidationFormulaColorItem: Or
 }, Pr = (e) => {
-  const { isTwoFormula: t = !1, value: o, onChange: n, showError: a, validResult: i } = e, r = P(ee), l = a ? i == null ? void 0 : i.formula1 : "", s = a ? i == null ? void 0 : i.formula2 : "";
-  return t ? /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
-    /* @__PURE__ */ p.jsx(Z, { error: l, children: /* @__PURE__ */ p.jsx(
+  const { isTwoFormula: t = !1, value: o, onChange: n, showError: a, validResult: i } = e, r = L(J), l = a ? i == null ? void 0 : i.formula1 : "", s = a ? i == null ? void 0 : i.formula2 : "";
+  return t ? /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
+    /* @__PURE__ */ h.jsx(G, { error: l, children: /* @__PURE__ */ h.jsx(
       xe,
       {
-        className: oe.dataValidationFormula,
+        className: ne.dataValidationFormula,
         placeholder: r.t("dataValidation.panel.formulaPlaceholder"),
         value: o == null ? void 0 : o.formula1,
-        onChange: (u) => {
+        onChange: (c) => {
           n == null || n({
             ...o,
-            formula1: u
+            formula1: c
           });
         }
       }
     ) }),
-    /* @__PURE__ */ p.jsx("div", { className: oe.dataValidationFormulaAnd, children: r.t("dataValidation.panel.formulaAnd") }),
-    /* @__PURE__ */ p.jsx(Z, { error: s, children: /* @__PURE__ */ p.jsx(
+    /* @__PURE__ */ h.jsx("div", { className: ne.dataValidationFormulaAnd, children: r.t("dataValidation.panel.formulaAnd") }),
+    /* @__PURE__ */ h.jsx(G, { error: s, children: /* @__PURE__ */ h.jsx(
       xe,
       {
-        className: oe.dataValidationFormula,
+        className: ne.dataValidationFormula,
         placeholder: r.t("dataValidation.panel.formulaPlaceholder"),
         value: o == null ? void 0 : o.formula2,
-        onChange: (u) => {
+        onChange: (c) => {
           n == null || n({
             ...o,
-            formula2: u
+            formula2: c
           });
         }
       }
     ) })
-  ] }) : /* @__PURE__ */ p.jsx(Z, { error: l, children: /* @__PURE__ */ p.jsx(
+  ] }) : /* @__PURE__ */ h.jsx(G, { error: l, children: /* @__PURE__ */ h.jsx(
     xe,
     {
-      className: oe.dataValidationFormula,
+      className: ne.dataValidationFormula,
       placeholder: r.t("dataValidation.panel.formulaPlaceholder"),
       value: o == null ? void 0 : o.formula1,
-      onChange: (u) => {
-        n == null || n({ formula1: u });
+      onChange: (c) => {
+        n == null || n({ formula1: c });
       }
     }
   ) });
 };
 function Lr(e) {
-  const { value: t, onChange: o, showError: n, validResult: a } = e, i = P(ee), r = n ? a == null ? void 0 : a.formula1 : "", l = n ? a == null ? void 0 : a.formula2 : "", [s, u] = Y(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
-  return /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
-    /* @__PURE__ */ p.jsx(Z, { children: /* @__PURE__ */ p.jsx(
-      yt,
+  const { value: t, onChange: o, showError: n, validResult: a } = e, i = L(J), r = n ? a == null ? void 0 : a.formula1 : "", l = n ? a == null ? void 0 : a.formula2 : "", [s, c] = H(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
+  return /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
+    /* @__PURE__ */ h.jsx(G, { children: /* @__PURE__ */ h.jsx(
+      Mt,
       {
         checked: s,
-        onChange: (c) => {
-          c ? u(!0) : (u(!1), o == null || o({
+        onChange: (u) => {
+          u ? c(!0) : (c(!1), o == null || o({
             ...t,
             formula1: void 0,
             formula2: void 0
@@ -1853,30 +1826,30 @@ function Lr(e) {
         children: i.t("dataValidation.checkbox.tips")
       }
     ) }),
-    s ? /* @__PURE__ */ p.jsx(Z, { label: i.t("dataValidation.checkbox.checked"), error: r, children: /* @__PURE__ */ p.jsx(
+    s ? /* @__PURE__ */ h.jsx(G, { label: i.t("dataValidation.checkbox.checked"), error: r, children: /* @__PURE__ */ h.jsx(
       xe,
       {
-        className: oe.dataValidationFormula,
+        className: ne.dataValidationFormula,
         placeholder: i.t("dataValidation.panel.valuePlaceholder"),
         value: t == null ? void 0 : t.formula1,
-        onChange: (c) => {
+        onChange: (u) => {
           o == null || o({
             ...t,
-            formula1: c || void 0
+            formula1: u || void 0
           });
         }
       }
     ) }) : null,
-    s ? /* @__PURE__ */ p.jsx(Z, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ p.jsx(
+    s ? /* @__PURE__ */ h.jsx(G, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ h.jsx(
       xe,
       {
-        className: oe.dataValidationFormula,
+        className: ne.dataValidationFormula,
         placeholder: i.t("dataValidation.panel.valuePlaceholder"),
         value: t == null ? void 0 : t.formula2,
-        onChange: (c) => {
+        onChange: (u) => {
           o == null || o({
             ...t,
-            formula2: c || void 0
+            formula2: u || void 0
           });
         }
       }
@@ -1884,28 +1857,28 @@ function Lr(e) {
   ] });
 }
 function Tr(e) {
-  var h;
-  const { unitId: t, subUnitId: o, value: n, onChange: a, showError: i, validResult: r } = e, l = i ? r == null ? void 0 : r.formula1 : void 0, s = ke({}), [u, c] = Y(!1);
-  return mn((d) => {
+  var p;
+  const { unitId: t, subUnitId: o, value: n, onChange: a, showError: i, validResult: r } = e, l = i ? r == null ? void 0 : r.formula1 : void 0, s = We({}), [c, u] = H(!1);
+  return fn((d) => {
     var m;
-    const g = (m = s.current) == null ? void 0 : m.handleOutClick;
-    g && g(d, () => c(!1));
-  }), /* @__PURE__ */ p.jsx(
+    const S = (m = s.current) == null ? void 0 : m.handleOutClick;
+    S && S(d, () => u(!1));
+  }), /* @__PURE__ */ h.jsx(
     mo,
     {
-      initValue: (h = n == null ? void 0 : n.formula1) != null ? h : "",
+      initValue: (p = n == null ? void 0 : n.formula1) != null ? p : "",
       unitId: t,
       subUnitId: o,
-      isFocus: u,
+      isFocus: c,
       onChange: (d) => {
-        const g = (d != null ? d : "").trim();
-        g !== (n == null ? void 0 : n.formula1) && (a == null || a({
+        const S = (d != null ? d : "").trim();
+        S !== (n == null ? void 0 : n.formula1) && (a == null || a({
           ...n,
-          formula1: g
+          formula1: S
         }));
       },
       errorText: l,
-      onFocus: () => c(!0),
+      onFocus: () => u(!0),
       actions: s.current,
       isSupportAcrossSheet: !0
     }
@@ -1950,33 +1923,33 @@ const xr = [
   "#9E6DE3",
   "#F248A6"
 ], jr = (e) => {
-  const { value: t, onChange: o, disabled: n } = e, [a, i] = Y(!1);
-  return /* @__PURE__ */ p.jsx(
-    qt,
+  const { value: t, onChange: o, disabled: n } = e, [a, i] = H(!1);
+  return /* @__PURE__ */ h.jsx(
+    Jt,
     {
       disabled: n,
       open: a,
       onDropdownVisibleChange: i,
       dropdownStyle: { width: 112 },
       style: { width: 96, cursor: "pointer" },
-      className: oe.dataValidationFormulaColorSelect,
+      className: ne.dataValidationFormulaColorSelect,
       value: t,
       onChange: o,
-      labelRender: (r) => /* @__PURE__ */ p.jsx(
+      labelRender: (r) => /* @__PURE__ */ h.jsx(
         "div",
         {
-          className: oe.dataValidationFormulaColorItem,
+          className: ne.dataValidationFormulaColorItem,
           style: { background: r.value, marginTop: 5 }
         }
       ),
-      dropdownRender: () => /* @__PURE__ */ p.jsx("div", { className: oe.dataValidationFormulaColorSelectPanel, children: xr.map(
-        (r) => /* @__PURE__ */ p.jsx(
+      dropdownRender: () => /* @__PURE__ */ h.jsx("div", { className: ne.dataValidationFormulaColorSelectPanel, children: xr.map(
+        (r) => /* @__PURE__ */ h.jsx(
           "div",
           {
             onClick: () => {
               o(r), i(!1);
             },
-            className: oe.dataValidationFormulaColorItem,
+            className: ne.dataValidationFormulaColorItem,
             style: { background: r }
           },
           r
@@ -1984,11 +1957,11 @@ const xr = [
       ) })
     }
   );
-}, Fn = (e) => {
+}, Nn = (e) => {
   const { item: t, commonProps: o, style: n } = e, { onItemChange: a, onItemDelete: i } = o;
-  return /* @__PURE__ */ p.jsxs("div", { className: oe.dataValidationFormulaListItem, style: n, children: [
-    t.isRef ? null : /* @__PURE__ */ p.jsx("div", { className: Ar(oe.dataValidationFormulaListItemDrag, "draggableHandle"), children: /* @__PURE__ */ p.jsx(Ro, {}) }),
-    /* @__PURE__ */ p.jsx(
+  return /* @__PURE__ */ h.jsxs("div", { className: ne.dataValidationFormulaListItem, style: n, children: [
+    t.isRef ? null : /* @__PURE__ */ h.jsx("div", { className: Ar(ne.dataValidationFormulaListItemDrag, "draggableHandle"), children: /* @__PURE__ */ h.jsx(Ro, {}) }),
+    /* @__PURE__ */ h.jsx(
       jr,
       {
         value: t.color,
@@ -1997,7 +1970,7 @@ const xr = [
         }
       }
     ),
-    /* @__PURE__ */ p.jsx(
+    /* @__PURE__ */ h.jsx(
       xe,
       {
         disabled: t.isRef,
@@ -2007,181 +1980,181 @@ const xr = [
         }
       }
     ),
-    t.isRef ? null : /* @__PURE__ */ p.jsx("div", { className: oe.dataValidationFormulaListItemIcon, children: /* @__PURE__ */ p.jsx(_n, { onClick: () => i(t.id) }) })
+    t.isRef ? null : /* @__PURE__ */ h.jsx("div", { className: ne.dataValidationFormulaListItemIcon, children: /* @__PURE__ */ h.jsx(Sn, { onClick: () => i(t.id) }) })
   ] });
 };
 function Fr(e) {
   const { value: t, onChange: o = () => {
-  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: l } = e, { formula1: s = "", formula2: u = "" } = t || {}, c = ke(null), [h, d] = Y(() => Pe(s) ? "1" : "0"), [g, m] = Y(h === "1" ? s : "="), [f, C] = Y(h === "1" ? s : "="), S = P(ee), w = P(ye), v = P(Et), V = P(_a), [D, y] = Y(() => u.split(",")), _ = w.getValidatorItem(q.LIST), [R, T] = Y([]), [$, A] = Y(""), M = r ? i == null ? void 0 : i.formula1 : "", O = Te(() => v.ruleChange$.pipe(vn(16)), []), x = Ne(O), j = uo(o);
-  Se(() => {
+  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: l } = e, { formula1: s = "", formula2: c = "" } = t || {}, u = We(null), [p, d] = H(() => Pe(s) ? "1" : "0"), [S, m] = H(p === "1" ? s : "="), [f, R] = H(p === "1" ? s : "="), v = L(J), w = L(ye), I = L(Et), y = L(_a), [_, C] = H(() => c.split(",")), g = w.getValidatorItem(Z.LIST), [V, T] = H([]), [N, A] = H(""), E = r ? i == null ? void 0 : i.formula1 : "", O = Te(() => I.ruleChange$.pipe(_n(16)), []), x = Ne(O), j = uo(o);
+  Ce(() => {
     (async () => {
-      await new Promise((U) => {
-        setTimeout(() => U(!0), 100);
+      await new Promise((B) => {
+        setTimeout(() => B(!0), 100);
       });
-      const I = v.getRuleById(n, a, l), N = I == null ? void 0 : I.formula1;
-      if (Pe(N) && _ && I) {
-        const U = await _.getListAsync(I, n, a);
-        T(U);
+      const D = I.getRuleById(n, a, l), F = D == null ? void 0 : D.formula1;
+      if (Pe(F) && g && D) {
+        const B = await g.getListAsync(D, n, a);
+        T(B);
       }
     })();
-  }, [v, x, _, l, a, n]), Se(() => {
-    Pe(s) && s !== f && (m(s), C(f));
+  }, [I, x, g, l, a, n]), Ce(() => {
+    Pe(s) && s !== f && (m(s), R(f));
   }, [f, s]);
-  const [F, B] = Y(() => {
-    const I = h !== "1" ? qn(s) : [], N = u.split(",");
-    return I.map((U, W) => ({
-      label: U,
-      color: N[W] || Le,
+  const [U, W] = H(() => {
+    const D = p !== "1" ? qn(s) : [], F = c.split(",");
+    return D.map((B, $) => ({
+      label: B,
+      color: F[$] || Le,
       isRef: !1,
-      id: Zt.generateRandomId(4)
+      id: qt.generateRandomId(4)
     }));
-  }), k = (I, N, U) => {
-    const W = F.find((ve) => ve.id === I);
-    W && (W.label = N, W.color = U, B([...F]));
-  }, K = (I) => {
-    const N = F.findIndex((U) => U.id === I);
-    N !== -1 && (F.splice(N, 1), B([...F]));
-  }, H = u.split(","), X = Te(() => R.map((I, N) => ({
-    label: I,
-    color: H[N] || Le,
-    id: `${N}`,
+  }), Y = (D, F, B) => {
+    const $ = U.find((_e) => _e.id === D);
+    $ && ($.label = F, $.color = B, W([...U]));
+  }, k = (D) => {
+    const F = U.findIndex((B) => B.id === D);
+    F !== -1 && (U.splice(F, 1), W([...U]));
+  }, X = c.split(","), q = Te(() => V.map((D, F) => ({
+    label: D,
+    color: X[F] || Le,
+    id: `${F}`,
     isRef: !0
-  })), [H, R]), J = (I, N, U) => {
-    const W = [...D];
-    W[+I] = U, y(W), j({
+  })), [X, V]), ee = (D, F, B) => {
+    const $ = [..._];
+    $[+D] = B, C($), j({
       formula1: s,
-      formula2: W.join(",")
+      formula2: $.join(",")
     });
-  }, ae = () => {
-    B([
-      ...F,
+  }, te = () => {
+    W([
+      ...U,
       {
         label: "",
         color: Le,
         isRef: !1,
-        id: Zt.generateRandomId(4)
+        id: qt.generateRandomId(4)
       }
     ]);
   };
-  Se(() => {
-    if (h === "1")
+  Ce(() => {
+    if (p === "1")
       return;
-    const I = /* @__PURE__ */ new Set(), N = [];
-    F.map((U) => ({
-      labelList: U.label.split(","),
-      item: U
-    })).forEach(({ item: U, labelList: W }) => {
-      W.forEach((ve) => {
-        I.has(ve) || (I.add(ve), N.push({
-          label: ve,
-          color: U.color
+    const D = /* @__PURE__ */ new Set(), F = [];
+    U.map((B) => ({
+      labelList: B.label.split(","),
+      item: B
+    })).forEach(({ item: B, labelList: $ }) => {
+      $.forEach((_e) => {
+        D.has(_e) || (D.add(_e), F.push({
+          label: _e,
+          color: B.color
         }));
       });
     }), j({
-      formula1: Jn(N.map((U) => U.label)),
-      formula2: N.map((U) => U.color === Le ? "" : U.color).join(",")
+      formula1: Jn(F.map((B) => B.label)),
+      formula2: F.map((B) => B.color === Le ? "" : B.color).join(",")
     });
-  }, [F, j, h, f, D]);
+  }, [U, j, p, f, _]);
   const re = Te(
-    () => async (I) => {
-      if (!Pe(I)) {
+    () => async (D) => {
+      if (!Pe(D)) {
         j == null || j({
           formula1: "",
-          formula2: u
+          formula2: c
         });
         return;
       }
-      V.getFormulaRefCheck(I) ? (j == null || j({
-        formula1: Pe(I) ? I : "",
-        formula2: u
+      y.getFormulaRefCheck(D) ? (j == null || j({
+        formula1: Pe(D) ? D : "",
+        formula2: c
       }), A("")) : (j == null || j({
         formula1: "",
-        formula2: u
-      }), m("="), A(S.t("dataValidation.validFail.formulaError")));
+        formula2: c
+      }), m("="), A(v.t("dataValidation.validFail.formulaError")));
     },
-    [u, j]
-  ), Q = ke({}), [ne, b] = Y(!1);
-  return mn((I) => {
-    var U;
-    const N = (U = Q.current) == null ? void 0 : U.handleOutClick;
-    N && N(I, () => b(!1));
-  }), /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
-    /* @__PURE__ */ p.jsx(Z, { label: S.t("dataValidation.list.options"), children: /* @__PURE__ */ p.jsxs(
-      cn,
+    [c, j]
+  ), ae = We({}), [se, P] = H(!1);
+  return fn((D) => {
+    var B;
+    const F = (B = ae.current) == null ? void 0 : B.handleOutClick;
+    F && F(D, () => P(!1));
+  }), /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
+    /* @__PURE__ */ h.jsx(G, { label: v.t("dataValidation.list.options"), children: /* @__PURE__ */ h.jsxs(
+      un,
       {
-        value: h,
-        onChange: (I) => {
-          d(I), m(f), I === "1" && j({
+        value: p,
+        onChange: (D) => {
+          d(D), m(f), D === "1" && j({
             formula1: f === "=" ? "" : f,
-            formula2: D.join(",")
+            formula2: _.join(",")
           });
         },
         children: [
-          /* @__PURE__ */ p.jsx(Ae, { value: "0", children: S.t("dataValidation.list.customOptions") }),
-          /* @__PURE__ */ p.jsx(Ae, { value: "1", children: S.t("dataValidation.list.refOptions") })
+          /* @__PURE__ */ h.jsx(Ae, { value: "0", children: v.t("dataValidation.list.customOptions") }),
+          /* @__PURE__ */ h.jsx(Ae, { value: "1", children: v.t("dataValidation.list.refOptions") })
         ]
       }
     ) }),
-    h === "1" ? /* @__PURE__ */ p.jsxs(p.Fragment, { children: [
-      /* @__PURE__ */ p.jsx(
+    p === "1" ? /* @__PURE__ */ h.jsxs(h.Fragment, { children: [
+      /* @__PURE__ */ h.jsx(
         mo,
         {
-          initValue: g,
+          initValue: S,
           unitId: n,
           subUnitId: a,
-          isFocus: ne,
-          onChange: (I = "") => {
-            const N = (I != null ? I : "").trim();
-            C(N), re(N);
+          isFocus: se,
+          onChange: (D = "") => {
+            const F = (D != null ? D : "").trim();
+            R(F), re(F);
           },
-          errorText: M || $ || void 0,
-          onFocus: () => b(!0),
-          actions: Q.current,
+          errorText: E || N || void 0,
+          onFocus: () => P(!0),
+          actions: ae.current,
           isSupportAcrossSheet: !0
         }
       ),
-      /* @__PURE__ */ p.jsx("div", { ref: c, style: { marginTop: "12px" }, children: X.map((I) => /* @__PURE__ */ p.jsx(Fn, { item: I, commonProps: { onItemChange: J }, style: { marginBottom: 12 } }, I.id)) })
-    ] }) : /* @__PURE__ */ p.jsx(Z, { error: M, children: /* @__PURE__ */ p.jsxs("div", { ref: c, style: { marginTop: "-12px" }, children: [
-      /* @__PURE__ */ p.jsx(
+      /* @__PURE__ */ h.jsx("div", { ref: u, style: { marginTop: "12px" }, children: q.map((D) => /* @__PURE__ */ h.jsx(Nn, { item: D, commonProps: { onItemChange: ee }, style: { marginBottom: 12 } }, D.id)) })
+    ] }) : /* @__PURE__ */ h.jsx(G, { error: E, children: /* @__PURE__ */ h.jsxs("div", { ref: u, style: { marginTop: "-12px" }, children: [
+      /* @__PURE__ */ h.jsx(
         ia,
         {
-          list: F,
-          onListChange: B,
+          list: U,
+          onListChange: W,
           rowHeight: 32,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
-          itemRender: (I) => /* @__PURE__ */ p.jsx(
-            Fn,
+          itemRender: (D) => /* @__PURE__ */ h.jsx(
+            Nn,
             {
-              item: I,
+              item: D,
               commonProps: {
-                onItemChange: k,
-                onItemDelete: K
+                onItemChange: Y,
+                onItemDelete: k
               }
             },
-            I.id
+            D.id
           ),
           idKey: "id"
         }
       ),
-      /* @__PURE__ */ p.jsxs("a", { className: oe.dataValidationFormulaListAdd, onClick: ae, children: [
-        /* @__PURE__ */ p.jsx(Co, {}),
-        S.t("dataValidation.list.add")
+      /* @__PURE__ */ h.jsxs("a", { className: ne.dataValidationFormulaListAdd, onClick: te, children: [
+        /* @__PURE__ */ h.jsx(Co, {}),
+        v.t("dataValidation.list.add")
       ] })
     ] }) })
   ] });
 }
-const Ao = "data-validation.custom-formula-input", Lt = "data-validation.formula-input", Rn = "data-validation.list-formula-input", xo = "data-validation.checkbox-formula-input", Nr = [
+const Ao = "data-validation.custom-formula-input", Tt = "data-validation.formula-input", Dn = "data-validation.list-formula-input", xo = "data-validation.checkbox-formula-input", Nr = [
   [
     Ao,
     Tr
   ],
   [
-    Lt,
+    Tt,
     Pr
   ],
   [
-    Rn,
+    Dn,
     Fr
   ],
   [
@@ -2189,22 +2162,22 @@ const Ao = "data-validation.custom-formula-input", Lt = "data-validation.formula
     Lr
   ]
 ], Ur = "LIST_RENDER_MODE_OPTION_INPUT";
-function Rt(e) {
+function Dt(e) {
   var a;
-  const { value: t, onChange: o } = e, n = P(ee);
-  return /* @__PURE__ */ p.jsx(Z, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ p.jsxs(cn, { value: `${(a = t.renderMode) != null ? a : le.CUSTOM}`, onChange: (i) => o({ ...t, renderMode: +i }), children: [
-    /* @__PURE__ */ p.jsx(Ae, { value: `${le.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
-    /* @__PURE__ */ p.jsx(Ae, { value: `${le.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
-    /* @__PURE__ */ p.jsx(Ae, { value: `${le.TEXT}`, children: n.t("dataValidation.renderMode.text") })
+  const { value: t, onChange: o } = e, n = L(J);
+  return /* @__PURE__ */ h.jsx(G, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ h.jsxs(un, { value: `${(a = t.renderMode) != null ? a : de.CUSTOM}`, onChange: (i) => o({ ...t, renderMode: +i }), children: [
+    /* @__PURE__ */ h.jsx(Ae, { value: `${de.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
+    /* @__PURE__ */ h.jsx(Ae, { value: `${de.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
+    /* @__PURE__ */ h.jsx(Ae, { value: `${de.TEXT}`, children: n.t("dataValidation.renderMode.text") })
   ] }) });
 }
-Rt.componentKey = Ur;
-const $r = "DATE_SHOW_TIME_OPTION";
-function Dt(e) {
+Dt.componentKey = Ur;
+const Br = "DATE_SHOW_TIME_OPTION";
+function Vt(e) {
   var a;
-  const { value: t, onChange: o } = e, n = P(ee);
-  return /* @__PURE__ */ p.jsx(Z, { children: /* @__PURE__ */ p.jsx(
-    yt,
+  const { value: t, onChange: o } = e, n = L(J);
+  return /* @__PURE__ */ h.jsx(G, { children: /* @__PURE__ */ h.jsx(
+    Mt,
     {
       checked: (a = t.bizInfo) == null ? void 0 : a.showTime,
       onChange: (i) => {
@@ -2220,26 +2193,26 @@ function Dt(e) {
     }
   ) });
 }
-Dt.componentKey = $r;
-var Br = Object.defineProperty, kr = Object.getOwnPropertyDescriptor, Wr = (e, t, o, n) => {
+Vt.componentKey = Br;
+var $r = Object.defineProperty, kr = Object.getOwnPropertyDescriptor, Wr = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? kr(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
-  return n && a && Br(t, o, a), a;
-}, ct = (e, t) => (o, n) => t(o, n, e);
+  return n && a && $r(t, o, a), a;
+}, nt = (e, t) => (o, n) => t(o, n, e);
 const ut = 6;
-let on = class {
-  constructor(e, t, o, n) {
-    this._commandService = e, this._formulaService = t, this._themeService = o, this._renderManagerService = n;
+let an = class {
+  constructor(e, t, o, n, a) {
+    this._commandService = e, this._formulaService = t, this._themeService = o, this._renderManagerService = n, this._dataValidationModel = a;
   }
   _calc(e, t) {
-    var u, c, h;
-    const { vt: o, ht: n } = t || {}, a = e.endX - e.startX - ut * 2, i = e.endY - e.startY, r = ((u = t == null ? void 0 : t.fs) != null ? u : 10) * 1.6;
+    var c, u, p;
+    const { vt: o, ht: n } = t || {}, a = e.endX - e.startX - ut * 2, i = e.endY - e.startY, r = ((c = t == null ? void 0 : t.fs) != null ? c : 10) * 1.6;
     let l = 0, s = 0;
     switch (o) {
-      case ce.TOP:
+      case ue.TOP:
         s = 0;
         break;
-      case ce.BOTTOM:
+      case ue.BOTTOM:
         s = 0 + (i - r);
         break;
       default:
@@ -2247,10 +2220,10 @@ let on = class {
         break;
     }
     switch (n) {
-      case We.LEFT:
+      case He.LEFT:
         l = ut;
         break;
-      case We.RIGHT:
+      case He.RIGHT:
         l = ut + (a - r);
         break;
       default:
@@ -2260,8 +2233,8 @@ let on = class {
     return {
       left: e.startX + l,
       top: e.startY + s,
-      width: ((c = t == null ? void 0 : t.fs) != null ? c : 10) * 1.6,
-      height: ((h = t == null ? void 0 : t.fs) != null ? h : 10) * 1.6
+      width: ((u = t == null ? void 0 : t.fs) != null ? u : 10) * 1.6,
+      height: ((p = t == null ? void 0 : t.fs) != null ? p : 10) * 1.6
     };
   }
   calcCellAutoHeight(e) {
@@ -2275,25 +2248,28 @@ let on = class {
     return ((o = t == null ? void 0 : t.fs) != null ? o : 10) * 1.6;
   }
   async _parseFormula(e, t, o) {
-    var u, c, h, d, g, m, f, C, S;
-    const { formula1: n = wa, formula2: a = Ia } = e, i = await this._formulaService.getRuleFormulaResult(t, o, e.uid), r = At((h = (c = (u = i == null ? void 0 : i[0]) == null ? void 0 : u.result) == null ? void 0 : c[0]) == null ? void 0 : h[0]), l = At((m = (g = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : g[0]) == null ? void 0 : m[0]), s = bn(String(r)) && bn(String(l));
+    var c, u, p, d, S, m, f, R, v;
+    const { formula1: n = Ia, formula2: a = wa } = e, i = await this._formulaService.getRuleFormulaResult(t, o, e.uid), r = xt((p = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : p[0]), l = xt((m = (S = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : S[0]) == null ? void 0 : m[0]), s = bn(String(r)) && bn(String(l));
     return {
-      formula1: Pe(n) ? At((S = (C = (f = i == null ? void 0 : i[0]) == null ? void 0 : f.result) == null ? void 0 : C[0]) == null ? void 0 : S[0]) : n,
+      formula1: Pe(n) ? xt((v = (R = (f = i == null ? void 0 : i[0]) == null ? void 0 : f.result) == null ? void 0 : R[0]) == null ? void 0 : v[0]) : n,
       formula2: Pe(a) ? l : a,
       isFormulaValid: s
     };
   }
   drawWith(e, t) {
-    var O, x, j, F, B, k;
-    const { style: o, data: n, primaryWithCoord: a, unitId: i, subUnitId: r, worksheet: l, row: s, col: u } = t, c = a.isMergedMainCell ? a.mergeInfo : a, h = ie(l.getCellRaw(s, u)), d = (O = n.dataValidation) == null ? void 0 : O.rule, g = (x = n.dataValidation) == null ? void 0 : x.validator;
-    if (!d || !g)
+    var E, O, x, j;
+    const { style: o, primaryWithCoord: n, unitId: a, subUnitId: i, worksheet: r, row: l, col: s } = t, c = n.isMergedMainCell ? n.mergeInfo : n, u = ie(r.getCellRaw(l, s)), p = this._dataValidationModel.getRuleByLocation(a, i, l, s);
+    if (!p)
+      return;
+    const d = this._dataValidationModel.getValidator(p.type);
+    if (!d)
       return;
-    const m = this._themeService.getCurrentTheme();
-    if (!((j = g.skipDefaultFontRender) != null && j.call(g, d, h, { unitId: i, subUnitId: r, row: s, column: u })))
+    const S = this._themeService.getCurrentTheme();
+    if (!((E = d.skipDefaultFontRender) != null && E.call(d, p, u, { unitId: a, subUnitId: i, row: l, column: s })))
       return;
-    const f = g.parseFormulaSync(d, i, r), { formula1: C } = f, S = this._calc(c, o), { a: w, d: v } = e.getTransform(), V = Vn(S.left, w), D = Vn(S.top, v), y = ra.create().composeMatrix({
-      left: V,
-      top: D,
+    const m = d.parseFormulaSync(p, a, i), { formula1: f } = m, R = this._calc(c, o), { a: v, d: w } = e.getTransform(), I = yn(R.left, v), y = yn(R.top, w), _ = ra.create().composeMatrix({
+      left: I,
+      top: y,
       scaleX: 1,
       scaleY: 1,
       angle: 0,
@@ -2301,30 +2277,33 @@ let on = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), _ = c.endX - c.startX, R = c.endY - c.startY;
-    e.save(), e.beginPath(), e.rect(c.startX, c.startY, _, R), e.clip();
-    const T = y.getMatrix();
-    e.transform(T[0], T[1], T[2], T[3], T[4], T[5]);
-    const $ = ((F = o == null ? void 0 : o.fs) != null ? F : 10) * 1.6, A = String(h) === String(C), M = m.hyacinth500;
+    }), C = c.endX - c.startX, g = c.endY - c.startY;
+    e.save(), e.beginPath(), e.rect(c.startX, c.startY, C, g), e.clip();
+    const V = _.getMatrix();
+    e.transform(V[0], V[1], V[2], V[3], V[4], V[5]);
+    const T = ((O = o == null ? void 0 : o.fs) != null ? O : 10) * 1.6, N = String(u) === String(f), A = S.hyacinth500;
     sa.drawWith(e, {
-      checked: A,
-      width: $,
-      height: $,
-      fill: (k = (B = o == null ? void 0 : o.cl) == null ? void 0 : B.rgb) != null ? k : M
+      checked: N,
+      width: T,
+      height: T,
+      fill: (j = (x = o == null ? void 0 : o.cl) == null ? void 0 : x.rgb) != null ? j : A
     }), e.restore();
   }
   isHit(e, t) {
-    const o = t.primaryWithCoord.isMergedMainCell ? t.primaryWithCoord.mergeInfo : t.primaryWithCoord, n = this._calc(o, t.style), a = n.top, i = n.top + n.height, r = n.left, l = n.left + n.width, { x: s, y: u } = e;
-    return s <= l && s >= r && u <= i && u >= a;
+    const o = t.primaryWithCoord.isMergedMainCell ? t.primaryWithCoord.mergeInfo : t.primaryWithCoord, n = this._calc(o, t.style), a = n.top, i = n.top + n.height, r = n.left, l = n.left + n.width, { x: s, y: c } = e;
+    return s <= l && s >= r && c <= i && c >= a;
   }
   async onPointerDown(e, t) {
-    var f, C, S;
+    var m;
     if (t.button === 2)
       return;
-    const { primaryWithCoord: o, unitId: n, subUnitId: a, data: i, worksheet: r, row: l, col: s } = e, u = ie(r.getCellRaw(l, s)), c = (f = i.dataValidation) == null ? void 0 : f.rule, h = (C = i.dataValidation) == null ? void 0 : C.validator;
-    if (!c || !h || !((S = h.skipDefaultFontRender) != null && S.call(h, c, u, { unitId: n, subUnitId: a, row: l, column: s })))
+    const { primaryWithCoord: o, unitId: n, subUnitId: a, worksheet: i, row: r, col: l } = e, s = ie(i.getCellRaw(r, l)), c = this._dataValidationModel.getRuleByLocation(n, a, r, l);
+    if (!c)
+      return;
+    const u = this._dataValidationModel.getValidator(c.type);
+    if (!u || !((m = u.skipDefaultFontRender) != null && m.call(u, c, s, { unitId: n, subUnitId: a, row: r, column: l })))
       return;
-    const { formula1: d, formula2: g } = await this._parseFormula(c, n, a), m = {
+    const { formula1: p, formula2: d } = await this._parseFormula(c, n, a), S = {
       range: {
         startColumn: o.actualColumn,
         endColumn: o.actualColumn,
@@ -2332,80 +2311,81 @@ let on = class {
         endRow: o.actualRow
       },
       value: {
-        v: String(u) === Ca(String(d)) ? g : d,
+        v: String(s) === Ca(String(p)) ? d : p,
         p: null
       }
     };
     this._commandService.executeCommand(
-      hn.id,
-      m
+      pn.id,
+      S
     );
   }
   onPointerEnter(e, t) {
     var o, n;
-    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(z.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(He.POINTER);
+    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(z.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Ye.POINTER);
   }
   onPointerLeave(e, t) {
     var o, n;
-    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(z.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(He.DEFAULT);
+    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(z.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Ye.DEFAULT);
   }
 };
-on = Wr([
-  ct(0, te),
-  ct(1, L(Sa)),
-  ct(2, L(ea)),
-  ct(3, L(De))
-], on);
+an = Wr([
+  nt(0, Q),
+  nt(1, b(Sa)),
+  nt(2, b(ea)),
+  nt(3, b(Ve)),
+  nt(4, b(oe))
+], an);
 var Hr = Object.defineProperty, Yr = Object.getOwnPropertyDescriptor, Xr = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? Yr(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && Hr(t, o, a), a;
 }, zr = (e, t) => (o, n) => t(o, n, e);
-let me = class {
+let fe = class {
   constructor(e) {
-    E(this, "canvasRender", null);
-    E(this, "dropdown");
-    E(this, "optionsInput");
-    E(this, "formulaInput", Rn);
+    M(this, "canvasRender", null);
+    M(this, "dropdown");
+    M(this, "optionsInput");
+    M(this, "formulaInput", Dn);
     this.injector = e;
   }
 };
-me = Xr([
-  zr(0, L(Fe))
-], me);
-class Kr extends me {
+fe = Xr([
+  zr(0, b(Fe))
+], fe);
+class Kr extends fe {
   constructor() {
     super(...arguments);
-    E(this, "id", q.CHECKBOX);
-    E(this, "canvasRender", this.injector.createInstance(on));
-    E(this, "formulaInput", xo);
+    M(this, "id", Z.CHECKBOX);
+    M(this, "canvasRender", this.injector.createInstance(an));
+    M(this, "formulaInput", xo);
   }
 }
-class Gr extends me {
+class Gr extends fe {
   constructor() {
     super(...arguments);
-    E(this, "id", q.CUSTOM);
-    E(this, "formulaInput", Ao);
+    M(this, "id", Z.CUSTOM);
+    M(this, "formulaInput", Ao);
   }
 }
 const Zr = "data-validation.formula-input";
-class qr extends me {
+class qr extends fe {
   constructor() {
     super(...arguments);
-    E(this, "id", q.DATE);
-    E(this, "formulaInput", Zr);
-    E(this, "optionsInput", Dt.componentKey);
-    E(this, "dropdown", Eo);
+    M(this, "id", Z.DATE);
+    M(this, "formulaInput", Zr);
+    M(this, "optionsInput", Vt.componentKey);
+    M(this, "dropdown", bo);
   }
 }
-class Jr extends me {
+class Jr extends fe {
   constructor() {
     super(...arguments);
-    E(this, "id", q.DECIMAL);
-    E(this, "formulaInput", Lt);
+    M(this, "id", Z.DECIMAL);
+    M(this, "formulaInput", Tt);
   }
 }
-const jo = 4, Qr = 0, Ut = 4, Fo = 4, an = 6, Vt = 6, Oe = 14;
+const jo = 4, Qr = 0, Bt = 4, Fo = 4, rn = 6, yt = 6, Oe = 14;
 function es(e, t) {
   const o = la.getTextSize(e, t), n = o.width + jo * 2, { ba: a, bd: i } = o, r = a + i;
   return {
@@ -2415,36 +2395,36 @@ function es(e, t) {
   };
 }
 function $t(e, t, o, n) {
-  const a = Oe + an * 2, i = o - a, r = n - Vt * 2, l = e.map((d) => ({
+  const a = Oe + rn * 2, i = o - a, r = n - yt * 2, l = e.map((d) => ({
     layout: es(d, t),
     text: d
   }));
   let s;
-  const u = [];
+  const c = [];
   l.forEach((d) => {
-    const { layout: g } = d, { width: m, height: f } = g;
-    !s || s.width + m + Ut > i ? (s = {
+    const { layout: S } = d, { width: m, height: f } = S;
+    !s || s.width + m + Bt > i ? (s = {
       width: m,
       height: f,
       items: [{
         ...d,
         left: 0
       }]
-    }, u.push(s)) : (s.items.push({
+    }, c.push(s)) : (s.items.push({
       ...d,
-      left: s.width + Ut
-    }), s.width = s.width + m + Ut);
+      left: s.width + Bt
+    }), s.width = s.width + m + Bt);
   });
-  let c = 0, h = 0;
-  return u.forEach((d, g) => {
-    h = Math.max(h, d.width), g === u.length - 1 ? c += d.height : c += d.height + Fo;
+  let u = 0, p = 0;
+  return c.forEach((d, S) => {
+    p = Math.max(p, d.width), S === c.length - 1 ? u += d.height : u += d.height + Fo;
   }), {
-    lines: u,
-    totalHeight: c,
+    lines: c,
+    totalHeight: u,
     contentWidth: i,
     contentHeight: r,
-    cellAutoHeight: c + Vt * 2,
-    calcAutoWidth: h + a
+    cellAutoHeight: u + yt * 2,
+    calcAutoWidth: p + a
   };
 }
 const ts = 8;
@@ -2463,13 +2443,13 @@ var os = Object.defineProperty, as = Object.getOwnPropertyDescriptor, is = (e, t
   for (var a = n > 1 ? void 0 : n ? as(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && os(t, o, a), a;
-}, Nn = (e, t) => (o, n) => t(o, n, e);
+}, kt = (e, t) => (o, n) => t(o, n, e);
 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 rn = class {
-  constructor(e, t) {
-    E(this, "zIndex");
-    E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
-    this._commandService = e, this._renderManagerService = t;
+let sn = class {
+  constructor(e, t, o) {
+    M(this, "zIndex");
+    M(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    this._commandService = e, this._renderManagerService = t, this._dataValidationModel = o;
   }
   _ensureMap(e) {
     let t = this._dropdownInfoMap.get(e);
@@ -2482,10 +2462,10 @@ let rn = class {
     const i = o - Oe + 4;
     let r = 4;
     switch (a) {
-      case ce.MIDDLE:
+      case ue.MIDDLE:
         r = (n - Oe) / 2 + 4;
         break;
-      case ce.BOTTOM:
+      case ue.BOTTOM:
         r = n - Oe + 4;
         break;
     }
@@ -2493,78 +2473,87 @@ let rn = class {
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, o, n) {
-    var H, X;
-    const { primaryWithCoord: a, row: i, col: r, style: l, data: s, subUnitId: u } = t, c = a.isMergedMainCell ? a.mergeInfo : a, h = s.fontRenderExtension, { leftOffset: d = 0, rightOffset: g = 0, topOffset: m = 0, downOffset: f = 0 } = h || {}, C = s.dataValidation, S = this._ensureMap(u), w = this._generateKey(i, r);
-    if (!C)
+    var Y, k;
+    const { primaryWithCoord: a, row: i, col: r, style: l, data: s, subUnitId: c } = t, u = a.isMergedMainCell ? a.mergeInfo : a, p = s == null ? void 0 : s.fontRenderExtension, { leftOffset: d = 0, rightOffset: S = 0, topOffset: m = 0, downOffset: f = 0 } = p || {}, R = this._ensureMap(c), v = this._generateKey(i, r), w = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, r);
+    if (!w)
       return;
-    const v = {
-      startX: c.startX + d,
-      endX: c.endX - g,
-      startY: c.startY + m,
-      endY: c.endY - f
-    }, V = v.endX - v.startX, D = v.endY - v.startY, { cl: y } = l || {}, _ = (H = typeof y == "object" ? y == null ? void 0 : y.rgb : y) != null ? H : "#000", R = Tt(l != null ? l : void 0), { rule: T, validator: $ } = C, A = $, { vt: M, ht: O } = l || {}, x = M != null ? M : ce.MIDDLE, j = (X = ie(s)) != null ? X : "", F = A.parseCellValue(j), B = A.getListWithColorMap(T), k = $t(F, R, V, D);
-    this._drawDownIcon(e, v, V, D, x), e.save(), e.translateWithPrecision(v.startX, v.startY), e.beginPath(), e.rect(0, 0, V - Oe, D), e.clip(), e.translateWithPrecision(an, Vt);
-    let K = 0;
-    switch (x) {
-      case ce.MIDDLE:
-        K = (k.contentHeight - k.totalHeight) / 2;
+    const I = this._dataValidationModel.getValidator(w.type);
+    if (!I)
+      return;
+    const y = {
+      startX: u.startX + d,
+      endX: u.endX - S,
+      startY: u.startY + m,
+      endY: u.endY - f
+    }, _ = y.endX - y.startX, C = y.endY - y.startY, { cl: g } = l || {}, V = (Y = typeof g == "object" ? g == null ? void 0 : g.rgb : g) != null ? Y : "#000", T = At(l != null ? l : void 0), { vt: N, ht: A } = l || {}, E = N != null ? N : ue.MIDDLE, O = (k = ie(s)) != null ? k : "", x = I.parseCellValue(O), j = I.getListWithColorMap(w), U = $t(x, T, _, C);
+    this._drawDownIcon(e, y, _, C, E), e.save(), e.translateWithPrecision(y.startX, y.startY), e.beginPath(), e.rect(0, 0, _ - Oe, C), e.clip(), e.translateWithPrecision(rn, yt);
+    let W = 0;
+    switch (E) {
+      case ue.MIDDLE:
+        W = (U.contentHeight - U.totalHeight) / 2;
         break;
-      case ce.BOTTOM:
-        K = k.contentHeight - k.totalHeight;
+      case ue.BOTTOM:
+        W = U.contentHeight - U.totalHeight;
         break;
     }
-    e.translateWithPrecision(0, K), k.lines.forEach((J, ae) => {
+    e.translateWithPrecision(0, W), U.lines.forEach((X, q) => {
       e.save();
-      const { width: re, height: Q, items: ne } = J;
-      let b = 0;
-      switch (O) {
-        case We.RIGHT:
-          b = k.contentWidth - re;
+      const { width: ee, height: te, items: re } = X;
+      let ae = 0;
+      switch (A) {
+        case He.RIGHT:
+          ae = U.contentWidth - ee;
           break;
-        case We.CENTER:
-          b = (k.contentWidth - re) / 2;
+        case He.CENTER:
+          ae = (U.contentWidth - ee) / 2;
           break;
       }
-      e.translate(b, ae * (Q + Fo)), ne.forEach((I) => {
-        e.save(), e.translateWithPrecision(I.left, 0), ns.drawWith(e, {
-          ...R,
-          info: I,
-          color: _,
-          fill: B[I.text]
+      e.translate(ae, q * (te + Fo)), re.forEach((se) => {
+        e.save(), e.translateWithPrecision(se.left, 0), ns.drawWith(e, {
+          ...T,
+          info: se,
+          color: V,
+          fill: j[se.text]
         }), e.restore();
       }), e.restore();
-    }), e.restore(), S.set(w, {
-      left: v.startX,
-      top: v.startY,
-      width: k.contentWidth + an + Oe,
-      height: k.contentHeight + Vt * 2
+    }), e.restore(), R.set(v, {
+      left: y.startX,
+      top: y.startY,
+      width: U.contentWidth + rn + Oe,
+      height: U.contentHeight + yt * 2
     });
   }
   calcCellAutoHeight(e) {
-    var V;
-    const { primaryWithCoord: t, style: o, data: n } = e, a = n.fontRenderExtension, { leftOffset: i = 0, rightOffset: r = 0, topOffset: l = 0, downOffset: s = 0 } = a || {}, u = t.isMergedMainCell ? t.mergeInfo : t, c = {
-      startX: u.startX + i,
-      endX: u.endX - r,
-      startY: u.startY + l,
-      endY: u.endY - s
-    }, h = n.dataValidation;
-    if (!h)
+    var _;
+    const { primaryWithCoord: t, style: o, data: n, row: a, col: i } = e, r = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = r || {}, p = t.isMergedMainCell ? t.mergeInfo : t, d = {
+      startX: p.startX + l,
+      endX: p.endX - s,
+      startY: p.startY + c,
+      endY: p.endY - u
+    }, S = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
+    if (!S)
+      return;
+    const m = this._dataValidationModel.getValidator(S.type);
+    if (!m)
       return;
-    const d = c.endX - c.startX, g = c.endY - c.startY, m = (V = ie(n)) != null ? V : "", { validator: f } = h, S = f.parseCellValue(m), w = Tt(o != null ? o : void 0);
-    return $t(S, w, d, g).cellAutoHeight;
+    const f = d.endX - d.startX, R = d.endY - d.startY, v = (_ = ie(n)) != null ? _ : "", w = m.parseCellValue(v), I = At(o != null ? o : void 0);
+    return $t(w, I, f, R).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
-    var V;
-    const { primaryWithCoord: t, style: o, data: n } = e, a = n.fontRenderExtension, { leftOffset: i = 0, rightOffset: r = 0, topOffset: l = 0, downOffset: s = 0 } = a || {}, u = t.isMergedMainCell ? t.mergeInfo : t, c = {
-      startX: u.startX + i,
-      endX: u.endX - r,
-      startY: u.startY + l,
-      endY: u.endY - s
-    }, h = n.dataValidation;
-    if (!h)
+    var _;
+    const { primaryWithCoord: t, style: o, data: n, row: a, col: i } = e, r = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = r || {}, p = t.isMergedMainCell ? t.mergeInfo : t, d = {
+      startX: p.startX + l,
+      endX: p.endX - s,
+      startY: p.startY + c,
+      endY: p.endY - u
+    }, S = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
+    if (!S)
       return;
-    const d = c.endX - c.startX, g = c.endY - c.startY, m = (V = ie(n)) != null ? V : "", { validator: f } = h, S = f.parseCellValue(m), w = Tt(o != null ? o : void 0);
-    return $t(S, w, d, g).calcAutoWidth;
+    const m = this._dataValidationModel.getValidator(S.type);
+    if (!m)
+      return;
+    const f = d.endX - d.startX, R = d.endY - d.startY, v = (_ = ie(n)) != null ? _ : "", w = m.parseCellValue(v), I = At(o != null ? o : void 0);
+    return $t(w, I, f, R).calcAutoWidth;
   }
   isHit(e, t) {
     const { primaryWithCoord: o } = t, n = o.isMergedMainCell ? o.mergeInfo : o, { endX: a } = n, { x: i } = e;
@@ -2579,35 +2568,36 @@ let rn = class {
       row: a,
       column: i
     };
-    this._commandService.executeCommand(Ot.id, r);
+    this._commandService.executeCommand(Pt.id, r);
   }
   onPointerEnter(e, t) {
     var o, n;
-    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(z.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(He.POINTER);
+    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(z.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Ye.POINTER);
   }
   onPointerLeave(e, t) {
     var o, n;
-    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(z.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(He.DEFAULT);
+    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(z.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Ye.DEFAULT);
   }
 };
-rn = is([
-  Nn(0, te),
-  Nn(1, L(De))
-], rn);
-class ss extends me {
+sn = is([
+  kt(0, Q),
+  kt(1, b(Ve)),
+  kt(2, b(oe))
+], sn);
+class ss extends fe {
   constructor() {
     super(...arguments);
-    E(this, "id", q.LIST_MULTIPLE);
-    E(this, "canvasRender", this.injector.createInstance(rn));
-    E(this, "dropdown", In);
+    M(this, "id", Z.LIST_MULTIPLE);
+    M(this, "canvasRender", this.injector.createInstance(sn));
+    M(this, "dropdown", Rn);
   }
 }
 var ls = Object.defineProperty, ds = Object.getOwnPropertyDescriptor, cs = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? ds(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && ls(t, o, a), a;
-}, Bt = (e, t) => (o, n) => t(o, n, e);
-const Me = 4, ht = 4, ue = 14, he = 6, Be = 4, kt = 8, us = "#565656", Un = 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");
+}, ht = (e, t) => (o, n) => t(o, n, e);
+const Ee = 4, pt = 4, he = 14, pe = 6, ke = 4, Wt = 8, us = "#565656", Un = 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 hs(e, t) {
   const o = e.length;
   return {
@@ -2619,16 +2609,16 @@ function hs(e, t) {
           ts: {
             fs: 11,
             ff: void 0,
-            it: qe.FALSE,
-            bl: qe.FALSE,
+            it: Je.FALSE,
+            bl: Je.FALSE,
             ul: {
-              s: qe.FALSE
+              s: Je.FALSE
             },
             st: {
-              s: qe.FALSE
+              s: Je.FALSE
             },
             ol: {
-              s: qe.FALSE
+              s: Je.FALSE
             },
             cl: void 0,
             ...t,
@@ -2656,14 +2646,14 @@ function No(e, t, o) {
     docViewModel: i
   };
 }
-function pt(e, t, o) {
+function mt(e, t, o) {
   const {
     documentSkeleton: n,
     docModel: a,
     docViewModel: i
   } = No(e, t, o);
   return {
-    documents: new ha(`DOCUMENTS_${Zt.generateRandomId()}`, n, {
+    documents: new ha(`DOCUMENTS_${qt.generateRandomId()}`, n, {
       pageMarginLeft: 0,
       pageMarginTop: 0
     }),
@@ -2672,40 +2662,40 @@ function pt(e, t, o) {
     docViewModel: i
   };
 }
-function $n(e, t, o, n, a, i, r = !0) {
+function Bn(e, t, o, n, a, i, r = !0) {
   let l = 0;
-  const s = r ? Be : 0;
+  const s = r ? ke : 0;
   switch (a) {
-    case ce.BOTTOM:
+    case ue.BOTTOM:
       l = t - n - s;
       break;
-    case ce.MIDDLE:
+    case ue.MIDDLE:
       l = (t - n) / 2;
       break;
     default:
       l = s;
       break;
   }
-  l = Math.max(Be, l);
-  let u = 0;
+  l = Math.max(ke, l);
+  let c = 0;
   switch (i) {
-    case We.CENTER:
-      u = (e - o) / 2;
+    case He.CENTER:
+      c = (e - o) / 2;
       break;
-    case We.RIGHT:
-      u = e - o;
+    case He.RIGHT:
+      c = e - o;
       break;
   }
-  return u = Math.max(he, u), {
-    paddingLeft: u,
+  return c = Math.max(pe, c), {
+    paddingLeft: c,
     paddingTop: l
   };
 }
-let sn = class {
-  constructor(e, t, o) {
-    E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
-    E(this, "zIndex");
-    this._localeService = e, this._commandService = t, this._renderManagerService = o;
+let ln = class {
+  constructor(e, t, o, n) {
+    M(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    M(this, "zIndex");
+    this._localeService = e, this._commandService = t, this._renderManagerService = o, this._dataValidationModel = n;
   }
   _ensureMap(e) {
     let t = this._dropdownInfoMap.get(e);
@@ -2715,124 +2705,128 @@ let sn = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, o, n, a, i, r) {
-    const { t: l = se.pd.t, b: s = se.pd.b } = r, u = o - ue;
-    let c;
+    const { t: l = le.pd.t, b: s = le.pd.b } = r, c = o - he;
+    let u;
     switch (i) {
-      case ce.MIDDLE:
-        c = (n - ht) / 2;
+      case ue.MIDDLE:
+        u = (n - pt) / 2;
         break;
-      case ce.BOTTOM:
-        c = n - s - a - Be + (a / 2 - ht / 2);
+      case ue.BOTTOM:
+        u = n - s - a - ke + (a / 2 - pt / 2);
         break;
       default:
-        c = l + Be + (a / 2 - ht / 2);
+        u = l + ke + (a / 2 - pt / 2);
         break;
     }
-    e.save(), e.translateWithPrecision(t.startX + u, t.startY + c), e.fillStyle = "#565656", e.fill(Un), e.restore();
+    e.save(), e.translateWithPrecision(t.startX + c, t.startY + u), e.fillStyle = "#565656", e.fill(Un), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(e, t, o) {
-    var x, j;
-    const { primaryWithCoord: n, row: a, col: i, style: r, data: l, subUnitId: s } = t, u = n.isMergedMainCell ? n.mergeInfo : n, c = (x = l.dataValidation) == null ? void 0 : x.rule, h = (j = l.dataValidation) == null ? void 0 : j.validator, d = l.fontRenderExtension, { leftOffset: g = 0, rightOffset: m = 0, topOffset: f = 0, downOffset: C = 0 } = d || {};
-    if (!c || !h || !h || h.id.indexOf(q.LIST) !== 0 || !h.skipDefaultFontRender(c))
+    const { primaryWithCoord: n, row: a, col: i, style: r, data: l, subUnitId: s } = t, c = n.isMergedMainCell ? n.mergeInfo : n, u = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
+    if (!u)
       return;
-    const S = {
-      startX: u.startX + g,
-      endX: u.endX - m,
-      startY: u.startY + f,
-      endY: u.endY - C
-    }, w = S.endX - S.startX, v = S.endY - S.startY, V = this._ensureMap(s), D = this._generateKey(a, i), y = h.getListWithColor(c), _ = ie(l), R = `${_ != null ? _ : ""}`, T = y.find((F) => F.label === R);
-    let { tb: $, vt: A, ht: M, pd: O } = r || {};
-    if ($ = $ != null ? $ : _e.WRAP, A = A != null ? A : ce.BOTTOM, M = M != null ? M : se.ht, O = O != null ? O : se.pd, c.renderMode === le.ARROW) {
-      const { l: F = se.pd.l, t: B = se.pd.t, r: k = se.pd.r, b: K = se.pd.b } = O, H = w - F - k - ue - 4, { documentSkeleton: X, documents: J, docModel: ae } = pt(R, this._localeService, r);
-      $ === _e.WRAP && ae.updateDocumentDataPageSize(Math.max(H, 1)), X.calculate(), X.getActualSize();
-      const re = Je(X), { height: Q, width: ne } = re, { paddingTop: b, paddingLeft: I } = $n(H, v - B - K, ne, Q, A, M, !0);
-      this._drawDownIcon(e, S, w, v, Q, A, O), e.save(), e.translateWithPrecision(S.startX + F, S.startY + B), e.beginPath(), e.rect(0, 0, w - F - k, v - B - K), e.clip(), e.translateWithPrecision(0, b), e.save(), e.translateWithPrecision(Me, 0), e.beginPath(), e.rect(0, 0, H, Q), e.clip(), J.render(e), e.translateWithPrecision(I, 0), e.restore(), e.restore(), V.set(D, {
-        left: S.endX + F + o.rowHeaderWidth - ue,
-        top: S.startY + B + o.columnHeaderHeight,
-        width: ue,
-        height: v - B - K
+    const p = this._dataValidationModel.getValidator(u.type);
+    if (!p)
+      return;
+    const d = l == null ? void 0 : l.fontRenderExtension, { leftOffset: S = 0, rightOffset: m = 0, topOffset: f = 0, downOffset: R = 0 } = d || {};
+    if (!u || !p || !p || p.id.indexOf(Z.LIST) !== 0 || !p.skipDefaultFontRender(u))
+      return;
+    const v = {
+      startX: c.startX + S,
+      endX: c.endX - m,
+      startY: c.startY + f,
+      endY: c.endY - R
+    }, w = v.endX - v.startX, I = v.endY - v.startY, y = this._ensureMap(s), _ = this._generateKey(a, i), C = p.getListWithColor(u), g = ie(l), V = `${g != null ? g : ""}`, T = C.find((x) => x.label === V);
+    let { tb: N, vt: A, ht: E, pd: O } = r || {};
+    if (N = N != null ? N : Se.WRAP, A = A != null ? A : ue.BOTTOM, E = E != null ? E : le.ht, O = O != null ? O : le.pd, u.renderMode === de.ARROW) {
+      const { l: x = le.pd.l, t: j = le.pd.t, r: U = le.pd.r, b: W = le.pd.b } = O, Y = w - x - U - he - 4, { documentSkeleton: k, documents: X, docModel: q } = mt(V, this._localeService, r);
+      N === Se.WRAP && q.updateDocumentDataPageSize(Math.max(Y, 1)), k.calculate(), k.getActualSize();
+      const ee = Qe(k), { height: te, width: re } = ee, { paddingTop: ae, paddingLeft: se } = Bn(Y, I - j - W, re, te, A, E, !0);
+      this._drawDownIcon(e, v, w, I, te, A, O), e.save(), e.translateWithPrecision(v.startX + x, v.startY + j), e.beginPath(), e.rect(0, 0, w - x - U, I - j - W), e.clip(), e.translateWithPrecision(0, ae), e.save(), e.translateWithPrecision(Ee, 0), e.beginPath(), e.rect(0, 0, Y, te), e.clip(), X.render(e), e.translateWithPrecision(se, 0), e.restore(), e.restore(), y.set(_, {
+        left: v.endX + x + o.rowHeaderWidth - he,
+        top: v.startY + j + o.columnHeaderHeight,
+        width: he,
+        height: I - j - W
       });
     } else {
-      e.save(), e.translateWithPrecision(S.startX, S.startY), e.beginPath(), e.rect(0, 0, w, v), e.clip();
-      const F = w - he * 2 - Me - ue - 4, { documentSkeleton: B, documents: k, docModel: K } = pt(R, this._localeService, r);
-      $ === _e.WRAP && K.updateDocumentDataPageSize(Math.max(F, 1)), B.calculate();
-      const H = Je(B), { height: X, width: J } = H, { paddingTop: ae, paddingLeft: re } = $n(F, v, J, X, A, M);
-      e.translateWithPrecision(he, ae);
-      const Q = Math.max(w - he * 2, 1), ne = X;
+      e.save(), e.translateWithPrecision(v.startX, v.startY), e.beginPath(), e.rect(0, 0, w, I), e.clip();
+      const x = w - pe * 2 - Ee - he - 4, { documentSkeleton: j, documents: U, docModel: W } = mt(V, this._localeService, r);
+      N === Se.WRAP && W.updateDocumentDataPageSize(Math.max(x, 1)), j.calculate();
+      const Y = Qe(j), { height: k, width: X } = Y, { paddingTop: q, paddingLeft: ee } = Bn(x, I, X, k, A, E);
+      e.translateWithPrecision(pe, q);
+      const te = Math.max(w - pe * 2, 1), re = k;
       Xn.drawWith(e, {
-        width: Q,
-        height: ne,
+        width: te,
+        height: re,
         fill: (T == null ? void 0 : T.color) || Le,
-        radius: kt
-      }), e.save(), e.translateWithPrecision(Me, 0), e.beginPath(), e.rect(0, 0, F, X), e.clip(), e.translateWithPrecision(re, 0), k.render(e), e.restore(), e.translateWithPrecision(F + Me + 4, (X - ht) / 2), e.fillStyle = us, e.fill(Un), e.restore(), V.set(D, {
-        left: S.startX + he + o.rowHeaderWidth,
-        top: S.startY + ae + o.columnHeaderHeight,
-        width: Q,
-        height: ne
+        radius: Wt
+      }), e.save(), e.translateWithPrecision(Ee, 0), e.beginPath(), e.rect(0, 0, x, k), e.clip(), e.translateWithPrecision(ee, 0), U.render(e), e.restore(), e.translateWithPrecision(x + Ee + 4, (k - pt) / 2), e.fillStyle = us, e.fill(Un), e.restore(), y.set(_, {
+        left: v.startX + pe + o.rowHeaderWidth,
+        top: v.startY + q + o.columnHeaderHeight,
+        width: te,
+        height: re
       });
     }
   }
   calcCellAutoHeight(e) {
-    var v;
-    const { primaryWithCoord: t, style: o, data: n } = e, a = t.isMergedMainCell ? t.mergeInfo : t, i = n.fontRenderExtension, { leftOffset: r = 0, rightOffset: l = 0, topOffset: s = 0, downOffset: u = 0 } = i || {}, c = (v = n.dataValidation) == null ? void 0 : v.rule;
-    if (!c || c.renderMode === le.TEXT)
+    const { primaryWithCoord: t, style: o, data: n, row: a, col: i } = e, r = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: p = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
+    if (!d || d.renderMode === de.TEXT)
       return;
-    const h = {
-      startX: a.startX + r,
-      endX: a.endX - l,
-      startY: a.startY + s,
-      endY: a.endY - u
-    }, d = h.endX - h.startX, g = ie(n), m = `${g != null ? g : ""}`;
-    let { tb: f, pd: C } = o || {};
-    const { t: S = se.pd.t, b: w = se.pd.b } = C != null ? C : {};
-    if (f = f != null ? f : _e.WRAP, c.renderMode === le.ARROW) {
-      const V = d - ue, { documentSkeleton: D, docModel: y } = pt(m, this._localeService, o);
-      f === _e.WRAP && y.updateDocumentDataPageSize(Math.max(V, 1)), D.calculate(), D.getActualSize();
-      const _ = Je(D), { height: R } = _;
-      return R + S + w + Be * 2;
+    const S = {
+      startX: r.startX + s,
+      endX: r.endX - c,
+      startY: r.startY + u,
+      endY: r.endY - p
+    }, m = S.endX - S.startX, f = ie(n), R = `${f != null ? f : ""}`;
+    let { tb: v, pd: w } = o || {};
+    const { t: I = le.pd.t, b: y = le.pd.b } = w != null ? w : {};
+    if (v = v != null ? v : Se.WRAP, d.renderMode === de.ARROW) {
+      const _ = m - he, { documentSkeleton: C, docModel: g } = mt(R, this._localeService, o);
+      v === Se.WRAP && g.updateDocumentDataPageSize(Math.max(_, 1)), C.calculate(), C.getActualSize();
+      const V = Qe(C), { height: T } = V;
+      return T + I + y + ke * 2;
     } else {
-      const V = d - he * 2 - Me - ue, { documentSkeleton: D, docModel: y } = No(m, this._localeService, o);
-      f === _e.WRAP && y.updateDocumentDataPageSize(Math.max(V, 1)), D.calculate();
-      const _ = Je(D), {
-        height: R
-      } = _;
-      return R + Be * 2;
+      const _ = m - pe * 2 - Ee - he, { documentSkeleton: C, docModel: g } = No(R, this._localeService, o);
+      v === Se.WRAP && g.updateDocumentDataPageSize(Math.max(_, 1)), C.calculate();
+      const V = Qe(C), {
+        height: T
+      } = V;
+      return T + ke * 2;
     }
   }
   calcCellAutoWidth(e) {
-    var R;
-    const { primaryWithCoord: t, style: o, data: n } = e, a = t.isMergedMainCell ? t.mergeInfo : t, i = n.fontRenderExtension, { leftOffset: r = 0, rightOffset: l = 0, topOffset: s = 0, downOffset: u = 0 } = i || {}, c = (R = n.dataValidation) == null ? void 0 : R.rule;
-    if (!c || c.renderMode === le.TEXT) return;
-    const h = {
-      startX: a.startX + r,
-      endX: a.endX - l,
-      startY: a.startY + s,
-      endY: a.endY - u
-    }, d = h.endX - h.startX, g = ie(n), m = `${g != null ? g : ""}`;
-    let { tb: f, pd: C } = o || {};
-    const { l: S = se.pd.l, r: w = se.pd.r } = C != null ? C : {};
-    f = f != null ? f : _e.WRAP;
-    let v = he * 2 + ue;
-    switch (c.renderMode) {
-      case le.ARROW:
-        v = ue + he * 2 + w + S;
+    const { primaryWithCoord: t, style: o, data: n, row: a, col: i } = e, r = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: p = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
+    if (!d || d.renderMode === de.TEXT)
+      return;
+    const S = {
+      startX: r.startX + s,
+      endX: r.endX - c,
+      startY: r.startY + u,
+      endY: r.endY - p
+    }, m = S.endX - S.startX, f = ie(n), R = `${f != null ? f : ""}`;
+    let { tb: v, pd: w } = o || {};
+    const { l: I = le.pd.l, r: y = le.pd.r } = w != null ? w : {};
+    v = v != null ? v : Se.WRAP;
+    let _ = pe * 2 + he;
+    switch (d.renderMode) {
+      case de.ARROW:
+        _ = he + pe * 2 + y + I;
         break;
-      case le.CUSTOM:
-        v = ue + he * 2 + Me * 2 + w + S + kt / 2 + 1;
+      case de.CUSTOM:
+        _ = he + pe * 2 + Ee * 2 + y + I + Wt / 2 + 1;
         break;
       default:
-        v = ue + he * 2 + Me * 2 + w + S + kt / 2 + 1;
+        _ = he + pe * 2 + Ee * 2 + y + I + Wt / 2 + 1;
     }
-    const V = d - v, { documentSkeleton: D, docModel: y } = pt(m, this._localeService, o);
-    return f === _e.WRAP && y.updateDocumentDataPageSize(Math.max(V, 1)), D.calculate(), D.getActualSize(), Je(D).width + v;
+    const C = m - _, { documentSkeleton: g, docModel: V } = mt(R, this._localeService, o);
+    return v === Se.WRAP && V.updateDocumentDataPageSize(Math.max(C, 1)), g.calculate(), g.getActualSize(), Qe(g).width + _;
   }
   isHit(e, t) {
-    const { data: o, subUnitId: n, row: a, col: i } = t, l = this._ensureMap(n).get(this._generateKey(a, i)), s = o.dataValidation;
-    if (!s || !l || s.rule.renderMode === le.TEXT)
+    const { subUnitId: o, row: n, col: a } = t, r = this._ensureMap(o).get(this._generateKey(n, a)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, n, a);
+    if (!l || !r || l.renderMode === de.TEXT)
       return !1;
-    const { top: u, left: c, width: h, height: d } = l, { x: g, y: m } = e;
-    return g >= c && g <= c + h && m >= u && m <= u + d;
+    const { top: s, left: c, width: u, height: p } = r, { x: d, y: S } = e;
+    return d >= c && d <= c + u && S >= s && S <= s + p;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2843,64 +2837,65 @@ let sn = class {
       row: a,
       column: i
     };
-    this._commandService.executeCommand(Ot.id, r);
+    this._commandService.executeCommand(Pt.id, r);
   }
   onPointerEnter(e, t) {
     var o, n;
-    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(z.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(He.POINTER);
+    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(z.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Ye.POINTER);
   }
   onPointerLeave(e, t) {
     var o, n;
-    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(z.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(He.DEFAULT);
+    (n = (o = this._renderManagerService.getCurrentTypeOfRenderer(z.UNIVER_SHEET)) == null ? void 0 : o.mainComponent) == null || n.setCursor(Ye.DEFAULT);
   }
 };
-sn = cs([
-  Bt(0, L(ee)),
-  Bt(1, te),
-  Bt(2, L(De))
-], sn);
-class ps extends me {
+ln = cs([
+  ht(0, b(J)),
+  ht(1, Q),
+  ht(2, b(Ve)),
+  ht(3, b(oe))
+], ln);
+class ps extends fe {
   constructor() {
     super(...arguments);
-    E(this, "id", q.LIST);
-    E(this, "canvasRender", this.injector.createInstance(sn));
-    E(this, "dropdown", In);
-    E(this, "optionsInput", Rt.componentKey);
-    E(this, "formulaInput", Rn);
+    M(this, "id", Z.LIST);
+    M(this, "canvasRender", this.injector.createInstance(ln));
+    M(this, "dropdown", Rn);
+    M(this, "optionsInput", Dt.componentKey);
+    M(this, "formulaInput", Dn);
   }
 }
-class ms extends me {
+class ms extends fe {
   constructor() {
     super(...arguments);
-    E(this, "id", q.TEXT_LENGTH);
-    E(this, "formulaInput", Lt);
+    M(this, "id", Z.TEXT_LENGTH);
+    M(this, "formulaInput", Tt);
   }
 }
-class fs extends me {
+class fs extends fe {
   constructor() {
     super(...arguments);
-    E(this, "id", q.WHOLE);
-    E(this, "formulaInput", Lt);
+    M(this, "id", Z.WHOLE);
+    M(this, "formulaInput", Tt);
   }
 }
 var gs = Object.defineProperty, vs = Object.getOwnPropertyDescriptor, _s = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? vs(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && gs(t, o, a), a;
-}, Wt = (e, t) => (o, n) => t(o, n, e);
-let Ge = class extends dn {
+}, Ht = (e, t) => (o, n) => t(o, n, e);
+let Ze = class extends cn {
   constructor(e, t, o) {
     super(), this._injector = e, this._componentManger = t, this._dataValidatorRegistryService = o, this._initComponents(), this._registerValidatorViews();
   }
   _initComponents() {
     [
-      [Mo, So],
-      [Sn, er],
+      [Eo, So],
+      [Cn, er],
       [Do, Si],
-      [In, Ti],
-      [Eo, ai],
-      [Rt.componentKey, Rt],
+      [Rn, Ti],
+      [bo, ai],
       [Dt.componentKey, Dt],
+      [Vt.componentKey, Vt],
       ...Nr
     ].forEach(([e, t]) => {
       this.disposeWithMe(this._componentManger.register(
@@ -2925,42 +2920,42 @@ let Ge = class extends dn {
     });
   }
 };
-Ge = _s([
-  Wt(0, L(Fe)),
-  Wt(1, L(bt)),
-  Wt(2, L(ye))
-], Ge);
-var Ss = Object.defineProperty, Cs = Object.getOwnPropertyDescriptor, ws = (e, t, o, n) => {
+Ze = _s([
+  Ht(0, b(Fe)),
+  Ht(1, b(bt)),
+  Ht(2, b(ye))
+], Ze);
+var Ss = Object.defineProperty, Cs = Object.getOwnPropertyDescriptor, Is = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? Cs(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && Ss(t, o, a), a;
-}, Ht = (e, t) => (o, n) => t(o, n, e);
-const Is = "SHEET_DATA_VALIDATION_UI_PLUGIN";
-var mt;
-let Bn = (mt = class extends Yn {
-  constructor(e = bo, t, o, n) {
+}, Yt = (e, t) => (o, n) => t(o, n, e);
+const ws = "SHEET_DATA_VALIDATION_UI_PLUGIN";
+var ft;
+let $n = (ft = class extends Yn {
+  constructor(e = Mo, t, o, n) {
     super(), this._config = e, this._injector = t, this._commandService = o, this._configService = n;
     const { menu: a, ...i } = this._config;
     a && this._configService.setConfig("menu", a, { merge: !0 }), this._configService.setConfig(wn, i);
   }
   onStarting() {
     [
-      [pe],
-      [Ce],
-      [it],
-      [Ye],
+      [me],
+      [Ie],
+      [rt],
+      [Xe],
+      [Ge],
       [Ke],
       [ze],
-      [Xe],
-      [at],
-      [Ge]
+      [it],
+      [Ze]
     ].forEach((e) => {
       this._injector.add(e);
     }), [
+      Lt,
       Pt,
-      Ot,
       yo,
-      Cn,
+      In,
       Ue,
       Vo
     ].forEach((e) => {
@@ -2968,53 +2963,53 @@ let Bn = (mt = class extends Yn {
     });
   }
   onReady() {
-    this._injector.get(Xe), this._injector.get(ze), this._injector.get(at), this._injector.get(it), this._injector.get(De).registerRenderModule(
+    this._injector.get(ze), this._injector.get(Ke), this._injector.get(it), this._injector.get(rt), this._injector.get(Ve).registerRenderModule(
       z.UNIVER_SHEET,
-      [It]
+      [Rt]
     );
   }
   onRendered() {
-    this._injector.get(Ge), this._injector.get(Ke);
+    this._injector.get(Ze), this._injector.get(Ge);
   }
   onSteady() {
-    this._injector.get(Ye);
-  }
-}, E(mt, "pluginName", Is), E(mt, "type", z.UNIVER_SHEET), mt);
-Bn = ws([
-  Ht(1, L(Fe)),
-  Ht(2, te),
-  Ht(3, ln)
-], Bn);
+    this._injector.get(Xe);
+  }
+}, M(ft, "pluginName", ws), M(ft, "type", z.UNIVER_SHEET), ft);
+$n = Is([
+  Yt(1, b(Fe)),
+  Yt(2, Q),
+  Yt(3, dn)
+], $n);
 var Rs = Object.defineProperty, Ds = Object.getOwnPropertyDescriptor, Vs = (e, t, o, n) => {
   for (var a = n > 1 ? void 0 : n ? Ds(t, o) : t, i = e.length - 1, r; i >= 0; i--)
     (r = e[i]) && (a = (n ? r(t, o, a) : r(a)) || a);
   return n && a && Rs(t, o, a), a;
-}, Yt = (e, t) => (o, n) => t(o, n, e);
+}, Xt = (e, t) => (o, n) => t(o, n, e);
 const ys = "SHEET_DATA_VALIDATION_UI_PLUGIN";
-var ft;
-let kn = (ft = class extends Yn {
-  constructor(e = bo, t, o, n) {
+var gt;
+let kn = (gt = class extends Yn {
+  constructor(e = Mo, t, o, n) {
     super(), this._config = e, this._injector = t, this._commandService = o, this._configService = n;
     const { menu: a, ...i } = this._config;
     a && this._configService.setConfig("menu", a, { merge: !0 }), this._configService.setConfig(wn, i);
   }
   onStarting() {
     [
-      [pe],
-      [Ce],
-      [it],
-      [Ye],
+      [me],
+      [Ie],
+      [rt],
+      [Xe],
+      [Ge],
       [Ke],
       [ze],
-      [Xe],
-      [Ge]
+      [Ze]
     ].forEach((e) => {
       this._injector.add(e);
     }), [
+      Lt,
       Pt,
-      Ot,
       yo,
-      Cn,
+      In,
       Ue,
       Vo
     ].forEach((e) => {
@@ -3022,26 +3017,26 @@ let kn = (ft = class extends Yn {
     });
   }
   onReady() {
-    this._injector.get(Xe), this._injector.get(ze), this._injector.get(De).registerRenderModule(
+    this._injector.get(ze), this._injector.get(Ke), this._injector.get(Ve).registerRenderModule(
       z.UNIVER_SHEET,
-      [It]
+      [Rt]
     );
   }
   onRendered() {
-    this._injector.get(Ge), this._injector.get(Ke);
+    this._injector.get(Ze), this._injector.get(Ge);
   }
   onSteady() {
-    this._injector.get(Ye);
+    this._injector.get(Xe);
   }
-}, E(ft, "pluginName", ys), E(ft, "type", z.UNIVER_SHEET), ft);
+}, M(gt, "pluginName", ys), M(gt, "type", z.UNIVER_SHEET), gt);
 kn = Vs([
-  Yt(1, L(Fe)),
-  Yt(2, te),
-  Yt(3, ln)
+  Xt(1, b(Fe)),
+  Xt(2, Q),
+  Xt(3, dn)
 ], kn);
 export {
-  Eo as DATE_DROPDOWN_KEY,
-  In as LIST_DROPDOWN_KEY,
+  bo as DATE_DROPDOWN_KEY,
+  Rn as LIST_DROPDOWN_KEY,
   kn as UniverSheetsDataValidationMobileUIPlugin,
-  Bn as UniverSheetsDataValidationUIPlugin
+  $n as UniverSheetsDataValidationUIPlugin
 };