@univerjs/sheets-data-validation-ui 0.7.0-nightly.202505141607 → 0.7.0-nightly.202505151607

package/lib/index.js

@@ -1,15 +1,15 @@
 var Lr = Object.defineProperty;
 var kr = (e, t, r) => t in e ? Lr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var E = (e, t, r) => kr(e, typeof t != "symbol" ? t + "" : t, r);
-import { LocaleService as se, isFormulaString as De, DataValidationType as G, Tools as Zt, Inject as b, Injector as we, Disposable as Re, UniverInstanceType as Y, toDisposable as Nr, IUniverInstanceService as le, DataValidationErrorStyle as lt, DataValidationStatus as je, ICommandService as J, IConfigService as dn, DataValidationRenderMode as ie, DisposableCollection as Ur, dayjs as Mn, numfmt as Yn, CellValueType as Fr, CommandType as nt, ObjectMatrix as Rt, Range as xr, Rectangle as yt, queryObjectMatrix as qt, Optional as $r, RxDisposable as un, InterceptorEffectEnum as Xn, sequenceExecute as zn, bufferDebounceTime as Br, debounce as Hr, UndoCommand as Wr, RedoCommand as jr, isUnitRangesEqual as Yr, shallowEqual as bn, ThemeService as Kn, ColorKit as Xr, VerticalAlign as ae, HorizontalAlign as Ye, DEFAULT_STYLES as re, WrapStrategy as Ie, DocumentDataModel as zr, BooleanNumber as rt, DEFAULT_EMPTY_DOCUMENT_VALUE as Kr, Plugin as Gn, merge as Zn } from "@univerjs/core";
+import { LocaleService as se, isFormulaString as De, DataValidationType as G, Tools as Zt, Inject as b, Injector as we, Disposable as Re, UniverInstanceType as Y, toDisposable as Nr, IUniverInstanceService as le, DataValidationErrorStyle as lt, DataValidationStatus as je, ICommandService as J, IConfigService as cn, DataValidationRenderMode as ie, DisposableCollection as Ur, dayjs as Mn, numfmt as Yn, CellValueType as Fr, CommandType as nt, ObjectMatrix as Rt, Range as xr, Rectangle as yt, queryObjectMatrix as qt, Optional as $r, RxDisposable as un, InterceptorEffectEnum as Xn, sequenceExecute as zn, bufferDebounceTime as Br, debounce as Hr, UndoCommand as Wr, RedoCommand as jr, isUnitRangesEqual as Yr, shallowEqual as bn, ThemeService as Kn, ColorKit as Xr, VerticalAlign as ae, HorizontalAlign as Ye, DEFAULT_STYLES as re, WrapStrategy as Ie, DocumentDataModel as zr, BooleanNumber as rt, DEFAULT_EMPTY_DOCUMENT_VALUE as Kr, Plugin as Gn, merge as Zn } from "@univerjs/core";
 import { DataValidationFormulaController as Gr, deserializeListOptions as Zr, serializeListOptions as qn, CUSTOM_FORMULA_INPUT_NAME as Jn, BASE_FORMULA_INPUT_NAME as At, LIST_FORMULA_INPUT_NAME as hn, CHECKBOX_FORMULA_INPUT_NAME as Qn, SheetDataValidationModel as ee, SheetsDataValidationValidatorService as qr, getDataValidationCellValue as Ut, getCellValueOrigin as Q, createDefaultNewRule as er, AddSheetDataValidationCommand as gn, DATA_VALIDATION_PLUGIN_NAME as tr, getDataValidationDiffMutations as Jt, UpdateSheetDataValidationRangeCommand as nr, DataValidationCacheService as rr, UpdateSheetDataValidationSettingCommand as En, UpdateSheetDataValidationOptionsCommand as Jr, RemoveSheetDataValidationCommand as ir, RemoveSheetAllDataValidationCommand as Qr, DataValidationFormulaService as ei, CHECKBOX_FORMULA_2 as ti, CHECKBOX_FORMULA_1 as ni, getFormulaResult as Ft, isLegalFormulaResult as Dn, transformCheckboxValue as ri } from "@univerjs/sheets-data-validation";
-import { jsxs as W, Fragment as ct, jsx as _ } from "react/jsx-runtime";
+import { jsxs as W, Fragment as dt, jsx as _ } from "react/jsx-runtime";
 import { FormLayout as j, Input as Ve, Checkbox as Lt, clsx as Xe, borderClassName as Mt, RadioGroup as pn, Radio as Oe, DraggableList as ii, Dropdown as oi, Button as ze, Select as Vn } from "@univerjs/design";
-import { useDependency as U, useSidebarClick as or, useObservable as Te, useEvent as Qt, ISidebarService as ar, IDialogService as ai, IZenZoneService as sr, KeyCode as gt, MenuItemType as vn, getMenuHiddenObservable as si, RibbonStartGroup as li, IMenuManagerService as ci, ComponentManager as mn } from "@univerjs/ui";
-import On, { useState as H, useRef as ht, forwardRef as Le, createElement as ke, useMemo as dt, useEffect as Pe } from "react";
-import { FormulaEditor as lr, RangeSelector as di } from "@univerjs/sheets-formula-ui";
+import { useDependency as U, useSidebarClick as or, useObservable as Te, useEvent as Qt, ISidebarService as ar, IDialogService as ai, IZenZoneService as sr, KeyCode as gt, MenuItemType as vn, getMenuHiddenObservable as si, RibbonDataGroup as li, IMenuManagerService as di, ComponentManager as mn } from "@univerjs/ui";
+import On, { useState as H, useRef as ht, forwardRef as Le, createElement as ke, useMemo as ct, useEffect as Pe } from "react";
+import { FormulaEditor as lr, RangeSelector as ci } from "@univerjs/sheets-formula-ui";
 import { DataValidatorRegistryService as ye, DataValidationModel as fn, DataValidatorDropdownType as ge, DataValidatorRegistryScope as ui, TWO_FORMULA_OPERATOR_COUNT as hi, getRuleOptions as Tn, getRuleSetting as Pn } from "@univerjs/data-validation";
-import { debounceTime as cr, filter as _n, BehaviorSubject as An, distinctUntilChanged as gi, Subject as pi, bufferTime as dr, of as vi } from "rxjs";
+import { debounceTime as dr, filter as _n, BehaviorSubject as An, distinctUntilChanged as gi, Subject as pi, bufferTime as cr, of as vi } from "rxjs";
 import { DeviceInputEventType as pt, IRenderManagerService as Ne, fixLineWidthByScale as Ln, Transform as mi, CheckboxShape as fi, getCurrentTypeOfRenderer as Ke, CURSOR_TYPE as Ge, FontCache as _i, Shape as Si, Rect as ur, getFontStyleString as xt, getDocsSkeletonPageSize as it, Documents as Ci, DocumentViewModel as Ii, DocumentSkeleton as wi } from "@univerjs/engine-render";
 import { SheetInterceptorService as Sn, VALIDATE_CELL as Ri, SheetsSelectionsService as hr, SetRangeValuesCommand as st, getSheetCommandTarget as gr, rangeToDiscreteRange as yi, SheetPermissionCheckController as Mi, WorksheetEditPermission as en, WorksheetSetCellStylePermission as tn, RangeProtectionPermissionEditPoint as nn, WorkbookEditablePermission as rn, INTERCEPTOR_POINT as pr, InterceptCellContentPriority as vr, checkRangesEditablePermission as bi } from "@univerjs/sheets";
 import { getPatternType as Ei } from "@univerjs/sheets-numfmt";
