@univerjs/sheets-data-validation-ui 0.15.0-insiders.20251227-453e4ff → 0.15.0-insiders.20260106-79b11f9

package/lib/index.js

@@ -1,18 +1,18 @@
 var Tr = Object.defineProperty;
 var Or = (e, t, n) => t in e ? Tr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
 var V = (e, t, n) => Or(e, typeof t != "symbol" ? t + "" : t, n);
-import { Disposable as Re, UniverInstanceType as X, toDisposable as Ar, IUniverInstanceService as le, Inject as E, LocaleService as de, DataValidationErrorStyle as st, DataValidationStatus as Ye, ICommandService as ee, Injector as ye, IConfigService as ln, DataValidationRenderMode as ae, DisposableCollection as Pr, dayjs as kt, numfmt as Wn, CellValueType as Lr, CommandType as tt, DataValidationType as j, ObjectMatrix as It, Range as kr, Rectangle as wt, queryObjectMatrix as Gt, Optional as Nr, RxDisposable as dn, InterceptorEffectEnum as Hn, sequenceExecute as jn, bufferDebounceTime as Ur, debounce as Fr, UndoCommand as $r, RedoCommand as xr, isUnitRangesEqual as Br, shallowEqual as Rn, ThemeService as Yn, ColorKit as Wr, isFormulaString as De, generateRandomId as yn, VerticalAlign as se, HorizontalAlign as we, DEFAULT_STYLES as Q, WrapStrategy as ve, Plugin as Xn, merge as Zn, DependentOn as Hr } from "@univerjs/core";
+import { Disposable as Re, UniverInstanceType as Z, toDisposable as Ar, IUniverInstanceService as le, Inject as D, LocaleService as de, DataValidationErrorStyle as st, DataValidationStatus as Ye, ICommandService as te, Injector as ye, IConfigService as dn, DataValidationRenderMode as ae, DisposableCollection as Pr, dayjs as Nt, numfmt as Wn, CellValueType as Lr, CommandType as tt, DataValidationType as Y, ObjectMatrix as wt, Range as kr, Rectangle as It, queryObjectMatrix as zt, Optional as Nr, RxDisposable as cn, InterceptorEffectEnum as Hn, sequenceExecute as jn, bufferDebounceTime as Ur, debounce as Fr, UndoCommand as $r, RedoCommand as xr, isUnitRangesEqual as Br, shallowEqual as Rn, ThemeService as Yn, ColorKit as Wr, isFormulaString as De, generateRandomId as yn, VerticalAlign as se, HorizontalAlign as Ie, DEFAULT_STYLES as ee, WrapStrategy as ve, Plugin as Xn, merge as Zn, DependentOn as Hr } from "@univerjs/core";
 import { DeviceInputEventType as pt, IRenderManagerService as Ue, fixLineWidthByScale as Mn, Transform as jr, CheckboxShape as Yr, getCurrentTypeOfRenderer as Xe, CURSOR_TYPE as Ze, FontCache as Xr, Shape as Zr, Rect as Kn, getFontStyleString as Ve, DocSimpleSkeleton as rt, Text as bn } from "@univerjs/engine-render";
-import { SheetInterceptorService as cn, VALIDATE_CELL as Kr, SheetsSelectionsService as Gn, SetRangeValuesCommand as at, getSheetCommandTarget as zn, rangeToDiscreteRange as Gr, SheetPermissionCheckController as zr, WorksheetEditPermission as zt, WorksheetSetCellStylePermission as qt, RangeProtectionPermissionEditPoint as Jt, WorkbookEditablePermission as Qt, INTERCEPTOR_POINT as qn, InterceptCellContentPriority as Jn, checkRangesEditablePermission as qr } from "@univerjs/sheets";
-import { SheetDataValidationModel as oe, SheetsDataValidationValidatorService as Jr, getDataValidationCellValue as Nt, getCellValueOrigin as re, serializeListOptions as Qn, createDefaultNewRule as er, AddSheetDataValidationCommand as un, DATA_VALIDATION_PLUGIN_NAME as tr, getDataValidationDiffMutations as en, UpdateSheetDataValidationRangeCommand as nr, DataValidationCacheService as rr, UpdateSheetDataValidationSettingCommand as En, UpdateSheetDataValidationOptionsCommand as Qr, RemoveSheetDataValidationCommand as or, RemoveSheetAllDataValidationCommand as eo, DataValidationFormulaController as to, deserializeListOptions as no, CUSTOM_FORMULA_INPUT_NAME as ir, BASE_FORMULA_INPUT_NAME as Ot, LIST_FORMULA_INPUT_NAME as hn, CHECKBOX_FORMULA_INPUT_NAME as ar, DataValidationFormulaService as ro, CHECKBOX_FORMULA_2 as oo, CHECKBOX_FORMULA_1 as io, getFormulaResult as Ut, isLegalFormulaResult as Dn, transformCheckboxValue as ao, UniverSheetsDataValidationPlugin as so } from "@univerjs/sheets-data-validation";
-import { DataValidatorRegistryService as Me, DataValidatorDropdownType as pe, DataValidationModel as pn, DataValidatorRegistryScope as lo, TWO_FORMULA_OPERATOR_COUNT as co, getRuleOptions as Vn, getRuleSetting as Tn } from "@univerjs/data-validation";
-import { ISidebarService as sr, IDialogService as uo, IZenZoneService as lr, KeyCode as gt, MenuItemType as gn, getMenuHiddenObservable as ho, RibbonDataGroup as po, IMenuManagerService as go, useDependency as F, ComponentManager as vn, useObservable as Oe, useEvent as tn, useSidebarClick as dr } from "@univerjs/ui";
-import { filter as mn, BehaviorSubject as On, distinctUntilChanged as vo, Subject as mo, debounceTime as cr, bufferTime as ur, of as fo } from "rxjs";
+import { SheetInterceptorService as un, VALIDATE_CELL as Kr, SheetsSelectionsService as Gn, SetRangeValuesCommand as at, getSheetCommandTarget as zn, rangeToDiscreteRange as Gr, SheetPermissionCheckController as zr, WorksheetEditPermission as qt, WorksheetSetCellStylePermission as Jt, RangeProtectionPermissionEditPoint as Qt, WorkbookEditablePermission as en, INTERCEPTOR_POINT as qn, InterceptCellContentPriority as Jn, checkRangesEditablePermission as qr } from "@univerjs/sheets";
+import { SheetDataValidationModel as oe, SheetsDataValidationValidatorService as Jr, getDataValidationCellValue as Ut, getCellValueOrigin as re, serializeListOptions as Qn, createDefaultNewRule as er, AddSheetDataValidationCommand as hn, DATA_VALIDATION_PLUGIN_NAME as tr, getDataValidationDiffMutations as tn, UpdateSheetDataValidationRangeCommand as nr, DataValidationCacheService as rr, UpdateSheetDataValidationSettingCommand as En, UpdateSheetDataValidationOptionsCommand as Qr, RemoveSheetDataValidationCommand as or, RemoveSheetAllDataValidationCommand as eo, DataValidationFormulaController as to, deserializeListOptions as no, CUSTOM_FORMULA_INPUT_NAME as ir, BASE_FORMULA_INPUT_NAME as At, LIST_FORMULA_INPUT_NAME as pn, CHECKBOX_FORMULA_INPUT_NAME as ar, DataValidationFormulaService as ro, CHECKBOX_FORMULA_2 as oo, CHECKBOX_FORMULA_1 as io, getFormulaResult as Ft, isLegalFormulaResult as Dn, transformCheckboxValue as ao, UniverSheetsDataValidationPlugin as so } from "@univerjs/sheets-data-validation";
+import { DataValidatorRegistryService as Me, DataValidatorDropdownType as pe, DataValidationModel as gn, DataValidatorRegistryScope as lo, TWO_FORMULA_OPERATOR_COUNT as co, getRuleOptions as Vn, getRuleSetting as Tn } from "@univerjs/data-validation";
+import { ISidebarService as sr, IDialogService as uo, IZenZoneService as lr, KeyCode as gt, MenuItemType as vn, getMenuHiddenObservable as ho, RibbonDataGroup as po, IMenuManagerService as go, useDependency as F, ComponentManager as mn, useObservable as Oe, useEvent as nn, useSidebarClick as dr } from "@univerjs/ui";
+import { filter as fn, BehaviorSubject as On, distinctUntilChanged as vo, Subject as mo, debounceTime as cr, bufferTime as ur, of as fo } from "rxjs";
 import { getPatternType as _o } from "@univerjs/sheets-numfmt";
