@univerjs/sheets-data-validation-ui 0.7.0 → 0.8.0-beta.0

package/lib/es/index.js

@@ -1,33 +1,33 @@
 var Lr = Object.defineProperty;
 var kr = (e, t, r) => t in e ? Lr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var E = (e, t, r) => kr(e, typeof t != "symbol" ? t + "" : t, r);
-import { LocaleService as se, isFormulaString as De, DataValidationType as G, Tools as Zt, Inject as b, Injector as we, Disposable as Re, UniverInstanceType as Y, toDisposable as Nr, IUniverInstanceService as le, DataValidationErrorStyle as lt, DataValidationStatus as je, ICommandService as J, IConfigService as dn, DataValidationRenderMode as ie, DisposableCollection as Ur, dayjs as Mn, numfmt as Yn, CellValueType as Fr, CommandType as nt, ObjectMatrix as Rt, Range as xr, Rectangle as yt, queryObjectMatrix as qt, Optional as $r, RxDisposable as un, InterceptorEffectEnum as Xn, sequenceExecute as zn, bufferDebounceTime as Br, debounce as Hr, UndoCommand as Wr, RedoCommand as jr, isUnitRangesEqual as Yr, shallowEqual as bn, ThemeService as Kn, ColorKit as Xr, VerticalAlign as ae, HorizontalAlign as Ye, DEFAULT_STYLES as re, WrapStrategy as Ie, DocumentDataModel as zr, BooleanNumber as rt, DEFAULT_EMPTY_DOCUMENT_VALUE as Kr, Plugin as Gn, merge as Zn } from "@univerjs/core";
+import { LocaleService as se, isFormulaString as De, DataValidationType as G, Tools as Zt, Inject as b, Injector as we, Disposable as Re, UniverInstanceType as Y, toDisposable as Nr, IUniverInstanceService as le, DataValidationErrorStyle as lt, DataValidationStatus as Ye, ICommandService as J, IConfigService as cn, DataValidationRenderMode as ie, DisposableCollection as Ur, dayjs as Mn, numfmt as Yn, CellValueType as Fr, CommandType as nt, ObjectMatrix as Rt, Range as xr, Rectangle as yt, queryObjectMatrix as qt, Optional as $r, RxDisposable as un, InterceptorEffectEnum as Xn, sequenceExecute as zn, bufferDebounceTime as Hr, debounce as Br, UndoCommand as Wr, RedoCommand as jr, isUnitRangesEqual as Yr, shallowEqual as bn, ThemeService as Kn, ColorKit as Xr, VerticalAlign as ae, HorizontalAlign as Xe, DEFAULT_STYLES as re, WrapStrategy as Ie, DocumentDataModel as zr, BooleanNumber as rt, DEFAULT_EMPTY_DOCUMENT_VALUE as Kr, Plugin as Gn, merge as Zn } from "@univerjs/core";
 import { DataValidationFormulaController as Gr, deserializeListOptions as Zr, serializeListOptions as qn, CUSTOM_FORMULA_INPUT_NAME as Jn, BASE_FORMULA_INPUT_NAME as At, LIST_FORMULA_INPUT_NAME as hn, CHECKBOX_FORMULA_INPUT_NAME as Qn, SheetDataValidationModel as ee, SheetsDataValidationValidatorService as qr, getDataValidationCellValue as Ut, getCellValueOrigin as Q, createDefaultNewRule as er, AddSheetDataValidationCommand as gn, DATA_VALIDATION_PLUGIN_NAME as tr, getDataValidationDiffMutations as Jt, UpdateSheetDataValidationRangeCommand as nr, DataValidationCacheService as rr, UpdateSheetDataValidationSettingCommand as En, UpdateSheetDataValidationOptionsCommand as Jr, RemoveSheetDataValidationCommand as ir, RemoveSheetAllDataValidationCommand as Qr, DataValidationFormulaService as ei, CHECKBOX_FORMULA_2 as ti, CHECKBOX_FORMULA_1 as ni, getFormulaResult as Ft, isLegalFormulaResult as Dn, transformCheckboxValue as ri } from "@univerjs/sheets-data-validation";
-import { jsxs as W, Fragment as ct, jsx as _ } from "react/jsx-runtime";
-import { FormLayout as j, Input as Ve, Checkbox as Lt, clsx as Xe, borderClassName as Mt, RadioGroup as pn, Radio as Oe, DraggableList as ii, Dropdown as oi, Button as ze, Select as Vn } from "@univerjs/design";
-import { useDependency as U, useSidebarClick as or, useObservable as Te, useEvent as Qt, ISidebarService as ar, IDialogService as ai, IZenZoneService as sr, KeyCode as gt, MenuItemType as vn, getMenuHiddenObservable as si, RibbonStartGroup as li, IMenuManagerService as ci, ComponentManager as mn } from "@univerjs/ui";
-import On, { useState as H, useRef as ht, forwardRef as Le, createElement as ke, useMemo as dt, useEffect as Pe } from "react";
-import { FormulaEditor as lr, RangeSelector as di } from "@univerjs/sheets-formula-ui";
+import { jsxs as W, Fragment as dt, jsx as _ } from "react/jsx-runtime";
+import { FormLayout as j, Input as Ve, Checkbox as Lt, clsx as Ae, borderClassName as Mt, RadioGroup as pn, Radio as Oe, DraggableList as ii, Dropdown as oi, Button as ze, Select as Vn } from "@univerjs/design";
+import { useDependency as U, useSidebarClick as or, useObservable as Te, useEvent as Qt, ISidebarService as ar, IDialogService as ai, IZenZoneService as sr, KeyCode as gt, MenuItemType as vn, getMenuHiddenObservable as si, RibbonDataGroup as li, IMenuManagerService as di, ComponentManager as mn } from "@univerjs/ui";
+import On, { useState as B, useRef as ht, forwardRef as ke, createElement as Ne, useMemo as ct, useEffect as Pe } from "react";
+import { FormulaEditor as lr, RangeSelector as ci } from "@univerjs/sheets-formula-ui";
 import { DataValidatorRegistryService as ye, DataValidationModel as fn, DataValidatorDropdownType as ge, DataValidatorRegistryScope as ui, TWO_FORMULA_OPERATOR_COUNT as hi, getRuleOptions as Tn, getRuleSetting as Pn } from "@univerjs/data-validation";