@@ -17,17 +17,17 @@ import { ISheetCellDropdownManagerService as Di, IEditorBridgeService as mr, Set
 import { deserializeRangeWithSheet as Ui, serializeRange as _r } from "@univerjs/engine-formula";
 const Fi = (e) => {
   const { isTwoFormula: t = !1, value: r, onChange: n, showError: i, validResult: o } = e, a = U(se), l = i ? o == null ? void 0 : o.formula1 : "", s = i ? o == null ? void 0 : o.formula2 : "";
-  return t ? /* @__PURE__ */ W(ct, { children: [
+  return t ? /* @__PURE__ */ W(dt, { children: [
     /* @__PURE__ */ _(j, { error: l, children: /* @__PURE__ */ _(
       Ve,
       {
         className: "univer-w-full",
         placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
         value: r == null ? void 0 : r.formula1,
-        onChange: (c) => {
+        onChange: (d) => {
           n == null || n({
             ...r,
-            formula1: c
+            formula1: d
           });
         }
       }
@@ -39,10 +39,10 @@ const Fi = (e) => {
         className: "univer-w-full",
         placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
         value: r == null ? void 0 : r.formula2,
-        onChange: (c) => {
+        onChange: (d) => {
           n == null || n({
             ...r,
-            formula2: c
+            formula2: d
           });
         }
       }
@@ -53,21 +53,21 @@ const Fi = (e) => {
       className: "univer-w-full",
       placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
       value: r == null ? void 0 : r.formula1,
-      onChange: (c) => {
-        n == null || n({ formula1: c });
+      onChange: (d) => {
+        n == null || n({ formula1: d });
       }
     }
   ) });
 };
 function xi(e) {
-  const { value: t, onChange: r, showError: n, validResult: i } = e, o = U(se), a = n ? i == null ? void 0 : i.formula1 : "", l = n ? i == null ? void 0 : i.formula2 : "", [s, c] = H(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
-  return /* @__PURE__ */ W(ct, { children: [
+  const { value: t, onChange: r, showError: n, validResult: i } = e, o = U(se), a = n ? i == null ? void 0 : i.formula1 : "", l = n ? i == null ? void 0 : i.formula2 : "", [s, d] = H(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
+  return /* @__PURE__ */ W(dt, { children: [
     /* @__PURE__ */ _(j, { children: /* @__PURE__ */ _(
       Lt,
       {
         checked: s,
         onChange: (u) => {
-          u ? c(!0) : (c(!1), r == null || r({
+          u ? d(!0) : (d(!1), r == null || r({
             ...t,
             formula1: void 0,
             formula2: void 0
@@ -108,22 +108,22 @@ function xi(e) {
 }
 function $i(e) {
   var h;
-  const { unitId: t, subUnitId: r, value: n, onChange: i, showError: o, validResult: a } = e, l = o ? a == null ? void 0 : a.formula1 : void 0, s = ht(null), [c, u] = H(!1);
-  return or((d) => {
+  const { unitId: t, subUnitId: r, value: n, onChange: i, showError: o, validResult: a } = e, l = o ? a == null ? void 0 : a.formula1 : void 0, s = ht(null), [d, u] = H(!1);
+  return or((c) => {
     var g;
-    ((g = s.current) == null ? void 0 : g.isClickOutSide(d)) && u(!1);
+    ((g = s.current) == null ? void 0 : g.isClickOutSide(c)) && u(!1);
   }), /* @__PURE__ */ _(j, { error: l, children: /* @__PURE__ */ _(
     lr,
     {
       ref: s,
-      className: Xe("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent dark:univer-bg-gray-700 dark:univer-text-white hover:univer-border-primary-600", Mt),
+      className: Xe("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent dark:!univer-bg-gray-700 dark:!univer-text-white hover:univer-border-primary-600", Mt),
       initValue: (h = n == null ? void 0 : n.formula1) != null ? h : "=",
       unitId: t,
       subUnitId: r,
-      isFocus: c,
+      isFocus: d,
       isSupportAcrossSheet: !0,
-      onChange: (d) => {
-        const m = (d != null ? d : "").trim();
+      onChange: (c) => {
+        const m = (c != null ? c : "").trim();
         m !== (n == null ? void 0 : n.formula1) && (i == null || i({
           ...n,
           formula1: m
@@ -283,7 +283,7 @@ const He = "#ECECEC", qi = [
       children: /* @__PURE__ */ W(
         "div",
         {
-          className: Xe("univer-box-border univer-inline-flex univer-h-8 univer-w-16 univer-cursor-pointer univer-items-center univer-justify-between univer-gap-2 univer-rounded-lg univer-bg-white univer-px-2.5 univer-transition-colors univer-duration-200 dark:univer-bg-gray-700 dark:univer-text-white hover:univer-border-primary-600", Mt),
+          className: Xe("univer-box-border univer-inline-flex univer-h-8 univer-w-16 univer-cursor-pointer univer-items-center univer-justify-between univer-gap-2 univer-rounded-lg univer-bg-white univer-px-2.5 univer-transition-colors univer-duration-200 dark:!univer-bg-gray-700 dark:!univer-text-white hover:univer-border-primary-600", Mt),
           children: [
             /* @__PURE__ */ _(
               "div",
@@ -332,7 +332,7 @@ const He = "#ECECEC", qi = [
 };
 function Qi(e) {
   const { value: t, onChange: r = () => {
-  }, unitId: n, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: c = "" } = t || {}, [u, h] = H(() => De(s) ? "1" : "0"), [d, m] = H(u === "1" ? s : "="), [g, M] = H(u === "1" ? s : "="), y = U(se), p = U(ye), S = U(fn), v = U(Gr), [C, w] = H(() => c.split(",")), I = p.getValidatorItem(G.LIST), [R, T] = H([]), [N, D] = H(""), P = a ? o == null ? void 0 : o.formula1 : "", A = dt(() => S.ruleChange$.pipe(cr(16)), []), L = Te(A), V = Qt(r);
+  }, unitId: n, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, h] = H(() => De(s) ? "1" : "0"), [c, m] = H(u === "1" ? s : "="), [g, M] = H(u === "1" ? s : "="), y = U(se), p = U(ye), S = U(fn), v = U(Gr), [C, w] = H(() => d.split(",")), I = p.getValidatorItem(G.LIST), [R, T] = H([]), [N, D] = H(""), P = a ? o == null ? void 0 : o.formula1 : "", A = ct(() => S.ruleChange$.pipe(dr(16)), []), L = Te(A), V = Qt(r);
   Pe(() => {
     (async () => {
       await new Promise((f) => {
@@ -348,7 +348,7 @@ function Qi(e) {
     De(s) && s !== g && (m(s), M(g));
   }, [g, s]);
   const [F, x] = H(() => {
-    const O = u !== "1" ? Zr(s) : [], B = c.split(",");
+    const O = u !== "1" ? Zr(s) : [], B = d.split(",");
     return O.map((f, k) => ({
       label: f,
       color: B[k] || He,
@@ -361,7 +361,7 @@ function Qi(e) {
   }, Z = (O) => {
     const B = F.findIndex((f) => f.id === O);
     B !== -1 && (F.splice(B, 1), x([...F]));
-  }, z = c.split(","), te = dt(() => R.map((O, B) => ({
+  }, z = d.split(","), te = ct(() => R.map((O, B) => ({
     label: O,
     color: z[B] || He,
     id: `${B}`,
@@ -372,7 +372,7 @@ function Qi(e) {
       formula1: s,
       formula2: k.join(",")
     });
-  }, ce = () => {
+  }, de = () => {
     x([
       ...F,
       {
@@ -406,22 +406,22 @@ function Qi(e) {
     if (!De(O)) {
       V == null || V({
         formula1: "",
-        formula2: c
+        formula2: d
       });
       return;
     }
     v.getFormulaRefCheck(O) ? (V == null || V({
       formula1: De(O) ? O : "",
-      formula2: c
+      formula2: d
     }), D("")) : (V == null || V({
       formula1: "",
-      formula2: c
+      formula2: d
     }), m("="), D(y.t("dataValidation.validFail.formulaError")));
-  }), de = ht(null), [Se, ve] = H(!1);
+  }), ce = ht(null), [Se, ve] = H(!1);
   return or((O) => {
     var f;
-    ((f = de.current) == null ? void 0 : f.isClickOutSide(O)) && ve(!1);
-  }), /* @__PURE__ */ W(ct, { children: [
+    ((f = ce.current) == null ? void 0 : f.isClickOutSide(O)) && ve(!1);
+  }), /* @__PURE__ */ W(dt, { children: [
     /* @__PURE__ */ _(j, { label: y.t("dataValidation.list.options"), children: /* @__PURE__ */ W(
       pn,
       {
@@ -442,9 +442,9 @@ function Qi(e) {
       /* @__PURE__ */ _(
         lr,
         {
-          ref: de,
-          className: Xe("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent dark:univer-bg-gray-700 dark:univer-text-white hover:univer-border-primary-600", Mt),
-          initValue: d,
+          ref: ce,
+          className: Xe("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent dark:!univer-bg-gray-700 dark:!univer-text-white hover:univer-border-primary-600", Mt),
+          initValue: c,
           unitId: n,
           subUnitId: i,
           isFocus: Se,
@@ -492,7 +492,7 @@ function Qi(e) {
         "a",
         {
           className: "univer-flex univer-w-fit univer-cursor-pointer univer-flex-row univer-items-center univer-rounded univer-p-1 univer-px-2 univer-text-sm univer-text-primary hover:univer-bg-primary-50",
-          onClick: ce,
+          onClick: de,
           children: [
             /* @__PURE__ */ _(Ir, { className: "univer-mr-1" }),
             y.t("dataValidation.list.add")
@@ -606,12 +606,12 @@ let Ze = class extends Re {
       Ri,
       {
         handler: async (e, t, r) => {
-          const n = await e, { row: i, col: o, unitId: a, subUnitId: l } = t, s = this._dataValidationModel.getRuleIdByLocation(a, l, i, o), c = s ? this._dataValidationModel.getRuleById(a, l, s) : void 0;
+          const n = await e, { row: i, col: o, unitId: a, subUnitId: l } = t, s = this._dataValidationModel.getRuleIdByLocation(a, l, i, o), d = s ? this._dataValidationModel.getRuleById(a, l, s) : void 0;
           if (n === !1)
             return r(Promise.resolve(!1));
-          if (!c || c.errorStyle !== lt.STOP)
+          if (!d || d.errorStyle !== lt.STOP)
             return r(Promise.resolve(!0));
-          const u = this._dataValidatorRegistryService.getValidatorItem(c.type);
+          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: {
@@ -619,7 +619,7 @@ let Ze = class extends Re {
             },
             id: "reject-input-dialog",
             children: {
-              title: u.getRuleFinalError(c, { row: i, col: o, unitId: a, subUnitId: l })
+              title: u.getRuleFinalError(d, { row: i, col: o, unitId: a, subUnitId: l })
             },
             footer: {
               title: On.createElement(
@@ -701,14 +701,14 @@ function uo(e, t) {
   }
 }
 let Ae = class extends Re {
-  constructor(t, r, n, i, o, 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 pi());
     E(this, "_currentPopup", null);
     E(this, "activeDropdown$", this._activeDropdown$.asObservable());
     E(this, "_zenVisible", !1);
-    this._univerInstanceService = t, this._dataValidatorRegistryService = r, this._zenZoneService = n, this._dataValidationModel = i, this._sheetsSelectionsService = o, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = c, this._injector = u, this._configService = h, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
+    this._univerInstanceService = t, this._dataValidatorRegistryService = r, this._zenZoneService = n, this._dataValidationModel = i, this._sheetsSelectionsService = o, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = d, this._injector = u, this._configService = h, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
   }
@@ -745,19 +745,19 @@ let Ae = class extends Re {
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
     this._activeDropdown = t, this._activeDropdown$.next(this._activeDropdown);
-    const c = this._sheetDataValidationModel.getRuleByLocation(o, a, n, i);
-    if (!c)
+    const d = this._sheetDataValidationModel.getRuleByLocation(o, a, n, i);
+    if (!d)
       return;
-    const u = this._dataValidatorRegistryService.getValidatorItem(c.type);
+    const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
     if (!(u != null && u.dropdownType))
       return;
     let h;
-    const d = async (v, C) => {
+    const c = async (v, C) => {
       var A, L, V;
       if (!v)
         return !0;
       const w = v, I = s.getCell(n, i), R = w.format(C === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), T = (A = Yn.parseDate(R)) == null ? void 0 : A.v, N = C === "time" ? T % 1 : T, D = l.getStyles().getStyleByCell(I), P = (V = (L = D == null ? void 0 : D.n) == null ? void 0 : L.pattern) != null ? V : "";
-      return c.errorStyle !== lt.STOP || await u.validator({
+      return d.errorStyle !== lt.STOP || await u.validator({
         value: N,
         unitId: o,
         subUnitId: a,
@@ -767,7 +767,7 @@ let Ae = class extends Re {
         workbook: l,
         interceptValue: R.replace("Z", "").replace("T", " "),
         t: Fr.NUMBER
-      }, c) ? (await this._commandService.executeCommand(vt.id, {
+      }, d) ? (await this._commandService.executeCommand(vt.id, {
         visible: !1,
         eventType: pt.Keyboard,
         unitId: o,
@@ -793,18 +793,18 @@ let Ae = class extends Re {
             }
           }
         }
-      }), !0) : (this._injector.has(Ze) && this._injector.get(Ze).showReject(u.getRuleFinalError(c, { row: n, col: i, unitId: o, subUnitId: a })), !1);
+      }), !0) : (this._injector.has(Ze) && this._injector.get(Ze).showReject(u.getRuleFinalError(d, { row: n, col: i, unitId: o, subUnitId: a })), !1);
     };
     let m;
     switch (u.dropdownType) {
       case ge.DATE: {
-        const v = Q(s.getCellRaw(n, i)), C = $t(v), w = !!((M = c.bizInfo) != null && M.showTime);
+        const v = Q(s.getCellRaw(n, i)), C = $t(v), w = !!((M = d.bizInfo) != null && M.showTime);
         m = {
           location: r,
           type: "datepicker",
           props: {
             showTime: w,
-            onChange: (I) => d(I, w ? "datetime" : "date"),
+            onChange: (I) => c(I, w ? "datetime" : "date"),
             defaultValue: C,
             patternType: "date"
           }
@@ -817,7 +817,7 @@ let Ae = class extends Re {
           location: r,
           type: "datepicker",
           props: {
-            onChange: (w) => d(w, "time"),
+            onChange: (w) => c(w, "time"),
             defaultValue: C,
             patternType: "time"
           }
@@ -830,7 +830,7 @@ let Ae = class extends Re {
           location: r,
           type: "datepicker",
           props: {
-            onChange: (w) => d(w, "datetime"),
+            onChange: (w) => c(w, "datetime"),
             defaultValue: C,
             patternType: "datetime"
           }
@@ -862,9 +862,9 @@ let Ae = class extends Re {
             unitId: o,
             keycode: gt.ESC
           }), this._commandService.executeCommand(st.id, A), !v;
-        }, w = (c == null ? void 0 : c.renderMode) === ie.CUSTOM || (c == null ? void 0 : c.renderMode) === void 0, I = u.getListWithColor(c, o, a), R = Ut(s.getCellRaw(n, i)), T = () => {
+        }, w = (d == null ? void 0 : d.renderMode) === ie.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, I = u.getListWithColor(d, o, a), R = Ut(s.getCellRaw(n, i)), T = () => {
           this._commandService.executeCommand(Fe.id, {
-            ruleId: c.uid
+            ruleId: d.uid
           }), h == null || h.dispose();
         }, N = I.map((D) => ({
           label: D.label,
@@ -914,7 +914,7 @@ let Ae = class extends Re {
               }), this._commandService.syncExecuteCommand(st.id, w), !0;
             },
             defaultValue: Ut(s.getCellRaw(n, i)).split("/"),
-            options: JSON.parse((S = c.formula1) != null ? S : "[]")
+            options: JSON.parse((S = d.formula1) != null ? S : "[]")
           },
           location: r
         };
@@ -980,8 +980,8 @@ let Ae = class extends Re {
     const s = this._dataValidationModel.getRuleByLocation(a.getUnitId(), l.getSheetId(), n, i);
     if (!s)
       return;
-    const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
-    if (!c || !c.dropdownType) {
+    const d = this._dataValidatorRegistryService.getValidatorItem(s.type);
+    if (!d || !d.dropdownType) {
       this.hideDropdown();
       return;
     }
@@ -1009,7 +1009,7 @@ Ae = co([
   ue(7, J),
   ue(8, mr),
   ue(9, b(we)),
-  ue(10, dn)
+  ue(10, cn)
 ], Ae);
 const Dt = "DataValidationPanel", Fe = {
   id: "data-validation.operation.open-validation-panel",
@@ -1019,20 +1019,20 @@ const Dt = "DataValidationPanel", Fe = {
       return !1;
     const { ruleId: r, isAdd: n } = t, i = e.get(_e), o = e.get(fn), a = e.get(le), l = e.get(ar), s = gr(a);
     if (!s) return !1;
-    const { unitId: c, subUnitId: u } = s, h = r ? o.getRuleById(c, u, r) : void 0;
+    const { unitId: d, subUnitId: u } = s, h = r ? o.getRuleById(d, u, r) : void 0;
     i.open(), i.setActiveRule(h && {
-      unitId: c,
+      unitId: d,
       subUnitId: u,
       rule: h
     });
-    const d = l.open({
+    const c = l.open({
       id: Dt,
       header: { title: n ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
       children: { label: Dt },
       width: 312,
       onClose: () => i.close()
     });
-    return i.setCloseDisposable(d), !0;
+    return i.setCloseDisposable(c), !0;
   }
 }, Rn = {
   id: "data-validation.operation.close-validation-panel",
@@ -1073,12 +1073,12 @@ const Dt = "DataValidationPanel", Fe = {
   handler(e) {
     const t = e.get(le), r = gr(t);
     if (!r) return !1;
-    const { workbook: n, worksheet: i } = r, o = er(e), a = e.get(J), l = n.getUnitId(), s = i.getSheetId(), c = {
+    const { workbook: n, worksheet: i } = r, o = er(e), a = e.get(J), l = n.getUnitId(), s = i.getSheetId(), d = {
       rule: o,
       unitId: l,
       subUnitId: s
     };
-    return a.syncExecuteCommand(gn.id, c) ? (a.syncExecuteCommand(Fe.id, {
+    return a.syncExecuteCommand(gn.id, d) ? (a.syncExecuteCommand(Fe.id, {
       ruleId: o.uid,
       isAdd: !0
     }), !0) : !1;
@@ -1098,7 +1098,7 @@ let ut = class extends Re {
     this._initCellAlertPopup(), this._initZenService();
   }
   _initCellAlertPopup() {
-    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(cr(100)).subscribe((e) => {
+    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(dr(100)).subscribe((e) => {
       var t;
       if (e) {
         const r = this._univerInstanceService.getUnit(e.location.unitId, Y.UNIVER_SHEET), n = r.getSheetBySheetId(e.location.subUnitId);
@@ -1160,10 +1160,10 @@ let qe = class extends Re {
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const e = () => ({ redos: [], undos: [] }), t = (n, i) => {
-      const { source: o, target: a, unitId: l, subUnitId: s } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = on([o, a]), [h, d] = u.ranges, { mapFunc: m } = u, g = {
+      const { source: o, target: a, unitId: l, subUnitId: s } = n, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = on([o, a]), [h, c] = u.ranges, { mapFunc: m } = u, g = {
         row: h.startRow,
         col: h.startColumn
-      }, M = Ai(h, d), y = new Rt(), p = /* @__PURE__ */ new Set();
+      }, M = Ai(h, c), y = new Rt(), p = /* @__PURE__ */ new Set();
       M.forEach((I) => {
         const R = I.repeatStartCell, T = I.relativeRange, N = {
           startRow: g.row,
@@ -1198,8 +1198,8 @@ let qe = class extends Re {
         });
       });
       const S = Array.from(p).map((I) => ({ id: I, ranges: qt(y, (R) => R === I) }));
-      c.addRangeRules(S);
-      const v = c.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: C, undoMutations: w } = Jt(l, s, v, this._injector, "patched", i === ot.ONLY_FORMAT);
+      d.addRangeRules(S);
+      const v = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: C, undoMutations: w } = Jt(l, s, v, this._injector, "patched", i === ot.ONLY_FORMAT);
       return {
         undos: w,
         redos: C
@@ -1210,8 +1210,8 @@ let qe = class extends Re {
         const { source: i, unitId: o, subUnitId: a } = n;
         for (const l of i.rows)
           for (const s of i.cols) {
-            const c = this._sheetDataValidationModel.getRuleByLocation(o, a, l, s);
-            if (c && c.type === G.CHECKBOX) {
+            const d = this._sheetDataValidationModel.getRuleByLocation(o, a, l, s);
+            if (d && d.type === G.CHECKBOX) {
               this._autoFillService.setDisableApplyType(ot.SERIES, !0);
               return;
             }
@@ -1245,8 +1245,8 @@ let Je = class extends Re {
       id: tr,
       onBeforeCopy: (t, r, n) => this._collect(t, r, n),
       onPasteCells: (t, r, n, i) => {
-        const { copyType: o = kn.COPY, pasteType: a } = i, { range: l } = t || {}, { range: s, unitId: c, subUnitId: u } = r;
-        return this._generateMutations(s, { copyType: o, pasteType: a, copyRange: l, unitId: c, subUnitId: u });
+        const { copyType: o = kn.COPY, pasteType: a } = i, { range: l } = t || {}, { range: s, unitId: d, subUnitId: u } = r;
+        return this._generateMutations(s, { copyType: o, pasteType: a, copyRange: l, unitId: d, subUnitId: u });
       }
     });
   }
@@ -1261,10 +1261,10 @@ let Je = class extends Re {
     if (!o)
       return;
     const { rows: a, cols: l } = o;
-    a.forEach((s, c) => {
+    a.forEach((s, d) => {
       l.forEach((u, h) => {
-        const d = this._sheetDataValidationModel.getRuleIdByLocation(t, r, s, u);
-        i.setValue(c, h, d != null ? d : "");
+        const c = this._sheetDataValidationModel.getRuleIdByLocation(t, r, s, u);
+        i.setValue(d, h, c != null ? c : "");
       });
     });
   }
@@ -1285,8 +1285,8 @@ let Je = class extends Re {
       return { redos: [], undos: [] };
     const { unitId: i, subUnitId: o } = this._copyInfo;
     if (r.unitId !== i || o !== r.subUnitId) {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(r.unitId, r.subUnitId).clone(), l = new Rt(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = on([r.copyRange, t]), d = Nn(c, u, !0), m = /* @__PURE__ */ new Map();
-      d.forEach(({ startRange: p }) => {
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(r.unitId, r.subUnitId).clone(), l = new Rt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = on([r.copyRange, t]), c = Nn(d, u, !0), m = /* @__PURE__ */ new Map();
+      c.forEach(({ startRange: p }) => {
         var S;
         (S = this._copyInfo) == null || S.matrix.forValue((v, C, w) => {
           const I = yt.getPositionRange(
@@ -1318,8 +1318,8 @@ let Je = class extends Re {
         undos: y
       };
     } else {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(i, o).clone(), l = new Rt(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = on([r.copyRange, t]);
-      Nn(c, u, !0).forEach(({ startRange: y }) => {
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(i, o).clone(), l = new Rt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = on([r.copyRange, t]);
+      Nn(d, u, !0).forEach(({ startRange: y }) => {
         var p;
         (p = this._copyInfo) == null || p.matrix.forValue((S, v, C) => {
           const w = yt.getPositionRange(
@@ -1412,9 +1412,9 @@ function wo(e) {
   };
 }
 const Ro = {
-  [li.FORMULAS_INSERT]: {
+  [li.RULES]: {
     [Er]: {
-      order: 9,
+      order: 0,
       menuItemFactory: Co,
       [Fe.id]: {
         order: 0,
@@ -1439,8 +1439,8 @@ const Vr = {
   }
 };
 let et = class extends un {
-  constructor(e, t, r, n, i, o, a, l, s, c, u) {
-    super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = r, this._univerInstanceService = n, this._autoHeightController = i, this._dropdownManagerService = o, this._sheetDataValidationModel = a, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = c, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
+  constructor(e, t, r, n, i, o, a, l, s, d, u) {
+    super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = r, this._univerInstanceService = n, this._autoHeightController = i, this._dropdownManagerService = o, this._sheetDataValidationModel = a, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = d, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
     this._menuManagerService.mergeMenu(Ro);
@@ -1460,13 +1460,13 @@ let et = class extends un {
         const s = this._sheetDataValidationModel.getRuleByLocation(n, i, o, a);
         if (!s)
           return;
-        const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
-        if (!(c != null && c.dropdownType))
+        const d = this._dataValidatorRegistryService.getValidatorItem(s.type);
+        if (!(d != null && d.dropdownType))
           return;
         const u = l.getActiveSheet();
         if (!u) return;
-        const h = this._dropdownManagerService.activeDropdown, d = h == null ? void 0 : h.location;
-        if (d && d.unitId === n && d.subUnitId === i && d.row === o && d.col === a)
+        const h = this._dropdownManagerService.activeDropdown, c = h == null ? void 0 : h.location;
+        if (c && c.unitId === n && c.subUnitId === i && c.row === o && c.col === a)
           return;
         this._dropdownManagerService.showDropdown(
           {
@@ -1497,13 +1497,13 @@ let et = class extends un {
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, r) => {
             var p, S, v, C, w;
-            const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
-            if (!c)
+            const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
+            if (!d)
               return r(e);
-            const u = this._sheetDataValidationModel.getRuleById(o, a, c);
+            const u = this._sheetDataValidationModel.getRuleById(o, a, d);
             if (!u)
               return r(e);
-            const h = (p = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? p : je.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
+            const h = (p = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? p : je.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
             let g;
             const M = {
               get value() {
@@ -1524,15 +1524,15 @@ let et = class extends un {
               },
               customRender: [
                 ...(S = e == null ? void 0 : e.customRender) != null ? S : [],
-                ...d != null && d.canvasRender ? [d.canvasRender] : []
+                ...c != null && c.canvasRender ? [c.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((v = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : v.isSkip) || ((C = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : C.call(d, u, M.value, t))
+                isSkip: ((v = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : v.isSkip) || ((C = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : C.call(c, u, M.value, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(u, y.value, {
+                ...c == null ? void 0 : c.getExtraStyle(u, y.value, {
                   get style() {
                     const I = l.getStyles();
                     return (typeof (e == null ? void 0 : e.s) == "string" ? I.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
@@ -1555,7 +1555,7 @@ let et = class extends un {
                   workbook: l,
                   worksheet: s
                 };
-                return (V = (L = d == null ? void 0 : d.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : V.call(L, T);
+                return (V = (L = c == null ? void 0 : c.canvasRender) == null ? void 0 : L.calcCellAutoHeight) == null ? void 0 : V.call(L, T);
               },
               interceptorAutoWidth: () => {
                 var N, D, P, A, L, V;
@@ -1573,7 +1573,7 @@ let et = class extends un {
                   workbook: l,
                   worksheet: s
                 };
-                return (V = (L = d == null ? void 0 : d.canvasRender) == null ? void 0 : L.calcCellAutoWidth) == null ? void 0 : V.call(L, T);
+                return (V = (L = c == null ? void 0 : c.canvasRender) == null ? void 0 : L.calcCellAutoWidth) == null ? void 0 : V.call(L, T);
               },
               coverable: ((w = e == null ? void 0 : e.coverable) != null ? w : !0) && !(u.type === G.LIST || u.type === G.LIST_MULTIPLE)
             });
@@ -1587,7 +1587,7 @@ let et = class extends un {
       // patched data-validation change don't need to re-calc row height
       // re-calc of row height will be triggered precisely by the origin command
       _n((e) => e.source === "command"),
-      dr(100)
+      cr(100)
     ).subscribe((e) => {
       if (e.length === 0)
         return;
@@ -1604,7 +1604,7 @@ let et = class extends un {
 };
 et = Dr([
   K(0, J),
-  K(1, ci),
+  K(1, di),
   K(2, Ne),
   K(3, le),
   K(4, b(fr)),
@@ -1630,13 +1630,13 @@ let xn = class extends un {
           // eslint-disable-next-line complexity
           handler: (e, t, r) => {
             var y, p, S, v, C;
-            const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, c = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
-            if (!c)
+            const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
+            if (!d)
               return r(e);
-            const u = this._sheetDataValidationModel.getRuleById(o, a, c);
+            const u = this._sheetDataValidationModel.getRuleById(o, a, d);
             if (!u)
               return r(e);
-            const h = (y = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? y : je.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(n, i), g = Q(m), M = `${g != null ? g : ""}`;
+            const h = (y = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? y : je.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(n, i), g = Q(m), M = `${g != null ? g : ""}`;
             return r({
               ...e,
               markers: {
@@ -1645,15 +1645,15 @@ let xn = class extends un {
               },
               customRender: [
                 ...(p = e == null ? void 0 : e.customRender) != null ? p : [],
-                ...d != null && d.canvasRender ? [d.canvasRender] : []
+                ...c != null && c.canvasRender ? [c.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...e == null ? void 0 : e.fontRenderExtension,
-                isSkip: ((S = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : S.isSkip) || ((v = d == null ? void 0 : d.skipDefaultFontRender) == null ? void 0 : v.call(d, u, g, t))
+                isSkip: ((S = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : S.isSkip) || ((v = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : v.call(c, u, g, t))
               },
               interceptorStyle: {
                 ...e == null ? void 0 : e.interceptorStyle,
-                ...d == null ? void 0 : d.getExtraStyle(u, M, {
+                ...c == null ? void 0 : c.getExtraStyle(u, M, {
                   get style() {
                     const w = l.getStyles();
                     return (typeof (e == null ? void 0 : e.s) == "string" ? w.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
@@ -1676,7 +1676,7 @@ let xn = class extends un {
                   workbook: l,
                   worksheet: s
                 };
-                return (L = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : L.call(A, R);
+                return (L = (A = c == null ? void 0 : c.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : L.call(A, R);
               },
               coverable: ((C = e == null ? void 0 : e.coverable) != null ? C : !0) && !(u.type === G.LIST || u.type === G.LIST_MULTIPLE)
             });
@@ -1688,7 +1688,7 @@ let xn = class extends un {
   _initAutoHeight() {
     this._sheetDataValidationModel.ruleChange$.pipe(
       _n((e) => e.source === "command"),
-      dr(16)
+      cr(16)
     ).subscribe((e) => {
       const t = [];
       if (e.forEach((r) => {
@@ -1740,13 +1740,13 @@ Vt = bo([
   $n(2, b(bt))
 ], Vt);
 function Eo(e) {
-  var c;
+  var d;
   const t = U(se), r = U(mn), { value: n, onChange: i, extraComponent: o } = e, [a, l] = H(!1), s = o ? r.get(o) : null;
-  return /* @__PURE__ */ W(ct, { children: [
+  return /* @__PURE__ */ W(dt, { children: [
     /* @__PURE__ */ W(
       "div",
       {
-        className: "univer-mb-3 univer-flex univer-cursor-pointer univer-items-center univer-text-sm univer-text-gray-900 dark:univer-text-white",
+        className: "univer-mb-3 univer-flex univer-cursor-pointer univer-items-center univer-text-sm univer-text-gray-900 dark:!univer-text-white",
         onClick: () => l(!a),
         children: [
           t.t("dataValidation.panel.options"),
@@ -1754,7 +1754,7 @@ function Eo(e) {
         ]
       }
     ),
-    a && /* @__PURE__ */ W(ct, { children: [
+    a && /* @__PURE__ */ W(dt, { children: [
       s ? /* @__PURE__ */ _(s, { value: n, onChange: i }) : null,
       /* @__PURE__ */ _(
         j,
@@ -1763,7 +1763,7 @@ function Eo(e) {
           children: /* @__PURE__ */ W(
             pn,
             {
-              value: `${(c = n.errorStyle) != null ? c : lt.WARNING}`,
+              value: `${(d = n.errorStyle) != null ? d : lt.WARNING}`,
               onChange: (u) => i({ ...n, errorStyle: +u }),
               children: [
                 /* @__PURE__ */ _(Oe, { value: `${lt.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
@@ -1807,18 +1807,18 @@ function Vo(e, t, r) {
 }
 function Oo() {
   var O, B;
-  const [e, t] = H(0), r = U(_e), n = Te(r.activeRule$, r.activeRule), { unitId: i, subUnitId: o, rule: a } = n || {}, l = a.uid, s = U(ye), c = U(le), u = U(mn), h = U(J), d = U(fn), m = U(se), [g, M] = H(a), y = s.getValidatorItem(g.type), [p, S] = H(!1), v = s.getValidatorsByScope(ui.SHEET), [C, w] = H(() => g.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), I = dt(() => Do(h), [h]), [R, T] = H(!1), [N, D] = H(!1), P = ht(null), A = U(hr);
+  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(mn), h = U(J), c = U(fn), m = U(se), [g, M] = H(a), y = s.getValidatorItem(g.type), [p, S] = H(!1), v = s.getValidatorsByScope(ui.SHEET), [C, w] = H(() => g.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), I = ct(() => Do(h), [h]), [R, T] = H(!1), [N, D] = H(!1), P = ht(null), A = U(hr);
   if (Pe(() => () => {
     const f = A.getCurrentLastSelection();
     f && A.setSelections([f]);
   }, [A]), Pe(() => {
     h.onCommandExecuted((f) => {
       (f.id === Wr.id || f.id === jr.id) && setTimeout(() => {
-        const k = d.getRuleById(i, o, l);
+        const k = c.getRuleById(i, o, l);
         t(($) => $ + 1), k && (M(k), w(k.ranges.map(($) => ({ unitId: "", sheetId: "", range: $ }))));
       }, 20);
     });
-  }, [h, d, l, o, i]), !y)
+  }, [h, c, l, o, i]), !y)
     return null;
   const L = y.operators, V = y.operatorNames, F = g.operator ? hi.includes(g.operator) : !1, x = () => {
     var f, k, $;
@@ -1827,7 +1827,7 @@ function Oo() {
     const k = f.split(",").filter(Boolean).map(Ui).map((q) => {
       const yn = q.sheetName;
       if (yn) {
-        const Ar = Vo(c, q.unitId, yn);
+        const Ar = Vo(d, q.unitId, yn);
         return { ...q, sheetId: Ar };
       }
       return {
@@ -1885,7 +1885,7 @@ function Oo() {
     const k = s.getValidatorItem(f);
     if (!k)
       return;
-    const $ = k.operators, Ce = d.getRuleById(i, o, l), q = f === (Ce == null ? void 0 : Ce.type) || f.includes("list") && (Ce != null && Ce.type.includes("list")) ? {
+    const $ = k.operators, Ce = c.getRuleById(i, o, l), q = f === (Ce == null ? void 0 : Ce.type) || f.includes("list") && (Ce != null && Ce.type.includes("list")) ? {
       ...Ce,
       type: f
     } : {
@@ -1901,7 +1901,7 @@ function Oo() {
       ruleId: g.uid,
       setting: Pn(q)
     });
-  }, ce = u.get(y.formulaInput), ne = dt(() => C.map((f) => _r(f.range)).join(","), []), de = Tn(g), Se = (f) => {
+  }, de = u.get(y.formulaInput), ne = ct(() => C.map((f) => _r(f.range)).join(","), []), ce = Tn(g), Se = (f) => {
     bn(f, Tn(g)) || (M({
       ...g,
       ...f
@@ -1915,14 +1915,14 @@ function Oo() {
       }
     ));
   }, ve = L.length && !g.operator;
-  return /* @__PURE__ */ W("div", { className: "univer-py-4", children: [
+  return /* @__PURE__ */ W("div", { "data-u-comp": "data-validation-detail", children: [
     /* @__PURE__ */ _(
       j,
       {
         label: m.t("dataValidation.panel.range"),
         error: !g.ranges.length || R ? m.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ _(
-          di,
+          ci,
           {
             selectorRef: P,
             unitId: i,
@@ -1976,8 +1976,8 @@ function Oo() {
         }
       }
     ) }) : null,
-    ce && !ve ? /* @__PURE__ */ _(
-      ce,
+    de && !ve ? /* @__PURE__ */ _(
+      de,
       {
         isTwoFormula: F,
         value: {
@@ -2012,7 +2012,7 @@ function Oo() {
         children: m.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ _(Eo, { value: de, onChange: Se, extraComponent: y.optionsInput }),
+    /* @__PURE__ */ _(Eo, { value: ce, onChange: Se, extraComponent: y.optionsInput }),
     /* @__PURE__ */ W("div", { className: "univer-mt-5 univer-flex univer-flex-row univer-justify-end", children: [
       /* @__PURE__ */ _(ze, { className: "univer-ml-3", onClick: z, children: m.t("dataValidation.panel.removeRule") }),
       /* @__PURE__ */ _(ze, { className: "univer-ml-3", variant: "primary", onClick: x, children: m.t("dataValidation.panel.done") })
@@ -2020,7 +2020,7 @@ function Oo() {
   ] });
 }
 const To = (e) => {
-  const { rule: t, onClick: r, unitId: n, subUnitId: i, disable: o } = e, a = U(ye), l = U(J), s = U(Ni), c = a.getValidatorItem(t.type), u = ht(void 0), [h, d] = H(!1), m = U(Kn), g = Te(m.currentTheme$), M = dt(() => {
+  const { rule: t, onClick: r, unitId: n, subUnitId: i, disable: o } = e, a = U(ye), l = U(J), s = U(Ni), d = a.getValidatorItem(t.type), u = ht(void 0), [h, c] = H(!1), m = U(Kn), g = Te(m.currentTheme$), M = ct(() => {
     var w;
     const p = m.getColorFromTheme("primary.600"), S = m.getColorFromTheme("loop-color.2"), v = (w = m.getColorFromTheme(S)) != null ? w : p, C = new Xr(v).toRgb();
     return {
@@ -2049,13 +2049,13 @@ const To = (e) => {
                   univer-overflow-hidden univer-p-2 univer-pr-9
                 `,
         {
-          "hover:univer-bg-gray-50": !o,
+          "dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-50": !o,
           "univer-opacity-50": o
         }
       ),
       onClick: r,
       onMouseEnter: () => {
-        o || (d(!0), u.current = t.ranges.map((p) => s.addShape({
+        o || (c(!0), u.current = t.ranges.map((p) => s.addShape({
           range: p,
           style: M,
           primary: null
@@ -2063,7 +2063,7 @@ const To = (e) => {
       },
       onMouseLeave: () => {
         var p;
-        d(!1), (p = u.current) == null || p.forEach((S) => {
+        c(!1), (p = u.current) == null || p.forEach((S) => {
           S && s.removeShape(S);
         }), u.current = void 0;
       },
@@ -2071,21 +2071,21 @@ const To = (e) => {
         /* @__PURE__ */ _(
           "div",
           {
-            className: "univer-truncate univer-text-sm univer-font-medium univer-leading-[22px] univer-text-gray-900 dark:univer-text-white",
-            children: c == null ? void 0 : c.generateRuleName(t)
+            className: "univer-truncate univer-text-sm univer-font-medium univer-leading-[22px] univer-text-gray-900 dark:!univer-text-white",
+            children: d == null ? void 0 : d.generateRuleName(t)
           }
         ),
         /* @__PURE__ */ _(
           "div",
           {
-            className: "univer-text-secondary univer-truncate univer-text-xs univer-leading-[18px]",
+            className: "univer-text-secondary univer-truncate univer-text-xs univer-leading-[18px] dark:!univer-text-gray-300",
             children: t.ranges.map((p) => _r(p)).join(",")
           }
         ),
         h ? /* @__PURE__ */ _(
           "div",
           {
-            className: "univer-absolute univer-right-2 univer-top-[19px] univer-flex univer-h-5 univer-w-5 univer-items-center univer-justify-center univer-rounded hover:univer-bg-gray-200",
+            className: "univer-absolute univer-right-2 univer-top-[19px] univer-flex univer-h-5 univer-w-5 univer-items-center univer-justify-center univer-rounded dark:!univer-text-gray-300 dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-200",
             onClick: y,
             children: /* @__PURE__ */ _(Cn, {})
           }
@@ -2095,31 +2095,31 @@ const To = (e) => {
   );
 };
 function Po(e) {
-  const t = U(ee), r = U(le), n = U(J), i = U(we), o = U(_e), a = U(se), [l, s] = H([]), { workbook: c } = e, u = Te(c.activeSheet$, void 0, !0), h = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
+  const t = U(ee), r = U(le), n = U(J), i = U(we), o = U(_e), a = U(se), [l, s] = 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));
+    s(t.getRules(h, c));
     const S = t.ruleChange$.subscribe((v) => {
-      v.unitId === h && v.subUnitId === d && s(t.getRules(h, d));
+      v.unitId === h && v.subUnitId === c && s(t.getRules(h, c));
     });
     return () => {
       S.unsubscribe();
     };
-  }, [h, d, t]);
+  }, [h, c, t]);
   const m = async () => {
     const S = er(i), v = {
       unitId: h,
-      subUnitId: d,
+      subUnitId: c,
       rule: S
     };
     await n.executeCommand(gn.id, v), o.setActiveRule({
       unitId: h,
-      subUnitId: d,
+      subUnitId: c,
       rule: S
     });
   }, g = () => {
     n.executeCommand(Qr.id, {
       unitId: h,
-      subUnitId: d
+      subUnitId: c
     });
   }, y = ((S) => {
     const v = r.getCurrentUnitForType(Y.UNIVER_SHEET), C = v.getActiveSheet(), w = v.getUnitId(), I = C.getSheetId();
@@ -2132,11 +2132,11 @@ function Po(e) {
         To,
         {
           unitId: h,
-          subUnitId: d,
+          subUnitId: c,
           onClick: () => {
             S.disable || o.setActiveRule({
               unitId: h,
-              subUnitId: d,
+              subUnitId: c,
               rule: S
             });
           },
@@ -2207,8 +2207,8 @@ let an = class {
     this._commandService = e, this._univerInstanceService = t, this._formulaService = r, this._themeService = n, this._renderManagerService = i, this._dataValidationModel = o;
   }
   _calc(e, t) {
-    var c, u, h;
-    const { vt: r, ht: n } = t || {}, i = e.endX - e.startX - ft * 2, o = e.endY - e.startY, a = ((c = t == null ? void 0 : t.fs) != null ? c : 10) * 1.6;
+    var d, u, h;
+    const { vt: r, ht: n } = t || {}, i = e.endX - e.startX - ft * 2, o = e.endY - e.startY, a = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
     let l = 0, s = 0;
     switch (r) {
       case ae.TOP:
@@ -2250,8 +2250,8 @@ let an = class {
     return ((r = t == null ? void 0 : t.fs) != null ? r : 10) * 1.6;
   }
   async _parseFormula(e, t, r) {
-    var c, u, h, d, m, g, M, y, p;
-    const { formula1: n = ni, formula2: i = ti } = e, o = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Ft((h = (u = (c = o == null ? void 0 : o[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Ft((g = (m = (d = o == null ? void 0 : o[1]) == null ? void 0 : d.result) == null ? void 0 : m[0]) == null ? void 0 : g[0]), s = Dn(String(a)) && Dn(String(l));
+    var d, u, h, c, m, g, M, y, p;
+    const { formula1: n = ni, formula2: i = ti } = e, o = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Ft((h = (u = (d = o == null ? void 0 : o[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Ft((g = (m = (c = o == null ? void 0 : o[1]) == null ? void 0 : c.result) == null ? void 0 : m[0]) == null ? void 0 : g[0]), s = Dn(String(a)) && Dn(String(l));
     return {
       formula1: De(n) ? Ft((p = (y = (M = o == null ? void 0 : o[0]) == null ? void 0 : M.result) == null ? void 0 : y[0]) == null ? void 0 : p[0]) : n,
       formula2: De(i) ? l : i,
@@ -2260,13 +2260,13 @@ let an = class {
   }
   drawWith(e, t) {
     var P, A, L, V;
-    const { style: r, primaryWithCoord: n, unitId: i, subUnitId: o, worksheet: a, row: l, col: s } = t, c = n.isMergedMainCell ? n.mergeInfo : n, u = Q(a.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(i, o, l, s);
+    const { style: r, primaryWithCoord: n, unitId: i, subUnitId: o, worksheet: a, row: l, col: s } = t, d = n.isMergedMainCell ? n.mergeInfo : n, u = Q(a.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(i, o, l, s);
     if (!h)
       return;
-    const d = this._dataValidationModel.getValidator(h.type);
-    if (!d || !((P = d.skipDefaultFontRender) != null && P.call(d, h, u, { unitId: i, subUnitId: o, row: l, column: s })))
+    const c = this._dataValidationModel.getValidator(h.type);
+    if (!c || !((P = c.skipDefaultFontRender) != null && P.call(c, h, u, { unitId: i, subUnitId: o, row: l, column: s })))
       return;
-    const m = d.parseFormulaSync(h, i, o), { formula1: g } = m, M = this._calc(c, r), { a: y, d: p } = e.getTransform(), S = Ln(M.left, y), v = Ln(M.top, p), C = mi.create().composeMatrix({
+    const m = c.parseFormulaSync(h, i, o), { formula1: g } = m, M = this._calc(d, r), { a: y, d: p } = e.getTransform(), S = Ln(M.left, y), v = Ln(M.top, p), C = mi.create().composeMatrix({
       left: S,
       top: v,
       scaleX: 1,
@@ -2276,8 +2276,8 @@ let an = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), w = c.endX - c.startX, I = c.endY - c.startY;
-    e.save(), e.beginPath(), e.rect(c.startX, c.startY, w, I), e.clip();
+    }), w = d.endX - d.startX, I = d.endY - d.startY;
+    e.save(), e.beginPath(), e.rect(d.startX, d.startY, w, I), e.clip();
     const R = C.getMatrix();
     e.transform(R[0], R[1], R[2], R[3], R[4], R[5]);
     const T = ((A = r == null ? void 0 : r.fs) != null ? A : 10) * 1.6, N = String(u) === String(g), D = this._themeService.getColorFromTheme("primary.600");
@@ -2289,20 +2289,20 @@ let an = class {
     }), e.restore();
   }
   isHit(e, t) {
-    const r = t.primaryWithCoord.isMergedMainCell ? t.primaryWithCoord.mergeInfo : t.primaryWithCoord, n = this._calc(r, t.style), i = n.top, o = n.top + n.height, a = n.left, l = n.left + n.width, { x: s, y: c } = e;
-    return s <= l && s >= a && c <= o && c >= i;
+    const r = t.primaryWithCoord.isMergedMainCell ? t.primaryWithCoord.mergeInfo : t.primaryWithCoord, n = this._calc(r, t.style), i = n.top, o = n.top + n.height, a = n.left, l = n.left + n.width, { x: s, y: d } = e;
+    return s <= l && s >= a && d <= o && d >= i;
   }
   async onPointerDown(e, t) {
     var g;
     if (t.button === 2)
       return;
-    const { primaryWithCoord: r, unitId: n, subUnitId: i, worksheet: o, row: a, col: l } = e, s = Q(o.getCellRaw(a, l)), c = this._dataValidationModel.getRuleByLocation(n, i, a, l);
-    if (!c)
+    const { primaryWithCoord: r, unitId: n, subUnitId: i, worksheet: o, row: a, col: l } = e, s = Q(o.getCellRaw(a, l)), d = this._dataValidationModel.getRuleByLocation(n, i, a, l);
+    if (!d)
       return;
-    const u = this._dataValidationModel.getValidator(c.type);
-    if (!u || !((g = u.skipDefaultFontRender) != null && g.call(u, c, s, { unitId: n, subUnitId: i, row: a, column: l })))
+    const u = this._dataValidationModel.getValidator(d.type);
+    if (!u || !((g = u.skipDefaultFontRender) != null && g.call(u, d, s, { unitId: n, subUnitId: i, row: a, column: l })))
       return;
-    const { formula1: h, formula2: d } = await this._parseFormula(c, n, i), m = {
+    const { formula1: h, formula2: c } = await this._parseFormula(d, n, i), m = {
       range: {
         startColumn: r.actualColumn,
         endColumn: r.actualColumn,
@@ -2310,7 +2310,7 @@ let an = class {
         endRow: r.actualRow
       },
       value: {
-        v: String(s) === ri(String(h)) ? d : h,
+        v: String(s) === ri(String(h)) ? c : h,
         p: null
       }
     };
@@ -2378,31 +2378,31 @@ function jo(e, t) {
   };
 }
 function Yt(e, t, r, n) {
-  const i = Ee + sn * 2, o = r - i, a = n - Pt * 2, l = e.map((d) => ({
-    layout: jo(d, t),
-    text: d
+  const i = Ee + sn * 2, o = r - i, a = n - Pt * 2, l = e.map((c) => ({
+    layout: jo(c, t),
+    text: c
   }));
   let s;
-  const c = [];
-  l.forEach((d) => {
-    const { layout: m } = d, { width: g, height: M } = m;
+  const d = [];
+  l.forEach((c) => {
+    const { layout: m } = c, { width: g, height: M } = m;
     !s || s.width + g + jt > o ? (s = {
       width: g,
       height: M,
       items: [{
-        ...d,
+        ...c,
         left: 0
       }]
-    }, c.push(s)) : (s.items.push({
-      ...d,
+    }, d.push(s)) : (s.items.push({
+      ...c,
       left: s.width + jt
     }), s.width = s.width + g + jt);
   });
   let u = 0, h = 0;
-  return c.forEach((d, m) => {
-    h = Math.max(h, d.width), m === c.length - 1 ? u += d.height : u += d.height + Tr;
+  return d.forEach((c, m) => {
+    h = Math.max(h, c.width), m === d.length - 1 ? u += c.height : u += c.height + Tr;
   }), {
-    lines: c,
+    lines: d,
     totalHeight: u,
     contentWidth: o,
     contentHeight: a,
@@ -2457,14 +2457,14 @@ let ln = class {
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, r, n) {
     var Z, z;
-    const { primaryWithCoord: i, row: o, col: a, style: l, data: s, subUnitId: c } = t, u = i.isMergedMainCell ? i.mergeInfo : i, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: d = 0, rightOffset: m = 0, topOffset: g = 0, downOffset: M = 0 } = h || {}, y = this._ensureMap(c), p = this._generateKey(o, a), S = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, o, a);
+    const { primaryWithCoord: i, row: o, col: a, style: l, data: s, subUnitId: d } = t, u = i.isMergedMainCell ? i.mergeInfo : i, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: c = 0, rightOffset: m = 0, topOffset: g = 0, downOffset: M = 0 } = h || {}, y = this._ensureMap(d), p = this._generateKey(o, a), S = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, o, a);
     if (!S)
       return;
     const v = this._dataValidationModel.getValidator(S.type);
     if (!v)
       return;
     const C = {
-      startX: u.startX + d,
+      startX: u.startX + c,
       endX: u.endX - m,
       startY: u.startY + g,
       endY: u.endY - M
@@ -2481,17 +2481,17 @@ let ln = class {
     }
     e.translateWithPrecision(0, X), x.lines.forEach((te, pe) => {
       e.save();
-      const { width: ce, height: ne, items: de } = te;
+      const { width: de, height: ne, items: ce } = te;
       let Se = 0;
       switch (P) {
         case Ye.RIGHT:
-          Se = x.contentWidth - ce;
+          Se = x.contentWidth - de;
           break;
         case Ye.CENTER:
-          Se = (x.contentWidth - ce) / 2;
+          Se = (x.contentWidth - de) / 2;
           break;
       }
-      e.translate(Se, pe * (ne + Tr)), de.forEach((ve) => {
+      e.translate(Se, pe * (ne + Tr)), ce.forEach((ve) => {
         e.save(), e.translateWithPrecision(ve.left, 0), Xo.drawWith(e, {
           ...N,
           info: ve,
@@ -2508,10 +2508,10 @@ let ln = class {
   }
   calcCellAutoHeight(e) {
     var w;
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, d = {
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
       startX: h.startX + l,
       endX: h.endX - s,
-      startY: h.startY + c,
+      startY: h.startY + d,
       endY: h.endY - u
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!m)
@@ -2519,15 +2519,15 @@ let ln = class {
     const g = this._dataValidationModel.getValidator(m.type);
     if (!g)
       return;
-    const M = d.endX - d.startX, y = d.endY - d.startY, p = (w = Q(n)) != null ? w : "", S = g.parseCellValue(p), v = xt(r != null ? r : void 0);
+    const M = c.endX - c.startX, y = c.endY - c.startY, p = (w = Q(n)) != null ? w : "", S = g.parseCellValue(p), v = xt(r != null ? r : void 0);
     return Yt(S, v, M, y).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
     var w;
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, d = {
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
       startX: h.startX + l,
       endX: h.endX - s,
-      startY: h.startY + c,
+      startY: h.startY + d,
       endY: h.endY - u
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!m)
@@ -2535,7 +2535,7 @@ let ln = class {
     const g = this._dataValidationModel.getValidator(m.type);
     if (!g)
       return;
-    const M = d.endX - d.startX, y = d.endY - d.startY, p = (w = Q(n)) != null ? w : "", S = g.parseCellValue(p), v = xt(r != null ? r : void 0);
+    const M = c.endX - c.startX, y = c.endY - c.startY, p = (w = Q(n)) != null ? w : "", S = g.parseCellValue(p), v = xt(r != null ? r : void 0);
     return Yt(S, v, M, y).calcAutoWidth;
   }
   isHit(e, t) {
@@ -2661,21 +2661,21 @@ function Hn(e, t, r, n, i, o, a = !0) {
       break;
   }
   l = Math.max(We, l);
-  let c = 0;
+  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(me, c), {
-    paddingLeft: c,
+  return d = Math.max(me, d), {
+    paddingLeft: d,
     paddingTop: l
   };
 }
-let cn = class {
+let dn = class {
   constructor(e, t, r, n, i) {
     E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     E(this, "zIndex");
@@ -2689,7 +2689,7 @@ let cn = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, r, n, i, o, a) {
-    const { t: l = re.pd.t, b: s = re.pd.b } = a, c = r - he;
+    const { t: l = re.pd.t, b: s = re.pd.b } = a, d = r - he;
     let u;
     switch (o) {
       case ae.MIDDLE:
@@ -2702,30 +2702,30 @@ let cn = class {
         u = l + We + (i / 2 - St / 2);
         break;
     }
-    e.save(), e.translateWithPrecision(t.startX + c, t.startY + u), e.fillStyle = "#565656", e.fill(Bn), e.restore();
+    e.save(), e.translateWithPrecision(t.startX + d, t.startY + u), e.fillStyle = "#565656", e.fill(Bn), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(e, t, r) {
-    const { primaryWithCoord: n, row: i, col: o, style: a, data: l, subUnitId: s } = t, c = n.isMergedMainCell ? n.mergeInfo : n, u = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, o);
+    const { primaryWithCoord: n, row: i, col: o, style: a, data: l, subUnitId: s } = t, d = n.isMergedMainCell ? n.mergeInfo : n, u = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, o);
     if (!u)
       return;
     const h = this._dataValidationModel.getValidator(u.type);
     if (!h)
       return;
-    const d = l == null ? void 0 : l.fontRenderExtension, { leftOffset: m = 0, rightOffset: g = 0, topOffset: M = 0, downOffset: y = 0 } = d || {};
+    const c = l == null ? void 0 : l.fontRenderExtension, { leftOffset: m = 0, rightOffset: g = 0, topOffset: M = 0, downOffset: y = 0 } = c || {};
     if (!u || !h || !h || h.id.indexOf(G.LIST) !== 0 || !h.skipDefaultFontRender(u))
       return;
     const p = {
-      startX: c.startX + m,
-      endX: c.endX - g,
-      startY: c.startY + M,
-      endY: c.endY - y
+      startX: d.startX + m,
+      endX: d.endX - g,
+      startY: d.startY + M,
+      endY: d.endY - y
     }, S = p.endX - p.startX, v = p.endY - p.startY, C = this._ensureMap(s), w = this._generateKey(i, o), I = h.getListWithColor(u), R = Q(l), T = `${R != null ? R : ""}`, N = I.find((V) => V.label === T);
     let { tb: D, vt: P, ht: A, pd: L } = a || {};
     if (D = D != null ? D : Ie.WRAP, P = P != null ? P : ae.BOTTOM, A = A != null ? A : re.ht, L = L != null ? L : re.pd, u.renderMode === ie.ARROW) {
       const { l: V = re.pd.l, t: F = re.pd.t, r: x = re.pd.r, b: X = re.pd.b } = L, Z = S - V - x - he - 4, { documentSkeleton: z, documents: te, docModel: pe } = Ct(T, this._localeService, a);
       D === Ie.WRAP && pe.updateDocumentDataPageSize(Math.max(Z, 1)), z.calculate(), z.getActualSize();
-      const ce = it(z), { height: ne, width: de } = ce, { paddingTop: Se, paddingLeft: ve } = Hn(Z, v - F - X, de, ne, P, A, !0);
+      const de = it(z), { height: ne, width: ce } = de, { paddingTop: Se, paddingLeft: ve } = Hn(Z, v - F - X, ce, ne, P, A, !0);
       this._drawDownIcon(e, p, S, v, ne, P, L), e.save(), e.translateWithPrecision(p.startX + V, p.startY + F), e.beginPath(), e.rect(0, 0, S - V - x, v - F - X), e.clip(), e.translateWithPrecision(0, Se), e.save(), e.translateWithPrecision(be, 0), e.beginPath(), e.rect(0, 0, Z, ne), e.clip(), te.render(e), e.translateWithPrecision(ve, 0), e.restore(), e.restore(), C.set(w, {
         left: p.endX + V + r.rowHeaderWidth - he,
         top: p.startY + F + r.columnHeaderHeight,
@@ -2736,35 +2736,35 @@ let cn = class {
       e.save(), e.translateWithPrecision(p.startX, p.startY), e.beginPath(), e.rect(0, 0, S, v), e.clip();
       const V = S - me * 2 - be - he - 4, { documentSkeleton: F, documents: x, docModel: X } = Ct(T, this._localeService, a);
       D === Ie.WRAP && X.updateDocumentDataPageSize(Math.max(V, 1)), F.calculate();
-      const Z = it(F), { height: z, width: te } = Z, { paddingTop: pe, paddingLeft: ce } = Hn(V, v, te, z, P, A);
+      const Z = it(F), { height: z, width: te } = Z, { paddingTop: pe, paddingLeft: de } = Hn(V, v, te, z, P, A);
       e.translateWithPrecision(me, pe);
-      const ne = Math.max(S - me * 2, 1), de = z;
+      const ne = Math.max(S - me * 2, 1), ce = z;
       ur.drawWith(e, {
         width: ne,
-        height: de,
+        height: ce,
         fill: (N == null ? void 0 : N.color) || He,
         radius: Xt
-      }), e.save(), e.translateWithPrecision(be, 0), e.beginPath(), e.rect(0, 0, V, z), e.clip(), e.translateWithPrecision(ce, 0), x.render(e), e.restore(), e.translateWithPrecision(V + be + 4, (z - St) / 2), e.fillStyle = Qo, e.fill(Bn), e.restore(), C.set(w, {
+      }), e.save(), e.translateWithPrecision(be, 0), e.beginPath(), e.rect(0, 0, V, z), e.clip(), e.translateWithPrecision(de, 0), x.render(e), e.restore(), e.translateWithPrecision(V + be + 4, (z - St) / 2), e.fillStyle = Qo, e.fill(Bn), e.restore(), C.set(w, {
         left: p.startX + me + r.rowHeaderWidth,
         top: p.startY + pe + r.columnHeaderHeight,
         width: ne,
-        height: de
+        height: ce
       });
     }
   }
   calcCellAutoHeight(e) {
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
-    if (!d || d.renderMode === ie.TEXT)
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
+    if (!c || c.renderMode === ie.TEXT)
       return;
     const m = {
       startX: a.startX + s,
-      endX: a.endX - c,
+      endX: a.endX - d,
       startY: a.startY + u,
       endY: a.endY - h
     }, g = m.endX - m.startX, M = Q(n), y = `${M != null ? M : ""}`;
     let { tb: p, pd: S } = r || {};
     const { t: v = re.pd.t, b: C = re.pd.b } = S != null ? S : {};
-    if (p = p != null ? p : Ie.WRAP, d.renderMode === ie.ARROW) {
+    if (p = p != null ? p : Ie.WRAP, c.renderMode === ie.ARROW) {
       const w = g - he, { documentSkeleton: I, docModel: R } = Ct(y, this._localeService, r);
       p === Ie.WRAP && R.updateDocumentDataPageSize(Math.max(w, 1)), I.calculate(), I.getActualSize();
       const T = it(I), { height: N } = T;
@@ -2779,12 +2779,12 @@ let cn = class {
     }
   }
   calcCellAutoWidth(e) {
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
-    if (!d || d.renderMode === ie.TEXT)
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
+    if (!c || c.renderMode === ie.TEXT)
       return;
     const m = {
       startX: a.startX + s,
-      endX: a.endX - c,
+      endX: a.endX - d,
       startY: a.startY + u,
       endY: a.endY - h
     }, g = m.endX - m.startX, M = Q(n), y = `${M != null ? M : ""}`;
@@ -2792,7 +2792,7 @@ let cn = class {
     const { l: v = re.pd.l, r: C = re.pd.r } = S != null ? S : {};
     p = p != null ? p : Ie.WRAP;
     let w = me * 2 + he;
-    switch (d.renderMode) {
+    switch (c.renderMode) {
       case ie.ARROW:
         w = he + me * 2 + C + v;
         break;
@@ -2810,8 +2810,8 @@ let cn = class {
     const { subUnitId: r, row: n, col: i } = t, a = this._ensureMap(r).get(this._generateKey(n, i)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, n, i);
     if (!l || !a || l.renderMode === ie.TEXT)
       return !1;
-    const { top: s, left: c, width: u, height: h } = a, { x: d, y: m } = e;
-    return d >= c && d <= c + u && m >= s && m <= s + h;
+    const { top: s, left: d, width: u, height: h } = a, { x: c, y: m } = e;
+    return c >= d && c <= d + u && m >= s && m <= s + h;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2833,18 +2833,18 @@ let cn = class {
     (n = (r = Ke(Y.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(Ge.DEFAULT);
   }
 };
-cn = Jo([
+dn = Jo([
   at(0, le),
   at(1, b(se)),
   at(2, J),
   at(3, b(Ne)),
   at(4, b(ee))
-], cn);
+], dn);
 class ta extends fe {
   constructor() {
     super(...arguments);
     E(this, "id", G.LIST);
-    E(this, "canvasRender", this.injector.createInstance(cn));
+    E(this, "canvasRender", this.injector.createInstance(dn));
     E(this, "dropdownType", ge.LIST);
     E(this, "optionsInput", Ot.componentKey);
     E(this, "formulaInput", hn);
@@ -2965,10 +2965,10 @@ let Wn = (It = class extends Gn {
 Wn = sa([
   Kt(1, b(we)),
   Kt(2, J),
-  Kt(3, dn)
+  Kt(3, cn)
 ], Wn);
-var ca = Object.getOwnPropertyDescriptor, da = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? ca(t, r) : t, o = e.length - 1, a; o >= 0; o--)
+var da = Object.getOwnPropertyDescriptor, ca = (e, t, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? da(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, Gt = (e, t) => (r, n) => t(r, n, e);
@@ -3020,10 +3020,10 @@ let jn = (wt = class extends Gn {
     this._injector.get(qe);
   }
 }, E(wt, "pluginName", ua), E(wt, "type", Y.UNIVER_SHEET), wt);
-jn = da([
+jn = ca([
   Gt(1, b(we)),
   Gt(2, J),
-  Gt(3, dn)
+  Gt(3, cn)
 ], jn);
 export {
   fe as BaseSheetDataValidatorView,