@univerjs/sheets-data-validation-ui 0.7.0-nightly.202505071607 → 0.7.0-nightly.202505101606

package/lib/es/index.js

@@ -1,73 +1,73 @@
-var Ar = Object.defineProperty;
-var Lr = (e, t, r) => t in e ? Ar(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var E = (e, t, r) => Lr(e, typeof t != "symbol" ? t + "" : t, r);
-import { LocaleService as se, isFormulaString as De, DataValidationType as G, Tools as Kt, Inject as M, Injector as we, Disposable as Re, UniverInstanceType as j, toDisposable as kr, IUniverInstanceService as le, DataValidationErrorStyle as lt, DataValidationStatus as je, ICommandService as J, IConfigService as ln, DataValidationRenderMode as ie, DisposableCollection as Nr, dayjs as Rn, numfmt as Wn, CellValueType as Ur, CommandType as nt, ObjectMatrix as wt, Range as Fr, Rectangle as Rt, queryObjectMatrix as Gt, Optional as xr, RxDisposable as dn, InterceptorEffectEnum as jn, sequenceExecute as Yn, bufferDebounceTime as $r, debounce as Br, UndoCommand as Hr, RedoCommand as Wr, isUnitRangesEqual as jr, shallowEqual as yn, ThemeService as Xn, ColorKit as Yr, VerticalAlign as ae, HorizontalAlign as Ye, DEFAULT_STYLES as re, WrapStrategy as Ie, DocumentDataModel as Xr, BooleanNumber as rt, DEFAULT_EMPTY_DOCUMENT_VALUE as zr, Plugin as zn, merge as Kn } from "@univerjs/core";
-import { DataValidationFormulaController as Kr, deserializeListOptions as Gr, serializeListOptions as Gn, CUSTOM_FORMULA_INPUT_NAME as Zn, BASE_FORMULA_INPUT_NAME as Tt, LIST_FORMULA_INPUT_NAME as cn, CHECKBOX_FORMULA_INPUT_NAME as qn, SheetDataValidationModel as ee, SheetsDataValidationValidatorService as Zr, getDataValidationCellValue as kt, getCellValueOrigin as Q, createDefaultNewRule as Jn, AddSheetDataValidationCommand as un, DATA_VALIDATION_PLUGIN_NAME as Qn, getDataValidationDiffMutations as Zt, UpdateSheetDataValidationRangeCommand as er, DataValidationCacheService as tr, UpdateSheetDataValidationSettingCommand as bn, UpdateSheetDataValidationOptionsCommand as qr, RemoveSheetDataValidationCommand as nr, RemoveSheetAllDataValidationCommand as Jr, DataValidationFormulaService as Qr, CHECKBOX_FORMULA_2 as ei, CHECKBOX_FORMULA_1 as ti, getFormulaResult as Nt, isLegalFormulaResult as Mn, transformCheckboxValue as ni } from "@univerjs/sheets-data-validation";
-import { jsxs as W, Fragment as Xe, jsx as _ } from "react/jsx-runtime";
-import { FormLayout as K, Input as Ve, Checkbox as Pt, RadioGroup as hn, Radio as Oe, DraggableList as ri, clsx as rr, Dropdown as ii, Button as ze, Select as En } from "@univerjs/design";
-import { useDependency as U, useSidebarClick as ir, useObservable as Te, useEvent as qt, ISidebarService as or, IDialogService as oi, IZenZoneService as ar, KeyCode as ht, MenuItemType as gn, getMenuHiddenObservable as ai, RibbonStartGroup as si, IMenuManagerService as li, ComponentManager as pn } from "@univerjs/ui";
-import Dn, { useState as H, useRef as ut, forwardRef as Le, createElement as ke, useMemo as dt, useEffect as Pe } from "react";
-import { FormulaEditor as sr, RangeSelector as di } from "@univerjs/sheets-formula-ui";
-import { DataValidatorRegistryService as ye, DataValidationModel as vn, DataValidatorDropdownType as ge, DataValidatorRegistryScope as ci, TWO_FORMULA_OPERATOR_COUNT as ui, getRuleOptions as Vn, getRuleSetting as On } from "@univerjs/data-validation";
-import { debounceTime as lr, filter as mn, BehaviorSubject as Tn, distinctUntilChanged as hi, Subject as gi, bufferTime as dr, of as pi } from "rxjs";
-import { DeviceInputEventType as gt, IRenderManagerService as Ne, fixLineWidthByScale as Pn, Transform as vi, CheckboxShape as mi, getCurrentTypeOfRenderer as Ke, CURSOR_TYPE as Ge, FontCache as fi, Shape as _i, Rect as cr, getFontStyleString as Ut, getDocsSkeletonPageSize as it, Documents as Si, DocumentViewModel as Ci, DocumentSkeleton as Ii } from "@univerjs/engine-render";
-import { SheetInterceptorService as fn, VALIDATE_CELL as wi, SheetsSelectionsService as ur, SetRangeValuesCommand as st, getSheetCommandTarget as hr, rangeToDiscreteRange as Ri, SheetPermissionCheckController as yi, WorksheetEditPermission as Jt, WorksheetSetCellStylePermission as Qt, RangeProtectionPermissionEditPoint as en, WorkbookEditablePermission as tn, INTERCEPTOR_POINT as gr, InterceptCellContentPriority as pr, checkRangesEditablePermission as bi } from "@univerjs/sheets";
-import { getPatternType as Mi } from "@univerjs/sheets-numfmt";
-import { ISheetCellDropdownManagerService as Ei, IEditorBridgeService as vr, SetCellEditVisibleOperation as pt, HoverManagerService as Di, CellAlertManagerService as Vi, CellAlertType as Oi, IAutoFillService as Ti, APPLY_TYPE as ot, virtualizeDiscreteRanges as nn, getAutoFillRepeatRange as Pi, ISheetClipboardService as Ai, COPY_TYPE as An, PREDEFINED_HOOK_NAME as vt, getRepeatRange as Ln, getCurrentRangeDisable$ as Li, AutoHeightController as mr, SheetSkeletonManagerService as yt, IMarkSelectionService as ki } from "@univerjs/sheets-ui";
-import { deserializeRangeWithSheet as Ni, serializeRange as fr } from "@univerjs/engine-formula";
-const Ui = (e) => {
+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 { 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 { 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 { 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(Xe, { children: [
-    /* @__PURE__ */ _(K, { error: l, children: /* @__PURE__ */ _(
+  return t ? /* @__PURE__ */ W(ct, { 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: (d) => {
+        onChange: (c) => {
           n == null || n({
             ...r,
-            formula1: d
+            formula1: c
           });
         }
       }
     ) }),
     /* @__PURE__ */ _("div", { className: "-univer-mt-2 univer-mb-1 univer-text-sm univer-text-gray-400", children: a.t("dataValidation.panel.formulaAnd") }),
-    /* @__PURE__ */ _(K, { error: s, children: /* @__PURE__ */ _(
+    /* @__PURE__ */ _(j, { error: s, children: /* @__PURE__ */ _(
       Ve,
       {
         className: "univer-w-full",
         placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
         value: r == null ? void 0 : r.formula2,
-        onChange: (d) => {
+        onChange: (c) => {
           n == null || n({
             ...r,
-            formula2: d
+            formula2: c
           });
         }
       }
     ) })
-  ] }) : /* @__PURE__ */ _(K, { error: l, children: /* @__PURE__ */ _(
+  ] }) : /* @__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: (d) => {
-        n == null || n({ formula1: d });
+      onChange: (c) => {
+        n == null || n({ formula1: c });
       }
     }
   ) });
 };
-function Fi(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, d] = H(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
-  return /* @__PURE__ */ W(Xe, { children: [
-    /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(
-      Pt,
+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: [
+    /* @__PURE__ */ _(j, { children: /* @__PURE__ */ _(
+      Lt,
       {
         checked: s,
         onChange: (u) => {
-          u ? d(!0) : (d(!1), r == null || r({
+          u ? c(!0) : (c(!1), r == null || r({
             ...t,
             formula1: void 0,
             formula2: void 0
@@ -76,7 +76,7 @@ function Fi(e) {
         children: o.t("dataValidation.checkbox.tips")
       }
     ) }),
-    s ? /* @__PURE__ */ _(K, { label: o.t("dataValidation.checkbox.checked"), error: a, children: /* @__PURE__ */ _(
+    s ? /* @__PURE__ */ _(j, { label: o.t("dataValidation.checkbox.checked"), error: a, children: /* @__PURE__ */ _(
       Ve,
       {
         className: "univer-w-full",
@@ -90,7 +90,7 @@ function Fi(e) {
         }
       }
     ) }) : null,
-    s ? /* @__PURE__ */ _(K, { label: o.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ _(
+    s ? /* @__PURE__ */ _(j, { label: o.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ _(
       Ve,
       {
         className: "univer-w-full",
@@ -106,33 +106,31 @@ function Fi(e) {
     ) }) : null
   ] });
 }
-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 = ut(null), [d, u] = H(!1);
-  return ir((c) => {
+  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) => {
     var g;
-    ((g = s.current) == null ? void 0 : g.isClickOutSide(c)) && u(!1);
-  }), /* @__PURE__ */ _(
-    sr,
+    ((g = s.current) == null ? void 0 : g.isClickOutSide(d)) && u(!1);
+  }), /* @__PURE__ */ _(j, { error: l, children: /* @__PURE__ */ _(
+    lr,
     {
       ref: s,
-      className: `
-              univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg
-              univer-border univer-border-solid univer-border-gray-200 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-border-gray-600 dark:univer-bg-gray-700 dark:univer-text-white
-              hover:univer-border-primary-600
-            `,
+      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: (h = n == null ? void 0 : n.formula1) != null ? h : "=",
       unitId: t,
       subUnitId: r,
-      isFocus: d,
-      errorText: l,
+      isFocus: c,
       isSupportAcrossSheet: !0,
-      onChange: (c) => {
-        const m = (c != null ? c : "").trim();
+      onChange: (d) => {
+        const m = (d != null ? d : "").trim();
         m !== (n == null ? void 0 : n.formula1) && (i == null || i({
           ...n,
           formula1: m
@@ -140,7 +138,7 @@ function xi(e) {
       },
       onFocus: () => u(!0)
     }
-  );
+  ) });
 }
 var oe = function() {
   return oe = Object.assign || function(e) {
@@ -150,7 +148,7 @@ var oe = function() {
     }
     return e;
   }, oe.apply(this, arguments);
-}, $i = function(e, t) {
+}, Bi = 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")
@@ -158,15 +156,15 @@ var oe = function() {
       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 = $i(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), s = ut("_".concat(Wi()));
-  return _r(r, "".concat(n), { defIds: r.defIds, idSuffix: s.current }, oe({ ref: t, className: l }, a), o);
+  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()));
+  return Sr(r, "".concat(n), { defIds: r.defIds, idSuffix: s.current }, oe({ ref: t, className: l }, a), o);
 });
-function _r(e, t, r, n, i) {
-  return ke(e.tag, oe(oe({ key: t }, Bi(e, r, i)), n), (Hi(e, r).children || []).map(function(o, a) {
-    return _r(o, "".concat(t, "-").concat(e.tag, "-").concat(a), r, void 0, i);
+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 Sr(o, "".concat(t, "-").concat(e.tag, "-").concat(a), r, void 0, i);
   }));
 }
-function Bi(e, t, r) {
+function Hi(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,65 +176,65 @@ function Bi(e, t, r) {
     typeof l == "string" && (n[a] = l.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
   })), n;
 }
-function Hi(e, t) {
+function Wi(e, t) {
   var r, n = t.defIds;
   return !n || n.length === 0 ? e : e.tag === "defs" && (!((r = e.children) === null || r === void 0) && r.length) ? oe(oe({}, e), { children: e.children.map(function(i) {
     return typeof i.attrs.id == "string" && n && n.indexOf(i.attrs.id) > -1 ? oe(oe({}, i), { attrs: oe(oe({}, i.attrs), { id: i.attrs.id + t.idSuffix }) }) : i;
   }) }) : e;
 }
-function Wi() {
+function ji() {
   return Math.random().toString(36).substring(2, 8);
 }
 Ue.displayName = "UniverIcon";
-var ji = { 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" } }] }, Sr = Le(function(e, t) {
+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, {
     id: "data-validation-single",
     ref: t,
-    icon: ji
+    icon: Yi
   }));
 });
-Sr.displayName = "DataValidationSingle";
-var Yi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993.866699 5.9313.866699H10.069C10.4004.866699 10.669 1.13533 10.669 1.4667 10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667zM1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443 14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443zM6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928 9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171 10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778 9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539 9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263 6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539 5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778 6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, _n = Le(function(e, t) {
+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, {
     id: "delete-single",
     ref: t,
-    icon: Yi
+    icon: Xi
   }));
 });
-_n.displayName = "DeleteSingle";
-var Xi = { 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" } }] }, Cr = Le(function(e, t) {
+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, {
     id: "increase-single",
     ref: t,
-    icon: Xi
+    icon: zi
   }));
 });
-Cr.displayName = "IncreaseSingle";
-var zi = { 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" } }] }, Sn = Le(function(e, t) {
+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, {
     id: "more-down-single",
     ref: t,
-    icon: zi
+    icon: Ki
   }));
 });
-Sn.displayName = "MoreDownSingle";
-var Ki = { 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" } }] }, Ir = Le(function(e, t) {
+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, {
     id: "more-up-single",
     ref: t,
-    icon: Ki
+    icon: Gi
   }));
 });
-Ir.displayName = "MoreUpSingle";
-var Gi = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "mask", attrs: { id: "mask0_622_8", style: { maskType: "alpha" }, width: 16, height: 16, x: 0, y: 0, maskUnits: "userSpaceOnUse" }, children: [{ tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }] }, { tag: "g", attrs: { fill: "currentColor", mask: "url(#mask0_622_8)" }, children: [{ tag: "path", attrs: { d: "M6 5C6.55228 5 7 4.55228 7 4 7 3.44772 6.55228 3 6 3 5.44772 3 5 3.44772 5 4 5 4.55228 5.44772 5 6 5zM6 9C6.55228 9 7 8.55229 7 8 7 7.44772 6.55228 7 6 7 5.44772 7 5 7.44772 5 8 5 8.55229 5.44772 9 6 9zM7 12C7 12.5523 6.55228 13 6 13 5.44772 13 5 12.5523 5 12 5 11.4477 5.44772 11 6 11 6.55228 11 7 11.4477 7 12zM10 5C10.5523 5 11 4.55228 11 4 11 3.44772 10.5523 3 10 3 9.44771 3 9 3.44772 9 4 9 4.55228 9.44771 5 10 5zM11 8C11 8.55229 10.5523 9 10 9 9.44771 9 9 8.55229 9 8 9 7.44772 9.44771 7 10 7 10.5523 7 11 7.44772 11 8zM10 13C10.5523 13 11 12.5523 11 12 11 11.4477 10.5523 11 10 11 9.44771 11 9 11.4477 9 12 9 12.5523 9.44771 13 10 13z" } }] }] }, wr = Le(function(e, t) {
+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, {
     id: "sequence-single",
     ref: t,
-    icon: Gi
+    icon: Zi
   }));
 });
-wr.displayName = "SequenceSingle";
-const He = "#ECECEC", Zi = [
+Rr.displayName = "SequenceSingle";
+const He = "#ECECEC", qi = [
   "#FFFFFF",
   "#FEE7E7",
   "#FEF0E6",
@@ -261,10 +259,10 @@ const He = "#ECECEC", Zi = [
   "#3A60F7",
   "#9E6DE3",
   "#F248A6"
-], qi = (e) => {
+], Ji = (e) => {
   const { value: t, onChange: r, disabled: n } = e, [i, o] = H(!1);
   return /* @__PURE__ */ _(
-    ii,
+    oi,
     {
       align: "start",
       disabled: n,
@@ -277,14 +275,11 @@ const He = "#ECECEC", Zi = [
                       univer-box-border univer-grid univer-w-fit univer-grid-cols-6 univer-flex-wrap univer-gap-2
                       univer-p-1.5
                     `,
-          children: Zi.map(
+          children: qi.map(
             (a) => /* @__PURE__ */ _(
               "div",
               {
-                className: `
-                                  univer-box-border univer-size-4 univer-cursor-pointer univer-rounded univer-border
-                                  univer-border-solid univer-border-gray-200
-                                `,
+                className: Xe("univer-box-border univer-size-4 univer-cursor-pointer univer-rounded", Mt),
                 style: { background: a },
                 onClick: () => {
                   r(a), o(!1);
@@ -298,36 +293,33 @@ const He = "#ECECEC", Zi = [
       children: /* @__PURE__ */ W(
         "div",
         {
-          className: `
+          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-border univer-border-solid
-                  univer-border-gray-200 univer-bg-white univer-px-2.5 univer-transition-colors univer-duration-200
-                  dark:univer-border-gray-600 dark:univer-bg-gray-700 dark:univer-text-white
+                  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",
               {
-                className: `
-                      univer-box-border univer-h-4 univer-w-4 univer-rounded univer-border univer-border-gray-200
-                      univer-text-base
-                    `,
+                className: "univer-box-border univer-h-4 univer-w-4 univer-rounded univer-text-base",
                 style: { background: t }
               }
             ),
-            /* @__PURE__ */ _(Sn, { className: "univer-text-gray-600" })
+            /* @__PURE__ */ _(In, {})
           ]
         }
       )
     }
   );
-}, kn = (e) => {
+}, 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: rr("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ _(wr, {}) }),
+    t.isRef ? null : /* @__PURE__ */ _("div", { className: Xe("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ _(Rr, {}) }),
     /* @__PURE__ */ _(
-      qi,
+      Ji,
       {
         value: t.color,
         onChange: (a) => {
@@ -352,14 +344,14 @@ const He = "#ECECEC", Zi = [
                           univer-ml-1 univer-cursor-pointer univer-rounded univer-text-base
                           hover:univer-bg-gray-200
                         `,
-        children: /* @__PURE__ */ _(_n, { onClick: () => o(t.id) })
+        children: /* @__PURE__ */ _(Cn, { onClick: () => o(t.id) })
       }
     )
   ] });
 };
-function Ji(e) {
+function Qi(e) {
   const { value: t, onChange: r = () => {
-  }, unitId: n, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, h] = H(() => De(s) ? "1" : "0"), [c, m] = H(u === "1" ? s : "="), [g, b] = H(u === "1" ? s : "="), y = U(se), p = U(ye), S = U(vn), v = U(Kr), [C, w] = H(() => d.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(lr(16)), []), L = Te(A), V = qt(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);
   Pe(() => {
     (async () => {
       await new Promise((f) => {
@@ -372,41 +364,41 @@ function Ji(e) {
       }
     })();
   }, [S, L, I, l, i, n]), Pe(() => {
-    De(s) && s !== g && (m(s), b(g));
+    De(s) && s !== g && (m(s), M(g));
   }, [g, s]);
   const [F, x] = H(() => {
-    const O = u !== "1" ? Gr(s) : [], B = d.split(",");
+    const O = u !== "1" ? Zr(s) : [], B = c.split(",");
     return O.map((f, k) => ({
       label: f,
       color: B[k] || He,
       isRef: !1,
-      id: Kt.generateRandomId(4)
+      id: Zt.generateRandomId(4)
     }));
-  }), Y = (O, B, f) => {
+  }), X = (O, B, f) => {
     const k = F.find(($) => $.id === O);
     k && (k.label = B, k.color = f, x([...F]));
   }, Z = (O) => {
     const B = F.findIndex((f) => f.id === O);
     B !== -1 && (F.splice(B, 1), x([...F]));
-  }, X = d.split(","), te = dt(() => R.map((O, B) => ({
+  }, z = c.split(","), te = dt(() => R.map((O, B) => ({
     label: O,
-    color: X[B] || He,
+    color: z[B] || He,
     id: `${B}`,
     isRef: !0
-  })), [X, R]), pe = (O, B, f) => {
+  })), [z, R]), pe = (O, B, f) => {
     const k = [...C];
     k[+O] = f, w(k), V({
       formula1: s,
       formula2: k.join(",")
     });
-  }, de = () => {
+  }, ce = () => {
     x([
       ...F,
       {
         label: "",
         color: He,
         isRef: !1,
-        id: Kt.generateRandomId(4)
+        id: Zt.generateRandomId(4)
       }
     ]);
   };
@@ -425,32 +417,32 @@ function Ji(e) {
         }));
       });
     }), V({
-      formula1: Gn(B.map((f) => f.label)),
+      formula1: qn(B.map((f) => f.label)),
       formula2: B.map((f) => f.color === He ? "" : f.color).join(",")
     });
   }, [F, V, u, g, C]);
-  const ne = qt(async (O) => {
+  const ne = Qt(async (O) => {
     if (!De(O)) {
       V == null || V({
         formula1: "",
-        formula2: d
+        formula2: c
       });
       return;
     }
     v.getFormulaRefCheck(O) ? (V == null || V({
       formula1: De(O) ? O : "",
-      formula2: d
+      formula2: c
     }), D("")) : (V == null || V({
       formula1: "",
-      formula2: d
+      formula2: c
     }), m("="), D(y.t("dataValidation.validFail.formulaError")));
-  }), ce = ut(null), [Se, ve] = H(!1);
-  return ir((O) => {
+  }), de = ht(null), [Se, ve] = H(!1);
+  return or((O) => {
     var f;
-    ((f = ce.current) == null ? void 0 : f.isClickOutSide(O)) && ve(!1);
-  }), /* @__PURE__ */ W(Xe, { children: [
-    /* @__PURE__ */ _(K, { label: y.t("dataValidation.list.options"), children: /* @__PURE__ */ W(
-      hn,
+    ((f = de.current) == null ? void 0 : f.isClickOutSide(O)) && ve(!1);
+  }), /* @__PURE__ */ W(ct, { children: [
+    /* @__PURE__ */ _(j, { label: y.t("dataValidation.list.options"), children: /* @__PURE__ */ W(
+      pn,
       {
         value: u,
         onChange: (O) => {
@@ -465,35 +457,33 @@ function Ji(e) {
         ]
       }
     ) }),
-    u === "1" ? /* @__PURE__ */ W(Xe, { children: [
+    u === "1" ? /* @__PURE__ */ W(j, { error: P || N || void 0, children: [
       /* @__PURE__ */ _(
-        sr,
+        lr,
         {
-          ref: ce,
-          className: `
+          ref: de,
+          className: Xe(`
                               univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center
-                              univer-rounded-lg univer-border univer-border-solid univer-border-gray-200 univer-bg-white
-                              univer-pt-2 univer-transition-colors
+                              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-border-gray-600 dark:univer-bg-gray-700 dark:univer-text-white
+                              dark:univer-bg-gray-700 dark:univer-text-white
                               hover:univer-border-primary-600
-                            `,
-          initValue: c,
+                            `, Mt),
+          initValue: d,
           unitId: n,
           subUnitId: i,
           isFocus: Se,
-          errorText: P || N || void 0,
           isSupportAcrossSheet: !0,
           onFocus: () => ve(!0),
           onChange: (O = "") => {
             const B = (O != null ? O : "").trim();
-            b(B), ne(B);
+            M(B), ne(B);
           }
         }
       ),
       te.length > 0 && /* @__PURE__ */ _("div", { style: { marginTop: "12px" }, children: te.map((O) => /* @__PURE__ */ _(
-        kn,
+        Un,
         {
           item: O,
           commonProps: { onItemChange: pe },
@@ -501,9 +491,9 @@ function Ji(e) {
         },
         O.id
       )) })
-    ] }) : /* @__PURE__ */ _(K, { error: P, children: /* @__PURE__ */ W("div", { style: { marginTop: "-12px" }, children: [
+    ] }) : /* @__PURE__ */ _(j, { error: P, children: /* @__PURE__ */ W("div", { style: { marginTop: "-12px" }, children: [
       /* @__PURE__ */ _(
-        ri,
+        ii,
         {
           list: F,
           onListChange: x,
@@ -511,11 +501,11 @@ function Ji(e) {
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
           itemRender: (O) => /* @__PURE__ */ _(
-            kn,
+            Un,
             {
               item: O,
               commonProps: {
-                onItemChange: Y,
+                onItemChange: X,
                 onItemDelete: Z
               }
             },
@@ -532,9 +522,9 @@ function Ji(e) {
                                   univer-rounded univer-p-1 univer-px-2 univer-text-sm univer-text-primary
                                   hover:univer-bg-primary-600/5
                                 `,
-          onClick: de,
+          onClick: ce,
           children: [
-            /* @__PURE__ */ _(Cr, { className: "univer-mr-1" }),
+            /* @__PURE__ */ _(Ir, { className: "univer-mr-1" }),
             y.t("dataValidation.list.add")
           ]
         }
@@ -542,61 +532,61 @@ function Ji(e) {
     ] }) })
   ] });
 }
-const Qi = [
+const eo = [
   [
-    Zn,
-    xi
+    Jn,
+    $i
   ],
   [
-    Tt,
-    Ui
+    At,
+    Fi
   ],
   [
-    cn,
-    Ji
+    hn,
+    Qi
   ],
   [
-    qn,
-    Fi
+    Qn,
+    xi
   ]
 ];
-var eo = Object.getOwnPropertyDescriptor, to = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? eo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+var to = Object.getOwnPropertyDescriptor, no = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? to(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, no = (e, t) => (r, n) => t(r, n, e);
+}, ro = (e, t) => (r, n) => t(r, n, e);
 let fe = class {
   constructor(e) {
     E(this, "canvasRender", null);
     E(this, "dropdownType");
     E(this, "optionsInput");
-    E(this, "formulaInput", cn);
+    E(this, "formulaInput", hn);
     this.injector = e;
   }
 };
-fe = to([
-  no(0, M(we))
+fe = no([
+  ro(0, b(we))
 ], fe);
-var ro = Object.getOwnPropertyDescriptor, io = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? ro(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+var io = Object.getOwnPropertyDescriptor, oo = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? io(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Nn = (e, t) => (r, n) => t(r, n, e);
+}, Fn = (e, t) => (r, n) => t(r, n, e);
 let _e = class extends Re {
   constructor(t, r) {
     super();
-    E(this, "_open$", new Tn(!1));
-    E(this, "open$", this._open$.pipe(hi()));
+    E(this, "_open$", new An(!1));
+    E(this, "open$", this._open$.pipe(gi()));
     E(this, "_activeRule");
-    E(this, "_activeRule$", new Tn(void 0));
+    E(this, "_activeRule$", new An(void 0));
     E(this, "activeRule$", this._activeRule$.asObservable());
     E(this, "_closeDisposable", null);
     this._univerInstanceService = t, this._sidebarService = r, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(j.UNIVER_SHEET).pipe(mn((n) => !n)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET).pipe(_n((n) => !n)).subscribe(() => {
         this.close();
       })
     ), this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((n) => {
-      n.id === Mt && (n.visible || setTimeout(() => {
+      n.id === Dt && (n.visible || setTimeout(() => {
         this._sidebarService.sidebarOptions$.next({ visible: !1 });
       }));
     }));
@@ -619,7 +609,7 @@ let _e = class extends Re {
     this._open$.next(!1), (t = this._closeDisposable) == null || t.dispose();
   }
   setCloseDisposable(t) {
-    this._closeDisposable = kr(() => {
+    this._closeDisposable = Nr(() => {
       t.dispose(), this._closeDisposable = null;
     });
   }
@@ -627,13 +617,13 @@ let _e = class extends Re {
     this._activeRule = t, this._activeRule$.next(t);
   }
 };
-_e = io([
-  Nn(0, le),
-  Nn(1, or)
+_e = oo([
+  Fn(0, le),
+  Fn(1, ar)
 ], _e);
-const Cn = "sheets-data-validation-ui.config", bt = {};
-var oo = Object.getOwnPropertyDescriptor, ao = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? oo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+const wn = "sheets-data-validation-ui.config", Et = {};
+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);
@@ -643,15 +633,15 @@ let Ze = class extends Re {
   }
   _initEditorBridgeInterceptor() {
     this._sheetInterceptorService.writeCellInterceptor.intercept(
-      wi,
+      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), d = 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), c = s ? this._dataValidationModel.getRuleById(a, l, s) : void 0;
           if (n === !1)
             return r(Promise.resolve(!1));
-          if (!d || d.errorStyle !== lt.STOP)
+          if (!c || c.errorStyle !== lt.STOP)
             return r(Promise.resolve(!0));
-          const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
+          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({
             width: 368,
             title: {
@@ -659,10 +649,10 @@ let Ze = class extends Re {
             },
             id: "reject-input-dialog",
             children: {
-              title: u.getRuleFinalError(d, { row: i, col: o, unitId: a, subUnitId: l })
+              title: u.getRuleFinalError(c, { row: i, col: o, unitId: a, subUnitId: l })
             },
             footer: {
-              title: Dn.createElement(
+              title: On.createElement(
                 ze,
                 {
                   variant: "primary",
@@ -690,7 +680,7 @@ let Ze = class extends Re {
         title: e
       },
       footer: {
-        title: Dn.createElement(
+        title: On.createElement(
           ze,
           {
             variant: "primary",
@@ -705,30 +695,30 @@ let Ze = class extends Re {
     });
   }
 };
-Ze = ao([
-  xe(0, M(fn)),
-  xe(1, M(ee)),
-  xe(2, M(ye)),
-  xe(3, oi),
-  xe(4, M(se)),
-  xe(5, M(Zr))
+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))
 ], Ze);
-var so = Object.getOwnPropertyDescriptor, lo = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? so(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+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--)
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, ue = (e, t) => (r, n) => t(r, n, e);
-const Ft = (e) => {
+const $t = (e) => {
   if (e == null || typeof e == "boolean")
     return;
   if (typeof e == "number" || !Number.isNaN(+e))
-    return Rn(Wn.format("yyyy-MM-dd HH:mm:ss", Number(e)));
-  const t = Rn(e);
+    return Mn(Yn.format("yyyy-MM-dd HH:mm:ss", Number(e)));
+  const t = Mn(e);
   if (t.isValid())
     return t;
 };
-function co(e, t) {
-  const r = Mi(t);
+function uo(e, t) {
+  const r = Ei(t);
   if (e === r)
     return t;
   switch (e) {
@@ -741,14 +731,14 @@ function co(e, t) {
   }
 }
 let Ae = class extends Re {
-  constructor(t, r, n, i, o, a, l, s, d, u, h) {
+  constructor(t, r, n, i, o, a, l, s, c, u, h) {
     super();
     E(this, "_activeDropdown");
-    E(this, "_activeDropdown$", new gi());
+    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 = d, 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 = c, this._injector = u, this._configService = h, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
   }
@@ -761,7 +751,7 @@ let Ae = class extends Re {
     }));
   }
   _getDropdownByCell(t, r, n, i) {
-    const o = t ? this._univerInstanceService.getUnit(t, j.UNIVER_SHEET) : this._univerInstanceService.getCurrentUnitForType(j.UNIVER_SHEET);
+    const o = t ? this._univerInstanceService.getUnit(t, Y.UNIVER_SHEET) : this._univerInstanceService.getCurrentUnitForType(Y.UNIVER_SHEET);
     if (!o)
       return;
     const a = r ? o.getSheetBySheetId(r) : o.getActiveSheet();
@@ -780,24 +770,24 @@ let Ae = class extends Re {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   showDropdown(t) {
-    var b, y, p, S;
+    var M, y, p, S;
     const { location: r } = t, { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = r;
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
     this._activeDropdown = t, this._activeDropdown$.next(this._activeDropdown);
-    const d = this._sheetDataValidationModel.getRuleByLocation(o, a, n, i);
-    if (!d)
+    const c = this._sheetDataValidationModel.getRuleByLocation(o, a, n, i);
+    if (!c)
       return;
-    const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
+    const u = this._dataValidatorRegistryService.getValidatorItem(c.type);
     if (!(u != null && u.dropdownType))
       return;
     let h;
-    const c = async (v, C) => {
+    const d = 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 = Wn.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 d.errorStyle !== lt.STOP || await u.validator({
+      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({
         value: N,
         unitId: o,
         subUnitId: a,
@@ -806,12 +796,12 @@ let Ae = class extends Re {
         worksheet: s,
         workbook: l,
         interceptValue: R.replace("Z", "").replace("T", " "),
-        t: Ur.NUMBER
-      }, d) ? (await this._commandService.executeCommand(pt.id, {
+        t: Fr.NUMBER
+      }, c) ? (await this._commandService.executeCommand(vt.id, {
         visible: !1,
-        eventType: gt.Keyboard,
+        eventType: pt.Keyboard,
         unitId: o,
-        keycode: ht.ESC
+        keycode: gt.ESC
       }), await this._commandService.executeCommand(st.id, {
         unitId: o,
         subUnitId: a,
@@ -829,22 +819,22 @@ let Ae = class extends Re {
           si: null,
           s: {
             n: {
-              pattern: co(C, P)
+              pattern: uo(C, P)
             }
           }
         }
-      }), !0) : (this._injector.has(Ze) && this._injector.get(Ze).showReject(u.getRuleFinalError(d, { row: n, col: i, unitId: o, subUnitId: a })), !1);
+      }), !0) : (this._injector.has(Ze) && this._injector.get(Ze).showReject(u.getRuleFinalError(c, { 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 = Ft(v), w = !!((b = d.bizInfo) != null && b.showTime);
+        const v = Q(s.getCellRaw(n, i)), C = $t(v), w = !!((M = c.bizInfo) != null && M.showTime);
         m = {
           location: r,
           type: "datepicker",
           props: {
             showTime: w,
-            onChange: (I) => c(I, w ? "datetime" : "date"),
+            onChange: (I) => d(I, w ? "datetime" : "date"),
             defaultValue: C,
             patternType: "date"
           }
@@ -852,12 +842,12 @@ let Ae = class extends Re {
         break;
       }
       case ge.TIME: {
-        const v = Q(s.getCellRaw(n, i)), C = Ft(v);
+        const v = Q(s.getCellRaw(n, i)), C = $t(v);
         m = {
           location: r,
           type: "datepicker",
           props: {
-            onChange: (w) => c(w, "time"),
+            onChange: (w) => d(w, "time"),
             defaultValue: C,
             patternType: "time"
           }
@@ -865,12 +855,12 @@ let Ae = class extends Re {
         break;
       }
       case ge.DATETIME: {
-        const v = Q(s.getCellRaw(n, i)), C = Ft(v);
+        const v = Q(s.getCellRaw(n, i)), C = $t(v);
         m = {
           location: r,
           type: "datepicker",
           props: {
-            onChange: (w) => c(w, "datetime"),
+            onChange: (w) => d(w, "datetime"),
             defaultValue: C,
             patternType: "datetime"
           }
@@ -880,7 +870,7 @@ let Ae = class extends Re {
       case ge.LIST:
       case ge.MULTIPLE_LIST: {
         const v = u.dropdownType === ge.MULTIPLE_LIST, C = async (D) => {
-          const P = Gn(D), A = {
+          const P = qn(D), A = {
             unitId: o,
             subUnitId: a,
             range: {
@@ -896,15 +886,15 @@ let Ae = class extends Re {
               si: null
             }
           };
-          return this._editorBridgeService.isVisible().visible && await this._commandService.executeCommand(pt.id, {
+          return this._editorBridgeService.isVisible().visible && await this._commandService.executeCommand(vt.id, {
             visible: !1,
-            eventType: gt.Keyboard,
+            eventType: pt.Keyboard,
             unitId: o,
-            keycode: ht.ESC
+            keycode: gt.ESC
           }), this._commandService.executeCommand(st.id, A), !v;
-        }, w = (d == null ? void 0 : d.renderMode) === ie.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, I = u.getListWithColor(d, o, a), R = kt(s.getCellRaw(n, i)), T = () => {
+        }, 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: d.uid
+            ruleId: c.uid
           }), h == null || h.dispose();
         }, N = I.map((D) => ({
           label: D.label,
@@ -920,7 +910,7 @@ let Ae = class extends Re {
             onEdit: T,
             defaultValue: R,
             multiple: v,
-            showEdit: (p = (y = this._configService.getConfig(Cn)) == null ? void 0 : y.showEditOnDropdown) != null ? p : !0
+            showEdit: (p = (y = this._configService.getConfig(wn)) == null ? void 0 : y.showEditOnDropdown) != null ? p : !0
           }
         };
         break;
@@ -946,15 +936,15 @@ let Ae = class extends Re {
                   si: null
                 }
               };
-              return this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(pt.id, {
+              return this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(vt.id, {
                 visible: !1,
-                eventType: gt.Keyboard,
+                eventType: pt.Keyboard,
                 unitId: o,
-                keycode: ht.ESC
+                keycode: gt.ESC
               }), this._commandService.syncExecuteCommand(st.id, w), !0;
             },
-            defaultValue: kt(s.getCellRaw(n, i)).split("/"),
-            options: JSON.parse((S = d.formula1) != null ? S : "[]")
+            defaultValue: Ut(s.getCellRaw(n, i)).split("/"),
+            options: JSON.parse((S = c.formula1) != null ? S : "[]")
           },
           location: r
         };
@@ -981,14 +971,14 @@ let Ae = class extends Re {
                   si: null
                 }
               };
-              return this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(pt.id, {
+              return this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(vt.id, {
                 visible: !1,
-                eventType: gt.Keyboard,
+                eventType: pt.Keyboard,
                 unitId: o,
-                keycode: ht.ESC
+                keycode: gt.ESC
               }), this._commandService.syncExecuteCommand(st.id, w), !0;
             },
-            defaultValue: kt(s.getCellRaw(n, i))
+            defaultValue: Ut(s.getCellRaw(n, i))
           },
           location: r
         };
@@ -999,7 +989,7 @@ let Ae = class extends Re {
     }
     if (h = this._cellDropdownManagerService.showDropdown(m), !h)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
-    const g = new Nr();
+    const g = new Ur();
     g.add(h), g.add({
       dispose: () => {
         var v, C;
@@ -1011,7 +1001,7 @@ let Ae = class extends Re {
     this._activeDropdown && (this._currentPopup && this._currentPopup.dispose(), this._currentPopup = null, this._activeDropdown = null, this._activeDropdown$.next(null));
   }
   showDataValidationDropdown(t, r, n, i, o) {
-    const a = this._univerInstanceService.getUnit(t, j.UNIVER_SHEET);
+    const a = this._univerInstanceService.getUnit(t, Y.UNIVER_SHEET);
     if (!a)
       return;
     const l = a.getSheetBySheetId(r);
@@ -1020,8 +1010,8 @@ let Ae = class extends Re {
     const s = this._dataValidationModel.getRuleByLocation(a.getUnitId(), l.getSheetId(), n, i);
     if (!s)
       return;
-    const d = this._dataValidatorRegistryService.getValidatorItem(s.type);
-    if (!d || !d.dropdownType) {
+    const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
+    if (!c || !c.dropdownType) {
       this.hideDropdown();
       return;
     }
@@ -1038,56 +1028,56 @@ let Ae = class extends Re {
     });
   }
 };
-Ae = lo([
+Ae = co([
   ue(0, le),
-  ue(1, M(ye)),
-  ue(2, ar),
-  ue(3, M(ee)),
-  ue(4, M(ur)),
-  ue(5, M(Ei)),
-  ue(6, M(ee)),
+  ue(1, b(ye)),
+  ue(2, sr),
+  ue(3, b(ee)),
+  ue(4, b(hr)),
+  ue(5, b(Di)),
+  ue(6, b(ee)),
   ue(7, J),
-  ue(8, vr),
-  ue(9, M(we)),
-  ue(10, ln)
+  ue(8, mr),
+  ue(9, b(we)),
+  ue(10, dn)
 ], Ae);
-const Mt = "DataValidationPanel", Fe = {
+const Dt = "DataValidationPanel", Fe = {
   id: "data-validation.operation.open-validation-panel",
   type: nt.OPERATION,
   handler(e, t) {
     if (!t)
       return !1;
-    const { ruleId: r, isAdd: n } = t, i = e.get(_e), o = e.get(vn), a = e.get(le), l = e.get(or), s = hr(a);
+    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: d, subUnitId: u } = s, h = r ? o.getRuleById(d, u, r) : void 0;
+    const { unitId: c, subUnitId: u } = s, h = r ? o.getRuleById(c, u, r) : void 0;
     i.open(), i.setActiveRule(h && {
-      unitId: d,
+      unitId: c,
       subUnitId: u,
       rule: h
     });
-    const c = l.open({
-      id: Mt,
+    const d = l.open({
+      id: Dt,
       header: { title: n ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
-      children: { label: Mt },
+      children: { label: Dt },
       width: 312,
       onClose: () => i.close()
     });
-    return i.setCloseDisposable(c), !0;
+    return i.setCloseDisposable(d), !0;
   }
-}, In = {
+}, Rn = {
   id: "data-validation.operation.close-validation-panel",
   type: nt.OPERATION,
   handler(e) {
     return e.get(_e).close(), !0;
   }
-}, Rr = {
+}, yr = {
   id: "data-validation.operation.toggle-validation-panel",
   type: nt.OPERATION,
   handler(e) {
     const t = e.get(J), r = e.get(_e);
-    return r.open(), r.isOpen ? t.executeCommand(In.id) : t.executeCommand(Fe.id), !0;
+    return r.open(), r.isOpen ? t.executeCommand(Rn.id) : t.executeCommand(Fe.id), !0;
   }
-}, At = {
+}, kt = {
   type: nt.OPERATION,
   id: "sheet.operation.show-data-validation-dropdown",
   handler(e, t) {
@@ -1101,36 +1091,36 @@ const Mt = "DataValidationPanel", Fe = {
       a
     ), !0;
   }
-}, yr = {
+}, Mr = {
   type: nt.OPERATION,
   id: "sheet.operation.hide-data-validation-dropdown",
   handler(e, t) {
     return t ? (e.get(Ae).hideDropdown(), !0) : !1;
   }
-}, Lt = {
+}, Nt = {
   type: nt.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   handler(e) {
-    const t = e.get(le), r = hr(t);
+    const t = e.get(le), r = gr(t);
     if (!r) return !1;
-    const { workbook: n, worksheet: i } = r, o = Jn(e), a = e.get(J), l = n.getUnitId(), s = i.getSheetId(), d = {
+    const { workbook: n, worksheet: i } = r, o = er(e), a = e.get(J), l = n.getUnitId(), s = i.getSheetId(), c = {
       rule: o,
       unitId: l,
       subUnitId: s
     };
-    return a.syncExecuteCommand(un.id, d) ? (a.syncExecuteCommand(Fe.id, {
+    return a.syncExecuteCommand(gn.id, c) ? (a.syncExecuteCommand(Fe.id, {
       ruleId: o.uid,
       isAdd: !0
     }), !0) : !1;
   }
 };
-var uo = Object.getOwnPropertyDescriptor, ho = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? uo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+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);
-const be = "SHEET_DATA_VALIDATION_ALERT";
-let ct = class extends Re {
+const Me = "SHEET_DATA_VALIDATION_ALERT";
+let ut = class extends Re {
   constructor(e, t, r, n, i, o) {
     super(), this._hoverManagerService = e, this._cellAlertManagerService = t, this._univerInstanceService = r, this._localeService = n, this._zenZoneService = i, this._dataValidationModel = o, this._init();
   }
@@ -1138,61 +1128,61 @@ let ct = class extends Re {
     this._initCellAlertPopup(), this._initZenService();
   }
   _initCellAlertPopup() {
-    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(lr(100)).subscribe((e) => {
+    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(cr(100)).subscribe((e) => {
       var t;
       if (e) {
-        const r = this._univerInstanceService.getUnit(e.location.unitId, j.UNIVER_SHEET), n = r.getSheetBySheetId(e.location.subUnitId);
+        const r = this._univerInstanceService.getUnit(e.location.unitId, Y.UNIVER_SHEET), n = r.getSheetBySheetId(e.location.subUnitId);
         if (!n) return;
         const i = this._dataValidationModel.getRuleByLocation(e.location.unitId, e.location.subUnitId, e.location.row, e.location.col);
         if (!i) {
-          this._cellAlertManagerService.removeAlert(be);
+          this._cellAlertManagerService.removeAlert(Me);
           return;
         }
         if (this._dataValidationModel.validator(i, { ...e.location, workbook: r, worksheet: n }) === je.INVALID) {
-          const a = this._cellAlertManagerService.currentAlert.get(be), l = (t = a == null ? void 0 : a.alert) == null ? void 0 : t.location;
+          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(be);
+            this._cellAlertManagerService.removeAlert(Me);
             return;
           }
           const s = this._dataValidationModel.getValidator(i.type);
           if (!s) {
-            this._cellAlertManagerService.removeAlert(be);
+            this._cellAlertManagerService.removeAlert(Me);
             return;
           }
           this._cellAlertManagerService.showAlert({
-            type: Oi.ERROR,
+            type: Ti.ERROR,
             title: this._localeService.t("dataValidation.error.title"),
             message: s == null ? void 0 : s.getRuleFinalError(i, e.location),
             location: e.location,
             width: 200,
             height: 74,
-            key: be
+            key: Me
           });
           return;
         }
       }
-      this._cellAlertManagerService.removeAlert(be);
+      this._cellAlertManagerService.removeAlert(Me);
     }));
   }
   _initZenService() {
     this.disposeWithMe(this._zenZoneService.visible$.subscribe((e) => {
-      e && this._cellAlertManagerService.removeAlert(be);
+      e && this._cellAlertManagerService.removeAlert(Me);
     }));
   }
 };
-ct = ho([
-  $e(0, M(Di)),
-  $e(1, M(Vi)),
+ut = go([
+  $e(0, b(Vi)),
+  $e(1, b(Oi)),
   $e(2, le),
-  $e(3, M(se)),
-  $e(4, ar),
-  $e(5, M(ee))
-], ct);
-var go = Object.getOwnPropertyDescriptor, po = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? go(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+  $e(3, b(se)),
+  $e(4, sr),
+  $e(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;
-}, xt = (e, t) => (r, n) => t(r, n, e);
+}, Bt = (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();
@@ -1200,11 +1190,11 @@ 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, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = nn([o, a]), [h, c] = u.ranges, { mapFunc: m } = u, g = {
+      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 = {
         row: h.startRow,
         col: h.startColumn
-      }, b = Pi(h, c), y = new wt(), p = /* @__PURE__ */ new Set();
-      b.forEach((I) => {
+      }, M = Ai(h, d), y = new Rt(), p = /* @__PURE__ */ new Set();
+      M.forEach((I) => {
         const R = I.repeatStartCell, T = I.relativeRange, N = {
           startRow: g.row,
           startColumn: g.col,
@@ -1216,8 +1206,8 @@ let qe = class extends Re {
           endColumn: R.col,
           endRow: R.row
         };
-        Fr.foreach(T, (P, A) => {
-          const L = Rt.getPositionRange(
+        xr.foreach(T, (P, A) => {
+          const L = yt.getPositionRange(
             {
               startRow: P,
               startColumn: A,
@@ -1225,7 +1215,7 @@ let qe = class extends Re {
               endRow: P
             },
             N
-          ), { row: V, col: F } = m(L.startRow, L.startColumn), x = this._sheetDataValidationModel.getRuleIdByLocation(l, s, V, F) || "", Y = Rt.getPositionRange(
+          ), { row: V, col: F } = m(L.startRow, L.startColumn), x = this._sheetDataValidationModel.getRuleIdByLocation(l, s, V, F) || "", X = yt.getPositionRange(
             {
               startRow: P,
               startColumn: A,
@@ -1233,25 +1223,25 @@ let qe = class extends Re {
               endRow: P
             },
             D
-          ), { row: Z, col: X } = m(Y.startRow, Y.startColumn);
-          y.setValue(Z, X, x), p.add(x);
+          ), { row: Z, col: z } = m(X.startRow, X.startColumn);
+          y.setValue(Z, z, x), p.add(x);
         });
       });
-      const S = Array.from(p).map((I) => ({ id: I, ranges: Gt(y, (R) => R === I) }));
-      d.addRangeRules(S);
-      const v = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: C, undoMutations: w } = Zt(l, s, v, this._injector, "patched", i === ot.ONLY_FORMAT);
+      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);
       return {
         undos: w,
         redos: C
       };
     }, r = {
-      id: Qn,
+      id: tr,
       onBeforeFillData: (n) => {
         const { source: i, unitId: o, subUnitId: a } = n;
         for (const l of i.rows)
           for (const s of i.cols) {
-            const d = this._sheetDataValidationModel.getRuleByLocation(o, a, l, s);
-            if (d && d.type === G.CHECKBOX) {
+            const c = this._sheetDataValidationModel.getRuleByLocation(o, a, l, s);
+            if (c && c.type === G.CHECKBOX) {
               this._autoFillService.setDisableApplyType(ot.SERIES, !0);
               return;
             }
@@ -1264,16 +1254,16 @@ let qe = class extends Re {
     this.disposeWithMe(this._autoFillService.addHook(r));
   }
 };
-qe = po([
-  xt(0, Ti),
-  xt(1, M(ee)),
-  xt(2, M(we))
+qe = vo([
+  Bt(0, Pi),
+  Bt(1, b(ee)),
+  Bt(2, b(we))
 ], qe);
-var vo = Object.getOwnPropertyDescriptor, mo = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? vo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+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;
-}, $t = (e, t) => (r, n) => t(r, n, e);
+}, Ht = (e, t) => (r, n) => t(r, n, e);
 let Je = class extends Re {
   constructor(t, r, n) {
     super();
@@ -1282,29 +1272,29 @@ let Je = class extends Re {
   }
   _initCopyPaste() {
     this._sheetClipboardService.addClipboardHook({
-      id: Qn,
+      id: tr,
       onBeforeCopy: (t, r, n) => this._collect(t, r, n),
       onPasteCells: (t, r, n, i) => {
-        const { copyType: o = An.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 });
+        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 });
       }
     });
   }
   _collect(t, r, n) {
-    const i = new wt();
+    const i = new Rt();
     this._copyInfo = {
       unitId: t,
       subUnitId: r,
       matrix: i
     };
-    const o = this._injector.invoke((s) => Ri(n, s, t, r));
+    const o = this._injector.invoke((s) => yi(n, s, t, r));
     if (!o)
       return;
     const { rows: a, cols: l } = o;
-    a.forEach((s, d) => {
+    a.forEach((s, c) => {
       l.forEach((u, h) => {
-        const c = this._sheetDataValidationModel.getRuleIdByLocation(t, r, s, u);
-        i.setValue(d, h, c != null ? c : "");
+        const d = this._sheetDataValidationModel.getRuleIdByLocation(t, r, s, u);
+        i.setValue(c, h, d != null ? d : "");
       });
     });
   }
@@ -1312,24 +1302,24 @@ let Je = class extends Re {
   _generateMutations(t, r) {
     if (!this._copyInfo)
       return { redos: [], undos: [] };
-    if (r.copyType === An.CUT)
+    if (r.copyType === kn.CUT)
       return this._copyInfo = null, { redos: [], undos: [] };
     if (!this._copyInfo || !this._copyInfo.matrix.getSizeOf() || !r.copyRange)
       return { redos: [], undos: [] };
     if ([
-      vt.SPECIAL_PASTE_COL_WIDTH,
-      vt.SPECIAL_PASTE_VALUE,
-      vt.SPECIAL_PASTE_FORMAT,
-      vt.SPECIAL_PASTE_FORMULA
+      mt.SPECIAL_PASTE_COL_WIDTH,
+      mt.SPECIAL_PASTE_VALUE,
+      mt.SPECIAL_PASTE_FORMAT,
+      mt.SPECIAL_PASTE_FORMULA
     ].includes(r.pasteType))
       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 wt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = nn([r.copyRange, t]), c = Ln(d, u, !0), m = /* @__PURE__ */ new Map();
-      c.forEach(({ startRange: p }) => {
+      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 }) => {
         var S;
         (S = this._copyInfo) == null || S.matrix.forValue((v, C, w) => {
-          const I = Rt.getPositionRange(
+          const I = yt.getPositionRange(
             {
               startRow: v,
               endRow: v,
@@ -1343,9 +1333,9 @@ let Je = class extends Re {
           s.add(R), l.setValue(N, D, R);
         });
       });
-      const g = Array.from(s).map((p) => ({ id: p, ranges: Gt(l, (S) => S === p) }));
+      const g = Array.from(s).map((p) => ({ id: p, ranges: qt(l, (S) => S === p) }));
       a.addRangeRules(g);
-      const { redoMutations: b, undoMutations: y } = Zt(
+      const { redoMutations: M, undoMutations: y } = Jt(
         r.unitId,
         r.subUnitId,
         a.diffWithAddition(this._sheetDataValidationModel.getRules(r.unitId, r.subUnitId), m.values()),
@@ -1354,15 +1344,15 @@ let Je = class extends Re {
         !1
       );
       return {
-        redos: b,
+        redos: M,
         undos: y
       };
     } else {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(i, o).clone(), l = new wt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = nn([r.copyRange, t]);
-      Ln(d, u, !0).forEach(({ startRange: y }) => {
+      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 }) => {
         var p;
         (p = this._copyInfo) == null || p.matrix.forValue((S, v, C) => {
-          const w = Rt.getPositionRange(
+          const w = yt.getPositionRange(
             {
               startRow: S,
               endRow: S,
@@ -1374,9 +1364,9 @@ let Je = class extends Re {
           l.setValue(I, R, C), s.add(C);
         });
       });
-      const m = Array.from(s).map((y) => ({ id: y, ranges: Gt(l, (p) => p === y) }));
+      const m = Array.from(s).map((y) => ({ id: y, ranges: qt(l, (p) => p === y) }));
       a.addRangeRules(m);
-      const { redoMutations: g, undoMutations: b } = Zt(
+      const { redoMutations: g, undoMutations: M } = Jt(
         i,
         o,
         a.diff(this._sheetDataValidationModel.getRules(i, o)),
@@ -1386,21 +1376,21 @@ let Je = class extends Re {
       );
       return {
         redos: g,
-        undos: b
+        undos: M
       };
     }
   }
 };
-Je = mo([
-  $t(0, Ai),
-  $t(1, M(ee)),
-  $t(2, M(we))
+Je = fo([
+  Ht(0, Li),
+  Ht(1, b(ee)),
+  Ht(2, b(we))
 ], Je);
-var fo = Object.getOwnPropertyDescriptor, _o = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? fo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+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--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Bt = (e, t) => (r, n) => t(r, n, e);
+}, Wt = (e, t) => (r, n) => t(r, n, e);
 let Qe = class extends Re {
   constructor(e, t, r) {
     super(), this._localeService = e, this._commandService = t, this._sheetPermissionCheckController = r, this._commandExecutedListener();
@@ -1408,82 +1398,82 @@ let Qe = class extends Re {
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((e) => {
-        e.id === un.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
-          workbookTypes: [tn],
-          rangeTypes: [en],
-          worksheetTypes: [Jt, Qt]
-        }) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"))), e.id === er.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
-          workbookTypes: [tn],
-          rangeTypes: [en],
-          worksheetTypes: [Jt, Qt]
+        e.id === gn.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
+          workbookTypes: [rn],
+          rangeTypes: [nn],
+          worksheetTypes: [en, tn]
+        }) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"))), e.id === nr.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
+          workbookTypes: [rn],
+          rangeTypes: [nn],
+          worksheetTypes: [en, tn]
         }, e.params.ranges) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr")));
       })
     );
   }
 };
-Qe = _o([
-  Bt(0, M(se)),
-  Bt(1, J),
-  Bt(2, M(yi))
+Qe = So([
+  Wt(0, b(se)),
+  Wt(1, J),
+  Wt(2, b(Mi))
 ], Qe);
-const br = "data-validation-single", Mr = "sheet.menu.data-validation";
-function So(e) {
+const br = "data-validation-single", Er = "sheet.menu.data-validation";
+function Co(e) {
   return {
-    id: Mr,
-    type: gn.SUBITEMS,
+    id: Er,
+    type: vn.SUBITEMS,
     icon: br,
     tooltip: "dataValidation.title",
-    hidden$: ai(e, j.UNIVER_SHEET),
-    disabled$: Li(e, { workbookTypes: [tn], worksheetTypes: [Qt, Jt], rangeTypes: [en] })
+    hidden$: si(e, Y.UNIVER_SHEET),
+    disabled$: ki(e, { workbookTypes: [rn], worksheetTypes: [tn, en], rangeTypes: [nn] })
   };
 }
-function Co(e) {
+function Io(e) {
   return {
     id: Fe.id,
     title: "dataValidation.panel.title",
-    type: gn.BUTTON
+    type: vn.BUTTON
   };
 }
-function Io(e) {
+function wo(e) {
   return {
-    id: Lt.id,
+    id: Nt.id,
     title: "dataValidation.panel.add",
-    type: gn.BUTTON
+    type: vn.BUTTON
   };
 }
-const wo = {
-  [si.FORMULAS_INSERT]: {
-    [Mr]: {
+const Ro = {
+  [li.FORMULAS_INSERT]: {
+    [Er]: {
       order: 9,
-      menuItemFactory: So,
+      menuItemFactory: Co,
       [Fe.id]: {
         order: 0,
-        menuItemFactory: Co
+        menuItemFactory: Io
       },
-      [Lt.id]: {
+      [Nt.id]: {
         order: 1,
-        menuItemFactory: Io
+        menuItemFactory: wo
       }
     }
   }
 };
-var Ro = Object.getOwnPropertyDescriptor, Er = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Ro(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+var yo = Object.getOwnPropertyDescriptor, Dr = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? yo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, z = (e, t) => (r, n) => t(r, n, e);
-const Dr = {
+}, K = (e, t) => (r, n) => t(r, n, e);
+const Vr = {
   tr: {
     size: 6,
     color: "#fe4b4b"
   }
 };
-let et = class extends dn {
-  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();
+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();
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(wo);
+    this._menuManagerService.mergeMenu(Ro);
   }
   _initDropdown() {
     this._editorBridgeService && this.disposeWithMe(this._editorBridgeService.visible$.subscribe((e) => {
@@ -1500,13 +1490,13 @@ let et = class extends dn {
         const s = this._sheetDataValidationModel.getRuleByLocation(n, i, o, a);
         if (!s)
           return;
-        const d = this._dataValidatorRegistryService.getValidatorItem(s.type);
-        if (!(d != null && d.dropdownType))
+        const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
+        if (!(c != null && c.dropdownType))
           return;
         const u = l.getActiveSheet();
         if (!u) return;
-        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)
+        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)
           return;
         this._dropdownManagerService.showDropdown(
           {
@@ -1529,23 +1519,23 @@ let et = class extends dn {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        gr.CELL_CONTENT,
+        pr.CELL_CONTENT,
         {
-          effect: jn.Style,
+          effect: Xn.Style,
           // must be after numfmt
-          priority: pr.DATA_VALIDATION,
+          priority: vr.DATA_VALIDATION,
           // 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, d = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
-            if (!d)
+            const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
+            if (!c)
               return r(e);
-            const u = this._sheetDataValidationModel.getRuleById(o, a, d);
+            const u = this._sheetDataValidationModel.getRuleById(o, a, c);
             if (!u)
               return r(e);
-            const h = (p = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? p : je.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
+            const h = (p = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? p : je.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
             let g;
-            const b = {
+            const M = {
               get value() {
                 var I;
                 return g !== void 0 || (g = (I = Q(m)) != null ? I : null), g;
@@ -1553,26 +1543,26 @@ let et = class extends dn {
             }, y = {
               get value() {
                 var I;
-                return `${(I = b.value) != null ? I : ""}`;
+                return `${(I = M.value) != null ? I : ""}`;
               }
             };
             return r({
               ...e,
               markers: {
                 ...e == null ? void 0 : e.markers,
-                ...h === je.INVALID ? Dr : null
+                ...h === je.INVALID ? Vr : null
               },
               customRender: [
                 ...(S = e == null ? void 0 : e.customRender) != null ? S : [],
-                ...c != null && c.canvasRender ? [c.canvasRender] : []
+                ...d != null && d.canvasRender ? [d.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((v = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : v.isSkip) || ((C = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : C.call(c, u, b.value, t))
+                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))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...c == null ? void 0 : c.getExtraStyle(u, y.value, {
+                ...d == null ? void 0 : d.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) || {};
@@ -1581,7 +1571,7 @@ let et = class extends dn {
               },
               interceptorAutoHeight: () => {
                 var N, D, P, A, L, V;
-                const I = (D = (N = this._renderManagerService.getRenderById(o)) == null ? void 0 : N.with(yt).getSkeletonParam(a)) == null ? void 0 : D.skeleton;
+                const I = (D = (N = this._renderManagerService.getRenderById(o)) == null ? void 0 : N.with(bt).getSkeletonParam(a)) == null ? void 0 : D.skeleton;
                 if (!I)
                   return;
                 const R = I.worksheet.getMergedCell(n, i), T = {
@@ -1595,11 +1585,11 @@ let et = class extends dn {
                   workbook: l,
                   worksheet: s
                 };
-                return (V = (L = c == null ? void 0 : c.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : V.call(L, T);
+                return (V = (L = d == null ? void 0 : d.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : V.call(L, T);
               },
               interceptorAutoWidth: () => {
                 var N, D, P, A, L, V;
-                const I = (D = (N = this._renderManagerService.getRenderById(o)) == null ? void 0 : N.with(yt).getSkeletonParam(a)) == null ? void 0 : D.skeleton;
+                const I = (D = (N = this._renderManagerService.getRenderById(o)) == null ? void 0 : N.with(bt).getSkeletonParam(a)) == null ? void 0 : D.skeleton;
                 if (!I)
                   return;
                 const R = I.worksheet.getMergedCell(n, i), T = {
@@ -1613,7 +1603,7 @@ let et = class extends dn {
                   workbook: l,
                   worksheet: s
                 };
-                return (V = (L = c == null ? void 0 : c.canvasRender) == null ? void 0 : L.calcCellAutoWidth) == null ? void 0 : V.call(L, T);
+                return (V = (L = d == null ? void 0 : d.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)
             });
@@ -1626,7 +1616,7 @@ let et = class extends dn {
     this._sheetDataValidationModel.ruleChange$.pipe(
       // patched data-validation change don't need to re-calc row height
       // re-calc of row height will be triggered precisely by the origin command
-      mn((e) => e.source === "command"),
+      _n((e) => e.source === "command"),
       dr(100)
     ).subscribe((e) => {
       if (e.length === 0)
@@ -1637,63 +1627,63 @@ let et = class extends dn {
         (r.rule.type === G.LIST_MULTIPLE || r.rule.type === G.LIST) && (n = r.rule) != null && n.ranges && t.push(...r.rule.ranges);
       }), t.length) {
         const r = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
-        Yn(r.redos, this._commandService);
+        zn(r.redos, this._commandService);
       }
     });
   }
 };
-et = Er([
-  z(0, J),
-  z(1, li),
-  z(2, Ne),
-  z(3, le),
-  z(4, M(mr)),
-  z(5, M(Ae)),
-  z(6, M(ee)),
-  z(7, M(ye)),
-  z(8, M(fn)),
-  z(9, M(tr)),
-  z(10, xr(vr))
+et = Dr([
+  K(0, J),
+  K(1, ci),
+  K(2, Ne),
+  K(3, le),
+  K(4, b(fr)),
+  K(5, b(Ae)),
+  K(6, b(ee)),
+  K(7, b(ye)),
+  K(8, b(Sn)),
+  K(9, b(rr)),
+  K(10, $r(mr))
 ], et);
-let Un = class extends dn {
+let xn = class extends un {
   constructor(e, t, r, n, i, o, a) {
     super(), this._commandService = e, this._renderManagerService = t, this._autoHeightController = r, this._dataValidatorRegistryService = n, this._sheetInterceptorService = i, this._sheetDataValidationModel = o, this._dataValidationCacheService = a, this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        gr.CELL_CONTENT,
+        pr.CELL_CONTENT,
         {
-          effect: jn.Style,
+          effect: Xn.Style,
           // must be after numfmt
-          priority: pr.DATA_VALIDATION,
+          priority: vr.DATA_VALIDATION,
           // 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, d = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
-            if (!d)
+            const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
+            if (!c)
               return r(e);
-            const u = this._sheetDataValidationModel.getRuleById(o, a, d);
+            const u = this._sheetDataValidationModel.getRuleById(o, a, c);
             if (!u)
               return r(e);
-            const h = (y = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? y : je.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(n, i), g = Q(m), b = `${g != null ? g : ""}`;
+            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 : ""}`;
             return r({
               ...e,
               markers: {
                 ...e == null ? void 0 : e.markers,
-                ...h === je.INVALID ? Dr : null
+                ...h === je.INVALID ? Vr : null
               },
               customRender: [
                 ...(p = e == null ? void 0 : e.customRender) != null ? p : [],
-                ...c != null && c.canvasRender ? [c.canvasRender] : []
+                ...d != null && d.canvasRender ? [d.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                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))
+                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))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...c == null ? void 0 : c.getExtraStyle(u, b, {
+                ...d == null ? void 0 : d.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) || {};
@@ -1702,7 +1692,7 @@ let Un = class extends dn {
               },
               interceptorAutoHeight: () => {
                 var T, N, D, P, A, L;
-                const w = (N = (T = this._renderManagerService.getRenderById(o)) == null ? void 0 : T.with(yt).getSkeletonParam(a)) == null ? void 0 : N.skeleton;
+                const w = (N = (T = this._renderManagerService.getRenderById(o)) == null ? void 0 : T.with(bt).getSkeletonParam(a)) == null ? void 0 : N.skeleton;
                 if (!w)
                   return;
                 const I = w.worksheet.getMergedCell(n, i), R = {
@@ -1716,7 +1706,7 @@ let Un = class extends dn {
                   workbook: l,
                   worksheet: s
                 };
-                return (L = (A = c == null ? void 0 : c.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : L.call(A, R);
+                return (L = (A = d == null ? void 0 : d.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)
             });
@@ -1727,7 +1717,7 @@ let Un = class extends dn {
   }
   _initAutoHeight() {
     this._sheetDataValidationModel.ruleChange$.pipe(
-      mn((e) => e.source === "command"),
+      _n((e) => e.source === "command"),
       dr(16)
     ).subscribe((e) => {
       const t = [];
@@ -1736,26 +1726,26 @@ let Un = class extends dn {
         (n = r.rule) != null && n.ranges && t.push(...r.rule.ranges);
       }), t.length) {
         const r = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
-        Yn(r.redos, this._commandService);
+        zn(r.redos, this._commandService);
       }
     });
   }
 };
-Un = Er([
-  z(0, J),
-  z(1, Ne),
-  z(2, M(mr)),
-  z(3, M(ye)),
-  z(4, M(fn)),
-  z(5, M(ee)),
-  z(6, M(tr))
-], Un);
-var yo = Object.getOwnPropertyDescriptor, bo = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? yo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+xn = Dr([
+  K(0, J),
+  K(1, Ne),
+  K(2, b(fr)),
+  K(3, b(ye)),
+  K(4, b(Sn)),
+  K(5, b(ee)),
+  K(6, b(rr))
+], xn);
+var Mo = Object.getOwnPropertyDescriptor, bo = (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;
-}, Fn = (e, t) => (r, n) => t(r, n, e);
-let Et = class extends Re {
+}, $n = (e, t) => (r, n) => t(r, n, e);
+let Vt = class extends Re {
   constructor(e, t, r) {
     super(), this._context = e, this._sheetDataValidationModel = t, this._sheetSkeletonManagerService = r, this._initSkeletonChange();
   }
@@ -1772,40 +1762,41 @@ let Et = 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($r(16)).subscribe(e));
+    this.disposeWithMe(this._sheetDataValidationModel.validStatusChange$.pipe(Br(16)).subscribe(e));
   }
 };
-Et = bo([
-  Fn(1, M(ee)),
-  Fn(2, M(yt))
-], Et);
-function Mo(e) {
-  var d;
-  const t = U(se), r = U(pn), { value: n, onChange: i, extraComponent: o } = e, [a, l] = H(!1), s = o ? r.get(o) : null;
-  return /* @__PURE__ */ W(Xe, { children: [
+Vt = bo([
+  $n(1, b(ee)),
+  $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: [
     /* @__PURE__ */ W(
       "div",
       {
         className: `
-                  univer-mb-3 univer-flex univer-cursor-pointer univer-items-center univer-text-sm univer-text-black
+                  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"),
-          a ? /* @__PURE__ */ _(Ir, { className: "univer-ml-1 univer-text-[8px]" }) : /* @__PURE__ */ _(Sn, { className: "univer-ml-1 univer-text-[8px]" })
+          a ? /* @__PURE__ */ _(wr, { className: "univer-ml-1" }) : /* @__PURE__ */ _(In, { className: "univer-ml-1" })
         ]
       }
     ),
-    a && /* @__PURE__ */ W(Xe, { children: [
+    a && /* @__PURE__ */ W(ct, { children: [
       s ? /* @__PURE__ */ _(s, { value: n, onChange: i }) : null,
       /* @__PURE__ */ _(
-        K,
+        j,
         {
           label: t.t("dataValidation.panel.invalid"),
           children: /* @__PURE__ */ W(
-            hn,
+            pn,
             {
-              value: `${(d = n.errorStyle) != null ? d : lt.WARNING}`,
+              value: `${(c = n.errorStyle) != null ? c : lt.WARNING}`,
               onChange: (u) => i({ ...n, errorStyle: +u }),
               children: [
                 /* @__PURE__ */ _(Oe, { value: `${lt.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
@@ -1816,11 +1807,11 @@ function Mo(e) {
         }
       ),
       /* @__PURE__ */ _(
-        K,
+        j,
         {
           label: t.t("dataValidation.panel.messageInfo"),
           children: /* @__PURE__ */ _(
-            Pt,
+            Lt,
             {
               checked: n.showErrorMessage,
               onChange: () => i({
@@ -1832,56 +1823,56 @@ function Mo(e) {
           )
         }
       ),
-      n.showErrorMessage ? /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(Ve, { value: n.error, onChange: (u) => i({ ...n, error: u }) }) }) : null
+      n.showErrorMessage ? /* @__PURE__ */ _(j, { children: /* @__PURE__ */ _(Ve, { value: n.error, onChange: (u) => i({ ...n, error: u }) }) }) : null
     ] })
   ] });
 }
-const Eo = (e) => Br(
+const Do = (e) => Hr(
   async (t, r, n, i) => {
     const o = await e.executeCommand(t, r, n);
     i == null || i(o);
   },
   1e3
 );
-function Do(e, t, r) {
+function Vo(e, t, r) {
   var n, i, o, a;
-  return t ? ((i = (n = e.getUnit(t)) == null ? void 0 : n.getSheetBySheetName(r)) == null ? void 0 : i.getSheetId()) || "" : ((a = (o = e.getCurrentUnitForType(j.UNIVER_SHEET)) == null ? void 0 : o.getSheetBySheetName(r)) == null ? void 0 : a.getSheetId()) || "";
+  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 Vo() {
+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), d = U(le), u = U(pn), h = U(J), c = U(vn), m = U(se), [g, b] = H(a), y = s.getValidatorItem(g.type), [p, S] = H(!1), v = s.getValidatorsByScope(ci.SHEET), [C, w] = H(() => g.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), I = dt(() => Eo(h), [h]), [R, T] = H(!1), [N, D] = H(!1), P = ut(null), A = U(ur);
+  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);
   if (Pe(() => () => {
     const f = A.getCurrentLastSelection();
     f && A.setSelections([f]);
   }, [A]), Pe(() => {
     h.onCommandExecuted((f) => {
-      (f.id === Hr.id || f.id === Wr.id) && setTimeout(() => {
-        const k = c.getRuleById(i, o, l);
-        t(($) => $ + 1), k && (b(k), w(k.ranges.map(($) => ({ unitId: "", sheetId: "", range: $ }))));
+      (f.id === Wr.id || f.id === jr.id) && setTimeout(() => {
+        const k = d.getRuleById(i, o, l);
+        t(($) => $ + 1), k && (M(k), w(k.ranges.map(($) => ({ unitId: "", sheetId: "", range: $ }))));
       }, 20);
     });
-  }, [h, c, l, o, i]), !y)
+  }, [h, d, l, o, i]), !y)
     return null;
-  const L = y.operators, V = y.operatorNames, F = g.operator ? ui.includes(g.operator) : !1, x = () => {
+  const L = y.operators, V = y.operatorNames, F = g.operator ? hi.includes(g.operator) : !1, x = () => {
     var f, k, $;
-    (k = (f = P.current) == null ? void 0 : f.editor) != null && k.isFocus() && Y(($ = P.current) == null ? void 0 : $.getValue()), !(!g.ranges.length || R) && (y.validatorFormula(g, i, o).success ? r.setActiveRule(null) : S(!0));
-  }, Y = qt((f) => {
-    const k = f.split(",").filter(Boolean).map(Ni).map((q) => {
-      const wn = q.sheetName;
-      if (wn) {
-        const Pr = Do(d, q.unitId, wn);
-        return { ...q, sheetId: Pr };
+    (k = (f = P.current) == null ? void 0 : f.editor) != null && k.isFocus() && X(($ = P.current) == null ? void 0 : $.getValue()), !(!g.ranges.length || R) && (y.validatorFormula(g, i, o).success ? r.setActiveRule(null) : S(!0));
+  }, X = Qt((f) => {
+    const k = f.split(",").filter(Boolean).map(Ui).map((q) => {
+      const yn = q.sheetName;
+      if (yn) {
+        const Ar = Vo(c, q.unitId, yn);
+        return { ...q, sheetId: Ar };
       }
       return {
         ...q,
         sheetId: ""
       };
     });
-    if (jr(k, C))
+    if (Yr(k, C))
       return;
     w(k);
     const $ = k.filter((q) => (!q.unitId || q.unitId === i) && (!q.sheetId || q.sheetId === o)).map((q) => q.range);
-    if (b({
+    if (M({
       ...g,
       ranges: $
     }), $.length === 0)
@@ -1892,11 +1883,11 @@ function Vo() {
       ruleId: l,
       ranges: $
     };
-    I(er.id, Ce);
+    I(nr.id, Ce);
   }), Z = (f) => {
-    if (yn(f, On(g)))
+    if (bn(f, Pn(g)))
       return;
-    b({
+    M({
       ...g,
       ...f
     });
@@ -1907,12 +1898,12 @@ function Vo() {
       setting: f
     };
     I(
-      bn.id,
+      En.id,
       k,
       void 0
     );
-  }, X = async () => {
-    await h.executeCommand(nr.id, {
+  }, z = async () => {
+    await h.executeCommand(ir.id, {
       ruleId: l,
       unitId: i,
       subUnitId: o
@@ -1927,7 +1918,7 @@ function Vo() {
     const k = s.getValidatorItem(f);
     if (!k)
       return;
-    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")) ? {
+    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")) ? {
       ...Ce,
       type: f
     } : {
@@ -1937,18 +1928,18 @@ function Vo() {
       formula1: void 0,
       formula2: void 0
     };
-    b(q), h.executeCommand(bn.id, {
+    M(q), h.executeCommand(En.id, {
       unitId: i,
       subUnitId: o,
       ruleId: g.uid,
-      setting: On(q)
+      setting: Pn(q)
     });
-  }, de = u.get(y.formulaInput), ne = dt(() => C.map((f) => fr(f.range)).join(","), []), ce = Vn(g), Se = (f) => {
-    yn(f, Vn(g)) || (b({
+  }, ce = u.get(y.formulaInput), ne = dt(() => C.map((f) => _r(f.range)).join(","), []), de = Tn(g), Se = (f) => {
+    bn(f, Tn(g)) || (M({
       ...g,
       ...f
     }), I(
-      qr.id,
+      Jr.id,
       {
         unitId: i,
         subUnitId: o,
@@ -1959,7 +1950,7 @@ function Vo() {
   }, ve = L.length && !g.operator;
   return /* @__PURE__ */ W("div", { className: "univer-py-4", children: [
     /* @__PURE__ */ _(
-      K,
+      j,
       {
         label: m.t("dataValidation.panel.range"),
         error: !g.ranges.length || R ? m.t("dataValidation.panel.rangeError") : "",
@@ -1972,19 +1963,19 @@ function Vo() {
             initialValue: ne,
             onChange: (f, k) => {
               var $;
-              !N && (($ = P.current) != null && $.verify()) && Y(k);
+              !N && (($ = P.current) != null && $.verify()) && X(k);
             },
             onFocusChange: (f, k) => {
               var $;
-              D(f), !f && k && (($ = P.current) != null && $.verify()) && Y(k);
+              D(f), !f && k && (($ = P.current) != null && $.verify()) && X(k);
             },
             onVerify: (f) => T(!f)
           }
         )
       }
     ),
-    /* @__PURE__ */ _(K, { label: m.t("dataValidation.panel.type"), children: /* @__PURE__ */ _(
-      En,
+    /* @__PURE__ */ _(j, { label: m.t("dataValidation.panel.type"), children: /* @__PURE__ */ _(
+      Vn,
       {
         className: "univer-w-full",
         value: g.type,
@@ -1995,8 +1986,8 @@ function Vo() {
         onChange: pe
       }
     ) }),
-    L != null && L.length ? /* @__PURE__ */ _(K, { label: m.t("dataValidation.panel.operator"), children: /* @__PURE__ */ _(
-      En,
+    L != null && L.length ? /* @__PURE__ */ _(j, { label: m.t("dataValidation.panel.operator"), children: /* @__PURE__ */ _(
+      Vn,
       {
         className: "univer-w-full",
         value: `${g.operator}`,
@@ -2018,8 +2009,8 @@ function Vo() {
         }
       }
     ) }) : null,
-    de && !ve ? /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(
-      de,
+    ce && !ve ? /* @__PURE__ */ _(
+      ce,
       {
         isTwoFormula: F,
         value: {
@@ -2039,9 +2030,9 @@ function Vo() {
         ruleId: l
       },
       e + g.type
-    ) }) : null,
-    /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(
-      Pt,
+    ) : null,
+    /* @__PURE__ */ _(j, { children: /* @__PURE__ */ _(
+      Lt,
       {
         checked: (B = g.allowBlank) != null ? B : !0,
         onChange: () => {
@@ -2054,23 +2045,23 @@ function Vo() {
         children: m.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ _(Mo, { value: ce, onChange: Se, extraComponent: y.optionsInput }),
+    /* @__PURE__ */ _(Eo, { value: de, 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: X, children: m.t("dataValidation.panel.removeRule") }),
+      /* @__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") })
     ] })
   ] });
 }
-const Oo = (e) => {
-  const { rule: t, onClick: r, unitId: n, subUnitId: i, disable: o } = e, a = U(ye), l = U(J), s = U(ki), d = a.getValidatorItem(t.type), u = ut(void 0), [h, c] = H(!1), m = U(Xn), g = Te(m.currentTheme$), b = dt(() => {
+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(() => {
     var w;
-    const p = m.getColorFromTheme("primary.600"), S = m.getColorFromTheme("loop-color.2"), v = (w = m.getColorFromTheme(S)) != null ? w : p, C = new Yr(v).toRgb();
+    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 {
       fill: `rgba(${C.r}, ${C.g}, ${C.b}, 0.1)`,
       stroke: v
     };
   }, [g]), y = (p) => {
-    l.executeCommand(nr.id, {
+    l.executeCommand(ir.id, {
       ruleId: t.uid,
       unitId: n,
       subUnitId: i
@@ -2084,7 +2075,7 @@ const Oo = (e) => {
   }, [s]), /* @__PURE__ */ W(
     "div",
     {
-      className: rr(
+      className: Xe(
         `
                   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
@@ -2097,15 +2088,15 @@ const Oo = (e) => {
       ),
       onClick: r,
       onMouseEnter: () => {
-        o || (c(!0), u.current = t.ranges.map((p) => s.addShape({
+        o || (d(!0), u.current = t.ranges.map((p) => s.addShape({
           range: p,
-          style: b,
+          style: M,
           primary: null
         })));
       },
       onMouseLeave: () => {
         var p;
-        c(!1), (p = u.current) == null || p.forEach((S) => {
+        d(!1), (p = u.current) == null || p.forEach((S) => {
           S && s.removeShape(S);
         }), u.current = void 0;
       },
@@ -2114,19 +2105,17 @@ const Oo = (e) => {
           "div",
           {
             className: `
-                  univer-overflow-hidden univer-text-ellipsis univer-text-sm univer-font-medium univer-leading-[22px]
-                  univer-text-black
+                  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)
+            children: c == null ? void 0 : c.generateRuleName(t)
           }
         ),
         /* @__PURE__ */ _(
           "div",
           {
-            className: `
-                  univer-text-secondary univer-overflow-hidden univer-text-ellipsis univer-text-xs univer-leading-[18px]
-                `,
-            children: t.ranges.map((p) => fr(p)).join(",")
+            className: "univer-text-secondary univer-truncate univer-text-xs univer-leading-[18px]",
+            children: t.ranges.map((p) => _r(p)).join(",")
           }
         ),
         h ? /* @__PURE__ */ _(
@@ -2138,56 +2127,56 @@ const Oo = (e) => {
                           hover:univer-bg-gray-200
                         `,
             onClick: y,
-            children: /* @__PURE__ */ _(_n, {})
+            children: /* @__PURE__ */ _(Cn, {})
           }
         ) : null
       ]
     }
   );
 };
-function To(e) {
-  const t = U(ee), r = U(le), n = U(J), i = U(we), o = U(_e), a = U(se), [l, s] = H([]), { workbook: d } = e, u = Te(d.activeSheet$, void 0, !0), h = d.getUnitId(), c = u == null ? void 0 : u.getSheetId();
+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();
   Pe(() => {
-    s(t.getRules(h, c));
+    s(t.getRules(h, d));
     const S = t.ruleChange$.subscribe((v) => {
-      v.unitId === h && v.subUnitId === c && s(t.getRules(h, c));
+      v.unitId === h && v.subUnitId === d && s(t.getRules(h, d));
     });
     return () => {
       S.unsubscribe();
     };
-  }, [h, c, t]);
+  }, [h, d, t]);
   const m = async () => {
-    const S = Jn(i), v = {
+    const S = er(i), v = {
       unitId: h,
-      subUnitId: c,
+      subUnitId: d,
       rule: S
     };
-    await n.executeCommand(un.id, v), o.setActiveRule({
+    await n.executeCommand(gn.id, v), o.setActiveRule({
       unitId: h,
-      subUnitId: c,
+      subUnitId: d,
       rule: S
     });
   }, g = () => {
-    n.executeCommand(Jr.id, {
+    n.executeCommand(Qr.id, {
       unitId: h,
-      subUnitId: c
+      subUnitId: d
     });
   }, y = ((S) => {
-    const v = r.getCurrentUnitForType(j.UNIVER_SHEET), C = v.getActiveSheet(), w = v.getUnitId(), I = C.getSheetId();
+    const v = r.getCurrentUnitForType(Y.UNIVER_SHEET), C = v.getActiveSheet(), w = v.getUnitId(), I = C.getSheetId();
     return S.map((T) => bi(i, w, I, T.ranges) ? { ...T } : { ...T, disable: !0 });
   })(l), p = y == null ? void 0 : y.some((S) => S.disable);
   return /* @__PURE__ */ W("div", { className: "univer-pb-4", children: [
     y == null ? void 0 : y.map((S) => {
       var v;
       return /* @__PURE__ */ _(
-        Oo,
+        To,
         {
           unitId: h,
-          subUnitId: c,
+          subUnitId: d,
           onClick: () => {
             S.disable || o.setActiveRule({
               unitId: h,
-              subUnitId: c,
+              subUnitId: d,
               rule: S
             });
           },
@@ -2203,34 +2192,34 @@ function To(e) {
     ] })
   ] });
 }
-const Po = () => {
+const Ao = () => {
   const e = U(_e), t = Te(e.activeRule$, e.activeRule), r = U(le), n = Te(
-    () => r.getCurrentTypeOfUnit$(j.UNIVER_SHEET),
+    () => r.getCurrentTypeOfUnit$(Y.UNIVER_SHEET),
     void 0,
     void 0,
     []
   ), i = Te(() => {
     var o;
-    return (o = n == null ? void 0 : n.activeSheet$) != null ? o : pi(null);
+    return (o = n == null ? void 0 : n.activeSheet$) != null ? o : vi(null);
   }, void 0, void 0, []);
-  return !n || !i ? null : t && t.subUnitId === i.getSheetId() ? /* @__PURE__ */ _(Vo, {}, t.rule.uid) : /* @__PURE__ */ _(To, { workbook: n });
-}, Ao = "LIST_RENDER_MODE_OPTION_INPUT";
-function Dt(e) {
+  return !n || !i ? null : t && t.subUnitId === i.getSheetId() ? /* @__PURE__ */ _(Oo, {}, t.rule.uid) : /* @__PURE__ */ _(Po, { workbook: n });
+}, Lo = "LIST_RENDER_MODE_OPTION_INPUT";
+function Ot(e) {
   var i;
   const { value: t, onChange: r } = e, n = U(se);
-  return /* @__PURE__ */ _(K, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ W(hn, { value: `${(i = t.renderMode) != null ? i : ie.CUSTOM}`, onChange: (o) => r({ ...t, renderMode: +o }), children: [
+  return /* @__PURE__ */ _(j, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ W(pn, { value: `${(i = t.renderMode) != null ? i : ie.CUSTOM}`, onChange: (o) => r({ ...t, renderMode: +o }), children: [
     /* @__PURE__ */ _(Oe, { value: `${ie.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
     /* @__PURE__ */ _(Oe, { value: `${ie.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
     /* @__PURE__ */ _(Oe, { value: `${ie.TEXT}`, children: n.t("dataValidation.renderMode.text") })
   ] }) });
 }
-Dt.componentKey = Ao;
-const Lo = "DATE_SHOW_TIME_OPTION";
-function Vt(e) {
+Ot.componentKey = Lo;
+const ko = "DATE_SHOW_TIME_OPTION";
+function Tt(e) {
   var i;
   const { value: t, onChange: r } = e, n = U(se);
-  return /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(
-    Pt,
+  return /* @__PURE__ */ _(j, { children: /* @__PURE__ */ _(
+    Lt,
     {
       checked: (i = t.bizInfo) == null ? void 0 : i.showTime,
       onChange: (o) => {
@@ -2246,20 +2235,20 @@ function Vt(e) {
     }
   ) });
 }
-Vt.componentKey = Lo;
-var ko = Object.getOwnPropertyDescriptor, No = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? ko(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+Tt.componentKey = ko;
+var No = Object.getOwnPropertyDescriptor, Uo = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? No(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, Be = (e, t) => (r, n) => t(r, n, e);
-const mt = 6;
-let rn = class {
+const ft = 6;
+let an = class {
   constructor(e, t, r, n, i, o) {
     this._commandService = e, this._univerInstanceService = t, this._formulaService = r, this._themeService = n, this._renderManagerService = i, this._dataValidationModel = o;
   }
   _calc(e, t) {
-    var d, u, h;
-    const { vt: r, ht: n } = t || {}, i = e.endX - e.startX - mt * 2, o = e.endY - e.startY, a = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
+    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;
     let l = 0, s = 0;
     switch (r) {
       case ae.TOP:
@@ -2274,13 +2263,13 @@ let rn = class {
     }
     switch (n) {
       case Ye.LEFT:
-        l = mt;
+        l = ft;
         break;
       case Ye.RIGHT:
-        l = mt + (i - a);
+        l = ft + (i - a);
         break;
       default:
-        l = mt + (i - a) / 2;
+        l = ft + (i - a) / 2;
         break;
     }
     return {
@@ -2301,23 +2290,23 @@ let rn = class {
     return ((r = t == null ? void 0 : t.fs) != null ? r : 10) * 1.6;
   }
   async _parseFormula(e, t, r) {
-    var d, u, h, c, m, g, b, y, p;
-    const { formula1: n = ti, formula2: i = ei } = e, o = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Nt((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 = Nt((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 = Mn(String(a)) && Mn(String(l));
+    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));
     return {
-      formula1: De(n) ? Nt((p = (y = (b = o == null ? void 0 : o[0]) == null ? void 0 : b.result) == null ? void 0 : y[0]) == null ? void 0 : p[0]) : n,
+      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,
       isFormulaValid: s
     };
   }
   drawWith(e, t) {
     var P, A, L, V;
-    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);
+    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);
     if (!h)
       return;
-    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 })))
+    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 })))
       return;
-    const m = c.parseFormulaSync(h, i, o), { formula1: g } = m, b = this._calc(d, r), { a: y, d: p } = e.getTransform(), S = Pn(b.left, y), v = Pn(b.top, p), C = vi.create().composeMatrix({
+    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({
       left: S,
       top: v,
       scaleX: 1,
@@ -2327,12 +2316,12 @@ let rn = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), w = d.endX - d.startX, I = d.endY - d.startY;
-    e.save(), e.beginPath(), e.rect(d.startX, d.startY, w, I), e.clip();
+    }), w = c.endX - c.startX, I = c.endY - c.startY;
+    e.save(), e.beginPath(), e.rect(c.startX, c.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");
-    mi.drawWith(e, {
+    fi.drawWith(e, {
       checked: N,
       width: T,
       height: T,
@@ -2340,20 +2329,20 @@ let rn = 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: d } = e;
-    return s <= l && s >= a && d <= o && d >= 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: c } = e;
+    return s <= l && s >= a && c <= o && c >= 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)), d = this._dataValidationModel.getRuleByLocation(n, i, a, l);
-    if (!d)
+    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)
       return;
-    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 })))
+    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 })))
       return;
-    const { formula1: h, formula2: c } = await this._parseFormula(d, n, i), m = {
+    const { formula1: h, formula2: d } = await this._parseFormula(c, n, i), m = {
       range: {
         startColumn: r.actualColumn,
         endColumn: r.actualColumn,
@@ -2361,7 +2350,7 @@ let rn = class {
         endRow: r.actualRow
       },
       value: {
-        v: String(s) === ni(String(h)) ? c : h,
+        v: String(s) === ri(String(h)) ? d : h,
         p: null
       }
     };
@@ -2372,114 +2361,114 @@ let rn = class {
   }
   onPointerEnter(e, t) {
     var r, n;
-    (n = (r = Ke(j.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.POINTER);
+    (n = (r = Ke(Y.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.POINTER);
   }
   onPointerLeave(e, t) {
     var r, n;
-    (n = (r = Ke(j.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.DEFAULT);
+    (n = (r = Ke(Y.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.DEFAULT);
   }
 };
-rn = No([
+an = Uo([
   Be(0, J),
   Be(1, le),
-  Be(2, M(Qr)),
-  Be(3, M(Xn)),
-  Be(4, M(Ne)),
-  Be(5, M(ee))
-], rn);
-class Uo extends fe {
+  Be(2, b(ei)),
+  Be(3, b(Kn)),
+  Be(4, b(Ne)),
+  Be(5, b(ee))
+], an);
+class Fo extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.CHECKBOX);
-    E(this, "canvasRender", this.injector.createInstance(rn));
-    E(this, "formulaInput", qn);
+    E(this, "canvasRender", this.injector.createInstance(an));
+    E(this, "formulaInput", Qn);
   }
 }
-class Fo extends fe {
+class xo extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.CUSTOM);
-    E(this, "formulaInput", Zn);
+    E(this, "formulaInput", Jn);
   }
 }
-const xo = "data-validation.formula-input";
-class $o extends fe {
+const $o = "data-validation.formula-input";
+class Bo extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.DATE);
-    E(this, "formulaInput", xo);
-    E(this, "optionsInput", Vt.componentKey);
+    E(this, "formulaInput", $o);
+    E(this, "optionsInput", Tt.componentKey);
     E(this, "dropdownType", ge.DATE);
   }
 }
-class Bo extends fe {
+class Ho extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.DECIMAL);
-    E(this, "formulaInput", Tt);
+    E(this, "formulaInput", At);
   }
 }
-const Vr = 4, Ho = 0, Ht = 4, Or = 4, on = 6, Ot = 6, Ee = 14;
-function Wo(e, t) {
-  const r = fi.getTextSize(e, t), n = r.width + Vr * 2, { ba: i, bd: o } = r, a = i + o;
+const Or = 4, Wo = 0, jt = 4, Tr = 4, sn = 6, Pt = 6, Ee = 14;
+function jo(e, t) {
+  const r = _i.getTextSize(e, t), n = r.width + Or * 2, { ba: i, bd: o } = r, a = i + o;
   return {
     width: n,
-    height: a + Ho * 2,
+    height: a + Wo * 2,
     ba: i
   };
 }
-function Wt(e, t, r, n) {
-  const i = Ee + on * 2, o = r - i, a = n - Ot * 2, l = e.map((c) => ({
-    layout: Wo(c, t),
-    text: c
+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
   }));
   let s;
-  const d = [];
-  l.forEach((c) => {
-    const { layout: m } = c, { width: g, height: b } = m;
-    !s || s.width + g + Ht > o ? (s = {
+  const c = [];
+  l.forEach((d) => {
+    const { layout: m } = d, { width: g, height: M } = m;
+    !s || s.width + g + jt > o ? (s = {
       width: g,
-      height: b,
+      height: M,
       items: [{
-        ...c,
+        ...d,
         left: 0
       }]
-    }, d.push(s)) : (s.items.push({
-      ...c,
-      left: s.width + Ht
-    }), s.width = s.width + g + Ht);
+    }, c.push(s)) : (s.items.push({
+      ...d,
+      left: s.width + jt
+    }), s.width = s.width + g + jt);
   });
   let u = 0, h = 0;
-  return d.forEach((c, m) => {
-    h = Math.max(h, c.width), m === d.length - 1 ? u += c.height : u += c.height + Or;
+  return c.forEach((d, m) => {
+    h = Math.max(h, d.width), m === c.length - 1 ? u += d.height : u += d.height + Tr;
   }), {
-    lines: d,
+    lines: c,
     totalHeight: u,
     contentWidth: o,
     contentHeight: a,
-    cellAutoHeight: u + Ot * 2,
+    cellAutoHeight: u + Pt * 2,
     calcAutoWidth: h + i
   };
 }
-const jo = 8;
-class Yo extends _i {
+const Yo = 8;
+class Xo extends Si {
   static drawWith(t, r) {
     const { fontString: n, info: i, fill: o, color: a } = r, { layout: l, text: s } = i;
-    t.save(), cr.drawWith(t, {
+    t.save(), ur.drawWith(t, {
       width: l.width,
       height: l.height,
-      radius: jo,
+      radius: Yo,
       fill: o || He
-    }), t.translateWithPrecision(Vr, l.ba), t.font = n, t.fillStyle = a, t.fillText(s, 0, 0), t.restore();
+    }), t.translateWithPrecision(Or, l.ba), t.font = n, t.fillStyle = a, t.fillText(s, 0, 0), t.restore();
   }
 }
-var Xo = Object.getOwnPropertyDescriptor, zo = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Xo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+var zo = Object.getOwnPropertyDescriptor, Ko = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? zo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, ft = (e, t) => (r, n) => t(r, n, e);
-const Ko = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
-let an = class {
+}, _t = (e, t) => (r, n) => t(r, n, e);
+const Go = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
+let ln = class {
   constructor(e, t, r, n) {
     E(this, "zIndex");
     E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
@@ -2503,47 +2492,47 @@ let an = class {
         a = n - Ee + 4;
         break;
     }
-    e.save(), e.translateWithPrecision(t.startX + o, t.startY + a), e.fillStyle = "#565656", e.fill(Ko), e.restore();
+    e.save(), e.translateWithPrecision(t.startX + o, t.startY + a), e.fillStyle = "#565656", e.fill(Go), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, r, n) {
-    var Z, X;
-    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: b = 0 } = h || {}, y = this._ensureMap(d), p = this._generateKey(o, a), S = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, o, a);
+    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);
     if (!S)
       return;
     const v = this._dataValidationModel.getValidator(S.type);
     if (!v)
       return;
     const C = {
-      startX: u.startX + c,
+      startX: u.startX + d,
       endX: u.endX - m,
       startY: u.startY + g,
-      endY: u.endY - b
-    }, w = C.endX - C.startX, I = C.endY - C.startY, { cl: R } = l || {}, T = (Z = typeof R == "object" ? R == null ? void 0 : R.rgb : R) != null ? Z : "#000", N = Ut(l != null ? l : void 0), { vt: D, ht: P } = l || {}, A = D != null ? D : ae.MIDDLE, L = (X = Q(s)) != null ? X : "", V = v.parseCellValue(L), F = v.getListWithColorMap(S), x = Wt(V, N, w, I);
-    this._drawDownIcon(e, C, w, I, A), e.save(), e.translateWithPrecision(C.startX, C.startY), e.beginPath(), e.rect(0, 0, w - Ee, I), e.clip(), e.translateWithPrecision(on, Ot);
-    let Y = 0;
+      endY: u.endY - M
+    }, w = C.endX - C.startX, I = C.endY - C.startY, { cl: R } = l || {}, T = (Z = typeof R == "object" ? R == null ? void 0 : R.rgb : R) != null ? Z : "#000", N = xt(l != null ? l : void 0), { vt: D, ht: P } = l || {}, A = D != null ? D : ae.MIDDLE, L = (z = Q(s)) != null ? z : "", V = v.parseCellValue(L), F = v.getListWithColorMap(S), x = Yt(V, N, w, I);
+    this._drawDownIcon(e, C, w, I, A), e.save(), e.translateWithPrecision(C.startX, C.startY), e.beginPath(), e.rect(0, 0, w - Ee, I), e.clip(), e.translateWithPrecision(sn, Pt);
+    let X = 0;
     switch (A) {
       case ae.MIDDLE:
-        Y = (x.contentHeight - x.totalHeight) / 2;
+        X = (x.contentHeight - x.totalHeight) / 2;
         break;
       case ae.BOTTOM:
-        Y = x.contentHeight - x.totalHeight;
+        X = x.contentHeight - x.totalHeight;
         break;
     }
-    e.translateWithPrecision(0, Y), x.lines.forEach((te, pe) => {
+    e.translateWithPrecision(0, X), x.lines.forEach((te, pe) => {
       e.save();
-      const { width: de, height: ne, items: ce } = te;
+      const { width: ce, height: ne, items: de } = te;
       let Se = 0;
       switch (P) {
         case Ye.RIGHT:
-          Se = x.contentWidth - de;
+          Se = x.contentWidth - ce;
           break;
         case Ye.CENTER:
-          Se = (x.contentWidth - de) / 2;
+          Se = (x.contentWidth - ce) / 2;
           break;
       }
-      e.translate(Se, pe * (ne + Or)), ce.forEach((ve) => {
-        e.save(), e.translateWithPrecision(ve.left, 0), Yo.drawWith(e, {
+      e.translate(Se, pe * (ne + Tr)), de.forEach((ve) => {
+        e.save(), e.translateWithPrecision(ve.left, 0), Xo.drawWith(e, {
           ...N,
           info: ve,
           color: T,
@@ -2553,16 +2542,16 @@ let an = class {
     }), e.restore(), y.set(p, {
       left: C.startX,
       top: C.startY,
-      width: x.contentWidth + on + Ee,
-      height: x.contentHeight + Ot * 2
+      width: x.contentWidth + sn + Ee,
+      height: x.contentHeight + Pt * 2
     });
   }
   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: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
+    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 = {
       startX: h.startX + l,
       endX: h.endX - s,
-      startY: h.startY + d,
+      startY: h.startY + c,
       endY: h.endY - u
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!m)
@@ -2570,15 +2559,15 @@ let an = class {
     const g = this._dataValidationModel.getValidator(m.type);
     if (!g)
       return;
-    const b = c.endX - c.startX, y = c.endY - c.startY, p = (w = Q(n)) != null ? w : "", S = g.parseCellValue(p), v = Ut(r != null ? r : void 0);
-    return Wt(S, v, b, y).cellAutoHeight;
+    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);
+    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: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
+    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 = {
       startX: h.startX + l,
       endX: h.endX - s,
-      startY: h.startY + d,
+      startY: h.startY + c,
       endY: h.endY - u
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!m)
@@ -2586,8 +2575,8 @@ let an = class {
     const g = this._dataValidationModel.getValidator(m.type);
     if (!g)
       return;
-    const b = c.endX - c.startX, y = c.endY - c.startY, p = (w = Q(n)) != null ? w : "", S = g.parseCellValue(p), v = Ut(r != null ? r : void 0);
-    return Wt(S, v, b, y).calcAutoWidth;
+    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);
+    return Yt(S, v, M, y).calcAutoWidth;
   }
   isHit(e, t) {
     const { primaryWithCoord: r } = t, n = r.isMergedMainCell ? r.mergeInfo : r, { endX: i } = n, { x: o } = e;
@@ -2602,43 +2591,43 @@ let an = class {
       row: i,
       column: o
     };
-    this._commandService.executeCommand(At.id, a);
+    this._commandService.executeCommand(kt.id, a);
   }
   onPointerEnter(e, t) {
     var r, n;
-    return (n = (r = Ke(j.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null ? void 0 : n.setCursor(Ge.POINTER);
+    return (n = (r = Ke(Y.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null ? void 0 : n.setCursor(Ge.POINTER);
   }
   onPointerLeave(e, t) {
     var r, n;
-    return (n = (r = Ke(j.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null ? void 0 : n.setCursor(Ge.DEFAULT);
+    return (n = (r = Ke(Y.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null ? void 0 : n.setCursor(Ge.DEFAULT);
   }
 };
-an = zo([
-  ft(0, J),
-  ft(1, le),
-  ft(2, M(Ne)),
-  ft(3, M(ee))
-], an);
-class Go extends fe {
+ln = Ko([
+  _t(0, J),
+  _t(1, le),
+  _t(2, b(Ne)),
+  _t(3, b(ee))
+], ln);
+class Zo extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.LIST_MULTIPLE);
-    E(this, "canvasRender", this.injector.createInstance(an));
+    E(this, "canvasRender", this.injector.createInstance(ln));
     E(this, "dropdownType", ge.MULTIPLE_LIST);
   }
 }
-var Zo = Object.getOwnPropertyDescriptor, qo = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Zo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+var qo = Object.getOwnPropertyDescriptor, Jo = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? qo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, at = (e, t) => (r, n) => t(r, n, e);
-const Me = 4, _t = 4, he = 14, me = 6, We = 4, jt = 8, Jo = "#565656", xn = 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 Qo(e, t) {
+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");
+function ea(e, t) {
   const r = e.length;
   return {
     id: "d",
     body: {
-      dataStream: `${e}${zr}`,
+      dataStream: `${e}${Kr}`,
       textRuns: [
         {
           ts: {
@@ -2673,22 +2662,22 @@ function Qo(e, t) {
     }
   };
 }
-function Tr(e, t, r) {
-  const n = Qo(e, r), i = new Xr(n), o = new Ci(i);
+function Pr(e, t, r) {
+  const n = ea(e, r), i = new zr(n), o = new Ii(i);
   return {
-    documentSkeleton: Ii.create(o, t),
+    documentSkeleton: wi.create(o, t),
     docModel: i,
     docViewModel: o
   };
 }
-function St(e, t, r) {
+function Ct(e, t, r) {
   const {
     documentSkeleton: n,
     docModel: i,
     docViewModel: o
-  } = Tr(e, t, r);
+  } = Pr(e, t, r);
   return {
-    documents: new Si(`DOCUMENTS_${Kt.generateRandomId()}`, n, {
+    documents: new Ci(`DOCUMENTS_${Zt.generateRandomId()}`, n, {
       pageMarginLeft: 0,
       pageMarginTop: 0
     }),
@@ -2697,7 +2686,7 @@ function St(e, t, r) {
     docViewModel: o
   };
 }
-function $n(e, t, r, n, i, o, a = !0) {
+function Hn(e, t, r, n, i, o, a = !0) {
   let l = 0;
   const s = a ? We : 0;
   switch (i) {
@@ -2712,21 +2701,21 @@ function $n(e, t, r, n, i, o, a = !0) {
       break;
   }
   l = Math.max(We, l);
-  let d = 0;
+  let c = 0;
   switch (o) {
     case Ye.CENTER:
-      d = (e - r) / 2;
+      c = (e - r) / 2;
       break;
     case Ye.RIGHT:
-      d = e - r;
+      c = e - r;
       break;
   }
-  return d = Math.max(me, d), {
-    paddingLeft: d,
+  return c = Math.max(me, c), {
+    paddingLeft: c,
     paddingTop: l
   };
 }
-let sn = class {
+let cn = class {
   constructor(e, t, r, n, i) {
     E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     E(this, "zIndex");
@@ -2740,88 +2729,88 @@ let sn = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, r, n, i, o, a) {
-    const { t: l = re.pd.t, b: s = re.pd.b } = a, d = r - he;
+    const { t: l = re.pd.t, b: s = re.pd.b } = a, c = r - he;
     let u;
     switch (o) {
       case ae.MIDDLE:
-        u = (n - _t) / 2;
+        u = (n - St) / 2;
         break;
       case ae.BOTTOM:
-        u = n - s - i - We + (i / 2 - _t / 2);
+        u = n - s - i - We + (i / 2 - St / 2);
         break;
       default:
-        u = l + We + (i / 2 - _t / 2);
+        u = l + We + (i / 2 - St / 2);
         break;
     }
-    e.save(), e.translateWithPrecision(t.startX + d, t.startY + u), e.fillStyle = "#565656", e.fill(xn), e.restore();
+    e.save(), e.translateWithPrecision(t.startX + c, t.startY + u), e.fillStyle = "#565656", e.fill(Bn), 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, d = 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, c = 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 c = l == null ? void 0 : l.fontRenderExtension, { leftOffset: m = 0, rightOffset: g = 0, topOffset: b = 0, downOffset: y = 0 } = c || {};
+    const d = l == null ? void 0 : l.fontRenderExtension, { leftOffset: m = 0, rightOffset: g = 0, topOffset: M = 0, downOffset: y = 0 } = d || {};
     if (!u || !h || !h || h.id.indexOf(G.LIST) !== 0 || !h.skipDefaultFontRender(u))
       return;
     const p = {
-      startX: d.startX + m,
-      endX: d.endX - g,
-      startY: d.startY + b,
-      endY: d.endY - y
+      startX: c.startX + m,
+      endX: c.endX - g,
+      startY: c.startY + M,
+      endY: c.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: Y = re.pd.b } = L, Z = S - V - x - he - 4, { documentSkeleton: X, documents: te, docModel: pe } = St(T, this._localeService, a);
-      D === Ie.WRAP && pe.updateDocumentDataPageSize(Math.max(Z, 1)), X.calculate(), X.getActualSize();
-      const de = it(X), { height: ne, width: ce } = de, { paddingTop: Se, paddingLeft: ve } = $n(Z, v - F - Y, 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 - Y), e.clip(), e.translateWithPrecision(0, Se), e.save(), e.translateWithPrecision(Me, 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, {
+      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);
+      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,
         width: he,
-        height: v - F - Y
+        height: v - F - X
       });
     } else {
       e.save(), e.translateWithPrecision(p.startX, p.startY), e.beginPath(), e.rect(0, 0, S, v), e.clip();
-      const V = S - me * 2 - Me - he - 4, { documentSkeleton: F, documents: x, docModel: Y } = St(T, this._localeService, a);
-      D === Ie.WRAP && Y.updateDocumentDataPageSize(Math.max(V, 1)), F.calculate();
-      const Z = it(F), { height: X, width: te } = Z, { paddingTop: pe, paddingLeft: de } = $n(V, v, te, X, P, A);
+      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);
       e.translateWithPrecision(me, pe);
-      const ne = Math.max(S - me * 2, 1), ce = X;
-      cr.drawWith(e, {
+      const ne = Math.max(S - me * 2, 1), de = z;
+      ur.drawWith(e, {
         width: ne,
-        height: ce,
+        height: de,
         fill: (N == null ? void 0 : N.color) || He,
-        radius: jt
-      }), e.save(), e.translateWithPrecision(Me, 0), e.beginPath(), e.rect(0, 0, V, X), e.clip(), e.translateWithPrecision(de, 0), x.render(e), e.restore(), e.translateWithPrecision(V + Me + 4, (X - _t) / 2), e.fillStyle = Jo, e.fill(xn), e.restore(), C.set(w, {
+        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, {
         left: p.startX + me + r.rowHeaderWidth,
         top: p.startY + pe + r.columnHeaderHeight,
         width: ne,
-        height: ce
+        height: de
       });
     }
   }
   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: 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)
+    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)
       return;
     const m = {
       startX: a.startX + s,
-      endX: a.endX - d,
+      endX: a.endX - c,
       startY: a.startY + u,
       endY: a.endY - h
-    }, g = m.endX - m.startX, b = Q(n), y = `${b != null ? b : ""}`;
+    }, 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, c.renderMode === ie.ARROW) {
-      const w = g - he, { documentSkeleton: I, docModel: R } = St(y, this._localeService, r);
+    if (p = p != null ? p : Ie.WRAP, d.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;
     } else {
-      const w = g - me * 2 - Me - he, { documentSkeleton: I, docModel: R } = Tr(y, this._localeService, r);
+      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
@@ -2830,39 +2819,39 @@ let sn = class {
     }
   }
   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: 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)
+    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)
       return;
     const m = {
       startX: a.startX + s,
-      endX: a.endX - d,
+      endX: a.endX - c,
       startY: a.startY + u,
       endY: a.endY - h
-    }, g = m.endX - m.startX, b = Q(n), y = `${b != null ? b : ""}`;
+    }, g = m.endX - m.startX, M = Q(n), y = `${M != null ? M : ""}`;
     let { tb: p, pd: S } = r || {};
     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 (c.renderMode) {
+    switch (d.renderMode) {
       case ie.ARROW:
         w = he + me * 2 + C + v;
         break;
       case ie.CUSTOM:
-        w = he + me * 2 + Me * 2 + C + v + jt / 2 + 1;
+        w = he + me * 2 + be * 2 + C + v + Xt / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        w = he + me * 2 + Me * 2 + C + v + jt / 2 + 1;
+        w = he + me * 2 + be * 2 + C + v + Xt / 2 + 1;
     }
-    const I = g - w, { documentSkeleton: R, docModel: T } = St(y, this._localeService, r);
+    const I = g - w, { documentSkeleton: R, docModel: T } = Ct(y, this._localeService, r);
     return p === Ie.WRAP && T.updateDocumentDataPageSize(Math.max(I, 1)), R.calculate(), R.getActualSize(), it(R).width + w;
   }
   isHit(e, t) {
     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: d, width: u, height: h } = a, { x: c, y: m } = e;
-    return c >= d && c <= d + u && m >= s && m <= s + h;
+    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;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2873,64 +2862,64 @@ let sn = class {
       row: i,
       column: o
     };
-    this._commandService.executeCommand(At.id, a);
+    this._commandService.executeCommand(kt.id, a);
   }
   onPointerEnter(e, t) {
     var r, n;
-    (n = (r = Ke(j.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.POINTER);
+    (n = (r = Ke(Y.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.POINTER);
   }
   onPointerLeave(e, t) {
     var r, n;
-    (n = (r = Ke(j.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.DEFAULT);
+    (n = (r = Ke(Y.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.DEFAULT);
   }
 };
-sn = qo([
+cn = Jo([
   at(0, le),
-  at(1, M(se)),
+  at(1, b(se)),
   at(2, J),
-  at(3, M(Ne)),
-  at(4, M(ee))
-], sn);
-class ea extends fe {
+  at(3, b(Ne)),
+  at(4, b(ee))
+], cn);
+class ta extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.LIST);
-    E(this, "canvasRender", this.injector.createInstance(sn));
+    E(this, "canvasRender", this.injector.createInstance(cn));
     E(this, "dropdownType", ge.LIST);
-    E(this, "optionsInput", Dt.componentKey);
-    E(this, "formulaInput", cn);
+    E(this, "optionsInput", Ot.componentKey);
+    E(this, "formulaInput", hn);
   }
 }
-class ta extends fe {
+class na extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.TEXT_LENGTH);
-    E(this, "formulaInput", Tt);
+    E(this, "formulaInput", At);
   }
 }
-class na extends fe {
+class ra extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.WHOLE);
-    E(this, "formulaInput", Tt);
+    E(this, "formulaInput", At);
   }
 }
-var ra = Object.getOwnPropertyDescriptor, ia = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? ra(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+var ia = Object.getOwnPropertyDescriptor, oa = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? ia(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Yt = (e, t) => (r, n) => t(r, n, e);
-let tt = class extends dn {
+}, zt = (e, t) => (r, n) => t(r, n, e);
+let tt = class extends un {
   constructor(e, t, r) {
     super(), this._injector = e, this._componentManger = t, this._dataValidatorRegistryService = r, this._initComponents(), this._registerValidatorViews();
   }
   _initComponents() {
     [
-      [br, Sr],
-      [Mt, Po],
-      [Dt.componentKey, Dt],
-      [Vt.componentKey, Vt],
-      ...Qi
+      [br, Cr],
+      [Dt, Ao],
+      [Ot.componentKey, Ot],
+      [Tt.componentKey, Tt],
+      ...eo
     ].forEach(([e, t]) => {
       this.disposeWithMe(this._componentManger.register(
         e,
@@ -2940,47 +2929,47 @@ let tt = class extends dn {
   }
   _registerValidatorViews() {
     [
-      Bo,
+      Ho,
+      ra,
       na,
+      Bo,
+      Fo,
       ta,
-      $o,
-      Uo,
-      ea,
-      Go,
-      Fo
+      Zo,
+      xo
     ].forEach((e) => {
       const t = this._injector.createInstance(e), r = this._dataValidatorRegistryService.getValidatorItem(t.id);
       r && (r.formulaInput = t.formulaInput, r.canvasRender = t.canvasRender, r.dropdownType = t.dropdownType, r.optionsInput = t.optionsInput);
     });
   }
 };
-tt = ia([
-  Yt(0, M(we)),
-  Yt(1, M(pn)),
-  Yt(2, M(ye))
+tt = oa([
+  zt(0, b(we)),
+  zt(1, b(mn)),
+  zt(2, b(ye))
 ], tt);
-var oa = Object.getOwnPropertyDescriptor, aa = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? oa(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+var aa = Object.getOwnPropertyDescriptor, sa = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? aa(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Xt = (e, t) => (r, n) => t(r, n, e);
-const sa = "SHEET_DATA_VALIDATION_UI_PLUGIN";
-var Ct;
-let Bn = (Ct = class extends zn {
-  constructor(e = bt, t, r, n) {
+}, Kt = (e, t) => (r, n) => t(r, n, e);
+const la = "SHEET_DATA_VALIDATION_UI_PLUGIN";
+var It;
+let Wn = (It = class extends Gn {
+  constructor(e = Et, t, r, n) {
     super(), this._config = e, this._injector = t, this._commandService = r, this._configService = n;
-    const { menu: i, ...o } = Kn(
+    const { menu: i, ...o } = Zn(
       {},
-      bt,
+      Et,
       this._config
     );
-    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(Cn, o);
+    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(wn, o);
   }
   onStarting() {
     [
       [_e],
       [Ae],
-      [ct],
+      [ut],
       [qe],
       [et],
       [Qe],
@@ -2990,20 +2979,20 @@ let Bn = (Ct = class extends zn {
     ].forEach((e) => {
       this._injector.add(e);
     }), [
-      Lt,
-      At,
-      yr,
-      In,
+      Nt,
+      kt,
+      Mr,
+      Rn,
       Fe,
-      Rr
+      yr
     ].forEach((e) => {
       this._commandService.registerCommand(e);
     });
   }
   onReady() {
-    this._injector.get(Je), this._injector.get(Qe), this._injector.get(Ze), this._injector.get(ct), this._injector.get(Ne).registerRenderModule(
-      j.UNIVER_SHEET,
-      [Et]
+    this._injector.get(Je), this._injector.get(Qe), this._injector.get(Ze), this._injector.get(ut), this._injector.get(Ne).registerRenderModule(
+      Y.UNIVER_SHEET,
+      [Vt]
     );
   }
   onRendered() {
@@ -3012,34 +3001,34 @@ let Bn = (Ct = class extends zn {
   onSteady() {
     this._injector.get(qe);
   }
-}, E(Ct, "pluginName", sa), E(Ct, "type", j.UNIVER_SHEET), Ct);
-Bn = aa([
-  Xt(1, M(we)),
-  Xt(2, J),
-  Xt(3, ln)
-], Bn);
-var la = Object.getOwnPropertyDescriptor, da = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? la(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+}, E(It, "pluginName", la), E(It, "type", Y.UNIVER_SHEET), It);
+Wn = sa([
+  Kt(1, b(we)),
+  Kt(2, J),
+  Kt(3, dn)
+], 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--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, zt = (e, t) => (r, n) => t(r, n, e);
-const ca = "SHEET_DATA_VALIDATION_UI_PLUGIN";
-var It;
-let Hn = (It = class extends zn {
-  constructor(e = bt, t, r, n) {
+}, Gt = (e, t) => (r, n) => t(r, n, e);
+const ua = "SHEET_DATA_VALIDATION_UI_PLUGIN";
+var wt;
+let jn = (wt = class extends Gn {
+  constructor(e = Et, t, r, n) {
     super(), this._config = e, this._injector = t, this._commandService = r, this._configService = n;
-    const { menu: i, ...o } = Kn(
+    const { menu: i, ...o } = Zn(
       {},
-      bt,
+      Et,
       this._config
     );
-    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(Cn, o);
+    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(wn, o);
   }
   onStarting() {
     [
       [_e],
       [Ae],
-      [ct],
+      [ut],
       [qe],
       [et],
       [Qe],
@@ -3048,20 +3037,20 @@ let Hn = (It = class extends zn {
     ].forEach((e) => {
       this._injector.add(e);
     }), [
-      Lt,
-      At,
-      yr,
-      In,
+      Nt,
+      kt,
+      Mr,
+      Rn,
       Fe,
-      Rr
+      yr
     ].forEach((e) => {
       this._commandService.registerCommand(e);
     });
   }
   onReady() {
     this._injector.get(Je), this._injector.get(Qe), this._injector.get(Ne).registerRenderModule(
-      j.UNIVER_SHEET,
-      [Et]
+      Y.UNIVER_SHEET,
+      [Vt]
     );
   }
   onRendered() {
@@ -3070,14 +3059,14 @@ let Hn = (It = class extends zn {
   onSteady() {
     this._injector.get(qe);
   }
-}, E(It, "pluginName", ca), E(It, "type", j.UNIVER_SHEET), It);
-Hn = da([
-  zt(1, M(we)),
-  zt(2, J),
-  zt(3, ln)
-], Hn);
+}, E(wt, "pluginName", ua), E(wt, "type", Y.UNIVER_SHEET), wt);
+jn = da([
+  Gt(1, b(we)),
+  Gt(2, J),
+  Gt(3, dn)
+], jn);
 export {
   fe as BaseSheetDataValidatorView,
-  Hn as UniverSheetsDataValidationMobileUIPlugin,
-  Bn as UniverSheetsDataValidationUIPlugin
+  jn as UniverSheetsDataValidationMobileUIPlugin,
+  Wn as UniverSheetsDataValidationUIPlugin
 };