-import { debounceTime as cr, filter as _n, BehaviorSubject as An, distinctUntilChanged as gi, Subject as pi, bufferTime as dr, of as vi } from "rxjs";
-import { DeviceInputEventType as pt, IRenderManagerService as Ne, fixLineWidthByScale as Ln, Transform as mi, CheckboxShape as fi, getCurrentTypeOfRenderer as Ke, CURSOR_TYPE as Ge, FontCache as _i, Shape as Si, Rect as ur, getFontStyleString as xt, getDocsSkeletonPageSize as it, Documents as Ci, DocumentViewModel as Ii, DocumentSkeleton as wi } from "@univerjs/engine-render";
+import { debounceTime as dr, filter as _n, BehaviorSubject as An, distinctUntilChanged as gi, Subject as pi, bufferTime as cr, of as vi } from "rxjs";
+import { DeviceInputEventType as pt, IRenderManagerService as Ue, fixLineWidthByScale as Ln, Transform as mi, CheckboxShape as fi, getCurrentTypeOfRenderer as Ke, CURSOR_TYPE as Ge, FontCache as _i, Shape as Si, Rect as ur, getFontStyleString as xt, getDocsSkeletonPageSize as it, Documents as Ci, DocumentViewModel as Ii, DocumentSkeleton as wi } from "@univerjs/engine-render";
 import { SheetInterceptorService as Sn, VALIDATE_CELL as Ri, SheetsSelectionsService as hr, SetRangeValuesCommand as st, getSheetCommandTarget as gr, rangeToDiscreteRange as yi, SheetPermissionCheckController as Mi, WorksheetEditPermission as en, WorksheetSetCellStylePermission as tn, RangeProtectionPermissionEditPoint as nn, WorkbookEditablePermission as rn, INTERCEPTOR_POINT as pr, InterceptCellContentPriority as vr, checkRangesEditablePermission as bi } from "@univerjs/sheets";
 import { getPatternType as Ei } from "@univerjs/sheets-numfmt";
 import { ISheetCellDropdownManagerService as Di, IEditorBridgeService as mr, SetCellEditVisibleOperation as vt, HoverManagerService as Vi, CellAlertManagerService as Oi, CellAlertType as Ti, IAutoFillService as Pi, APPLY_TYPE as ot, virtualizeDiscreteRanges as on, getAutoFillRepeatRange as Ai, ISheetClipboardService as Li, COPY_TYPE as kn, PREDEFINED_HOOK_NAME as mt, getRepeatRange as Nn, getCurrentRangeDisable$ as ki, AutoHeightController as fr, SheetSkeletonManagerService as bt, IMarkSelectionService as Ni } from "@univerjs/sheets-ui";
 import { deserializeRangeWithSheet as Ui, serializeRange as _r } from "@univerjs/engine-formula";
 const Fi = (e) => {
   const { isTwoFormula: t = !1, value: r, onChange: n, showError: i, validResult: o } = e, a = U(se), l = i ? o == null ? void 0 : o.formula1 : "", s = i ? o == null ? void 0 : o.formula2 : "";
-  return t ? /* @__PURE__ */ W(ct, { children: [
+  return t ? /* @__PURE__ */ W(dt, { children: [
     /* @__PURE__ */ _(j, { error: l, children: /* @__PURE__ */ _(
       Ve,
       {
         className: "univer-w-full",
         placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
         value: r == null ? void 0 : r.formula1,
-        onChange: (c) => {
+        onChange: (d) => {
           n == null || n({
             ...r,
-            formula1: c
+            formula1: d
           });
         }
       }
@@ -39,10 +39,10 @@ const Fi = (e) => {
         className: "univer-w-full",
         placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
         value: r == null ? void 0 : r.formula2,
-        onChange: (c) => {
+        onChange: (d) => {
           n == null || n({
             ...r,
-            formula2: c
+            formula2: d
           });
         }
       }
@@ -53,21 +53,21 @@ const Fi = (e) => {
       className: "univer-w-full",
       placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
       value: r == null ? void 0 : r.formula1,
-      onChange: (c) => {
-        n == null || n({ formula1: c });
+      onChange: (d) => {
+        n == null || n({ formula1: d });
       }
     }
   ) });
 };
 function xi(e) {
-  const { value: t, onChange: r, showError: n, validResult: i } = e, o = U(se), a = n ? i == null ? void 0 : i.formula1 : "", l = n ? i == null ? void 0 : i.formula2 : "", [s, c] = H(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
-  return /* @__PURE__ */ W(ct, { children: [
+  const { value: t, onChange: r, showError: n, validResult: i } = e, o = U(se), a = n ? i == null ? void 0 : i.formula1 : "", l = n ? i == null ? void 0 : i.formula2 : "", [s, d] = B(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
+  return /* @__PURE__ */ W(dt, { children: [
     /* @__PURE__ */ _(j, { children: /* @__PURE__ */ _(
       Lt,
       {
         checked: s,
         onChange: (u) => {
-          u ? c(!0) : (c(!1), r == null || r({
+          u ? d(!0) : (d(!1), r == null || r({
             ...t,
             formula1: void 0,
             formula2: void 0
@@ -108,22 +108,22 @@ function xi(e) {
 }
 function $i(e) {
   var h;
-  const { unitId: t, subUnitId: r, value: n, onChange: i, showError: o, validResult: a } = e, l = o ? a == null ? void 0 : a.formula1 : void 0, s = ht(null), [c, u] = H(!1);
-  return or((d) => {
+  const { unitId: t, subUnitId: r, value: n, onChange: i, showError: o, validResult: a } = e, l = o ? a == null ? void 0 : a.formula1 : void 0, s = ht(null), [d, u] = B(!1);
+  return or((c) => {
     var g;
-    ((g = s.current) == null ? void 0 : g.isClickOutSide(d)) && u(!1);
+    ((g = s.current) == null ? void 0 : g.isClickOutSide(c)) && u(!1);
   }), /* @__PURE__ */ _(j, { error: l, children: /* @__PURE__ */ _(
     lr,
     {
       ref: s,
-      className: Xe("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent dark:univer-bg-gray-700 dark:univer-text-white hover:univer-border-primary-600", Mt),
+      className: Ae("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent dark:!univer-bg-gray-700 dark:!univer-text-white hover:univer-border-primary-600", Mt),
       initValue: (h = n == null ? void 0 : n.formula1) != null ? h : "=",
       unitId: t,
       subUnitId: r,
-      isFocus: c,
+      isFocus: d,
       isSupportAcrossSheet: !0,
-      onChange: (d) => {
-        const m = (d != null ? d : "").trim();
+      onChange: (c) => {
+        const m = (c != null ? c : "").trim();
         m !== (n == null ? void 0 : n.formula1) && (i == null || i({
           ...n,
           formula1: m
@@ -141,23 +141,23 @@ var oe = function() {
     }
     return e;
   }, oe.apply(this, arguments);
-}, Bi = function(e, t) {
+}, Hi = function(e, t) {
   var r = {};
   for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && t.indexOf(n) < 0 && (r[n] = e[n]);
   if (e != null && typeof Object.getOwnPropertySymbols == "function")
     for (var i = 0, n = Object.getOwnPropertySymbols(e); i < n.length; i++)
       t.indexOf(n[i]) < 0 && Object.prototype.propertyIsEnumerable.call(e, n[i]) && (r[n[i]] = e[n[i]]);
   return r;
-}, Ue = Le(function(e, t) {
-  var r = e.icon, n = e.id, i = e.className, o = e.extend, a = Bi(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), s = ht("_".concat(ji()));
+}, Fe = ke(function(e, t) {
+  var r = e.icon, n = e.id, i = e.className, o = e.extend, a = Hi(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), s = ht("_".concat(ji()));
   return Sr(r, "".concat(n), { defIds: r.defIds, idSuffix: s.current }, oe({ ref: t, className: l }, a), o);
 });
 function Sr(e, t, r, n, i) {
-  return ke(e.tag, oe(oe({ key: t }, Hi(e, r, i)), n), (Wi(e, r).children || []).map(function(o, a) {
+  return Ne(e.tag, oe(oe({ key: t }, Bi(e, r, i)), n), (Wi(e, r).children || []).map(function(o, a) {
     return Sr(o, "".concat(t, "-").concat(e.tag, "-").concat(a), r, void 0, i);
   }));
 }
-function Hi(e, t, r) {
+function Bi(e, t, r) {
   var n = oe({}, e.attrs);
   r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1), e.tag === "mask" && n.id && (n.id = n.id + t.idSuffix), Object.entries(n).forEach(function(o) {
     var a = o[0], l = o[1];
@@ -178,56 +178,56 @@ function Wi(e, t) {
 function ji() {
   return Math.random().toString(36).substring(2, 8);
 }
-Ue.displayName = "UniverIcon";
-var Yi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M1.4917 3.07803C1.4917 2.19437 2.20804 1.47803 3.0917 1.47803H5.6917C6.57536 1.47803 7.2917 2.19437 7.2917 3.07803V5.67803C7.2917 6.56168 6.57535 7.27803 5.6917 7.27803H3.0917C2.20804 7.27803 1.4917 6.56168 1.4917 5.67803V3.07803ZM3.0917 2.67803C2.87078 2.67803 2.6917 2.85711 2.6917 3.07803V5.67803C2.6917 5.89894 2.87079 6.07803 3.0917 6.07803H5.6917C5.91261 6.07803 6.0917 5.89894 6.0917 5.67803V3.07803C6.0917 2.85711 5.91261 2.67803 5.6917 2.67803H3.0917Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M14.6175 2.45279C14.8518 2.68711 14.8518 3.06701 14.6175 3.30132L11.6151 6.30365C11.3957 6.52307 11.0451 6.53897 10.8067 6.34031L8.80915 4.67566C8.55458 4.46352 8.52019 4.08518 8.73233 3.83062 8.94447 3.57605 9.32281 3.54166 9.57737 3.7538L11.154 5.06767 13.769 2.45278C14.0033 2.21847 14.3832 2.21848 14.6175 2.45279zM14.1175 9.19746C14.3518 9.43178 14.3518 9.81168 14.1175 10.046L12.5418 11.6217 14.1175 13.1975C14.3518 13.4318 14.3518 13.8117 14.1175 14.046 13.8832 14.2803 13.5033 14.2803 13.269 14.046L11.6933 12.4703 10.1175 14.046C9.88321 14.2803 9.50331 14.2803 9.269 14.046 9.03468 13.8117 9.03468 13.4318 9.269 13.1975L10.8447 11.6217 9.269 10.046C9.03468 9.81168 9.03468 9.43178 9.269 9.19746 9.50331 8.96315 9.88321 8.96315 10.1175 9.19746L11.6933 10.7732 13.269 9.19746C13.5033 8.96315 13.8832 8.96315 14.1175 9.19746z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M3.0917 8.72168C2.20804 8.72168 1.4917 9.43802 1.4917 10.3217V12.9217C1.4917 13.8053 2.20804 14.5217 3.0917 14.5217H5.6917C6.57535 14.5217 7.2917 13.8053 7.2917 12.9217V10.3217C7.2917 9.43802 6.57536 8.72168 5.6917 8.72168H3.0917ZM2.6917 10.3217C2.6917 10.1008 2.87078 9.92168 3.0917 9.92168H5.6917C5.91261 9.92168 6.0917 10.1008 6.0917 10.3217V12.9217C6.0917 13.1426 5.91261 13.3217 5.6917 13.3217H3.0917C2.87079 13.3217 2.6917 13.1426 2.6917 12.9217V10.3217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Cr = Le(function(e, t) {
-  return ke(Ue, Object.assign({}, e, {
+Fe.displayName = "UniverIcon";
+var Yi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M1.4917 3.07803C1.4917 2.19437 2.20804 1.47803 3.0917 1.47803H5.6917C6.57536 1.47803 7.2917 2.19437 7.2917 3.07803V5.67803C7.2917 6.56168 6.57535 7.27803 5.6917 7.27803H3.0917C2.20804 7.27803 1.4917 6.56168 1.4917 5.67803V3.07803ZM3.0917 2.67803C2.87078 2.67803 2.6917 2.85711 2.6917 3.07803V5.67803C2.6917 5.89894 2.87079 6.07803 3.0917 6.07803H5.6917C5.91261 6.07803 6.0917 5.89894 6.0917 5.67803V3.07803C6.0917 2.85711 5.91261 2.67803 5.6917 2.67803H3.0917Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M14.6175 2.45279C14.8518 2.68711 14.8518 3.06701 14.6175 3.30132L11.6151 6.30365C11.3957 6.52307 11.0451 6.53897 10.8067 6.34031L8.80915 4.67566C8.55458 4.46352 8.52019 4.08518 8.73233 3.83062 8.94447 3.57605 9.32281 3.54166 9.57737 3.7538L11.154 5.06767 13.769 2.45278C14.0033 2.21847 14.3832 2.21848 14.6175 2.45279zM14.1175 9.19746C14.3518 9.43178 14.3518 9.81168 14.1175 10.046L12.5418 11.6217 14.1175 13.1975C14.3518 13.4318 14.3518 13.8117 14.1175 14.046 13.8832 14.2803 13.5033 14.2803 13.269 14.046L11.6933 12.4703 10.1175 14.046C9.88321 14.2803 9.50331 14.2803 9.269 14.046 9.03468 13.8117 9.03468 13.4318 9.269 13.1975L10.8447 11.6217 9.269 10.046C9.03468 9.81168 9.03468 9.43178 9.269 9.19746 9.50331 8.96315 9.88321 8.96315 10.1175 9.19746L11.6933 10.7732 13.269 9.19746C13.5033 8.96315 13.8832 8.96315 14.1175 9.19746z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M3.0917 8.72168C2.20804 8.72168 1.4917 9.43802 1.4917 10.3217V12.9217C1.4917 13.8053 2.20804 14.5217 3.0917 14.5217H5.6917C6.57535 14.5217 7.2917 13.8053 7.2917 12.9217V10.3217C7.2917 9.43802 6.57536 8.72168 5.6917 8.72168H3.0917ZM2.6917 10.3217C2.6917 10.1008 2.87078 9.92168 3.0917 9.92168H5.6917C5.91261 9.92168 6.0917 10.1008 6.0917 10.3217V12.9217C6.0917 13.1426 5.91261 13.3217 5.6917 13.3217H3.0917C2.87079 13.3217 2.6917 13.1426 2.6917 12.9217V10.3217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Cr = ke(function(e, t) {
+  return Ne(Fe, Object.assign({}, e, {
     id: "data-validation-single",
     ref: t,
     icon: Yi
   }));
 });
 Cr.displayName = "DataValidationSingle";
-var Xi = { 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" } }] }, Cn = Le(function(e, t) {
-  return ke(Ue, Object.assign({}, e, {
+var Xi = { 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" } }] }, Cn = ke(function(e, t) {
+  return Ne(Fe, Object.assign({}, e, {
     id: "delete-single",
     ref: t,
     icon: Xi
   }));
 });
 Cn.displayName = "DeleteSingle";
-var zi = { 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" } }] }, Ir = Le(function(e, t) {
-  return ke(Ue, Object.assign({}, e, {
+var zi = { 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" } }] }, Ir = ke(function(e, t) {
+  return Ne(Fe, Object.assign({}, e, {
     id: "increase-single",
     ref: t,
     icon: zi
   }));
 });
 Ir.displayName = "IncreaseSingle";
-var Ki = { 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" } }] }, In = Le(function(e, t) {
-  return ke(Ue, Object.assign({}, e, {
+var Ki = { 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" } }] }, In = ke(function(e, t) {
+  return Ne(Fe, Object.assign({}, e, {
     id: "more-down-single",
     ref: t,
     icon: Ki
   }));
 });
 In.displayName = "MoreDownSingle";
-var Gi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M4.64645 9.85355C4.45118 9.65829 4.45118 9.34171 4.64645 9.14645L7.64645 6.14645C7.84171 5.95118 8.15829 5.95118 8.35355 6.14645L11.3536 9.14645C11.5488 9.34171 11.5488 9.65829 11.3536 9.85355C11.1583 10.0488 10.8417 10.0488 10.6464 9.85355L8 7.20711L5.35355 9.85355C5.15829 10.0488 4.84171 10.0488 4.64645 9.85355Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, wr = Le(function(e, t) {
-  return ke(Ue, Object.assign({}, e, {
+var Gi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M4.64645 9.85355C4.45118 9.65829 4.45118 9.34171 4.64645 9.14645L7.64645 6.14645C7.84171 5.95118 8.15829 5.95118 8.35355 6.14645L11.3536 9.14645C11.5488 9.34171 11.5488 9.65829 11.3536 9.85355C11.1583 10.0488 10.8417 10.0488 10.6464 9.85355L8 7.20711L5.35355 9.85355C5.15829 10.0488 4.84171 10.0488 4.64645 9.85355Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, wr = ke(function(e, t) {
+  return Ne(Fe, Object.assign({}, e, {
     id: "more-up-single",
     ref: t,
     icon: Gi
   }));
 });
 wr.displayName = "MoreUpSingle";
-var Zi = { 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" } }] }] }, Rr = Le(function(e, t) {
-  return ke(Ue, Object.assign({}, e, {
+var Zi = { 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" } }] }] }, Rr = ke(function(e, t) {
+  return Ne(Fe, Object.assign({}, e, {
     id: "sequence-single",
     ref: t,
     icon: Zi
   }));
 });
 Rr.displayName = "SequenceSingle";
-const He = "#ECECEC", qi = [
+const We = "#ECECEC", qi = [
   "#FFFFFF",
   "#FEE7E7",
   "#FEF0E6",
@@ -253,7 +253,7 @@ const He = "#ECECEC", qi = [
   "#9E6DE3",
   "#F248A6"
 ], Ji = (e) => {
-  const { value: t, onChange: r, disabled: n } = e, [i, o] = H(!1);
+  const { value: t, onChange: r, disabled: n } = e, [i, o] = B(!1);
   return /* @__PURE__ */ _(
     oi,
     {
@@ -269,7 +269,7 @@ const He = "#ECECEC", qi = [
             (a) => /* @__PURE__ */ _(
               "div",
               {
-                className: Xe("univer-box-border univer-size-4 univer-cursor-pointer univer-rounded", Mt),
+                className: Ae("univer-box-border univer-size-4 univer-cursor-pointer univer-rounded", Mt),
                 style: { background: a },
                 onClick: () => {
                   r(a), o(!1);
@@ -283,7 +283,7 @@ const He = "#ECECEC", qi = [
       children: /* @__PURE__ */ W(
         "div",
         {
-          className: Xe("univer-box-border univer-inline-flex univer-h-8 univer-w-16 univer-cursor-pointer univer-items-center univer-justify-between univer-gap-2 univer-rounded-lg univer-bg-white univer-px-2.5 univer-transition-colors univer-duration-200 dark:univer-bg-gray-700 dark:univer-text-white hover:univer-border-primary-600", Mt),
+          className: Ae("univer-box-border univer-inline-flex univer-h-8 univer-w-16 univer-cursor-pointer univer-items-center univer-justify-between univer-gap-2 univer-rounded-lg univer-bg-white univer-px-2.5 univer-transition-colors univer-duration-200 dark:!univer-bg-gray-700 dark:!univer-text-white hover:univer-border-primary-600", Mt),
           children: [
             /* @__PURE__ */ _(
               "div",
@@ -299,9 +299,9 @@ const He = "#ECECEC", qi = [
     }
   );
 }, Un = (e) => {
-  const { item: t, commonProps: r, style: n } = e, { onItemChange: i, onItemDelete: o } = r;
-  return /* @__PURE__ */ W("div", { className: "univer-flex univer-items-center univer-gap-2", style: n, children: [
-    t.isRef ? null : /* @__PURE__ */ _("div", { className: Xe("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ _(Rr, {}) }),
+  const { item: t, commonProps: r, className: n } = e, { onItemChange: i, onItemDelete: o } = r;
+  return /* @__PURE__ */ W("div", { className: Ae("univer-flex univer-items-center univer-gap-2", n), children: [
+    !t.isRef && /* @__PURE__ */ _("div", { className: Ae("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ _(Rr, {}) }),
     /* @__PURE__ */ _(
       Ji,
       {
@@ -332,14 +332,14 @@ const He = "#ECECEC", qi = [
 };
 function Qi(e) {
   const { value: t, onChange: r = () => {
-  }, unitId: n, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: c = "" } = t || {}, [u, h] = H(() => De(s) ? "1" : "0"), [d, m] = H(u === "1" ? s : "="), [g, M] = H(u === "1" ? s : "="), y = U(se), p = U(ye), S = U(fn), v = U(Gr), [C, w] = H(() => c.split(",")), I = p.getValidatorItem(G.LIST), [R, T] = H([]), [N, D] = H(""), P = a ? o == null ? void 0 : o.formula1 : "", A = dt(() => S.ruleChange$.pipe(cr(16)), []), L = Te(A), V = Qt(r);
+  }, unitId: n, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, h] = B(() => De(s) ? "1" : "0"), [c, m] = B(u === "1" ? s : "="), [g, M] = B(u === "1" ? s : "="), y = U(se), p = U(ye), S = U(fn), v = U(Gr), [C, w] = B(() => d.split(",")), I = p.getValidatorItem(G.LIST), [R, T] = B([]), [N, D] = B(""), P = a ? o == null ? void 0 : o.formula1 : "", A = ct(() => S.ruleChange$.pipe(dr(16)), []), L = Te(A), V = Qt(r);
   Pe(() => {
     (async () => {
       await new Promise((f) => {
         setTimeout(() => f(!0), 100);
       });
-      const O = S.getRuleById(n, i, l), B = O == null ? void 0 : O.formula1;
-      if (De(B) && I && O) {
+      const O = S.getRuleById(n, i, l), H = O == null ? void 0 : O.formula1;
+      if (De(H) && I && O) {
         const f = await I.getListAsync(O, n, i);
         T(f);
       }
@@ -347,37 +347,37 @@ function Qi(e) {
   }, [S, L, I, l, i, n]), Pe(() => {
     De(s) && s !== g && (m(s), M(g));
   }, [g, s]);
-  const [F, x] = H(() => {
-    const O = u !== "1" ? Zr(s) : [], B = c.split(",");
+  const [F, x] = B(() => {
+    const O = u !== "1" ? Zr(s) : [], H = d.split(",");
     return O.map((f, k) => ({
       label: f,
-      color: B[k] || He,
+      color: H[k] || We,
       isRef: !1,
       id: Zt.generateRandomId(4)
     }));
-  }), X = (O, B, f) => {
+  }), X = (O, H, f) => {
     const k = F.find(($) => $.id === O);
-    k && (k.label = B, k.color = f, x([...F]));
+    k && (k.label = H, k.color = f, x([...F]));
   }, Z = (O) => {
-    const B = F.findIndex((f) => f.id === O);
-    B !== -1 && (F.splice(B, 1), x([...F]));
-  }, z = c.split(","), te = dt(() => R.map((O, B) => ({
+    const H = F.findIndex((f) => f.id === O);
+    H !== -1 && (F.splice(H, 1), x([...F]));
+  }, z = d.split(","), te = ct(() => R.map((O, H) => ({
     label: O,
-    color: z[B] || He,
-    id: `${B}`,
+    color: z[H] || We,
+    id: `${H}`,
     isRef: !0
-  })), [z, R]), pe = (O, B, f) => {
+  })), [z, R]), pe = (O, H, f) => {
     const k = [...C];
     k[+O] = f, w(k), V({
       formula1: s,
       formula2: k.join(",")
     });
-  }, ce = () => {
+  }, de = () => {
     x([
       ...F,
       {
         label: "",
-        color: He,
+        color: We,
         isRef: !1,
         id: Zt.generateRandomId(4)
       }
@@ -386,42 +386,42 @@ function Qi(e) {
   Pe(() => {
     if (u === "1")
       return;
-    const O = /* @__PURE__ */ new Set(), B = [];
+    const O = /* @__PURE__ */ new Set(), H = [];
     F.map((f) => ({
       labelList: f.label.split(","),
       item: f
     })).forEach(({ item: f, labelList: k }) => {
       k.forEach(($) => {
-        O.has($) || (O.add($), B.push({
+        O.has($) || (O.add($), H.push({
           label: $,
           color: f.color
         }));
       });
     }), V({
-      formula1: qn(B.map((f) => f.label)),
-      formula2: B.map((f) => f.color === He ? "" : f.color).join(",")
+      formula1: qn(H.map((f) => f.label)),
+      formula2: H.map((f) => f.color === We ? "" : f.color).join(",")
     });
   }, [F, V, u, g, C]);
   const ne = Qt(async (O) => {
     if (!De(O)) {
       V == null || V({
         formula1: "",
-        formula2: c
+        formula2: d
       });
       return;
     }
     v.getFormulaRefCheck(O) ? (V == null || V({
       formula1: De(O) ? O : "",
-      formula2: c
+      formula2: d
     }), D("")) : (V == null || V({
       formula1: "",
-      formula2: c
+      formula2: d
     }), m("="), D(y.t("dataValidation.validFail.formulaError")));
-  }), de = ht(null), [Se, ve] = H(!1);
+  }), ce = ht(null), [Se, ve] = B(!1);
   return or((O) => {
     var f;
-    ((f = de.current) == null ? void 0 : f.isClickOutSide(O)) && ve(!1);
-  }), /* @__PURE__ */ W(ct, { children: [
+    ((f = ce.current) == null ? void 0 : f.isClickOutSide(O)) && ve(!1);
+  }), /* @__PURE__ */ W(dt, { children: [
     /* @__PURE__ */ _(j, { label: y.t("dataValidation.list.options"), children: /* @__PURE__ */ W(
       pn,
       {
@@ -442,30 +442,30 @@ function Qi(e) {
       /* @__PURE__ */ _(
         lr,
         {
-          ref: de,
-          className: Xe("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent dark:univer-bg-gray-700 dark:univer-text-white hover:univer-border-primary-600", Mt),
-          initValue: d,
+          ref: ce,
+          className: Ae("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent dark:!univer-bg-gray-700 dark:!univer-text-white hover:univer-border-primary-600", Mt),
+          initValue: c,
           unitId: n,
           subUnitId: i,
           isFocus: Se,
           isSupportAcrossSheet: !0,
           onFocus: () => ve(!0),
           onChange: (O = "") => {
-            const B = (O != null ? O : "").trim();
-            M(B), ne(B);
+            const H = (O != null ? O : "").trim();
+            M(H), ne(H);
           }
         }
       ),
-      te.length > 0 && /* @__PURE__ */ _("div", { style: { marginTop: "12px" }, children: te.map((O) => /* @__PURE__ */ _(
+      te.length > 0 && /* @__PURE__ */ _("div", { className: "univer-mt-3", children: te.map((O) => /* @__PURE__ */ _(
         Un,
         {
+          className: "univer-mb-3",
           item: O,
-          commonProps: { onItemChange: pe },
-          style: { marginBottom: 12 }
+          commonProps: { onItemChange: pe }
         },
         O.id
       )) })
-    ] }) : /* @__PURE__ */ _(j, { error: P, children: /* @__PURE__ */ W("div", { style: { marginTop: "-12px" }, children: [
+    ] }) : /* @__PURE__ */ _(j, { error: P, children: /* @__PURE__ */ W("div", { className: "-univer-mt-3", children: [
       /* @__PURE__ */ _(
         ii,
         {
@@ -491,8 +491,8 @@ function Qi(e) {
       /* @__PURE__ */ W(
         "a",
         {
-          className: "univer-flex univer-w-fit univer-cursor-pointer univer-flex-row univer-items-center univer-rounded univer-p-1 univer-px-2 univer-text-sm univer-text-primary hover:univer-bg-primary-50",
-          onClick: ce,
+          className: "univer-flex univer-w-fit univer-cursor-pointer univer-flex-row univer-items-center univer-rounded univer-p-1 univer-px-2 univer-text-sm univer-text-primary dark:hover:!univer-bg-gray-800 hover:univer-bg-primary-50",
+          onClick: de,
           children: [
             /* @__PURE__ */ _(Ir, { className: "univer-mr-1" }),
             y.t("dataValidation.list.add")
@@ -596,7 +596,7 @@ var ao = Object.getOwnPropertyDescriptor, so = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? ao(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, xe = (e, t) => (r, n) => t(r, n, e);
+}, $e = (e, t) => (r, n) => t(r, n, e);
 let Ze = class extends Re {
   constructor(e, t, r, n, i, o) {
     super(), this._sheetInterceptorService = e, this._dataValidationModel = t, this._dataValidatorRegistryService = r, this._dialogService = n, this._localeService = i, this._sheetsDataValidationValidatorService = o, this._initEditorBridgeInterceptor();
@@ -606,20 +606,20 @@ let Ze = class extends Re {
       Ri,
       {
         handler: async (e, t, r) => {
-          const n = await e, { row: i, col: o, unitId: a, subUnitId: l } = t, s = this._dataValidationModel.getRuleIdByLocation(a, l, i, o), c = s ? this._dataValidationModel.getRuleById(a, l, s) : void 0;
+          const n = await e, { row: i, col: o, unitId: a, subUnitId: l } = t, s = this._dataValidationModel.getRuleIdByLocation(a, l, i, o), d = s ? this._dataValidationModel.getRuleById(a, l, s) : void 0;
           if (n === !1)
             return r(Promise.resolve(!1));
-          if (!c || c.errorStyle !== lt.STOP)
+          if (!d || d.errorStyle !== lt.STOP)
             return r(Promise.resolve(!0));
-          const u = this._dataValidatorRegistryService.getValidatorItem(c.type);
-          return !u || await this._sheetsDataValidationValidatorService.validatorCell(a, l, i, o) === je.VALID ? r(Promise.resolve(!0)) : (this._dialogService.open({
+          const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
+          return !u || await this._sheetsDataValidationValidatorService.validatorCell(a, l, i, o) === Ye.VALID ? r(Promise.resolve(!0)) : (this._dialogService.open({
             width: 368,
             title: {
               title: this._localeService.t("dataValidation.alert.title")
             },
             id: "reject-input-dialog",
             children: {
-              title: u.getRuleFinalError(c, { row: i, col: o, unitId: a, subUnitId: l })
+              title: u.getRuleFinalError(d, { row: i, col: o, unitId: a, subUnitId: l })
             },
             footer: {
               title: On.createElement(
@@ -666,12 +666,12 @@ let Ze = class extends Re {
   }
 };
 Ze = so([
-  xe(0, b(Sn)),
-  xe(1, b(ee)),
-  xe(2, b(ye)),
-  xe(3, ai),
-  xe(4, b(se)),
-  xe(5, b(qr))
+  $e(0, b(Sn)),
+  $e(1, b(ee)),
+  $e(2, b(ye)),
+  $e(3, ai),
+  $e(4, b(se)),
+  $e(5, b(qr))
 ], Ze);
 var lo = Object.getOwnPropertyDescriptor, co = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? lo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
@@ -700,15 +700,15 @@ function uo(e, t) {
       return "HH:mm:ss";
   }
 }
-let Ae = class extends Re {
-  constructor(t, r, n, i, o, a, l, s, c, u, h) {
+let Le = class extends Re {
+  constructor(t, r, n, i, o, a, l, s, d, u, h) {
     super();
     E(this, "_activeDropdown");
     E(this, "_activeDropdown$", new pi());
     E(this, "_currentPopup", null);
     E(this, "activeDropdown$", this._activeDropdown$.asObservable());
     E(this, "_zenVisible", !1);
-    this._univerInstanceService = t, this._dataValidatorRegistryService = r, this._zenZoneService = n, this._dataValidationModel = i, this._sheetsSelectionsService = o, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = c, this._injector = u, this._configService = h, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
+    this._univerInstanceService = t, this._dataValidatorRegistryService = r, this._zenZoneService = n, this._dataValidationModel = i, this._sheetsSelectionsService = o, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = d, this._injector = u, this._configService = h, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
   }
@@ -745,19 +745,19 @@ let Ae = class extends Re {
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
     this._activeDropdown = t, this._activeDropdown$.next(this._activeDropdown);
-    const c = this._sheetDataValidationModel.getRuleByLocation(o, a, n, i);
-    if (!c)
+    const d = this._sheetDataValidationModel.getRuleByLocation(o, a, n, i);
+    if (!d)
       return;
-    const u = this._dataValidatorRegistryService.getValidatorItem(c.type);
+    const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
     if (!(u != null && u.dropdownType))
       return;
     let h;
-    const d = async (v, C) => {
+    const c = async (v, C) => {
       var A, L, V;
       if (!v)
         return !0;
       const w = v, I = s.getCell(n, i), R = w.format(C === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), T = (A = Yn.parseDate(R)) == null ? void 0 : A.v, N = C === "time" ? T % 1 : T, D = l.getStyles().getStyleByCell(I), P = (V = (L = D == null ? void 0 : D.n) == null ? void 0 : L.pattern) != null ? V : "";
-      return c.errorStyle !== lt.STOP || await u.validator({
+      return d.errorStyle !== lt.STOP || await u.validator({
         value: N,
         unitId: o,
         subUnitId: a,
@@ -767,7 +767,7 @@ let Ae = class extends Re {
         workbook: l,
         interceptValue: R.replace("Z", "").replace("T", " "),
         t: Fr.NUMBER
-      }, c) ? (await this._commandService.executeCommand(vt.id, {
+      }, d) ? (await this._commandService.executeCommand(vt.id, {
         visible: !1,
         eventType: pt.Keyboard,
         unitId: o,
@@ -793,18 +793,18 @@ let Ae = class extends Re {
             }
           }
         }
-      }), !0) : (this._injector.has(Ze) && this._injector.get(Ze).showReject(u.getRuleFinalError(c, { row: n, col: i, unitId: o, subUnitId: a })), !1);
+      }), !0) : (this._injector.has(Ze) && this._injector.get(Ze).showReject(u.getRuleFinalError(d, { row: n, col: i, unitId: o, subUnitId: a })), !1);
     };
     let m;
     switch (u.dropdownType) {
       case ge.DATE: {
-        const v = Q(s.getCellRaw(n, i)), C = $t(v), w = !!((M = c.bizInfo) != null && M.showTime);
+        const v = Q(s.getCellRaw(n, i)), C = $t(v), w = !!((M = d.bizInfo) != null && M.showTime);
         m = {
           location: r,
           type: "datepicker",
           props: {
             showTime: w,
-            onChange: (I) => d(I, w ? "datetime" : "date"),
+            onChange: (I) => c(I, w ? "datetime" : "date"),
             defaultValue: C,
             patternType: "date"
           }
@@ -817,7 +817,7 @@ let Ae = class extends Re {
           location: r,
           type: "datepicker",
           props: {
-            onChange: (w) => d(w, "time"),
+            onChange: (w) => c(w, "time"),
             defaultValue: C,
             patternType: "time"
           }
@@ -830,7 +830,7 @@ let Ae = class extends Re {
           location: r,
           type: "datepicker",
           props: {
-            onChange: (w) => d(w, "datetime"),
+            onChange: (w) => c(w, "datetime"),
             defaultValue: C,
             patternType: "datetime"
           }
@@ -862,9 +862,9 @@ let Ae = class extends Re {
             unitId: o,
             keycode: gt.ESC
           }), this._commandService.executeCommand(st.id, A), !v;
-        }, w = (c == null ? void 0 : c.renderMode) === ie.CUSTOM || (c == null ? void 0 : c.renderMode) === void 0, I = u.getListWithColor(c, o, a), R = Ut(s.getCellRaw(n, i)), T = () => {
-          this._commandService.executeCommand(Fe.id, {
-            ruleId: c.uid
+        }, w = (d == null ? void 0 : d.renderMode) === ie.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, I = u.getListWithColor(d, o, a), R = Ut(s.getCellRaw(n, i)), T = () => {
+          this._commandService.executeCommand(xe.id, {
+            ruleId: d.uid
           }), h == null || h.dispose();
         }, N = I.map((D) => ({
           label: D.label,
@@ -914,7 +914,7 @@ let Ae = class extends Re {
               }), this._commandService.syncExecuteCommand(st.id, w), !0;
             },
             defaultValue: Ut(s.getCellRaw(n, i)).split("/"),
-            options: JSON.parse((S = c.formula1) != null ? S : "[]")
+            options: JSON.parse((S = d.formula1) != null ? S : "[]")
           },
           location: r
         };
@@ -980,8 +980,8 @@ let Ae = class extends Re {
     const s = this._dataValidationModel.getRuleByLocation(a.getUnitId(), l.getSheetId(), n, i);
     if (!s)
       return;
-    const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
-    if (!c || !c.dropdownType) {
+    const d = this._dataValidatorRegistryService.getValidatorItem(s.type);
+    if (!d || !d.dropdownType) {
       this.hideDropdown();
       return;
     }
@@ -998,7 +998,7 @@ let Ae = class extends Re {
     });
   }
 };
-Ae = co([
+Le = co([
   ue(0, le),
   ue(1, b(ye)),
   ue(2, sr),
@@ -1009,9 +1009,9 @@ Ae = co([
   ue(7, J),
   ue(8, mr),
   ue(9, b(we)),
-  ue(10, dn)
-], Ae);
-const Dt = "DataValidationPanel", Fe = {
+  ue(10, cn)
+], Le);
+const Dt = "DataValidationPanel", xe = {
   id: "data-validation.operation.open-validation-panel",
   type: nt.OPERATION,
   handler(e, t) {
@@ -1019,20 +1019,20 @@ const Dt = "DataValidationPanel", Fe = {
       return !1;
     const { ruleId: r, isAdd: n } = t, i = e.get(_e), o = e.get(fn), a = e.get(le), l = e.get(ar), s = gr(a);
     if (!s) return !1;
-    const { unitId: c, subUnitId: u } = s, h = r ? o.getRuleById(c, u, r) : void 0;
+    const { unitId: d, subUnitId: u } = s, h = r ? o.getRuleById(d, u, r) : void 0;
     i.open(), i.setActiveRule(h && {
-      unitId: c,
+      unitId: d,
       subUnitId: u,
       rule: h
     });
-    const d = l.open({
+    const c = l.open({
       id: Dt,
       header: { title: n ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
       children: { label: Dt },
       width: 312,
       onClose: () => i.close()
     });
-    return i.setCloseDisposable(d), !0;
+    return i.setCloseDisposable(c), !0;
   }
 }, Rn = {
   id: "data-validation.operation.close-validation-panel",
@@ -1045,7 +1045,7 @@ const Dt = "DataValidationPanel", Fe = {
   type: nt.OPERATION,
   handler(e) {
     const t = e.get(J), r = e.get(_e);
-    return r.open(), r.isOpen ? t.executeCommand(Rn.id) : t.executeCommand(Fe.id), !0;
+    return r.open(), r.isOpen ? t.executeCommand(Rn.id) : t.executeCommand(xe.id), !0;
   }
 }, kt = {
   type: nt.OPERATION,
@@ -1053,7 +1053,7 @@ const Dt = "DataValidationPanel", Fe = {
   handler(e, t) {
     if (!t)
       return !1;
-    const r = e.get(Ae), { unitId: n, subUnitId: i, row: o, column: a } = t, l = r.activeDropdown, s = l == null ? void 0 : l.location;
+    const r = e.get(Le), { unitId: n, subUnitId: i, row: o, column: a } = t, l = r.activeDropdown, s = l == null ? void 0 : l.location;
     return s && s.unitId === n && s.subUnitId === i && s.row === o && s.col === a || r.showDataValidationDropdown(
       n,
       i,
@@ -1065,7 +1065,7 @@ const Dt = "DataValidationPanel", Fe = {
   type: nt.OPERATION,
   id: "sheet.operation.hide-data-validation-dropdown",
   handler(e, t) {
-    return t ? (e.get(Ae).hideDropdown(), !0) : !1;
+    return t ? (e.get(Le).hideDropdown(), !0) : !1;
   }
 }, Nt = {
   type: nt.COMMAND,
@@ -1073,12 +1073,12 @@ const Dt = "DataValidationPanel", Fe = {
   handler(e) {
     const t = e.get(le), r = gr(t);
     if (!r) return !1;
-    const { workbook: n, worksheet: i } = r, o = er(e), a = e.get(J), l = n.getUnitId(), s = i.getSheetId(), c = {
+    const { workbook: n, worksheet: i } = r, o = er(e), a = e.get(J), l = n.getUnitId(), s = i.getSheetId(), d = {
       rule: o,
       unitId: l,
       subUnitId: s
     };
-    return a.syncExecuteCommand(gn.id, c) ? (a.syncExecuteCommand(Fe.id, {
+    return a.syncExecuteCommand(gn.id, d) ? (a.syncExecuteCommand(xe.id, {
       ruleId: o.uid,
       isAdd: !0
     }), !0) : !1;
@@ -1088,7 +1088,7 @@ var ho = Object.getOwnPropertyDescriptor, go = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? ho(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, $e = (e, t) => (r, n) => t(r, n, e);
+}, He = (e, t) => (r, n) => t(r, n, e);
 const Me = "SHEET_DATA_VALIDATION_ALERT";
 let ut = class extends Re {
   constructor(e, t, r, n, i, o) {
@@ -1098,7 +1098,7 @@ let ut = class extends Re {
     this._initCellAlertPopup(), this._initZenService();
   }
   _initCellAlertPopup() {
-    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(cr(100)).subscribe((e) => {
+    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(dr(100)).subscribe((e) => {
       var t;
       if (e) {
         const r = this._univerInstanceService.getUnit(e.location.unitId, Y.UNIVER_SHEET), n = r.getSheetBySheetId(e.location.subUnitId);
@@ -1108,7 +1108,7 @@ let ut = class extends Re {
           this._cellAlertManagerService.removeAlert(Me);
           return;
         }
-        if (this._dataValidationModel.validator(i, { ...e.location, workbook: r, worksheet: n }) === je.INVALID) {
+        if (this._dataValidationModel.validator(i, { ...e.location, workbook: r, worksheet: n }) === Ye.INVALID) {
           const a = this._cellAlertManagerService.currentAlert.get(Me), l = (t = a == null ? void 0 : a.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) {
             this._cellAlertManagerService.removeAlert(Me);
@@ -1141,18 +1141,18 @@ let ut = class extends Re {
   }
 };
 ut = go([
-  $e(0, b(Vi)),
-  $e(1, b(Oi)),
-  $e(2, le),
-  $e(3, b(se)),
-  $e(4, sr),
-  $e(5, b(ee))
+  He(0, b(Vi)),
+  He(1, b(Oi)),
+  He(2, le),
+  He(3, b(se)),
+  He(4, sr),
+  He(5, b(ee))
 ], ut);
 var po = Object.getOwnPropertyDescriptor, vo = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? po(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Bt = (e, t) => (r, n) => t(r, n, e);
+}, Ht = (e, t) => (r, n) => t(r, n, e);
 let qe = class extends Re {
   constructor(e, t, r) {
     super(), this._autoFillService = e, this._sheetDataValidationModel = t, this._injector = r, this._initAutoFill();
@@ -1160,10 +1160,10 @@ let qe = class extends Re {
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const e = () => ({ redos: [], undos: [] }), t = (n, i) => {
-      const { source: o, target: a, unitId: l, subUnitId: s } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = on([o, a]), [h, d] = u.ranges, { mapFunc: m } = u, g = {
+      const { source: o, target: a, unitId: l, subUnitId: s } = n, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = on([o, a]), [h, c] = u.ranges, { mapFunc: m } = u, g = {
         row: h.startRow,
         col: h.startColumn
-      }, M = Ai(h, d), y = new Rt(), p = /* @__PURE__ */ new Set();
+      }, M = Ai(h, c), y = new Rt(), p = /* @__PURE__ */ new Set();
       M.forEach((I) => {
         const R = I.repeatStartCell, T = I.relativeRange, N = {
           startRow: g.row,
@@ -1198,8 +1198,8 @@ let qe = class extends Re {
         });
       });
       const S = Array.from(p).map((I) => ({ id: I, ranges: qt(y, (R) => R === I) }));
-      c.addRangeRules(S);
-      const v = c.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: C, undoMutations: w } = Jt(l, s, v, this._injector, "patched", i === ot.ONLY_FORMAT);
+      d.addRangeRules(S);
+      const v = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: C, undoMutations: w } = Jt(l, s, v, this._injector, "patched", i === ot.ONLY_FORMAT);
       return {
         undos: w,
         redos: C
@@ -1210,8 +1210,8 @@ let qe = class extends Re {
         const { source: i, unitId: o, subUnitId: a } = n;
         for (const l of i.rows)
           for (const s of i.cols) {
-            const c = this._sheetDataValidationModel.getRuleByLocation(o, a, l, s);
-            if (c && c.type === G.CHECKBOX) {
+            const d = this._sheetDataValidationModel.getRuleByLocation(o, a, l, s);
+            if (d && d.type === G.CHECKBOX) {
               this._autoFillService.setDisableApplyType(ot.SERIES, !0);
               return;
             }
@@ -1225,15 +1225,15 @@ let qe = class extends Re {
   }
 };
 qe = vo([
-  Bt(0, Pi),
-  Bt(1, b(ee)),
-  Bt(2, b(we))
+  Ht(0, Pi),
+  Ht(1, b(ee)),
+  Ht(2, b(we))
 ], qe);
 var mo = Object.getOwnPropertyDescriptor, fo = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? mo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Ht = (e, t) => (r, n) => t(r, n, e);
+}, Bt = (e, t) => (r, n) => t(r, n, e);
 let Je = class extends Re {
   constructor(t, r, n) {
     super();
@@ -1245,8 +1245,8 @@ let Je = class extends Re {
       id: tr,
       onBeforeCopy: (t, r, n) => this._collect(t, r, n),
       onPasteCells: (t, r, n, i) => {
-        const { copyType: o = kn.COPY, pasteType: a } = i, { range: l } = t || {}, { range: s, unitId: c, subUnitId: u } = r;
-        return this._generateMutations(s, { copyType: o, pasteType: a, copyRange: l, unitId: c, subUnitId: u });
+        const { copyType: o = kn.COPY, pasteType: a } = i, { range: l } = t || {}, { range: s, unitId: d, subUnitId: u } = r;
+        return this._generateMutations(s, { copyType: o, pasteType: a, copyRange: l, unitId: d, subUnitId: u });
       }
     });
   }
@@ -1261,10 +1261,10 @@ let Je = class extends Re {
     if (!o)
       return;
     const { rows: a, cols: l } = o;
-    a.forEach((s, c) => {
+    a.forEach((s, d) => {
       l.forEach((u, h) => {
-        const d = this._sheetDataValidationModel.getRuleIdByLocation(t, r, s, u);
-        i.setValue(c, h, d != null ? d : "");
+        const c = this._sheetDataValidationModel.getRuleIdByLocation(t, r, s, u);
+        i.setValue(d, h, c != null ? c : "");
       });
     });
   }
@@ -1285,8 +1285,8 @@ let Je = class extends Re {
       return { redos: [], undos: [] };
     const { unitId: i, subUnitId: o } = this._copyInfo;
     if (r.unitId !== i || o !== r.subUnitId) {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(r.unitId, r.subUnitId).clone(), l = new Rt(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = on([r.copyRange, t]), d = Nn(c, u, !0), m = /* @__PURE__ */ new Map();
-      d.forEach(({ startRange: p }) => {
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(r.unitId, r.subUnitId).clone(), l = new Rt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = on([r.copyRange, t]), c = Nn(d, u, !0), m = /* @__PURE__ */ new Map();
+      c.forEach(({ startRange: p }) => {
         var S;
         (S = this._copyInfo) == null || S.matrix.forValue((v, C, w) => {
           const I = yt.getPositionRange(
@@ -1318,8 +1318,8 @@ let Je = class extends Re {
         undos: y
       };
     } else {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(i, o).clone(), l = new Rt(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = on([r.copyRange, t]);
-      Nn(c, u, !0).forEach(({ startRange: y }) => {
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(i, o).clone(), l = new Rt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = on([r.copyRange, t]);
+      Nn(d, u, !0).forEach(({ startRange: y }) => {
         var p;
         (p = this._copyInfo) == null || p.matrix.forValue((S, v, C) => {
           const w = yt.getPositionRange(
@@ -1352,9 +1352,9 @@ let Je = class extends Re {
   }
 };
 Je = fo([
-  Ht(0, Li),
-  Ht(1, b(ee)),
-  Ht(2, b(we))
+  Bt(0, Li),
+  Bt(1, b(ee)),
+  Bt(2, b(we))
 ], Je);
 var _o = Object.getOwnPropertyDescriptor, So = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? _o(t, r) : t, o = e.length - 1, a; o >= 0; o--)
@@ -1399,7 +1399,7 @@ function Co(e) {
 }
 function Io(e) {
   return {
-    id: Fe.id,
+    id: xe.id,
     title: "dataValidation.panel.title",
     type: vn.BUTTON
   };
@@ -1412,11 +1412,11 @@ function wo(e) {
   };
 }
 const Ro = {
-  [li.FORMULAS_INSERT]: {
+  [li.RULES]: {
     [Er]: {
-      order: 9,
+      order: 0,
       menuItemFactory: Co,
-      [Fe.id]: {
+      [xe.id]: {
         order: 0,
         menuItemFactory: Io
       },
@@ -1439,8 +1439,8 @@ const Vr = {
   }
 };
 let et = class extends un {
-  constructor(e, t, r, n, i, o, a, l, s, c, u) {
-    super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = r, this._univerInstanceService = n, this._autoHeightController = i, this._dropdownManagerService = o, this._sheetDataValidationModel = a, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = c, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
+  constructor(e, t, r, n, i, o, a, l, s, d, u) {
+    super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = r, this._univerInstanceService = n, this._autoHeightController = i, this._dropdownManagerService = o, this._sheetDataValidationModel = a, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = d, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
     this._menuManagerService.mergeMenu(Ro);
@@ -1460,13 +1460,13 @@ let et = class extends un {
         const s = this._sheetDataValidationModel.getRuleByLocation(n, i, o, a);
         if (!s)
           return;
-        const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
-        if (!(c != null && c.dropdownType))
+        const d = this._dataValidatorRegistryService.getValidatorItem(s.type);
+        if (!(d != null && d.dropdownType))
           return;
         const u = l.getActiveSheet();
         if (!u) return;
-        const h = this._dropdownManagerService.activeDropdown, d = h == null ? void 0 : h.location;
-        if (d && d.unitId === n && d.subUnitId === i && d.row === o && d.col === a)
+        const h = this._dropdownManagerService.activeDropdown, c = h == null ? void 0 : h.location;
+        if (c && c.unitId === n && c.subUnitId === i && c.row === o && c.col === a)
           return;
         this._dropdownManagerService.showDropdown(
           {
@@ -1497,13 +1497,13 @@ let et = class extends un {
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, r) => {
             var p, S, v, C, w;
-            const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
-            if (!c)
+            const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
+            if (!d)
               return r(e);
-            const u = this._sheetDataValidationModel.getRuleById(o, a, c);
+            const u = this._sheetDataValidationModel.getRuleById(o, a, d);
             if (!u)
               return r(e);
-            const h = (p = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? p : je.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
+            const h = (p = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? p : Ye.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
             let g;
             const M = {
               get value() {
@@ -1520,19 +1520,19 @@ let et = class extends un {
               ...e,
               markers: {
                 ...e == null ? void 0 : e.markers,
-                ...h === je.INVALID ? Vr : null
+                ...h === Ye.INVALID ? Vr : null
               },
               customRender: [
                 ...(S = e == null ? void 0 : e.customRender) != null ? S : [],
-                ...d != null && d.canvasRender ? [d.canvasRender] : []
+                ...c != null && c.canvasRender ? [c.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((v = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : v.isSkip) || ((C = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : C.call(d, u, M.value, t))
+                isSkip: ((v = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : v.isSkip) || ((C = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : C.call(c, u, M.value, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(u, y.value, {
+                ...c == null ? void 0 : c.getExtraStyle(u, y.value, {
                   get style() {
                     const I = l.getStyles();
                     return (typeof (e == null ? void 0 : e.s) == "string" ? I.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
@@ -1555,7 +1555,7 @@ let et = class extends un {
                   workbook: l,
                   worksheet: s
                 };
-                return (V = (L = d == null ? void 0 : d.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : V.call(L, T);
+                return (V = (L = c == null ? void 0 : c.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : V.call(L, T);
               },
               interceptorAutoWidth: () => {
                 var N, D, P, A, L, V;
@@ -1573,7 +1573,7 @@ let et = class extends un {
                   workbook: l,
                   worksheet: s
                 };
-                return (V = (L = d == null ? void 0 : d.canvasRender) == null ? void 0 : L.calcCellAutoWidth) == null ? void 0 : V.call(L, T);
+                return (V = (L = c == null ? void 0 : c.canvasRender) == null ? void 0 : L.calcCellAutoWidth) == null ? void 0 : V.call(L, T);
               },
               coverable: ((w = e == null ? void 0 : e.coverable) != null ? w : !0) && !(u.type === G.LIST || u.type === G.LIST_MULTIPLE)
             });
@@ -1587,7 +1587,7 @@ let et = class extends un {
       // 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
       _n((e) => e.source === "command"),
-      dr(100)
+      cr(100)
     ).subscribe((e) => {
       if (e.length === 0)
         return;
@@ -1604,11 +1604,11 @@ let et = class extends un {
 };
 et = Dr([
   K(0, J),
-  K(1, ci),
-  K(2, Ne),
+  K(1, di),
+  K(2, Ue),
   K(3, le),
   K(4, b(fr)),
-  K(5, b(Ae)),
+  K(5, b(Le)),
   K(6, b(ee)),
   K(7, b(ye)),
   K(8, b(Sn)),
@@ -1630,30 +1630,30 @@ let xn = class extends un {
           // eslint-disable-next-line complexity
           handler: (e, t, r) => {
             var y, p, S, v, C;
-            const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
-            if (!c)
+            const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
+            if (!d)
               return r(e);
-            const u = this._sheetDataValidationModel.getRuleById(o, a, c);
+            const u = this._sheetDataValidationModel.getRuleById(o, a, d);
             if (!u)
               return r(e);
-            const h = (y = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? y : je.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(n, i), g = Q(m), M = `${g != null ? g : ""}`;
+            const h = (y = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? y : Ye.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(n, i), g = Q(m), M = `${g != null ? g : ""}`;
             return r({
               ...e,
               markers: {
                 ...e == null ? void 0 : e.markers,
-                ...h === je.INVALID ? Vr : null
+                ...h === Ye.INVALID ? Vr : null
               },
               customRender: [
                 ...(p = e == null ? void 0 : e.customRender) != null ? p : [],
-                ...d != null && d.canvasRender ? [d.canvasRender] : []
+                ...c != null && c.canvasRender ? [c.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((S = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : S.isSkip) || ((v = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : v.call(d, u, g, t))
+                isSkip: ((S = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : S.isSkip) || ((v = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : v.call(c, u, g, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(u, M, {
+                ...c == null ? void 0 : c.getExtraStyle(u, M, {
                   get style() {
                     const w = l.getStyles();
                     return (typeof (e == null ? void 0 : e.s) == "string" ? w.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
@@ -1676,7 +1676,7 @@ let xn = class extends un {
                   workbook: l,
                   worksheet: s
                 };
-                return (L = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : L.call(A, R);
+                return (L = (A = c == null ? void 0 : c.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : L.call(A, R);
               },
               coverable: ((C = e == null ? void 0 : e.coverable) != null ? C : !0) && !(u.type === G.LIST || u.type === G.LIST_MULTIPLE)
             });
@@ -1688,7 +1688,7 @@ let xn = class extends un {
   _initAutoHeight() {
     this._sheetDataValidationModel.ruleChange$.pipe(
       _n((e) => e.source === "command"),
-      dr(16)
+      cr(16)
     ).subscribe((e) => {
       const t = [];
       if (e.forEach((r) => {
@@ -1703,7 +1703,7 @@ let xn = class extends un {
 };
 xn = Dr([
   K(0, J),
-  K(1, Ne),
+  K(1, Ue),
   K(2, b(fr)),
   K(3, b(ye)),
   K(4, b(Sn)),
@@ -1732,7 +1732,7 @@ let Vt = class extends Re {
         (o = this._sheetSkeletonManagerService.getSkeletonParam(i)) == null || o.skeleton.makeDirty(!0);
       }), (n = this._context.mainComponent) == null || n.makeForceDirty();
     };
-    this.disposeWithMe(this._sheetDataValidationModel.validStatusChange$.pipe(Br(16)).subscribe(e));
+    this.disposeWithMe(this._sheetDataValidationModel.validStatusChange$.pipe(Hr(16)).subscribe(e));
   }
 };
 Vt = bo([
@@ -1740,13 +1740,13 @@ Vt = bo([
   $n(2, b(bt))
 ], Vt);
 function Eo(e) {
-  var c;
-  const t = U(se), r = U(mn), { value: n, onChange: i, extraComponent: o } = e, [a, l] = H(!1), s = o ? r.get(o) : null;
-  return /* @__PURE__ */ W(ct, { children: [
+  var d;
+  const t = U(se), r = U(mn), { value: n, onChange: i, extraComponent: o } = e, [a, l] = B(!1), s = o ? r.get(o) : null;
+  return /* @__PURE__ */ W(dt, { children: [
     /* @__PURE__ */ W(
       "div",
       {
-        className: "univer-mb-3 univer-flex univer-cursor-pointer univer-items-center univer-text-sm univer-text-gray-900 dark:univer-text-white",
+        className: "univer-mb-3 univer-flex univer-cursor-pointer univer-items-center univer-text-sm univer-text-gray-900 dark:!univer-text-white",
         onClick: () => l(!a),
         children: [
           t.t("dataValidation.panel.options"),
@@ -1754,7 +1754,7 @@ function Eo(e) {
         ]
       }
     ),
-    a && /* @__PURE__ */ W(ct, { children: [
+    a && /* @__PURE__ */ W(dt, { children: [
       s ? /* @__PURE__ */ _(s, { value: n, onChange: i }) : null,
       /* @__PURE__ */ _(
         j,
@@ -1763,7 +1763,7 @@ function Eo(e) {
           children: /* @__PURE__ */ W(
             pn,
             {
-              value: `${(c = n.errorStyle) != null ? c : lt.WARNING}`,
+              value: `${(d = n.errorStyle) != null ? d : lt.WARNING}`,
               onChange: (u) => i({ ...n, errorStyle: +u }),
               children: [
                 /* @__PURE__ */ _(Oe, { value: `${lt.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
@@ -1794,7 +1794,7 @@ function Eo(e) {
     ] })
   ] });
 }
-const Do = (e) => Hr(
+const Do = (e) => Br(
   async (t, r, n, i) => {
     const o = await e.executeCommand(t, r, n);
     i == null || i(o);
@@ -1806,19 +1806,19 @@ function Vo(e, t, r) {
   return t ? ((i = (n = e.getUnit(t)) == null ? void 0 : n.getSheetBySheetName(r)) == null ? void 0 : i.getSheetId()) || "" : ((a = (o = e.getCurrentUnitForType(Y.UNIVER_SHEET)) == null ? void 0 : o.getSheetBySheetName(r)) == null ? void 0 : a.getSheetId()) || "";
 }
 function Oo() {
-  var O, B;
-  const [e, t] = H(0), r = U(_e), n = Te(r.activeRule$, r.activeRule), { unitId: i, subUnitId: o, rule: a } = n || {}, l = a.uid, s = U(ye), c = U(le), u = U(mn), h = U(J), d = U(fn), m = U(se), [g, M] = H(a), y = s.getValidatorItem(g.type), [p, S] = H(!1), v = s.getValidatorsByScope(ui.SHEET), [C, w] = H(() => g.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), I = dt(() => Do(h), [h]), [R, T] = H(!1), [N, D] = H(!1), P = ht(null), A = U(hr);
+  var O, H;
+  const [e, t] = B(0), r = U(_e), n = Te(r.activeRule$, r.activeRule), { unitId: i, subUnitId: o, rule: a } = n || {}, l = a.uid, s = U(ye), d = U(le), u = U(mn), h = U(J), c = U(fn), m = U(se), [g, M] = B(a), y = s.getValidatorItem(g.type), [p, S] = B(!1), v = s.getValidatorsByScope(ui.SHEET), [C, w] = B(() => g.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), I = ct(() => Do(h), [h]), [R, T] = B(!1), [N, D] = B(!1), P = ht(null), A = U(hr);
   if (Pe(() => () => {
     const f = A.getCurrentLastSelection();
     f && A.setSelections([f]);
   }, [A]), Pe(() => {
     h.onCommandExecuted((f) => {
       (f.id === Wr.id || f.id === jr.id) && setTimeout(() => {
-        const k = d.getRuleById(i, o, l);
+        const k = c.getRuleById(i, o, l);
         t(($) => $ + 1), k && (M(k), w(k.ranges.map(($) => ({ unitId: "", sheetId: "", range: $ }))));
       }, 20);
     });
-  }, [h, d, l, o, i]), !y)
+  }, [h, c, l, o, i]), !y)
     return null;
   const L = y.operators, V = y.operatorNames, F = g.operator ? hi.includes(g.operator) : !1, x = () => {
     var f, k, $;
@@ -1827,7 +1827,7 @@ function Oo() {
     const k = f.split(",").filter(Boolean).map(Ui).map((q) => {
       const yn = q.sheetName;
       if (yn) {
-        const Ar = Vo(c, q.unitId, yn);
+        const Ar = Vo(d, q.unitId, yn);
         return { ...q, sheetId: Ar };
       }
       return {
@@ -1885,7 +1885,7 @@ function Oo() {
     const k = s.getValidatorItem(f);
     if (!k)
       return;
-    const $ = k.operators, Ce = d.getRuleById(i, o, l), q = f === (Ce == null ? void 0 : Ce.type) || f.includes("list") && (Ce != null && Ce.type.includes("list")) ? {
+    const $ = k.operators, Ce = c.getRuleById(i, o, l), q = f === (Ce == null ? void 0 : Ce.type) || f.includes("list") && (Ce != null && Ce.type.includes("list")) ? {
       ...Ce,
       type: f
     } : {
@@ -1901,7 +1901,7 @@ function Oo() {
       ruleId: g.uid,
       setting: Pn(q)
     });
-  }, ce = u.get(y.formulaInput), ne = dt(() => C.map((f) => _r(f.range)).join(","), []), de = Tn(g), Se = (f) => {
+  }, de = u.get(y.formulaInput), ne = ct(() => C.map((f) => _r(f.range)).join(","), []), ce = Tn(g), Se = (f) => {
     bn(f, Tn(g)) || (M({
       ...g,
       ...f
@@ -1915,14 +1915,14 @@ function Oo() {
       }
     ));
   }, ve = L.length && !g.operator;
-  return /* @__PURE__ */ W("div", { className: "univer-py-4", children: [
+  return /* @__PURE__ */ W("div", { "data-u-comp": "data-validation-detail", className: "univer-py-2", children: [
     /* @__PURE__ */ _(
       j,
       {
         label: m.t("dataValidation.panel.range"),
         error: !g.ranges.length || R ? m.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ _(
-          di,
+          ci,
           {
             selectorRef: P,
             unitId: i,
@@ -1976,8 +1976,8 @@ function Oo() {
         }
       }
     ) }) : null,
-    ce && !ve ? /* @__PURE__ */ _(
-      ce,
+    de && !ve ? /* @__PURE__ */ _(
+      de,
       {
         isTwoFormula: F,
         value: {
@@ -2001,7 +2001,7 @@ function Oo() {
     /* @__PURE__ */ _(j, { children: /* @__PURE__ */ _(
       Lt,
       {
-        checked: (B = g.allowBlank) != null ? B : !0,
+        checked: (H = g.allowBlank) != null ? H : !0,
         onChange: () => {
           var f;
           return Z({
@@ -2012,7 +2012,7 @@ function Oo() {
         children: m.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ _(Eo, { value: de, onChange: Se, extraComponent: y.optionsInput }),
+    /* @__PURE__ */ _(Eo, { value: ce, onChange: Se, extraComponent: y.optionsInput }),
     /* @__PURE__ */ W("div", { className: "univer-mt-5 univer-flex univer-flex-row univer-justify-end", children: [
       /* @__PURE__ */ _(ze, { className: "univer-ml-3", onClick: z, children: m.t("dataValidation.panel.removeRule") }),
       /* @__PURE__ */ _(ze, { className: "univer-ml-3", variant: "primary", onClick: x, children: m.t("dataValidation.panel.done") })
@@ -2020,7 +2020,7 @@ function Oo() {
   ] });
 }
 const To = (e) => {
-  const { rule: t, onClick: r, unitId: n, subUnitId: i, disable: o } = e, a = U(ye), l = U(J), s = U(Ni), c = a.getValidatorItem(t.type), u = ht(void 0), [h, d] = H(!1), m = U(Kn), g = Te(m.currentTheme$), M = dt(() => {
+  const { rule: t, onClick: r, unitId: n, subUnitId: i, disable: o } = e, a = U(ye), l = U(J), s = U(Ni), d = a.getValidatorItem(t.type), u = ht(void 0), [h, c] = B(!1), m = U(Kn), g = Te(m.currentTheme$), M = ct(() => {
     var w;
     const p = m.getColorFromTheme("primary.600"), S = m.getColorFromTheme("loop-color.2"), v = (w = m.getColorFromTheme(S)) != null ? w : p, C = new Xr(v).toRgb();
     return {
@@ -2042,20 +2042,20 @@ const To = (e) => {
   }, [s]), /* @__PURE__ */ W(
     "div",
     {
-      className: Xe(
+      className: Ae(
         `
                   univer-rounded-md univer-bg-secondary univer-relative univer--ml-2 univer--mr-2 univer-box-border
                   univer-flex univer-w-[287px] univer-cursor-pointer univer-flex-col univer-justify-between
                   univer-overflow-hidden univer-p-2 univer-pr-9
                 `,
         {
-          "hover:univer-bg-gray-50": !o,
+          "dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-50": !o,
           "univer-opacity-50": o
         }
       ),
       onClick: r,
       onMouseEnter: () => {
-        o || (d(!0), u.current = t.ranges.map((p) => s.addShape({
+        o || (c(!0), u.current = t.ranges.map((p) => s.addShape({
           range: p,
           style: M,
           primary: null
@@ -2063,7 +2063,7 @@ const To = (e) => {
       },
       onMouseLeave: () => {
         var p;
-        d(!1), (p = u.current) == null || p.forEach((S) => {
+        c(!1), (p = u.current) == null || p.forEach((S) => {
           S && s.removeShape(S);
         }), u.current = void 0;
       },
@@ -2071,21 +2071,21 @@ const To = (e) => {
         /* @__PURE__ */ _(
           "div",
           {
-            className: "univer-truncate univer-text-sm univer-font-medium univer-leading-[22px] univer-text-gray-900 dark:univer-text-white",
-            children: c == null ? void 0 : c.generateRuleName(t)
+            className: "univer-truncate univer-text-sm univer-font-medium univer-leading-[22px] univer-text-gray-900 dark:!univer-text-white",
+            children: d == null ? void 0 : d.generateRuleName(t)
           }
         ),
         /* @__PURE__ */ _(
           "div",
           {
-            className: "univer-text-secondary univer-truncate univer-text-xs univer-leading-[18px]",
+            className: "univer-text-secondary univer-truncate univer-text-xs univer-leading-[18px] dark:!univer-text-gray-300",
             children: t.ranges.map((p) => _r(p)).join(",")
           }
         ),
         h ? /* @__PURE__ */ _(
           "div",
           {
-            className: "univer-absolute univer-right-2 univer-top-[19px] univer-flex univer-h-5 univer-w-5 univer-items-center univer-justify-center univer-rounded hover:univer-bg-gray-200",
+            className: "univer-absolute univer-right-2 univer-top-[19px] univer-flex univer-h-5 univer-w-5 univer-items-center univer-justify-center univer-rounded dark:!univer-text-gray-300 dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-200",
             onClick: y,
             children: /* @__PURE__ */ _(Cn, {})
           }
@@ -2095,31 +2095,31 @@ const To = (e) => {
   );
 };
 function Po(e) {
-  const t = U(ee), r = U(le), n = U(J), i = U(we), o = U(_e), a = U(se), [l, s] = H([]), { workbook: c } = e, u = Te(c.activeSheet$, void 0, !0), h = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
+  const t = U(ee), r = U(le), n = U(J), i = U(we), o = U(_e), a = U(se), [l, s] = B([]), { workbook: d } = e, u = Te(d.activeSheet$, void 0, !0), h = d.getUnitId(), c = u == null ? void 0 : u.getSheetId();
   Pe(() => {
-    s(t.getRules(h, d));
+    s(t.getRules(h, c));
     const S = t.ruleChange$.subscribe((v) => {
-      v.unitId === h && v.subUnitId === d && s(t.getRules(h, d));
+      v.unitId === h && v.subUnitId === c && s(t.getRules(h, c));
     });
     return () => {
       S.unsubscribe();
     };
-  }, [h, d, t]);
+  }, [h, c, t]);
   const m = async () => {
     const S = er(i), v = {
       unitId: h,
-      subUnitId: d,
+      subUnitId: c,
       rule: S
     };
     await n.executeCommand(gn.id, v), o.setActiveRule({
       unitId: h,
-      subUnitId: d,
+      subUnitId: c,
       rule: S
     });
   }, g = () => {
     n.executeCommand(Qr.id, {
       unitId: h,
-      subUnitId: d
+      subUnitId: c
     });
   }, y = ((S) => {
     const v = r.getCurrentUnitForType(Y.UNIVER_SHEET), C = v.getActiveSheet(), w = v.getUnitId(), I = C.getSheetId();
@@ -2132,11 +2132,11 @@ function Po(e) {
         To,
         {
           unitId: h,
-          subUnitId: d,
+          subUnitId: c,
           onClick: () => {
             S.disable || o.setActiveRule({
               unitId: h,
-              subUnitId: d,
+              subUnitId: c,
               rule: S
             });
           },
@@ -2207,8 +2207,8 @@ let an = class {
     this._commandService = e, this._univerInstanceService = t, this._formulaService = r, this._themeService = n, this._renderManagerService = i, this._dataValidationModel = o;
   }
   _calc(e, t) {
-    var c, u, h;
-    const { vt: r, ht: n } = t || {}, i = e.endX - e.startX - ft * 2, o = e.endY - e.startY, a = ((c = t == null ? void 0 : t.fs) != null ? c : 10) * 1.6;
+    var d, u, h;
+    const { vt: r, ht: n } = t || {}, i = e.endX - e.startX - ft * 2, o = e.endY - e.startY, a = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
     let l = 0, s = 0;
     switch (r) {
       case ae.TOP:
@@ -2222,10 +2222,10 @@ let an = class {
         break;
     }
     switch (n) {
-      case Ye.LEFT:
+      case Xe.LEFT:
         l = ft;
         break;
-      case Ye.RIGHT:
+      case Xe.RIGHT:
         l = ft + (i - a);
         break;
       default:
@@ -2250,8 +2250,8 @@ let an = class {
     return ((r = t == null ? void 0 : t.fs) != null ? r : 10) * 1.6;
   }
   async _parseFormula(e, t, r) {
-    var c, u, h, d, m, g, M, y, p;
-    const { formula1: n = ni, formula2: i = ti } = e, o = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Ft((h = (u = (c = o == null ? void 0 : o[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Ft((g = (m = (d = o == null ? void 0 : o[1]) == null ? void 0 : d.result) == null ? void 0 : m[0]) == null ? void 0 : g[0]), s = Dn(String(a)) && Dn(String(l));
+    var d, u, h, c, m, g, M, y, p;
+    const { formula1: n = ni, formula2: i = ti } = e, o = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Ft((h = (u = (d = o == null ? void 0 : o[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Ft((g = (m = (c = o == null ? void 0 : o[1]) == null ? void 0 : c.result) == null ? void 0 : m[0]) == null ? void 0 : g[0]), s = Dn(String(a)) && Dn(String(l));
     return {
       formula1: De(n) ? Ft((p = (y = (M = o == null ? void 0 : o[0]) == null ? void 0 : M.result) == null ? void 0 : y[0]) == null ? void 0 : p[0]) : n,
       formula2: De(i) ? l : i,
@@ -2260,13 +2260,13 @@ let an = class {
   }
   drawWith(e, t) {
     var P, A, L, V;
-    const { style: r, primaryWithCoord: n, unitId: i, subUnitId: o, worksheet: a, row: l, col: s } = t, c = n.isMergedMainCell ? n.mergeInfo : n, u = Q(a.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(i, o, l, s);
+    const { style: r, primaryWithCoord: n, unitId: i, subUnitId: o, worksheet: a, row: l, col: s } = t, d = n.isMergedMainCell ? n.mergeInfo : n, u = Q(a.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(i, o, l, s);
     if (!h)
       return;
-    const d = this._dataValidationModel.getValidator(h.type);
-    if (!d || !((P = d.skipDefaultFontRender) != null && P.call(d, h, u, { unitId: i, subUnitId: o, row: l, column: s })))
+    const c = this._dataValidationModel.getValidator(h.type);
+    if (!c || !((P = c.skipDefaultFontRender) != null && P.call(c, h, u, { unitId: i, subUnitId: o, row: l, column: s })))
       return;
-    const m = d.parseFormulaSync(h, i, o), { formula1: g } = m, M = this._calc(c, r), { a: y, d: p } = e.getTransform(), S = Ln(M.left, y), v = Ln(M.top, p), C = mi.create().composeMatrix({
+    const m = c.parseFormulaSync(h, i, o), { formula1: g } = m, M = this._calc(d, r), { a: y, d: p } = e.getTransform(), S = Ln(M.left, y), v = Ln(M.top, p), C = mi.create().composeMatrix({
       left: S,
       top: v,
       scaleX: 1,
@@ -2276,8 +2276,8 @@ let an = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), w = c.endX - c.startX, I = c.endY - c.startY;
-    e.save(), e.beginPath(), e.rect(c.startX, c.startY, w, I), e.clip();
+    }), w = d.endX - d.startX, I = d.endY - d.startY;
+    e.save(), e.beginPath(), e.rect(d.startX, d.startY, w, I), e.clip();
     const R = C.getMatrix();
     e.transform(R[0], R[1], R[2], R[3], R[4], R[5]);
     const T = ((A = r == null ? void 0 : r.fs) != null ? A : 10) * 1.6, N = String(u) === String(g), D = this._themeService.getColorFromTheme("primary.600");
@@ -2289,20 +2289,20 @@ let an = class {
     }), e.restore();
   }
   isHit(e, t) {
-    const r = t.primaryWithCoord.isMergedMainCell ? t.primaryWithCoord.mergeInfo : t.primaryWithCoord, n = this._calc(r, t.style), i = n.top, o = n.top + n.height, a = n.left, l = n.left + n.width, { x: s, y: c } = e;
-    return s <= l && s >= a && c <= o && c >= i;
+    const r = t.primaryWithCoord.isMergedMainCell ? t.primaryWithCoord.mergeInfo : t.primaryWithCoord, n = this._calc(r, t.style), i = n.top, o = n.top + n.height, a = n.left, l = n.left + n.width, { x: s, y: d } = e;
+    return s <= l && s >= a && d <= o && d >= i;
   }
   async onPointerDown(e, t) {
     var g;
     if (t.button === 2)
       return;
-    const { primaryWithCoord: r, unitId: n, subUnitId: i, worksheet: o, row: a, col: l } = e, s = Q(o.getCellRaw(a, l)), c = this._dataValidationModel.getRuleByLocation(n, i, a, l);
-    if (!c)
+    const { primaryWithCoord: r, unitId: n, subUnitId: i, worksheet: o, row: a, col: l } = e, s = Q(o.getCellRaw(a, l)), d = this._dataValidationModel.getRuleByLocation(n, i, a, l);
+    if (!d)
       return;
-    const u = this._dataValidationModel.getValidator(c.type);
-    if (!u || !((g = u.skipDefaultFontRender) != null && g.call(u, c, s, { unitId: n, subUnitId: i, row: a, column: l })))
+    const u = this._dataValidationModel.getValidator(d.type);
+    if (!u || !((g = u.skipDefaultFontRender) != null && g.call(u, d, s, { unitId: n, subUnitId: i, row: a, column: l })))
       return;
-    const { formula1: h, formula2: d } = await this._parseFormula(c, n, i), m = {
+    const { formula1: h, formula2: c } = await this._parseFormula(d, n, i), m = {
       range: {
         startColumn: r.actualColumn,
         endColumn: r.actualColumn,
@@ -2310,7 +2310,7 @@ let an = class {
         endRow: r.actualRow
       },
       value: {
-        v: String(s) === ri(String(h)) ? d : h,
+        v: String(s) === ri(String(h)) ? c : h,
         p: null
       }
     };
@@ -2333,7 +2333,7 @@ an = Uo([
   Be(1, le),
   Be(2, b(ei)),
   Be(3, b(Kn)),
-  Be(4, b(Ne)),
+  Be(4, b(Ue)),
   Be(5, b(ee))
 ], an);
 class Fo extends fe {
@@ -2352,7 +2352,7 @@ class xo extends fe {
   }
 }
 const $o = "data-validation.formula-input";
-class Bo extends fe {
+class Ho extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.DATE);
@@ -2361,7 +2361,7 @@ class Bo extends fe {
     E(this, "dropdownType", ge.DATE);
   }
 }
-class Ho extends fe {
+class Bo extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.DECIMAL);
@@ -2378,31 +2378,31 @@ function jo(e, t) {
   };
 }
 function Yt(e, t, r, n) {
-  const i = Ee + sn * 2, o = r - i, a = n - Pt * 2, l = e.map((d) => ({
-    layout: jo(d, t),
-    text: d
+  const i = Ee + sn * 2, o = r - i, a = n - Pt * 2, l = e.map((c) => ({
+    layout: jo(c, t),
+    text: c
   }));
   let s;
-  const c = [];
-  l.forEach((d) => {
-    const { layout: m } = d, { width: g, height: M } = m;
+  const d = [];
+  l.forEach((c) => {
+    const { layout: m } = c, { width: g, height: M } = m;
     !s || s.width + g + jt > o ? (s = {
       width: g,
       height: M,
       items: [{
-        ...d,
+        ...c,
         left: 0
       }]
-    }, c.push(s)) : (s.items.push({
-      ...d,
+    }, d.push(s)) : (s.items.push({
+      ...c,
       left: s.width + jt
     }), s.width = s.width + g + jt);
   });
   let u = 0, h = 0;
-  return c.forEach((d, m) => {
-    h = Math.max(h, d.width), m === c.length - 1 ? u += d.height : u += d.height + Tr;
+  return d.forEach((c, m) => {
+    h = Math.max(h, c.width), m === d.length - 1 ? u += c.height : u += c.height + Tr;
   }), {
-    lines: c,
+    lines: d,
     totalHeight: u,
     contentWidth: o,
     contentHeight: a,
@@ -2418,7 +2418,7 @@ class Xo extends Si {
       width: l.width,
       height: l.height,
       radius: Yo,
-      fill: o || He
+      fill: o || We
     }), t.translateWithPrecision(Or, l.ba), t.font = n, t.fillStyle = a, t.fillText(s, 0, 0), t.restore();
   }
 }
@@ -2457,14 +2457,14 @@ let ln = class {
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, r, n) {
     var Z, z;
-    const { primaryWithCoord: i, row: o, col: a, style: l, data: s, subUnitId: c } = t, u = i.isMergedMainCell ? i.mergeInfo : i, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: d = 0, rightOffset: m = 0, topOffset: g = 0, downOffset: M = 0 } = h || {}, y = this._ensureMap(c), p = this._generateKey(o, a), S = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, o, a);
+    const { primaryWithCoord: i, row: o, col: a, style: l, data: s, subUnitId: d } = t, u = i.isMergedMainCell ? i.mergeInfo : i, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: c = 0, rightOffset: m = 0, topOffset: g = 0, downOffset: M = 0 } = h || {}, y = this._ensureMap(d), p = this._generateKey(o, a), S = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, o, a);
     if (!S)
       return;
     const v = this._dataValidationModel.getValidator(S.type);
     if (!v)
       return;
     const C = {
-      startX: u.startX + d,
+      startX: u.startX + c,
       endX: u.endX - m,
       startY: u.startY + g,
       endY: u.endY - M
@@ -2481,17 +2481,17 @@ let ln = class {
     }
     e.translateWithPrecision(0, X), x.lines.forEach((te, pe) => {
       e.save();
-      const { width: ce, height: ne, items: de } = te;
+      const { width: de, height: ne, items: ce } = te;
       let Se = 0;
       switch (P) {
-        case Ye.RIGHT:
-          Se = x.contentWidth - ce;
+        case Xe.RIGHT:
+          Se = x.contentWidth - de;
           break;
-        case Ye.CENTER:
-          Se = (x.contentWidth - ce) / 2;
+        case Xe.CENTER:
+          Se = (x.contentWidth - de) / 2;
           break;
       }
-      e.translate(Se, pe * (ne + Tr)), de.forEach((ve) => {
+      e.translate(Se, pe * (ne + Tr)), ce.forEach((ve) => {
         e.save(), e.translateWithPrecision(ve.left, 0), Xo.drawWith(e, {
           ...N,
           info: ve,
@@ -2508,10 +2508,10 @@ let ln = class {
   }
   calcCellAutoHeight(e) {
     var w;
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, d = {
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
       startX: h.startX + l,
       endX: h.endX - s,
-      startY: h.startY + c,
+      startY: h.startY + d,
       endY: h.endY - u
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!m)
@@ -2519,15 +2519,15 @@ let ln = class {
     const g = this._dataValidationModel.getValidator(m.type);
     if (!g)
       return;
-    const M = d.endX - d.startX, y = d.endY - d.startY, p = (w = Q(n)) != null ? w : "", S = g.parseCellValue(p), v = xt(r != null ? r : void 0);
+    const M = c.endX - c.startX, y = c.endY - c.startY, p = (w = Q(n)) != null ? w : "", S = g.parseCellValue(p), v = xt(r != null ? r : void 0);
     return Yt(S, v, M, y).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
     var w;
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, d = {
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
       startX: h.startX + l,
       endX: h.endX - s,
-      startY: h.startY + c,
+      startY: h.startY + d,
       endY: h.endY - u
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!m)
@@ -2535,7 +2535,7 @@ let ln = class {
     const g = this._dataValidationModel.getValidator(m.type);
     if (!g)
       return;
-    const M = d.endX - d.startX, y = d.endY - d.startY, p = (w = Q(n)) != null ? w : "", S = g.parseCellValue(p), v = xt(r != null ? r : void 0);
+    const M = c.endX - c.startX, y = c.endY - c.startY, p = (w = Q(n)) != null ? w : "", S = g.parseCellValue(p), v = xt(r != null ? r : void 0);
     return Yt(S, v, M, y).calcAutoWidth;
   }
   isHit(e, t) {
@@ -2565,7 +2565,7 @@ let ln = class {
 ln = Ko([
   _t(0, J),
   _t(1, le),
-  _t(2, b(Ne)),
+  _t(2, b(Ue)),
   _t(3, b(ee))
 ], ln);
 class Zo extends fe {
@@ -2581,7 +2581,7 @@ var qo = Object.getOwnPropertyDescriptor, Jo = (e, t, r, n) => {
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, at = (e, t) => (r, n) => t(r, n, e);
-const be = 4, St = 4, he = 14, me = 6, We = 4, Xt = 8, Qo = "#565656", Bn = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
+const be = 4, St = 4, he = 14, me = 6, je = 4, Xt = 8, Qo = "#565656", Hn = 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 ea(e, t) {
   const r = e.length;
   return {
@@ -2646,9 +2646,9 @@ function Ct(e, t, r) {
     docViewModel: o
   };
 }
-function Hn(e, t, r, n, i, o, a = !0) {
+function Bn(e, t, r, n, i, o, a = !0) {
   let l = 0;
-  const s = a ? We : 0;
+  const s = a ? je : 0;
   switch (i) {
     case ae.BOTTOM:
       l = t - n - s;
@@ -2660,22 +2660,22 @@ function Hn(e, t, r, n, i, o, a = !0) {
       l = s;
       break;
   }
-  l = Math.max(We, l);
-  let c = 0;
+  l = Math.max(je, l);
+  let d = 0;
   switch (o) {
-    case Ye.CENTER:
-      c = (e - r) / 2;
+    case Xe.CENTER:
+      d = (e - r) / 2;
       break;
-    case Ye.RIGHT:
-      c = e - r;
+    case Xe.RIGHT:
+      d = e - r;
       break;
   }
-  return c = Math.max(me, c), {
-    paddingLeft: c,
+  return d = Math.max(me, d), {
+    paddingLeft: d,
     paddingTop: l
   };
 }
-let cn = class {
+let dn = class {
   constructor(e, t, r, n, i) {
     E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     E(this, "zIndex");
@@ -2689,43 +2689,43 @@ let cn = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, r, n, i, o, a) {
-    const { t: l = re.pd.t, b: s = re.pd.b } = a, c = r - he;
+    const { t: l = re.pd.t, b: s = re.pd.b } = a, d = r - he;
     let u;
     switch (o) {
       case ae.MIDDLE:
         u = (n - St) / 2;
         break;
       case ae.BOTTOM:
-        u = n - s - i - We + (i / 2 - St / 2);
+        u = n - s - i - je + (i / 2 - St / 2);
         break;
       default:
-        u = l + We + (i / 2 - St / 2);
+        u = l + je + (i / 2 - St / 2);
         break;
     }
-    e.save(), e.translateWithPrecision(t.startX + c, t.startY + u), e.fillStyle = "#565656", e.fill(Bn), e.restore();
+    e.save(), e.translateWithPrecision(t.startX + d, t.startY + u), e.fillStyle = "#565656", e.fill(Hn), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(e, t, r) {
-    const { primaryWithCoord: n, row: i, col: o, style: a, data: l, subUnitId: s } = t, c = n.isMergedMainCell ? n.mergeInfo : n, u = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, o);
+    const { primaryWithCoord: n, row: i, col: o, style: a, data: l, subUnitId: s } = t, d = n.isMergedMainCell ? n.mergeInfo : n, u = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, o);
     if (!u)
       return;
     const h = this._dataValidationModel.getValidator(u.type);
     if (!h)
       return;
-    const d = l == null ? void 0 : l.fontRenderExtension, { leftOffset: m = 0, rightOffset: g = 0, topOffset: M = 0, downOffset: y = 0 } = d || {};
+    const c = l == null ? void 0 : l.fontRenderExtension, { leftOffset: m = 0, rightOffset: g = 0, topOffset: M = 0, downOffset: y = 0 } = c || {};
     if (!u || !h || !h || h.id.indexOf(G.LIST) !== 0 || !h.skipDefaultFontRender(u))
       return;
     const p = {
-      startX: c.startX + m,
-      endX: c.endX - g,
-      startY: c.startY + M,
-      endY: c.endY - y
+      startX: d.startX + m,
+      endX: d.endX - g,
+      startY: d.startY + M,
+      endY: d.endY - y
     }, S = p.endX - p.startX, v = p.endY - p.startY, C = this._ensureMap(s), w = this._generateKey(i, o), I = h.getListWithColor(u), R = Q(l), T = `${R != null ? R : ""}`, N = I.find((V) => V.label === T);
     let { tb: D, vt: P, ht: A, pd: L } = a || {};
     if (D = D != null ? D : Ie.WRAP, P = P != null ? P : ae.BOTTOM, A = A != null ? A : re.ht, L = L != null ? L : re.pd, u.renderMode === ie.ARROW) {
       const { l: V = re.pd.l, t: F = re.pd.t, r: x = re.pd.r, b: X = re.pd.b } = L, Z = S - V - x - he - 4, { documentSkeleton: z, documents: te, docModel: pe } = Ct(T, this._localeService, a);
       D === Ie.WRAP && pe.updateDocumentDataPageSize(Math.max(Z, 1)), z.calculate(), z.getActualSize();
-      const ce = it(z), { height: ne, width: de } = ce, { paddingTop: Se, paddingLeft: ve } = Hn(Z, v - F - X, de, ne, P, A, !0);
+      const de = it(z), { height: ne, width: ce } = de, { paddingTop: Se, paddingLeft: ve } = Bn(Z, v - F - X, ce, ne, P, A, !0);
       this._drawDownIcon(e, p, S, v, ne, P, L), e.save(), e.translateWithPrecision(p.startX + V, p.startY + F), e.beginPath(), e.rect(0, 0, S - V - x, v - F - X), e.clip(), e.translateWithPrecision(0, Se), e.save(), e.translateWithPrecision(be, 0), e.beginPath(), e.rect(0, 0, Z, ne), e.clip(), te.render(e), e.translateWithPrecision(ve, 0), e.restore(), e.restore(), C.set(w, {
         left: p.endX + V + r.rowHeaderWidth - he,
         top: p.startY + F + r.columnHeaderHeight,
@@ -2736,55 +2736,55 @@ let cn = class {
       e.save(), e.translateWithPrecision(p.startX, p.startY), e.beginPath(), e.rect(0, 0, S, v), e.clip();
       const V = S - me * 2 - be - he - 4, { documentSkeleton: F, documents: x, docModel: X } = Ct(T, this._localeService, a);
       D === Ie.WRAP && X.updateDocumentDataPageSize(Math.max(V, 1)), F.calculate();
-      const Z = it(F), { height: z, width: te } = Z, { paddingTop: pe, paddingLeft: ce } = Hn(V, v, te, z, P, A);
+      const Z = it(F), { height: z, width: te } = Z, { paddingTop: pe, paddingLeft: de } = Bn(V, v, te, z, P, A);
       e.translateWithPrecision(me, pe);
-      const ne = Math.max(S - me * 2, 1), de = z;
+      const ne = Math.max(S - me * 2, 1), ce = z;
       ur.drawWith(e, {
         width: ne,
-        height: de,
-        fill: (N == null ? void 0 : N.color) || He,
+        height: ce,
+        fill: (N == null ? void 0 : N.color) || We,
         radius: Xt
-      }), e.save(), e.translateWithPrecision(be, 0), e.beginPath(), e.rect(0, 0, V, z), e.clip(), e.translateWithPrecision(ce, 0), x.render(e), e.restore(), e.translateWithPrecision(V + be + 4, (z - St) / 2), e.fillStyle = Qo, e.fill(Bn), e.restore(), C.set(w, {
+      }), e.save(), e.translateWithPrecision(be, 0), e.beginPath(), e.rect(0, 0, V, z), e.clip(), e.translateWithPrecision(de, 0), x.render(e), e.restore(), e.translateWithPrecision(V + be + 4, (z - St) / 2), e.fillStyle = Qo, e.fill(Hn), e.restore(), C.set(w, {
         left: p.startX + me + r.rowHeaderWidth,
         top: p.startY + pe + r.columnHeaderHeight,
         width: ne,
-        height: de
+        height: ce
       });
     }
   }
   calcCellAutoHeight(e) {
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
-    if (!d || d.renderMode === ie.TEXT)
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
+    if (!c || c.renderMode === ie.TEXT)
       return;
     const m = {
       startX: a.startX + s,
-      endX: a.endX - c,
+      endX: a.endX - d,
       startY: a.startY + u,
       endY: a.endY - h
     }, g = m.endX - m.startX, M = Q(n), y = `${M != null ? M : ""}`;
     let { tb: p, pd: S } = r || {};
     const { t: v = re.pd.t, b: C = re.pd.b } = S != null ? S : {};
-    if (p = p != null ? p : Ie.WRAP, d.renderMode === ie.ARROW) {
+    if (p = p != null ? p : Ie.WRAP, c.renderMode === ie.ARROW) {
       const w = g - he, { documentSkeleton: I, docModel: R } = Ct(y, this._localeService, r);
       p === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), I.calculate(), I.getActualSize();
       const T = it(I), { height: N } = T;
-      return N + v + C + We * 2;
+      return N + v + C + je * 2;
     } else {
       const w = g - me * 2 - be - he, { documentSkeleton: I, docModel: R } = Pr(y, this._localeService, r);
       p === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), I.calculate();
       const T = it(I), {
         height: N
       } = T;
-      return N + We * 2;
+      return N + je * 2;
     }
   }
   calcCellAutoWidth(e) {
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
-    if (!d || d.renderMode === ie.TEXT)
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
+    if (!c || c.renderMode === ie.TEXT)
       return;
     const m = {
       startX: a.startX + s,
-      endX: a.endX - c,
+      endX: a.endX - d,
       startY: a.startY + u,
       endY: a.endY - h
     }, g = m.endX - m.startX, M = Q(n), y = `${M != null ? M : ""}`;
@@ -2792,7 +2792,7 @@ let cn = class {
     const { l: v = re.pd.l, r: C = re.pd.r } = S != null ? S : {};
     p = p != null ? p : Ie.WRAP;
     let w = me * 2 + he;
-    switch (d.renderMode) {
+    switch (c.renderMode) {
       case ie.ARROW:
         w = he + me * 2 + C + v;
         break;
@@ -2810,8 +2810,8 @@ let cn = class {
     const { subUnitId: r, row: n, col: i } = t, a = this._ensureMap(r).get(this._generateKey(n, i)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, n, i);
     if (!l || !a || l.renderMode === ie.TEXT)
       return !1;
-    const { top: s, left: c, width: u, height: h } = a, { x: d, y: m } = e;
-    return d >= c && d <= c + u && m >= s && m <= s + h;
+    const { top: s, left: d, width: u, height: h } = a, { x: c, y: m } = e;
+    return c >= d && c <= d + u && m >= s && m <= s + h;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2833,18 +2833,18 @@ let cn = class {
     (n = (r = Ke(Y.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.DEFAULT);
   }
 };
-cn = Jo([
+dn = Jo([
   at(0, le),
   at(1, b(se)),
   at(2, J),
-  at(3, b(Ne)),
+  at(3, b(Ue)),
   at(4, b(ee))
-], cn);
+], dn);
 class ta extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.LIST);
-    E(this, "canvasRender", this.injector.createInstance(cn));
+    E(this, "canvasRender", this.injector.createInstance(dn));
     E(this, "dropdownType", ge.LIST);
     E(this, "optionsInput", Ot.componentKey);
     E(this, "formulaInput", hn);
@@ -2889,10 +2889,10 @@ let tt = class extends un {
   }
   _registerValidatorViews() {
     [
-      Ho,
+      Bo,
       ra,
       na,
-      Bo,
+      Ho,
       Fo,
       ta,
       Zo,
@@ -2928,7 +2928,7 @@ let Wn = (It = class extends Gn {
   onStarting() {
     [
       [_e],
-      [Ae],
+      [Le],
       [ut],
       [qe],
       [et],
@@ -2943,14 +2943,14 @@ let Wn = (It = class extends Gn {
       kt,
       Mr,
       Rn,
-      Fe,
+      xe,
       yr
     ].forEach((e) => {
       this._commandService.registerCommand(e);
     });
   }
   onReady() {
-    this._injector.get(Je), this._injector.get(Qe), this._injector.get(Ze), this._injector.get(ut), this._injector.get(Ne).registerRenderModule(
+    this._injector.get(Je), this._injector.get(Qe), this._injector.get(Ze), this._injector.get(ut), this._injector.get(Ue).registerRenderModule(
       Y.UNIVER_SHEET,
       [Vt]
     );
@@ -2965,10 +2965,10 @@ let Wn = (It = class extends Gn {
 Wn = sa([
   Kt(1, b(we)),
   Kt(2, J),
-  Kt(3, dn)
+  Kt(3, cn)
 ], Wn);
-var ca = Object.getOwnPropertyDescriptor, da = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? ca(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+var da = Object.getOwnPropertyDescriptor, ca = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? da(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, Gt = (e, t) => (r, n) => t(r, n, e);
@@ -2987,7 +2987,7 @@ let jn = (wt = class extends Gn {
   onStarting() {
     [
       [_e],
-      [Ae],
+      [Le],
       [ut],
       [qe],
       [et],
@@ -3001,14 +3001,14 @@ let jn = (wt = class extends Gn {
       kt,
       Mr,
       Rn,
-      Fe,
+      xe,
       yr
     ].forEach((e) => {
       this._commandService.registerCommand(e);
     });
   }
   onReady() {
-    this._injector.get(Je), this._injector.get(Qe), this._injector.get(Ne).registerRenderModule(
+    this._injector.get(Je), this._injector.get(Qe), this._injector.get(Ue).registerRenderModule(
       Y.UNIVER_SHEET,
       [Vt]
     );
@@ -3020,10 +3020,10 @@ let jn = (wt = class extends Gn {
     this._injector.get(qe);
   }
 }, E(wt, "pluginName", ua), E(wt, "type", Y.UNIVER_SHEET), wt);
-jn = da([
+jn = ca([
   Gt(1, b(we)),
   Gt(2, J),
-  Gt(3, dn)
+  Gt(3, cn)
 ], jn);
 export {
   fe as BaseSheetDataValidatorView,