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

package/lib/es/index.js

@@ -1,33 +1,33 @@
 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 W, toDisposable as kr, IUniverInstanceService as le, DataValidationErrorStyle as lt, DataValidationStatus as je, ICommandService as J, IConfigService as ln, DataValidationRenderMode as oe, DisposableCollection as Nr, dayjs as wn, numfmt as Hn, CellValueType as Ur, CommandType as nt, ObjectMatrix as wt, Range as Fr, Rectangle as Rt, queryObjectMatrix as Gt, Optional as xr, RxDisposable as cn, InterceptorEffectEnum as Wn, sequenceExecute as jn, bufferDebounceTime as $r, debounce as Br, UndoCommand as Hr, RedoCommand as Wr, isUnitRangesEqual as jr, shallowEqual as Rn, ThemeService as Yn, 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 Xn, merge as zn } from "@univerjs/core";
-import { DataValidationFormulaController as Kr, deserializeListOptions as Gr, serializeListOptions as Kn, CUSTOM_FORMULA_INPUT_NAME as Gn, BASE_FORMULA_INPUT_NAME as Tt, LIST_FORMULA_INPUT_NAME as dn, CHECKBOX_FORMULA_INPUT_NAME as Zn, SheetDataValidationModel as ee, SheetsDataValidationValidatorService as Zr, getDataValidationCellValue as kt, getCellValueOrigin as Q, createDefaultNewRule as qn, AddSheetDataValidationCommand as un, DATA_VALIDATION_PLUGIN_NAME as Jn, getDataValidationDiffMutations as Zt, UpdateSheetDataValidationRangeCommand as Qn, DataValidationCacheService as er, UpdateSheetDataValidationSettingCommand as yn, UpdateSheetDataValidationOptionsCommand as qr, RemoveSheetDataValidationCommand as tr, RemoveSheetAllDataValidationCommand as Jr, DataValidationFormulaService as Qr, CHECKBOX_FORMULA_2 as eo, CHECKBOX_FORMULA_1 as to, getFormulaResult as Nt, isLegalFormulaResult as Mn, transformCheckboxValue as no } from "@univerjs/sheets-data-validation";
-import { jsxs as z, 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 ro, clsx as nr, LegacySelect as oo, Button as ze, Select as bn } from "@univerjs/design";
-import { useDependency as U, useSidebarClick as rr, useObservable as Te, useEvent as qt, ISidebarService as or, IDialogService as io, IZenZoneService as ir, KeyCode as ht, MenuItemType as pn, getMenuHiddenObservable as ao, RibbonStartGroup as so, IMenuManagerService as lo, ComponentManager as gn } from "@univerjs/ui";
-import En, { useState as H, useRef as ut, forwardRef as Le, createElement as ke, useMemo as ct, useEffect as Pe } from "react";
-import { FormulaEditor as ar, RangeSelector as co } from "@univerjs/sheets-formula-ui";
-import { DataValidatorRegistryService as ye, DataValidationModel as mn, DataValidatorDropdownType as pe, DataValidatorRegistryScope as uo, TWO_FORMULA_OPERATOR_COUNT as ho, getRuleOptions as Dn, getRuleSetting as Vn } from "@univerjs/data-validation";
-import { debounceTime as sr, filter as fn, BehaviorSubject as On, distinctUntilChanged as po, Subject as go, bufferTime as lr, of as mo } from "rxjs";
-import { DeviceInputEventType as pt, IRenderManagerService as Ne, fixLineWidthByScale as Tn, Transform as fo, CheckboxShape as vo, getCurrentTypeOfRenderer as Ke, CURSOR_TYPE as Ge, FontCache as _o, Shape as So, Rect as cr, getFontStyleString as Ut, getDocsSkeletonPageSize as ot, Documents as Co, DocumentViewModel as Io, DocumentSkeleton as wo } from "@univerjs/engine-render";
-import { SheetInterceptorService as vn, VALIDATE_CELL as Ro, SheetsSelectionsService as dr, SetRangeValuesCommand as st, getSheetCommandTarget as ur, rangeToDiscreteRange as yo, SheetPermissionCheckController as Mo, WorksheetEditPermission as Jt, WorksheetSetCellStylePermission as Qt, RangeProtectionPermissionEditPoint as en, WorkbookEditablePermission as tn, INTERCEPTOR_POINT as hr, InterceptCellContentPriority as pr, checkRangesEditablePermission as bo } from "@univerjs/sheets";
-import { getPatternType as Eo } from "@univerjs/sheets-numfmt";
-import { ISheetCellDropdownManagerService as Do, IEditorBridgeService as gr, SetCellEditVisibleOperation as gt, HoverManagerService as Vo, CellAlertManagerService as Oo, CellAlertType as To, IAutoFillService as Po, APPLY_TYPE as it, virtualizeDiscreteRanges as nn, getAutoFillRepeatRange as Ao, ISheetClipboardService as Lo, COPY_TYPE as Pn, PREDEFINED_HOOK_NAME as mt, getRepeatRange as An, getCurrentRangeDisable$ as ko, AutoHeightController as mr, SheetSkeletonManagerService as yt, IMarkSelectionService as No } from "@univerjs/sheets-ui";
-import { deserializeRangeWithSheet as Uo, serializeRange as fr } from "@univerjs/engine-formula";
-const Fo = (e) => {
-  const { isTwoFormula: t = !1, value: r, onChange: n, showError: o, validResult: i } = e, a = U(se), l = o ? i == null ? void 0 : i.formula1 : "", s = o ? i == null ? void 0 : i.formula2 : "";
-  return t ? /* @__PURE__ */ z(Xe, { children: [
+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) => {
+  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__ */ _(
       Ve,
       {
         className: "univer-w-full",
         placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
         value: r == null ? void 0 : r.formula1,
-        onChange: (c) => {
+        onChange: (d) => {
           n == null || n({
             ...r,
-            formula1: c
+            formula1: d
           });
         }
       }
@@ -39,10 +39,10 @@ const Fo = (e) => {
         className: "univer-w-full",
         placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
         value: r == null ? void 0 : r.formula2,
-        onChange: (c) => {
+        onChange: (d) => {
           n == null || n({
             ...r,
-            formula2: c
+            formula2: d
           });
         }
       }
@@ -53,34 +53,34 @@ const Fo = (e) => {
       className: "univer-w-full",
       placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
       value: r == null ? void 0 : r.formula1,
-      onChange: (c) => {
-        n == null || n({ formula1: c });
+      onChange: (d) => {
+        n == null || n({ formula1: d });
       }
     }
   ) });
 };
-function xo(e) {
-  const { value: t, onChange: r, showError: n, validResult: o } = e, i = U(se), a = n ? o == null ? void 0 : o.formula1 : "", l = n ? o == null ? void 0 : o.formula2 : "", [s, c] = H(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
-  return /* @__PURE__ */ z(Xe, { children: [
+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,
       {
         checked: s,
         onChange: (u) => {
-          u ? c(!0) : (c(!1), r == null || r({
+          u ? d(!0) : (d(!1), r == null || r({
             ...t,
             formula1: void 0,
             formula2: void 0
           }));
         },
-        children: i.t("dataValidation.checkbox.tips")
+        children: o.t("dataValidation.checkbox.tips")
       }
     ) }),
-    s ? /* @__PURE__ */ _(K, { label: i.t("dataValidation.checkbox.checked"), error: a, children: /* @__PURE__ */ _(
+    s ? /* @__PURE__ */ _(K, { label: o.t("dataValidation.checkbox.checked"), error: a, children: /* @__PURE__ */ _(
       Ve,
       {
         className: "univer-w-full",
-        placeholder: i.t("dataValidation.panel.valuePlaceholder"),
+        placeholder: o.t("dataValidation.panel.valuePlaceholder"),
         value: t == null ? void 0 : t.formula1,
         onChange: (u) => {
           r == null || r({
@@ -90,11 +90,11 @@ function xo(e) {
         }
       }
     ) }) : null,
-    s ? /* @__PURE__ */ _(K, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ _(
+    s ? /* @__PURE__ */ _(K, { label: o.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ _(
       Ve,
       {
         className: "univer-w-full",
-        placeholder: i.t("dataValidation.panel.valuePlaceholder"),
+        placeholder: o.t("dataValidation.panel.valuePlaceholder"),
         value: t == null ? void 0 : t.formula2,
         onChange: (u) => {
           r == null || r({
@@ -106,128 +106,137 @@ function xo(e) {
     ) }) : null
   ] });
 }
-function $o(e) {
+function xi(e) {
   var h;
-  const { unitId: t, subUnitId: r, value: n, onChange: o, showError: i, validResult: a } = e, l = i ? a == null ? void 0 : a.formula1 : void 0, s = ut(null), [c, u] = H(!1);
-  return rr((d) => {
-    var p;
-    ((p = s.current) == null ? void 0 : p.isClickOutSide(d)) && u(!1);
+  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) => {
+    var g;
+    ((g = s.current) == null ? void 0 : g.isClickOutSide(c)) && u(!1);
   }), /* @__PURE__ */ _(
-    ar,
+    sr,
     {
+      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
+            `,
       initValue: (h = n == null ? void 0 : n.formula1) != null ? h : "=",
       unitId: t,
       subUnitId: r,
-      isFocus: c,
-      onChange: (d) => {
-        const S = (d != null ? d : "").trim();
-        S !== (n == null ? void 0 : n.formula1) && (o == null || o({
+      isFocus: d,
+      errorText: l,
+      isSupportAcrossSheet: !0,
+      onChange: (c) => {
+        const m = (c != null ? c : "").trim();
+        m !== (n == null ? void 0 : n.formula1) && (i == null || i({
           ...n,
-          formula1: S
+          formula1: m
         }));
       },
-      errorText: l,
-      onFocus: () => u(!0),
-      isSupportAcrossSheet: !0,
-      ref: s
+      onFocus: () => u(!0)
     }
   );
 }
-var ie = function() {
-  return ie = Object.assign || function(e) {
+var oe = function() {
+  return oe = Object.assign || function(e) {
     for (var t, r = 1, n = arguments.length; r < n; r++) {
       t = arguments[r];
-      for (var o in t) Object.prototype.hasOwnProperty.call(t, o) && (e[o] = t[o]);
+      for (var i in t) Object.prototype.hasOwnProperty.call(t, i) && (e[i] = t[i]);
     }
     return e;
-  }, ie.apply(this, arguments);
-}, Bo = function(e, t) {
+  }, oe.apply(this, arguments);
+}, $i = function(e, t) {
   var r = {};
   for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && t.indexOf(n) < 0 && (r[n] = e[n]);
   if (e != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var o = 0, n = Object.getOwnPropertySymbols(e); o < n.length; o++)
-      t.indexOf(n[o]) < 0 && Object.prototype.propertyIsEnumerable.call(e, n[o]) && (r[n[o]] = e[n[o]]);
+    for (var i = 0, n = Object.getOwnPropertySymbols(e); i < n.length; i++)
+      t.indexOf(n[i]) < 0 && Object.prototype.propertyIsEnumerable.call(e, n[i]) && (r[n[i]] = e[n[i]]);
   return r;
 }, Ue = Le(function(e, t) {
-  var r = e.icon, n = e.id, o = e.className, i = e.extend, a = Bo(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(n, " ").concat(o || "").trim(), s = ut("_".concat(jo()));
-  return vr(r, "".concat(n), { defIds: r.defIds, idSuffix: s.current }, ie({ ref: t, className: l }, a), i);
+  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);
 });
-function vr(e, t, r, n, o) {
-  return ke(e.tag, ie(ie({ key: t }, Ho(e, r, o)), n), (Wo(e, r).children || []).map(function(i, a) {
-    return vr(i, "".concat(t, "-").concat(e.tag, "-").concat(a), r, void 0, 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 Ho(e, t, r) {
-  var n = ie({}, 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(i) {
-    var a = i[0], l = i[1];
+function Bi(e, t, r) {
+  var n = oe({}, e.attrs);
+  r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1), e.tag === "mask" && n.id && (n.id = n.id + t.idSuffix), Object.entries(n).forEach(function(o) {
+    var a = o[0], l = o[1];
     a === "mask" && typeof l == "string" && (n[a] = l.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
   });
-  var o = t.defIds;
-  return !o || o.length === 0 || (e.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + t.idSuffix), Object.entries(n).forEach(function(i) {
-    var a = i[0], l = i[1];
+  var i = t.defIds;
+  return !i || i.length === 0 || (e.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + t.idSuffix), Object.entries(n).forEach(function(o) {
+    var a = o[0], l = o[1];
     typeof l == "string" && (n[a] = l.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
   })), n;
 }
-function Wo(e, t) {
+function Hi(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) ? ie(ie({}, e), { children: e.children.map(function(o) {
-    return typeof o.attrs.id == "string" && n && n.indexOf(o.attrs.id) > -1 ? ie(ie({}, o), { attrs: ie(ie({}, o.attrs), { id: o.attrs.id + t.idSuffix }) }) : o;
+  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 jo() {
+function Wi() {
   return Math.random().toString(36).substring(2, 8);
 }
 Ue.displayName = "UniverIcon";
-var Yo = { 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" } }] }, _r = Le(function(e, t) {
+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) {
   return ke(Ue, Object.assign({}, e, {
     id: "data-validation-single",
     ref: t,
-    icon: Yo
+    icon: ji
   }));
 });
-_r.displayName = "DataValidationSingle";
-var Xo = { 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) {
+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) {
   return ke(Ue, Object.assign({}, e, {
     id: "delete-single",
     ref: t,
-    icon: Xo
+    icon: Yi
   }));
 });
 _n.displayName = "DeleteSingle";
-var zo = { 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" } }] }, Sr = Le(function(e, t) {
+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) {
   return ke(Ue, Object.assign({}, e, {
     id: "increase-single",
     ref: t,
-    icon: zo
+    icon: Xi
   }));
 });
-Sr.displayName = "IncreaseSingle";
-var Ko = { 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" } }] }, Cr = Le(function(e, t) {
+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) {
   return ke(Ue, Object.assign({}, e, {
     id: "more-down-single",
     ref: t,
-    icon: Ko
+    icon: zi
   }));
 });
-Cr.displayName = "MoreDownSingle";
-var Go = { 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) {
+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) {
   return ke(Ue, Object.assign({}, e, {
     id: "more-up-single",
     ref: t,
-    icon: Go
+    icon: Ki
   }));
 });
 Ir.displayName = "MoreUpSingle";
-var Zo = { 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) {
+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) {
   return ke(Ue, Object.assign({}, e, {
     id: "sequence-single",
     ref: t,
-    icon: Zo
+    icon: Gi
   }));
 });
 wr.displayName = "SequenceSingle";
-const He = "#ECECEC", qo = [
+const He = "#ECECEC", Zi = [
   "#FFFFFF",
   "#FEE7E7",
   "#FEF0E6",
@@ -252,67 +261,77 @@ const He = "#ECECEC", qo = [
   "#3A60F7",
   "#9E6DE3",
   "#F248A6"
-], Jo = (e) => {
-  const { value: t, onChange: r, disabled: n } = e, [o, i] = H(!1);
+], qi = (e) => {
+  const { value: t, onChange: r, disabled: n } = e, [i, o] = H(!1);
   return /* @__PURE__ */ _(
-    oo,
+    ii,
     {
+      align: "start",
       disabled: n,
-      open: o,
-      onDropdownVisibleChange: i,
-      dropdownStyle: { width: 112 },
-      style: { width: 96, cursor: "pointer" },
-      className: "univer-ml-1 univer-mr-2 univer-w-[92px]",
-      value: t,
-      onChange: r,
-      labelRender: (a) => /* @__PURE__ */ _(
+      open: i,
+      onOpenChange: o,
+      overlay: /* @__PURE__ */ _(
         "div",
         {
           className: `
-                      univer-box-border univer-h-4 univer-w-4 univer-rounded univer-border univer-border-gray-200
-                      univer-text-base
+                      univer-box-border univer-grid univer-w-fit univer-grid-cols-6 univer-flex-wrap univer-gap-2
+                      univer-p-1.5
                     `,
-          style: { background: a.value, marginTop: 5 }
-        }
-      ),
-      dropdownRender: () => /* @__PURE__ */ _(
-        "div",
-        {
-          className: `
-                          univer-box-border univer-flex univer-w-28 univer-flex-row univer-flex-wrap
-                          univer-justify-between univer-p-3 univer-pl-3
-                        `,
-          children: qo.map(
+          children: Zi.map(
             (a) => /* @__PURE__ */ _(
               "div",
               {
-                onClick: () => {
-                  r(a), i(!1);
-                },
                 className: `
-                                      univer-mb-2 univer-mr-2 univer-box-border univer-box-border univer-h-4 univer-w-4
-                                      univer-cursor-pointer univer-rounded univer-border univer-border-gray-200
-                                      univer-text-base
-                                    `,
-                style: { background: a }
+                                  univer-box-border univer-size-4 univer-cursor-pointer univer-rounded univer-border
+                                  univer-border-solid univer-border-gray-200
+                                `,
+                style: { background: a },
+                onClick: () => {
+                  r(a), o(!1);
+                }
               },
               a
             )
           )
         }
+      ),
+      children: /* @__PURE__ */ W(
+        "div",
+        {
+          className: `
+                  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
+                  hover:univer-border-primary-600
+                `,
+          children: [
+            /* @__PURE__ */ _(
+              "div",
+              {
+                className: `
+                      univer-box-border univer-h-4 univer-w-4 univer-rounded univer-border univer-border-gray-200
+                      univer-text-base
+                    `,
+                style: { background: t }
+              }
+            ),
+            /* @__PURE__ */ _(Sn, { className: "univer-text-gray-600" })
+          ]
+        }
       )
     }
   );
-}, Ln = (e) => {
-  const { item: t, commonProps: r, style: n } = e, { onItemChange: o, onItemDelete: i } = r;
-  return /* @__PURE__ */ z("div", { className: "univer-flex univer-items-center univer-pb-0.5", style: n, children: [
-    t.isRef ? null : /* @__PURE__ */ _("div", { className: nr("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ _(wr, {}) }),
+}, kn = (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, {}) }),
     /* @__PURE__ */ _(
-      Jo,
+      qi,
       {
         value: t.color,
         onChange: (a) => {
-          o(t.id, t.label, a);
+          i(t.id, t.label, a);
         }
       }
     ),
@@ -322,9 +341,8 @@ const He = "#ECECEC", qo = [
         disabled: t.isRef,
         value: t.label,
         onChange: (a) => {
-          o(t.id, a, t.color);
-        },
-        inputStyle: { height: 28 }
+          i(t.id, a, t.color);
+        }
       }
     ),
     t.isRef ? null : /* @__PURE__ */ _(
@@ -334,54 +352,54 @@ const He = "#ECECEC", qo = [
                           univer-ml-1 univer-cursor-pointer univer-rounded univer-text-base
                           hover:univer-bg-gray-200
                         `,
-        children: /* @__PURE__ */ _(_n, { onClick: () => i(t.id) })
+        children: /* @__PURE__ */ _(_n, { onClick: () => o(t.id) })
       }
     )
   ] });
 };
-function Qo(e) {
+function Ji(e) {
   const { value: t, onChange: r = () => {
-  }, unitId: n, subUnitId: o, validResult: i, showError: a, ruleId: l } = e, { formula1: s = "", formula2: c = "" } = t || {}, [u, h] = H(() => De(s) ? "1" : "0"), [d, S] = H(u === "1" ? s : "="), [p, b] = H(u === "1" ? s : "="), y = U(se), g = U(ye), f = U(mn), m = U(Kr), [I, w] = H(() => c.split(",")), C = g.getValidatorItem(G.LIST), [R, D] = H([]), [k, V] = H(""), A = a ? i == null ? void 0 : i.formula1 : "", P = ct(() => f.ruleChange$.pipe(sr(16)), []), L = Te(P), O = qt(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);
   Pe(() => {
     (async () => {
-      await new Promise((v) => {
-        setTimeout(() => v(!0), 100);
+      await new Promise((f) => {
+        setTimeout(() => f(!0), 100);
       });
-      const T = f.getRuleById(n, o, l), B = T == null ? void 0 : T.formula1;
-      if (De(B) && C && T) {
-        const v = await C.getListAsync(T, n, o);
-        D(v);
+      const O = S.getRuleById(n, i, l), B = O == null ? void 0 : O.formula1;
+      if (De(B) && I && O) {
+        const f = await I.getListAsync(O, n, i);
+        T(f);
       }
     })();
-  }, [f, L, C, l, o, n]), Pe(() => {
-    De(s) && s !== p && (S(s), b(p));
-  }, [p, s]);
+  }, [S, L, I, l, i, n]), Pe(() => {
+    De(s) && s !== g && (m(s), b(g));
+  }, [g, s]);
   const [F, x] = H(() => {
-    const T = u !== "1" ? Gr(s) : [], B = c.split(",");
-    return T.map((v, N) => ({
-      label: v,
-      color: B[N] || He,
+    const O = u !== "1" ? Gr(s) : [], B = d.split(",");
+    return O.map((f, k) => ({
+      label: f,
+      color: B[k] || He,
       isRef: !1,
       id: Kt.generateRandomId(4)
     }));
-  }), j = (T, B, v) => {
-    const N = F.find(($) => $.id === T);
-    N && (N.label = B, N.color = v, x([...F]));
-  }, Z = (T) => {
-    const B = F.findIndex((v) => v.id === T);
+  }), Y = (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]));
-  }, Y = c.split(","), te = ct(() => R.map((T, B) => ({
-    label: T,
-    color: Y[B] || He,
+  }, X = d.split(","), te = dt(() => R.map((O, B) => ({
+    label: O,
+    color: X[B] || He,
     id: `${B}`,
     isRef: !0
-  })), [Y, R]), ge = (T, B, v) => {
-    const N = [...I];
-    N[+T] = v, w(N), O({
+  })), [X, R]), pe = (O, B, f) => {
+    const k = [...C];
+    k[+O] = f, w(k), V({
       formula1: s,
-      formula2: N.join(",")
+      formula2: k.join(",")
     });
-  }, ce = () => {
+  }, de = () => {
     x([
       ...F,
       {
@@ -395,50 +413,50 @@ function Qo(e) {
   Pe(() => {
     if (u === "1")
       return;
-    const T = /* @__PURE__ */ new Set(), B = [];
-    F.map((v) => ({
-      labelList: v.label.split(","),
-      item: v
-    })).forEach(({ item: v, labelList: N }) => {
-      N.forEach(($) => {
-        T.has($) || (T.add($), B.push({
+    const O = /* @__PURE__ */ new Set(), B = [];
+    F.map((f) => ({
+      labelList: f.label.split(","),
+      item: f
+    })).forEach(({ item: f, labelList: k }) => {
+      k.forEach(($) => {
+        O.has($) || (O.add($), B.push({
           label: $,
-          color: v.color
+          color: f.color
         }));
       });
-    }), O({
-      formula1: Kn(B.map((v) => v.label)),
-      formula2: B.map((v) => v.color === He ? "" : v.color).join(",")
+    }), V({
+      formula1: Gn(B.map((f) => f.label)),
+      formula2: B.map((f) => f.color === He ? "" : f.color).join(",")
     });
-  }, [F, O, u, p, I]);
-  const ne = qt(async (T) => {
-    if (!De(T)) {
-      O == null || O({
+  }, [F, V, u, g, C]);
+  const ne = qt(async (O) => {
+    if (!De(O)) {
+      V == null || V({
         formula1: "",
-        formula2: c
+        formula2: d
       });
       return;
     }
-    m.getFormulaRefCheck(T) ? (O == null || O({
-      formula1: De(T) ? T : "",
-      formula2: c
-    }), V("")) : (O == null || O({
+    v.getFormulaRefCheck(O) ? (V == null || V({
+      formula1: De(O) ? O : "",
+      formula2: d
+    }), D("")) : (V == null || V({
       formula1: "",
-      formula2: c
-    }), S("="), V(y.t("dataValidation.validFail.formulaError")));
-  }), de = ut(null), [Se, me] = H(!1);
-  return rr((T) => {
-    var v;
-    ((v = de.current) == null ? void 0 : v.isClickOutSide(T)) && me(!1);
-  }), /* @__PURE__ */ z(Xe, { children: [
-    /* @__PURE__ */ _(K, { label: y.t("dataValidation.list.options"), children: /* @__PURE__ */ z(
+      formula2: d
+    }), m("="), D(y.t("dataValidation.validFail.formulaError")));
+  }), ce = ut(null), [Se, ve] = H(!1);
+  return ir((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,
       {
         value: u,
-        onChange: (T) => {
-          h(T), S(p), T === "1" && O({
-            formula1: p === "=" ? "" : p,
-            formula2: I.join(",")
+        onChange: (O) => {
+          h(O), m(g), O === "1" && V({
+            formula1: g === "=" ? "" : g,
+            formula2: C.join(",")
           });
         },
         children: [
@@ -447,57 +465,66 @@ function Qo(e) {
         ]
       }
     ) }),
-    u === "1" ? /* @__PURE__ */ z(Xe, { children: [
+    u === "1" ? /* @__PURE__ */ W(Xe, { children: [
       /* @__PURE__ */ _(
-        ar,
+        sr,
         {
-          initValue: d,
+          ref: ce,
+          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
+                            `,
+          initValue: c,
           unitId: n,
-          subUnitId: o,
+          subUnitId: i,
           isFocus: Se,
-          onChange: (T = "") => {
-            const B = (T != null ? T : "").trim();
-            b(B), ne(B);
-          },
-          errorText: A || k || void 0,
-          onFocus: () => me(!0),
+          errorText: P || N || void 0,
           isSupportAcrossSheet: !0,
-          ref: de
+          onFocus: () => ve(!0),
+          onChange: (O = "") => {
+            const B = (O != null ? O : "").trim();
+            b(B), ne(B);
+          }
         }
       ),
-      te.length > 0 && /* @__PURE__ */ _("div", { style: { marginTop: "12px" }, children: te.map((T) => /* @__PURE__ */ _(
-        Ln,
+      te.length > 0 && /* @__PURE__ */ _("div", { style: { marginTop: "12px" }, children: te.map((O) => /* @__PURE__ */ _(
+        kn,
         {
-          item: T,
-          commonProps: { onItemChange: ge },
+          item: O,
+          commonProps: { onItemChange: pe },
           style: { marginBottom: 12 }
         },
-        T.id
+        O.id
       )) })
-    ] }) : /* @__PURE__ */ _(K, { error: A, children: /* @__PURE__ */ z("div", { style: { marginTop: "-12px" }, children: [
+    ] }) : /* @__PURE__ */ _(K, { error: P, children: /* @__PURE__ */ W("div", { style: { marginTop: "-12px" }, children: [
       /* @__PURE__ */ _(
-        ro,
+        ri,
         {
           list: F,
           onListChange: x,
           rowHeight: 28,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
-          itemRender: (T) => /* @__PURE__ */ _(
-            Ln,
+          itemRender: (O) => /* @__PURE__ */ _(
+            kn,
             {
-              item: T,
+              item: O,
               commonProps: {
-                onItemChange: j,
+                onItemChange: Y,
                 onItemDelete: Z
               }
             },
-            T.id
+            O.id
           ),
           idKey: "id"
         }
       ),
-      /* @__PURE__ */ z(
+      /* @__PURE__ */ W(
         "a",
         {
           className: `
@@ -505,9 +532,9 @@ function Qo(e) {
                                   univer-rounded univer-p-1 univer-px-2 univer-text-sm univer-text-primary
                                   hover:univer-bg-primary-600/5
                                 `,
-          onClick: ce,
+          onClick: de,
           children: [
-            /* @__PURE__ */ _(Sr, { className: "univer-mr-1" }),
+            /* @__PURE__ */ _(Cr, { className: "univer-mr-1" }),
             y.t("dataValidation.list.add")
           ]
         }
@@ -515,61 +542,61 @@ function Qo(e) {
     ] }) })
   ] });
 }
-const ei = [
+const Qi = [
   [
-    Gn,
-    $o
+    Zn,
+    xi
   ],
   [
     Tt,
-    Fo
+    Ui
   ],
   [
-    dn,
-    Qo
+    cn,
+    Ji
   ],
   [
-    Zn,
-    xo
+    qn,
+    Fi
   ]
 ];
-var ti = Object.getOwnPropertyDescriptor, ni = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? ti(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
-}, ri = (e, t) => (r, n) => t(r, n, e);
-let ve = class {
+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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, no = (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", dn);
+    E(this, "formulaInput", cn);
     this.injector = e;
   }
 };
-ve = ni([
-  ri(0, M(we))
-], ve);
-var oi = Object.getOwnPropertyDescriptor, ii = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? oi(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
-}, kn = (e, t) => (r, n) => t(r, n, e);
+fe = to([
+  no(0, M(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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, Nn = (e, t) => (r, n) => t(r, n, e);
 let _e = class extends Re {
   constructor(t, r) {
     super();
-    E(this, "_open$", new On(!1));
-    E(this, "open$", this._open$.pipe(po()));
+    E(this, "_open$", new Tn(!1));
+    E(this, "open$", this._open$.pipe(hi()));
     E(this, "_activeRule");
-    E(this, "_activeRule$", new On(void 0));
+    E(this, "_activeRule$", new Tn(void 0));
     E(this, "activeRule$", this._activeRule$.asObservable());
     E(this, "_closeDisposable", null);
     this._univerInstanceService = t, this._sidebarService = r, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(W.UNIVER_SHEET).pipe(fn((n) => !n)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(j.UNIVER_SHEET).pipe(mn((n) => !n)).subscribe(() => {
         this.close();
       })
     ), this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((n) => {
-      n.id === bt && (n.visible || setTimeout(() => {
+      n.id === Mt && (n.visible || setTimeout(() => {
         this._sidebarService.sidebarOptions$.next({ visible: !1 });
       }));
     }));
@@ -600,42 +627,42 @@ let _e = class extends Re {
     this._activeRule = t, this._activeRule$.next(t);
   }
 };
-_e = ii([
-  kn(0, le),
-  kn(1, or)
+_e = io([
+  Nn(0, le),
+  Nn(1, or)
 ], _e);
-const Sn = "sheets-data-validation-ui.config", Mt = {};
-var ai = Object.getOwnPropertyDescriptor, si = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? ai(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, xe = (e, t) => (r, n) => t(r, n, e);
 let Ze = class extends Re {
-  constructor(e, t, r, n, o, i) {
-    super(), this._sheetInterceptorService = e, this._dataValidationModel = t, this._dataValidatorRegistryService = r, this._dialogService = n, this._localeService = o, this._sheetsDataValidationValidatorService = i, this._initEditorBridgeInterceptor();
+  constructor(e, t, r, n, i, o) {
+    super(), this._sheetInterceptorService = e, this._dataValidationModel = t, this._dataValidatorRegistryService = r, this._dialogService = n, this._localeService = i, this._sheetsDataValidationValidatorService = o, this._initEditorBridgeInterceptor();
   }
   _initEditorBridgeInterceptor() {
     this._sheetInterceptorService.writeCellInterceptor.intercept(
-      Ro,
+      wi,
       {
         handler: async (e, t, r) => {
-          const n = await e, { row: o, col: i, unitId: a, subUnitId: l } = t, s = this._dataValidationModel.getRuleIdByLocation(a, l, o, i), c = s ? this._dataValidationModel.getRuleById(a, l, s) : void 0;
+          const n = await e, { row: i, col: o, unitId: a, subUnitId: l } = t, s = this._dataValidationModel.getRuleIdByLocation(a, l, i, o), d = s ? this._dataValidationModel.getRuleById(a, l, s) : void 0;
           if (n === !1)
             return r(Promise.resolve(!1));
-          if (!c || c.errorStyle !== lt.STOP)
+          if (!d || d.errorStyle !== lt.STOP)
             return r(Promise.resolve(!0));
-          const u = this._dataValidatorRegistryService.getValidatorItem(c.type);
-          return !u || await this._sheetsDataValidationValidatorService.validatorCell(a, l, o, i) === je.VALID ? r(Promise.resolve(!0)) : (this._dialogService.open({
+          const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
+          return !u || await this._sheetsDataValidationValidatorService.validatorCell(a, l, i, o) === je.VALID ? r(Promise.resolve(!0)) : (this._dialogService.open({
             width: 368,
             title: {
               title: this._localeService.t("dataValidation.alert.title")
             },
             id: "reject-input-dialog",
             children: {
-              title: u.getRuleFinalError(c, { row: o, col: i, unitId: a, subUnitId: l })
+              title: u.getRuleFinalError(d, { row: i, col: o, unitId: a, subUnitId: l })
             },
             footer: {
-              title: En.createElement(
+              title: Dn.createElement(
                 ze,
                 {
                   variant: "primary",
@@ -663,7 +690,7 @@ let Ze = class extends Re {
         title: e
       },
       footer: {
-        title: En.createElement(
+        title: Dn.createElement(
           ze,
           {
             variant: "primary",
@@ -678,30 +705,30 @@ let Ze = class extends Re {
     });
   }
 };
-Ze = si([
-  xe(0, M(vn)),
+Ze = ao([
+  xe(0, M(fn)),
   xe(1, M(ee)),
   xe(2, M(ye)),
-  xe(3, io),
+  xe(3, oi),
   xe(4, M(se)),
   xe(5, M(Zr))
 ], Ze);
-var li = Object.getOwnPropertyDescriptor, ci = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? li(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, ue = (e, t) => (r, n) => t(r, n, e);
 const Ft = (e) => {
   if (e == null || typeof e == "boolean")
     return;
   if (typeof e == "number" || !Number.isNaN(+e))
-    return wn(Hn.format("yyyy-MM-dd HH:mm:ss", Number(e)));
-  const t = wn(e);
+    return Rn(Wn.format("yyyy-MM-dd HH:mm:ss", Number(e)));
+  const t = Rn(e);
   if (t.isValid())
     return t;
 };
-function di(e, t) {
-  const r = Eo(t);
+function co(e, t) {
+  const r = Mi(t);
   if (e === r)
     return t;
   switch (e) {
@@ -714,14 +741,14 @@ function di(e, t) {
   }
 }
 let Ae = class extends Re {
-  constructor(t, r, n, o, i, a, l, s, c, u, h) {
+  constructor(t, r, n, i, o, a, l, s, d, u, h) {
     super();
     E(this, "_activeDropdown");
-    E(this, "_activeDropdown$", new go());
+    E(this, "_activeDropdown$", new gi());
     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 = o, this._sheetsSelectionsService = i, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = c, this._injector = u, this._configService = h, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
+    this._univerInstanceService = t, this._dataValidatorRegistryService = r, this._zenZoneService = n, this._dataValidationModel = i, this._sheetsSelectionsService = o, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = d, this._injector = u, this._configService = h, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
   }
@@ -733,14 +760,14 @@ let Ae = class extends Re {
       this._zenVisible = t, t && this.hideDropdown();
     }));
   }
-  _getDropdownByCell(t, r, n, o) {
-    const i = t ? this._univerInstanceService.getUnit(t, W.UNIVER_SHEET) : this._univerInstanceService.getCurrentUnitForType(W.UNIVER_SHEET);
-    if (!i)
+  _getDropdownByCell(t, r, n, i) {
+    const o = t ? this._univerInstanceService.getUnit(t, j.UNIVER_SHEET) : this._univerInstanceService.getCurrentUnitForType(j.UNIVER_SHEET);
+    if (!o)
       return;
-    const a = r ? i.getSheetBySheetId(r) : i.getActiveSheet();
+    const a = r ? o.getSheetBySheetId(r) : o.getActiveSheet();
     if (!a)
       return;
-    const l = this._dataValidationModel.getRuleByLocation(i.getUnitId(), a.getSheetId(), n, o);
+    const l = this._dataValidationModel.getRuleByLocation(o.getUnitId(), a.getSheetId(), n, i);
     if (!l)
       return;
     const s = this._dataValidatorRegistryService.getValidatorItem(l.type);
@@ -753,215 +780,215 @@ let Ae = class extends Re {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   showDropdown(t) {
-    var b, y, g, f;
-    const { location: r } = t, { row: n, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = r;
+    var b, 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 c = this._sheetDataValidationModel.getRuleByLocation(i, a, n, o);
-    if (!c)
+    const d = this._sheetDataValidationModel.getRuleByLocation(o, a, n, i);
+    if (!d)
       return;
-    const u = this._dataValidatorRegistryService.getValidatorItem(c.type);
+    const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
     if (!(u != null && u.dropdownType))
       return;
     let h;
-    const d = async (m, I) => {
-      var P, L, O;
-      if (!m)
+    const c = async (v, C) => {
+      var A, L, V;
+      if (!v)
         return !0;
-      const w = m, C = s.getCell(n, o), R = w.format(I === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), D = (P = Hn.parseDate(R)) == null ? void 0 : P.v, k = I === "time" ? D % 1 : D, V = l.getStyles().getStyleByCell(C), A = (O = (L = V == null ? void 0 : V.n) == null ? void 0 : L.pattern) != null ? O : "";
-      return c.errorStyle !== lt.STOP || await u.validator({
-        value: k,
-        unitId: i,
+      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({
+        value: N,
+        unitId: o,
         subUnitId: a,
         row: n,
-        column: o,
+        column: i,
         worksheet: s,
         workbook: l,
         interceptValue: R.replace("Z", "").replace("T", " "),
         t: Ur.NUMBER
-      }, c) ? (await this._commandService.executeCommand(gt.id, {
+      }, d) ? (await this._commandService.executeCommand(pt.id, {
         visible: !1,
-        eventType: pt.Keyboard,
-        unitId: i,
+        eventType: gt.Keyboard,
+        unitId: o,
         keycode: ht.ESC
       }), await this._commandService.executeCommand(st.id, {
-        unitId: i,
+        unitId: o,
         subUnitId: a,
         range: {
-          startColumn: o,
-          endColumn: o,
+          startColumn: i,
+          endColumn: i,
           startRow: n,
           endRow: n
         },
         value: {
-          v: k,
+          v: N,
           t: 2,
           p: null,
           f: null,
           si: null,
           s: {
             n: {
-              pattern: di(I, A)
+              pattern: co(C, P)
             }
           }
         }
-      }), !0) : (this._injector.has(Ze) && this._injector.get(Ze).showReject(u.getRuleFinalError(c, { row: n, col: o, unitId: i, subUnitId: a })), !1);
+      }), !0) : (this._injector.has(Ze) && this._injector.get(Ze).showReject(u.getRuleFinalError(d, { row: n, col: i, unitId: o, subUnitId: a })), !1);
     };
-    let S;
+    let m;
     switch (u.dropdownType) {
-      case pe.DATE: {
-        const m = Q(s.getCellRaw(n, o)), I = Ft(m), w = !!((b = c.bizInfo) != null && b.showTime);
-        S = {
+      case ge.DATE: {
+        const v = Q(s.getCellRaw(n, i)), C = Ft(v), w = !!((b = d.bizInfo) != null && b.showTime);
+        m = {
           location: r,
           type: "datepicker",
           props: {
             showTime: w,
-            onChange: (C) => d(C, w ? "datetime" : "date"),
-            defaultValue: I,
+            onChange: (I) => c(I, w ? "datetime" : "date"),
+            defaultValue: C,
             patternType: "date"
           }
         };
         break;
       }
-      case pe.TIME: {
-        const m = Q(s.getCellRaw(n, o)), I = Ft(m);
-        S = {
+      case ge.TIME: {
+        const v = Q(s.getCellRaw(n, i)), C = Ft(v);
+        m = {
           location: r,
           type: "datepicker",
           props: {
-            onChange: (w) => d(w, "time"),
-            defaultValue: I,
+            onChange: (w) => c(w, "time"),
+            defaultValue: C,
             patternType: "time"
           }
         };
         break;
       }
-      case pe.DATETIME: {
-        const m = Q(s.getCellRaw(n, o)), I = Ft(m);
-        S = {
+      case ge.DATETIME: {
+        const v = Q(s.getCellRaw(n, i)), C = Ft(v);
+        m = {
           location: r,
           type: "datepicker",
           props: {
-            onChange: (w) => d(w, "datetime"),
-            defaultValue: I,
+            onChange: (w) => c(w, "datetime"),
+            defaultValue: C,
             patternType: "datetime"
           }
         };
         break;
       }
-      case pe.LIST:
-      case pe.MULTIPLE_LIST: {
-        const m = u.dropdownType === pe.MULTIPLE_LIST, I = async (V) => {
-          const A = Kn(V), P = {
-            unitId: i,
+      case ge.LIST:
+      case ge.MULTIPLE_LIST: {
+        const v = u.dropdownType === ge.MULTIPLE_LIST, C = async (D) => {
+          const P = Gn(D), A = {
+            unitId: o,
             subUnitId: a,
             range: {
-              startColumn: o,
-              endColumn: o,
+              startColumn: i,
+              endColumn: i,
               startRow: n,
               endRow: n
             },
             value: {
-              v: A,
+              v: P,
               p: null,
               f: null,
               si: null
             }
           };
-          return this._editorBridgeService.isVisible().visible && await this._commandService.executeCommand(gt.id, {
+          return this._editorBridgeService.isVisible().visible && await this._commandService.executeCommand(pt.id, {
             visible: !1,
-            eventType: pt.Keyboard,
-            unitId: i,
+            eventType: gt.Keyboard,
+            unitId: o,
             keycode: ht.ESC
-          }), this._commandService.executeCommand(st.id, P), !m;
-        }, w = (c == null ? void 0 : c.renderMode) === oe.CUSTOM || (c == null ? void 0 : c.renderMode) === void 0, C = u.getListWithColor(c, i, a), R = kt(s.getCellRaw(n, o)), D = () => {
+          }), 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 = () => {
           this._commandService.executeCommand(Fe.id, {
-            ruleId: c.uid
+            ruleId: d.uid
           }), h == null || h.dispose();
-        }, k = C.map((V) => ({
-          label: V.label,
-          value: V.label,
-          color: w || V.color ? V.color : "transparent"
+        }, N = I.map((D) => ({
+          label: D.label,
+          value: D.label,
+          color: w || D.color ? D.color : "transparent"
         }));
-        S = {
+        m = {
           location: r,
           type: "list",
           props: {
-            onChange: (V) => I(V),
-            options: k,
-            onEdit: D,
+            onChange: (D) => C(D),
+            options: N,
+            onEdit: T,
             defaultValue: R,
-            multiple: m,
-            showEdit: (g = (y = this._configService.getConfig(Sn)) == null ? void 0 : y.showEditOnDropdown) != null ? g : !0
+            multiple: v,
+            showEdit: (p = (y = this._configService.getConfig(Cn)) == null ? void 0 : y.showEditOnDropdown) != null ? p : !0
           }
         };
         break;
       }
-      case pe.CASCADE: {
-        S = {
+      case ge.CASCADE: {
+        m = {
           type: "cascader",
           props: {
-            onChange: (I) => {
+            onChange: (C) => {
               const w = {
-                unitId: i,
+                unitId: o,
                 subUnitId: a,
                 range: {
-                  startColumn: o,
-                  endColumn: o,
+                  startColumn: i,
+                  endColumn: i,
                   startRow: n,
                   endRow: n
                 },
                 value: {
-                  v: I.join("/"),
+                  v: C.join("/"),
                   p: null,
                   f: null,
                   si: null
                 }
               };
-              return this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(gt.id, {
+              return this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(pt.id, {
                 visible: !1,
-                eventType: pt.Keyboard,
-                unitId: i,
+                eventType: gt.Keyboard,
+                unitId: o,
                 keycode: ht.ESC
               }), this._commandService.syncExecuteCommand(st.id, w), !0;
             },
-            defaultValue: kt(s.getCellRaw(n, o)).split("/"),
-            options: JSON.parse((f = c.formula1) != null ? f : "[]")
+            defaultValue: kt(s.getCellRaw(n, i)).split("/"),
+            options: JSON.parse((S = d.formula1) != null ? S : "[]")
           },
           location: r
         };
         break;
       }
-      case pe.COLOR: {
-        S = {
+      case ge.COLOR: {
+        m = {
           type: "color",
           props: {
-            onChange: (I) => {
+            onChange: (C) => {
               const w = {
-                unitId: i,
+                unitId: o,
                 subUnitId: a,
                 range: {
-                  startColumn: o,
-                  endColumn: o,
+                  startColumn: i,
+                  endColumn: i,
                   startRow: n,
                   endRow: n
                 },
                 value: {
-                  v: I,
+                  v: C,
                   p: null,
                   f: null,
                   si: null
                 }
               };
-              return this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(gt.id, {
+              return this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(pt.id, {
                 visible: !1,
-                eventType: pt.Keyboard,
-                unitId: i,
+                eventType: gt.Keyboard,
+                unitId: o,
                 keycode: ht.ESC
               }), this._commandService.syncExecuteCommand(st.id, w), !0;
             },
-            defaultValue: kt(s.getCellRaw(n, o))
+            defaultValue: kt(s.getCellRaw(n, i))
           },
           location: r
         };
@@ -970,31 +997,31 @@ let Ae = class extends Re {
       default:
         throw new Error("[DataValidationDropdownManagerService]: unknown type!");
     }
-    if (h = this._cellDropdownManagerService.showDropdown(S), !h)
+    if (h = this._cellDropdownManagerService.showDropdown(m), !h)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
-    const p = new Nr();
-    p.add(h), p.add({
+    const g = new Nr();
+    g.add(h), g.add({
       dispose: () => {
-        var m, I;
-        (I = (m = this._activeDropdown) == null ? void 0 : m.onHide) == null || I.call(m);
+        var v, C;
+        (C = (v = this._activeDropdown) == null ? void 0 : v.onHide) == null || C.call(v);
       }
-    }), this._currentPopup = p;
+    }), this._currentPopup = g;
   }
   hideDropdown() {
     this._activeDropdown && (this._currentPopup && this._currentPopup.dispose(), this._currentPopup = null, this._activeDropdown = null, this._activeDropdown$.next(null));
   }
-  showDataValidationDropdown(t, r, n, o, i) {
-    const a = this._univerInstanceService.getUnit(t, W.UNIVER_SHEET);
+  showDataValidationDropdown(t, r, n, i, o) {
+    const a = this._univerInstanceService.getUnit(t, j.UNIVER_SHEET);
     if (!a)
       return;
     const l = a.getSheetBySheetId(r);
     if (!l)
       return;
-    const s = this._dataValidationModel.getRuleByLocation(a.getUnitId(), l.getSheetId(), n, o);
+    const s = this._dataValidationModel.getRuleByLocation(a.getUnitId(), l.getSheetId(), n, i);
     if (!s)
       return;
-    const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
-    if (!c || !c.dropdownType) {
+    const d = this._dataValidatorRegistryService.getValidatorItem(s.type);
+    if (!d || !d.dropdownType) {
       this.hideDropdown();
       return;
     }
@@ -1003,51 +1030,51 @@ let Ae = class extends Re {
         workbook: a,
         worksheet: l,
         row: n,
-        col: o,
+        col: i,
         unitId: t,
         subUnitId: r
       },
-      onHide: i
+      onHide: o
     });
   }
 };
-Ae = ci([
+Ae = lo([
   ue(0, le),
   ue(1, M(ye)),
-  ue(2, ir),
+  ue(2, ar),
   ue(3, M(ee)),
-  ue(4, M(dr)),
-  ue(5, M(Do)),
+  ue(4, M(ur)),
+  ue(5, M(Ei)),
   ue(6, M(ee)),
   ue(7, J),
-  ue(8, gr),
+  ue(8, vr),
   ue(9, M(we)),
   ue(10, ln)
 ], Ae);
-const bt = "DataValidationPanel", Fe = {
+const Mt = "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, o = e.get(_e), i = e.get(mn), a = e.get(le), l = e.get(or), s = ur(a);
+    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);
     if (!s) return !1;
-    const { unitId: c, subUnitId: u } = s, h = r ? i.getRuleById(c, u, r) : void 0;
-    o.open(), o.setActiveRule(h && {
-      unitId: c,
+    const { unitId: d, subUnitId: u } = s, h = r ? o.getRuleById(d, u, r) : void 0;
+    i.open(), i.setActiveRule(h && {
+      unitId: d,
       subUnitId: u,
       rule: h
     });
-    const d = l.open({
-      id: bt,
+    const c = l.open({
+      id: Mt,
       header: { title: n ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
-      children: { label: bt },
+      children: { label: Mt },
       width: 312,
-      onClose: () => o.close()
+      onClose: () => i.close()
     });
-    return o.setCloseDisposable(d), !0;
+    return i.setCloseDisposable(c), !0;
   }
-}, Cn = {
+}, In = {
   id: "data-validation.operation.close-validation-panel",
   type: nt.OPERATION,
   handler(e) {
@@ -1058,7 +1085,7 @@ const bt = "DataValidationPanel", Fe = {
   type: nt.OPERATION,
   handler(e) {
     const t = e.get(J), r = e.get(_e);
-    return r.open(), r.isOpen ? t.executeCommand(Cn.id) : t.executeCommand(Fe.id), !0;
+    return r.open(), r.isOpen ? t.executeCommand(In.id) : t.executeCommand(Fe.id), !0;
   }
 }, At = {
   type: nt.OPERATION,
@@ -1066,11 +1093,11 @@ const bt = "DataValidationPanel", Fe = {
   handler(e, t) {
     if (!t)
       return !1;
-    const r = e.get(Ae), { unitId: n, subUnitId: o, row: i, column: a } = t, l = r.activeDropdown, s = l == null ? void 0 : l.location;
-    return s && s.unitId === n && s.subUnitId === o && s.row === i && s.col === a || r.showDataValidationDropdown(
+    const r = e.get(Ae), { unitId: n, subUnitId: i, row: o, column: a } = t, l = r.activeDropdown, s = l == null ? void 0 : l.location;
+    return s && s.unitId === n && s.subUnitId === i && s.row === o && s.col === a || r.showDataValidationDropdown(
       n,
-      o,
       i,
+      o,
       a
     ), !0;
   }
@@ -1084,87 +1111,87 @@ const bt = "DataValidationPanel", Fe = {
   type: nt.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   handler(e) {
-    const t = e.get(le), r = ur(t);
+    const t = e.get(le), r = hr(t);
     if (!r) return !1;
-    const { workbook: n, worksheet: o } = r, i = qn(e), a = e.get(J), l = n.getUnitId(), s = o.getSheetId(), c = {
-      rule: i,
+    const { workbook: n, worksheet: i } = r, o = Jn(e), a = e.get(J), l = n.getUnitId(), s = i.getSheetId(), d = {
+      rule: o,
       unitId: l,
       subUnitId: s
     };
-    return a.syncExecuteCommand(un.id, c) ? (a.syncExecuteCommand(Fe.id, {
-      ruleId: i.uid,
+    return a.syncExecuteCommand(un.id, d) ? (a.syncExecuteCommand(Fe.id, {
+      ruleId: o.uid,
       isAdd: !0
     }), !0) : !1;
   }
 };
-var ui = Object.getOwnPropertyDescriptor, hi = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? ui(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, $e = (e, t) => (r, n) => t(r, n, e);
-const Me = "SHEET_DATA_VALIDATION_ALERT";
-let dt = class extends Re {
-  constructor(e, t, r, n, o, i) {
-    super(), this._hoverManagerService = e, this._cellAlertManagerService = t, this._univerInstanceService = r, this._localeService = n, this._zenZoneService = o, this._dataValidationModel = i, this._init();
+const be = "SHEET_DATA_VALIDATION_ALERT";
+let ct = 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();
   }
   _init() {
     this._initCellAlertPopup(), this._initZenService();
   }
   _initCellAlertPopup() {
-    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(sr(100)).subscribe((e) => {
+    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(lr(100)).subscribe((e) => {
       var t;
       if (e) {
-        const r = this._univerInstanceService.getUnit(e.location.unitId, W.UNIVER_SHEET), n = r.getSheetBySheetId(e.location.subUnitId);
+        const r = this._univerInstanceService.getUnit(e.location.unitId, j.UNIVER_SHEET), n = r.getSheetBySheetId(e.location.subUnitId);
         if (!n) return;
-        const o = this._dataValidationModel.getRuleByLocation(e.location.unitId, e.location.subUnitId, e.location.row, e.location.col);
-        if (!o) {
-          this._cellAlertManagerService.removeAlert(Me);
+        const i = this._dataValidationModel.getRuleByLocation(e.location.unitId, e.location.subUnitId, e.location.row, e.location.col);
+        if (!i) {
+          this._cellAlertManagerService.removeAlert(be);
           return;
         }
-        if (this._dataValidationModel.validator(o, { ...e.location, workbook: r, worksheet: n }) === je.INVALID) {
-          const a = this._cellAlertManagerService.currentAlert.get(Me), l = (t = a == null ? void 0 : a.alert) == null ? void 0 : t.location;
+        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;
           if (l && l.row === e.location.row && l.col === e.location.col && l.subUnitId === e.location.subUnitId && l.unitId === e.location.unitId) {
-            this._cellAlertManagerService.removeAlert(Me);
+            this._cellAlertManagerService.removeAlert(be);
             return;
           }
-          const s = this._dataValidationModel.getValidator(o.type);
+          const s = this._dataValidationModel.getValidator(i.type);
           if (!s) {
-            this._cellAlertManagerService.removeAlert(Me);
+            this._cellAlertManagerService.removeAlert(be);
             return;
           }
           this._cellAlertManagerService.showAlert({
-            type: To.ERROR,
+            type: Oi.ERROR,
             title: this._localeService.t("dataValidation.error.title"),
-            message: s == null ? void 0 : s.getRuleFinalError(o, e.location),
+            message: s == null ? void 0 : s.getRuleFinalError(i, e.location),
             location: e.location,
             width: 200,
             height: 74,
-            key: Me
+            key: be
           });
           return;
         }
       }
-      this._cellAlertManagerService.removeAlert(Me);
+      this._cellAlertManagerService.removeAlert(be);
     }));
   }
   _initZenService() {
     this.disposeWithMe(this._zenZoneService.visible$.subscribe((e) => {
-      e && this._cellAlertManagerService.removeAlert(Me);
+      e && this._cellAlertManagerService.removeAlert(be);
     }));
   }
 };
-dt = hi([
-  $e(0, M(Vo)),
-  $e(1, M(Oo)),
+ct = ho([
+  $e(0, M(Di)),
+  $e(1, M(Vi)),
   $e(2, le),
   $e(3, M(se)),
-  $e(4, ir),
+  $e(4, ar),
   $e(5, M(ee))
-], dt);
-var pi = Object.getOwnPropertyDescriptor, gi = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? pi(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+], 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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, xt = (e, t) => (r, n) => t(r, n, e);
 let qe = class extends Re {
   constructor(e, t, r) {
@@ -1172,80 +1199,80 @@ let qe = class extends Re {
   }
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
-    const e = () => ({ redos: [], undos: [] }), t = (n, o) => {
-      const { source: i, target: a, unitId: l, subUnitId: s } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = nn([i, a]), [h, d] = u.ranges, { mapFunc: S } = u, p = {
+    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 = {
         row: h.startRow,
         col: h.startColumn
-      }, b = Ao(h, d), y = new wt(), g = /* @__PURE__ */ new Set();
-      b.forEach((C) => {
-        const R = C.repeatStartCell, D = C.relativeRange, k = {
-          startRow: p.row,
-          startColumn: p.col,
-          endColumn: p.col,
-          endRow: p.row
-        }, V = {
+      }, b = Pi(h, c), y = new wt(), p = /* @__PURE__ */ new Set();
+      b.forEach((I) => {
+        const R = I.repeatStartCell, T = I.relativeRange, N = {
+          startRow: g.row,
+          startColumn: g.col,
+          endColumn: g.col,
+          endRow: g.row
+        }, D = {
           startRow: R.row,
           startColumn: R.col,
           endColumn: R.col,
           endRow: R.row
         };
-        Fr.foreach(D, (A, P) => {
+        Fr.foreach(T, (P, A) => {
           const L = Rt.getPositionRange(
             {
-              startRow: A,
-              startColumn: P,
-              endColumn: P,
-              endRow: A
+              startRow: P,
+              startColumn: A,
+              endColumn: A,
+              endRow: P
             },
-            k
-          ), { row: O, col: F } = S(L.startRow, L.startColumn), x = this._sheetDataValidationModel.getRuleIdByLocation(l, s, O, F) || "", j = Rt.getPositionRange(
+            N
+          ), { row: V, col: F } = m(L.startRow, L.startColumn), x = this._sheetDataValidationModel.getRuleIdByLocation(l, s, V, F) || "", Y = Rt.getPositionRange(
             {
-              startRow: A,
-              startColumn: P,
-              endColumn: P,
-              endRow: A
+              startRow: P,
+              startColumn: A,
+              endColumn: A,
+              endRow: P
             },
-            V
-          ), { row: Z, col: Y } = S(j.startRow, j.startColumn);
-          y.setValue(Z, Y, x), g.add(x);
+            D
+          ), { row: Z, col: X } = m(Y.startRow, Y.startColumn);
+          y.setValue(Z, X, x), p.add(x);
         });
       });
-      const f = Array.from(g).map((C) => ({ id: C, ranges: Gt(y, (R) => R === C) }));
-      c.addRangeRules(f);
-      const m = c.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: I, undoMutations: w } = Zt(l, s, m, this._injector, "patched", o === it.ONLY_FORMAT);
+      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);
       return {
         undos: w,
-        redos: I
+        redos: C
       };
     }, r = {
-      id: Jn,
+      id: Qn,
       onBeforeFillData: (n) => {
-        const { source: o, unitId: i, subUnitId: a } = n;
-        for (const l of o.rows)
-          for (const s of o.cols) {
-            const c = this._sheetDataValidationModel.getRuleByLocation(i, a, l, s);
-            if (c && c.type === G.CHECKBOX) {
-              this._autoFillService.setDisableApplyType(it.SERIES, !0);
+        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) {
+              this._autoFillService.setDisableApplyType(ot.SERIES, !0);
               return;
             }
           }
       },
-      onFillData: (n, o, i) => i === it.COPY || i === it.ONLY_FORMAT || i === it.SERIES ? t(n, i) : e(),
+      onFillData: (n, i, o) => o === ot.COPY || o === ot.ONLY_FORMAT || o === ot.SERIES ? t(n, o) : e(),
       onAfterFillData: () => {
       }
     };
     this.disposeWithMe(this._autoFillService.addHook(r));
   }
 };
-qe = gi([
-  xt(0, Po),
+qe = po([
+  xt(0, Ti),
   xt(1, M(ee)),
   xt(2, M(we))
 ], qe);
-var mi = Object.getOwnPropertyDescriptor, fi = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? mi(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, $t = (e, t) => (r, n) => t(r, n, e);
 let Je = class extends Re {
   constructor(t, r, n) {
@@ -1255,29 +1282,29 @@ let Je = class extends Re {
   }
   _initCopyPaste() {
     this._sheetClipboardService.addClipboardHook({
-      id: Jn,
+      id: Qn,
       onBeforeCopy: (t, r, n) => this._collect(t, r, n),
-      onPasteCells: (t, r, n, o) => {
-        const { copyType: i = Pn.COPY, pasteType: a } = o, { range: l } = t || {}, { range: s, unitId: c, subUnitId: u } = r;
-        return this._generateMutations(s, { copyType: i, pasteType: a, copyRange: l, unitId: c, subUnitId: u });
+      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 });
       }
     });
   }
   _collect(t, r, n) {
-    const o = new wt();
+    const i = new wt();
     this._copyInfo = {
       unitId: t,
       subUnitId: r,
-      matrix: o
+      matrix: i
     };
-    const i = this._injector.invoke((s) => yo(n, s, t, r));
-    if (!i)
+    const o = this._injector.invoke((s) => Ri(n, s, t, r));
+    if (!o)
       return;
-    const { rows: a, cols: l } = i;
-    a.forEach((s, c) => {
+    const { rows: a, cols: l } = o;
+    a.forEach((s, d) => {
       l.forEach((u, h) => {
-        const d = this._sheetDataValidationModel.getRuleIdByLocation(t, r, s, u);
-        o.setValue(c, h, d != null ? d : "");
+        const c = this._sheetDataValidationModel.getRuleIdByLocation(t, r, s, u);
+        i.setValue(d, h, c != null ? c : "");
       });
     });
   }
@@ -1285,43 +1312,43 @@ let Je = class extends Re {
   _generateMutations(t, r) {
     if (!this._copyInfo)
       return { redos: [], undos: [] };
-    if (r.copyType === Pn.CUT)
+    if (r.copyType === An.CUT)
       return this._copyInfo = null, { redos: [], undos: [] };
     if (!this._copyInfo || !this._copyInfo.matrix.getSizeOf() || !r.copyRange)
       return { redos: [], undos: [] };
     if ([
-      mt.SPECIAL_PASTE_COL_WIDTH,
-      mt.SPECIAL_PASTE_VALUE,
-      mt.SPECIAL_PASTE_FORMAT,
-      mt.SPECIAL_PASTE_FORMULA
+      vt.SPECIAL_PASTE_COL_WIDTH,
+      vt.SPECIAL_PASTE_VALUE,
+      vt.SPECIAL_PASTE_FORMAT,
+      vt.SPECIAL_PASTE_FORMULA
     ].includes(r.pasteType))
       return { redos: [], undos: [] };
-    const { unitId: o, subUnitId: i } = this._copyInfo;
-    if (r.unitId !== o || i !== r.subUnitId) {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(r.unitId, r.subUnitId).clone(), l = new wt(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = nn([r.copyRange, t]), d = An(c, u, !0), S = /* @__PURE__ */ new Map();
-      d.forEach(({ startRange: g }) => {
-        var f;
-        (f = this._copyInfo) == null || f.matrix.forValue((m, I, w) => {
-          const C = Rt.getPositionRange(
+    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 }) => {
+        var S;
+        (S = this._copyInfo) == null || S.matrix.forValue((v, C, w) => {
+          const I = Rt.getPositionRange(
             {
-              startRow: m,
-              endRow: m,
-              startColumn: I,
-              endColumn: I
+              startRow: v,
+              endRow: v,
+              startColumn: C,
+              endColumn: C
             },
-            g
-          ), R = `${i}-${w}`, D = this._sheetDataValidationModel.getRuleById(o, i, w);
-          !this._sheetDataValidationModel.getRuleById(r.unitId, r.subUnitId, R) && D && S.set(R, { ...D, uid: R });
-          const { row: k, col: V } = h(C.startRow, C.startColumn);
-          s.add(R), l.setValue(k, V, R);
+            p
+          ), R = `${o}-${w}`, T = this._sheetDataValidationModel.getRuleById(i, o, w);
+          !this._sheetDataValidationModel.getRuleById(r.unitId, r.subUnitId, R) && T && m.set(R, { ...T, uid: R });
+          const { row: N, col: D } = h(I.startRow, I.startColumn);
+          s.add(R), l.setValue(N, D, R);
         });
       });
-      const p = Array.from(s).map((g) => ({ id: g, ranges: Gt(l, (f) => f === g) }));
-      a.addRangeRules(p);
+      const g = Array.from(s).map((p) => ({ id: p, ranges: Gt(l, (S) => S === p) }));
+      a.addRangeRules(g);
       const { redoMutations: b, undoMutations: y } = Zt(
         r.unitId,
         r.subUnitId,
-        a.diffWithAddition(this._sheetDataValidationModel.getRules(r.unitId, r.subUnitId), S.values()),
+        a.diffWithAddition(this._sheetDataValidationModel.getRules(r.unitId, r.subUnitId), m.values()),
         this._injector,
         "patched",
         !1
@@ -1331,48 +1358,48 @@ let Je = class extends Re {
         undos: y
       };
     } else {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(o, i).clone(), l = new wt(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = nn([r.copyRange, t]);
-      An(c, u, !0).forEach(({ startRange: y }) => {
-        var g;
-        (g = this._copyInfo) == null || g.matrix.forValue((f, m, I) => {
+      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 }) => {
+        var p;
+        (p = this._copyInfo) == null || p.matrix.forValue((S, v, C) => {
           const w = Rt.getPositionRange(
             {
-              startRow: f,
-              endRow: f,
-              startColumn: m,
-              endColumn: m
+              startRow: S,
+              endRow: S,
+              startColumn: v,
+              endColumn: v
             },
             y
-          ), { row: C, col: R } = h(w.startRow, w.startColumn);
-          l.setValue(C, R, I), s.add(I);
+          ), { row: I, col: R } = h(w.startRow, w.startColumn);
+          l.setValue(I, R, C), s.add(C);
         });
       });
-      const S = Array.from(s).map((y) => ({ id: y, ranges: Gt(l, (g) => g === y) }));
-      a.addRangeRules(S);
-      const { redoMutations: p, undoMutations: b } = Zt(
-        o,
+      const m = Array.from(s).map((y) => ({ id: y, ranges: Gt(l, (p) => p === y) }));
+      a.addRangeRules(m);
+      const { redoMutations: g, undoMutations: b } = Zt(
         i,
-        a.diff(this._sheetDataValidationModel.getRules(o, i)),
+        o,
+        a.diff(this._sheetDataValidationModel.getRules(i, o)),
         this._injector,
         "patched",
         !1
       );
       return {
-        redos: p,
+        redos: g,
         undos: b
       };
     }
   }
 };
-Je = fi([
-  $t(0, Lo),
+Je = mo([
+  $t(0, Ai),
   $t(1, M(ee)),
   $t(2, M(we))
 ], Je);
-var vi = Object.getOwnPropertyDescriptor, _i = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? vi(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, Bt = (e, t) => (r, n) => t(r, n, e);
 let Qe = class extends Re {
   constructor(e, t, r) {
@@ -1385,7 +1412,7 @@ let Qe = class extends Re {
           workbookTypes: [tn],
           rangeTypes: [en],
           worksheetTypes: [Jt, Qt]
-        }) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"))), e.id === Qn.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
+        }) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"))), e.id === er.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
           workbookTypes: [tn],
           rangeTypes: [en],
           worksheetTypes: [Jt, Qt]
@@ -1394,69 +1421,69 @@ let Qe = class extends Re {
     );
   }
 };
-Qe = _i([
+Qe = _o([
   Bt(0, M(se)),
   Bt(1, J),
-  Bt(2, M(Mo))
+  Bt(2, M(yi))
 ], Qe);
-const Mr = "data-validation-single", br = "sheet.menu.data-validation";
-function Si(e) {
+const br = "data-validation-single", Mr = "sheet.menu.data-validation";
+function So(e) {
   return {
-    id: br,
-    type: pn.SUBITEMS,
-    icon: Mr,
+    id: Mr,
+    type: gn.SUBITEMS,
+    icon: br,
     tooltip: "dataValidation.title",
-    hidden$: ao(e, W.UNIVER_SHEET),
-    disabled$: ko(e, { workbookTypes: [tn], worksheetTypes: [Qt, Jt], rangeTypes: [en] })
+    hidden$: ai(e, j.UNIVER_SHEET),
+    disabled$: Li(e, { workbookTypes: [tn], worksheetTypes: [Qt, Jt], rangeTypes: [en] })
   };
 }
-function Ci(e) {
+function Co(e) {
   return {
     id: Fe.id,
     title: "dataValidation.panel.title",
-    type: pn.BUTTON
+    type: gn.BUTTON
   };
 }
-function Ii(e) {
+function Io(e) {
   return {
     id: Lt.id,
     title: "dataValidation.panel.add",
-    type: pn.BUTTON
+    type: gn.BUTTON
   };
 }
-const wi = {
-  [so.FORMULAS_INSERT]: {
-    [br]: {
+const wo = {
+  [si.FORMULAS_INSERT]: {
+    [Mr]: {
       order: 9,
-      menuItemFactory: Si,
+      menuItemFactory: So,
       [Fe.id]: {
         order: 0,
-        menuItemFactory: Ci
+        menuItemFactory: Co
       },
       [Lt.id]: {
         order: 1,
-        menuItemFactory: Ii
+        menuItemFactory: Io
       }
     }
   }
 };
-var Ri = Object.getOwnPropertyDescriptor, Er = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? Ri(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
-}, X = (e, t) => (r, n) => t(r, n, e);
+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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, z = (e, t) => (r, n) => t(r, n, e);
 const Dr = {
   tr: {
     size: 6,
     color: "#fe4b4b"
   }
 };
-let et = class extends cn {
-  constructor(e, t, r, n, o, i, a, l, s, c, u) {
-    super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = r, this._univerInstanceService = n, this._autoHeightController = o, this._dropdownManagerService = i, this._sheetDataValidationModel = a, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = c, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
+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();
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(wi);
+    this._menuManagerService.mergeMenu(wo);
   }
   _initDropdown() {
     this._editorBridgeService && this.disposeWithMe(this._editorBridgeService.visible$.subscribe((e) => {
@@ -1467,26 +1494,26 @@ let et = class extends cn {
       }
       const t = this._editorBridgeService.getEditCellState();
       if (t) {
-        const { unitId: n, sheetId: o, row: i, column: a } = t, l = this._univerInstanceService.getUniverSheetInstance(n);
+        const { unitId: n, sheetId: i, row: o, column: a } = t, l = this._univerInstanceService.getUniverSheetInstance(n);
         if (!l)
           return;
-        const s = this._sheetDataValidationModel.getRuleByLocation(n, o, i, a);
+        const s = this._sheetDataValidationModel.getRuleByLocation(n, i, o, a);
         if (!s)
           return;
-        const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
-        if (!(c != null && c.dropdownType))
+        const d = this._dataValidatorRegistryService.getValidatorItem(s.type);
+        if (!(d != null && d.dropdownType))
           return;
         const u = l.getActiveSheet();
         if (!u) return;
-        const h = this._dropdownManagerService.activeDropdown, d = h == null ? void 0 : h.location;
-        if (d && d.unitId === n && d.subUnitId === o && d.row === i && d.col === a)
+        const h = this._dropdownManagerService.activeDropdown, c = h == null ? void 0 : h.location;
+        if (c && c.unitId === n && c.subUnitId === i && c.row === o && c.col === a)
           return;
         this._dropdownManagerService.showDropdown(
           {
             location: {
               unitId: n,
-              subUnitId: o,
-              row: i,
+              subUnitId: i,
+              row: o,
               col: a,
               workbook: l,
               worksheet: u
@@ -1502,31 +1529,31 @@ let et = class extends cn {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        hr.CELL_CONTENT,
+        gr.CELL_CONTENT,
         {
-          effect: Wn.Style,
+          effect: jn.Style,
           // must be after numfmt
           priority: pr.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, r) => {
-            var g, f, m, I, w;
-            const { row: n, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(i, a, n, o);
-            if (!c)
+            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)
               return r(e);
-            const u = this._sheetDataValidationModel.getRuleById(i, a, c);
+            const u = this._sheetDataValidationModel.getRuleById(o, a, d);
             if (!u)
               return r(e);
-            const h = (g = this._dataValidationCacheService.getValue(i, a, n, o)) != null ? g : je.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), S = t.rawData;
-            let p;
+            const h = (p = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? p : je.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
+            let g;
             const b = {
               get value() {
-                var C;
-                return p !== void 0 || (p = (C = Q(S)) != null ? C : null), p;
+                var I;
+                return g !== void 0 || (g = (I = Q(m)) != null ? I : null), g;
               }
             }, y = {
               get value() {
-                var C;
-                return `${(C = b.value) != null ? C : ""}`;
+                var I;
+                return `${(I = b.value) != null ? I : ""}`;
               }
             };
             return r({
@@ -1536,57 +1563,57 @@ let et = class extends cn {
                 ...h === je.INVALID ? Dr : null
               },
               customRender: [
-                ...(f = e == null ? void 0 : e.customRender) != null ? f : [],
-                ...d != null && d.canvasRender ? [d.canvasRender] : []
+                ...(S = e == null ? void 0 : e.customRender) != null ? S : [],
+                ...c != null && c.canvasRender ? [c.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((m = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : m.isSkip) || ((I = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : I.call(d, u, b.value, t))
+                isSkip: ((v = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : v.isSkip) || ((C = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : C.call(c, u, b.value, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(u, y.value, {
+                ...c == null ? void 0 : c.getExtraStyle(u, y.value, {
                   get style() {
-                    const C = l.getStyles();
-                    return (typeof (e == null ? void 0 : e.s) == "string" ? C.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
+                    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) || {};
                   }
-                }, n, o)
+                }, n, i)
               },
               interceptorAutoHeight: () => {
-                var k, V, A, P, L, O;
-                const C = (V = (k = this._renderManagerService.getRenderById(i)) == null ? void 0 : k.with(yt).getSkeletonParam(a)) == null ? void 0 : V.skeleton;
-                if (!C)
+                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;
+                if (!I)
                   return;
-                const R = C.worksheet.getMergedCell(n, o), D = {
+                const R = I.worksheet.getMergedCell(n, i), T = {
                   data: e,
-                  style: C.getStyles().getStyleByCell(e),
-                  primaryWithCoord: C.getCellWithCoordByIndex((A = R == null ? void 0 : R.startRow) != null ? A : n, (P = R == null ? void 0 : R.startColumn) != null ? P : o),
-                  unitId: i,
+                  style: I.getStyles().getStyleByCell(e),
+                  primaryWithCoord: I.getCellWithCoordByIndex((P = R == null ? void 0 : R.startRow) != null ? P : n, (A = R == null ? void 0 : R.startColumn) != null ? A : i),
+                  unitId: o,
                   subUnitId: a,
                   row: n,
-                  col: o,
+                  col: i,
                   workbook: l,
                   worksheet: s
                 };
-                return (O = (L = d == null ? void 0 : d.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : O.call(L, D);
+                return (V = (L = c == null ? void 0 : c.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : V.call(L, T);
               },
               interceptorAutoWidth: () => {
-                var k, V, A, P, L, O;
-                const C = (V = (k = this._renderManagerService.getRenderById(i)) == null ? void 0 : k.with(yt).getSkeletonParam(a)) == null ? void 0 : V.skeleton;
-                if (!C)
+                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;
+                if (!I)
                   return;
-                const R = C.worksheet.getMergedCell(n, o), D = {
+                const R = I.worksheet.getMergedCell(n, i), T = {
                   data: e,
-                  style: C.getStyles().getStyleByCell(e),
-                  primaryWithCoord: C.getCellWithCoordByIndex((A = R == null ? void 0 : R.startRow) != null ? A : n, (P = R == null ? void 0 : R.startColumn) != null ? P : o),
-                  unitId: i,
+                  style: I.getStyles().getStyleByCell(e),
+                  primaryWithCoord: I.getCellWithCoordByIndex((P = R == null ? void 0 : R.startRow) != null ? P : n, (A = R == null ? void 0 : R.startColumn) != null ? A : i),
+                  unitId: o,
                   subUnitId: a,
                   row: n,
-                  col: o,
+                  col: i,
                   workbook: l,
                   worksheet: s
                 };
-                return (O = (L = d == null ? void 0 : d.canvasRender) == null ? void 0 : L.calcCellAutoWidth) == null ? void 0 : O.call(L, D);
+                return (V = (L = c == null ? void 0 : c.canvasRender) == null ? void 0 : L.calcCellAutoWidth) == null ? void 0 : V.call(L, T);
               },
               coverable: ((w = e == null ? void 0 : e.coverable) != null ? w : !0) && !(u.type === G.LIST || u.type === G.LIST_MULTIPLE)
             });
@@ -1599,8 +1626,8 @@ let et = class extends cn {
     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
-      fn((e) => e.source === "command"),
-      lr(100)
+      mn((e) => e.source === "command"),
+      dr(100)
     ).subscribe((e) => {
       if (e.length === 0)
         return;
@@ -1610,46 +1637,46 @@ let et = class extends cn {
         (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);
-        jn(r.redos, this._commandService);
+        Yn(r.redos, this._commandService);
       }
     });
   }
 };
 et = Er([
-  X(0, J),
-  X(1, lo),
-  X(2, Ne),
-  X(3, le),
-  X(4, M(mr)),
-  X(5, M(Ae)),
-  X(6, M(ee)),
-  X(7, M(ye)),
-  X(8, M(vn)),
-  X(9, M(er)),
-  X(10, xr(gr))
+  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);
-let Nn = class extends cn {
-  constructor(e, t, r, n, o, i, a) {
-    super(), this._commandService = e, this._renderManagerService = t, this._autoHeightController = r, this._dataValidatorRegistryService = n, this._sheetInterceptorService = o, this._sheetDataValidationModel = i, this._dataValidationCacheService = a, this._initViewModelIntercept(), this._initAutoHeight();
+let Un = class extends dn {
+  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(
-        hr.CELL_CONTENT,
+        gr.CELL_CONTENT,
         {
-          effect: Wn.Style,
+          effect: jn.Style,
           // must be after numfmt
           priority: pr.DATA_VALIDATION,
           // eslint-disable-next-line complexity
           handler: (e, t, r) => {
-            var y, g, f, m, I;
-            const { row: n, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(i, a, n, o);
-            if (!c)
+            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)
               return r(e);
-            const u = this._sheetDataValidationModel.getRuleById(i, a, c);
+            const u = this._sheetDataValidationModel.getRuleById(o, a, d);
             if (!u)
               return r(e);
-            const h = (y = this._dataValidationCacheService.getValue(i, a, n, o)) != null ? y : je.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), S = s.getCellRaw(n, o), p = Q(S), b = `${p != null ? p : ""}`;
+            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 : ""}`;
             return r({
               ...e,
               markers: {
@@ -1657,41 +1684,41 @@ let Nn = class extends cn {
                 ...h === je.INVALID ? Dr : null
               },
               customRender: [
-                ...(g = e == null ? void 0 : e.customRender) != null ? g : [],
-                ...d != null && d.canvasRender ? [d.canvasRender] : []
+                ...(p = e == null ? void 0 : e.customRender) != null ? p : [],
+                ...c != null && c.canvasRender ? [c.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((f = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : f.isSkip) || ((m = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : m.call(d, u, p, t))
+                isSkip: ((S = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : S.isSkip) || ((v = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : v.call(c, u, g, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(u, b, {
+                ...c == null ? void 0 : c.getExtraStyle(u, b, {
                   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) || {};
                   }
-                }, n, o)
+                }, n, i)
               },
               interceptorAutoHeight: () => {
-                var D, k, V, A, P, L;
-                const w = (k = (D = this._renderManagerService.getRenderById(i)) == null ? void 0 : D.with(yt).getSkeletonParam(a)) == null ? void 0 : k.skeleton;
+                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;
                 if (!w)
                   return;
-                const C = w.worksheet.getMergedCell(n, o), R = {
+                const I = w.worksheet.getMergedCell(n, i), R = {
                   data: e,
                   style: w.getStyles().getStyleByCell(e),
-                  primaryWithCoord: w.getCellWithCoordByIndex((V = C == null ? void 0 : C.startRow) != null ? V : n, (A = C == null ? void 0 : C.startColumn) != null ? A : o),
-                  unitId: i,
+                  primaryWithCoord: w.getCellWithCoordByIndex((D = I == null ? void 0 : I.startRow) != null ? D : n, (P = I == null ? void 0 : I.startColumn) != null ? P : i),
+                  unitId: o,
                   subUnitId: a,
                   row: n,
-                  col: o,
+                  col: i,
                   workbook: l,
                   worksheet: s
                 };
-                return (L = (P = d == null ? void 0 : d.canvasRender) == null ? void 0 : P.calcCellAutoHeight) == null ? void 0 : L.call(P, R);
+                return (L = (A = c == null ? void 0 : c.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : L.call(A, R);
               },
-              coverable: ((I = e == null ? void 0 : e.coverable) != null ? I : !0) && !(u.type === G.LIST || u.type === G.LIST_MULTIPLE)
+              coverable: ((C = e == null ? void 0 : e.coverable) != null ? C : !0) && !(u.type === G.LIST || u.type === G.LIST_MULTIPLE)
             });
           }
         }
@@ -1700,8 +1727,8 @@ let Nn = class extends cn {
   }
   _initAutoHeight() {
     this._sheetDataValidationModel.ruleChange$.pipe(
-      fn((e) => e.source === "command"),
-      lr(16)
+      mn((e) => e.source === "command"),
+      dr(16)
     ).subscribe((e) => {
       const t = [];
       if (e.forEach((r) => {
@@ -1709,25 +1736,25 @@ let Nn = class extends cn {
         (n = r.rule) != null && n.ranges && t.push(...r.rule.ranges);
       }), t.length) {
         const r = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
-        jn(r.redos, this._commandService);
+        Yn(r.redos, this._commandService);
       }
     });
   }
 };
-Nn = Er([
-  X(0, J),
-  X(1, Ne),
-  X(2, M(mr)),
-  X(3, M(ye)),
-  X(4, M(vn)),
-  X(5, M(ee)),
-  X(6, M(er))
-], Nn);
-var yi = Object.getOwnPropertyDescriptor, Mi = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? yi(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
-}, Un = (e, t) => (r, n) => t(r, n, e);
+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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, Fn = (e, t) => (r, n) => t(r, n, e);
 let Et = class extends Re {
   constructor(e, t, r) {
     super(), this._context = e, this._sheetDataValidationModel = t, this._sheetSkeletonManagerService = r, this._initSkeletonChange();
@@ -1738,25 +1765,25 @@ let Et = class extends Re {
       if (!t.length)
         return;
       const r = /* @__PURE__ */ new Set();
-      t.forEach((o) => {
-        r.add(o.subUnitId);
-      }), r.forEach((o) => {
-        var i;
-        (i = this._sheetSkeletonManagerService.getSkeletonParam(o)) == null || i.skeleton.makeDirty(!0);
+      t.forEach((i) => {
+        r.add(i.subUnitId);
+      }), r.forEach((i) => {
+        var o;
+        (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));
   }
 };
-Et = Mi([
-  Un(1, M(ee)),
-  Un(2, M(yt))
+Et = bo([
+  Fn(1, M(ee)),
+  Fn(2, M(yt))
 ], Et);
-function bi(e) {
-  var c;
-  const t = U(se), r = U(gn), { value: n, onChange: o, extraComponent: i } = e, [a, l] = H(!1), s = i ? r.get(i) : null;
-  return /* @__PURE__ */ z(Xe, { children: [
-    /* @__PURE__ */ z(
+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: [
+    /* @__PURE__ */ W(
       "div",
       {
         className: `
@@ -1765,21 +1792,21 @@ function bi(e) {
         onClick: () => l(!a),
         children: [
           t.t("dataValidation.panel.options"),
-          a ? /* @__PURE__ */ _(Ir, { className: "univer-ml-1 univer-text-[8px]" }) : /* @__PURE__ */ _(Cr, { className: "univer-ml-1 univer-text-[8px]" })
+          a ? /* @__PURE__ */ _(Ir, { className: "univer-ml-1 univer-text-[8px]" }) : /* @__PURE__ */ _(Sn, { className: "univer-ml-1 univer-text-[8px]" })
         ]
       }
     ),
-    a && /* @__PURE__ */ z(Xe, { children: [
-      s ? /* @__PURE__ */ _(s, { value: n, onChange: o }) : null,
+    a && /* @__PURE__ */ W(Xe, { children: [
+      s ? /* @__PURE__ */ _(s, { value: n, onChange: i }) : null,
       /* @__PURE__ */ _(
         K,
         {
           label: t.t("dataValidation.panel.invalid"),
-          children: /* @__PURE__ */ z(
+          children: /* @__PURE__ */ W(
             hn,
             {
-              value: `${(c = n.errorStyle) != null ? c : lt.WARNING}`,
-              onChange: (u) => o({ ...n, errorStyle: +u }),
+              value: `${(d = n.errorStyle) != null ? d : lt.WARNING}`,
+              onChange: (u) => i({ ...n, errorStyle: +u }),
               children: [
                 /* @__PURE__ */ _(Oe, { value: `${lt.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
                 /* @__PURE__ */ _(Oe, { value: `${lt.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
@@ -1796,7 +1823,7 @@ function bi(e) {
             Pt,
             {
               checked: n.showErrorMessage,
-              onChange: () => o({
+              onChange: () => i({
                 ...n,
                 showErrorMessage: !n.showErrorMessage
               }),
@@ -1805,44 +1832,44 @@ function bi(e) {
           )
         }
       ),
-      n.showErrorMessage ? /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(Ve, { value: n.error, onChange: (u) => o({ ...n, error: u }) }) }) : null
+      n.showErrorMessage ? /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(Ve, { value: n.error, onChange: (u) => i({ ...n, error: u }) }) }) : null
     ] })
   ] });
 }
-const Ei = (e) => Br(
-  async (t, r, n, o) => {
-    const i = await e.executeCommand(t, r, n);
-    o == null || o(i);
+const Eo = (e) => Br(
+  async (t, r, n, i) => {
+    const o = await e.executeCommand(t, r, n);
+    i == null || i(o);
   },
   1e3
 );
-function Di(e, t, r) {
-  var n, o, i, a;
-  return t ? ((o = (n = e.getUnit(t)) == null ? void 0 : n.getSheetBySheetName(r)) == null ? void 0 : o.getSheetId()) || "" : ((a = (i = e.getCurrentUnitForType(W.UNIVER_SHEET)) == null ? void 0 : i.getSheetBySheetName(r)) == null ? void 0 : a.getSheetId()) || "";
+function Do(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()) || "";
 }
-function Vi() {
-  var T, B;
-  const [e, t] = H(0), r = U(_e), n = Te(r.activeRule$, r.activeRule), { unitId: o, subUnitId: i, rule: a } = n || {}, l = a.uid, s = U(ye), c = U(le), u = U(gn), h = U(J), d = U(mn), S = U(se), [p, b] = H(a), y = s.getValidatorItem(p.type), [g, f] = H(!1), m = s.getValidatorsByScope(uo.SHEET), [I, w] = H(() => p.ranges.map((v) => ({ unitId: "", sheetId: "", range: v }))), C = ct(() => Ei(h), [h]), [R, D] = H(!1), [k, V] = H(!1), A = ut(null), P = U(dr);
+function Vo() {
+  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);
   if (Pe(() => () => {
-    const v = P.getCurrentLastSelection();
-    v && P.setSelections([v]);
-  }, [P]), Pe(() => {
-    h.onCommandExecuted((v) => {
-      (v.id === Hr.id || v.id === Wr.id) && setTimeout(() => {
-        const N = d.getRuleById(o, i, l);
-        t(($) => $ + 1), N && (b(N), w(N.ranges.map(($) => ({ unitId: "", sheetId: "", range: $ }))));
+    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: $ }))));
       }, 20);
     });
-  }, [h, d, l, i, o]), !y)
+  }, [h, c, l, o, i]), !y)
     return null;
-  const L = y.operators, O = y.operatorNames, F = p.operator ? ho.includes(p.operator) : !1, x = () => {
-    var v, N, $;
-    (N = (v = A.current) == null ? void 0 : v.editor) != null && N.isFocus() && j(($ = A.current) == null ? void 0 : $.getValue()), !(!p.ranges.length || R) && (y.validatorFormula(p, o, i).success ? r.setActiveRule(null) : f(!0));
-  }, j = qt((v) => {
-    const N = v.split(",").filter(Boolean).map(Uo).map((q) => {
-      const In = q.sheetName;
-      if (In) {
-        const Pr = Di(c, q.unitId, In);
+  const L = y.operators, V = y.operatorNames, F = g.operator ? ui.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 };
       }
       return {
@@ -1850,236 +1877,236 @@ function Vi() {
         sheetId: ""
       };
     });
-    if (jr(N, I))
+    if (jr(k, C))
       return;
-    w(N);
-    const $ = N.filter((q) => (!q.unitId || q.unitId === o) && (!q.sheetId || q.sheetId === i)).map((q) => q.range);
+    w(k);
+    const $ = k.filter((q) => (!q.unitId || q.unitId === i) && (!q.sheetId || q.sheetId === o)).map((q) => q.range);
     if (b({
-      ...p,
+      ...g,
       ranges: $
     }), $.length === 0)
       return;
     const Ce = {
-      unitId: o,
-      subUnitId: i,
+      unitId: i,
+      subUnitId: o,
       ruleId: l,
       ranges: $
     };
-    C(Qn.id, Ce);
-  }), Z = (v) => {
-    if (Rn(v, Vn(p)))
+    I(er.id, Ce);
+  }), Z = (f) => {
+    if (yn(f, On(g)))
       return;
     b({
-      ...p,
-      ...v
+      ...g,
+      ...f
     });
-    const N = {
-      unitId: o,
-      subUnitId: i,
+    const k = {
+      unitId: i,
+      subUnitId: o,
       ruleId: l,
-      setting: v
+      setting: f
     };
-    C(
-      yn.id,
-      N,
+    I(
+      bn.id,
+      k,
       void 0
     );
-  }, Y = async () => {
-    await h.executeCommand(tr.id, {
+  }, X = async () => {
+    await h.executeCommand(nr.id, {
       ruleId: l,
-      unitId: o,
-      subUnitId: i
+      unitId: i,
+      subUnitId: o
     }), r.setActiveRule(null);
   }, te = {
-    type: p.type,
-    operator: p.operator,
-    formula1: p.formula1,
-    formula2: p.formula2,
-    allowBlank: p.allowBlank
-  }, ge = (v) => {
-    const N = s.getValidatorItem(v);
-    if (!N)
+    type: g.type,
+    operator: g.operator,
+    formula1: g.formula1,
+    formula2: g.formula2,
+    allowBlank: g.allowBlank
+  }, pe = (f) => {
+    const k = s.getValidatorItem(f);
+    if (!k)
       return;
-    const $ = N.operators, Ce = d.getRuleById(o, i, l), q = v === (Ce == null ? void 0 : Ce.type) || v.includes("list") && (Ce != null && Ce.type.includes("list")) ? {
+    const $ = k.operators, Ce = c.getRuleById(i, o, l), q = f === (Ce == null ? void 0 : Ce.type) || f.includes("list") && (Ce != null && Ce.type.includes("list")) ? {
       ...Ce,
-      type: v
+      type: f
     } : {
-      ...p,
-      type: v,
+      ...g,
+      type: f,
       operator: $[0],
       formula1: void 0,
       formula2: void 0
     };
-    b(q), h.executeCommand(yn.id, {
-      unitId: o,
-      subUnitId: i,
-      ruleId: p.uid,
-      setting: Vn(q)
+    b(q), h.executeCommand(bn.id, {
+      unitId: i,
+      subUnitId: o,
+      ruleId: g.uid,
+      setting: On(q)
     });
-  }, ce = u.get(y.formulaInput), ne = ct(() => I.map((v) => fr(v.range)).join(","), []), de = Dn(p), Se = (v) => {
-    Rn(v, Dn(p)) || (b({
-      ...p,
-      ...v
-    }), C(
+  }, de = u.get(y.formulaInput), ne = dt(() => C.map((f) => fr(f.range)).join(","), []), ce = Vn(g), Se = (f) => {
+    yn(f, Vn(g)) || (b({
+      ...g,
+      ...f
+    }), I(
       qr.id,
       {
-        unitId: o,
-        subUnitId: i,
+        unitId: i,
+        subUnitId: o,
         ruleId: l,
-        options: v
+        options: f
       }
     ));
-  }, me = L.length && !p.operator;
-  return /* @__PURE__ */ z("div", { className: "univer-py-4", children: [
+  }, ve = L.length && !g.operator;
+  return /* @__PURE__ */ W("div", { className: "univer-py-4", children: [
     /* @__PURE__ */ _(
       K,
       {
-        label: S.t("dataValidation.panel.range"),
-        error: !p.ranges.length || R ? S.t("dataValidation.panel.rangeError") : "",
+        label: m.t("dataValidation.panel.range"),
+        error: !g.ranges.length || R ? m.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ _(
-          co,
+          di,
           {
-            selectorRef: A,
-            unitId: o,
-            subUnitId: i,
+            selectorRef: P,
+            unitId: i,
+            subUnitId: o,
             initialValue: ne,
-            onChange: (v, N) => {
+            onChange: (f, k) => {
               var $;
-              !k && (($ = A.current) != null && $.verify()) && j(N);
+              !N && (($ = P.current) != null && $.verify()) && Y(k);
             },
-            onFocusChange: (v, N) => {
+            onFocusChange: (f, k) => {
               var $;
-              V(v), !v && N && (($ = A.current) != null && $.verify()) && j(N);
+              D(f), !f && k && (($ = P.current) != null && $.verify()) && Y(k);
             },
-            onVerify: (v) => D(!v)
+            onVerify: (f) => T(!f)
           }
         )
       }
     ),
-    /* @__PURE__ */ _(K, { label: S.t("dataValidation.panel.type"), children: /* @__PURE__ */ _(
-      bn,
+    /* @__PURE__ */ _(K, { label: m.t("dataValidation.panel.type"), children: /* @__PURE__ */ _(
+      En,
       {
         className: "univer-w-full",
-        value: p.type,
-        options: (T = m == null ? void 0 : m.sort((v, N) => v.order - N.order)) == null ? void 0 : T.map((v) => ({
-          label: S.t(v.title),
-          value: v.id
+        value: g.type,
+        options: (O = v == null ? void 0 : v.sort((f, k) => f.order - k.order)) == null ? void 0 : O.map((f) => ({
+          label: m.t(f.title),
+          value: f.id
         })),
-        onChange: ge
+        onChange: pe
       }
     ) }),
-    L != null && L.length ? /* @__PURE__ */ _(K, { label: S.t("dataValidation.panel.operator"), children: /* @__PURE__ */ _(
-      bn,
+    L != null && L.length ? /* @__PURE__ */ _(K, { label: m.t("dataValidation.panel.operator"), children: /* @__PURE__ */ _(
+      En,
       {
         className: "univer-w-full",
-        value: `${p.operator}`,
+        value: `${g.operator}`,
         options: [
           {
             value: "",
-            label: S.t("dataValidation.operators.legal")
+            label: m.t("dataValidation.operators.legal")
           },
-          ...L.map((v, N) => ({
-            value: `${v}`,
-            label: O[N]
+          ...L.map((f, k) => ({
+            value: `${f}`,
+            label: V[k]
           }))
         ],
-        onChange: (v) => {
+        onChange: (f) => {
           Z({
             ...te,
-            operator: v
+            operator: f
           });
         }
       }
     ) }) : null,
-    ce && !me ? /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(
-      ce,
+    de && !ve ? /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(
+      de,
       {
         isTwoFormula: F,
         value: {
-          formula1: p.formula1,
-          formula2: p.formula2
+          formula1: g.formula1,
+          formula2: g.formula2
         },
-        onChange: (v) => {
+        onChange: (f) => {
           Z({
             ...te,
-            ...v
+            ...f
           });
         },
-        showError: g,
-        validResult: y.validatorFormula(p, o, i),
-        unitId: o,
-        subUnitId: i,
+        showError: p,
+        validResult: y.validatorFormula(g, i, o),
+        unitId: i,
+        subUnitId: o,
         ruleId: l
       },
-      e + p.type
+      e + g.type
     ) }) : null,
     /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(
       Pt,
       {
-        checked: (B = p.allowBlank) != null ? B : !0,
+        checked: (B = g.allowBlank) != null ? B : !0,
         onChange: () => {
-          var v;
+          var f;
           return Z({
             ...te,
-            allowBlank: !((v = p.allowBlank) == null || v)
+            allowBlank: !((f = g.allowBlank) == null || f)
           });
         },
-        children: S.t("dataValidation.panel.allowBlank")
+        children: m.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ _(bi, { value: de, onChange: Se, extraComponent: y.optionsInput }),
-    /* @__PURE__ */ z("div", { className: "univer-mt-5 univer-flex univer-flex-row univer-justify-end", children: [
-      /* @__PURE__ */ _(ze, { className: "univer-ml-3", onClick: Y, children: S.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ _(ze, { className: "univer-ml-3", variant: "primary", onClick: x, children: S.t("dataValidation.panel.done") })
+    /* @__PURE__ */ _(Mo, { value: ce, onChange: Se, extraComponent: y.optionsInput }),
+    /* @__PURE__ */ W("div", { className: "univer-mt-5 univer-flex univer-flex-row univer-justify-end", children: [
+      /* @__PURE__ */ _(ze, { className: "univer-ml-3", onClick: X, children: m.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ _(ze, { className: "univer-ml-3", variant: "primary", onClick: x, children: m.t("dataValidation.panel.done") })
     ] })
   ] });
 }
-const Oi = (e) => {
-  const { rule: t, onClick: r, unitId: n, subUnitId: o, disable: i } = e, a = U(ye), l = U(J), s = U(No), c = a.getValidatorItem(t.type), u = ut(void 0), [h, d] = H(!1), S = U(Yn), p = Te(S.currentTheme$), b = ct(() => {
-    var m;
-    const g = (m = p == null ? void 0 : p.loopColor2) != null ? m : "#49B811", f = new Yr(g).toRgb();
+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(() => {
+    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();
     return {
-      fill: `rgba(${f.r}, ${f.g}, ${f.b}, 0.1)`,
-      stroke: g
+      fill: `rgba(${C.r}, ${C.g}, ${C.b}, 0.1)`,
+      stroke: v
     };
-  }, [p]), y = (g) => {
-    l.executeCommand(tr.id, {
+  }, [g]), y = (p) => {
+    l.executeCommand(nr.id, {
       ruleId: t.uid,
       unitId: n,
-      subUnitId: o
-    }), g.stopPropagation();
+      subUnitId: i
+    }), p.stopPropagation();
   };
   return Pe(() => () => {
-    var g;
-    u.current && ((g = u.current) == null || g.forEach((f) => {
-      f && s.removeShape(f);
+    var p;
+    u.current && ((p = u.current) == null || p.forEach((S) => {
+      S && s.removeShape(S);
     }));
-  }, [s]), /* @__PURE__ */ z(
+  }, [s]), /* @__PURE__ */ W(
     "div",
     {
-      className: nr(
+      className: rr(
         `
                   univer-rounded-md univer-bg-secondary univer-relative univer--ml-2 univer--mr-2 univer-box-border
                   univer-flex univer-w-[287px] univer-cursor-pointer univer-flex-col univer-justify-between
                   univer-overflow-hidden univer-p-2 univer-pr-9
                 `,
         {
-          "hover:univer-bg-gray-50": !i,
-          "univer-opacity-50": i
+          "hover:univer-bg-gray-50": !o,
+          "univer-opacity-50": o
         }
       ),
       onClick: r,
       onMouseEnter: () => {
-        i || (d(!0), u.current = t.ranges.map((g) => s.addShape({
-          range: g,
+        o || (c(!0), u.current = t.ranges.map((p) => s.addShape({
+          range: p,
           style: b,
           primary: null
         })));
       },
       onMouseLeave: () => {
-        var g;
-        d(!1), (g = u.current) == null || g.forEach((f) => {
-          f && s.removeShape(f);
+        var p;
+        c(!1), (p = u.current) == null || p.forEach((S) => {
+          S && s.removeShape(S);
         }), u.current = void 0;
       },
       children: [
@@ -2090,7 +2117,7 @@ const Oi = (e) => {
                   univer-overflow-hidden univer-text-ellipsis univer-text-sm univer-font-medium univer-leading-[22px]
                   univer-text-black
                 `,
-            children: c == null ? void 0 : c.generateRuleName(t)
+            children: d == null ? void 0 : d.generateRuleName(t)
           }
         ),
         /* @__PURE__ */ _(
@@ -2099,7 +2126,7 @@ const Oi = (e) => {
             className: `
                   univer-text-secondary univer-overflow-hidden univer-text-ellipsis univer-text-xs univer-leading-[18px]
                 `,
-            children: t.ranges.map((g) => fr(g)).join(",")
+            children: t.ranges.map((p) => fr(p)).join(",")
           }
         ),
         h ? /* @__PURE__ */ _(
@@ -2118,100 +2145,100 @@ const Oi = (e) => {
     }
   );
 };
-function Ti(e) {
-  const t = U(ee), r = U(le), n = U(J), o = U(we), i = 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();
+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();
   Pe(() => {
-    s(t.getRules(h, d));
-    const f = t.ruleChange$.subscribe((m) => {
-      m.unitId === h && m.subUnitId === d && s(t.getRules(h, d));
+    s(t.getRules(h, c));
+    const S = t.ruleChange$.subscribe((v) => {
+      v.unitId === h && v.subUnitId === c && s(t.getRules(h, c));
     });
     return () => {
-      f.unsubscribe();
+      S.unsubscribe();
     };
-  }, [h, d, t]);
-  const S = async () => {
-    const f = qn(o), m = {
+  }, [h, c, t]);
+  const m = async () => {
+    const S = Jn(i), v = {
       unitId: h,
-      subUnitId: d,
-      rule: f
+      subUnitId: c,
+      rule: S
     };
-    await n.executeCommand(un.id, m), i.setActiveRule({
+    await n.executeCommand(un.id, v), o.setActiveRule({
       unitId: h,
-      subUnitId: d,
-      rule: f
+      subUnitId: c,
+      rule: S
     });
-  }, p = () => {
+  }, g = () => {
     n.executeCommand(Jr.id, {
       unitId: h,
-      subUnitId: d
+      subUnitId: c
     });
-  }, y = ((f) => {
-    const m = r.getCurrentUnitForType(W.UNIVER_SHEET), I = m.getActiveSheet(), w = m.getUnitId(), C = I.getSheetId();
-    return f.map((D) => bo(o, w, C, D.ranges) ? { ...D } : { ...D, disable: !0 });
-  })(l), g = y == null ? void 0 : y.some((f) => f.disable);
-  return /* @__PURE__ */ z("div", { className: "univer-pb-4", children: [
-    y == null ? void 0 : y.map((f) => {
-      var m;
+  }, y = ((S) => {
+    const v = r.getCurrentUnitForType(j.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__ */ _(
-        Oi,
+        Oo,
         {
           unitId: h,
-          subUnitId: d,
+          subUnitId: c,
           onClick: () => {
-            f.disable || i.setActiveRule({
+            S.disable || o.setActiveRule({
               unitId: h,
-              subUnitId: d,
-              rule: f
+              subUnitId: c,
+              rule: S
             });
           },
-          rule: f,
-          disable: (m = f.disable) != null ? m : !1
+          rule: S,
+          disable: (v = S.disable) != null ? v : !1
         },
-        f.uid
+        S.uid
       );
     }),
-    /* @__PURE__ */ z("div", { className: "univer-mt-4 univer-flex univer-flex-row univer-justify-end univer-gap-2", children: [
-      l.length && !g ? /* @__PURE__ */ _(ze, { onClick: p, children: a.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ _(ze, { variant: "primary", onClick: S, children: a.t("dataValidation.panel.add") })
+    /* @__PURE__ */ W("div", { className: "univer-mt-4 univer-flex univer-flex-row univer-justify-end univer-gap-2", children: [
+      l.length && !p ? /* @__PURE__ */ _(ze, { onClick: g, children: a.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ _(ze, { variant: "primary", onClick: m, children: a.t("dataValidation.panel.add") })
     ] })
   ] });
 }
-const Pi = () => {
+const Po = () => {
   const e = U(_e), t = Te(e.activeRule$, e.activeRule), r = U(le), n = Te(
-    () => r.getCurrentTypeOfUnit$(W.UNIVER_SHEET),
+    () => r.getCurrentTypeOfUnit$(j.UNIVER_SHEET),
     void 0,
     void 0,
     []
-  ), o = Te(() => {
-    var i;
-    return (i = n == null ? void 0 : n.activeSheet$) != null ? i : mo(null);
+  ), i = Te(() => {
+    var o;
+    return (o = n == null ? void 0 : n.activeSheet$) != null ? o : pi(null);
   }, void 0, void 0, []);
-  return !n || !o ? null : t && t.subUnitId === o.getSheetId() ? /* @__PURE__ */ _(Vi, {}, t.rule.uid) : /* @__PURE__ */ _(Ti, { workbook: n });
-}, Ai = "LIST_RENDER_MODE_OPTION_INPUT";
+  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) {
-  var o;
+  var i;
   const { value: t, onChange: r } = e, n = U(se);
-  return /* @__PURE__ */ _(K, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ z(hn, { value: `${(o = t.renderMode) != null ? o : oe.CUSTOM}`, onChange: (i) => r({ ...t, renderMode: +i }), children: [
-    /* @__PURE__ */ _(Oe, { value: `${oe.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
-    /* @__PURE__ */ _(Oe, { value: `${oe.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
-    /* @__PURE__ */ _(Oe, { value: `${oe.TEXT}`, children: n.t("dataValidation.renderMode.text") })
+  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: [
+    /* @__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 = Ai;
-const Li = "DATE_SHOW_TIME_OPTION";
+Dt.componentKey = Ao;
+const Lo = "DATE_SHOW_TIME_OPTION";
 function Vt(e) {
-  var o;
+  var i;
   const { value: t, onChange: r } = e, n = U(se);
   return /* @__PURE__ */ _(K, { children: /* @__PURE__ */ _(
     Pt,
     {
-      checked: (o = t.bizInfo) == null ? void 0 : o.showTime,
-      onChange: (i) => {
+      checked: (i = t.bizInfo) == null ? void 0 : i.showTime,
+      onChange: (o) => {
         r({
           ...t,
           bizInfo: {
             ...t.bizInfo,
-            showTime: i
+            showTime: o
           }
         });
       },
@@ -2219,41 +2246,41 @@ function Vt(e) {
     }
   ) });
 }
-Vt.componentKey = Li;
-var ki = Object.getOwnPropertyDescriptor, Ni = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? ki(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, Be = (e, t) => (r, n) => t(r, n, e);
-const ft = 6;
+const mt = 6;
 let rn = class {
-  constructor(e, t, r, n, o, i) {
-    this._commandService = e, this._univerInstanceService = t, this._formulaService = r, this._themeService = n, this._renderManagerService = o, this._dataValidationModel = i;
+  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 c, u, h;
-    const { vt: r, ht: n } = t || {}, o = e.endX - e.startX - ft * 2, i = e.endY - e.startY, a = ((c = t == null ? void 0 : t.fs) != null ? c : 10) * 1.6;
+    var d, u, h;
+    const { vt: r, ht: n } = t || {}, i = e.endX - e.startX - mt * 2, o = e.endY - e.startY, a = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
     let l = 0, s = 0;
     switch (r) {
       case ae.TOP:
         s = 0;
         break;
       case ae.BOTTOM:
-        s = 0 + (i - a);
+        s = 0 + (o - a);
         break;
       default:
-        s = 0 + (i - a) / 2;
+        s = 0 + (o - a) / 2;
         break;
     }
     switch (n) {
       case Ye.LEFT:
-        l = ft;
+        l = mt;
         break;
       case Ye.RIGHT:
-        l = ft + (o - a);
+        l = mt + (i - a);
         break;
       default:
-        l = ft + (o - a) / 2;
+        l = mt + (i - a) / 2;
         break;
     }
     return {
@@ -2274,28 +2301,25 @@ let rn = class {
     return ((r = t == null ? void 0 : t.fs) != null ? r : 10) * 1.6;
   }
   async _parseFormula(e, t, r) {
-    var c, u, h, d, S, p, b, y, g;
-    const { formula1: n = to, formula2: o = eo } = e, i = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Nt((h = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Nt((p = (S = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : S[0]) == null ? void 0 : p[0]), s = Mn(String(a)) && Mn(String(l));
+    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));
     return {
-      formula1: De(n) ? Nt((g = (y = (b = i == null ? void 0 : i[0]) == null ? void 0 : b.result) == null ? void 0 : y[0]) == null ? void 0 : g[0]) : n,
-      formula2: De(o) ? l : o,
+      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,
+      formula2: De(i) ? l : i,
       isFormulaValid: s
     };
   }
   drawWith(e, t) {
-    var P, L, O, F;
-    const { style: r, primaryWithCoord: n, unitId: o, subUnitId: i, worksheet: a, row: l, col: s } = t, c = n.isMergedMainCell ? n.mergeInfo : n, u = Q(a.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(o, i, l, s);
+    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);
     if (!h)
       return;
-    const d = this._dataValidationModel.getValidator(h.type);
-    if (!d)
-      return;
-    const S = this._themeService.getCurrentTheme();
-    if (!((P = d.skipDefaultFontRender) != null && P.call(d, h, u, { unitId: o, subUnitId: i, row: l, column: s })))
+    const c = this._dataValidationModel.getValidator(h.type);
+    if (!c || !((P = c.skipDefaultFontRender) != null && P.call(c, h, u, { unitId: i, subUnitId: o, row: l, column: s })))
       return;
-    const p = d.parseFormulaSync(h, o, i), { formula1: b } = p, y = this._calc(c, r), { a: g, d: f } = e.getTransform(), m = Tn(y.left, g), I = Tn(y.top, f), w = fo.create().composeMatrix({
-      left: m,
-      top: I,
+    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({
+      left: S,
+      top: v,
       scaleX: 1,
       scaleY: 1,
       angle: 0,
@@ -2303,33 +2327,33 @@ let rn = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), C = c.endX - c.startX, R = c.endY - c.startY;
-    e.save(), e.beginPath(), e.rect(c.startX, c.startY, C, R), e.clip();
-    const D = w.getMatrix();
-    e.transform(D[0], D[1], D[2], D[3], D[4], D[5]);
-    const k = ((L = r == null ? void 0 : r.fs) != null ? L : 10) * 1.6, V = String(u) === String(b), A = S.hyacinth500;
-    vo.drawWith(e, {
-      checked: V,
-      width: k,
-      height: k,
-      fill: (F = (O = r == null ? void 0 : r.cl) == null ? void 0 : O.rgb) != null ? F : A
+    }), w = d.endX - d.startX, I = d.endY - d.startY;
+    e.save(), e.beginPath(), e.rect(d.startX, d.startY, w, I), e.clip();
+    const R = C.getMatrix();
+    e.transform(R[0], R[1], R[2], R[3], R[4], R[5]);
+    const T = ((A = r == null ? void 0 : r.fs) != null ? A : 10) * 1.6, N = String(u) === String(g), D = this._themeService.getColorFromTheme("primary.600");
+    mi.drawWith(e, {
+      checked: N,
+      width: T,
+      height: T,
+      fill: (V = (L = r == null ? void 0 : r.cl) == null ? void 0 : L.rgb) != null ? V : D
     }), e.restore();
   }
   isHit(e, t) {
-    const r = t.primaryWithCoord.isMergedMainCell ? t.primaryWithCoord.mergeInfo : t.primaryWithCoord, n = this._calc(r, t.style), o = n.top, i = n.top + n.height, a = n.left, l = n.left + n.width, { x: s, y: c } = e;
-    return s <= l && s >= a && c <= i && c >= o;
+    const r = t.primaryWithCoord.isMergedMainCell ? t.primaryWithCoord.mergeInfo : t.primaryWithCoord, n = this._calc(r, t.style), i = n.top, o = n.top + n.height, a = n.left, l = n.left + n.width, { x: s, y: d } = e;
+    return s <= l && s >= a && d <= o && d >= i;
   }
   async onPointerDown(e, t) {
-    var p;
+    var g;
     if (t.button === 2)
       return;
-    const { primaryWithCoord: r, unitId: n, subUnitId: o, worksheet: i, row: a, col: l } = e, s = Q(i.getCellRaw(a, l)), c = this._dataValidationModel.getRuleByLocation(n, o, a, l);
-    if (!c)
+    const { primaryWithCoord: r, unitId: n, subUnitId: i, worksheet: o, row: a, col: l } = e, s = Q(o.getCellRaw(a, l)), d = this._dataValidationModel.getRuleByLocation(n, i, a, l);
+    if (!d)
       return;
-    const u = this._dataValidationModel.getValidator(c.type);
-    if (!u || !((p = u.skipDefaultFontRender) != null && p.call(u, c, s, { unitId: n, subUnitId: o, row: a, column: l })))
+    const u = this._dataValidationModel.getValidator(d.type);
+    if (!u || !((g = u.skipDefaultFontRender) != null && g.call(u, d, s, { unitId: n, subUnitId: i, row: a, column: l })))
       return;
-    const { formula1: h, formula2: d } = await this._parseFormula(c, n, o), S = {
+    const { formula1: h, formula2: c } = await this._parseFormula(d, n, i), m = {
       range: {
         startColumn: r.actualColumn,
         endColumn: r.actualColumn,
@@ -2337,124 +2361,124 @@ let rn = class {
         endRow: r.actualRow
       },
       value: {
-        v: String(s) === no(String(h)) ? d : h,
+        v: String(s) === ni(String(h)) ? c : h,
         p: null
       }
     };
     this._commandService.executeCommand(
       st.id,
-      S
+      m
     );
   }
   onPointerEnter(e, t) {
     var r, n;
-    (n = (r = Ke(W.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.POINTER);
+    (n = (r = Ke(j.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(W.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.DEFAULT);
+    (n = (r = Ke(j.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.DEFAULT);
   }
 };
-rn = Ni([
+rn = No([
   Be(0, J),
   Be(1, le),
   Be(2, M(Qr)),
-  Be(3, M(Yn)),
+  Be(3, M(Xn)),
   Be(4, M(Ne)),
   Be(5, M(ee))
 ], rn);
-class Ui extends ve {
+class Uo extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.CHECKBOX);
     E(this, "canvasRender", this.injector.createInstance(rn));
-    E(this, "formulaInput", Zn);
+    E(this, "formulaInput", qn);
   }
 }
-class Fi extends ve {
+class Fo extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.CUSTOM);
-    E(this, "formulaInput", Gn);
+    E(this, "formulaInput", Zn);
   }
 }
-const xi = "data-validation.formula-input";
-class $i extends ve {
+const xo = "data-validation.formula-input";
+class $o extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.DATE);
-    E(this, "formulaInput", xi);
+    E(this, "formulaInput", xo);
     E(this, "optionsInput", Vt.componentKey);
-    E(this, "dropdownType", pe.DATE);
+    E(this, "dropdownType", ge.DATE);
   }
 }
-class Bi extends ve {
+class Bo extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.DECIMAL);
     E(this, "formulaInput", Tt);
   }
 }
-const Vr = 4, Hi = 0, Ht = 4, Or = 4, on = 6, Ot = 6, Ee = 14;
-function Wi(e, t) {
-  const r = _o.getTextSize(e, t), n = r.width + Vr * 2, { ba: o, bd: i } = r, a = o + i;
+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;
   return {
     width: n,
-    height: a + Hi * 2,
-    ba: o
+    height: a + Ho * 2,
+    ba: i
   };
 }
 function Wt(e, t, r, n) {
-  const o = Ee + on * 2, i = r - o, a = n - Ot * 2, l = e.map((d) => ({
-    layout: Wi(d, t),
-    text: d
+  const i = Ee + on * 2, o = r - i, a = n - Ot * 2, l = e.map((c) => ({
+    layout: Wo(c, t),
+    text: c
   }));
   let s;
-  const c = [];
-  l.forEach((d) => {
-    const { layout: S } = d, { width: p, height: b } = S;
-    !s || s.width + p + Ht > i ? (s = {
-      width: p,
+  const d = [];
+  l.forEach((c) => {
+    const { layout: m } = c, { width: g, height: b } = m;
+    !s || s.width + g + Ht > o ? (s = {
+      width: g,
       height: b,
       items: [{
-        ...d,
+        ...c,
         left: 0
       }]
-    }, c.push(s)) : (s.items.push({
-      ...d,
+    }, d.push(s)) : (s.items.push({
+      ...c,
       left: s.width + Ht
-    }), s.width = s.width + p + Ht);
+    }), s.width = s.width + g + Ht);
   });
   let u = 0, h = 0;
-  return c.forEach((d, S) => {
-    h = Math.max(h, d.width), S === c.length - 1 ? u += d.height : u += d.height + Or;
+  return d.forEach((c, m) => {
+    h = Math.max(h, c.width), m === d.length - 1 ? u += c.height : u += c.height + Or;
   }), {
-    lines: c,
+    lines: d,
     totalHeight: u,
-    contentWidth: i,
+    contentWidth: o,
     contentHeight: a,
     cellAutoHeight: u + Ot * 2,
-    calcAutoWidth: h + o
+    calcAutoWidth: h + i
   };
 }
-const ji = 8;
-class Yi extends So {
+const jo = 8;
+class Yo extends _i {
   static drawWith(t, r) {
-    const { fontString: n, info: o, fill: i, color: a } = r, { layout: l, text: s } = o;
+    const { fontString: n, info: i, fill: o, color: a } = r, { layout: l, text: s } = i;
     t.save(), cr.drawWith(t, {
       width: l.width,
       height: l.height,
-      radius: ji,
-      fill: i || He
+      radius: jo,
+      fill: o || He
     }), t.translateWithPrecision(Vr, l.ba), t.font = n, t.fillStyle = a, t.fillText(s, 0, 0), t.restore();
   }
 }
-var Xi = Object.getOwnPropertyDescriptor, zi = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? Xi(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
-}, vt = (e, t) => (r, n) => t(r, n, e);
-const Ki = 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");
+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--)
+    (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 {
   constructor(e, t, r, n) {
     E(this, "zIndex");
@@ -2468,10 +2492,10 @@ let an = class {
   _generateKey(e, t) {
     return `${e}.${t}`;
   }
-  _drawDownIcon(e, t, r, n, o) {
-    const i = r - Ee + 4;
+  _drawDownIcon(e, t, r, n, i) {
+    const o = r - Ee + 4;
     let a = 4;
-    switch (o) {
+    switch (i) {
       case ae.MIDDLE:
         a = (n - Ee) / 2 + 4;
         break;
@@ -2479,137 +2503,137 @@ let an = class {
         a = n - Ee + 4;
         break;
     }
-    e.save(), e.translateWithPrecision(t.startX + i, t.startY + a), e.fillStyle = "#565656", e.fill(Ki), e.restore();
+    e.save(), e.translateWithPrecision(t.startX + o, t.startY + a), e.fillStyle = "#565656", e.fill(Ko), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, r, n) {
-    var Z, Y;
-    const { primaryWithCoord: o, row: i, col: a, style: l, data: s, subUnitId: c } = t, u = o.isMergedMainCell ? o.mergeInfo : o, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: d = 0, rightOffset: S = 0, topOffset: p = 0, downOffset: b = 0 } = h || {}, y = this._ensureMap(c), g = this._generateKey(i, a), f = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, a);
-    if (!f)
+    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);
+    if (!S)
       return;
-    const m = this._dataValidationModel.getValidator(f.type);
-    if (!m)
+    const v = this._dataValidationModel.getValidator(S.type);
+    if (!v)
       return;
-    const I = {
-      startX: u.startX + d,
-      endX: u.endX - S,
-      startY: u.startY + p,
+    const C = {
+      startX: u.startX + c,
+      endX: u.endX - m,
+      startY: u.startY + g,
       endY: u.endY - b
-    }, w = I.endX - I.startX, C = I.endY - I.startY, { cl: R } = l || {}, D = (Z = typeof R == "object" ? R == null ? void 0 : R.rgb : R) != null ? Z : "#000", k = Ut(l != null ? l : void 0), { vt: V, ht: A } = l || {}, P = V != null ? V : ae.MIDDLE, L = (Y = Q(s)) != null ? Y : "", O = m.parseCellValue(L), F = m.getListWithColorMap(f), x = Wt(O, k, w, C);
-    this._drawDownIcon(e, I, w, C, P), e.save(), e.translateWithPrecision(I.startX, I.startY), e.beginPath(), e.rect(0, 0, w - Ee, C), e.clip(), e.translateWithPrecision(on, Ot);
-    let j = 0;
-    switch (P) {
+    }, 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;
+    switch (A) {
       case ae.MIDDLE:
-        j = (x.contentHeight - x.totalHeight) / 2;
+        Y = (x.contentHeight - x.totalHeight) / 2;
         break;
       case ae.BOTTOM:
-        j = x.contentHeight - x.totalHeight;
+        Y = x.contentHeight - x.totalHeight;
         break;
     }
-    e.translateWithPrecision(0, j), x.lines.forEach((te, ge) => {
+    e.translateWithPrecision(0, Y), x.lines.forEach((te, pe) => {
       e.save();
-      const { width: ce, height: ne, items: de } = te;
+      const { width: de, height: ne, items: ce } = te;
       let Se = 0;
-      switch (A) {
+      switch (P) {
         case Ye.RIGHT:
-          Se = x.contentWidth - ce;
+          Se = x.contentWidth - de;
           break;
         case Ye.CENTER:
-          Se = (x.contentWidth - ce) / 2;
+          Se = (x.contentWidth - de) / 2;
           break;
       }
-      e.translate(Se, ge * (ne + Or)), de.forEach((me) => {
-        e.save(), e.translateWithPrecision(me.left, 0), Yi.drawWith(e, {
-          ...k,
-          info: me,
-          color: D,
-          fill: F[me.text]
+      e.translate(Se, pe * (ne + Or)), ce.forEach((ve) => {
+        e.save(), e.translateWithPrecision(ve.left, 0), Yo.drawWith(e, {
+          ...N,
+          info: ve,
+          color: T,
+          fill: F[ve.text]
         }), e.restore();
       }), e.restore();
-    }), e.restore(), y.set(g, {
-      left: I.startX,
-      top: I.startY,
+    }), e.restore(), y.set(p, {
+      left: C.startX,
+      top: C.startY,
       width: x.contentWidth + on + Ee,
       height: x.contentHeight + Ot * 2
     });
   }
   calcCellAutoHeight(e) {
     var w;
-    const { primaryWithCoord: t, style: r, data: n, row: o, col: i } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, d = {
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
       startX: h.startX + l,
       endX: h.endX - s,
-      startY: h.startY + c,
+      startY: h.startY + d,
       endY: h.endY - u
-    }, S = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
-    if (!S)
+    }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
+    if (!m)
       return;
-    const p = this._dataValidationModel.getValidator(S.type);
-    if (!p)
+    const g = this._dataValidationModel.getValidator(m.type);
+    if (!g)
       return;
-    const b = d.endX - d.startX, y = d.endY - d.startY, g = (w = Q(n)) != null ? w : "", f = p.parseCellValue(g), m = Ut(r != null ? r : void 0);
-    return Wt(f, m, b, y).cellAutoHeight;
+    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;
   }
   calcCellAutoWidth(e) {
     var w;
-    const { primaryWithCoord: t, style: r, data: n, row: o, col: i } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, d = {
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
       startX: h.startX + l,
       endX: h.endX - s,
-      startY: h.startY + c,
+      startY: h.startY + d,
       endY: h.endY - u
-    }, S = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
-    if (!S)
+    }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
+    if (!m)
       return;
-    const p = this._dataValidationModel.getValidator(S.type);
-    if (!p)
+    const g = this._dataValidationModel.getValidator(m.type);
+    if (!g)
       return;
-    const b = d.endX - d.startX, y = d.endY - d.startY, g = (w = Q(n)) != null ? w : "", f = p.parseCellValue(g), m = Ut(r != null ? r : void 0);
-    return Wt(f, m, b, y).calcAutoWidth;
+    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;
   }
   isHit(e, t) {
-    const { primaryWithCoord: r } = t, n = r.isMergedMainCell ? r.mergeInfo : r, { endX: o } = n, { x: i } = e;
-    return i >= o - Ee && i <= o;
+    const { primaryWithCoord: r } = t, n = r.isMergedMainCell ? r.mergeInfo : r, { endX: i } = n, { x: o } = e;
+    return o >= i - Ee && o <= i;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
       return;
-    const { unitId: r, subUnitId: n, row: o, col: i } = e, a = {
+    const { unitId: r, subUnitId: n, row: i, col: o } = e, a = {
       unitId: r,
       subUnitId: n,
-      row: o,
-      column: i
+      row: i,
+      column: o
     };
     this._commandService.executeCommand(At.id, a);
   }
   onPointerEnter(e, t) {
     var r, n;
-    return (n = (r = Ke(W.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null ? void 0 : n.setCursor(Ge.POINTER);
+    return (n = (r = Ke(j.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(W.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null ? void 0 : n.setCursor(Ge.DEFAULT);
+    return (n = (r = Ke(j.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null ? void 0 : n.setCursor(Ge.DEFAULT);
   }
 };
-an = zi([
-  vt(0, J),
-  vt(1, le),
-  vt(2, M(Ne)),
-  vt(3, M(ee))
+an = zo([
+  ft(0, J),
+  ft(1, le),
+  ft(2, M(Ne)),
+  ft(3, M(ee))
 ], an);
-class Gi extends ve {
+class Go extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.LIST_MULTIPLE);
     E(this, "canvasRender", this.injector.createInstance(an));
-    E(this, "dropdownType", pe.MULTIPLE_LIST);
+    E(this, "dropdownType", ge.MULTIPLE_LIST);
   }
 }
-var Zi = Object.getOwnPropertyDescriptor, qi = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? Zi(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, at = (e, t) => (r, n) => t(r, n, e);
-const be = 4, _t = 4, he = 14, fe = 6, We = 4, jt = 8, Ji = "#565656", Fn = 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 Qi(e, t) {
+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 r = e.length;
   return {
     id: "d",
@@ -2650,33 +2674,33 @@ function Qi(e, t) {
   };
 }
 function Tr(e, t, r) {
-  const n = Qi(e, r), o = new Xr(n), i = new Io(o);
+  const n = Qo(e, r), i = new Xr(n), o = new Ci(i);
   return {
-    documentSkeleton: wo.create(i, t),
-    docModel: o,
-    docViewModel: i
+    documentSkeleton: Ii.create(o, t),
+    docModel: i,
+    docViewModel: o
   };
 }
 function St(e, t, r) {
   const {
     documentSkeleton: n,
-    docModel: o,
-    docViewModel: i
+    docModel: i,
+    docViewModel: o
   } = Tr(e, t, r);
   return {
-    documents: new Co(`DOCUMENTS_${Kt.generateRandomId()}`, n, {
+    documents: new Si(`DOCUMENTS_${Kt.generateRandomId()}`, n, {
       pageMarginLeft: 0,
       pageMarginTop: 0
     }),
     documentSkeleton: n,
-    docModel: o,
-    docViewModel: i
+    docModel: i,
+    docViewModel: o
   };
 }
-function xn(e, t, r, n, o, i, a = !0) {
+function $n(e, t, r, n, i, o, a = !0) {
   let l = 0;
   const s = a ? We : 0;
-  switch (o) {
+  switch (i) {
     case ae.BOTTOM:
       l = t - n - s;
       break;
@@ -2688,25 +2712,25 @@ function xn(e, t, r, n, o, i, a = !0) {
       break;
   }
   l = Math.max(We, l);
-  let c = 0;
-  switch (i) {
+  let d = 0;
+  switch (o) {
     case Ye.CENTER:
-      c = (e - r) / 2;
+      d = (e - r) / 2;
       break;
     case Ye.RIGHT:
-      c = e - r;
+      d = e - r;
       break;
   }
-  return c = Math.max(fe, c), {
-    paddingLeft: c,
+  return d = Math.max(me, d), {
+    paddingLeft: d,
     paddingTop: l
   };
 }
 let sn = class {
-  constructor(e, t, r, n, o) {
+  constructor(e, t, r, n, i) {
     E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     E(this, "zIndex");
-    this._univerInstanceService = e, this._localeService = t, this._commandService = r, this._renderManagerService = n, this._dataValidationModel = o;
+    this._univerInstanceService = e, this._localeService = t, this._commandService = r, this._renderManagerService = n, this._dataValidationModel = i;
   }
   _ensureMap(e) {
     let t = this._dropdownInfoMap.get(e);
@@ -2715,198 +2739,198 @@ let sn = class {
   _generateKey(e, t) {
     return `${e}.${t}`;
   }
-  _drawDownIcon(e, t, r, n, o, i, a) {
-    const { t: l = re.pd.t, b: s = re.pd.b } = a, c = r - he;
+  _drawDownIcon(e, t, r, n, i, o, a) {
+    const { t: l = re.pd.t, b: s = re.pd.b } = a, d = r - he;
     let u;
-    switch (i) {
+    switch (o) {
       case ae.MIDDLE:
         u = (n - _t) / 2;
         break;
       case ae.BOTTOM:
-        u = n - s - o - We + (o / 2 - _t / 2);
+        u = n - s - i - We + (i / 2 - _t / 2);
         break;
       default:
-        u = l + We + (o / 2 - _t / 2);
+        u = l + We + (i / 2 - _t / 2);
         break;
     }
-    e.save(), e.translateWithPrecision(t.startX + c, t.startY + u), e.fillStyle = "#565656", e.fill(Fn), e.restore();
+    e.save(), e.translateWithPrecision(t.startX + d, t.startY + u), e.fillStyle = "#565656", e.fill(xn), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(e, t, r) {
-    const { primaryWithCoord: n, row: o, col: i, style: a, data: l, subUnitId: s } = t, c = n.isMergedMainCell ? n.mergeInfo : n, u = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, o, i);
+    const { primaryWithCoord: n, row: i, col: o, style: a, data: l, subUnitId: s } = t, d = n.isMergedMainCell ? n.mergeInfo : n, u = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, o);
     if (!u)
       return;
     const h = this._dataValidationModel.getValidator(u.type);
     if (!h)
       return;
-    const d = l == null ? void 0 : l.fontRenderExtension, { leftOffset: S = 0, rightOffset: p = 0, topOffset: b = 0, downOffset: y = 0 } = d || {};
+    const c = l == null ? void 0 : l.fontRenderExtension, { leftOffset: m = 0, rightOffset: g = 0, topOffset: b = 0, downOffset: y = 0 } = c || {};
     if (!u || !h || !h || h.id.indexOf(G.LIST) !== 0 || !h.skipDefaultFontRender(u))
       return;
-    const g = {
-      startX: c.startX + S,
-      endX: c.endX - p,
-      startY: c.startY + b,
-      endY: c.endY - y
-    }, f = g.endX - g.startX, m = g.endY - g.startY, I = this._ensureMap(s), w = this._generateKey(o, i), C = h.getListWithColor(u), R = Q(l), D = `${R != null ? R : ""}`, k = C.find((O) => O.label === D);
-    let { tb: V, vt: A, ht: P, pd: L } = a || {};
-    if (V = V != null ? V : Ie.WRAP, A = A != null ? A : ae.BOTTOM, P = P != null ? P : re.ht, L = L != null ? L : re.pd, u.renderMode === oe.ARROW) {
-      const { l: O = re.pd.l, t: F = re.pd.t, r: x = re.pd.r, b: j = re.pd.b } = L, Z = f - O - x - he - 4, { documentSkeleton: Y, documents: te, docModel: ge } = St(D, this._localeService, a);
-      V === Ie.WRAP && ge.updateDocumentDataPageSize(Math.max(Z, 1)), Y.calculate(), Y.getActualSize();
-      const ce = ot(Y), { height: ne, width: de } = ce, { paddingTop: Se, paddingLeft: me } = xn(Z, m - F - j, de, ne, A, P, !0);
-      this._drawDownIcon(e, g, f, m, ne, A, L), e.save(), e.translateWithPrecision(g.startX + O, g.startY + F), e.beginPath(), e.rect(0, 0, f - O - x, m - F - j), 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(me, 0), e.restore(), e.restore(), I.set(w, {
-        left: g.endX + O + r.rowHeaderWidth - he,
-        top: g.startY + F + r.columnHeaderHeight,
+    const p = {
+      startX: d.startX + m,
+      endX: d.endX - g,
+      startY: d.startY + b,
+      endY: d.endY - y
+    }, S = p.endX - p.startX, v = p.endY - p.startY, C = this._ensureMap(s), w = this._generateKey(i, o), I = h.getListWithColor(u), R = Q(l), T = `${R != null ? R : ""}`, N = I.find((V) => V.label === T);
+    let { tb: D, vt: P, ht: A, pd: L } = a || {};
+    if (D = D != null ? D : Ie.WRAP, P = P != null ? P : ae.BOTTOM, A = A != null ? A : re.ht, L = L != null ? L : re.pd, u.renderMode === ie.ARROW) {
+      const { l: V = re.pd.l, t: F = re.pd.t, r: x = re.pd.r, b: 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, {
+        left: p.endX + V + r.rowHeaderWidth - he,
+        top: p.startY + F + r.columnHeaderHeight,
         width: he,
-        height: m - F - j
+        height: v - F - Y
       });
     } else {
-      e.save(), e.translateWithPrecision(g.startX, g.startY), e.beginPath(), e.rect(0, 0, f, m), e.clip();
-      const O = f - fe * 2 - be - he - 4, { documentSkeleton: F, documents: x, docModel: j } = St(D, this._localeService, a);
-      V === Ie.WRAP && j.updateDocumentDataPageSize(Math.max(O, 1)), F.calculate();
-      const Z = ot(F), { height: Y, width: te } = Z, { paddingTop: ge, paddingLeft: ce } = xn(O, m, te, Y, A, P);
-      e.translateWithPrecision(fe, ge);
-      const ne = Math.max(f - fe * 2, 1), de = Y;
+      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);
+      e.translateWithPrecision(me, pe);
+      const ne = Math.max(S - me * 2, 1), ce = X;
       cr.drawWith(e, {
         width: ne,
-        height: de,
-        fill: (k == null ? void 0 : k.color) || He,
+        height: ce,
+        fill: (N == null ? void 0 : N.color) || He,
         radius: jt
-      }), e.save(), e.translateWithPrecision(be, 0), e.beginPath(), e.rect(0, 0, O, Y), e.clip(), e.translateWithPrecision(ce, 0), x.render(e), e.restore(), e.translateWithPrecision(O + be + 4, (Y - _t) / 2), e.fillStyle = Ji, e.fill(Fn), e.restore(), I.set(w, {
-        left: g.startX + fe + r.rowHeaderWidth,
-        top: g.startY + ge + r.columnHeaderHeight,
+      }), 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, {
+        left: p.startX + me + r.rowHeaderWidth,
+        top: p.startY + pe + r.columnHeaderHeight,
         width: ne,
-        height: de
+        height: ce
       });
     }
   }
   calcCellAutoHeight(e) {
-    const { primaryWithCoord: t, style: r, data: n, row: o, col: i } = 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, o, i);
-    if (!d || d.renderMode === oe.TEXT)
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
+    if (!c || c.renderMode === ie.TEXT)
       return;
-    const S = {
+    const m = {
       startX: a.startX + s,
-      endX: a.endX - c,
+      endX: a.endX - d,
       startY: a.startY + u,
       endY: a.endY - h
-    }, p = S.endX - S.startX, b = Q(n), y = `${b != null ? b : ""}`;
-    let { tb: g, pd: f } = r || {};
-    const { t: m = re.pd.t, b: I = re.pd.b } = f != null ? f : {};
-    if (g = g != null ? g : Ie.WRAP, d.renderMode === oe.ARROW) {
-      const w = p - he, { documentSkeleton: C, docModel: R } = St(y, this._localeService, r);
-      g === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), C.calculate(), C.getActualSize();
-      const D = ot(C), { height: k } = D;
-      return k + m + I + We * 2;
+    }, g = m.endX - m.startX, b = Q(n), y = `${b != null ? b : ""}`;
+    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);
+      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 = p - fe * 2 - be - he, { documentSkeleton: C, docModel: R } = Tr(y, this._localeService, r);
-      g === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), C.calculate();
-      const D = ot(C), {
-        height: k
-      } = D;
-      return k + We * 2;
+      const w = g - me * 2 - Me - he, { documentSkeleton: I, docModel: R } = Tr(y, this._localeService, r);
+      p === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), I.calculate();
+      const T = it(I), {
+        height: N
+      } = T;
+      return N + We * 2;
     }
   }
   calcCellAutoWidth(e) {
-    const { primaryWithCoord: t, style: r, data: n, row: o, col: i } = 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, o, i);
-    if (!d || d.renderMode === oe.TEXT)
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
+    if (!c || c.renderMode === ie.TEXT)
       return;
-    const S = {
+    const m = {
       startX: a.startX + s,
-      endX: a.endX - c,
+      endX: a.endX - d,
       startY: a.startY + u,
       endY: a.endY - h
-    }, p = S.endX - S.startX, b = Q(n), y = `${b != null ? b : ""}`;
-    let { tb: g, pd: f } = r || {};
-    const { l: m = re.pd.l, r: I = re.pd.r } = f != null ? f : {};
-    g = g != null ? g : Ie.WRAP;
-    let w = fe * 2 + he;
-    switch (d.renderMode) {
-      case oe.ARROW:
-        w = he + fe * 2 + I + m;
+    }, g = m.endX - m.startX, b = Q(n), y = `${b != null ? b : ""}`;
+    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) {
+      case ie.ARROW:
+        w = he + me * 2 + C + v;
         break;
-      case oe.CUSTOM:
-        w = he + fe * 2 + be * 2 + I + m + jt / 2 + 1;
+      case ie.CUSTOM:
+        w = he + me * 2 + Me * 2 + C + v + jt / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        w = he + fe * 2 + be * 2 + I + m + jt / 2 + 1;
+        w = he + me * 2 + Me * 2 + C + v + jt / 2 + 1;
     }
-    const C = p - w, { documentSkeleton: R, docModel: D } = St(y, this._localeService, r);
-    return g === Ie.WRAP && D.updateDocumentDataPageSize(Math.max(C, 1)), R.calculate(), R.getActualSize(), ot(R).width + w;
+    const I = g - w, { documentSkeleton: R, docModel: T } = St(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: o } = t, a = this._ensureMap(r).get(this._generateKey(n, o)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, n, o);
-    if (!l || !a || l.renderMode === oe.TEXT)
+    const { subUnitId: r, row: n, col: i } = t, a = this._ensureMap(r).get(this._generateKey(n, i)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, n, i);
+    if (!l || !a || l.renderMode === ie.TEXT)
       return !1;
-    const { top: s, left: c, width: u, height: h } = a, { x: d, y: S } = e;
-    return d >= c && d <= c + u && S >= s && S <= s + h;
+    const { top: s, left: d, width: u, height: h } = a, { x: c, y: m } = e;
+    return c >= d && c <= d + u && m >= s && m <= s + h;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
       return;
-    const { unitId: r, subUnitId: n, row: o, col: i } = e, a = {
+    const { unitId: r, subUnitId: n, row: i, col: o } = e, a = {
       unitId: r,
       subUnitId: n,
-      row: o,
-      column: i
+      row: i,
+      column: o
     };
     this._commandService.executeCommand(At.id, a);
   }
   onPointerEnter(e, t) {
     var r, n;
-    (n = (r = Ke(W.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.POINTER);
+    (n = (r = Ke(j.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(W.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.DEFAULT);
+    (n = (r = Ke(j.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.DEFAULT);
   }
 };
-sn = qi([
+sn = qo([
   at(0, le),
   at(1, M(se)),
   at(2, J),
   at(3, M(Ne)),
   at(4, M(ee))
 ], sn);
-class ea extends ve {
+class ea extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.LIST);
     E(this, "canvasRender", this.injector.createInstance(sn));
-    E(this, "dropdownType", pe.LIST);
+    E(this, "dropdownType", ge.LIST);
     E(this, "optionsInput", Dt.componentKey);
-    E(this, "formulaInput", dn);
+    E(this, "formulaInput", cn);
   }
 }
-class ta extends ve {
+class ta extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.TEXT_LENGTH);
     E(this, "formulaInput", Tt);
   }
 }
-class na extends ve {
+class na extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.WHOLE);
     E(this, "formulaInput", Tt);
   }
 }
-var ra = Object.getOwnPropertyDescriptor, oa = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? ra(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, Yt = (e, t) => (r, n) => t(r, n, e);
-let tt = class extends cn {
+let tt = class extends dn {
   constructor(e, t, r) {
     super(), this._injector = e, this._componentManger = t, this._dataValidatorRegistryService = r, this._initComponents(), this._registerValidatorViews();
   }
   _initComponents() {
     [
-      [Mr, _r],
-      [bt, Pi],
+      [br, Sr],
+      [Mt, Po],
       [Dt.componentKey, Dt],
       [Vt.componentKey, Vt],
-      ...ei
+      ...Qi
     ].forEach(([e, t]) => {
       this.disposeWithMe(this._componentManger.register(
         e,
@@ -2916,47 +2940,47 @@ let tt = class extends cn {
   }
   _registerValidatorViews() {
     [
-      Bi,
+      Bo,
       na,
       ta,
-      $i,
-      Ui,
+      $o,
+      Uo,
       ea,
-      Gi,
-      Fi
+      Go,
+      Fo
     ].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 = oa([
+tt = ia([
   Yt(0, M(we)),
-  Yt(1, M(gn)),
+  Yt(1, M(pn)),
   Yt(2, M(ye))
 ], tt);
-var ia = Object.getOwnPropertyDescriptor, aa = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? ia(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+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--)
+    (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 $n = (Ct = class extends Xn {
-  constructor(e = Mt, t, r, n) {
+let Bn = (Ct = class extends zn {
+  constructor(e = bt, t, r, n) {
     super(), this._config = e, this._injector = t, this._commandService = r, this._configService = n;
-    const { menu: o, ...i } = zn(
+    const { menu: i, ...o } = Kn(
       {},
-      Mt,
+      bt,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Sn, i);
+    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(Cn, o);
   }
   onStarting() {
     [
       [_e],
       [Ae],
-      [dt],
+      [ct],
       [qe],
       [et],
       [Qe],
@@ -2969,7 +2993,7 @@ let $n = (Ct = class extends Xn {
       Lt,
       At,
       yr,
-      Cn,
+      In,
       Fe,
       Rr
     ].forEach((e) => {
@@ -2977,8 +3001,8 @@ let $n = (Ct = class extends Xn {
     });
   }
   onReady() {
-    this._injector.get(Je), this._injector.get(Qe), this._injector.get(Ze), this._injector.get(dt), this._injector.get(Ne).registerRenderModule(
-      W.UNIVER_SHEET,
+    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]
     );
   }
@@ -2988,34 +3012,34 @@ let $n = (Ct = class extends Xn {
   onSteady() {
     this._injector.get(qe);
   }
-}, E(Ct, "pluginName", sa), E(Ct, "type", W.UNIVER_SHEET), Ct);
-$n = aa([
+}, E(Ct, "pluginName", sa), E(Ct, "type", j.UNIVER_SHEET), Ct);
+Bn = aa([
   Xt(1, M(we)),
   Xt(2, J),
   Xt(3, ln)
-], $n);
-var la = Object.getOwnPropertyDescriptor, ca = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? la(t, r) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+], 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--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, zt = (e, t) => (r, n) => t(r, n, e);
-const da = "SHEET_DATA_VALIDATION_UI_PLUGIN";
+const ca = "SHEET_DATA_VALIDATION_UI_PLUGIN";
 var It;
-let Bn = (It = class extends Xn {
-  constructor(e = Mt, t, r, n) {
+let Hn = (It = class extends zn {
+  constructor(e = bt, t, r, n) {
     super(), this._config = e, this._injector = t, this._commandService = r, this._configService = n;
-    const { menu: o, ...i } = zn(
+    const { menu: i, ...o } = Kn(
       {},
-      Mt,
+      bt,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Sn, i);
+    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(Cn, o);
   }
   onStarting() {
     [
       [_e],
       [Ae],
-      [dt],
+      [ct],
       [qe],
       [et],
       [Qe],
@@ -3027,7 +3051,7 @@ let Bn = (It = class extends Xn {
       Lt,
       At,
       yr,
-      Cn,
+      In,
       Fe,
       Rr
     ].forEach((e) => {
@@ -3036,7 +3060,7 @@ let Bn = (It = class extends Xn {
   }
   onReady() {
     this._injector.get(Je), this._injector.get(Qe), this._injector.get(Ne).registerRenderModule(
-      W.UNIVER_SHEET,
+      j.UNIVER_SHEET,
       [Et]
     );
   }
@@ -3046,14 +3070,14 @@ let Bn = (It = class extends Xn {
   onSteady() {
     this._injector.get(qe);
   }
-}, E(It, "pluginName", da), E(It, "type", W.UNIVER_SHEET), It);
-Bn = ca([
+}, E(It, "pluginName", ca), E(It, "type", j.UNIVER_SHEET), It);
+Hn = da([
   zt(1, M(we)),
   zt(2, J),
   zt(3, ln)
-], Bn);
+], Hn);
 export {
-  ve as BaseSheetDataValidatorView,
-  Bn as UniverSheetsDataValidationMobileUIPlugin,
-  $n as UniverSheetsDataValidationUIPlugin
+  fe as BaseSheetDataValidatorView,
+  Hn as UniverSheetsDataValidationMobileUIPlugin,
+  Bn as UniverSheetsDataValidationUIPlugin
 };