-import { ISheetCellDropdownManagerService as Co, IEditorBridgeService as hr, SetCellEditVisibleOperation as vt, HoverManagerService as So, CellAlertManagerService as Io, CellAlertType as wo, IAutoFillService as Ro, APPLY_TYPE as ot, virtualizeDiscreteRanges as nn, getAutoFillRepeatRange as yo, ISheetClipboardService as Mo, COPY_TYPE as An, PREDEFINED_HOOK_NAME_PASTE as mt, getRepeatRange as Pn, getCurrentRangeDisable$ as bo, AutoHeightController as pr, SheetSkeletonManagerService as lt, IMarkSelectionService as Eo } from "@univerjs/sheets-ui";
-import { Button as Ke, FormLayout as Y, RadioGroup as fn, Radio as Ae, Checkbox as At, Input as Pe, Select as Ln, clsx as ke, borderClassName as Rt, DraggableList as Do, Dropdown as Vo } from "@univerjs/design";
-import { createElement as Ie, useRef as ht, forwardRef as nt, useState as W, useMemo as dt, useEffect as Le } from "react";
-import { jsxs as H, Fragment as ct, jsx as C } from "react/jsx-runtime";
+import { ISheetCellDropdownManagerService as Co, IEditorBridgeService as hr, SetCellEditVisibleOperation as vt, HoverManagerService as So, CellAlertManagerService as wo, CellAlertType as Io, IAutoFillService as Ro, APPLY_TYPE as ot, virtualizeDiscreteRanges as rn, getAutoFillRepeatRange as yo, ISheetClipboardService as Mo, COPY_TYPE as An, PREDEFINED_HOOK_NAME_PASTE as mt, getRepeatRange as Pn, getCurrentRangeDisable$ as bo, AutoHeightController as pr, SheetSkeletonManagerService as lt, IMarkSelectionService as Eo } from "@univerjs/sheets-ui";
+import { Button as Ke, FormLayout as X, RadioGroup as _n, Radio as Ae, Checkbox as Pt, Input as Pe, Select as Ln, clsx as ke, borderClassName as Rt, DraggableList as Do, Dropdown as Vo } from "@univerjs/design";
+import { createElement as we, useRef as ht, forwardRef as nt, useState as W, useMemo as dt, useEffect as Le } from "react";
+import { jsxs as j, Fragment as ct, jsx as C } from "react/jsx-runtime";
 import { deserializeRangeWithSheet as To, serializeRange as gr } from "@univerjs/engine-formula";
 import { RangeSelector as Oo, FormulaEditor as vr } from "@univerjs/sheets-formula-ui";
 var Ao = Object.getOwnPropertyDescriptor, Po = (e, t, n, r) => {
@@ -30,11 +30,11 @@ let me = class extends Re {
     V(this, "activeRule$", this._activeRule$.asObservable());
     V(this, "_closeDisposable", null);
     this._univerInstanceService = t, this._sidebarService = n, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(X.UNIVER_SHEET).pipe(mn((r) => !r)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(Z.UNIVER_SHEET).pipe(fn((r) => !r)).subscribe(() => {
         this.close();
       })
     ), this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((r) => {
-      r.id === Mt && (r.visible || setTimeout(() => {
+      r.id === bt && (r.visible || setTimeout(() => {
         this._sidebarService.sidebarOptions$.next({ visible: !1 });
       }));
     }));
@@ -69,7 +69,7 @@ me = Po([
   kn(0, le),
   kn(1, sr)
 ], me);
-const Te = "#ECECEC", _n = "sheets-data-validation-ui.config", yt = {};
+const Te = "#ECECEC", yt = "sheets-data-validation-ui.config", Mt = {};
 var Lo = Object.getOwnPropertyDescriptor, ko = (e, t, n, r) => {
   for (var o = r > 1 ? void 0 : r ? Lo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
@@ -100,7 +100,7 @@ let Ge = class extends Re {
               title: u.getRuleFinalError(d, { row: o, col: i, unitId: a, subUnitId: l })
             },
             footer: {
-              title: Ie(
+              title: we(
                 Ke,
                 {
                   variant: "primary",
@@ -128,7 +128,7 @@ let Ge = class extends Re {
         title: e
       },
       footer: {
-        title: Ie(
+        title: we(
           Ke,
           {
             variant: "primary",
@@ -144,25 +144,25 @@ let Ge = class extends Re {
   }
 };
 Ge = ko([
-  xe(0, E(cn)),
-  xe(1, E(oe)),
-  xe(2, E(Me)),
+  xe(0, D(un)),
+  xe(1, D(oe)),
+  xe(2, D(Me)),
   xe(3, uo),
-  xe(4, E(de)),
-  xe(5, E(Jr))
+  xe(4, D(de)),
+  xe(5, D(Jr))
 ], Ge);
 var No = Object.getOwnPropertyDescriptor, Uo = (e, t, n, r) => {
   for (var o = r > 1 ? void 0 : r ? No(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
 }, ue = (e, t) => (n, r) => t(n, r, e);
-const Ft = (e) => {
+const $t = (e) => {
   if (e == null || typeof e == "boolean")
     return;
-  if (e === "") return kt();
+  if (e === "") return Nt();
   if (typeof e == "number" || !Number.isNaN(+e))
-    return kt(Wn.format("yyyy-MM-dd HH:mm:ss", Number(e)));
-  const t = kt(e);
+    return Nt(Wn.format("yyyy-MM-dd HH:mm:ss", Number(e)));
+  const t = Nt(e);
   if (t.isValid())
     return t;
 };
@@ -180,14 +180,14 @@ function Fo(e, t) {
   }
 }
 let Ne = class extends Re {
-  constructor(t, n, r, o, i, a, l, s, d, u, p) {
+  constructor(t, n, r, o, i, a, l, s, d, u, g) {
     super();
     V(this, "_activeDropdown");
     V(this, "_activeDropdown$", new mo());
     V(this, "_currentPopup", null);
     V(this, "activeDropdown$", this._activeDropdown$.asObservable());
     V(this, "_zenVisible", !1);
-    this._univerInstanceService = t, this._dataValidatorRegistryService = n, this._zenZoneService = r, this._dataValidationModel = o, this._sheetsSelectionsService = i, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = d, this._injector = u, this._configService = p, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
+    this._univerInstanceService = t, this._dataValidatorRegistryService = n, this._zenZoneService = r, this._dataValidationModel = o, this._sheetsSelectionsService = i, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = d, this._injector = u, this._configService = g, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
   }
@@ -200,7 +200,7 @@ let Ne = class extends Re {
     }));
   }
   _getDropdownByCell(t, n, r, o) {
-    const i = t ? this._univerInstanceService.getUnit(t, X.UNIVER_SHEET) : this._univerInstanceService.getCurrentUnitForType(X.UNIVER_SHEET);
+    const i = t ? this._univerInstanceService.getUnit(t, Z.UNIVER_SHEET) : this._univerInstanceService.getCurrentUnitForType(Z.UNIVER_SHEET);
     if (!i)
       return;
     const a = n ? i.getSheetBySheetId(n) : i.getActiveSheet();
@@ -219,7 +219,7 @@ let Ne = class extends Re {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   showDropdown(t) {
-    var b, y, I, S;
+    var E, R, w, S, I, b;
     const { location: n } = t, { row: r, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = n;
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
@@ -230,21 +230,21 @@ let Ne = class extends Re {
     const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
     if (!(u != null && u.dropdownType))
       return;
-    let p;
-    const c = async (g, w) => {
-      var D, O, L;
-      if (!g)
+    let g;
+    const c = async (v, p) => {
+      var A, x, H;
+      if (!v)
         return !0;
-      const _ = g, v = s.getCell(r, o), R = _.format(w === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), P = (D = Wn.parseDate(R)) == null ? void 0 : D.v, k = w === "time" ? P % 1 : P, T = l.getStyles().getStyleByCell(v), N = (L = (O = T == null ? void 0 : T.n) == null ? void 0 : O.pattern) != null ? L : "";
+      const _ = v, P = s.getCell(r, o), k = _.format(p === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), U = (A = Wn.parseDate(k)) == null ? void 0 : A.v, L = p === "time" ? U % 1 : U, y = l.getStyles().getStyleByCell(P), T = (H = (x = y == null ? void 0 : y.n) == null ? void 0 : x.pattern) != null ? H : "";
       return d.errorStyle !== st.STOP || await u.validator({
-        value: k,
+        value: L,
         unitId: i,
         subUnitId: a,
         row: r,
         column: o,
         worksheet: s,
         workbook: l,
-        interceptValue: R.replace("Z", "").replace("T", " "),
+        interceptValue: k.replace("Z", "").replace("T", " "),
         t: Lr.NUMBER
       }, d) ? (await this._commandService.executeCommand(at.id, {
         unitId: i,
@@ -256,14 +256,14 @@ let Ne = class extends Re {
           endRow: r
         },
         value: {
-          v: k,
+          v: L,
           t: 2,
           p: null,
           f: null,
           si: null,
           s: {
             n: {
-              pattern: Fo(w, N)
+              pattern: Fo(p, T)
             }
           }
         }
@@ -277,40 +277,40 @@ let Ne = class extends Re {
     let m;
     switch (u.dropdownType) {
       case pe.DATE: {
-        const g = re(s.getCellRaw(r, o)), w = Ft(g), _ = !!((b = d.bizInfo) != null && b.showTime);
+        const v = re(s.getCellRaw(r, o)), p = $t(v), _ = !!((E = d.bizInfo) != null && E.showTime);
         m = {
           location: n,
           type: "datepicker",
           props: {
             showTime: _,
-            onChange: (v) => c(v, _ ? "datetime" : "date"),
-            defaultValue: w,
+            onChange: (P) => c(P, _ ? "datetime" : "date"),
+            defaultValue: p,
             patternType: "date"
           }
         };
         break;
       }
       case pe.TIME: {
-        const g = re(s.getCellRaw(r, o)), w = Ft(g);
+        const v = re(s.getCellRaw(r, o)), p = $t(v);
         m = {
           location: n,
           type: "datepicker",
           props: {
             onChange: (_) => c(_, "time"),
-            defaultValue: w,
+            defaultValue: p,
             patternType: "time"
           }
         };
         break;
       }
       case pe.DATETIME: {
-        const g = re(s.getCellRaw(r, o)), w = Ft(g);
+        const v = re(s.getCellRaw(r, o)), p = $t(v);
         m = {
           location: n,
           type: "datepicker",
           props: {
             onChange: (_) => c(_, "datetime"),
-            defaultValue: w,
+            defaultValue: p,
             patternType: "datetime"
           }
         };
@@ -318,8 +318,8 @@ let Ne = class extends Re {
       }
       case pe.LIST:
       case pe.MULTIPLE_LIST: {
-        const g = u.dropdownType === pe.MULTIPLE_LIST, w = async (T) => {
-          const N = Qn(T), D = {
+        const v = u.dropdownType === pe.MULTIPLE_LIST, p = async (y) => {
+          const T = Qn(y), A = {
             unitId: i,
             subUnitId: a,
             range: {
@@ -329,37 +329,38 @@ let Ne = class extends Re {
               endRow: r
             },
             value: {
-              v: N,
+              v: T,
               p: null,
               f: null,
               si: null
             }
           };
-          return this._commandService.executeCommand(at.id, D), this._editorBridgeService.isVisible().visible && await this._commandService.executeCommand(vt.id, {
+          return this._commandService.executeCommand(at.id, A), this._editorBridgeService.isVisible().visible && await this._commandService.executeCommand(vt.id, {
             visible: !1,
             eventType: pt.Keyboard,
             unitId: i,
             keycode: gt.ESC
-          }), !g;
-        }, _ = (d == null ? void 0 : d.renderMode) === ae.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, v = u.getListWithColor(d, i, a), R = Nt(s.getCellRaw(r, o)), P = () => {
+          }), !v;
+        }, _ = (d == null ? void 0 : d.renderMode) === ae.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, P = u.getListWithColor(d, i, a), k = Ut(s.getCellRaw(r, o)), U = () => {
           this._commandService.executeCommand(Fe.id, {
             ruleId: d.uid
-          }), p == null || p.dispose();
-        }, k = v.map((T) => ({
-          label: T.label,
-          value: T.label,
-          color: _ || T.color ? T.color || Te : "transparent"
+          }), g == null || g.dispose();
+        }, L = P.map((y) => ({
+          label: y.label,
+          value: y.label,
+          color: _ || y.color ? y.color || Te : "transparent"
         }));
         m = {
           location: n,
           type: "list",
           props: {
-            onChange: (T) => w(T),
-            options: k,
-            onEdit: P,
-            defaultValue: R,
-            multiple: g,
-            showEdit: (I = (y = this._configService.getConfig(_n)) == null ? void 0 : y.showEditOnDropdown) != null ? I : !0
+            onChange: (y) => p(y),
+            options: L,
+            onEdit: U,
+            defaultValue: k,
+            multiple: v,
+            showEdit: (w = (R = this._configService.getConfig(yt)) == null ? void 0 : R.showEditOnDropdown) != null ? w : !0,
+            showSearch: (I = (S = this._configService.getConfig(yt)) == null ? void 0 : S.showSearchOnDropdown) != null ? I : !0
           }
         };
         break;
@@ -368,7 +369,7 @@ let Ne = class extends Re {
         m = {
           type: "cascader",
           props: {
-            onChange: (w) => {
+            onChange: (p) => {
               const _ = {
                 unitId: i,
                 subUnitId: a,
@@ -379,7 +380,7 @@ let Ne = class extends Re {
                   endRow: r
                 },
                 value: {
-                  v: w.join("/"),
+                  v: p.join("/"),
                   p: null,
                   f: null,
                   si: null
@@ -392,8 +393,8 @@ let Ne = class extends Re {
                 keycode: gt.ESC
               }), !0;
             },
-            defaultValue: Nt(s.getCellRaw(r, o)).split("/"),
-            options: JSON.parse((S = d.formula1) != null ? S : "[]")
+            defaultValue: Ut(s.getCellRaw(r, o)).split("/"),
+            options: JSON.parse((b = d.formula1) != null ? b : "[]")
           },
           location: n
         };
@@ -403,7 +404,7 @@ let Ne = class extends Re {
         m = {
           type: "color",
           props: {
-            onChange: (w) => {
+            onChange: (p) => {
               const _ = {
                 unitId: i,
                 subUnitId: a,
@@ -414,7 +415,7 @@ let Ne = class extends Re {
                   endRow: r
                 },
                 value: {
-                  v: w,
+                  v: p,
                   p: null,
                   f: null,
                   si: null
@@ -427,7 +428,7 @@ let Ne = class extends Re {
                 keycode: gt.ESC
               }), !0;
             },
-            defaultValue: Nt(s.getCellRaw(r, o))
+            defaultValue: Ut(s.getCellRaw(r, o))
           },
           location: n
         };
@@ -436,18 +437,18 @@ let Ne = class extends Re {
       default:
         throw new Error("[DataValidationDropdownManagerService]: unknown type!");
     }
-    if (p = this._cellDropdownManagerService.showDropdown({
+    if (g = this._cellDropdownManagerService.showDropdown({
       ...m,
       onHide: () => {
         this._activeDropdown = null, this._activeDropdown$.next(null);
       }
-    }), !p)
+    }), !g)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
     const h = new Pr();
-    h.add(p), h.add({
+    h.add(g), h.add({
       dispose: () => {
-        var g, w;
-        (w = (g = this._activeDropdown) == null ? void 0 : g.onHide) == null || w.call(g);
+        var v, p;
+        (p = (v = this._activeDropdown) == null ? void 0 : v.onHide) == null || p.call(v);
       }
     }), this._currentPopup = h;
   }
@@ -455,7 +456,7 @@ let Ne = class extends Re {
     this._activeDropdown && (this._currentPopup && this._currentPopup.dispose(), this._currentPopup = null, this._activeDropdown = null, this._activeDropdown$.next(null));
   }
   showDataValidationDropdown(t, n, r, o, i) {
-    const a = this._univerInstanceService.getUnit(t, X.UNIVER_SHEET);
+    const a = this._univerInstanceService.getUnit(t, Z.UNIVER_SHEET);
     if (!a)
       return;
     const l = a.getSheetBySheetId(n);
@@ -484,35 +485,35 @@ let Ne = class extends Re {
 };
 Ne = Uo([
   ue(0, le),
-  ue(1, E(Me)),
+  ue(1, D(Me)),
   ue(2, lr),
-  ue(3, E(oe)),
-  ue(4, E(Gn)),
-  ue(5, E(Co)),
-  ue(6, E(oe)),
-  ue(7, ee),
+  ue(3, D(oe)),
+  ue(4, D(Gn)),
+  ue(5, D(Co)),
+  ue(6, D(oe)),
+  ue(7, te),
   ue(8, hr),
-  ue(9, E(ye)),
-  ue(10, ln)
+  ue(9, D(ye)),
+  ue(10, dn)
 ], Ne);
-const Mt = "DataValidationPanel", Fe = {
+const bt = "DataValidationPanel", Fe = {
   id: "data-validation.operation.open-validation-panel",
   type: tt.OPERATION,
   handler(e, t) {
     if (!t)
       return !1;
-    const { ruleId: n, isAdd: r } = t, o = e.get(me), i = e.get(pn), a = e.get(le), l = e.get(sr), s = zn(a);
+    const { ruleId: n, isAdd: r } = t, o = e.get(me), i = e.get(gn), a = e.get(le), l = e.get(sr), s = zn(a);
     if (!s) return !1;
-    const { unitId: d, subUnitId: u } = s, p = n ? i.getRuleById(d, u, n) : void 0;
-    o.open(), o.setActiveRule(p && {
+    const { unitId: d, subUnitId: u } = s, g = n ? i.getRuleById(d, u, n) : void 0;
+    o.open(), o.setActiveRule(g && {
       unitId: d,
       subUnitId: u,
-      rule: p
+      rule: g
     });
     const c = l.open({
-      id: Mt,
+      id: bt,
       header: { title: r ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
-      children: { label: Mt },
+      children: { label: bt },
       width: 312,
       onClose: () => o.close()
     });
@@ -528,10 +529,10 @@ const Mt = "DataValidationPanel", Fe = {
   id: "data-validation.operation.toggle-validation-panel",
   type: tt.OPERATION,
   handler(e) {
-    const t = e.get(ee), n = e.get(me);
+    const t = e.get(te), n = e.get(me);
     return n.open(), n.isOpen ? t.executeCommand(Cn.id) : t.executeCommand(Fe.id), !0;
   }
-}, Pt = {
+}, Lt = {
   type: tt.OPERATION,
   id: "sheet.operation.show-data-validation-dropdown",
   handler(e, t) {
@@ -551,18 +552,18 @@ const Mt = "DataValidationPanel", Fe = {
   handler(e, t) {
     return t ? (e.get(Ne).hideDropdown(), !0) : !1;
   }
-}, Lt = {
+}, kt = {
   type: tt.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   handler(e) {
     const t = e.get(le), n = zn(t);
     if (!n) return !1;
-    const { workbook: r, worksheet: o } = n, i = er(e), a = e.get(ee), l = r.getUnitId(), s = o.getSheetId(), d = {
+    const { workbook: r, worksheet: o } = n, i = er(e), a = e.get(te), l = r.getUnitId(), s = o.getSheetId(), d = {
       rule: i,
       unitId: l,
       subUnitId: s
     };
-    return a.syncExecuteCommand(un.id, d) ? (a.syncExecuteCommand(Fe.id, {
+    return a.syncExecuteCommand(hn.id, d) ? (a.syncExecuteCommand(Fe.id, {
       ruleId: i.uid,
       isAdd: !0
     }), !0) : !1;
@@ -585,7 +586,7 @@ let ut = class extends Re {
     this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(cr(100)).subscribe((e) => {
       var t;
       if (e) {
-        const n = this._univerInstanceService.getUnit(e.location.unitId, X.UNIVER_SHEET), r = n.getSheetBySheetId(e.location.subUnitId);
+        const n = this._univerInstanceService.getUnit(e.location.unitId, Z.UNIVER_SHEET), r = n.getSheetBySheetId(e.location.subUnitId);
         if (!r) return;
         const o = this._dataValidationModel.getRuleByLocation(e.location.unitId, e.location.subUnitId, e.location.row, e.location.col);
         if (!o) {
@@ -604,7 +605,7 @@ let ut = class extends Re {
             return;
           }
           this._cellAlertManagerService.showAlert({
-            type: wo.ERROR,
+            type: Io.ERROR,
             title: this._localeService.t("dataValidation.error.title"),
             message: s == null ? void 0 : s.getRuleFinalError(o, e.location),
             location: e.location,
@@ -625,18 +626,18 @@ let ut = class extends Re {
   }
 };
 ut = xo([
-  Be(0, E(So)),
-  Be(1, E(Io)),
+  Be(0, D(So)),
+  Be(1, D(wo)),
   Be(2, le),
-  Be(3, E(de)),
+  Be(3, D(de)),
   Be(4, lr),
-  Be(5, E(oe))
+  Be(5, D(oe))
 ], ut);
 var Bo = Object.getOwnPropertyDescriptor, Wo = (e, t, n, r) => {
   for (var o = r > 1 ? void 0 : r ? Bo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, $t = (e, t) => (n, r) => t(n, r, e);
+}, xt = (e, t) => (n, r) => t(n, r, e);
 let ze = class extends Re {
   constructor(e, t, n) {
     super(), this._autoFillService = e, this._sheetDataValidationModel = t, this._injector = n, this._initAutoFill();
@@ -644,49 +645,49 @@ let ze = class extends Re {
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const e = () => ({ redos: [], undos: [] }), t = (r, o) => {
-      const { source: i, target: a, unitId: l, subUnitId: s } = r, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = nn([i, a]), [p, c] = u.ranges, { mapFunc: m } = u, h = {
-        row: p.startRow,
-        col: p.startColumn
-      }, b = yo(p, c), y = new It(), I = /* @__PURE__ */ new Set();
-      b.forEach((v) => {
-        const R = v.repeatStartCell, P = v.relativeRange, k = {
+      const { source: i, target: a, unitId: l, subUnitId: s } = r, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = rn([i, a]), [g, c] = u.ranges, { mapFunc: m } = u, h = {
+        row: g.startRow,
+        col: g.startColumn
+      }, E = yo(g, c), R = new wt(), w = /* @__PURE__ */ new Set();
+      E.forEach((p) => {
+        const _ = p.repeatStartCell, P = p.relativeRange, k = {
           startRow: h.row,
           startColumn: h.col,
           endColumn: h.col,
           endRow: h.row
-        }, T = {
-          startRow: R.row,
-          startColumn: R.col,
-          endColumn: R.col,
-          endRow: R.row
+        }, U = {
+          startRow: _.row,
+          startColumn: _.col,
+          endColumn: _.col,
+          endRow: _.row
         };
-        kr.foreach(P, (N, D) => {
-          const O = wt.getPositionRange(
+        kr.foreach(P, (L, y) => {
+          const T = It.getPositionRange(
             {
-              startRow: N,
-              startColumn: D,
-              endColumn: D,
-              endRow: N
+              startRow: L,
+              startColumn: y,
+              endColumn: y,
+              endRow: L
             },
             k
-          ), { row: L, col: x } = m(O.startRow, O.startColumn), G = this._sheetDataValidationModel.getRuleIdByLocation(l, s, L, x) || "", te = wt.getPositionRange(
+          ), { row: A, col: x } = m(T.startRow, T.startColumn), H = this._sheetDataValidationModel.getRuleIdByLocation(l, s, A, x) || "", q = It.getPositionRange(
             {
-              startRow: N,
-              startColumn: D,
-              endColumn: D,
-              endRow: N
+              startRow: L,
+              startColumn: y,
+              endColumn: y,
+              endRow: L
             },
-            T
-          ), { row: B, col: ne } = m(te.startRow, te.startColumn);
-          y.setValue(B, ne, G), I.add(G);
+            U
+          ), { row: B, col: ne } = m(q.startRow, q.startColumn);
+          R.setValue(B, ne, H), w.add(H);
         });
       });
-      const S = Array.from(I).map((v) => ({ id: v, ranges: Gt(y, (R) => R === v) }));
+      const S = Array.from(w).map((p) => ({ id: p, ranges: zt(R, (_) => _ === p) }));
       d.addRangeRules(S);
-      const g = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: w, undoMutations: _ } = en(l, s, g, this._injector, "patched", o === ot.ONLY_FORMAT);
+      const I = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: b, undoMutations: v } = tn(l, s, I, this._injector, "patched", o === ot.ONLY_FORMAT);
       return {
-        undos: _,
-        redos: w
+        undos: v,
+        redos: b
       };
     }, n = {
       id: tr,
@@ -695,7 +696,7 @@ let ze = class extends Re {
         for (const l of o.rows)
           for (const s of o.cols) {
             const d = this._sheetDataValidationModel.getRuleByLocation(i, a, l, s);
-            if (d && d.type === j.CHECKBOX) {
+            if (d && d.type === Y.CHECKBOX) {
               this._autoFillService.setDisableApplyType(ot.SERIES, !0);
               return;
             }
@@ -709,15 +710,15 @@ let ze = class extends Re {
   }
 };
 ze = Wo([
-  $t(0, Ro),
-  $t(1, E(oe)),
-  $t(2, E(ye))
+  xt(0, Ro),
+  xt(1, D(oe)),
+  xt(2, D(ye))
 ], ze);
 var Ho = Object.getOwnPropertyDescriptor, jo = (e, t, n, r) => {
   for (var o = r > 1 ? void 0 : r ? Ho(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, xt = (e, t) => (n, r) => t(n, r, e);
+}, Bt = (e, t) => (n, r) => t(n, r, e);
 let qe = class extends Re {
   constructor(t, n, r) {
     super();
@@ -735,7 +736,7 @@ let qe = class extends Re {
     });
   }
   _collect(t, n, r) {
-    const o = new It();
+    const o = new wt();
     this._copyInfo = {
       unitId: t,
       subUnitId: n,
@@ -746,9 +747,9 @@ let qe = class extends Re {
       return;
     const { rows: a, cols: l } = i;
     a.forEach((s, d) => {
-      l.forEach((u, p) => {
+      l.forEach((u, g) => {
         const c = this._sheetDataValidationModel.getRuleIdByLocation(t, n, s, u);
-        o.setValue(d, p, c != null ? c : "");
+        o.setValue(d, g, c != null ? c : "");
       });
     });
   }
@@ -769,27 +770,27 @@ let qe = class extends Re {
       return { redos: [], undos: [] };
     const { unitId: o, subUnitId: i } = this._copyInfo;
     if (n.unitId !== o || i !== n.subUnitId) {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(n.unitId, n.subUnitId).clone(), l = new It(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: p } = nn([n.copyRange, t]), c = Pn(d, u, !0), m = /* @__PURE__ */ new Map();
-      c.forEach(({ startRange: I }) => {
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(n.unitId, n.subUnitId).clone(), l = new wt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: g } = rn([n.copyRange, t]), c = Pn(d, u, !0), m = /* @__PURE__ */ new Map();
+      c.forEach(({ startRange: w }) => {
         var S;
-        (S = this._copyInfo) == null || S.matrix.forValue((g, w, _) => {
-          const v = wt.getPositionRange(
+        (S = this._copyInfo) == null || S.matrix.forValue((I, b, v) => {
+          const p = It.getPositionRange(
             {
-              startRow: g,
-              endRow: g,
-              startColumn: w,
-              endColumn: w
+              startRow: I,
+              endRow: I,
+              startColumn: b,
+              endColumn: b
             },
-            I
-          ), R = `${i}-${_}`, P = this._sheetDataValidationModel.getRuleById(o, i, _);
-          !this._sheetDataValidationModel.getRuleById(n.unitId, n.subUnitId, R) && P && m.set(R, { ...P, uid: R });
-          const { row: k, col: T } = p(v.startRow, v.startColumn);
-          s.add(R), l.setValue(k, T, R);
+            w
+          ), _ = `${i}-${v}`, P = this._sheetDataValidationModel.getRuleById(o, i, v);
+          !this._sheetDataValidationModel.getRuleById(n.unitId, n.subUnitId, _) && P && m.set(_, { ...P, uid: _ });
+          const { row: k, col: U } = g(p.startRow, p.startColumn);
+          s.add(_), l.setValue(k, U, _);
         });
       });
-      const h = Array.from(s).map((I) => ({ id: I, ranges: Gt(l, (S) => S === I) }));
+      const h = Array.from(s).map((w) => ({ id: w, ranges: zt(l, (S) => S === w) }));
       a.addRangeRules(h);
-      const { redoMutations: b, undoMutations: y } = en(
+      const { redoMutations: E, undoMutations: R } = tn(
         n.unitId,
         n.subUnitId,
         a.diffWithAddition(this._sheetDataValidationModel.getRules(n.unitId, n.subUnitId), m.values()),
@@ -798,29 +799,29 @@ let qe = class extends Re {
         !1
       );
       return {
-        redos: b,
-        undos: y
+        redos: E,
+        undos: R
       };
     } else {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(o, i).clone(), l = new It(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: p } = nn([n.copyRange, t]);
-      Pn(d, u, !0).forEach(({ startRange: y }) => {
-        var I;
-        (I = this._copyInfo) == null || I.matrix.forValue((S, g, w) => {
-          const _ = wt.getPositionRange(
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(o, i).clone(), l = new wt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: g } = rn([n.copyRange, t]);
+      Pn(d, u, !0).forEach(({ startRange: R }) => {
+        var w;
+        (w = this._copyInfo) == null || w.matrix.forValue((S, I, b) => {
+          const v = It.getPositionRange(
             {
               startRow: S,
               endRow: S,
-              startColumn: g,
-              endColumn: g
+              startColumn: I,
+              endColumn: I
             },
-            y
-          ), { row: v, col: R } = p(_.startRow, _.startColumn);
-          l.setValue(v, R, w), s.add(w);
+            R
+          ), { row: p, col: _ } = g(v.startRow, v.startColumn);
+          l.setValue(p, _, b), s.add(b);
         });
       });
-      const m = Array.from(s).map((y) => ({ id: y, ranges: Gt(l, (I) => I === y) }));
+      const m = Array.from(s).map((R) => ({ id: R, ranges: zt(l, (w) => w === R) }));
       a.addRangeRules(m);
-      const { redoMutations: h, undoMutations: b } = en(
+      const { redoMutations: h, undoMutations: E } = tn(
         o,
         i,
         a.diff(this._sheetDataValidationModel.getRules(o, i)),
@@ -830,21 +831,21 @@ let qe = class extends Re {
       );
       return {
         redos: h,
-        undos: b
+        undos: E
       };
     }
   }
 };
 qe = jo([
-  xt(0, Mo),
-  xt(1, E(oe)),
-  xt(2, E(ye))
+  Bt(0, Mo),
+  Bt(1, D(oe)),
+  Bt(2, D(ye))
 ], qe);
 var Yo = Object.getOwnPropertyDescriptor, Xo = (e, t, n, r) => {
   for (var o = r > 1 ? void 0 : r ? Yo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, Bt = (e, t) => (n, r) => t(n, r, e);
+}, Wt = (e, t) => (n, r) => t(n, r, e);
 let Je = class extends Re {
   constructor(e, t, n) {
     super(), this._localeService = e, this._commandService = t, this._sheetPermissionCheckController = n, this._commandExecutedListener();
@@ -852,20 +853,20 @@ let Je = class extends Re {
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((e) => {
-        if (e.id === un.id) {
+        if (e.id === hn.id) {
           const { unitId: t, subUnitId: n, rule: { ranges: r } } = e.params;
           this._sheetPermissionCheckController.permissionCheckWithRanges({
-            workbookTypes: [Qt],
-            rangeTypes: [Jt],
-            worksheetTypes: [zt, qt]
+            workbookTypes: [en],
+            rangeTypes: [Qt],
+            worksheetTypes: [qt, Jt]
           }, r, t, n) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"));
         }
         if (e.id === nr.id) {
           const { unitId: t, subUnitId: n, ranges: r } = e.params;
           this._sheetPermissionCheckController.permissionCheckWithRanges({
-            workbookTypes: [Qt],
-            rangeTypes: [Jt],
-            worksheetTypes: [zt, qt]
+            workbookTypes: [en],
+            rangeTypes: [Qt],
+            worksheetTypes: [qt, Jt]
           }, r, t, n) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"));
         }
       })
@@ -873,33 +874,33 @@ let Je = class extends Re {
   }
 };
 Je = Xo([
-  Bt(0, E(de)),
-  Bt(1, ee),
-  Bt(2, E(zr))
+  Wt(0, D(de)),
+  Wt(1, te),
+  Wt(2, D(zr))
 ], Je);
 const _r = "sheet.menu.data-validation";
 function Zo(e) {
   return {
     id: _r,
-    type: gn.SUBITEMS,
+    type: vn.SUBITEMS,
     icon: "DataValidationIcon",
     tooltip: "dataValidation.title",
-    hidden$: ho(e, X.UNIVER_SHEET),
-    disabled$: bo(e, { workbookTypes: [Qt], worksheetTypes: [qt, zt], rangeTypes: [Jt] })
+    hidden$: ho(e, Z.UNIVER_SHEET),
+    disabled$: bo(e, { workbookTypes: [en], worksheetTypes: [Jt, qt], rangeTypes: [Qt] })
   };
 }
 function Ko(e) {
   return {
     id: Fe.id,
     title: "dataValidation.panel.title",
-    type: gn.BUTTON
+    type: vn.BUTTON
   };
 }
 function Go(e) {
   return {
-    id: Lt.id,
+    id: kt.id,
     title: "dataValidation.panel.add",
-    type: gn.BUTTON
+    type: vn.BUTTON
   };
 }
 const zo = {
@@ -911,7 +912,7 @@ const zo = {
         order: 0,
         menuItemFactory: Ko
       },
-      [Lt.id]: {
+      [kt.id]: {
         order: 1,
         menuItemFactory: Go
       }
@@ -922,14 +923,14 @@ var qo = Object.getOwnPropertyDescriptor, Cr = (e, t, n, r) => {
   for (var o = r > 1 ? void 0 : r ? qo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, K = (e, t) => (n, r) => t(n, r, e);
+}, G = (e, t) => (n, r) => t(n, r, e);
 const Sr = {
   tr: {
     size: 6,
     color: "#fe4b4b"
   }
 };
-let Qe = class extends dn {
+let Qe = class extends cn {
   constructor(e, t, n, r, o, i, a, l, s, d, u) {
     super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = n, this._univerInstanceService = r, this._autoHeightController = o, this._dropdownManagerService = i, this._sheetDataValidationModel = a, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = d, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
@@ -956,7 +957,7 @@ let Qe = class extends dn {
           return;
         const u = l.getActiveSheet();
         if (!u) return;
-        const p = this._dropdownManagerService.activeDropdown, c = p == null ? void 0 : p.location;
+        const g = this._dropdownManagerService.activeDropdown, c = g == null ? void 0 : g.location;
         if (c && c.unitId === r && c.subUnitId === o && c.row === i && c.col === a)
           return;
         this._dropdownManagerService.showDropdown(
@@ -987,52 +988,52 @@ let Qe = class extends dn {
           priority: Jn.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, n) => {
-            var I, S, g, w, _;
+            var w, S, I, b, v;
             const { row: r, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(i, a, r, o);
             if (!d)
               return n(e);
             const u = this._sheetDataValidationModel.getRuleById(i, a, d);
             if (!u)
               return n(e);
-            const p = (I = this._dataValidationCacheService.getValue(i, a, r, o)) != null ? I : Ye.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
+            const g = (w = this._dataValidationCacheService.getValue(i, a, r, o)) != null ? w : Ye.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
             let h;
-            const b = {
+            const E = {
               get value() {
-                var v;
-                return h !== void 0 || (h = (v = re(m)) != null ? v : null), h;
+                var p;
+                return h !== void 0 || (h = (p = re(m)) != null ? p : null), h;
               }
-            }, y = {
+            }, R = {
               get value() {
-                var v;
-                return `${(v = b.value) != null ? v : ""}`;
+                var p;
+                return `${(p = E.value) != null ? p : ""}`;
               }
             };
             return (!e || e === t.rawData) && (e = { ...t.rawData }), e.markers = {
               ...e == null ? void 0 : e.markers,
-              ...p === Ye.INVALID ? Sr : null
+              ...g === Ye.INVALID ? Sr : null
             }, e.customRender = [
               ...(S = e == null ? void 0 : e.customRender) != null ? S : [],
               ...c != null && c.canvasRender ? [c.canvasRender] : []
             ], e.fontRenderExtension = {
               ...e == null ? void 0 : e.fontRenderExtension,
-              isSkip: ((g = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : g.isSkip) || ((w = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : w.call(c, u, b.value, t))
+              isSkip: ((I = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : I.isSkip) || ((b = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : b.call(c, u, E.value, t))
             }, e.interceptorStyle = {
               ...e == null ? void 0 : e.interceptorStyle,
-              ...c == null ? void 0 : c.getExtraStyle(u, y.value, {
+              ...c == null ? void 0 : c.getExtraStyle(u, R.value, {
                 get style() {
-                  const v = l.getStyles();
-                  return (typeof (e == null ? void 0 : e.s) == "string" ? v.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
+                  const p = l.getStyles();
+                  return (typeof (e == null ? void 0 : e.s) == "string" ? p.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                 }
               }, r, o)
             }, e.interceptorAutoHeight = () => {
-              var k, T, N, D, O, L;
-              const v = (T = (k = this._renderManagerService.getRenderById(i)) == null ? void 0 : k.with(lt).getSkeletonParam(a)) == null ? void 0 : T.skeleton;
-              if (!v)
+              var k, U, L, y, T, A;
+              const p = (U = (k = this._renderManagerService.getRenderById(i)) == null ? void 0 : k.with(lt).getSkeletonParam(a)) == null ? void 0 : U.skeleton;
+              if (!p)
                 return;
-              const R = v.worksheet.getMergedCell(r, o), P = {
+              const _ = p.worksheet.getMergedCell(r, o), P = {
                 data: e,
-                style: v.getStyles().getStyleByCell(e),
-                primaryWithCoord: v.getCellWithCoordByIndex((N = R == null ? void 0 : R.startRow) != null ? N : r, (D = R == null ? void 0 : R.startColumn) != null ? D : o),
+                style: p.getStyles().getStyleByCell(e),
+                primaryWithCoord: p.getCellWithCoordByIndex((L = _ == null ? void 0 : _.startRow) != null ? L : r, (y = _ == null ? void 0 : _.startColumn) != null ? y : o),
                 unitId: i,
                 subUnitId: a,
                 row: r,
@@ -1040,16 +1041,16 @@ let Qe = class extends dn {
                 workbook: l,
                 worksheet: s
               };
-              return (L = (O = c == null ? void 0 : c.canvasRender) == null ? void 0 : O.calcCellAutoHeight) == null ? void 0 : L.call(O, P);
+              return (A = (T = c == null ? void 0 : c.canvasRender) == null ? void 0 : T.calcCellAutoHeight) == null ? void 0 : A.call(T, P);
             }, e.interceptorAutoWidth = () => {
-              var k, T, N, D, O, L;
-              const v = (T = (k = this._renderManagerService.getRenderById(i)) == null ? void 0 : k.with(lt).getSkeletonParam(a)) == null ? void 0 : T.skeleton;
-              if (!v)
+              var k, U, L, y, T, A;
+              const p = (U = (k = this._renderManagerService.getRenderById(i)) == null ? void 0 : k.with(lt).getSkeletonParam(a)) == null ? void 0 : U.skeleton;
+              if (!p)
                 return;
-              const R = v.worksheet.getMergedCell(r, o), P = {
+              const _ = p.worksheet.getMergedCell(r, o), P = {
                 data: e,
-                style: v.getStyles().getStyleByCell(e),
-                primaryWithCoord: v.getCellWithCoordByIndex((N = R == null ? void 0 : R.startRow) != null ? N : r, (D = R == null ? void 0 : R.startColumn) != null ? D : o),
+                style: p.getStyles().getStyleByCell(e),
+                primaryWithCoord: p.getCellWithCoordByIndex((L = _ == null ? void 0 : _.startRow) != null ? L : r, (y = _ == null ? void 0 : _.startColumn) != null ? y : o),
                 unitId: i,
                 subUnitId: a,
                 row: r,
@@ -1057,8 +1058,8 @@ let Qe = class extends dn {
                 workbook: l,
                 worksheet: s
               };
-              return (L = (O = c == null ? void 0 : c.canvasRender) == null ? void 0 : O.calcCellAutoWidth) == null ? void 0 : L.call(O, P);
-            }, e.coverable = ((_ = e == null ? void 0 : e.coverable) != null ? _ : !0) && !(u.type === j.LIST || u.type === j.LIST_MULTIPLE), n(e);
+              return (A = (T = c == null ? void 0 : c.canvasRender) == null ? void 0 : T.calcCellAutoWidth) == null ? void 0 : A.call(T, P);
+            }, e.coverable = ((v = e == null ? void 0 : e.coverable) != null ? v : !0) && !(u.type === Y.LIST || u.type === Y.LIST_MULTIPLE), n(e);
           }
         }
       )
@@ -1068,7 +1069,7 @@ let Qe = class extends dn {
     this._sheetDataValidationModel.ruleChange$.pipe(
       // patched data-validation change don't need to re-calc row height
       // re-calc of row height will be triggered precisely by the origin command
-      mn((e) => e.source === "command"),
+      fn((e) => e.source === "command"),
       ur(100)
     ).subscribe((e) => {
       if (e.length === 0)
@@ -1076,7 +1077,7 @@ let Qe = class extends dn {
       const t = [];
       if (e.forEach((n) => {
         var r;
-        (n.rule.type === j.LIST_MULTIPLE || n.rule.type === j.LIST) && (r = n.rule) != null && r.ranges && t.push(...n.rule.ranges);
+        (n.rule.type === Y.LIST_MULTIPLE || n.rule.type === Y.LIST) && (r = n.rule) != null && r.ranges && t.push(...n.rule.ranges);
       }), t.length) {
         const n = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
         jn(n.redos, this._commandService);
@@ -1085,19 +1086,19 @@ let Qe = class extends dn {
   }
 };
 Qe = Cr([
-  K(0, ee),
-  K(1, go),
-  K(2, Ue),
-  K(3, le),
-  K(4, E(pr)),
-  K(5, E(Ne)),
-  K(6, E(oe)),
-  K(7, E(Me)),
-  K(8, E(cn)),
-  K(9, E(rr)),
-  K(10, Nr(hr))
+  G(0, te),
+  G(1, go),
+  G(2, Ue),
+  G(3, le),
+  G(4, D(pr)),
+  G(5, D(Ne)),
+  G(6, D(oe)),
+  G(7, D(Me)),
+  G(8, D(un)),
+  G(9, D(rr)),
+  G(10, Nr(hr))
 ], Qe);
-let Nn = class extends dn {
+let Nn = class extends cn {
   constructor(e, t, n, r, o, i, a) {
     super(), this._commandService = e, this._renderManagerService = t, this._autoHeightController = n, this._dataValidatorRegistryService = r, this._sheetInterceptorService = o, this._sheetDataValidationModel = i, this._dataValidationCacheService = a, this._initViewModelIntercept(), this._initAutoHeight();
   }
@@ -1112,40 +1113,40 @@ let Nn = class extends dn {
           priority: Jn.DATA_VALIDATION,
           // eslint-disable-next-line complexity, max-lines-per-function
           handler: (e, t, n) => {
-            var y, I, S, g, w;
+            var R, w, S, I, b;
             const { row: r, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(i, a, r, o);
             if (!d)
               return n(e);
             const u = this._sheetDataValidationModel.getRuleById(i, a, d);
             if (!u)
               return n(e);
-            const p = (y = this._dataValidationCacheService.getValue(i, a, r, o)) != null ? y : Ye.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(r, o), h = re(m), b = `${h != null ? h : ""}`;
+            const g = (R = this._dataValidationCacheService.getValue(i, a, r, o)) != null ? R : Ye.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(r, o), h = re(m), E = `${h != null ? h : ""}`;
             return (!e || e === t.rawData) && (e = { ...t.rawData }), e.markers = {
               ...e == null ? void 0 : e.markers,
-              ...p === Ye.INVALID ? Sr : null
+              ...g === Ye.INVALID ? Sr : null
             }, e.customRender = [
-              ...(I = e == null ? void 0 : e.customRender) != null ? I : [],
+              ...(w = e == null ? void 0 : e.customRender) != null ? w : [],
               ...c != null && c.canvasRender ? [c.canvasRender] : []
             ], e.fontRenderExtension = {
               ...e == null ? void 0 : e.fontRenderExtension,
-              isSkip: ((S = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : S.isSkip) || ((g = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : g.call(c, u, h, t))
+              isSkip: ((S = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : S.isSkip) || ((I = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : I.call(c, u, h, t))
             }, e.interceptorStyle = {
               ...e == null ? void 0 : e.interceptorStyle,
-              ...c == null ? void 0 : c.getExtraStyle(u, b, {
+              ...c == null ? void 0 : c.getExtraStyle(u, E, {
                 get style() {
-                  const _ = l.getStyles();
-                  return (typeof (e == null ? void 0 : e.s) == "string" ? _.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
+                  const v = l.getStyles();
+                  return (typeof (e == null ? void 0 : e.s) == "string" ? v.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                 }
               }, r, o)
             }, e.interceptorAutoHeight = () => {
-              var P, k, T, N, D, O;
-              const _ = (k = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(lt).getSkeletonParam(a)) == null ? void 0 : k.skeleton;
-              if (!_)
+              var P, k, U, L, y, T;
+              const v = (k = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(lt).getSkeletonParam(a)) == null ? void 0 : k.skeleton;
+              if (!v)
                 return;
-              const v = _.worksheet.getMergedCell(r, o), R = {
+              const p = v.worksheet.getMergedCell(r, o), _ = {
                 data: e,
-                style: _.getStyles().getStyleByCell(e),
-                primaryWithCoord: _.getCellWithCoordByIndex((T = v == null ? void 0 : v.startRow) != null ? T : r, (N = v == null ? void 0 : v.startColumn) != null ? N : o),
+                style: v.getStyles().getStyleByCell(e),
+                primaryWithCoord: v.getCellWithCoordByIndex((U = p == null ? void 0 : p.startRow) != null ? U : r, (L = p == null ? void 0 : p.startColumn) != null ? L : o),
                 unitId: i,
                 subUnitId: a,
                 row: r,
@@ -1153,16 +1154,16 @@ let Nn = class extends dn {
                 workbook: l,
                 worksheet: s
               };
-              return (O = (D = c == null ? void 0 : c.canvasRender) == null ? void 0 : D.calcCellAutoHeight) == null ? void 0 : O.call(D, R);
+              return (T = (y = c == null ? void 0 : c.canvasRender) == null ? void 0 : y.calcCellAutoHeight) == null ? void 0 : T.call(y, _);
             }, e.interceptorAutoWidth = () => {
-              var P, k, T, N, D, O;
-              const _ = (k = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(lt).getSkeletonParam(a)) == null ? void 0 : k.skeleton;
-              if (!_)
+              var P, k, U, L, y, T;
+              const v = (k = (P = this._renderManagerService.getRenderById(i)) == null ? void 0 : P.with(lt).getSkeletonParam(a)) == null ? void 0 : k.skeleton;
+              if (!v)
                 return;
-              const v = _.worksheet.getMergedCell(r, o), R = {
+              const p = v.worksheet.getMergedCell(r, o), _ = {
                 data: e,
-                style: _.getStyles().getStyleByCell(e),
-                primaryWithCoord: _.getCellWithCoordByIndex((T = v == null ? void 0 : v.startRow) != null ? T : r, (N = v == null ? void 0 : v.startColumn) != null ? N : o),
+                style: v.getStyles().getStyleByCell(e),
+                primaryWithCoord: v.getCellWithCoordByIndex((U = p == null ? void 0 : p.startRow) != null ? U : r, (L = p == null ? void 0 : p.startColumn) != null ? L : o),
                 unitId: i,
                 subUnitId: a,
                 row: r,
@@ -1170,8 +1171,8 @@ let Nn = class extends dn {
                 workbook: l,
                 worksheet: s
               };
-              return (O = (D = c == null ? void 0 : c.canvasRender) == null ? void 0 : D.calcCellAutoWidth) == null ? void 0 : O.call(D, R);
-            }, e.coverable = ((w = e == null ? void 0 : e.coverable) != null ? w : !0) && !(u.type === j.LIST || u.type === j.LIST_MULTIPLE), n(e);
+              return (T = (y = c == null ? void 0 : c.canvasRender) == null ? void 0 : y.calcCellAutoWidth) == null ? void 0 : T.call(y, _);
+            }, e.coverable = ((b = e == null ? void 0 : e.coverable) != null ? b : !0) && !(u.type === Y.LIST || u.type === Y.LIST_MULTIPLE), n(e);
           }
         }
       )
@@ -1179,13 +1180,13 @@ let Nn = class extends dn {
   }
   _initAutoHeight() {
     this._sheetDataValidationModel.ruleChange$.pipe(
-      mn((e) => e.source === "command"),
+      fn((e) => e.source === "command"),
       ur(16)
     ).subscribe((e) => {
       const t = [];
       if (e.forEach((n) => {
         var r;
-        (n.rule.type === j.LIST_MULTIPLE || n.rule.type === j.LIST) && (r = n.rule) != null && r.ranges && t.push(...n.rule.ranges);
+        (n.rule.type === Y.LIST_MULTIPLE || n.rule.type === Y.LIST) && (r = n.rule) != null && r.ranges && t.push(...n.rule.ranges);
       }), t.length) {
         const n = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
         jn(n.redos, this._commandService);
@@ -1194,20 +1195,20 @@ let Nn = class extends dn {
   }
 };
 Nn = Cr([
-  K(0, ee),
-  K(1, Ue),
-  K(2, E(pr)),
-  K(3, E(Me)),
-  K(4, E(cn)),
-  K(5, E(oe)),
-  K(6, E(rr))
+  G(0, te),
+  G(1, Ue),
+  G(2, D(pr)),
+  G(3, D(Me)),
+  G(4, D(un)),
+  G(5, D(oe)),
+  G(6, D(rr))
 ], Nn);
 var Jo = Object.getOwnPropertyDescriptor, Qo = (e, t, n, r) => {
   for (var o = r > 1 ? void 0 : r ? Jo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
 }, Un = (e, t) => (n, r) => t(n, r, e);
-let bt = class extends Re {
+let Et = class extends Re {
   constructor(e, t, n) {
     super(), this._context = e, this._sheetDataValidationModel = t, this._sheetSkeletonManagerService = n, this._initSkeletonChange();
   }
@@ -1227,13 +1228,13 @@ let bt = class extends Re {
     this.disposeWithMe(this._sheetDataValidationModel.validStatusChange$.pipe(Ur(16)).subscribe(e));
   }
 };
-bt = Qo([
-  Un(1, E(oe)),
-  Un(2, E(lt))
-], bt);
+Et = Qo([
+  Un(1, D(oe)),
+  Un(2, D(lt))
+], Et);
 function $e({ ref: e, ...t }) {
   const { icon: n, id: r, className: o, extend: i, ...a } = t, l = `univerjs-icon univerjs-icon-${r} ${o || ""}`.trim(), s = ht(`_${ni()}`);
-  return Ir(n, `${r}`, {
+  return wr(n, `${r}`, {
     defIds: n.defIds,
     idSuffix: s.current
   }, {
@@ -1242,12 +1243,12 @@ function $e({ ref: e, ...t }) {
     ...a
   }, i);
 }
-function Ir(e, t, n, r, o) {
-  return Ie(e.tag, {
+function wr(e, t, n, r, o) {
+  return we(e.tag, {
     key: t,
     ...ei(e, n, o),
     ...r
-  }, (ti(e, n).children || []).map((i, a) => Ir(i, `${t}-${e.tag}-${a}`, n, void 0, o)));
+  }, (ti(e, n).children || []).map((i, a) => wr(i, `${t}-${e.tag}-${a}`, n, void 0, o)));
 }
 function ei(e, t, n) {
   const r = { ...e.attrs };
@@ -1320,14 +1321,14 @@ const ri = {
       }
     }
   ]
-}, wr = nt(function(t, n) {
-  return Ie($e, Object.assign({}, t, {
+}, Ir = nt(function(t, n) {
+  return we($e, Object.assign({}, t, {
     id: "data-validation-icon",
     ref: n,
     icon: ri
   }));
 });
-wr.displayName = "DataValidationIcon";
+Ir.displayName = "DataValidationIcon";
 const oi = {
   tag: "svg",
   attrs: {
@@ -1370,7 +1371,7 @@ const oi = {
     }
   ]
 }, Sn = nt(function(t, n) {
-  return Ie($e, Object.assign({}, t, {
+  return we($e, Object.assign({}, t, {
     id: "delete-icon",
     ref: n,
     icon: oi
@@ -1394,7 +1395,7 @@ const ii = {
     }
   }]
 }, Rr = nt(function(t, n) {
-  return Ie($e, Object.assign({}, t, {
+  return we($e, Object.assign({}, t, {
     id: "increase-icon",
     ref: n,
     icon: ii
@@ -1419,14 +1420,14 @@ const ai = {
       clipRule: "evenodd"
     }
   }]
-}, In = nt(function(t, n) {
-  return Ie($e, Object.assign({}, t, {
+}, wn = nt(function(t, n) {
+  return we($e, Object.assign({}, t, {
     id: "more-down-icon",
     ref: n,
     icon: ai
   }));
 });
-In.displayName = "MoreDownIcon";
+wn.displayName = "MoreDownIcon";
 const si = {
   tag: "svg",
   attrs: {
@@ -1446,7 +1447,7 @@ const si = {
     }
   }]
 }, yr = nt(function(t, n) {
-  return Ie($e, Object.assign({}, t, {
+  return we($e, Object.assign({}, t, {
     id: "more-up-icon",
     ref: n,
     icon: si
@@ -1507,7 +1508,7 @@ const li = {
     }
   ]
 }, Mr = nt(function(t, n) {
-  return Ie($e, Object.assign({}, t, {
+  return we($e, Object.assign({}, t, {
     id: "sequence-icon",
     ref: n,
     icon: li
@@ -1516,27 +1517,27 @@ const li = {
 Mr.displayName = "SequenceIcon";
 function di(e) {
   var d;
-  const t = F(de), n = F(vn), { value: r, onChange: o, extraComponent: i } = e, [a, l] = W(!1), s = i ? n.get(i) : null;
-  return /* @__PURE__ */ H(ct, { children: [
-    /* @__PURE__ */ H(
+  const t = F(de), n = F(mn), { value: r, onChange: o, extraComponent: i } = e, [a, l] = W(!1), s = i ? n.get(i) : null;
+  return /* @__PURE__ */ j(ct, { children: [
+    /* @__PURE__ */ j(
       "div",
       {
         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"),
-          a ? /* @__PURE__ */ C(yr, { className: "univer-ml-1" }) : /* @__PURE__ */ C(In, { className: "univer-ml-1" })
+          a ? /* @__PURE__ */ C(yr, { className: "univer-ml-1" }) : /* @__PURE__ */ C(wn, { className: "univer-ml-1" })
         ]
       }
     ),
-    a && /* @__PURE__ */ H(ct, { children: [
+    a && /* @__PURE__ */ j(ct, { children: [
       s ? /* @__PURE__ */ C(s, { value: r, onChange: o }) : null,
       /* @__PURE__ */ C(
-        Y,
+        X,
         {
           label: t.t("dataValidation.panel.invalid"),
-          children: /* @__PURE__ */ H(
-            fn,
+          children: /* @__PURE__ */ j(
+            _n,
             {
               value: `${(d = r.errorStyle) != null ? d : st.WARNING}`,
               onChange: (u) => o({ ...r, errorStyle: +u }),
@@ -1549,11 +1550,11 @@ function di(e) {
         }
       ),
       /* @__PURE__ */ C(
-        Y,
+        X,
         {
           label: t.t("dataValidation.panel.messageInfo"),
           children: /* @__PURE__ */ C(
-            At,
+            Pt,
             {
               checked: r.showErrorMessage,
               onChange: () => o({
@@ -1565,7 +1566,7 @@ function di(e) {
           )
         }
       ),
-      r.showErrorMessage ? /* @__PURE__ */ C(Y, { children: /* @__PURE__ */ C(Pe, { value: r.error, onChange: (u) => o({ ...r, error: u }) }) }) : null
+      r.showErrorMessage ? /* @__PURE__ */ C(X, { children: /* @__PURE__ */ C(Pe, { value: r.error, onChange: (u) => o({ ...r, error: u }) }) }) : null
     ] })
   ] });
 }
@@ -1578,43 +1579,43 @@ const ci = (e) => Fr(
 );
 function ui(e, t, n) {
   var r, o, i, a;
-  return t ? ((o = (r = e.getUnit(t)) == null ? void 0 : r.getSheetBySheetName(n)) == null ? void 0 : o.getSheetId()) || "" : ((a = (i = e.getCurrentUnitForType(X.UNIVER_SHEET)) == null ? void 0 : i.getSheetBySheetName(n)) == null ? void 0 : a.getSheetId()) || "";
+  return t ? ((o = (r = e.getUnit(t)) == null ? void 0 : r.getSheetBySheetName(n)) == null ? void 0 : o.getSheetId()) || "" : ((a = (i = e.getCurrentUnitForType(Z.UNIVER_SHEET)) == null ? void 0 : i.getSheetBySheetName(n)) == null ? void 0 : a.getSheetId()) || "";
 }
 function hi() {
-  var M, U;
-  const [e, t] = W(0), n = F(me), r = Oe(n.activeRule$, n.activeRule), { unitId: o, subUnitId: i, rule: a } = r || {}, l = a.uid, s = F(Me), d = F(le), u = F(vn), p = F(ee), c = F(pn), m = F(de), [h, b] = W(a), y = s.getValidatorItem(h.type), [I, S] = W(!1), g = s.getValidatorsByScope(lo.SHEET), [w, _] = W(() => h.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), v = dt(() => ci(p), [p]), [R, P] = W(!1), [k, T] = W(!1), N = ht(null), D = F(Gn);
+  var M, N;
+  const [e, t] = W(0), n = F(me), r = Oe(n.activeRule$, n.activeRule), { unitId: o, subUnitId: i, rule: a } = r || {}, l = a.uid, s = F(Me), d = F(le), u = F(mn), g = F(te), c = F(gn), m = F(de), [h, E] = W(a), R = s.getValidatorItem(h.type), [w, S] = W(!1), I = s.getValidatorsByScope(lo.SHEET), [b, v] = W(() => h.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), p = dt(() => ci(g), [g]), [_, P] = W(!1), [k, U] = W(!1), L = ht(null), y = F(Gn);
   if (Le(() => () => {
-    const f = D.getCurrentLastSelection();
-    f && D.setSelections([f]);
-  }, [D]), Le(() => {
-    p.onCommandExecuted((f) => {
+    const f = y.getCurrentLastSelection();
+    f && y.setSelections([f]);
+  }, [y]), Le(() => {
+    g.onCommandExecuted((f) => {
       (f.id === $r.id || f.id === xr.id) && setTimeout(() => {
-        const A = c.getRuleById(o, i, l);
-        t(($) => $ + 1), A && (b(A), _(A.ranges.map(($) => ({ unitId: "", sheetId: "", range: $ }))));
+        const O = c.getRuleById(o, i, l);
+        t(($) => $ + 1), O && (E(O), v(O.ranges.map(($) => ({ unitId: "", sheetId: "", range: $ }))));
       }, 20);
     });
-  }, [p, c, l, i, o]), !y)
+  }, [g, c, l, i, o]), !R)
     return null;
-  const O = y.operators, L = y.operatorNames, x = h.operator ? co.includes(h.operator) : !1, G = () => {
-    var f, A, $;
-    (A = (f = N.current) == null ? void 0 : f.editor) != null && A.isFocus() && te(($ = N.current) == null ? void 0 : $.getValue()), !(!h.ranges.length || R) && (y.validatorFormula(h, o, i).success ? n.setActiveRule(null) : S(!0));
-  }, te = tn((f) => {
-    const A = f.split(",").filter(Boolean).map(To).map((J) => {
-      const wn = J.sheetName;
-      if (wn) {
-        const Vr = ui(d, J.unitId, wn);
-        return { ...J, sheetId: Vr };
+  const T = R.operators, A = R.operatorNames, x = h.operator ? co.includes(h.operator) : !1, H = () => {
+    var f, O, $;
+    (O = (f = L.current) == null ? void 0 : f.editor) != null && O.isFocus() && q(($ = L.current) == null ? void 0 : $.getValue()), !(!h.ranges.length || _) && (R.validatorFormula(h, o, i).success ? n.setActiveRule(null) : S(!0));
+  }, q = nn((f) => {
+    const O = f.split(",").filter(Boolean).map(To).map((Q) => {
+      const In = Q.sheetName;
+      if (In) {
+        const Vr = ui(d, Q.unitId, In);
+        return { ...Q, sheetId: Vr };
       }
       return {
-        ...J,
+        ...Q,
         sheetId: ""
       };
     });
-    if (Br(A, w))
+    if (Br(O, b))
       return;
-    _(A);
-    const $ = A.filter((J) => (!J.unitId || J.unitId === o) && (!J.sheetId || J.sheetId === i)).map((J) => J.range);
-    if (b({
+    v(O);
+    const $ = O.filter((Q) => (!Q.unitId || Q.unitId === o) && (!Q.sheetId || Q.sheetId === i)).map((Q) => Q.range);
+    if (E({
       ...h,
       ranges: $
     }), $.length === 0)
@@ -1625,27 +1626,27 @@ function hi() {
       ruleId: l,
       ranges: $
     };
-    v(nr.id, ce);
+    p(nr.id, ce);
   }), B = (f) => {
     if (Rn(f, Tn(h)))
       return;
-    b({
+    E({
       ...h,
       ...f
     });
-    const A = {
+    const O = {
       unitId: o,
       subUnitId: i,
       ruleId: l,
       setting: f
     };
-    v(
+    p(
       En.id,
-      A,
+      O,
       void 0
     );
   }, ne = async () => {
-    await p.executeCommand(or.id, {
+    await g.executeCommand(or.id, {
       ruleId: l,
       unitId: o,
       subUnitId: i
@@ -1657,10 +1658,10 @@ function hi() {
     formula2: h.formula2,
     allowBlank: h.allowBlank
   }, _e = (f) => {
-    const A = s.getValidatorItem(f);
-    if (!A)
+    const O = s.getValidatorItem(f);
+    if (!O)
       return;
-    const $ = A.operators, ce = c.getRuleById(o, i, l), J = f === (ce == null ? void 0 : ce.type) || f.includes("list") && (ce != null && ce.type.includes("list")) ? {
+    const $ = O.operators, ce = c.getRuleById(o, i, l), Q = f === (ce == null ? void 0 : ce.type) || f.includes("list") && (ce != null && ce.type.includes("list")) ? {
       ...ce,
       type: f
     } : {
@@ -1670,17 +1671,17 @@ function hi() {
       formula1: void 0,
       formula2: void 0
     };
-    b(J), p.executeCommand(En.id, {
+    E(Q), g.executeCommand(En.id, {
       unitId: o,
       subUnitId: i,
       ruleId: h.uid,
-      setting: Tn(J)
+      setting: Tn(Q)
     });
-  }, Ce = u.get(y.formulaInput), q = dt(() => w.map((f) => gr(f.range)).join(","), []), Z = Vn(h), ge = (f) => {
-    Rn(f, Vn(h)) || (b({
+  }, Ce = u.get(R.formulaInput), J = dt(() => b.map((f) => gr(f.range)).join(","), []), K = Vn(h), ge = (f) => {
+    Rn(f, Vn(h)) || (E({
       ...h,
       ...f
-    }), v(
+    }), p(
       Qr.id,
       {
         unitId: o,
@@ -1689,46 +1690,46 @@ function hi() {
         options: f
       }
     ));
-  }, z = O.length && !h.operator;
-  return /* @__PURE__ */ H("div", { "data-u-comp": "data-validation-detail", className: "univer-py-2", children: [
+  }, z = T.length && !h.operator;
+  return /* @__PURE__ */ j("div", { "data-u-comp": "data-validation-detail", className: "univer-py-2", children: [
     /* @__PURE__ */ C(
-      Y,
+      X,
       {
         label: m.t("dataValidation.panel.range"),
-        error: !h.ranges.length || R ? m.t("dataValidation.panel.rangeError") : "",
+        error: !h.ranges.length || _ ? m.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ C(
           Oo,
           {
-            selectorRef: N,
+            selectorRef: L,
             unitId: o,
             subUnitId: i,
-            initialValue: q,
-            onChange: (f, A) => {
+            initialValue: J,
+            onChange: (f, O) => {
               var $;
-              !k && (($ = N.current) != null && $.verify()) && te(A);
+              !k && (($ = L.current) != null && $.verify()) && q(O);
             },
-            onFocusChange: (f, A) => {
+            onFocusChange: (f, O) => {
               var $;
-              T(f), !f && A && (($ = N.current) != null && $.verify()) && te(A);
+              U(f), !f && O && (($ = L.current) != null && $.verify()) && q(O);
             },
             onVerify: (f) => P(!f)
           }
         )
       }
     ),
-    /* @__PURE__ */ C(Y, { label: m.t("dataValidation.panel.type"), children: /* @__PURE__ */ C(
+    /* @__PURE__ */ C(X, { label: m.t("dataValidation.panel.type"), children: /* @__PURE__ */ C(
       Ln,
       {
         className: "univer-w-full",
         value: h.type,
-        options: (M = g == null ? void 0 : g.sort((f, A) => f.order - A.order)) == null ? void 0 : M.map((f) => ({
+        options: (M = I == null ? void 0 : I.sort((f, O) => f.order - O.order)) == null ? void 0 : M.map((f) => ({
           label: m.t(f.title),
           value: f.id
         })),
         onChange: _e
       }
     ) }),
-    O != null && O.length ? /* @__PURE__ */ C(Y, { label: m.t("dataValidation.panel.operator"), children: /* @__PURE__ */ C(
+    T != null && T.length ? /* @__PURE__ */ C(X, { label: m.t("dataValidation.panel.operator"), children: /* @__PURE__ */ C(
       Ln,
       {
         className: "univer-w-full",
@@ -1738,9 +1739,9 @@ function hi() {
             value: "",
             label: m.t("dataValidation.operators.legal")
           },
-          ...O.map((f, A) => ({
+          ...T.map((f, O) => ({
             value: `${f}`,
-            label: L[A]
+            label: A[O]
           }))
         ],
         onChange: (f) => {
@@ -1765,18 +1766,18 @@ function hi() {
             ...f
           });
         },
-        showError: I,
-        validResult: y.validatorFormula(h, o, i),
+        showError: w,
+        validResult: R.validatorFormula(h, o, i),
         unitId: o,
         subUnitId: i,
         ruleId: l
       },
       e + h.type
     ) : null,
-    /* @__PURE__ */ C(Y, { children: /* @__PURE__ */ C(
-      At,
+    /* @__PURE__ */ C(X, { children: /* @__PURE__ */ C(
+      Pt,
       {
-        checked: (U = h.allowBlank) != null ? U : !0,
+        checked: (N = h.allowBlank) != null ? N : !0,
         onChange: () => {
           var f;
           return B({
@@ -1787,34 +1788,34 @@ function hi() {
         children: m.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ C(di, { value: Z, onChange: ge, extraComponent: y.optionsInput }),
-    /* @__PURE__ */ H("div", { className: "univer-mt-5 univer-flex univer-flex-row univer-justify-end", children: [
+    /* @__PURE__ */ C(di, { value: K, onChange: ge, extraComponent: R.optionsInput }),
+    /* @__PURE__ */ j("div", { className: "univer-mt-5 univer-flex univer-flex-row univer-justify-end", children: [
       /* @__PURE__ */ C(Ke, { className: "univer-ml-3", onClick: ne, children: m.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ C(Ke, { className: "univer-ml-3", variant: "primary", onClick: G, children: m.t("dataValidation.panel.done") })
+      /* @__PURE__ */ C(Ke, { className: "univer-ml-3", variant: "primary", onClick: H, children: m.t("dataValidation.panel.done") })
     ] })
   ] });
 }
 const pi = (e) => {
-  const { rule: t, onClick: n, unitId: r, subUnitId: o, disable: i } = e, a = F(Me), l = F(ee), s = F(Eo), d = a.getValidatorItem(t.type), u = ht(void 0), [p, c] = W(!1), m = F(Yn), h = Oe(m.currentTheme$), b = dt(() => {
-    var _;
-    const I = m.getColorFromTheme("primary.600"), S = m.getColorFromTheme("loop-color.2"), g = (_ = m.getColorFromTheme(S)) != null ? _ : I, w = new Wr(g).toRgb();
+  const { rule: t, onClick: n, unitId: r, subUnitId: o, disable: i } = e, a = F(Me), l = F(te), s = F(Eo), d = a.getValidatorItem(t.type), u = ht(void 0), [g, c] = W(!1), m = F(Yn), h = Oe(m.currentTheme$), E = dt(() => {
+    var v;
+    const w = m.getColorFromTheme("primary.600"), S = m.getColorFromTheme("loop-color.2"), I = (v = m.getColorFromTheme(S)) != null ? v : w, b = new Wr(I).toRgb();
     return {
-      fill: `rgba(${w.r}, ${w.g}, ${w.b}, 0.1)`,
-      stroke: g
+      fill: `rgba(${b.r}, ${b.g}, ${b.b}, 0.1)`,
+      stroke: I
     };
-  }, [h]), y = (I) => {
+  }, [h]), R = (w) => {
     l.executeCommand(or.id, {
       ruleId: t.uid,
       unitId: r,
       subUnitId: o
-    }), I.stopPropagation();
+    }), w.stopPropagation();
   };
   return Le(() => () => {
-    var I;
-    u.current && ((I = u.current) == null || I.forEach((S) => {
+    var w;
+    u.current && ((w = u.current) == null || w.forEach((S) => {
       S && s.removeShape(S);
     }));
-  }, [s]), /* @__PURE__ */ H(
+  }, [s]), /* @__PURE__ */ j(
     "div",
     {
       className: ke(
@@ -1830,15 +1831,15 @@ const pi = (e) => {
       ),
       onClick: n,
       onMouseEnter: () => {
-        i || (c(!0), u.current = t.ranges.map((I) => s.addShape({
-          range: I,
-          style: b,
+        i || (c(!0), u.current = t.ranges.map((w) => s.addShape({
+          range: w,
+          style: E,
           primary: null
         })));
       },
       onMouseLeave: () => {
-        var I;
-        c(!1), (I = u.current) == null || I.forEach((S) => {
+        var w;
+        c(!1), (w = u.current) == null || w.forEach((S) => {
           S && s.removeShape(S);
         }), u.current = void 0;
       },
@@ -1854,14 +1855,14 @@ const pi = (e) => {
           "div",
           {
             className: "univer-text-secondary univer-truncate univer-text-xs univer-leading-[18px] dark:!univer-text-gray-300",
-            children: t.ranges.map((I) => gr(I)).join(",")
+            children: t.ranges.map((w) => gr(w)).join(",")
           }
         ),
-        p ? /* @__PURE__ */ C(
+        g ? /* @__PURE__ */ C(
           "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 dark:!univer-text-gray-300 dark:hover:!univer-bg-gray-700",
-            onClick: y,
+            onClick: R,
             children: /* @__PURE__ */ C(Sn, {})
           }
         ) : null
@@ -1870,66 +1871,66 @@ const pi = (e) => {
   );
 };
 function gi(e) {
-  const t = F(oe), n = F(le), r = F(ee), o = F(ye), i = F(me), a = F(de), [l, s] = W([]), { workbook: d } = e, u = Oe(d.activeSheet$, void 0, !0), p = d.getUnitId(), c = u == null ? void 0 : u.getSheetId();
+  const t = F(oe), n = F(le), r = F(te), o = F(ye), i = F(me), a = F(de), [l, s] = W([]), { workbook: d } = e, u = Oe(d.activeSheet$, void 0, !0), g = d.getUnitId(), c = u == null ? void 0 : u.getSheetId();
   Le(() => {
-    s(t.getRules(p, c));
-    const S = t.ruleChange$.subscribe((g) => {
-      g.unitId === p && g.subUnitId === c && s(t.getRules(p, c));
+    s(t.getRules(g, c));
+    const S = t.ruleChange$.subscribe((I) => {
+      I.unitId === g && I.subUnitId === c && s(t.getRules(g, c));
     });
     return () => {
       S.unsubscribe();
     };
-  }, [p, c, t]);
+  }, [g, c, t]);
   const m = async () => {
-    const S = er(o), g = {
-      unitId: p,
+    const S = er(o), I = {
+      unitId: g,
       subUnitId: c,
       rule: S
     };
-    await r.executeCommand(un.id, g), i.setActiveRule({
-      unitId: p,
+    await r.executeCommand(hn.id, I), i.setActiveRule({
+      unitId: g,
       subUnitId: c,
       rule: S
     });
   }, h = () => {
     r.executeCommand(eo.id, {
-      unitId: p,
+      unitId: g,
       subUnitId: c
     });
-  }, y = ((S) => {
-    const g = n.getCurrentUnitForType(X.UNIVER_SHEET), w = g.getActiveSheet(), _ = g.getUnitId(), v = w.getSheetId();
-    return S.map((P) => qr(o, _, v, P.ranges) ? { ...P } : { ...P, disable: !0 });
-  })(l), I = y == null ? void 0 : y.some((S) => S.disable);
-  return /* @__PURE__ */ H("div", { className: "univer-pb-4", children: [
-    y == null ? void 0 : y.map((S) => {
-      var g;
+  }, R = ((S) => {
+    const I = n.getCurrentUnitForType(Z.UNIVER_SHEET), b = I.getActiveSheet(), v = I.getUnitId(), p = b.getSheetId();
+    return S.map((P) => qr(o, v, p, P.ranges) ? { ...P } : { ...P, disable: !0 });
+  })(l), w = R == null ? void 0 : R.some((S) => S.disable);
+  return /* @__PURE__ */ j("div", { className: "univer-pb-4", children: [
+    R == null ? void 0 : R.map((S) => {
+      var I;
       return /* @__PURE__ */ C(
         pi,
         {
-          unitId: p,
+          unitId: g,
           subUnitId: c,
           onClick: () => {
             S.disable || i.setActiveRule({
-              unitId: p,
+              unitId: g,
               subUnitId: c,
               rule: S
             });
           },
           rule: S,
-          disable: (g = S.disable) != null ? g : !1
+          disable: (I = S.disable) != null ? I : !1
         },
         S.uid
       );
     }),
-    /* @__PURE__ */ H("div", { className: "univer-mt-4 univer-flex univer-flex-row univer-justify-end univer-gap-2", children: [
-      l.length && !I ? /* @__PURE__ */ C(Ke, { onClick: h, children: a.t("dataValidation.panel.removeAll") }) : null,
+    /* @__PURE__ */ j("div", { className: "univer-mt-4 univer-flex univer-flex-row univer-justify-end univer-gap-2", children: [
+      l.length && !w ? /* @__PURE__ */ C(Ke, { onClick: h, children: a.t("dataValidation.panel.removeAll") }) : null,
       /* @__PURE__ */ C(Ke, { variant: "primary", onClick: m, children: a.t("dataValidation.panel.add") })
     ] })
   ] });
 }
 const vi = () => {
   const e = F(me), t = Oe(e.activeRule$, e.activeRule), n = F(le), r = Oe(
-    () => n.getCurrentTypeOfUnit$(X.UNIVER_SHEET),
+    () => n.getCurrentTypeOfUnit$(Z.UNIVER_SHEET),
     void 0,
     void 0,
     []
@@ -1940,8 +1941,8 @@ const vi = () => {
   return !r || !o ? null : t && t.subUnitId === o.getSheetId() ? /* @__PURE__ */ C(hi, {}, t.rule.uid) : /* @__PURE__ */ C(gi, { workbook: r });
 }, mi = (e) => {
   const { isTwoFormula: t = !1, value: n, onChange: r, showError: o, validResult: i } = e, a = F(de), l = o ? i == null ? void 0 : i.formula1 : "", s = o ? i == null ? void 0 : i.formula2 : "";
-  return t ? /* @__PURE__ */ H(ct, { children: [
-    /* @__PURE__ */ C(Y, { error: l, children: /* @__PURE__ */ C(
+  return t ? /* @__PURE__ */ j(ct, { children: [
+    /* @__PURE__ */ C(X, { error: l, children: /* @__PURE__ */ C(
       Pe,
       {
         className: "univer-w-full",
@@ -1956,7 +1957,7 @@ const vi = () => {
       }
     ) }),
     /* @__PURE__ */ C("div", { className: "-univer-mt-2 univer-mb-1 univer-text-sm univer-text-gray-400", children: a.t("dataValidation.panel.formulaAnd") }),
-    /* @__PURE__ */ C(Y, { error: s, children: /* @__PURE__ */ C(
+    /* @__PURE__ */ C(X, { error: s, children: /* @__PURE__ */ C(
       Pe,
       {
         className: "univer-w-full",
@@ -1970,7 +1971,7 @@ const vi = () => {
         }
       }
     ) })
-  ] }) : /* @__PURE__ */ C(Y, { error: l, children: /* @__PURE__ */ C(
+  ] }) : /* @__PURE__ */ C(X, { error: l, children: /* @__PURE__ */ C(
     Pe,
     {
       className: "univer-w-full",
@@ -1984,9 +1985,9 @@ const vi = () => {
 };
 function fi(e) {
   const { value: t, onChange: n, showError: r, validResult: o } = e, i = F(de), a = r ? o == null ? void 0 : o.formula1 : "", l = r ? o == null ? void 0 : o.formula2 : "", [s, d] = W(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
-  return /* @__PURE__ */ H(ct, { children: [
-    /* @__PURE__ */ C(Y, { children: /* @__PURE__ */ C(
-      At,
+  return /* @__PURE__ */ j(ct, { children: [
+    /* @__PURE__ */ C(X, { children: /* @__PURE__ */ C(
+      Pt,
       {
         checked: s,
         onChange: (u) => {
@@ -1999,7 +2000,7 @@ function fi(e) {
         children: i.t("dataValidation.checkbox.tips")
       }
     ) }),
-    s ? /* @__PURE__ */ C(Y, { label: i.t("dataValidation.checkbox.checked"), error: a, children: /* @__PURE__ */ C(
+    s ? /* @__PURE__ */ C(X, { label: i.t("dataValidation.checkbox.checked"), error: a, children: /* @__PURE__ */ C(
       Pe,
       {
         className: "univer-w-full",
@@ -2013,7 +2014,7 @@ function fi(e) {
         }
       }
     ) }) : null,
-    s ? /* @__PURE__ */ C(Y, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ C(
+    s ? /* @__PURE__ */ C(X, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ C(
       Pe,
       {
         className: "univer-w-full",
@@ -2030,17 +2031,17 @@ function fi(e) {
   ] });
 }
 function _i(e) {
-  var p;
+  var g;
   const { unitId: t, subUnitId: n, value: r, onChange: o, showError: i, validResult: a } = e, l = i ? a == null ? void 0 : a.formula1 : void 0, s = ht(null), [d, u] = W(!1);
   return dr((c) => {
     var h;
     (h = s.current) != null && h.isClickOutSide(c) && u(!1);
-  }), /* @__PURE__ */ C(Y, { error: l, children: /* @__PURE__ */ C(
+  }), /* @__PURE__ */ C(X, { error: l, children: /* @__PURE__ */ C(
     vr,
     {
       ref: s,
       className: ke("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 hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-white [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent", Rt),
-      initValue: (p = r == null ? void 0 : r.formula1) != null ? p : "=",
+      initValue: (g = r == null ? void 0 : r.formula1) != null ? g : "=",
       unitId: t,
       subUnitId: n,
       isFocus: d,
@@ -2109,7 +2110,7 @@ const Ci = [
           )
         }
       ),
-      children: /* @__PURE__ */ H(
+      children: /* @__PURE__ */ j(
         "div",
         {
           className: ke("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 hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-white", Rt),
@@ -2121,7 +2122,7 @@ const Ci = [
                 style: { background: t }
               }
             ),
-            /* @__PURE__ */ C(In, {})
+            /* @__PURE__ */ C(wn, {})
           ]
         }
       )
@@ -2129,7 +2130,7 @@ const Ci = [
   );
 }, Fn = (e) => {
   const { item: t, commonProps: n, className: r } = e, { onItemChange: o, onItemDelete: i } = n;
-  return /* @__PURE__ */ H("div", { className: ke("univer-flex univer-items-center univer-gap-2", r), children: [
+  return /* @__PURE__ */ j("div", { className: ke("univer-flex univer-items-center univer-gap-2", r), children: [
     !t.isRef && /* @__PURE__ */ C("div", { className: ke("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ C(Mr, {}) }),
     /* @__PURE__ */ C(
       Si,
@@ -2159,50 +2160,50 @@ const Ci = [
     )
   ] });
 };
-function Ii(e) {
+function wi(e) {
   const { value: t, onChange: n = () => {
-  }, unitId: r, subUnitId: o, validResult: i, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, p] = W(() => De(s) ? "1" : "0"), [c, m] = W(u === "1" ? s : "="), [h, b] = W(u === "1" ? s : "="), y = F(de), I = F(Me), S = F(pn), g = F(to), [w, _] = W(() => d.split(",")), v = I.getValidatorItem(j.LIST), [R, P] = W([]), [k, T] = W(""), N = a ? i == null ? void 0 : i.formula1 : "", D = dt(() => S.ruleChange$.pipe(cr(16)), []), O = Oe(D), L = tn(n);
+  }, unitId: r, subUnitId: o, validResult: i, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, g] = W(() => De(s) ? "1" : "0"), [c, m] = W(u === "1" ? s : "="), [h, E] = W(u === "1" ? s : "="), R = F(de), w = F(Me), S = F(gn), I = F(to), [b, v] = W(() => d.split(",")), p = w.getValidatorItem(Y.LIST), [_, P] = W([]), [k, U] = W(""), L = a ? i == null ? void 0 : i.formula1 : "", y = dt(() => S.ruleChange$.pipe(cr(16)), []), T = Oe(y), A = nn(n);
   Le(() => {
     (async () => {
       await new Promise((f) => {
         setTimeout(() => f(!0), 100);
       });
-      const M = S.getRuleById(r, o, l), U = M == null ? void 0 : M.formula1;
-      if (De(U) && v && M) {
-        const f = await v.getListAsync(M, r, o);
+      const M = S.getRuleById(r, o, l), N = M == null ? void 0 : M.formula1;
+      if (De(N) && p && M) {
+        const f = await p.getListAsync(M, r, o);
         P(f);
       }
     })();
-  }, [S, O, v, l, o, r]), Le(() => {
-    De(s) && s !== h && (m(s), b(h));
+  }, [S, T, p, l, o, r]), Le(() => {
+    De(s) && s !== h && (m(s), E(h));
   }, [h, s]);
-  const [x, G] = W(() => {
-    const M = u !== "1" ? no(s) : [], U = d.split(",");
-    return M.map((f, A) => ({
+  const [x, H] = W(() => {
+    const M = u !== "1" ? no(s) : [], N = d.split(",");
+    return M.map((f, O) => ({
       label: f,
-      color: U[A] || Te,
+      color: N[O] || Te,
       isRef: !1,
       id: yn(4)
     }));
-  }), te = (M, U, f) => {
-    const A = x.find(($) => $.id === M);
-    A && (A.label = U, A.color = f, G([...x]));
+  }), q = (M, N, f) => {
+    const O = x.find(($) => $.id === M);
+    O && (O.label = N, O.color = f, H([...x]));
   }, B = (M) => {
-    const U = x.findIndex((f) => f.id === M);
-    U !== -1 && (x.splice(U, 1), G([...x]));
-  }, ne = d.split(","), ie = dt(() => R.map((M, U) => ({
+    const N = x.findIndex((f) => f.id === M);
+    N !== -1 && (x.splice(N, 1), H([...x]));
+  }, ne = d.split(","), ie = dt(() => _.map((M, N) => ({
     label: M,
-    color: ne[U] || Te,
-    id: `${U}`,
+    color: ne[N] || Te,
+    id: `${N}`,
     isRef: !0
-  })), [ne, R]), _e = (M, U, f) => {
-    const A = [...w];
-    A[+M] = f, _(A), L({
+  })), [ne, _]), _e = (M, N, f) => {
+    const O = [...b];
+    O[+M] = f, v(O), A({
       formula1: s,
-      formula2: A.join(",")
+      formula2: O.join(",")
     });
   }, Ce = () => {
-    G([
+    H([
       ...x,
       {
         label: "",
@@ -2215,63 +2216,63 @@ function Ii(e) {
   Le(() => {
     if (u === "1")
       return;
-    const M = /* @__PURE__ */ new Set(), U = [];
+    const M = /* @__PURE__ */ new Set(), N = [];
     x.map((f) => ({
       labelList: f.label.split(","),
       item: f
-    })).forEach(({ item: f, labelList: A }) => {
-      A.forEach(($) => {
-        M.has($) || (M.add($), U.push({
+    })).forEach(({ item: f, labelList: O }) => {
+      O.forEach(($) => {
+        M.has($) || (M.add($), N.push({
           label: $,
           color: f.color
         }));
       });
-    }), L({
-      formula1: Qn(U.map((f) => f.label)),
-      formula2: U.map((f) => f.color === Te ? "" : f.color).join(",")
+    }), A({
+      formula1: Qn(N.map((f) => f.label)),
+      formula2: N.map((f) => f.color === Te ? "" : f.color).join(",")
     });
-  }, [x, L, u, h, w]);
-  const q = tn(async (M) => {
+  }, [x, A, u, h, b]);
+  const J = nn(async (M) => {
     if (!De(M)) {
-      L == null || L({
+      A == null || A({
         formula1: "",
         formula2: d
       });
       return;
     }
-    g.getFormulaRefCheck(M) ? (L == null || L({
+    I.getFormulaRefCheck(M) ? (A == null || A({
       formula1: De(M) ? M : "",
       formula2: d
-    }), T("")) : (L == null || L({
+    }), U("")) : (A == null || A({
       formula1: "",
       formula2: d
-    }), m("="), T(y.t("dataValidation.validFail.formulaError")));
-  }), Z = ht(null), [ge, z] = W(!1);
+    }), m("="), U(R.t("dataValidation.validFail.formulaError")));
+  }), K = ht(null), [ge, z] = W(!1);
   return dr((M) => {
     var f;
-    (f = Z.current) != null && f.isClickOutSide(M) && z(!1);
-  }), /* @__PURE__ */ H(ct, { children: [
-    /* @__PURE__ */ C(Y, { label: y.t("dataValidation.list.options"), children: /* @__PURE__ */ H(
-      fn,
+    (f = K.current) != null && f.isClickOutSide(M) && z(!1);
+  }), /* @__PURE__ */ j(ct, { children: [
+    /* @__PURE__ */ C(X, { label: R.t("dataValidation.list.options"), children: /* @__PURE__ */ j(
+      _n,
       {
         value: u,
         onChange: (M) => {
-          p(M), m(h), M === "1" && L({
+          g(M), m(h), M === "1" && A({
             formula1: h === "=" ? "" : h,
-            formula2: w.join(",")
+            formula2: b.join(",")
           });
         },
         children: [
-          /* @__PURE__ */ C(Ae, { value: "0", children: y.t("dataValidation.list.customOptions") }),
-          /* @__PURE__ */ C(Ae, { value: "1", children: y.t("dataValidation.list.refOptions") })
+          /* @__PURE__ */ C(Ae, { value: "0", children: R.t("dataValidation.list.customOptions") }),
+          /* @__PURE__ */ C(Ae, { value: "1", children: R.t("dataValidation.list.refOptions") })
         ]
       }
     ) }),
-    u === "1" ? /* @__PURE__ */ H(Y, { error: N || k || void 0, children: [
+    u === "1" ? /* @__PURE__ */ j(X, { error: L || k || void 0, children: [
       /* @__PURE__ */ C(
         vr,
         {
-          ref: Z,
+          ref: K,
           className: ke("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 hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-white [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent", Rt),
           initValue: c,
           unitId: r,
@@ -2280,8 +2281,8 @@ function Ii(e) {
           isSupportAcrossSheet: !0,
           onFocus: () => z(!0),
           onChange: (M = "") => {
-            const U = (M != null ? M : "").trim();
-            b(U), q(U);
+            const N = (M != null ? M : "").trim();
+            E(N), J(N);
           }
         }
       ),
@@ -2294,12 +2295,12 @@ function Ii(e) {
         },
         M.id
       )) })
-    ] }) : /* @__PURE__ */ C(Y, { error: N, children: /* @__PURE__ */ H("div", { className: "-univer-mt-3", children: [
+    ] }) : /* @__PURE__ */ C(X, { error: L, children: /* @__PURE__ */ j("div", { className: "-univer-mt-3", children: [
       /* @__PURE__ */ C(
         Do,
         {
           list: x,
-          onListChange: G,
+          onListChange: H,
           rowHeight: 28,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
@@ -2308,7 +2309,7 @@ function Ii(e) {
             {
               item: M,
               commonProps: {
-                onItemChange: te,
+                onItemChange: q,
                 onItemDelete: B
               }
             },
@@ -2317,54 +2318,54 @@ function Ii(e) {
           idKey: "id"
         }
       ),
-      /* @__PURE__ */ H(
+      /* @__PURE__ */ j(
         "a",
         {
           className: "univer-text-primary 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 hover:univer-bg-primary-50 dark:hover:!univer-bg-gray-800",
           onClick: Ce,
           children: [
             /* @__PURE__ */ C(Rr, { className: "univer-mr-1" }),
-            y.t("dataValidation.list.add")
+            R.t("dataValidation.list.add")
           ]
         }
       )
     ] }) })
   ] });
 }
-const wi = [
+const Ii = [
   [
     ir,
     _i
   ],
   [
-    Ot,
+    At,
     mi
   ],
   [
-    hn,
-    Ii
+    pn,
+    wi
   ],
   [
     ar,
     fi
   ]
 ], Ri = "LIST_RENDER_MODE_OPTION_INPUT";
-function Et(e) {
+function Dt(e) {
   var o;
   const { value: t, onChange: n } = e, r = F(de);
-  return /* @__PURE__ */ C(Y, { label: r.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ H(fn, { value: `${(o = t.renderMode) != null ? o : ae.CUSTOM}`, onChange: (i) => n({ ...t, renderMode: +i }), children: [
+  return /* @__PURE__ */ C(X, { label: r.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ j(_n, { value: `${(o = t.renderMode) != null ? o : ae.CUSTOM}`, onChange: (i) => n({ ...t, renderMode: +i }), children: [
     /* @__PURE__ */ C(Ae, { value: `${ae.CUSTOM}`, children: r.t("dataValidation.renderMode.chip") }),
     /* @__PURE__ */ C(Ae, { value: `${ae.ARROW}`, children: r.t("dataValidation.renderMode.arrow") }),
     /* @__PURE__ */ C(Ae, { value: `${ae.TEXT}`, children: r.t("dataValidation.renderMode.text") })
   ] }) });
 }
-Et.componentKey = Ri;
+Dt.componentKey = Ri;
 const yi = "DATE_SHOW_TIME_OPTION";
-function Dt(e) {
+function Vt(e) {
   var o;
   const { value: t, onChange: n } = e, r = F(de);
-  return /* @__PURE__ */ C(Y, { children: /* @__PURE__ */ C(
-    At,
+  return /* @__PURE__ */ C(X, { children: /* @__PURE__ */ C(
+    Pt,
     {
       checked: (o = t.bizInfo) == null ? void 0 : o.showTime,
       onChange: (i) => {
@@ -2380,19 +2381,19 @@ function Dt(e) {
     }
   ) });
 }
-Dt.componentKey = yi;
+Vt.componentKey = yi;
 var Mi = Object.getOwnPropertyDescriptor, bi = (e, t, n, r) => {
   for (var o = r > 1 ? void 0 : r ? Mi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
 }, We = (e, t) => (n, r) => t(n, r, e);
 const ft = 6;
-let rn = class {
+let on = class {
   constructor(e, t, n, r, o, i) {
     this._commandService = e, this._univerInstanceService = t, this._formulaService = n, this._themeService = r, this._renderManagerService = o, this._dataValidationModel = i;
   }
   _calc(e, t) {
-    var d, u, p;
+    var d, u, g;
     const { vt: n, ht: r } = t || {}, o = e.endX - e.startX - ft * 2, i = e.endY - e.startY, a = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
     let l = 0, s = 0;
     switch (n) {
@@ -2407,10 +2408,10 @@ let rn = class {
         break;
     }
     switch (r) {
-      case we.LEFT:
+      case Ie.LEFT:
         l = ft;
         break;
-      case we.RIGHT:
+      case Ie.RIGHT:
         l = ft + (o - a);
         break;
       default:
@@ -2421,7 +2422,7 @@ let rn = class {
       left: e.startX + l,
       top: e.startY + s,
       width: ((u = t == null ? void 0 : t.fs) != null ? u : 10) * 1.6,
-      height: ((p = t == null ? void 0 : t.fs) != null ? p : 10) * 1.6
+      height: ((g = t == null ? void 0 : t.fs) != null ? g : 10) * 1.6
     };
   }
   calcCellAutoHeight(e) {
@@ -2435,25 +2436,25 @@ let rn = class {
     return ((n = t == null ? void 0 : t.fs) != null ? n : 10) * 1.6;
   }
   async _parseFormula(e, t, n) {
-    var d, u, p, c, m, h, b, y, I;
-    const { formula1: r = io, formula2: o = oo } = e, i = await this._formulaService.getRuleFormulaResult(t, n, e.uid), a = Ut((p = (u = (d = i == null ? void 0 : i[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : p[0]), l = Ut((h = (m = (c = i == null ? void 0 : i[1]) == null ? void 0 : c.result) == null ? void 0 : m[0]) == null ? void 0 : h[0]), s = Dn(String(a)) && Dn(String(l));
+    var d, u, g, c, m, h, E, R, w;
+    const { formula1: r = io, formula2: o = oo } = e, i = await this._formulaService.getRuleFormulaResult(t, n, e.uid), a = Ft((g = (u = (d = i == null ? void 0 : i[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : g[0]), l = Ft((h = (m = (c = i == null ? void 0 : i[1]) == null ? void 0 : c.result) == null ? void 0 : m[0]) == null ? void 0 : h[0]), s = Dn(String(a)) && Dn(String(l));
     return {
-      formula1: De(r) ? Ut((I = (y = (b = i == null ? void 0 : i[0]) == null ? void 0 : b.result) == null ? void 0 : y[0]) == null ? void 0 : I[0]) : r,
+      formula1: De(r) ? Ft((w = (R = (E = i == null ? void 0 : i[0]) == null ? void 0 : E.result) == null ? void 0 : R[0]) == null ? void 0 : w[0]) : r,
       formula2: De(o) ? l : o,
       isFormulaValid: s
     };
   }
   drawWith(e, t) {
-    var N, D, O, L;
-    const { style: n, primaryWithCoord: r, unitId: o, subUnitId: i, worksheet: a, row: l, col: s } = t, d = r.isMergedMainCell ? r.mergeInfo : r, u = re(a.getCellRaw(l, s)), p = this._dataValidationModel.getRuleByLocation(o, i, l, s);
-    if (!p)
+    var L, y, T, A;
+    const { style: n, primaryWithCoord: r, unitId: o, subUnitId: i, worksheet: a, row: l, col: s } = t, d = r.isMergedMainCell ? r.mergeInfo : r, u = re(a.getCellRaw(l, s)), g = this._dataValidationModel.getRuleByLocation(o, i, l, s);
+    if (!g)
       return;
-    const c = this._dataValidationModel.getValidator(p.type);
-    if (!c || !((N = c.skipDefaultFontRender) != null && N.call(c, p, u, { unitId: o, subUnitId: i, row: l, column: s })))
+    const c = this._dataValidationModel.getValidator(g.type);
+    if (!c || !((L = c.skipDefaultFontRender) != null && L.call(c, g, u, { unitId: o, subUnitId: i, row: l, column: s })))
       return;
-    const m = c.parseFormulaSync(p, o, i), { formula1: h } = m, b = this._calc(d, n), { a: y, d: I } = e.getTransform(), S = Mn(b.left, y), g = Mn(b.top, I), w = jr.create().composeMatrix({
+    const m = c.parseFormulaSync(g, o, i), { formula1: h } = m, E = this._calc(d, n), { a: R, d: w } = e.getTransform(), S = Mn(E.left, R), I = Mn(E.top, w), b = jr.create().composeMatrix({
       left: S,
-      top: g,
+      top: I,
       scaleX: 1,
       scaleY: 1,
       angle: 0,
@@ -2461,16 +2462,16 @@ let rn = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), _ = d.endX - d.startX, v = d.endY - d.startY;
-    e.save(), e.beginPath(), e.rect(d.startX, d.startY, _, v), e.clip();
-    const R = w.getMatrix();
-    e.transform(R[0], R[1], R[2], R[3], R[4], R[5]);
-    const P = ((D = n == null ? void 0 : n.fs) != null ? D : 10) * 1.6, k = String(u) === String(h), T = this._themeService.getColorFromTheme("primary.600");
+    }), v = d.endX - d.startX, p = d.endY - d.startY;
+    e.save(), e.beginPath(), e.rect(d.startX, d.startY, v, p), e.clip();
+    const _ = b.getMatrix();
+    e.transform(_[0], _[1], _[2], _[3], _[4], _[5]);
+    const P = ((y = n == null ? void 0 : n.fs) != null ? y : 10) * 1.6, k = String(u) === String(h), U = this._themeService.getColorFromTheme("primary.600");
     Yr.drawWith(e, {
       checked: k,
       width: P,
       height: P,
-      fill: (L = (O = n == null ? void 0 : n.cl) == null ? void 0 : O.rgb) != null ? L : T
+      fill: (A = (T = n == null ? void 0 : n.cl) == null ? void 0 : T.rgb) != null ? A : U
     }), e.restore();
   }
   isHit(e, t) {
@@ -2487,7 +2488,7 @@ let rn = class {
     const u = this._dataValidationModel.getValidator(d.type);
     if (!u || !((h = u.skipDefaultFontRender) != null && h.call(u, d, s, { unitId: r, subUnitId: o, row: a, column: l })))
       return;
-    const { formula1: p, formula2: c } = await this._parseFormula(d, r, o), m = {
+    const { formula1: g, formula2: c } = await this._parseFormula(d, r, o), m = {
       range: {
         startColumn: n.actualColumn,
         endColumn: n.actualColumn,
@@ -2495,7 +2496,7 @@ let rn = class {
         endRow: n.actualRow
       },
       value: {
-        v: String(s) === ao(String(p)) ? c : p,
+        v: String(s) === ao(String(g)) ? c : g,
         p: null
       }
     };
@@ -2506,21 +2507,21 @@ let rn = class {
   }
   onPointerEnter(e, t) {
     var n, r;
-    (r = (n = Xe(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ze.POINTER);
+    (r = (n = Xe(Z.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ze.POINTER);
   }
   onPointerLeave(e, t) {
     var n, r;
-    (r = (n = Xe(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ze.DEFAULT);
+    (r = (n = Xe(Z.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ze.DEFAULT);
   }
 };
-rn = bi([
-  We(0, ee),
+on = bi([
+  We(0, te),
   We(1, le),
-  We(2, E(ro)),
-  We(3, E(Yn)),
-  We(4, E(Ue)),
-  We(5, E(oe))
-], rn);
+  We(2, D(ro)),
+  We(3, D(Yn)),
+  We(4, D(Ue)),
+  We(5, D(oe))
+], on);
 var Ei = Object.getOwnPropertyDescriptor, Di = (e, t, n, r) => {
   for (var o = r > 1 ? void 0 : r ? Ei(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
@@ -2531,25 +2532,25 @@ let fe = class {
     V(this, "canvasRender", null);
     V(this, "dropdownType");
     V(this, "optionsInput");
-    V(this, "formulaInput", hn);
+    V(this, "formulaInput", pn);
     this.injector = e;
   }
 };
 fe = Di([
-  Vi(0, E(ye))
+  Vi(0, D(ye))
 ], fe);
 class Ti extends fe {
   constructor() {
     super(...arguments);
-    V(this, "id", j.CHECKBOX);
-    V(this, "canvasRender", this.injector.createInstance(rn));
+    V(this, "id", Y.CHECKBOX);
+    V(this, "canvasRender", this.injector.createInstance(on));
     V(this, "formulaInput", ar);
   }
 }
 class Oi extends fe {
   constructor() {
     super(...arguments);
-    V(this, "id", j.CUSTOM);
+    V(this, "id", Y.CUSTOM);
     V(this, "formulaInput", ir);
   }
 }
@@ -2557,20 +2558,20 @@ const Ai = "data-validation.formula-input";
 class Pi extends fe {
   constructor() {
     super(...arguments);
-    V(this, "id", j.DATE);
+    V(this, "id", Y.DATE);
     V(this, "formulaInput", Ai);
-    V(this, "optionsInput", Dt.componentKey);
+    V(this, "optionsInput", Vt.componentKey);
     V(this, "dropdownType", pe.DATE);
   }
 }
 class Li extends fe {
   constructor() {
     super(...arguments);
-    V(this, "id", j.DECIMAL);
-    V(this, "formulaInput", Ot);
+    V(this, "id", Y.DECIMAL);
+    V(this, "formulaInput", At);
   }
 }
-const br = 4, ki = 0, Wt = 4, Er = 4, on = 6, Vt = 6, Ee = 14;
+const br = 4, ki = 0, Ht = 4, Er = 4, an = 6, Tt = 6, Ee = 14;
 function Ni(e, t) {
   const n = Xr.getTextSize(e, t), r = n.width + br * 2, { ba: o, bd: i } = n, a = o + i;
   return {
@@ -2579,37 +2580,37 @@ function Ni(e, t) {
     ba: o
   };
 }
-function Ht(e, t, n, r) {
-  const o = Ee + on * 2, i = n - o, a = r - Vt * 2, l = e.map((c) => ({
+function jt(e, t, n, r) {
+  const o = Ee + an * 2, i = n - o, a = r - Tt * 2, l = e.map((c) => ({
     layout: Ni(c, t),
     text: c
   }));
   let s;
   const d = [];
   l.forEach((c) => {
-    const { layout: m } = c, { width: h, height: b } = m;
-    !s || s.width + h + Wt > i ? (s = {
+    const { layout: m } = c, { width: h, height: E } = m;
+    !s || s.width + h + Ht > i ? (s = {
       width: h,
-      height: b,
+      height: E,
       items: [{
         ...c,
         left: 0
       }]
     }, d.push(s)) : (s.items.push({
       ...c,
-      left: s.width + Wt
-    }), s.width = s.width + h + Wt);
+      left: s.width + Ht
+    }), s.width = s.width + h + Ht);
   });
-  let u = 0, p = 0;
+  let u = 0, g = 0;
   return d.forEach((c, m) => {
-    p = Math.max(p, c.width), m === d.length - 1 ? u += c.height : u += c.height + Er;
+    g = Math.max(g, c.width), m === d.length - 1 ? u += c.height : u += c.height + Er;
   }), {
     lines: d,
     totalHeight: u,
     contentWidth: i,
     contentHeight: a,
-    cellAutoHeight: u + Vt * 2,
-    calcAutoWidth: p + o
+    cellAutoHeight: u + Tt * 2,
+    calcAutoWidth: g + o
   };
 }
 const Ui = 8;
@@ -2630,7 +2631,7 @@ var $i = Object.getOwnPropertyDescriptor, xi = (e, t, n, r) => {
   return o;
 }, _t = (e, t) => (n, r) => t(n, r, e);
 const Bi = 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 {
+let sn = class {
   constructor(e, t, n, r) {
     V(this, "zIndex");
     V(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
@@ -2659,21 +2660,21 @@ let an = class {
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, n, r) {
     var ie, _e;
-    const { primaryWithCoord: o, row: i, col: a, style: l, data: s, subUnitId: d } = t, u = o.isMergedMainCell ? o.mergeInfo : o, p = s == null ? void 0 : s.fontRenderExtension, { leftOffset: c = 0, rightOffset: m = 0, topOffset: h = 0, downOffset: b = 0 } = p || {}, y = this._ensureMap(d), I = this._generateKey(i, a), S = o.isMergedMainCell ? o.mergeInfo.startRow : i, g = o.isMergedMainCell ? o.mergeInfo.startColumn : a, w = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, S, g);
-    if (!w)
+    const { primaryWithCoord: o, row: i, col: a, style: l, data: s, subUnitId: d } = t, u = o.isMergedMainCell ? o.mergeInfo : o, g = s == null ? void 0 : s.fontRenderExtension, { leftOffset: c = 0, rightOffset: m = 0, topOffset: h = 0, downOffset: E = 0 } = g || {}, R = this._ensureMap(d), w = this._generateKey(i, a), S = o.isMergedMainCell ? o.mergeInfo.startRow : i, I = o.isMergedMainCell ? o.mergeInfo.startColumn : a, b = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, S, I);
+    if (!b)
       return;
-    const _ = this._dataValidationModel.getValidator(w.type);
-    if (!_)
+    const v = this._dataValidationModel.getValidator(b.type);
+    if (!v)
       return;
-    const v = {
+    const p = {
       startX: u.startX + c,
       endX: u.endX - m,
       startY: u.startY + h,
-      endY: u.endY - b
-    }, R = v.endX - v.startX, P = v.endY - v.startY, { cl: k } = l || {}, T = (ie = typeof k == "object" ? k == null ? void 0 : k.rgb : k) != null ? ie : "#000", N = Ve(l != null ? l : void 0), { vt: D, ht: O } = l || {}, L = D != null ? D : se.MIDDLE, x = (_e = re(s)) != null ? _e : "", G = _.parseCellValue(x), te = _.getListWithColorMap(w), B = Ht(G, N, R, P);
-    this._drawDownIcon(e, v, R, P, L), e.save(), e.translateWithPrecision(v.startX, v.startY), e.beginPath(), e.rect(0, 0, R - Ee, P), e.clip(), e.translateWithPrecision(on, Vt);
+      endY: u.endY - E
+    }, _ = p.endX - p.startX, P = p.endY - p.startY, { cl: k } = l || {}, U = (ie = typeof k == "object" ? k == null ? void 0 : k.rgb : k) != null ? ie : "#000", L = Ve(l != null ? l : void 0), { vt: y, ht: T } = l || {}, A = y != null ? y : se.MIDDLE, x = (_e = re(s)) != null ? _e : "", H = v.parseCellValue(x), q = v.getListWithColorMap(b), B = jt(H, L, _, P);
+    this._drawDownIcon(e, p, _, P, A), e.save(), e.translateWithPrecision(p.startX, p.startY), e.beginPath(), e.rect(0, 0, _ - Ee, P), e.clip(), e.translateWithPrecision(an, Tt);
     let ne = 0;
-    switch (L) {
+    switch (A) {
       case se.MIDDLE:
         ne = (B.contentHeight - B.totalHeight) / 2;
         break;
@@ -2681,64 +2682,64 @@ let an = class {
         ne = B.contentHeight - B.totalHeight;
         break;
     }
-    e.translateWithPrecision(0, ne), B.lines.forEach((Ce, q) => {
+    e.translateWithPrecision(0, ne), B.lines.forEach((Ce, J) => {
       e.save();
-      const { width: Z, height: ge, items: z } = Ce;
+      const { width: K, height: ge, items: z } = Ce;
       let M = 0;
-      switch (O) {
-        case we.RIGHT:
-          M = B.contentWidth - Z;
+      switch (T) {
+        case Ie.RIGHT:
+          M = B.contentWidth - K;
           break;
-        case we.CENTER:
-          M = (B.contentWidth - Z) / 2;
+        case Ie.CENTER:
+          M = (B.contentWidth - K) / 2;
           break;
       }
-      e.translate(M, q * (ge + Er)), z.forEach((U) => {
-        e.save(), e.translateWithPrecision(U.left, 0), Fi.drawWith(e, {
-          ...N,
-          info: U,
-          color: T,
-          fill: te[U.text]
+      e.translate(M, J * (ge + Er)), z.forEach((N) => {
+        e.save(), e.translateWithPrecision(N.left, 0), Fi.drawWith(e, {
+          ...L,
+          info: N,
+          color: U,
+          fill: q[N.text]
         }), e.restore();
       }), e.restore();
-    }), e.restore(), y.set(I, {
-      left: v.startX,
-      top: v.startY,
-      width: B.contentWidth + on + Ee,
-      height: B.contentHeight + Vt * 2
+    }), e.restore(), R.set(w, {
+      left: p.startX,
+      top: p.startY,
+      width: B.contentWidth + an + Ee,
+      height: B.contentHeight + Tt * 2
     });
   }
   calcCellAutoHeight(e) {
-    var _;
-    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = r == null ? void 0 : r.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, p = t.isMergedMainCell ? t.mergeInfo : t, c = {
-      startX: p.startX + l,
-      endX: p.endX - s,
-      startY: p.startY + d,
-      endY: p.endY - u
+    var v;
+    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = r == null ? void 0 : r.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, g = t.isMergedMainCell ? t.mergeInfo : t, c = {
+      startX: g.startX + l,
+      endX: g.endX - s,
+      startY: g.startY + d,
+      endY: g.endY - u
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
     if (!m)
       return;
     const h = this._dataValidationModel.getValidator(m.type);
     if (!h)
       return;
-    const b = c.endX - c.startX, y = c.endY - c.startY, I = (_ = re(r)) != null ? _ : "", S = h.parseCellValue(I), g = Ve(n != null ? n : void 0);
-    return Ht(S, g, b, y).cellAutoHeight;
+    const E = c.endX - c.startX, R = c.endY - c.startY, w = (v = re(r)) != null ? v : "", S = h.parseCellValue(w), I = Ve(n != null ? n : void 0);
+    return jt(S, I, E, R).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
-    var _;
-    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = r == null ? void 0 : r.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, p = t.isMergedMainCell ? t.mergeInfo : t, c = {
-      startX: p.startX + l,
-      endX: p.endX - s,
-      startY: p.startY + d,
-      endY: p.endY - u
+    var v;
+    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = r == null ? void 0 : r.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, g = t.isMergedMainCell ? t.mergeInfo : t, c = {
+      startX: g.startX + l,
+      endX: g.endX - s,
+      startY: g.startY + d,
+      endY: g.endY - u
     }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
     if (!m)
       return;
     const h = this._dataValidationModel.getValidator(m.type);
     if (!h)
       return;
-    const b = c.endX - c.startX, y = c.endY - c.startY, I = (_ = re(r)) != null ? _ : "", S = h.parseCellValue(I), g = Ve(n != null ? n : void 0);
-    return Ht(S, g, b, y).calcAutoWidth;
+    const E = c.endX - c.startX, R = c.endY - c.startY, w = (v = re(r)) != null ? v : "", S = h.parseCellValue(w), I = Ve(n != null ? n : void 0);
+    return jt(S, I, E, R).calcAutoWidth;
   }
   isHit(e, t) {
     const { primaryWithCoord: n } = t, r = n.isMergedMainCell ? n.mergeInfo : n, { endX: o } = r, { x: i } = e;
@@ -2753,28 +2754,28 @@ let an = class {
       row: o,
       column: i
     };
-    this._commandService.executeCommand(Pt.id, a);
+    this._commandService.executeCommand(Lt.id, a);
   }
   onPointerEnter(e, t) {
     var n, r;
-    return (r = (n = Xe(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null ? void 0 : r.setCursor(Ze.POINTER);
+    return (r = (n = Xe(Z.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null ? void 0 : r.setCursor(Ze.POINTER);
   }
   onPointerLeave(e, t) {
     var n, r;
-    return (r = (n = Xe(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null ? void 0 : r.setCursor(Ze.DEFAULT);
+    return (r = (n = Xe(Z.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null ? void 0 : r.setCursor(Ze.DEFAULT);
   }
 };
-an = xi([
-  _t(0, ee),
+sn = xi([
+  _t(0, te),
   _t(1, le),
-  _t(2, E(Ue)),
-  _t(3, E(oe))
-], an);
+  _t(2, D(Ue)),
+  _t(3, D(oe))
+], sn);
 class Wi extends fe {
   constructor() {
     super(...arguments);
-    V(this, "id", j.LIST_MULTIPLE);
-    V(this, "canvasRender", this.injector.createInstance(an));
+    V(this, "id", Y.LIST_MULTIPLE);
+    V(this, "canvasRender", this.injector.createInstance(sn));
     V(this, "dropdownType", pe.MULTIPLE_LIST);
   }
 }
@@ -2783,7 +2784,7 @@ var Hi = Object.getOwnPropertyDescriptor, ji = (e, t, n, r) => {
     (a = e[i]) && (o = a(o) || o);
   return o;
 }, it = (e, t) => (n, r) => t(n, r, e);
-const He = 4, Ct = 4, he = 14, jt = 1, Se = 6, je = 3, Yt = 8, Yi = "#565656", $n = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
+const He = 4, Ct = 4, he = 14, Yt = 1, Se = 6, je = 3, Xt = 8, Yi = "#565656", $n = 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 xn(e, t, n, r, o, i, a = !0) {
   let l = 0;
   const s = a ? je : 0;
@@ -2801,10 +2802,10 @@ function xn(e, t, n, r, o, i, a = !0) {
   l = Math.max(je, l);
   let d = 0;
   switch (i) {
-    case we.CENTER:
+    case Ie.CENTER:
       d = (e - n) / 2;
       break;
-    case we.RIGHT:
+    case Ie.RIGHT:
       d = e - n;
       break;
   }
@@ -2813,7 +2814,7 @@ function xn(e, t, n, r, o, i, a = !0) {
     paddingTop: l
   };
 }
-let sn = class {
+let ln = class {
   constructor(e, t, n, r, o) {
     V(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     V(this, "zIndex");
@@ -2827,7 +2828,7 @@ let sn = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, n, r, o, i, a) {
-    const { t: l = Q.pd.t, b: s = Q.pd.b } = a, d = n - he;
+    const { t: l = ee.pd.t, b: s = ee.pd.b } = a, d = n - he;
     let u;
     switch (i) {
       case se.MIDDLE:
@@ -2844,157 +2845,157 @@ let sn = class {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(e, t, n) {
-    var te, B, ne, ie, _e, Ce;
-    const { primaryWithCoord: r, row: o, col: i, style: a, data: l, subUnitId: s } = t, d = r.isMergedMainCell ? r.mergeInfo : r, u = r.isMergedMainCell ? r.mergeInfo.startRow : o, p = r.isMergedMainCell ? r.mergeInfo.startColumn : i, c = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, u, p);
+    var q, B, ne, ie, _e, Ce;
+    const { primaryWithCoord: r, row: o, col: i, style: a, data: l, subUnitId: s } = t, d = r.isMergedMainCell ? r.mergeInfo : r, u = r.isMergedMainCell ? r.mergeInfo.startRow : o, g = r.isMergedMainCell ? r.mergeInfo.startColumn : i, c = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, u, g);
     if (!c)
       return;
     const m = this._dataValidationModel.getValidator(c.type);
     if (!m)
       return;
-    const h = l == null ? void 0 : l.fontRenderExtension, { leftOffset: b = 0, rightOffset: y = 0, topOffset: I = 0, downOffset: S = 0 } = h || {};
-    if (!c || !m || !m || m.id.indexOf(j.LIST) !== 0 || !m.skipDefaultFontRender(c))
+    const h = l == null ? void 0 : l.fontRenderExtension, { leftOffset: E = 0, rightOffset: R = 0, topOffset: w = 0, downOffset: S = 0 } = h || {};
+    if (!c || !m || !m || m.id.indexOf(Y.LIST) !== 0 || !m.skipDefaultFontRender(c))
       return;
-    const g = {
-      startX: d.startX + b,
-      endX: d.endX - y,
-      startY: d.startY + I,
+    const I = {
+      startX: d.startX + E,
+      endX: d.endX - R,
+      startY: d.startY + w,
       endY: d.endY - S
-    }, w = g.endX - g.startX, _ = g.endY - g.startY, v = this._ensureMap(s), R = this._generateKey(o, i), P = m.getListWithColorMap(c), k = re(l), T = `${k != null ? k : ""}`, N = P[T];
-    let { tb: D, vt: O, ht: L, pd: x } = a || {};
-    D = D != null ? D : ve.WRAP, O = O != null ? O : se.BOTTOM, L = L != null ? L : Q.ht, x = x != null ? x : Q.pd;
-    const G = Ve(a).fontCache;
+    }, b = I.endX - I.startX, v = I.endY - I.startY, p = this._ensureMap(s), _ = this._generateKey(o, i), P = m.getListWithColorMap(c), k = re(l), U = `${k != null ? k : ""}`, L = P[U];
+    let { tb: y, vt: T, ht: A, pd: x } = a || {};
+    y = y != null ? y : ve.WRAP, T = T != null ? T : se.BOTTOM, A = A != null ? A : ee.ht, x = x != null ? x : ee.pd;
+    const H = Ve(a).fontCache;
     if (c.renderMode === ae.ARROW) {
-      const { l: q = Q.pd.l, t: Z = Q.pd.t, r: ge = Q.pd.r, b: z = Q.pd.b } = x, M = w - q - ge - he - 4, U = new rt(
-        T,
-        G,
-        D === ve.WRAP,
+      const { l: J = ee.pd.l, t: K = ee.pd.t, r: ge = ee.pd.r, b: z = ee.pd.b } = x, M = b - J - ge - he - 4, N = new rt(
+        U,
+        H,
+        y === ve.WRAP,
         M,
         1 / 0
       );
-      U.calculate();
-      const f = U.getTotalWidth(), A = U.getTotalHeight(), { paddingTop: $, paddingLeft: ce } = xn(M, _ - Z - z, f, A, O, L, !0);
-      this._drawDownIcon(e, g, w, _, A, O, x), e.save(), e.translateWithPrecision(g.startX + q, g.startY + Z), e.beginPath(), e.rect(0, 0, w - q - ge, _ - Z - z), e.clip(), e.translateWithPrecision(0, $), e.save(), e.translateWithPrecision(ce, 0), e.beginPath(), e.rect(0, 0, M, A), e.clip(), bn.drawWith(e, {
-        text: T,
-        fontStyle: G,
+      N.calculate();
+      const f = N.getTotalWidth(), O = N.getTotalHeight(), { paddingTop: $, paddingLeft: ce } = xn(M, v - K - z, f, O, T, A, !0);
+      this._drawDownIcon(e, I, b, v, O, T, x), e.save(), e.translateWithPrecision(I.startX + J, I.startY + K), e.beginPath(), e.rect(0, 0, b - J - ge, v - K - z), e.clip(), e.translateWithPrecision(0, $), e.save(), e.translateWithPrecision(ce, 0), e.beginPath(), e.rect(0, 0, M, O), e.clip(), bn.drawWith(e, {
+        text: U,
+        fontStyle: H,
         width: M,
-        height: A,
-        color: (te = a == null ? void 0 : a.cl) == null ? void 0 : te.rgb,
+        height: O,
+        color: (q = a == null ? void 0 : a.cl) == null ? void 0 : q.rgb,
         strokeLine: !!((B = a == null ? void 0 : a.st) != null && B.s),
         underline: !!((ne = a == null ? void 0 : a.ul) != null && ne.s),
-        warp: D === ve.WRAP,
-        hAlign: we.LEFT
-      }, U), e.restore(), e.restore(), v.set(R, {
-        left: g.endX - he + n.rowHeaderWidth,
-        top: g.startY + Z + n.columnHeaderHeight,
+        warp: y === ve.WRAP,
+        hAlign: Ie.LEFT
+      }, N), e.restore(), e.restore(), p.set(_, {
+        left: I.endX - he + n.rowHeaderWidth,
+        top: I.startY + K + n.columnHeaderHeight,
         width: he,
-        height: _ - Z - z
+        height: v - K - z
       });
     } else {
-      e.save(), e.translateWithPrecision(g.startX, g.startY), e.beginPath(), e.rect(0, 0, w, _), e.clip();
-      const q = w - Se * 2 - He - he - 4, Z = new rt(
-        T,
-        G,
-        D === ve.WRAP,
-        q,
+      e.save(), e.translateWithPrecision(I.startX, I.startY), e.beginPath(), e.rect(0, 0, b, v), e.clip();
+      const J = b - Se * 2 - He - he - 4, K = new rt(
+        U,
+        H,
+        y === ve.WRAP,
+        J,
         1 / 0
       );
-      Z.calculate();
-      const ge = Z.getTotalWidth(), z = Z.getTotalHeight(), M = z + jt * 2, U = Math.max(w - Se * 2, 1), { paddingTop: f } = xn(U, _, ge, M, O, L);
+      K.calculate();
+      const ge = K.getTotalWidth(), z = K.getTotalHeight(), M = z + Yt * 2, N = Math.max(b - Se * 2, 1), { paddingTop: f } = xn(N, v, ge, M, T, A);
       e.translateWithPrecision(Se, f), Kn.drawWith(e, {
-        width: U,
+        width: N,
         height: M,
-        fill: N || Te,
-        radius: Yt
-      }), e.save(), e.translateWithPrecision(He, jt), e.beginPath(), e.rect(0, 0, q, z), e.clip(), bn.drawWith(e, {
-        text: T,
-        fontStyle: G,
-        width: q,
+        fill: L || Te,
+        radius: Xt
+      }), e.save(), e.translateWithPrecision(He, Yt), e.beginPath(), e.rect(0, 0, J, z), e.clip(), bn.drawWith(e, {
+        text: U,
+        fontStyle: H,
+        width: J,
         height: z,
         color: (ie = a == null ? void 0 : a.cl) == null ? void 0 : ie.rgb,
         strokeLine: !!((_e = a == null ? void 0 : a.st) != null && _e.s),
         underline: !!((Ce = a == null ? void 0 : a.ul) != null && Ce.s),
-        warp: D === ve.WRAP,
-        hAlign: we.LEFT
-      }, Z), e.restore(), e.translateWithPrecision(q + He + 4, (z - Ct) / 2), e.fillStyle = Yi, e.fill($n), e.restore(), v.set(R, {
-        left: g.startX + Se + n.rowHeaderWidth,
-        top: g.startY + f + n.columnHeaderHeight,
-        width: U,
+        warp: y === ve.WRAP,
+        hAlign: Ie.LEFT
+      }, K), e.restore(), e.translateWithPrecision(J + He + 4, (z - Ct) / 2), e.fillStyle = Yi, e.fill($n), e.restore(), p.set(_, {
+        left: I.startX + Se + n.rowHeaderWidth,
+        top: I.startY + f + n.columnHeaderHeight,
+        width: N,
         height: M
       });
     }
   }
   calcCellAutoHeight(e) {
-    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = r == null ? void 0 : r.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: p = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
+    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = r == null ? void 0 : r.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: g = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
     if (!c || c.renderMode === ae.TEXT)
       return;
     const m = {
       startX: a.startX + s,
       endX: a.endX - d,
       startY: a.startY + u,
-      endY: a.endY - p
-    }, h = m.endX - m.startX, b = re(r), y = `${b != null ? b : ""}`;
-    let { tb: I, pd: S } = n || {};
-    const { t: g = Q.pd.t, b: w = Q.pd.b } = S != null ? S : {};
-    if (I = I != null ? I : ve.WRAP, c.renderMode === ae.ARROW) {
-      const { l: _ = Q.pd.l, r: v = Q.pd.r } = S != null ? S : {}, R = h - _ - v - he - 4, P = new rt(
-        y,
-        Ve(n).fontCache,
-        I === ve.WRAP,
+      endY: a.endY - g
+    }, h = m.endX - m.startX, E = re(r), R = `${E != null ? E : ""}`;
+    let { tb: w, pd: S } = n || {};
+    const { t: I = ee.pd.t, b = ee.pd.b } = S != null ? S : {};
+    if (w = w != null ? w : ve.WRAP, c.renderMode === ae.ARROW) {
+      const { l: v = ee.pd.l, r: p = ee.pd.r } = S != null ? S : {}, _ = h - v - p - he - 4, P = new rt(
         R,
+        Ve(n).fontCache,
+        w === ve.WRAP,
+        _,
         1 / 0
       );
-      return P.calculate(), P.getTotalHeight() + g + w + je * 2;
+      return P.calculate(), P.getTotalHeight() + I + b + je * 2;
     } else {
-      const _ = Math.max(h - Se * 2 - He - he - 4, 10), v = new rt(
-        y,
+      const v = Math.max(h - Se * 2 - He - he - 4, 10), p = new rt(
+        R,
         Ve(n).fontCache,
-        I === ve.WRAP,
-        _,
+        w === ve.WRAP,
+        v,
         1 / 0
       );
-      return v.calculate(), v.getTotalHeight() + je * 2 + jt * 2;
+      return p.calculate(), p.getTotalHeight() + je * 2 + Yt * 2;
     }
   }
   calcCellAutoWidth(e) {
-    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = r == null ? void 0 : r.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: p = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
+    const { primaryWithCoord: t, style: n, data: r, row: o, col: i } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = r == null ? void 0 : r.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: g = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
     if (!c || c.renderMode === ae.TEXT)
       return;
     const m = {
       startX: a.startX + s,
       endX: a.endX - d,
       startY: a.startY + u,
-      endY: a.endY - p
-    }, h = m.endX - m.startX, b = re(r), y = `${b != null ? b : ""}`;
-    let { tb: I, pd: S } = n || {};
-    const { l: g = Q.pd.l, r: w = Q.pd.r } = S != null ? S : {};
-    I = I != null ? I : ve.WRAP;
-    let _ = Se * 2 + he;
+      endY: a.endY - g
+    }, h = m.endX - m.startX, E = re(r), R = `${E != null ? E : ""}`;
+    let { tb: w, pd: S } = n || {};
+    const { l: I = ee.pd.l, r: b = ee.pd.r } = S != null ? S : {};
+    w = w != null ? w : ve.WRAP;
+    let v = Se * 2 + he;
     switch (c.renderMode) {
       case ae.ARROW:
-        _ = he + 4 + w + g;
+        v = he + 4 + b + I;
         break;
       case ae.CUSTOM:
-        _ = he + Se * 2 + He * 2 + w + g + Yt / 2 + 1;
+        v = he + Se * 2 + He * 2 + b + I + Xt / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        _ = he + Se * 2 + He * 2 + w + g + Yt / 2 + 1;
+        v = he + Se * 2 + He * 2 + b + I + Xt / 2 + 1;
     }
-    const v = h - _, R = new rt(
-      y,
+    const p = h - v, _ = new rt(
+      R,
       Ve(n).fontCache,
-      I === ve.WRAP,
-      v,
+      w === ve.WRAP,
+      p,
       1 / 0
     );
-    return R.calculate(), R.getTotalWidth() + _;
+    return _.calculate(), _.getTotalWidth() + v;
   }
   isHit(e, t) {
     const { subUnitId: n, row: r, col: o } = t, a = this._ensureMap(n).get(this._generateKey(r, o)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, r, o);
     if (!l || !a || l.renderMode === ae.TEXT)
       return !1;
-    const { top: s, left: d, width: u, height: p } = a, { x: c, y: m } = e;
-    return c >= d && c <= d + u && m >= s && m <= s + p;
+    const { top: s, left: d, width: u, height: g } = a, { x: c, y: m } = e;
+    return c >= d && c <= d + u && m >= s && m <= s + g;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -3005,64 +3006,64 @@ let sn = class {
       row: o,
       column: i
     };
-    this._commandService.executeCommand(Pt.id, a);
+    this._commandService.executeCommand(Lt.id, a);
   }
   onPointerEnter(e, t) {
     var n, r;
-    (r = (n = Xe(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ze.POINTER);
+    (r = (n = Xe(Z.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ze.POINTER);
   }
   onPointerLeave(e, t) {
     var n, r;
-    (r = (n = Xe(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ze.DEFAULT);
+    (r = (n = Xe(Z.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ze.DEFAULT);
   }
 };
-sn = ji([
+ln = ji([
   it(0, le),
-  it(1, E(de)),
-  it(2, ee),
-  it(3, E(Ue)),
-  it(4, E(oe))
-], sn);
+  it(1, D(de)),
+  it(2, te),
+  it(3, D(Ue)),
+  it(4, D(oe))
+], ln);
 class Xi extends fe {
   constructor() {
     super(...arguments);
-    V(this, "id", j.LIST);
-    V(this, "canvasRender", this.injector.createInstance(sn));
+    V(this, "id", Y.LIST);
+    V(this, "canvasRender", this.injector.createInstance(ln));
     V(this, "dropdownType", pe.LIST);
-    V(this, "optionsInput", Et.componentKey);
-    V(this, "formulaInput", hn);
+    V(this, "optionsInput", Dt.componentKey);
+    V(this, "formulaInput", pn);
   }
 }
 class Zi extends fe {
   constructor() {
     super(...arguments);
-    V(this, "id", j.TEXT_LENGTH);
-    V(this, "formulaInput", Ot);
+    V(this, "id", Y.TEXT_LENGTH);
+    V(this, "formulaInput", At);
   }
 }
 class Ki extends fe {
   constructor() {
     super(...arguments);
-    V(this, "id", j.WHOLE);
-    V(this, "formulaInput", Ot);
+    V(this, "id", Y.WHOLE);
+    V(this, "formulaInput", At);
   }
 }
 var Gi = Object.getOwnPropertyDescriptor, zi = (e, t, n, r) => {
   for (var o = r > 1 ? void 0 : r ? Gi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, Xt = (e, t) => (n, r) => t(n, r, e);
-let et = class extends dn {
+}, Zt = (e, t) => (n, r) => t(n, r, e);
+let et = class extends cn {
   constructor(e, t, n) {
     super(), this._injector = e, this._componentManger = t, this._dataValidatorRegistryService = n, this._initComponents(), this._registerValidatorViews();
   }
   _initComponents() {
     [
-      ["DataValidationIcon", wr],
-      [Mt, vi],
-      [Et.componentKey, Et],
+      ["DataValidationIcon", Ir],
+      [bt, vi],
       [Dt.componentKey, Dt],
-      ...wi
+      [Vt.componentKey, Vt],
+      ...Ii
     ].forEach(([e, t]) => {
       this.disposeWithMe(this._componentManger.register(
         e,
@@ -3087,26 +3088,26 @@ let et = class extends dn {
   }
 };
 et = zi([
-  Xt(0, E(ye)),
-  Xt(1, E(vn)),
-  Xt(2, E(Me))
+  Zt(0, D(ye)),
+  Zt(1, D(mn)),
+  Zt(2, D(Me))
 ], et);
 var qi = Object.getOwnPropertyDescriptor, Ji = (e, t, n, r) => {
   for (var o = r > 1 ? void 0 : r ? qi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, Zt = (e, t) => (n, r) => t(n, r, e);
+}, Kt = (e, t) => (n, r) => t(n, r, e);
 const Qi = "SHEET_DATA_VALIDATION_UI_PLUGIN";
 var St;
 let Bn = (St = class extends Xn {
-  constructor(e = yt, t, n, r) {
+  constructor(e = Mt, t, n, r) {
     super(), this._config = e, this._injector = t, this._commandService = n, this._configService = r;
     const { menu: o, ...i } = Zn(
       {},
-      yt,
+      Mt,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(_n, i);
+    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(yt, i);
   }
   onStarting() {
     [
@@ -3121,8 +3122,8 @@ let Bn = (St = class extends Xn {
     ].forEach((e) => {
       this._injector.add(e);
     }), [
+      kt,
       Lt,
-      Pt,
       fr,
       Cn,
       Fe,
@@ -3133,8 +3134,8 @@ let Bn = (St = class extends Xn {
   }
   onReady() {
     this._injector.get(qe), this._injector.get(Je), this._injector.get(Ue).registerRenderModule(
-      X.UNIVER_SHEET,
-      [bt]
+      Z.UNIVER_SHEET,
+      [Et]
     );
   }
   onRendered() {
@@ -3143,27 +3144,27 @@ let Bn = (St = class extends Xn {
   onSteady() {
     this._injector.get(ze);
   }
-}, V(St, "pluginName", Qi), V(St, "type", X.UNIVER_SHEET), St);
+}, V(St, "pluginName", Qi), V(St, "type", Z.UNIVER_SHEET), St);
 Bn = Ji([
-  Zt(1, E(ye)),
-  Zt(2, ee),
-  Zt(3, ln)
+  Kt(1, D(ye)),
+  Kt(2, te),
+  Kt(3, dn)
 ], Bn);
 var ea = Object.defineProperty, ta = Object.getOwnPropertyDescriptor, na = (e, t, n) => t in e ? ea(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, ra = (e, t, n, r) => {
   for (var o = r > 1 ? void 0 : r ? ta(t, n) : t, i = e.length - 1, a; i >= 0; i--)
     (a = e[i]) && (o = a(o) || o);
   return o;
-}, Kt = (e, t) => (n, r) => t(n, r, e), Dr = (e, t, n) => na(e, typeof t != "symbol" ? t + "" : t, n);
+}, Gt = (e, t) => (n, r) => t(n, r, e), Dr = (e, t, n) => na(e, typeof t != "symbol" ? t + "" : t, n);
 const oa = "SHEET_DATA_VALIDATION_UI_PLUGIN";
-let Tt = class extends Xn {
-  constructor(e = yt, t, n, r) {
+let Ot = class extends Xn {
+  constructor(e = Mt, t, n, r) {
     super(), this._config = e, this._injector = t, this._commandService = n, this._configService = r;
     const { menu: o, ...i } = Zn(
       {},
-      yt,
+      Mt,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(_n, i);
+    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(yt, i);
   }
   onStarting() {
     [
@@ -3179,8 +3180,8 @@ let Tt = class extends Xn {
     ].forEach((e) => {
       this._injector.add(e);
     }), [
+      kt,
       Lt,
-      Pt,
       fr,
       Cn,
       Fe,
@@ -3191,8 +3192,8 @@ let Tt = class extends Xn {
   }
   onReady() {
     this._injector.get(qe), this._injector.get(Je), this._injector.get(Ge), this._injector.get(ut), this._injector.get(Ue).registerRenderModule(
-      X.UNIVER_SHEET,
-      [bt]
+      Z.UNIVER_SHEET,
+      [Et]
     );
   }
   onRendered() {
@@ -3202,16 +3203,16 @@ let Tt = class extends Xn {
     this._injector.get(ze);
   }
 };
-Dr(Tt, "pluginName", oa);
-Dr(Tt, "type", X.UNIVER_SHEET);
-Tt = ra([
+Dr(Ot, "pluginName", oa);
+Dr(Ot, "type", Z.UNIVER_SHEET);
+Ot = ra([
   Hr(so),
-  Kt(1, E(ye)),
-  Kt(2, ee),
-  Kt(3, ln)
-], Tt);
+  Gt(1, D(ye)),
+  Gt(2, te),
+  Gt(3, dn)
+], Ot);
 export {
   fe as BaseSheetDataValidatorView,
   Bn as UniverSheetsDataValidationMobileUIPlugin,
-  Tt as UniverSheetsDataValidationUIPlugin
+  Ot as UniverSheetsDataValidationUIPlugin
 };