@univerjs/sheets-data-validation-ui 0.16.0 → 0.16.1-insiders.20260311-074e8ca

package/lib/es/index.js

@@ -1,42 +1,46 @@
-var Lr = Object.defineProperty;
-var kr = (e, t, n) => t in e ? Lr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
-var V = (e, t, n) => kr(e, typeof t != "symbol" ? t + "" : t, n);
-import { Disposable as De, UniverInstanceType as H, toDisposable as Nr, IUniverInstanceService as pe, Inject as E, LocaleService as ge, DataValidationErrorStyle as ct, DataValidationStatus as ze, ICommandService as oe, Injector as Ve, IConfigService as hn, DataValidationRenderMode as ue, DisposableCollection as Ur, dayjs as $t, numfmt as Yn, CellValueType as Fr, CommandType as ot, DataValidationType as X, ObjectMatrix as yt, Range as $r, Rectangle as Mt, queryObjectMatrix as Qt, Optional as xr, RxDisposable as pn, InterceptorEffectEnum as Xn, sequenceExecute as Zn, bufferDebounceTime as Br, debounce as Wr, UndoCommand as Hr, RedoCommand as jr, isUnitRangesEqual as Yr, shallowEqual as bn, ThemeService as zn, ColorKit as Xr, isFormulaString as Pe, generateRandomId as En, VerticalAlign as he, HorizontalAlign as Ee, DEFAULT_STYLES as re, WrapStrategy as Se, Plugin as Kn, merge as Gn, DependentOn as Zr } from "@univerjs/core";
-import { DeviceInputEventType as mt, IRenderManagerService as xe, fixLineWidthByScale as Dn, Transform as zr, CheckboxShape as Kr, getCurrentTypeOfRenderer as Ke, CURSOR_TYPE as Ge, FontCache as Gr, Shape as qr, Rect as qn, getFontStyleString as Le, DocSimpleSkeleton as at, Text as Vn } from "@univerjs/engine-render";
-import { SheetInterceptorService as gn, VALIDATE_CELL as Jr, SheetsSelectionsService as Jn, SetRangeValuesCommand as dt, getSheetCommandTarget as Qn, IAutoFillService as Qr, AUTO_FILL_APPLY_TYPE as st, AutoFillTools as eo, rangeToDiscreteRange as to, SheetPermissionCheckController as no, WorksheetEditPermission as en, WorksheetSetCellStylePermission as tn, RangeProtectionPermissionEditPoint as nn, WorkbookEditablePermission as rn, INTERCEPTOR_POINT as er, InterceptCellContentPriority as tr, SetWorksheetActiveOperation as ro, checkRangesEditablePermission as oo } from "@univerjs/sheets";
-import { SheetDataValidationModel as ae, SheetsDataValidationValidatorService as io, getDataValidationCellValue as xt, getCellValueOrigin as ie, serializeListOptions as nr, createDefaultNewRule as rr, AddSheetDataValidationCommand as vn, DATA_VALIDATION_PLUGIN_NAME as or, getDataValidationDiffMutations as on, UpdateSheetDataValidationRangeCommand as ir, DataValidationCacheService as ar, UpdateSheetDataValidationSettingCommand as Tn, UpdateSheetDataValidationOptionsCommand as ao, RemoveSheetDataValidationCommand as sr, RemoveSheetAllDataValidationCommand as so, DataValidationFormulaController as lo, deserializeListOptions as co, CUSTOM_FORMULA_INPUT_NAME as lr, BASE_FORMULA_INPUT_NAME as kt, LIST_FORMULA_INPUT_NAME as mn, CHECKBOX_FORMULA_INPUT_NAME as dr, DataValidationFormulaService as uo, CHECKBOX_FORMULA_2 as ho, CHECKBOX_FORMULA_1 as po, getFormulaResult as Bt, isLegalFormulaResult as On, transformCheckboxValue as go, UniverSheetsDataValidationPlugin as vo } from "@univerjs/sheets-data-validation";
-import { DataValidatorRegistryService as Te, DataValidatorDropdownType as fe, DataValidationModel as fn, DataValidatorRegistryScope as mo, TWO_FORMULA_OPERATOR_COUNT as fo, getRuleOptions as An, getRuleSetting as Pn } from "@univerjs/data-validation";
-import { ISidebarService as cr, IDialogService as _o, IZenZoneService as ur, KeyCode as ft, MenuItemType as _n, getMenuHiddenObservable as So, RibbonDataGroup as Co, IMenuManagerService as Io, useDependency as F, ComponentManager as Sn, useObservable as Re, useEvent as an, useSidebarClick as hr } from "@univerjs/ui";
-import { filter as Cn, BehaviorSubject as Ln, distinctUntilChanged as wo, Subject as Ro, debounceTime as pr, bufferTime as gr, of as vr } from "rxjs";
-import { getPatternType as yo } from "@univerjs/sheets-numfmt";
-import { ISheetCellDropdownManagerService as Mo, IEditorBridgeService as mr, SetCellEditVisibleOperation as _t, HoverManagerService as bo, CellAlertManagerService as Eo, CellAlertType as Do, virtualizeDiscreteRanges as sn, ISheetClipboardService as Vo, COPY_TYPE as kn, PREDEFINED_HOOK_NAME_PASTE as St, getRepeatRange as Nn, getCurrentRangeDisable$ as To, AutoHeightController as fr, SheetSkeletonManagerService as ut, IMarkSelectionService as Oo } from "@univerjs/sheets-ui";
-import { Button as qe, FormLayout as Z, RadioGroup as In, Radio as Ne, Checkbox as Nt, Input as Ue, Select as Un, clsx as Fe, borderClassName as bt, DraggableList as Ao, Dropdown as Po } from "@univerjs/design";
-import { createElement as ye, useRef as vt, forwardRef as it, useState as W, useMemo as ht, useEffect as be } from "react";
-import { jsxs as Y, Fragment as pt, jsx as S } from "react/jsx-runtime";
-import { deserializeRangeWithSheet as Lo, serializeRange as _r } from "@univerjs/engine-formula";
-import { RangeSelector as ko, FormulaEditor as Sr } from "@univerjs/sheets-formula-ui";
-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;
-}, Fn = (e, t) => (n, r) => t(n, r, e);
+var kr = Object.defineProperty;
+var Nr = (e, t, n) => t in e ? kr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
+var E = (e, t, n) => Nr(e, typeof t != "symbol" ? t + "" : t, n);
+import { Disposable as De, UniverInstanceType as H, toDisposable as Ur, IUniverInstanceService as pe, Inject as D, LocaleService as ge, DataValidationErrorStyle as ht, DataValidationStatus as Ke, Injector as Ve, DataValidationRenderMode as ue, DisposableCollection as Fr, dayjs as Bt, numfmt as Zn, CellValueType as $r, ICommandService as ie, IConfigService as gn, CommandType as at, DataValidationType as X, ObjectMatrix as bt, Range as xr, Rectangle as Mt, queryObjectMatrix as tn, Optional as Br, RxDisposable as vn, InterceptorEffectEnum as zn, sequenceExecute as Kn, bufferDebounceTime as Wr, UndoCommand as Hr, RedoCommand as jr, isUnitRangesEqual as Yr, debounce as Xr, shallowEqual as Dn, ThemeService as Gn, ColorKit as Zr, isFormulaString as Pe, generateRandomId as Vn, VerticalAlign as he, HorizontalAlign as Ee, DEFAULT_STYLES as re, WrapStrategy as Se, Plugin as qn, merge as Jn, DependentOn as zr } from "@univerjs/core";
+import { DeviceInputEventType as _t, IRenderManagerService as xe, fixLineWidthByScale as Tn, Transform as Kr, CheckboxShape as Gr, getCurrentTypeOfRenderer as Ge, CURSOR_TYPE as qe, FontCache as qr, Shape as Jr, Rect as Qn, getFontStyleString as Le, DocSimpleSkeleton as lt, Text as On } from "@univerjs/engine-render";
+import { SheetInterceptorService as mn, VALIDATE_CELL as Qr, SheetsSelectionsService as er, SetRangeValuesCommand as ut, getSheetCommandTarget as tr, AUTO_FILL_APPLY_TYPE as dt, AutoFillTools as ei, IAutoFillService as ti, rangeToDiscreteRange as ni, SheetPermissionCheckController as ri, WorksheetEditPermission as nn, WorksheetSetCellStylePermission as rn, RangeProtectionPermissionEditPoint as on, WorkbookEditablePermission as an, INTERCEPTOR_POINT as nr, InterceptCellContentPriority as rr, SetWorksheetActiveOperation as ii, checkRangesEditablePermission as oi } from "@univerjs/sheets";
+import { SheetDataValidationModel as ae, SheetsDataValidationValidatorService as ai, getDataValidationCellValue as Wt, getCellValueOrigin as oe, serializeListOptions as ir, createDefaultNewRule as or, AddSheetDataValidationCommand as fn, DATA_VALIDATION_PLUGIN_NAME as ar, getDataValidationDiffMutations as sn, UpdateSheetDataValidationRangeCommand as sr, DataValidationCacheService as lr, UpdateSheetDataValidationSettingCommand as An, UpdateSheetDataValidationOptionsCommand as si, RemoveSheetDataValidationCommand as dr, RemoveSheetAllDataValidationCommand as li, DataValidationFormulaController as di, deserializeListOptions as ci, CUSTOM_FORMULA_INPUT_NAME as cr, BASE_FORMULA_INPUT_NAME as Nt, LIST_FORMULA_INPUT_NAME as _n, CHECKBOX_FORMULA_INPUT_NAME as ur, DataValidationFormulaService as ui, CHECKBOX_FORMULA_2 as hi, CHECKBOX_FORMULA_1 as pi, getFormulaResult as Ht, isLegalFormulaResult as Pn, transformCheckboxValue as gi, UniverSheetsDataValidationPlugin as vi } from "@univerjs/sheets-data-validation";
+import { DataValidatorRegistryService as Te, DataValidatorDropdownType as fe, DataValidationModel as Sn, DataValidatorRegistryScope as mi, TWO_FORMULA_OPERATOR_COUNT as fi, getRuleOptions as Ln, getRuleSetting as kn } from "@univerjs/data-validation";
+import { ISidebarService as hr, IDialogService as _i, KeyCode as St, IZenZoneService as pr, MenuItemType as Cn, getMenuHiddenObservable as Si, RibbonDataGroup as Ci, IMenuManagerService as Ii, useDependency as F, ComponentManager as In, useObservable as Re, useEvent as ln, useSidebarClick as gr } from "@univerjs/ui";
+import { filter as wn, BehaviorSubject as Nn, distinctUntilChanged as wi, Subject as Ri, debounceTime as vr, bufferTime as mr, of as fr } from "rxjs";
+import { getPatternType as yi } from "@univerjs/sheets-numfmt";
+import { ISheetCellDropdownManagerService as bi, SetCellEditVisibleOperation as Ct, IEditorBridgeService as _r, HoverManagerService as Mi, CellAlertManagerService as Ei, CellAlertType as Di, virtualizeDiscreteRanges as dn, COPY_TYPE as Un, PREDEFINED_HOOK_NAME_PASTE as It, getRepeatRange as Fn, ISheetClipboardService as Vi, getCurrentRangeDisable$ as Ti, AutoHeightController as Sr, SheetSkeletonManagerService as pt, IMarkSelectionService as Oi } from "@univerjs/sheets-ui";
+import { Button as Je, FormLayout as Z, RadioGroup as Rn, Radio as Ne, Checkbox as Ut, Input as Ue, Select as $n, clsx as Fe, borderClassName as Et, DraggableList as Ai, Dropdown as Pi } from "@univerjs/design";
+import { createElement as ye, useRef as ft, forwardRef as st, useState as W, useMemo as gt, useEffect as Me } from "react";
+import { jsxs as Y, Fragment as vt, jsx as S } from "react/jsx-runtime";
+import { deserializeRangeWithSheet as Li, serializeRange as Cr } from "@univerjs/engine-formula";
+import { RangeSelector as ki, FormulaEditor as Ir } from "@univerjs/sheets-formula-ui";
+const Ni = "@univerjs/sheets-data-validation-ui", Ui = "0.16.1-insiders.20260311-074e8ca", Dt = {
+  name: Ni,
+  version: Ui
+};
+var Fi = Object.getOwnPropertyDescriptor, $i = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? Fi(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, xn = (e, t) => (n, r) => t(n, r, e);
 let _e = class extends De {
   constructor(t, n) {
     super();
-    V(this, "_open$", new Ln(!1));
-    V(this, "open$", this._open$.pipe(wo()));
-    V(this, "_activeRule");
-    V(this, "_activeRule$", new Ln(void 0));
-    V(this, "activeRule$", this._activeRule$.asObservable());
-    V(this, "_closeDisposable", null);
+    E(this, "_open$", new Nn(!1));
+    E(this, "open$", this._open$.pipe(wi()));
+    E(this, "_activeRule");
+    E(this, "_activeRule$", new Nn(void 0));
+    E(this, "activeRule$", this._activeRule$.asObservable());
+    E(this, "_closeDisposable", null);
     // Record the worksheet to which the rule using the range selector belongs, so that the rule list is not switched when making cross-sheet selections
-    V(this, "_focusFormulaEditorActiveRuleSubUnitId", null);
+    E(this, "_focusFormulaEditorActiveRuleSubUnitId", null);
     this._univerInstanceService = t, this._sidebarService = n, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(H.UNIVER_SHEET).pipe(Cn((r) => !r)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(H.UNIVER_SHEET).pipe(wn((r) => !r)).subscribe(() => {
         this.close();
       })
     ), this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((r) => {
-      r.id === Vt && (r.visible || setTimeout(() => {
+      r.id === Ot && (r.visible || setTimeout(() => {
         this._sidebarService.sidebarOptions$.next({ visible: !1 });
       }));
     }));
@@ -59,7 +63,7 @@ let _e = class extends De {
     this._open$.next(!1), (t = this._closeDisposable) == null || t.dispose();
   }
   setCloseDisposable(t) {
-    this._closeDisposable = Nr(() => {
+    this._closeDisposable = Ur(() => {
       t.dispose(), this._closeDisposable = null;
     });
   }
@@ -73,43 +77,43 @@ let _e = class extends De {
     return this._focusFormulaEditorActiveRuleSubUnitId;
   }
 };
-_e = Uo([
-  Fn(0, pe),
-  Fn(1, cr)
+_e = $i([
+  xn(0, pe),
+  xn(1, hr)
 ], _e);
-const ke = "#ECECEC", Et = "sheets-data-validation-ui.config", Dt = {};
-var Fo = Object.getOwnPropertyDescriptor, $o = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Fo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+const Vt = "sheets-data-validation-ui.config", Tt = {}, ke = "#ECECEC";
+var xi = Object.getOwnPropertyDescriptor, Bi = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? xi(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, He = (e, t) => (n, r) => t(n, r, e);
-let Je = class extends De {
-  constructor(e, t, n, r, o, i) {
-    super(), this._sheetInterceptorService = e, this._dataValidationModel = t, this._dataValidatorRegistryService = n, this._dialogService = r, this._localeService = o, this._sheetsDataValidationValidatorService = i, this._initEditorBridgeInterceptor();
+let Qe = class extends De {
+  constructor(e, t, n, r, i, o) {
+    super(), this._sheetInterceptorService = e, this._dataValidationModel = t, this._dataValidatorRegistryService = n, this._dialogService = r, this._localeService = i, this._sheetsDataValidationValidatorService = o, this._initEditorBridgeInterceptor();
   }
   _initEditorBridgeInterceptor() {
     this.disposeWithMe(this._sheetInterceptorService.writeCellInterceptor.intercept(
-      Jr,
+      Qr,
       {
         handler: async (e, t, n) => {
-          const r = await e, { row: o, col: i, unitId: a, subUnitId: l } = t, s = this._dataValidationModel.getRuleIdByLocation(a, l, o, i), d = s ? this._dataValidationModel.getRuleById(a, l, s) : void 0;
+          const r = await e, { row: i, col: o, unitId: a, subUnitId: l } = t, s = this._dataValidationModel.getRuleIdByLocation(a, l, i, o), d = s ? this._dataValidationModel.getRuleById(a, l, s) : void 0;
           if (r === !1)
             return n(Promise.resolve(!1));
-          if (!d || d.errorStyle !== ct.STOP)
+          if (!d || d.errorStyle !== ht.STOP)
             return n(Promise.resolve(!0));
           const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
-          return !u || await this._sheetsDataValidationValidatorService.validatorCell(a, l, o, i) === ze.VALID ? n(Promise.resolve(!0)) : (this._dialogService.open({
+          return !u || await this._sheetsDataValidationValidatorService.validatorCell(a, l, i, o) === Ke.VALID ? n(Promise.resolve(!0)) : (this._dialogService.open({
             width: 368,
             title: {
               title: this._localeService.t("dataValidation.alert.title")
             },
             id: "reject-input-dialog",
             children: {
-              title: u.getRuleFinalError(d, { row: o, col: i, unitId: a, subUnitId: l })
+              title: u.getRuleFinalError(d, { row: i, col: o, unitId: a, subUnitId: l })
             },
             footer: {
               title: ye(
-                qe,
+                Je,
                 {
                   variant: "primary",
                   onClick: () => this._dialogService.close("reject-input-dialog")
@@ -137,7 +141,7 @@ let Je = class extends De {
       },
       footer: {
         title: ye(
-          qe,
+          Je,
           {
             variant: "primary",
             onClick: () => this._dialogService.close("reject-input-dialog")
@@ -151,31 +155,31 @@ let Je = class extends De {
     });
   }
 };
-Je = $o([
-  He(0, E(gn)),
-  He(1, E(ae)),
-  He(2, E(Te)),
-  He(3, _o),
-  He(4, E(ge)),
-  He(5, E(io))
-], Je);
-var xo = Object.getOwnPropertyDescriptor, Bo = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? xo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+Qe = Bi([
+  He(0, D(mn)),
+  He(1, D(ae)),
+  He(2, D(Te)),
+  He(3, _i),
+  He(4, D(ge)),
+  He(5, D(ai))
+], Qe);
+var Wi = Object.getOwnPropertyDescriptor, Hi = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? Wi(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, ve = (e, t) => (n, r) => t(n, r, e);
-const Wt = (e) => {
+const jt = (e) => {
   if (e == null || typeof e == "boolean")
     return;
-  if (e === "") return $t();
+  if (e === "") return Bt();
   if (typeof e == "number" || !Number.isNaN(+e))
-    return $t(Yn.format("yyyy-MM-dd HH:mm:ss", Number(e)));
-  const t = $t(e);
+    return Bt(Zn.format("yyyy-MM-dd HH:mm:ss", Number(e)));
+  const t = Bt(e);
   if (t.isValid())
     return t;
 };
-function Wo(e, t) {
-  const n = yo(t);
+function ji(e, t) {
+  const n = yi(t);
   if (e === n)
     return t;
   switch (e) {
@@ -188,14 +192,14 @@ function Wo(e, t) {
   }
 }
 let $e = class extends De {
-  constructor(t, n, r, o, i, a, l, s, d, u, h) {
+  constructor(t, n, r, i, o, a, l, s, d, u, h) {
     super();
-    V(this, "_activeDropdown");
-    V(this, "_activeDropdown$", new Ro());
-    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 = h, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
+    E(this, "_activeDropdown");
+    E(this, "_activeDropdown$", new Ri());
+    E(this, "_currentPopup", null);
+    E(this, "activeDropdown$", this._activeDropdown$.asObservable());
+    E(this, "_zenVisible", !1);
+    this._univerInstanceService = t, this._dataValidatorRegistryService = n, this._zenZoneService = r, this._dataValidationModel = i, this._sheetsSelectionsService = o, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = d, this._injector = u, this._configService = h, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
   }
@@ -207,14 +211,14 @@ let $e = class extends De {
       this._zenVisible = t, t && this.hideDropdown();
     }));
   }
-  _getDropdownByCell(t, n, r, o) {
-    const i = t ? this._univerInstanceService.getUnit(t, H.UNIVER_SHEET) : this._univerInstanceService.getCurrentUnitForType(H.UNIVER_SHEET);
-    if (!i)
+  _getDropdownByCell(t, n, r, i) {
+    const o = t ? this._univerInstanceService.getUnit(t, H.UNIVER_SHEET) : this._univerInstanceService.getCurrentUnitForType(H.UNIVER_SHEET);
+    if (!o)
       return;
-    const a = n ? i.getSheetBySheetId(n) : i.getActiveSheet();
+    const a = n ? o.getSheetBySheetId(n) : o.getActiveSheet();
     if (!a)
       return;
-    const l = this._dataValidationModel.getRuleByLocation(i.getUnitId(), a.getSheetId(), r, o);
+    const l = this._dataValidationModel.getRuleByLocation(o.getUnitId(), a.getSheetId(), r, i);
     if (!l)
       return;
     const s = this._dataValidatorRegistryService.getValidatorItem(l.type);
@@ -227,12 +231,12 @@ let $e = class extends De {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   showDropdown(t) {
-    var D, v, C, f, w, b;
-    const { location: n } = t, { row: r, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = n;
+    var V, v, C, f, w, M;
+    const { location: n } = t, { row: r, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = n;
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
     this._activeDropdown = t, this._activeDropdown$.next(this._activeDropdown);
-    const d = this._sheetDataValidationModel.getRuleByLocation(i, a, r, o);
+    const d = this._sheetDataValidationModel.getRuleByLocation(o, a, r, i);
     if (!d)
       return;
     const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
@@ -243,23 +247,23 @@ let $e = class extends De {
       var U, k, x;
       if (!g)
         return !0;
-      const _ = g, T = s.getCell(r, o), A = _.format(p === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), P = (U = Yn.parseDate(A)) == null ? void 0 : U.v, L = p === "time" ? P % 1 : P, y = l.getStyles().getStyleByCell(T), O = (x = (k = y == null ? void 0 : y.n) == null ? void 0 : k.pattern) != null ? x : "";
-      return d.errorStyle !== ct.STOP || await u.validator({
+      const _ = g, T = s.getCell(r, i), A = _.format(p === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), P = (U = Zn.parseDate(A)) == null ? void 0 : U.v, L = p === "time" ? P % 1 : P, y = l.getStyles().getStyleByCell(T), O = (x = (k = y == null ? void 0 : y.n) == null ? void 0 : k.pattern) != null ? x : "";
+      return d.errorStyle !== ht.STOP || await u.validator({
         value: L,
-        unitId: i,
+        unitId: o,
         subUnitId: a,
         row: r,
-        column: o,
+        column: i,
         worksheet: s,
         workbook: l,
         interceptValue: A.replace("Z", "").replace("T", " "),
-        t: Fr.NUMBER
-      }, d) ? (await this._commandService.executeCommand(dt.id, {
-        unitId: i,
+        t: $r.NUMBER
+      }, d) ? (await this._commandService.executeCommand(ut.id, {
+        unitId: o,
         subUnitId: a,
         range: {
-          startColumn: o,
-          endColumn: o,
+          startColumn: i,
+          endColumn: i,
           startRow: r,
           endRow: r
         },
@@ -271,21 +275,21 @@ let $e = class extends De {
           si: null,
           s: {
             n: {
-              pattern: Wo(p, O)
+              pattern: ji(p, O)
             }
           }
         }
-      }), await this._commandService.executeCommand(_t.id, {
+      }), await this._commandService.executeCommand(Ct.id, {
         visible: !1,
-        eventType: mt.Keyboard,
-        unitId: i,
-        keycode: ft.ESC
-      }), !0) : (this._injector.has(Je) && this._injector.get(Je).showReject(u.getRuleFinalError(d, { row: r, col: o, unitId: i, subUnitId: a })), !1);
+        eventType: _t.Keyboard,
+        unitId: o,
+        keycode: St.ESC
+      }), !0) : (this._injector.has(Qe) && this._injector.get(Qe).showReject(u.getRuleFinalError(d, { row: r, col: i, unitId: o, subUnitId: a })), !1);
     };
     let m;
     switch (u.dropdownType) {
       case fe.DATE: {
-        const g = ie(s.getCellRaw(r, o)), p = Wt(g), _ = !!((D = d.bizInfo) != null && D.showTime);
+        const g = oe(s.getCellRaw(r, i)), p = jt(g), _ = !!((V = d.bizInfo) != null && V.showTime);
         m = {
           location: n,
           type: "datepicker",
@@ -299,7 +303,7 @@ let $e = class extends De {
         break;
       }
       case fe.TIME: {
-        const g = ie(s.getCellRaw(r, o)), p = Wt(g);
+        const g = oe(s.getCellRaw(r, i)), p = jt(g);
         m = {
           location: n,
           type: "datepicker",
@@ -312,7 +316,7 @@ let $e = class extends De {
         break;
       }
       case fe.DATETIME: {
-        const g = ie(s.getCellRaw(r, o)), p = Wt(g);
+        const g = oe(s.getCellRaw(r, i)), p = jt(g);
         m = {
           location: n,
           type: "datepicker",
@@ -327,12 +331,12 @@ let $e = class extends De {
       case fe.LIST:
       case fe.MULTIPLE_LIST: {
         const g = u.dropdownType === fe.MULTIPLE_LIST, p = async (y) => {
-          const O = nr(y), U = {
-            unitId: i,
+          const O = ir(y), U = {
+            unitId: o,
             subUnitId: a,
             range: {
-              startColumn: o,
-              endColumn: o,
+              startColumn: i,
+              endColumn: i,
               startRow: r,
               endRow: r
             },
@@ -343,13 +347,13 @@ let $e = class extends De {
               si: null
             }
           };
-          return this._commandService.executeCommand(dt.id, U), this._editorBridgeService.isVisible().visible && await this._commandService.executeCommand(_t.id, {
+          return this._commandService.executeCommand(ut.id, U), this._editorBridgeService.isVisible().visible && await this._commandService.executeCommand(Ct.id, {
             visible: !1,
-            eventType: mt.Keyboard,
-            unitId: i,
-            keycode: ft.ESC
+            eventType: _t.Keyboard,
+            unitId: o,
+            keycode: St.ESC
           }), !g;
-        }, _ = (d == null ? void 0 : d.renderMode) === ue.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, T = u.getListWithColor(d, i, a), A = xt(s.getCellRaw(r, o)), P = () => {
+        }, _ = (d == null ? void 0 : d.renderMode) === ue.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, T = u.getListWithColor(d, o, a), A = Wt(s.getCellRaw(r, i)), P = () => {
           this._commandService.executeCommand(Be.id, {
             ruleId: d.uid
           }), h == null || h.dispose();
@@ -367,8 +371,8 @@ let $e = class extends De {
             onEdit: P,
             defaultValue: A,
             multiple: g,
-            showEdit: (C = (v = this._configService.getConfig(Et)) == null ? void 0 : v.showEditOnDropdown) != null ? C : !0,
-            showSearch: (w = (f = this._configService.getConfig(Et)) == null ? void 0 : f.showSearchOnDropdown) != null ? w : !0
+            showEdit: (C = (v = this._configService.getConfig(Vt)) == null ? void 0 : v.showEditOnDropdown) != null ? C : !0,
+            showSearch: (w = (f = this._configService.getConfig(Vt)) == null ? void 0 : f.showSearchOnDropdown) != null ? w : !0
           }
         };
         break;
@@ -379,11 +383,11 @@ let $e = class extends De {
           props: {
             onChange: (p) => {
               const _ = {
-                unitId: i,
+                unitId: o,
                 subUnitId: a,
                 range: {
-                  startColumn: o,
-                  endColumn: o,
+                  startColumn: i,
+                  endColumn: i,
                   startRow: r,
                   endRow: r
                 },
@@ -394,15 +398,15 @@ let $e = class extends De {
                   si: null
                 }
               };
-              return this._commandService.syncExecuteCommand(dt.id, _), this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(_t.id, {
+              return this._commandService.syncExecuteCommand(ut.id, _), this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(Ct.id, {
                 visible: !1,
-                eventType: mt.Keyboard,
-                unitId: i,
-                keycode: ft.ESC
+                eventType: _t.Keyboard,
+                unitId: o,
+                keycode: St.ESC
               }), !0;
             },
-            defaultValue: xt(s.getCellRaw(r, o)).split("/"),
-            options: JSON.parse((b = d.formula1) != null ? b : "[]")
+            defaultValue: Wt(s.getCellRaw(r, i)).split("/"),
+            options: JSON.parse((M = d.formula1) != null ? M : "[]")
           },
           location: n
         };
@@ -414,11 +418,11 @@ let $e = class extends De {
           props: {
             onChange: (p) => {
               const _ = {
-                unitId: i,
+                unitId: o,
                 subUnitId: a,
                 range: {
-                  startColumn: o,
-                  endColumn: o,
+                  startColumn: i,
+                  endColumn: i,
                   startRow: r,
                   endRow: r
                 },
@@ -429,14 +433,14 @@ let $e = class extends De {
                   si: null
                 }
               };
-              return this._commandService.syncExecuteCommand(dt.id, _), this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(_t.id, {
+              return this._commandService.syncExecuteCommand(ut.id, _), this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(Ct.id, {
                 visible: !1,
-                eventType: mt.Keyboard,
-                unitId: i,
-                keycode: ft.ESC
+                eventType: _t.Keyboard,
+                unitId: o,
+                keycode: St.ESC
               }), !0;
             },
-            defaultValue: xt(s.getCellRaw(r, o))
+            defaultValue: Wt(s.getCellRaw(r, i))
           },
           location: n
         };
@@ -452,7 +456,7 @@ let $e = class extends De {
       }
     }), !h)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
-    const I = new Ur();
+    const I = new Fr();
     I.add(h), I.add({
       dispose: () => {
         var g, p;
@@ -463,14 +467,14 @@ let $e = class extends De {
   hideDropdown() {
     this._activeDropdown && (this._currentPopup && this._currentPopup.dispose(), this._currentPopup = null, this._activeDropdown = null, this._activeDropdown$.next(null));
   }
-  showDataValidationDropdown(t, n, r, o, i) {
+  showDataValidationDropdown(t, n, r, i, o) {
     const a = this._univerInstanceService.getUnit(t, H.UNIVER_SHEET);
     if (!a)
       return;
     const l = a.getSheetBySheetId(n);
     if (!l)
       return;
-    const s = this._dataValidationModel.getRuleByLocation(a.getUnitId(), l.getSheetId(), r, o);
+    const s = this._dataValidationModel.getRuleByLocation(a.getUnitId(), l.getSheetId(), r, i);
     if (!s)
       return;
     const d = this._dataValidatorRegistryService.getValidatorItem(s.type);
@@ -483,139 +487,139 @@ let $e = class extends De {
         workbook: a,
         worksheet: l,
         row: r,
-        col: o,
+        col: i,
         unitId: t,
         subUnitId: n
       },
-      onHide: i
+      onHide: o
     });
   }
 };
-$e = Bo([
+$e = Hi([
   ve(0, pe),
-  ve(1, E(Te)),
-  ve(2, ur),
-  ve(3, E(ae)),
-  ve(4, E(Jn)),
-  ve(5, E(Mo)),
-  ve(6, E(ae)),
-  ve(7, oe),
-  ve(8, mr),
-  ve(9, E(Ve)),
-  ve(10, hn)
+  ve(1, D(Te)),
+  ve(2, pr),
+  ve(3, D(ae)),
+  ve(4, D(er)),
+  ve(5, D(bi)),
+  ve(6, D(ae)),
+  ve(7, ie),
+  ve(8, _r),
+  ve(9, D(Ve)),
+  ve(10, gn)
 ], $e);
-const Vt = "DataValidationPanel", Be = {
+const Ot = "DataValidationPanel", Be = {
   id: "data-validation.operation.open-validation-panel",
-  type: ot.OPERATION,
+  type: at.OPERATION,
   handler(e, t) {
     if (!t)
       return !1;
-    const { ruleId: n, isAdd: r } = t, o = e.get(_e), i = e.get(fn), a = e.get(pe), l = e.get(cr), s = Qn(a);
+    const { ruleId: n, isAdd: r } = t, i = e.get(_e), o = e.get(Sn), a = e.get(pe), l = e.get(hr), s = tr(a);
     if (!s) return !1;
-    const { unitId: d, subUnitId: u } = s, h = n ? i.getRuleById(d, u, n) : void 0;
-    o.open(), o.setActiveRule(h && {
+    const { unitId: d, subUnitId: u } = s, h = n ? o.getRuleById(d, u, n) : void 0;
+    i.open(), i.setActiveRule(h && {
       unitId: d,
       subUnitId: u,
       rule: h
     });
     const c = l.open({
-      id: Vt,
+      id: Ot,
       header: { title: r ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
-      children: { label: Vt },
+      children: { label: Ot },
       width: 312,
-      onClose: () => o.close()
+      onClose: () => i.close()
     });
-    return o.setCloseDisposable(c), !0;
+    return i.setCloseDisposable(c), !0;
   }
-}, wn = {
+}, yn = {
   id: "data-validation.operation.close-validation-panel",
-  type: ot.OPERATION,
+  type: at.OPERATION,
   handler(e) {
     return e.get(_e).close(), !0;
   }
-}, Cr = {
+}, wr = {
   id: "data-validation.operation.toggle-validation-panel",
-  type: ot.OPERATION,
+  type: at.OPERATION,
   handler(e) {
-    const t = e.get(oe), n = e.get(_e);
-    return n.open(), n.isOpen ? t.executeCommand(wn.id) : t.executeCommand(Be.id), !0;
+    const t = e.get(ie), n = e.get(_e);
+    return n.open(), n.isOpen ? t.executeCommand(yn.id) : t.executeCommand(Be.id), !0;
   }
-}, Ut = {
-  type: ot.OPERATION,
+}, Ft = {
+  type: at.OPERATION,
   id: "sheet.operation.show-data-validation-dropdown",
   handler(e, t) {
     if (!t)
       return !1;
-    const n = e.get($e), { unitId: r, subUnitId: o, row: i, column: a } = t, l = n.activeDropdown, s = l == null ? void 0 : l.location;
-    return s && s.unitId === r && s.subUnitId === o && s.row === i && s.col === a || n.showDataValidationDropdown(
+    const n = e.get($e), { unitId: r, subUnitId: i, row: o, column: a } = t, l = n.activeDropdown, s = l == null ? void 0 : l.location;
+    return s && s.unitId === r && s.subUnitId === i && s.row === o && s.col === a || n.showDataValidationDropdown(
       r,
-      o,
       i,
+      o,
       a
     ), !0;
   }
-}, Ir = {
-  type: ot.OPERATION,
+}, Rr = {
+  type: at.OPERATION,
   id: "sheet.operation.hide-data-validation-dropdown",
   handler(e, t) {
     return t ? (e.get($e).hideDropdown(), !0) : !1;
   }
-}, Ft = {
-  type: ot.COMMAND,
+}, $t = {
+  type: at.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   handler(e) {
-    const t = e.get(pe), n = Qn(t);
+    const t = e.get(pe), n = tr(t);
     if (!n) return !1;
-    const { workbook: r, worksheet: o } = n, i = rr(e), a = e.get(oe), l = r.getUnitId(), s = o.getSheetId(), d = {
-      rule: i,
+    const { workbook: r, worksheet: i } = n, o = or(e), a = e.get(ie), l = r.getUnitId(), s = i.getSheetId(), d = {
+      rule: o,
       unitId: l,
       subUnitId: s
     };
-    return a.syncExecuteCommand(vn.id, d) ? (a.syncExecuteCommand(Be.id, {
-      ruleId: i.uid,
+    return a.syncExecuteCommand(fn.id, d) ? (a.syncExecuteCommand(Be.id, {
+      ruleId: o.uid,
       isAdd: !0
     }), !0) : !1;
   }
 };
-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;
+var Yi = Object.getOwnPropertyDescriptor, Xi = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? Yi(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, je = (e, t) => (n, r) => t(n, r, e);
 const Oe = "SHEET_DATA_VALIDATION_ALERT";
-let gt = class extends De {
-  constructor(e, t, n, r, o, i) {
-    super(), this._hoverManagerService = e, this._cellAlertManagerService = t, this._univerInstanceService = n, this._localeService = r, this._zenZoneService = o, this._dataValidationModel = i, this._init();
+let mt = class extends De {
+  constructor(e, t, n, r, i, o) {
+    super(), this._hoverManagerService = e, this._cellAlertManagerService = t, this._univerInstanceService = n, this._localeService = r, this._zenZoneService = i, this._dataValidationModel = o, this._init();
   }
   _init() {
     this._initCellAlertPopup(), this._initZenService();
   }
   _initCellAlertPopup() {
-    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(pr(100)).subscribe((e) => {
+    this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(vr(100)).subscribe((e) => {
       var t;
       if (e) {
         const n = this._univerInstanceService.getUnit(e.location.unitId, H.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) {
+        const i = this._dataValidationModel.getRuleByLocation(e.location.unitId, e.location.subUnitId, e.location.row, e.location.col);
+        if (!i) {
           this._cellAlertManagerService.removeAlert(Oe);
           return;
         }
-        if (this._dataValidationModel.validator(o, { ...e.location, workbook: n, worksheet: r }) === ze.INVALID) {
+        if (this._dataValidationModel.validator(i, { ...e.location, workbook: n, worksheet: r }) === Ke.INVALID) {
           const a = this._cellAlertManagerService.currentAlert.get(Oe), l = (t = a == null ? void 0 : a.alert) == null ? void 0 : t.location;
           if (l && l.row === e.location.row && l.col === e.location.col && l.subUnitId === e.location.subUnitId && l.unitId === e.location.unitId) {
             this._cellAlertManagerService.removeAlert(Oe);
             return;
           }
-          const s = this._dataValidationModel.getValidator(o.type);
+          const s = this._dataValidationModel.getValidator(i.type);
           if (!s) {
             this._cellAlertManagerService.removeAlert(Oe);
             return;
           }
           this._cellAlertManagerService.showAlert({
-            type: Do.ERROR,
+            type: Di.ERROR,
             title: this._localeService.t("dataValidation.error.title"),
-            message: s == null ? void 0 : s.getRuleFinalError(o, e.location),
+            message: s == null ? void 0 : s.getRuleFinalError(i, e.location),
             location: e.location,
             width: 200,
             height: 74,
@@ -633,31 +637,31 @@ let gt = class extends De {
     }));
   }
 };
-gt = jo([
-  je(0, E(bo)),
-  je(1, E(Eo)),
+mt = Xi([
+  je(0, D(Mi)),
+  je(1, D(Ei)),
   je(2, pe),
-  je(3, E(ge)),
-  je(4, ur),
-  je(5, E(ae))
-], gt);
-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;
-}, Ht = (e, t) => (n, r) => t(n, r, e);
-let Qe = class extends De {
+  je(3, D(ge)),
+  je(4, pr),
+  je(5, D(ae))
+], mt);
+var Zi = Object.getOwnPropertyDescriptor, zi = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? Zi(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, Yt = (e, t) => (n, r) => t(n, r, e);
+let et = class extends De {
   constructor(e, t, n) {
     super(), this._autoFillService = e, this._sheetDataValidationModel = t, this._injector = n, this._initAutoFill();
   }
   // 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 = sn([i, a]), [h, c] = u.ranges, { mapFunc: m } = u, I = {
+    const e = () => ({ redos: [], undos: [] }), t = (r, i) => {
+      const { source: o, target: a, unitId: l, subUnitId: s } = r, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = dn([o, a]), [h, c] = u.ranges, { mapFunc: m } = u, I = {
         row: h.startRow,
         col: h.startColumn
-      }, D = eo.getAutoFillRepeatRange(h, c), v = new yt(), C = /* @__PURE__ */ new Set();
-      D.forEach((p) => {
+      }, V = ei.getAutoFillRepeatRange(h, c), v = new bt(), C = /* @__PURE__ */ new Set();
+      V.forEach((p) => {
         const _ = p.repeatStartCell, T = p.relativeRange, A = {
           startRow: I.row,
           startColumn: I.col,
@@ -669,7 +673,7 @@ let Qe = class extends De {
           endColumn: _.col,
           endRow: _.row
         };
-        $r.foreach(T, (L, y) => {
+        xr.foreach(T, (L, y) => {
           const O = Mt.getPositionRange(
             {
               startRow: L,
@@ -690,74 +694,74 @@ let Qe = class extends De {
           v.setValue(j, se, x), C.add(x);
         });
       });
-      const f = Array.from(C).map((p) => ({ id: p, ranges: Qt(v, (_) => _ === p) }));
+      const f = Array.from(C).map((p) => ({ id: p, ranges: tn(v, (_) => _ === p) }));
       d.addRangeRules(f);
-      const w = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: b, undoMutations: g } = on(l, s, w, this._injector, "patched", o === st.ONLY_FORMAT);
+      const w = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: M, undoMutations: g } = sn(l, s, w, this._injector, "patched", i === dt.ONLY_FORMAT);
       return {
         undos: g,
-        redos: b
+        redos: M
       };
     }, n = {
-      id: or,
+      id: ar,
       onBeforeFillData: (r) => {
-        const { source: o, unitId: i, subUnitId: a } = r;
-        for (const l of o.rows)
-          for (const s of o.cols) {
-            const d = this._sheetDataValidationModel.getRuleByLocation(i, a, l, s);
+        const { source: i, unitId: o, subUnitId: a } = r;
+        for (const l of i.rows)
+          for (const s of i.cols) {
+            const d = this._sheetDataValidationModel.getRuleByLocation(o, a, l, s);
             if (d && d.type === X.CHECKBOX) {
-              this._autoFillService.setDisableApplyType(st.SERIES, !0);
+              this._autoFillService.setDisableApplyType(dt.SERIES, !0);
               return;
             }
           }
       },
-      onFillData: (r, o, i) => i === st.COPY || i === st.ONLY_FORMAT || i === st.SERIES ? t(r, i) : e(),
+      onFillData: (r, i, o) => o === dt.COPY || o === dt.ONLY_FORMAT || o === dt.SERIES ? t(r, o) : e(),
       onAfterFillData: () => {
       }
     };
     this.disposeWithMe(this._autoFillService.addHook(n));
   }
 };
-Qe = Xo([
-  Ht(0, Qr),
-  Ht(1, E(ae)),
-  Ht(2, E(Ve))
-], Qe);
-var Zo = Object.getOwnPropertyDescriptor, zo = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Zo(t, n) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
-}, jt = (e, t) => (n, r) => t(n, r, e);
-let et = class extends De {
+et = zi([
+  Yt(0, ti),
+  Yt(1, D(ae)),
+  Yt(2, D(Ve))
+], et);
+var Ki = Object.getOwnPropertyDescriptor, Gi = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? Ki(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, Xt = (e, t) => (n, r) => t(n, r, e);
+let tt = class extends De {
   constructor(t, n, r) {
     super();
-    V(this, "_copyInfo");
+    E(this, "_copyInfo");
     this._sheetClipboardService = t, this._sheetDataValidationModel = n, this._injector = r, this._initCopyPaste();
   }
   _initCopyPaste() {
     this._sheetClipboardService.addClipboardHook({
-      id: or,
+      id: ar,
       onBeforeCopy: (t, n, r) => this._collect(t, n, r),
-      onPasteCells: (t, n, r, o) => {
-        const { copyType: i = kn.COPY, pasteType: a } = o, { range: l } = t || {}, { range: s, unitId: d, subUnitId: u } = n;
-        return this._generateMutations(s, { copyType: i, pasteType: a, copyRange: l, unitId: d, subUnitId: u });
+      onPasteCells: (t, n, r, i) => {
+        const { copyType: o = Un.COPY, pasteType: a } = i, { range: l } = t || {}, { range: s, unitId: d, subUnitId: u } = n;
+        return this._generateMutations(s, { copyType: o, pasteType: a, copyRange: l, unitId: d, subUnitId: u });
       }
     });
   }
   _collect(t, n, r) {
-    const o = new yt();
+    const i = new bt();
     this._copyInfo = {
       unitId: t,
       subUnitId: n,
-      matrix: o
+      matrix: i
     };
-    const i = this._injector.invoke((s) => to(r, s, t, n));
-    if (!i)
+    const o = this._injector.invoke((s) => ni(r, s, t, n));
+    if (!o)
       return;
-    const { rows: a, cols: l } = i;
+    const { rows: a, cols: l } = o;
     a.forEach((s, d) => {
       l.forEach((u, h) => {
         const c = this._sheetDataValidationModel.getRuleIdByLocation(t, n, s, u);
-        o.setValue(d, h, c != null ? c : "");
+        i.setValue(d, h, c != null ? c : "");
       });
     });
   }
@@ -765,40 +769,40 @@ let et = class extends De {
   _generateMutations(t, n) {
     if (!this._copyInfo)
       return { redos: [], undos: [] };
-    if (n.copyType === kn.CUT)
+    if (n.copyType === Un.CUT)
       return this._copyInfo = null, { redos: [], undos: [] };
     if (!this._copyInfo || !this._copyInfo.matrix.getSizeOf() || !n.copyRange)
       return { redos: [], undos: [] };
     if ([
-      St.SPECIAL_PASTE_COL_WIDTH,
-      St.SPECIAL_PASTE_VALUE,
-      St.SPECIAL_PASTE_FORMAT,
-      St.SPECIAL_PASTE_FORMULA
+      It.SPECIAL_PASTE_COL_WIDTH,
+      It.SPECIAL_PASTE_VALUE,
+      It.SPECIAL_PASTE_FORMAT,
+      It.SPECIAL_PASTE_FORMULA
     ].includes(n.pasteType))
       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 yt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = sn([n.copyRange, t]), c = Nn(d, u, !0), m = /* @__PURE__ */ new Map();
+    const { unitId: i, subUnitId: o } = this._copyInfo;
+    if (n.unitId !== i || o !== n.subUnitId) {
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(n.unitId, n.subUnitId).clone(), l = new bt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = dn([n.copyRange, t]), c = Fn(d, u, !0), m = /* @__PURE__ */ new Map();
       c.forEach(({ startRange: C }) => {
         var f;
-        (f = this._copyInfo) == null || f.matrix.forValue((w, b, g) => {
+        (f = this._copyInfo) == null || f.matrix.forValue((w, M, g) => {
           const p = Mt.getPositionRange(
             {
               startRow: w,
               endRow: w,
-              startColumn: b,
-              endColumn: b
+              startColumn: M,
+              endColumn: M
             },
             C
-          ), _ = `${i}-${g}`, T = this._sheetDataValidationModel.getRuleById(o, i, g);
+          ), _ = `${o}-${g}`, T = this._sheetDataValidationModel.getRuleById(i, o, g);
           !this._sheetDataValidationModel.getRuleById(n.unitId, n.subUnitId, _) && T && m.set(_, { ...T, uid: _ });
           const { row: A, col: P } = h(p.startRow, p.startColumn);
           s.add(_), l.setValue(A, P, _);
         });
       });
-      const I = Array.from(s).map((C) => ({ id: C, ranges: Qt(l, (f) => f === C) }));
+      const I = Array.from(s).map((C) => ({ id: C, ranges: tn(l, (f) => f === C) }));
       a.addRangeRules(I);
-      const { redoMutations: D, undoMutations: v } = on(
+      const { redoMutations: V, undoMutations: v } = sn(
         n.unitId,
         n.subUnitId,
         a.diffWithAddition(this._sheetDataValidationModel.getRules(n.unitId, n.subUnitId), m.values()),
@@ -807,14 +811,14 @@ let et = class extends De {
         !1
       );
       return {
-        redos: D,
+        redos: V,
         undos: v
       };
     } else {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(o, i).clone(), l = new yt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = sn([n.copyRange, t]);
-      Nn(d, u, !0).forEach(({ startRange: v }) => {
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(i, o).clone(), l = new bt(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = dn([n.copyRange, t]);
+      Fn(d, u, !0).forEach(({ startRange: v }) => {
         var C;
-        (C = this._copyInfo) == null || C.matrix.forValue((f, w, b) => {
+        (C = this._copyInfo) == null || C.matrix.forValue((f, w, M) => {
           const g = Mt.getPositionRange(
             {
               startRow: f,
@@ -824,126 +828,126 @@ let et = class extends De {
             },
             v
           ), { row: p, col: _ } = h(g.startRow, g.startColumn);
-          l.setValue(p, _, b), s.add(b);
+          l.setValue(p, _, M), s.add(M);
         });
       });
-      const m = Array.from(s).map((v) => ({ id: v, ranges: Qt(l, (C) => C === v) }));
+      const m = Array.from(s).map((v) => ({ id: v, ranges: tn(l, (C) => C === v) }));
       a.addRangeRules(m);
-      const { redoMutations: I, undoMutations: D } = on(
-        o,
+      const { redoMutations: I, undoMutations: V } = sn(
         i,
-        a.diff(this._sheetDataValidationModel.getRules(o, i)),
+        o,
+        a.diff(this._sheetDataValidationModel.getRules(i, o)),
         this._injector,
         "patched",
         !1
       );
       return {
         redos: I,
-        undos: D
+        undos: V
       };
     }
   }
 };
-et = zo([
-  jt(0, Vo),
-  jt(1, E(ae)),
-  jt(2, E(Ve))
-], et);
-var Ko = Object.getOwnPropertyDescriptor, Go = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Ko(t, n) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
-}, Yt = (e, t) => (n, r) => t(n, r, e);
-let tt = class extends De {
+tt = Gi([
+  Xt(0, Vi),
+  Xt(1, D(ae)),
+  Xt(2, D(Ve))
+], tt);
+var qi = Object.getOwnPropertyDescriptor, Ji = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? qi(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, Zt = (e, t) => (n, r) => t(n, r, e);
+let nt = class extends De {
   constructor(e, t, n) {
     super(), this._localeService = e, this._commandService = t, this._sheetPermissionCheckController = n, this._commandExecutedListener();
   }
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((e) => {
-        if (e.id === vn.id) {
+        if (e.id === fn.id) {
           const { unitId: t, subUnitId: n, rule: { ranges: r } } = e.params;
           this._sheetPermissionCheckController.permissionCheckWithRanges({
-            workbookTypes: [rn],
-            rangeTypes: [nn],
-            worksheetTypes: [en, tn]
+            workbookTypes: [an],
+            rangeTypes: [on],
+            worksheetTypes: [nn, rn]
           }, r, t, n) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"));
         }
-        if (e.id === ir.id) {
+        if (e.id === sr.id) {
           const { unitId: t, subUnitId: n, ranges: r } = e.params;
           this._sheetPermissionCheckController.permissionCheckWithRanges({
-            workbookTypes: [rn],
-            rangeTypes: [nn],
-            worksheetTypes: [en, tn]
+            workbookTypes: [an],
+            rangeTypes: [on],
+            worksheetTypes: [nn, rn]
           }, r, t, n) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"));
         }
       })
     );
   }
 };
-tt = Go([
-  Yt(0, E(ge)),
-  Yt(1, oe),
-  Yt(2, E(no))
-], tt);
-const wr = "sheet.menu.data-validation";
-function qo(e) {
+nt = Ji([
+  Zt(0, D(ge)),
+  Zt(1, ie),
+  Zt(2, D(ri))
+], nt);
+const yr = "sheet.menu.data-validation";
+function Qi(e) {
   return {
-    id: wr,
-    type: _n.SUBITEMS,
+    id: yr,
+    type: Cn.SUBITEMS,
     icon: "DataValidationIcon",
     tooltip: "dataValidation.title",
-    hidden$: So(e, H.UNIVER_SHEET),
-    disabled$: To(e, { workbookTypes: [rn], worksheetTypes: [tn, en], rangeTypes: [nn] })
+    hidden$: Si(e, H.UNIVER_SHEET),
+    disabled$: Ti(e, { workbookTypes: [an], worksheetTypes: [rn, nn], rangeTypes: [on] })
   };
 }
-function Jo(e) {
+function eo(e) {
   return {
     id: Be.id,
     title: "dataValidation.panel.title",
-    type: _n.BUTTON
+    type: Cn.BUTTON
   };
 }
-function Qo(e) {
+function to(e) {
   return {
-    id: Ft.id,
+    id: $t.id,
     title: "dataValidation.panel.add",
-    type: _n.BUTTON
+    type: Cn.BUTTON
   };
 }
-const ei = {
-  [Co.RULES]: {
-    [wr]: {
+const no = {
+  [Ci.RULES]: {
+    [yr]: {
       order: 0,
-      menuItemFactory: qo,
+      menuItemFactory: Qi,
       [Be.id]: {
         order: 0,
-        menuItemFactory: Jo
+        menuItemFactory: eo
       },
-      [Ft.id]: {
+      [$t.id]: {
         order: 1,
-        menuItemFactory: Qo
+        menuItemFactory: to
       }
     }
   }
 };
-var ti = Object.getOwnPropertyDescriptor, Rr = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? ti(t, n) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+var ro = Object.getOwnPropertyDescriptor, br = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? ro(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, K = (e, t) => (n, r) => t(n, r, e);
-const yr = {
+const Mr = {
   tr: {
     size: 6,
     color: "#fe4b4b"
   }
 };
-let nt = class extends pn {
-  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();
+let rt = class extends vn {
+  constructor(e, t, n, r, i, o, a, l, s, d, u) {
+    super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = n, this._univerInstanceService = r, this._autoHeightController = i, this._dropdownManagerService = o, this._sheetDataValidationModel = a, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = d, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(ei);
+    this._menuManagerService.mergeMenu(no);
   }
   _initDropdown() {
     this._editorBridgeService && this.disposeWithMe(this._editorBridgeService.visible$.subscribe((e) => {
@@ -954,10 +958,10 @@ let nt = class extends pn {
       }
       const t = this._editorBridgeService.getEditCellState();
       if (t) {
-        const { unitId: r, sheetId: o, row: i, column: a } = t, l = this._univerInstanceService.getUniverSheetInstance(r);
+        const { unitId: r, sheetId: i, row: o, column: a } = t, l = this._univerInstanceService.getUniverSheetInstance(r);
         if (!l)
           return;
-        const s = this._sheetDataValidationModel.getRuleByLocation(r, o, i, a);
+        const s = this._sheetDataValidationModel.getRuleByLocation(r, i, o, a);
         if (!s)
           return;
         const d = this._dataValidatorRegistryService.getValidatorItem(s.type);
@@ -966,14 +970,14 @@ let nt = class extends pn {
         const u = l.getActiveSheet();
         if (!u) return;
         const h = this._dropdownManagerService.activeDropdown, c = h == null ? void 0 : h.location;
-        if (c && c.unitId === r && c.subUnitId === o && c.row === i && c.col === a)
+        if (c && c.unitId === r && c.subUnitId === i && c.row === o && c.col === a)
           return;
         this._dropdownManagerService.showDropdown(
           {
             location: {
               unitId: r,
-              subUnitId: o,
-              row: i,
+              subUnitId: i,
+              row: o,
               col: a,
               workbook: l,
               worksheet: u
@@ -989,42 +993,42 @@ let nt = class extends pn {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        er.CELL_CONTENT,
+        nr.CELL_CONTENT,
         {
-          effect: Xn.Style,
+          effect: zn.Style,
           // must be after numfmt
-          priority: tr.DATA_VALIDATION,
+          priority: rr.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, n) => {
-            var C, f, w, b, g;
-            const { row: r, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(i, a, r, o);
+            var C, f, w, M, g;
+            const { row: r, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(o, a, r, i);
             if (!d)
               return n(e);
-            const u = this._sheetDataValidationModel.getRuleById(i, a, d);
+            const u = this._sheetDataValidationModel.getRuleById(o, a, d);
             if (!u)
               return n(e);
-            const h = (C = this._dataValidationCacheService.getValue(i, a, r, o)) != null ? C : ze.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
+            const h = (C = this._dataValidationCacheService.getValue(o, a, r, i)) != null ? C : Ke.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
             let I;
-            const D = {
+            const V = {
               get value() {
                 var p;
-                return I !== void 0 || (I = (p = ie(m)) != null ? p : null), I;
+                return I !== void 0 || (I = (p = oe(m)) != null ? p : null), I;
               }
             }, v = {
               get value() {
                 var p;
-                return `${(p = D.value) != null ? p : ""}`;
+                return `${(p = V.value) != null ? p : ""}`;
               }
             };
             return (!e || e === t.rawData) && (e = { ...t.rawData }), e.markers = {
               ...e == null ? void 0 : e.markers,
-              ...h === ze.INVALID ? yr : null
+              ...h === Ke.INVALID ? Mr : null
             }, e.customRender = [
               ...(f = e == null ? void 0 : e.customRender) != null ? f : [],
               ...c != null && c.canvasRender ? [c.canvasRender] : []
             ], e.fontRenderExtension = {
               ...e == null ? void 0 : e.fontRenderExtension,
-              isSkip: ((w = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : w.isSkip) || ((b = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : b.call(c, u, D.value, t))
+              isSkip: ((w = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : w.isSkip) || ((M = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : M.call(c, u, V.value, t))
             }, e.interceptorStyle = {
               ...e == null ? void 0 : e.interceptorStyle,
               ...c == null ? void 0 : c.getExtraStyle(u, v.value, {
@@ -1032,37 +1036,37 @@ let nt = class extends pn {
                   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)
+              }, r, i)
             }, e.interceptorAutoHeight = () => {
               var A, P, L, y, O, U;
-              const p = (P = (A = this._renderManagerService.getRenderById(i)) == null ? void 0 : A.with(ut).getSkeletonParam(a)) == null ? void 0 : P.skeleton;
+              const p = (P = (A = this._renderManagerService.getRenderById(o)) == null ? void 0 : A.with(pt).getSkeletonParam(a)) == null ? void 0 : P.skeleton;
               if (!p)
                 return;
-              const _ = p.worksheet.getMergedCell(r, o), T = {
+              const _ = p.worksheet.getMergedCell(r, i), T = {
                 data: e,
                 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,
+                primaryWithCoord: p.getCellWithCoordByIndex((L = _ == null ? void 0 : _.startRow) != null ? L : r, (y = _ == null ? void 0 : _.startColumn) != null ? y : i),
+                unitId: o,
                 subUnitId: a,
                 row: r,
-                col: o,
+                col: i,
                 workbook: l,
                 worksheet: s
               };
               return (U = (O = c == null ? void 0 : c.canvasRender) == null ? void 0 : O.calcCellAutoHeight) == null ? void 0 : U.call(O, T);
             }, e.interceptorAutoWidth = () => {
               var A, P, L, y, O, U;
-              const p = (P = (A = this._renderManagerService.getRenderById(i)) == null ? void 0 : A.with(ut).getSkeletonParam(a)) == null ? void 0 : P.skeleton;
+              const p = (P = (A = this._renderManagerService.getRenderById(o)) == null ? void 0 : A.with(pt).getSkeletonParam(a)) == null ? void 0 : P.skeleton;
               if (!p)
                 return;
-              const _ = p.worksheet.getMergedCell(r, o), T = {
+              const _ = p.worksheet.getMergedCell(r, i), T = {
                 data: e,
                 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,
+                primaryWithCoord: p.getCellWithCoordByIndex((L = _ == null ? void 0 : _.startRow) != null ? L : r, (y = _ == null ? void 0 : _.startColumn) != null ? y : i),
+                unitId: o,
                 subUnitId: a,
                 row: r,
-                col: o,
+                col: i,
                 workbook: l,
                 worksheet: s
               };
@@ -1077,8 +1081,8 @@ let nt = class extends pn {
     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
-      Cn((e) => e.source === "command"),
-      gr(100)
+      wn((e) => e.source === "command"),
+      mr(100)
     ).subscribe((e) => {
       if (e.length === 0)
         return;
@@ -1088,50 +1092,50 @@ let nt = class extends pn {
         (n.rule.type === X.LIST_MULTIPLE || n.rule.type === X.LIST) && (r = n.rule) != null && r.ranges && t.push(...n.rule.ranges);
       }), t.length) {
         const n = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
-        Zn(n.redos, this._commandService);
+        Kn(n.redos, this._commandService);
       }
     });
   }
 };
-nt = Rr([
-  K(0, oe),
-  K(1, Io),
+rt = br([
+  K(0, ie),
+  K(1, Ii),
   K(2, xe),
   K(3, pe),
-  K(4, E(fr)),
-  K(5, E($e)),
-  K(6, E(ae)),
-  K(7, E(Te)),
-  K(8, E(gn)),
-  K(9, E(ar)),
-  K(10, xr(mr))
-], nt);
-let $n = class extends pn {
-  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();
+  K(4, D(Sr)),
+  K(5, D($e)),
+  K(6, D(ae)),
+  K(7, D(Te)),
+  K(8, D(mn)),
+  K(9, D(lr)),
+  K(10, Br(_r))
+], rt);
+let Bn = class extends vn {
+  constructor(e, t, n, r, i, o, a) {
+    super(), this._commandService = e, this._renderManagerService = t, this._autoHeightController = n, this._dataValidatorRegistryService = r, this._sheetInterceptorService = i, this._sheetDataValidationModel = o, this._dataValidationCacheService = a, this._initViewModelIntercept(), this._initAutoHeight();
   }
   // eslint-disable-next-line max-lines-per-function
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        er.CELL_CONTENT,
+        nr.CELL_CONTENT,
         {
-          effect: Xn.Style,
+          effect: zn.Style,
           // must be after numfmt
-          priority: tr.DATA_VALIDATION,
+          priority: rr.DATA_VALIDATION,
           // eslint-disable-next-line complexity, max-lines-per-function
           handler: (e, t, n) => {
-            var v, C, f, w, b;
-            const { row: r, col: o, unitId: i, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(i, a, r, o);
+            var v, C, f, w, M;
+            const { row: r, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(o, a, r, i);
             if (!d)
               return n(e);
-            const u = this._sheetDataValidationModel.getRuleById(i, a, d);
+            const u = this._sheetDataValidationModel.getRuleById(o, a, d);
             if (!u)
               return n(e);
-            const h = (v = this._dataValidationCacheService.getValue(i, a, r, o)) != null ? v : ze.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(r, o), I = ie(m), D = `${I != null ? I : ""}`;
+            const h = (v = this._dataValidationCacheService.getValue(o, a, r, i)) != null ? v : Ke.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(r, i), I = oe(m), V = `${I != null ? I : ""}`;
             return (!e || e === t.rawData) && (e = { ...t.rawData }), e.markers = {
               ...e == null ? void 0 : e.markers,
-              ...h === ze.INVALID ? yr : null
+              ...h === Ke.INVALID ? Mr : null
             }, e.customRender = [
               ...(C = e == null ? void 0 : e.customRender) != null ? C : [],
               ...c != null && c.canvasRender ? [c.canvasRender] : []
@@ -1140,47 +1144,47 @@ let $n = class extends pn {
               isSkip: ((f = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : f.isSkip) || ((w = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : w.call(c, u, I, t))
             }, e.interceptorStyle = {
               ...e == null ? void 0 : e.interceptorStyle,
-              ...c == null ? void 0 : c.getExtraStyle(u, D, {
+              ...c == null ? void 0 : c.getExtraStyle(u, V, {
                 get style() {
                   const g = l.getStyles();
                   return (typeof (e == null ? void 0 : e.s) == "string" ? g.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                 }
-              }, r, o)
+              }, r, i)
             }, e.interceptorAutoHeight = () => {
               var T, A, P, L, y, O;
-              const g = (A = (T = this._renderManagerService.getRenderById(i)) == null ? void 0 : T.with(ut).getSkeletonParam(a)) == null ? void 0 : A.skeleton;
+              const g = (A = (T = this._renderManagerService.getRenderById(o)) == null ? void 0 : T.with(pt).getSkeletonParam(a)) == null ? void 0 : A.skeleton;
               if (!g)
                 return;
-              const p = g.worksheet.getMergedCell(r, o), _ = {
+              const p = g.worksheet.getMergedCell(r, i), _ = {
                 data: e,
                 style: g.getStyles().getStyleByCell(e),
-                primaryWithCoord: g.getCellWithCoordByIndex((P = p == null ? void 0 : p.startRow) != null ? P : r, (L = p == null ? void 0 : p.startColumn) != null ? L : o),
-                unitId: i,
+                primaryWithCoord: g.getCellWithCoordByIndex((P = p == null ? void 0 : p.startRow) != null ? P : r, (L = p == null ? void 0 : p.startColumn) != null ? L : i),
+                unitId: o,
                 subUnitId: a,
                 row: r,
-                col: o,
+                col: i,
                 workbook: l,
                 worksheet: s
               };
               return (O = (y = c == null ? void 0 : c.canvasRender) == null ? void 0 : y.calcCellAutoHeight) == null ? void 0 : O.call(y, _);
             }, e.interceptorAutoWidth = () => {
               var T, A, P, L, y, O;
-              const g = (A = (T = this._renderManagerService.getRenderById(i)) == null ? void 0 : T.with(ut).getSkeletonParam(a)) == null ? void 0 : A.skeleton;
+              const g = (A = (T = this._renderManagerService.getRenderById(o)) == null ? void 0 : T.with(pt).getSkeletonParam(a)) == null ? void 0 : A.skeleton;
               if (!g)
                 return;
-              const p = g.worksheet.getMergedCell(r, o), _ = {
+              const p = g.worksheet.getMergedCell(r, i), _ = {
                 data: e,
                 style: g.getStyles().getStyleByCell(e),
-                primaryWithCoord: g.getCellWithCoordByIndex((P = p == null ? void 0 : p.startRow) != null ? P : r, (L = p == null ? void 0 : p.startColumn) != null ? L : o),
-                unitId: i,
+                primaryWithCoord: g.getCellWithCoordByIndex((P = p == null ? void 0 : p.startRow) != null ? P : r, (L = p == null ? void 0 : p.startColumn) != null ? L : i),
+                unitId: o,
                 subUnitId: a,
                 row: r,
-                col: o,
+                col: i,
                 workbook: l,
                 worksheet: s
               };
               return (O = (y = c == null ? void 0 : c.canvasRender) == null ? void 0 : y.calcCellAutoWidth) == null ? void 0 : O.call(y, _);
-            }, e.coverable = ((b = e == null ? void 0 : e.coverable) != null ? b : !0) && !(u.type === X.LIST || u.type === X.LIST_MULTIPLE), n(e);
+            }, e.coverable = ((M = e == null ? void 0 : e.coverable) != null ? M : !0) && !(u.type === X.LIST || u.type === X.LIST_MULTIPLE), n(e);
           }
         }
       )
@@ -1188,8 +1192,8 @@ let $n = class extends pn {
   }
   _initAutoHeight() {
     this._sheetDataValidationModel.ruleChange$.pipe(
-      Cn((e) => e.source === "command"),
-      gr(16)
+      wn((e) => e.source === "command"),
+      mr(16)
     ).subscribe((e) => {
       const t = [];
       if (e.forEach((n) => {
@@ -1197,26 +1201,26 @@ let $n = class extends pn {
         (n.rule.type === X.LIST_MULTIPLE || n.rule.type === X.LIST) && (r = n.rule) != null && r.ranges && t.push(...n.rule.ranges);
       }), t.length) {
         const n = this._autoHeightController.getUndoRedoParamsOfAutoHeight(t);
-        Zn(n.redos, this._commandService);
+        Kn(n.redos, this._commandService);
       }
     });
   }
 };
-$n = Rr([
-  K(0, oe),
+Bn = br([
+  K(0, ie),
   K(1, xe),
-  K(2, E(fr)),
-  K(3, E(Te)),
-  K(4, E(gn)),
-  K(5, E(ae)),
-  K(6, E(ar))
-], $n);
-var ni = Object.getOwnPropertyDescriptor, ri = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? ni(t, n) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
-}, xn = (e, t) => (n, r) => t(n, r, e);
-let Tt = class extends De {
+  K(2, D(Sr)),
+  K(3, D(Te)),
+  K(4, D(mn)),
+  K(5, D(ae)),
+  K(6, D(lr))
+], Bn);
+var io = Object.getOwnPropertyDescriptor, oo = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? io(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, Wn = (e, t) => (n, r) => t(n, r, e);
+let At = class extends De {
   constructor(e, t, n) {
     super(), this._context = e, this._sheetDataValidationModel = t, this._sheetSkeletonManagerService = n, this._initSkeletonChange();
   }
@@ -1226,67 +1230,67 @@ let Tt = class extends De {
       if (!t.length)
         return;
       const n = /* @__PURE__ */ new Set();
-      t.forEach((o) => {
-        n.add(o.subUnitId);
-      }), n.forEach((o) => {
-        var i;
-        (i = this._sheetSkeletonManagerService.getSkeletonParam(o)) == null || i.skeleton.makeDirty(!0);
+      t.forEach((i) => {
+        n.add(i.subUnitId);
+      }), n.forEach((i) => {
+        var o;
+        (o = this._sheetSkeletonManagerService.getSkeletonParam(i)) == null || o.skeleton.makeDirty(!0);
       }), (r = this._context.mainComponent) == null || r.makeForceDirty();
     };
-    this.disposeWithMe(this._sheetDataValidationModel.validStatusChange$.pipe(Br(16)).subscribe(e));
+    this.disposeWithMe(this._sheetDataValidationModel.validStatusChange$.pipe(Wr(16)).subscribe(e));
   }
 };
-Tt = ri([
-  xn(1, E(ae)),
-  xn(2, E(ut))
-], Tt);
+At = oo([
+  Wn(1, D(ae)),
+  Wn(2, D(pt))
+], At);
 function We({ ref: e, ...t }) {
-  const { icon: n, id: r, className: o, extend: i, ...a } = t, l = `univerjs-icon univerjs-icon-${r} ${o || ""}`.trim(), s = vt(`_${ai()}`);
-  return Mr(n, `${r}`, {
+  const { icon: n, id: r, className: i, extend: o, ...a } = t, l = `univerjs-icon univerjs-icon-${r} ${i || ""}`.trim(), s = ft(`_${lo()}`);
+  return Er(n, `${r}`, {
     defIds: n.defIds,
     idSuffix: s.current
   }, {
     ref: e,
     className: l,
     ...a
-  }, i);
+  }, o);
 }
-function Mr(e, t, n, r, o) {
+function Er(e, t, n, r, i) {
   return ye(e.tag, {
     key: t,
-    ...oi(e, n, o),
+    ...ao(e, n, i),
     ...r
-  }, (ii(e, n).children || []).map((i, a) => Mr(i, `${t}-${e.tag}-${a}`, n, void 0, o)));
+  }, (so(e, n).children || []).map((o, a) => Er(o, `${t}-${e.tag}-${a}`, n, void 0, i)));
 }
-function oi(e, t, n) {
+function ao(e, t, n) {
   const r = { ...e.attrs };
-  n != null && n.colorChannel1 && r.fill === "colorChannel1" && (r.fill = n.colorChannel1), e.tag === "mask" && r.id && (r.id = r.id + t.idSuffix), Object.entries(r).forEach(([i, a]) => {
-    i === "mask" && typeof a == "string" && (r[i] = a.replace(/url\(#(.*)\)/, `url(#$1${t.idSuffix})`));
+  n != null && n.colorChannel1 && r.fill === "colorChannel1" && (r.fill = n.colorChannel1), e.tag === "mask" && r.id && (r.id = r.id + t.idSuffix), Object.entries(r).forEach(([o, a]) => {
+    o === "mask" && typeof a == "string" && (r[o] = a.replace(/url\(#(.*)\)/, `url(#$1${t.idSuffix})`));
   });
-  const { defIds: o } = t;
-  return !o || o.length === 0 || (e.tag === "use" && r["xlink:href"] && (r["xlink:href"] = r["xlink:href"] + t.idSuffix), Object.entries(r).forEach(([i, a]) => {
-    typeof a == "string" && (r[i] = a.replace(/url\(#(.*)\)/, `url(#$1${t.idSuffix})`));
+  const { defIds: i } = t;
+  return !i || i.length === 0 || (e.tag === "use" && r["xlink:href"] && (r["xlink:href"] = r["xlink:href"] + t.idSuffix), Object.entries(r).forEach(([o, a]) => {
+    typeof a == "string" && (r[o] = a.replace(/url\(#(.*)\)/, `url(#$1${t.idSuffix})`));
   })), r;
 }
-function ii(e, t) {
+function so(e, t) {
   var r;
   const { defIds: n } = t;
   return !n || n.length === 0 ? e : e.tag === "defs" && ((r = e.children) != null && r.length) ? {
     ...e,
-    children: e.children.map((o) => typeof o.attrs.id == "string" && n && n.includes(o.attrs.id) ? {
-      ...o,
+    children: e.children.map((i) => typeof i.attrs.id == "string" && n && n.includes(i.attrs.id) ? {
+      ...i,
       attrs: {
-        ...o.attrs,
-        id: o.attrs.id + t.idSuffix
+        ...i.attrs,
+        id: i.attrs.id + t.idSuffix
       }
-    } : o)
+    } : i)
   } : e;
 }
-function ai() {
+function lo() {
   return Math.random().toString(36).substring(2, 8);
 }
 We.displayName = "UniverIcon";
-const si = {
+const co = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1329,15 +1333,15 @@ const si = {
       }
     }
   ]
-}, br = it(function(t, n) {
+}, Dr = st(function(t, n) {
   return ye(We, Object.assign({}, t, {
     id: "data-validation-icon",
     ref: n,
-    icon: si
+    icon: co
   }));
 });
-br.displayName = "DataValidationIcon";
-const li = {
+Dr.displayName = "DataValidationIcon";
+const uo = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1378,15 +1382,15 @@ const li = {
       }
     }
   ]
-}, Rn = it(function(t, n) {
+}, bn = st(function(t, n) {
   return ye(We, Object.assign({}, t, {
     id: "delete-icon",
     ref: n,
-    icon: li
+    icon: uo
   }));
 });
-Rn.displayName = "DeleteIcon";
-const di = {
+bn.displayName = "DeleteIcon";
+const ho = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1402,15 +1406,15 @@ const di = {
       d: "M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z"
     }
   }]
-}, Er = it(function(t, n) {
+}, Vr = st(function(t, n) {
   return ye(We, Object.assign({}, t, {
     id: "increase-icon",
     ref: n,
-    icon: di
+    icon: ho
   }));
 });
-Er.displayName = "IncreaseIcon";
-const ci = {
+Vr.displayName = "IncreaseIcon";
+const po = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1428,15 +1432,15 @@ const ci = {
       clipRule: "evenodd"
     }
   }]
-}, yn = it(function(t, n) {
+}, Mn = st(function(t, n) {
   return ye(We, Object.assign({}, t, {
     id: "more-down-icon",
     ref: n,
-    icon: ci
+    icon: po
   }));
 });
-yn.displayName = "MoreDownIcon";
-const ui = {
+Mn.displayName = "MoreDownIcon";
+const go = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1454,15 +1458,15 @@ const ui = {
       clipRule: "evenodd"
     }
   }]
-}, Dr = it(function(t, n) {
+}, Tr = st(function(t, n) {
   return ye(We, Object.assign({}, t, {
     id: "more-up-icon",
     ref: n,
-    icon: ui
+    icon: go
   }));
 });
-Dr.displayName = "MoreUpIcon";
-const hi = {
+Tr.displayName = "MoreUpIcon";
+const vo = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -1515,18 +1519,18 @@ const hi = {
       }
     }
   ]
-}, Vr = it(function(t, n) {
+}, Or = st(function(t, n) {
   return ye(We, Object.assign({}, t, {
     id: "sequence-icon",
     ref: n,
-    icon: hi
+    icon: vo
   }));
 });
-Vr.displayName = "SequenceIcon";
-function pi(e) {
+Or.displayName = "SequenceIcon";
+function mo(e) {
   var d;
-  const t = F(ge), n = F(Sn), { value: r, onChange: o, extraComponent: i } = e, [a, l] = W(!1), s = i ? n.get(i) : null;
-  return /* @__PURE__ */ Y(pt, { children: [
+  const t = F(ge), n = F(In), { value: r, onChange: i, extraComponent: o } = e, [a, l] = W(!1), s = o ? n.get(o) : null;
+  return /* @__PURE__ */ Y(vt, { children: [
     /* @__PURE__ */ Y(
       "div",
       {
@@ -1534,24 +1538,24 @@ function pi(e) {
         onClick: () => l(!a),
         children: [
           t.t("dataValidation.panel.options"),
-          a ? /* @__PURE__ */ S(Dr, { className: "univer-ml-1" }) : /* @__PURE__ */ S(yn, { className: "univer-ml-1" })
+          a ? /* @__PURE__ */ S(Tr, { className: "univer-ml-1" }) : /* @__PURE__ */ S(Mn, { className: "univer-ml-1" })
         ]
       }
     ),
-    a && /* @__PURE__ */ Y(pt, { children: [
-      s ? /* @__PURE__ */ S(s, { value: r, onChange: o }) : null,
+    a && /* @__PURE__ */ Y(vt, { children: [
+      s ? /* @__PURE__ */ S(s, { value: r, onChange: i }) : null,
       /* @__PURE__ */ S(
         Z,
         {
           label: t.t("dataValidation.panel.invalid"),
           children: /* @__PURE__ */ Y(
-            In,
+            Rn,
             {
-              value: `${(d = r.errorStyle) != null ? d : ct.WARNING}`,
-              onChange: (u) => o({ ...r, errorStyle: +u }),
+              value: `${(d = r.errorStyle) != null ? d : ht.WARNING}`,
+              onChange: (u) => i({ ...r, errorStyle: +u }),
               children: [
-                /* @__PURE__ */ S(Ne, { value: `${ct.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ S(Ne, { value: `${ct.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
+                /* @__PURE__ */ S(Ne, { value: `${ht.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ S(Ne, { value: `${ht.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
               ]
             }
           )
@@ -1562,10 +1566,10 @@ function pi(e) {
         {
           label: t.t("dataValidation.panel.messageInfo"),
           children: /* @__PURE__ */ S(
-            Nt,
+            Ut,
             {
               checked: r.showErrorMessage,
-              onChange: () => o({
+              onChange: () => i({
                 ...r,
                 showErrorMessage: !r.showErrorMessage
               }),
@@ -1574,58 +1578,58 @@ function pi(e) {
           )
         }
       ),
-      r.showErrorMessage ? /* @__PURE__ */ S(Z, { children: /* @__PURE__ */ S(Ue, { value: r.error, onChange: (u) => o({ ...r, error: u }) }) }) : null
+      r.showErrorMessage ? /* @__PURE__ */ S(Z, { children: /* @__PURE__ */ S(Ue, { value: r.error, onChange: (u) => i({ ...r, error: u }) }) }) : null
     ] })
   ] });
 }
-const gi = (e) => Wr(
-  async (t, n, r, o) => {
-    const i = await e.executeCommand(t, n, r);
-    o == null || o(i);
+const fo = (e) => Xr(
+  async (t, n, r, i) => {
+    const o = await e.executeCommand(t, n, r);
+    i == null || i(o);
   },
   1e3
 );
-function vi(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(H.UNIVER_SHEET)) == null ? void 0 : i.getSheetBySheetName(n)) == null ? void 0 : a.getSheetId()) || "";
+function _o(e, t, n) {
+  var r, i, o, a;
+  return t ? ((i = (r = e.getUnit(t)) == null ? void 0 : r.getSheetBySheetName(n)) == null ? void 0 : i.getSheetId()) || "" : ((a = (o = e.getCurrentUnitForType(H.UNIVER_SHEET)) == null ? void 0 : o.getSheetBySheetName(n)) == null ? void 0 : a.getSheetId()) || "";
 }
-function mi() {
+function So() {
   var N, J;
-  const [e, t] = W(0), n = F(_e), r = Re(n.activeRule$, n.activeRule), { unitId: o, subUnitId: i, rule: a } = r || {}, l = a.uid, s = F(Te), d = F(pe), u = F(Sn), h = F(oe), c = F(fn), m = F(ge), I = Re(
+  const [e, t] = W(0), n = F(_e), r = Re(n.activeRule$, n.activeRule), { unitId: i, subUnitId: o, rule: a } = r || {}, l = a.uid, s = F(Te), d = F(pe), u = F(In), h = F(ie), c = F(Sn), m = F(ge), I = Re(
     () => d.getCurrentTypeOfUnit$(H.UNIVER_SHEET),
     void 0,
     void 0,
     []
-  ), D = Re(() => {
+  ), V = Re(() => {
     var R;
-    return (R = I == null ? void 0 : I.activeSheet$) != null ? R : vr(null);
-  }, void 0, void 0, []), [v, C] = W(a), f = s.getValidatorItem(v.type), [w, b] = W(!1), g = s.getValidatorsByScope(mo.SHEET), [p, _] = W(() => v.ranges.map((R) => ({ unitId: "", sheetId: "", range: R }))), T = ht(() => gi(h), [h]), [A, P] = W(!1), [L, y] = W(!1), O = vt(null), U = F(Jn);
-  if (be(() => () => {
+    return (R = I == null ? void 0 : I.activeSheet$) != null ? R : fr(null);
+  }, void 0, void 0, []), [v, C] = W(a), f = s.getValidatorItem(v.type), [w, M] = W(!1), g = s.getValidatorsByScope(mi.SHEET), [p, _] = W(() => v.ranges.map((R) => ({ unitId: "", sheetId: "", range: R }))), T = gt(() => fo(h), [h]), [A, P] = W(!1), [L, y] = W(!1), O = ft(null), U = F(er);
+  if (Me(() => () => {
     const R = U.getCurrentLastSelection();
     R && U.setSelections([R]);
-  }, [U]), be(() => {
+  }, [U]), Me(() => {
     h.onCommandExecuted((R) => {
       (R.id === Hr.id || R.id === jr.id) && setTimeout(() => {
-        const B = c.getRuleById(o, i, l);
+        const B = c.getRuleById(i, o, l);
         t((z) => z + 1), B && (C(B), _(B.ranges.map((z) => ({ unitId: "", sheetId: "", range: z }))));
       }, 20);
     });
-  }, [h, c, l, i, o]), !f)
+  }, [h, c, l, o, i]), !f)
     return null;
-  const k = f.operators, x = f.operatorNames, te = v.operator ? fo.includes(v.operator) : !1, j = () => {
-    (D == null ? void 0 : D.getSheetId()) !== i && h.syncExecuteCommand(ro.id, {
-      unitId: o,
-      subUnitId: i
+  const k = f.operators, x = f.operatorNames, te = v.operator ? fi.includes(v.operator) : !1, j = () => {
+    (V == null ? void 0 : V.getSheetId()) !== o && h.syncExecuteCommand(ii.id, {
+      unitId: i,
+      subUnitId: o
     });
   }, se = () => {
     var R, B, z;
-    (B = (R = O.current) == null ? void 0 : R.editor) != null && B.isFocus() && le((z = O.current) == null ? void 0 : z.getValue()), !(!v.ranges.length || A) && (f.validatorFormula(v, o, i).success ? n.setActiveRule(null) : b(!0), j());
-  }, le = an((R) => {
-    const B = R.split(",").filter(Boolean).map(Lo).map((ne) => {
-      const Mn = ne.sheetName;
-      if (Mn) {
-        const Pr = vi(d, ne.unitId, Mn);
-        return { ...ne, sheetId: Pr };
+    (B = (R = O.current) == null ? void 0 : R.editor) != null && B.isFocus() && le((z = O.current) == null ? void 0 : z.getValue()), !(!v.ranges.length || A) && (f.validatorFormula(v, i, o).success ? n.setActiveRule(null) : M(!0), j());
+  }, le = ln((R) => {
+    const B = R.split(",").filter(Boolean).map(Li).map((ne) => {
+      const En = ne.sheetName;
+      if (En) {
+        const Lr = _o(d, ne.unitId, En);
+        return { ...ne, sheetId: Lr };
       }
       return {
         ...ne,
@@ -1635,42 +1639,42 @@ function mi() {
     if (Yr(B, p))
       return;
     _(B);
-    const z = B.filter((ne) => (!ne.unitId || ne.unitId === o) && (!ne.sheetId || ne.sheetId === i)).map((ne) => ne.range);
+    const z = B.filter((ne) => (!ne.unitId || ne.unitId === i) && (!ne.sheetId || ne.sheetId === o)).map((ne) => ne.range);
     if (C({
       ...v,
       ranges: z
     }), z.length === 0)
       return;
     const Ie = {
-      unitId: o,
-      subUnitId: i,
+      unitId: i,
+      subUnitId: o,
       ruleId: l,
       ranges: z
     };
-    T(ir.id, Ie);
+    T(sr.id, Ie);
   }), de = (R) => {
-    if (bn(R, Pn(v)))
+    if (Dn(R, kn(v)))
       return;
     C({
       ...v,
       ...R
     });
     const B = {
-      unitId: o,
-      subUnitId: i,
+      unitId: i,
+      subUnitId: o,
       ruleId: l,
       setting: R
     };
     T(
-      Tn.id,
+      An.id,
       B,
       void 0
     );
-  }, Me = async () => {
-    await h.executeCommand(sr.id, {
+  }, be = async () => {
+    await h.executeCommand(dr.id, {
       ruleId: l,
-      unitId: o,
-      subUnitId: i
+      unitId: i,
+      subUnitId: o
     }), n.setActiveRule(null), j();
   }, Q = {
     type: v.type,
@@ -1682,7 +1686,7 @@ function mi() {
     const B = s.getValidatorItem(R);
     if (!B)
       return;
-    const z = B.operators, Ie = c.getRuleById(o, i, l), ne = R === (Ie == null ? void 0 : Ie.type) || R.includes("list") && (Ie != null && Ie.type.includes("list")) ? {
+    const z = B.operators, Ie = c.getRuleById(i, o, l), ne = R === (Ie == null ? void 0 : Ie.type) || R.includes("list") && (Ie != null && Ie.type.includes("list")) ? {
       ...Ie,
       type: R
     } : {
@@ -1692,21 +1696,21 @@ function mi() {
       formula1: void 0,
       formula2: void 0
     };
-    C(ne), h.executeCommand(Tn.id, {
-      unitId: o,
-      subUnitId: i,
+    C(ne), h.executeCommand(An.id, {
+      unitId: i,
+      subUnitId: o,
       ruleId: v.uid,
-      setting: Pn(ne)
+      setting: kn(ne)
     });
-  }, ce = u.get(f.formulaInput), ee = ht(() => p.map((R) => _r(R.range)).join(","), []), q = An(v), M = (R) => {
-    bn(R, An(v)) || (C({
+  }, ce = u.get(f.formulaInput), ee = gt(() => p.map((R) => Cr(R.range)).join(","), []), q = Ln(v), b = (R) => {
+    Dn(R, Ln(v)) || (C({
       ...v,
       ...R
     }), T(
-      ao.id,
+      si.id,
       {
-        unitId: o,
-        subUnitId: i,
+        unitId: i,
+        subUnitId: o,
         ruleId: l,
         options: R
       }
@@ -1719,11 +1723,11 @@ function mi() {
         label: m.t("dataValidation.panel.range"),
         error: !v.ranges.length || A ? m.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ S(
-          ko,
+          ki,
           {
             selectorRef: O,
-            unitId: o,
-            subUnitId: i,
+            unitId: i,
+            subUnitId: o,
             initialValue: ee,
             onChange: (R, B) => {
               var z;
@@ -1739,7 +1743,7 @@ function mi() {
       }
     ),
     /* @__PURE__ */ S(Z, { label: m.t("dataValidation.panel.type"), children: /* @__PURE__ */ S(
-      Un,
+      $n,
       {
         className: "univer-w-full",
         value: v.type,
@@ -1751,7 +1755,7 @@ function mi() {
       }
     ) }),
     k != null && k.length ? /* @__PURE__ */ S(Z, { label: m.t("dataValidation.panel.operator"), children: /* @__PURE__ */ S(
-      Un,
+      $n,
       {
         className: "univer-w-full",
         value: `${v.operator}`,
@@ -1788,15 +1792,15 @@ function mi() {
           });
         },
         showError: w,
-        validResult: f.validatorFormula(v, o, i),
-        unitId: o,
-        subUnitId: i,
+        validResult: f.validatorFormula(v, i, o),
+        unitId: i,
+        subUnitId: o,
         ruleId: l
       },
       e + v.type
     ) : null,
     /* @__PURE__ */ S(Z, { children: /* @__PURE__ */ S(
-      Nt,
+      Ut,
       {
         checked: (J = v.allowBlank) != null ? J : !0,
         onChange: () => {
@@ -1809,29 +1813,29 @@ function mi() {
         children: m.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ S(pi, { value: q, onChange: M, extraComponent: f.optionsInput }),
+    /* @__PURE__ */ S(mo, { value: q, onChange: b, extraComponent: f.optionsInput }),
     /* @__PURE__ */ Y("div", { className: "univer-mt-5 univer-flex univer-flex-row univer-justify-end", children: [
-      /* @__PURE__ */ S(qe, { className: "univer-ml-3", onClick: Me, children: m.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ S(qe, { className: "univer-ml-3", variant: "primary", onClick: se, children: m.t("dataValidation.panel.done") })
+      /* @__PURE__ */ S(Je, { className: "univer-ml-3", onClick: be, children: m.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ S(Je, { className: "univer-ml-3", variant: "primary", onClick: se, children: m.t("dataValidation.panel.done") })
     ] })
   ] });
 }
-const fi = (e) => {
-  const { rule: t, onClick: n, unitId: r, subUnitId: o, disable: i } = e, a = F(Te), l = F(oe), s = F(Oo), d = a.getValidatorItem(t.type), u = vt(void 0), [h, c] = W(!1), m = F(zn), I = Re(m.currentTheme$), D = ht(() => {
+const Co = (e) => {
+  const { rule: t, onClick: n, unitId: r, subUnitId: i, disable: o } = e, a = F(Te), l = F(ie), s = F(Oi), d = a.getValidatorItem(t.type), u = ft(void 0), [h, c] = W(!1), m = F(Gn), I = Re(m.currentTheme$), V = gt(() => {
     var g;
-    const C = m.getColorFromTheme("primary.600"), f = m.getColorFromTheme("loop-color.2"), w = (g = m.getColorFromTheme(f)) != null ? g : C, b = new Xr(w).toRgb();
+    const C = m.getColorFromTheme("primary.600"), f = m.getColorFromTheme("loop-color.2"), w = (g = m.getColorFromTheme(f)) != null ? g : C, M = new Zr(w).toRgb();
     return {
-      fill: `rgba(${b.r}, ${b.g}, ${b.b}, 0.1)`,
+      fill: `rgba(${M.r}, ${M.g}, ${M.b}, 0.1)`,
       stroke: w
     };
   }, [I]), v = (C) => {
-    l.executeCommand(sr.id, {
+    l.executeCommand(dr.id, {
       ruleId: t.uid,
       unitId: r,
-      subUnitId: o
+      subUnitId: i
     }), C.stopPropagation();
   };
-  return be(() => () => {
+  return Me(() => () => {
     var C;
     u.current && ((C = u.current) == null || C.forEach((f) => {
       f && s.removeShape(f);
@@ -1846,15 +1850,15 @@ const fi = (e) => {
                   univer-p-2 univer-pr-9
                 `,
         {
-          "hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-700": !i,
-          "univer-opacity-50": i
+          "hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-700": !o,
+          "univer-opacity-50": o
         }
       ),
       onClick: n,
       onMouseEnter: () => {
-        i || (c(!0), u.current = t.ranges.map((C) => s.addShape({
+        o || (c(!0), u.current = t.ranges.map((C) => s.addShape({
           range: C,
-          style: D,
+          style: V,
           primary: null
         })));
       },
@@ -1876,7 +1880,7 @@ const fi = (e) => {
           "div",
           {
             className: "univer-text-secondary univer-truncate univer-text-xs univer-leading-[18px] dark:!univer-text-gray-300",
-            children: t.ranges.map((C) => _r(C)).join(",")
+            children: t.ranges.map((C) => Cr(C)).join(",")
           }
         ),
         h ? /* @__PURE__ */ S(
@@ -1884,16 +1888,16 @@ const fi = (e) => {
           {
             className: "univer-absolute univer-right-2 univer-top-[19px] univer-flex univer-size-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: v,
-            children: /* @__PURE__ */ S(Rn, {})
+            children: /* @__PURE__ */ S(bn, {})
           }
         ) : null
       ]
     }
   );
 };
-function _i(e) {
-  const t = F(ae), n = F(pe), r = F(oe), o = F(Ve), i = F(_e), a = F(ge), [l, s] = W([]), { workbook: d } = e, u = Re(d.activeSheet$, void 0, !0), h = d.getUnitId(), c = u == null ? void 0 : u.getSheetId();
-  be(() => {
+function Io(e) {
+  const t = F(ae), n = F(pe), r = F(ie), i = F(Ve), o = F(_e), a = F(ge), [l, s] = W([]), { workbook: d } = e, u = Re(d.activeSheet$, void 0, !0), h = d.getUnitId(), c = u == null ? void 0 : u.getSheetId();
+  Me(() => {
     s(t.getRules(h, c));
     const f = t.ruleChange$.subscribe((w) => {
       w.unitId === h && w.subUnitId === c && s(t.getRules(h, c));
@@ -1903,35 +1907,35 @@ function _i(e) {
     };
   }, [h, c, t]);
   const m = async () => {
-    const f = rr(o), w = {
+    const f = or(i), w = {
       unitId: h,
       subUnitId: c,
       rule: f
     };
-    await r.executeCommand(vn.id, w), i.setActiveRule({
+    await r.executeCommand(fn.id, w), o.setActiveRule({
       unitId: h,
       subUnitId: c,
       rule: f
     });
   }, I = () => {
-    r.executeCommand(so.id, {
+    r.executeCommand(li.id, {
       unitId: h,
       subUnitId: c
     });
   }, v = ((f) => {
-    const w = n.getCurrentUnitForType(H.UNIVER_SHEET), b = w.getActiveSheet(), g = w.getUnitId(), p = b.getSheetId();
-    return f.map((T) => oo(o, g, p, T.ranges) ? { ...T } : { ...T, disable: !0 });
+    const w = n.getCurrentUnitForType(H.UNIVER_SHEET), M = w.getActiveSheet(), g = w.getUnitId(), p = M.getSheetId();
+    return f.map((T) => oi(i, g, p, T.ranges) ? { ...T } : { ...T, disable: !0 });
   })(l), C = v == null ? void 0 : v.some((f) => f.disable);
   return /* @__PURE__ */ Y("div", { className: "univer-pb-4", children: [
     v == null ? void 0 : v.map((f) => {
       var w;
       return /* @__PURE__ */ S(
-        fi,
+        Co,
         {
           unitId: h,
           subUnitId: c,
           onClick: () => {
-            f.disable || i.setActiveRule({
+            f.disable || o.setActiveRule({
               unitId: h,
               subUnitId: c,
               rule: f
@@ -1944,25 +1948,25 @@ function _i(e) {
       );
     }),
     /* @__PURE__ */ Y("div", { className: "univer-mt-4 univer-flex univer-flex-row univer-justify-end univer-gap-2", children: [
-      l.length && !C ? /* @__PURE__ */ S(qe, { onClick: I, children: a.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ S(qe, { variant: "primary", onClick: m, children: a.t("dataValidation.panel.add") })
+      l.length && !C ? /* @__PURE__ */ S(Je, { onClick: I, children: a.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ S(Je, { variant: "primary", onClick: m, children: a.t("dataValidation.panel.add") })
     ] })
   ] });
 }
-const Si = () => {
+const wo = () => {
   const e = F(_e), t = Re(e.activeRule$, e.activeRule), n = F(pe), r = Re(
     () => n.getCurrentTypeOfUnit$(H.UNIVER_SHEET),
     void 0,
     void 0,
     []
-  ), o = Re(() => {
-    var i;
-    return (i = r == null ? void 0 : r.activeSheet$) != null ? i : vr(null);
+  ), i = Re(() => {
+    var o;
+    return (o = r == null ? void 0 : r.activeSheet$) != null ? o : fr(null);
   }, void 0, void 0, []);
-  return !r || !o ? null : t && (t.subUnitId === o.getSheetId() || t.subUnitId === e.getFocusFormulaEditorActiveRuleSubUnitId()) ? /* @__PURE__ */ S(mi, {}, t.rule.uid) : /* @__PURE__ */ S(_i, { workbook: r });
-}, Ci = (e) => {
-  const { isTwoFormula: t = !1, value: n, onChange: r, showError: o, validResult: i } = e, a = F(ge), l = o ? i == null ? void 0 : i.formula1 : "", s = o ? i == null ? void 0 : i.formula2 : "";
-  return t ? /* @__PURE__ */ Y(pt, { children: [
+  return !r || !i ? null : t && (t.subUnitId === i.getSheetId() || t.subUnitId === e.getFocusFormulaEditorActiveRuleSubUnitId()) ? /* @__PURE__ */ S(So, {}, t.rule.uid) : /* @__PURE__ */ S(Io, { workbook: r });
+}, Ro = (e) => {
+  const { isTwoFormula: t = !1, value: n, onChange: r, showError: i, validResult: o } = e, a = F(ge), l = i ? o == null ? void 0 : o.formula1 : "", s = i ? o == null ? void 0 : o.formula2 : "";
+  return t ? /* @__PURE__ */ Y(vt, { children: [
     /* @__PURE__ */ S(Z, { error: l, children: /* @__PURE__ */ S(
       Ue,
       {
@@ -2004,11 +2008,11 @@ const Si = () => {
     }
   ) });
 };
-function Ii(e) {
-  const { value: t, onChange: n, showError: r, validResult: o } = e, i = F(ge), 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__ */ Y(pt, { children: [
+function yo(e) {
+  const { value: t, onChange: n, showError: r, validResult: i } = e, o = F(ge), a = r ? i == null ? void 0 : i.formula1 : "", l = r ? i == null ? void 0 : i.formula2 : "", [s, d] = W(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
+  return /* @__PURE__ */ Y(vt, { children: [
     /* @__PURE__ */ S(Z, { children: /* @__PURE__ */ S(
-      Nt,
+      Ut,
       {
         checked: s,
         onChange: (u) => {
@@ -2018,14 +2022,14 @@ function Ii(e) {
             formula2: void 0
           }));
         },
-        children: i.t("dataValidation.checkbox.tips")
+        children: o.t("dataValidation.checkbox.tips")
       }
     ) }),
-    s ? /* @__PURE__ */ S(Z, { label: i.t("dataValidation.checkbox.checked"), error: a, children: /* @__PURE__ */ S(
+    s ? /* @__PURE__ */ S(Z, { label: o.t("dataValidation.checkbox.checked"), error: a, children: /* @__PURE__ */ S(
       Ue,
       {
         className: "univer-w-full",
-        placeholder: i.t("dataValidation.panel.valuePlaceholder"),
+        placeholder: o.t("dataValidation.panel.valuePlaceholder"),
         value: t == null ? void 0 : t.formula1,
         onChange: (u) => {
           n == null || n({
@@ -2035,11 +2039,11 @@ function Ii(e) {
         }
       }
     ) }) : null,
-    s ? /* @__PURE__ */ S(Z, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ S(
+    s ? /* @__PURE__ */ S(Z, { label: o.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ S(
       Ue,
       {
         className: "univer-w-full",
-        placeholder: i.t("dataValidation.panel.valuePlaceholder"),
+        placeholder: o.t("dataValidation.panel.valuePlaceholder"),
         value: t == null ? void 0 : t.formula2,
         onChange: (u) => {
           n == null || n({
@@ -2051,17 +2055,17 @@ function Ii(e) {
     ) }) : null
   ] });
 }
-function wi(e) {
+function bo(e) {
   var h;
-  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 = vt(null), [d, u] = W(!1);
-  return hr((c) => {
+  const { unitId: t, subUnitId: n, value: r, onChange: i, showError: o, validResult: a } = e, l = o ? a == null ? void 0 : a.formula1 : void 0, s = ft(null), [d, u] = W(!1);
+  return gr((c) => {
     var I;
     (I = s.current) != null && I.isClickOutSide(c) && u(!1);
   }), /* @__PURE__ */ S(Z, { error: l, children: /* @__PURE__ */ S(
-    Sr,
+    Ir,
     {
       ref: s,
-      className: Fe("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", bt),
+      className: Fe("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", Et),
       initValue: (h = r == null ? void 0 : r.formula1) != null ? h : "=",
       unitId: t,
       subUnitId: n,
@@ -2069,7 +2073,7 @@ function wi(e) {
       isSupportAcrossSheet: !0,
       onChange: (c) => {
         const m = (c != null ? c : "").trim();
-        m !== (r == null ? void 0 : r.formula1) && (o == null || o({
+        m !== (r == null ? void 0 : r.formula1) && (i == null || i({
           ...r,
           formula1: m
         }));
@@ -2078,7 +2082,7 @@ function wi(e) {
     }
   ) });
 }
-const Ri = [
+const Mo = [
   "#FFFFFF",
   "#FEE7E7",
   "#FEF0E6",
@@ -2103,27 +2107,27 @@ const Ri = [
   "#3A60F7",
   "#9E6DE3",
   "#F248A6"
-], yi = (e) => {
-  const { value: t, onChange: n, disabled: r } = e, [o, i] = W(!1);
+], Eo = (e) => {
+  const { value: t, onChange: n, disabled: r } = e, [i, o] = W(!1);
   return /* @__PURE__ */ S(
-    Po,
+    Pi,
     {
       align: "start",
       disabled: r,
-      open: o,
-      onOpenChange: i,
+      open: i,
+      onOpenChange: o,
       overlay: /* @__PURE__ */ S(
         "div",
         {
           className: "univer-box-border univer-grid univer-w-fit univer-grid-cols-6 univer-flex-wrap univer-gap-2 univer-p-1.5",
-          children: Ri.map(
+          children: Mo.map(
             (a) => /* @__PURE__ */ S(
               "div",
               {
-                className: Fe("univer-box-border univer-size-4 univer-cursor-pointer univer-rounded", bt),
+                className: Fe("univer-box-border univer-size-4 univer-cursor-pointer univer-rounded", Et),
                 style: { background: a },
                 onClick: () => {
-                  n(a), i(!1);
+                  n(a), o(!1);
                 }
               },
               a
@@ -2134,7 +2138,7 @@ const Ri = [
       children: /* @__PURE__ */ Y(
         "div",
         {
-          className: Fe("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", bt),
+          className: Fe("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", Et),
           children: [
             /* @__PURE__ */ S(
               "div",
@@ -2143,22 +2147,22 @@ const Ri = [
                 style: { background: t }
               }
             ),
-            /* @__PURE__ */ S(yn, {})
+            /* @__PURE__ */ S(Mn, {})
           ]
         }
       )
     }
   );
-}, Bn = (e) => {
-  const { item: t, commonProps: n, className: r } = e, { onItemChange: o, onItemDelete: i } = n;
+}, Hn = (e) => {
+  const { item: t, commonProps: n, className: r } = e, { onItemChange: i, onItemDelete: o } = n;
   return /* @__PURE__ */ Y("div", { className: Fe("univer-flex univer-items-center univer-gap-2", r), children: [
-    !t.isRef && /* @__PURE__ */ S("div", { className: Fe("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ S(Vr, {}) }),
+    !t.isRef && /* @__PURE__ */ S("div", { className: Fe("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ S(Or, {}) }),
     /* @__PURE__ */ S(
-      yi,
+      Eo,
       {
         value: t.color,
         onChange: (a) => {
-          o(t.id, t.label, a);
+          i(t.id, t.label, a);
         }
       }
     ),
@@ -2168,7 +2172,7 @@ const Ri = [
         disabled: t.isRef,
         value: t.label,
         onChange: (a) => {
-          o(t.id, a, t.color);
+          i(t.id, a, t.color);
         }
       }
     ),
@@ -2176,50 +2180,50 @@ const Ri = [
       "div",
       {
         className: "univer-ml-1 univer-cursor-pointer univer-rounded univer-text-base hover:univer-bg-gray-200",
-        children: /* @__PURE__ */ S(Rn, { onClick: () => i(t.id) })
+        children: /* @__PURE__ */ S(bn, { onClick: () => o(t.id) })
       }
     )
   ] });
 };
-function Mi(e) {
+function Do(e) {
   const { value: t, onChange: n = () => {
-  }, unitId: r, subUnitId: o, validResult: i, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, h] = W(() => Pe(s) ? "1" : "0"), [c, m] = W(u === "1" ? s : "="), [I, D] = W(u === "1" ? s : "="), v = F(ge), C = F(Te), f = F(fn), w = F(lo), b = F(_e), [g, p] = W(() => d.split(",")), _ = C.getValidatorItem(X.LIST), [T, A] = W([]), [P, L] = W(""), y = a ? i == null ? void 0 : i.formula1 : "", O = ht(() => f.ruleChange$.pipe(pr(16)), []), U = Re(O), k = an(n);
-  be(() => {
+  }, unitId: r, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, h] = W(() => Pe(s) ? "1" : "0"), [c, m] = W(u === "1" ? s : "="), [I, V] = W(u === "1" ? s : "="), v = F(ge), C = F(Te), f = F(Sn), w = F(di), M = F(_e), [g, p] = W(() => d.split(",")), _ = C.getValidatorItem(X.LIST), [T, A] = W([]), [P, L] = W(""), y = a ? o == null ? void 0 : o.formula1 : "", O = gt(() => f.ruleChange$.pipe(vr(16)), []), U = Re(O), k = ln(n);
+  Me(() => {
     (async () => {
       await new Promise((N) => {
         setTimeout(() => N(!0), 100);
       });
-      const M = f.getRuleById(r, o, l), $ = M == null ? void 0 : M.formula1;
-      if (Pe($) && _ && M) {
-        const N = await _.getListAsync(M, r, o);
+      const b = f.getRuleById(r, i, l), $ = b == null ? void 0 : b.formula1;
+      if (Pe($) && _ && b) {
+        const N = await _.getListAsync(b, r, i);
         A(N);
       }
     })();
-  }, [f, U, _, l, o, r]), be(() => {
-    Pe(s) && s !== I && (m(s), D(I));
+  }, [f, U, _, l, i, r]), Me(() => {
+    Pe(s) && s !== I && (m(s), V(I));
   }, [I, s]);
   const [x, te] = W(() => {
-    const M = u !== "1" ? co(s) : [], $ = d.split(",");
-    return M.map((N, J) => ({
+    const b = u !== "1" ? ci(s) : [], $ = d.split(",");
+    return b.map((N, J) => ({
       label: N,
       color: $[J] || ke,
       isRef: !1,
-      id: En(4)
+      id: Vn(4)
     }));
-  }), j = (M, $, N) => {
-    const J = x.find((R) => R.id === M);
+  }), j = (b, $, N) => {
+    const J = x.find((R) => R.id === b);
     J && (J.label = $, J.color = N, te([...x]));
-  }, se = (M) => {
-    const $ = x.findIndex((N) => N.id === M);
+  }, se = (b) => {
+    const $ = x.findIndex((N) => N.id === b);
     $ !== -1 && (x.splice($, 1), te([...x]));
-  }, le = d.split(","), de = ht(() => T.map((M, $) => ({
-    label: M,
+  }, le = d.split(","), de = gt(() => T.map((b, $) => ({
+    label: b,
     color: le[$] || ke,
     id: `${$}`,
     isRef: !0
-  })), [le, T]), Me = (M, $, N) => {
+  })), [le, T]), be = (b, $, N) => {
     const J = [...g];
-    J[+M] = N, p(J), k({
+    J[+b] = N, p(J), k({
       formula1: s,
       formula2: J.join(",")
     });
@@ -2230,57 +2234,57 @@ function Mi(e) {
         label: "",
         color: ke,
         isRef: !1,
-        id: En(4)
+        id: Vn(4)
       }
     ]);
   };
-  be(() => {
+  Me(() => {
     if (u === "1")
       return;
-    const M = /* @__PURE__ */ new Set(), $ = [];
+    const b = /* @__PURE__ */ new Set(), $ = [];
     x.map((N) => ({
       labelList: N.label.split(","),
       item: N
     })).forEach(({ item: N, labelList: J }) => {
       J.forEach((R) => {
-        M.has(R) || (M.add(R), $.push({
+        b.has(R) || (b.add(R), $.push({
           label: R,
           color: N.color
         }));
       });
     }), k({
-      formula1: nr($.map((N) => N.label)),
+      formula1: ir($.map((N) => N.label)),
       formula2: $.map((N) => N.color === ke ? "" : N.color).join(",")
     });
   }, [x, k, u, I, g]);
-  const G = an(async (M) => {
-    if (!Pe(M)) {
+  const G = ln(async (b) => {
+    if (!Pe(b)) {
       k == null || k({
         formula1: "",
         formula2: d
       });
       return;
     }
-    w.getFormulaRefCheck(M) ? (k == null || k({
-      formula1: Pe(M) ? M : "",
+    w.getFormulaRefCheck(b) ? (k == null || k({
+      formula1: Pe(b) ? b : "",
       formula2: d
     }), L("")) : (k == null || k({
       formula1: "",
       formula2: d
     }), m("="), L(v.t("dataValidation.validFail.formulaError")));
-  }), ce = vt(null), [ee, q] = W(!1);
-  return hr((M) => {
+  }), ce = ft(null), [ee, q] = W(!1);
+  return gr((b) => {
     var N;
-    (N = ce.current) != null && N.isClickOutSide(M) && q(!1);
-  }), be(() => {
-    ee ? b.setFocusFormulaEditorActiveRuleSubUnitId(o) : b.setFocusFormulaEditorActiveRuleSubUnitId(null);
-  }, [ee, o, b]), /* @__PURE__ */ Y(pt, { children: [
+    (N = ce.current) != null && N.isClickOutSide(b) && q(!1);
+  }), Me(() => {
+    ee ? M.setFocusFormulaEditorActiveRuleSubUnitId(i) : M.setFocusFormulaEditorActiveRuleSubUnitId(null);
+  }, [ee, i, M]), /* @__PURE__ */ Y(vt, { children: [
     /* @__PURE__ */ S(Z, { label: v.t("dataValidation.list.options"), children: /* @__PURE__ */ Y(
-      In,
+      Rn,
       {
         value: u,
-        onChange: (M) => {
-          h(M), m(I), M === "1" && k({
+        onChange: (b) => {
+          h(b), m(I), b === "1" && k({
             formula1: I === "=" ? "" : I,
             formula2: g.join(",")
           });
@@ -2293,50 +2297,50 @@ function Mi(e) {
     ) }),
     u === "1" ? /* @__PURE__ */ Y(Z, { error: y || P || void 0, children: [
       /* @__PURE__ */ S(
-        Sr,
+        Ir,
         {
           ref: ce,
-          className: Fe("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", bt),
+          className: Fe("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", Et),
           initValue: c,
           unitId: r,
-          subUnitId: o,
+          subUnitId: i,
           isFocus: ee,
           isSupportAcrossSheet: !0,
           onFocus: () => q(!0),
-          onChange: (M = "") => {
-            const $ = (M != null ? M : "").trim();
-            D($), G($);
+          onChange: (b = "") => {
+            const $ = (b != null ? b : "").trim();
+            V($), G($);
           }
         }
       ),
-      de.length > 0 && /* @__PURE__ */ S("div", { className: "univer-mt-3", children: de.map((M) => /* @__PURE__ */ S(
-        Bn,
+      de.length > 0 && /* @__PURE__ */ S("div", { className: "univer-mt-3", children: de.map((b) => /* @__PURE__ */ S(
+        Hn,
         {
           className: "univer-mb-3",
-          item: M,
-          commonProps: { onItemChange: Me }
+          item: b,
+          commonProps: { onItemChange: be }
         },
-        M.id
+        b.id
       )) })
     ] }) : /* @__PURE__ */ S(Z, { error: y, children: /* @__PURE__ */ Y("div", { className: "-univer-mt-3", children: [
       /* @__PURE__ */ S(
-        Ao,
+        Ai,
         {
           list: x,
           onListChange: te,
           rowHeight: 28,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
-          itemRender: (M) => /* @__PURE__ */ S(
-            Bn,
+          itemRender: (b) => /* @__PURE__ */ S(
+            Hn,
             {
-              item: M,
+              item: b,
               commonProps: {
                 onItemChange: j,
                 onItemDelete: se
               }
             },
-            M.id
+            b.id
           ),
           idKey: "id"
         }
@@ -2347,7 +2351,7 @@ function Mi(e) {
           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: Q,
           children: [
-            /* @__PURE__ */ S(Er, { className: "univer-mr-1" }),
+            /* @__PURE__ */ S(Vr, { className: "univer-mr-1" }),
             v.t("dataValidation.list.add")
           ]
         }
@@ -2355,48 +2359,48 @@ function Mi(e) {
     ] }) })
   ] });
 }
-const bi = [
+const Vo = [
   [
-    lr,
-    wi
+    cr,
+    bo
   ],
   [
-    kt,
-    Ci
+    Nt,
+    Ro
   ],
   [
-    mn,
-    Mi
+    _n,
+    Do
   ],
   [
-    dr,
-    Ii
+    ur,
+    yo
   ]
-], Ei = "LIST_RENDER_MODE_OPTION_INPUT";
-function Ot(e) {
-  var o;
+], To = "LIST_RENDER_MODE_OPTION_INPUT";
+function Pt(e) {
+  var i;
   const { value: t, onChange: n } = e, r = F(ge);
-  return /* @__PURE__ */ S(Z, { label: r.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ Y(In, { value: `${(o = t.renderMode) != null ? o : ue.CUSTOM}`, onChange: (i) => n({ ...t, renderMode: +i }), children: [
+  return /* @__PURE__ */ S(Z, { label: r.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ Y(Rn, { value: `${(i = t.renderMode) != null ? i : ue.CUSTOM}`, onChange: (o) => n({ ...t, renderMode: +o }), children: [
     /* @__PURE__ */ S(Ne, { value: `${ue.CUSTOM}`, children: r.t("dataValidation.renderMode.chip") }),
     /* @__PURE__ */ S(Ne, { value: `${ue.ARROW}`, children: r.t("dataValidation.renderMode.arrow") }),
     /* @__PURE__ */ S(Ne, { value: `${ue.TEXT}`, children: r.t("dataValidation.renderMode.text") })
   ] }) });
 }
-Ot.componentKey = Ei;
-const Di = "DATE_SHOW_TIME_OPTION";
-function At(e) {
-  var o;
+Pt.componentKey = To;
+const Oo = "DATE_SHOW_TIME_OPTION";
+function Lt(e) {
+  var i;
   const { value: t, onChange: n } = e, r = F(ge);
   return /* @__PURE__ */ S(Z, { children: /* @__PURE__ */ S(
-    Nt,
+    Ut,
     {
-      checked: (o = t.bizInfo) == null ? void 0 : o.showTime,
-      onChange: (i) => {
+      checked: (i = t.bizInfo) == null ? void 0 : i.showTime,
+      onChange: (o) => {
         n({
           ...t,
           bizInfo: {
             ...t.bizInfo,
-            showTime: i
+            showTime: o
           }
         });
       },
@@ -2404,41 +2408,41 @@ function At(e) {
     }
   ) });
 }
-At.componentKey = Di;
-var Vi = Object.getOwnPropertyDescriptor, Ti = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Vi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
+Lt.componentKey = Oo;
+var Ao = Object.getOwnPropertyDescriptor, Po = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? Ao(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
 }, Ye = (e, t) => (n, r) => t(n, r, e);
-const Ct = 6;
-let ln = 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;
+const wt = 6;
+let cn = class {
+  constructor(e, t, n, r, i, o) {
+    this._commandService = e, this._univerInstanceService = t, this._formulaService = n, this._themeService = r, this._renderManagerService = i, this._dataValidationModel = o;
   }
   _calc(e, t) {
     var d, u, h;
-    const { vt: n, ht: r } = t || {}, o = e.endX - e.startX - Ct * 2, i = e.endY - e.startY, a = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
+    const { vt: n, ht: r } = t || {}, i = e.endX - e.startX - wt * 2, o = e.endY - e.startY, a = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
     let l = 0, s = 0;
     switch (n) {
       case he.TOP:
         s = 0;
         break;
       case he.BOTTOM:
-        s = 0 + (i - a);
+        s = 0 + (o - a);
         break;
       default:
-        s = 0 + (i - a) / 2;
+        s = 0 + (o - a) / 2;
         break;
     }
     switch (r) {
       case Ee.LEFT:
-        l = Ct;
+        l = wt;
         break;
       case Ee.RIGHT:
-        l = Ct + (o - a);
+        l = wt + (i - a);
         break;
       default:
-        l = Ct + (o - a) / 2;
+        l = wt + (i - a) / 2;
         break;
     }
     return {
@@ -2459,23 +2463,23 @@ let ln = class {
     return ((n = t == null ? void 0 : t.fs) != null ? n : 10) * 1.6;
   }
   async _parseFormula(e, t, n) {
-    var d, u, h, c, m, I, D, v, C;
-    const { formula1: r = po, formula2: o = ho } = e, i = await this._formulaService.getRuleFormulaResult(t, n, e.uid), a = Bt((h = (u = (d = i == null ? void 0 : i[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Bt((I = (m = (c = i == null ? void 0 : i[1]) == null ? void 0 : c.result) == null ? void 0 : m[0]) == null ? void 0 : I[0]), s = On(String(a)) && On(String(l));
+    var d, u, h, c, m, I, V, v, C;
+    const { formula1: r = pi, formula2: i = hi } = e, o = await this._formulaService.getRuleFormulaResult(t, n, e.uid), a = Ht((h = (u = (d = o == null ? void 0 : o[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Ht((I = (m = (c = o == null ? void 0 : o[1]) == null ? void 0 : c.result) == null ? void 0 : m[0]) == null ? void 0 : I[0]), s = Pn(String(a)) && Pn(String(l));
     return {
-      formula1: Pe(r) ? Bt((C = (v = (D = i == null ? void 0 : i[0]) == null ? void 0 : D.result) == null ? void 0 : v[0]) == null ? void 0 : C[0]) : r,
-      formula2: Pe(o) ? l : o,
+      formula1: Pe(r) ? Ht((C = (v = (V = o == null ? void 0 : o[0]) == null ? void 0 : V.result) == null ? void 0 : v[0]) == null ? void 0 : C[0]) : r,
+      formula2: Pe(i) ? l : i,
       isFormulaValid: s
     };
   }
   drawWith(e, t) {
     var L, y, O, U;
-    const { style: n, primaryWithCoord: r, unitId: o, subUnitId: i, worksheet: a, row: l, col: s } = t, d = r.isMergedMainCell ? r.mergeInfo : r, u = ie(a.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(o, i, l, s);
+    const { style: n, primaryWithCoord: r, unitId: i, subUnitId: o, worksheet: a, row: l, col: s } = t, d = r.isMergedMainCell ? r.mergeInfo : r, u = oe(a.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(i, o, l, s);
     if (!h)
       return;
     const c = this._dataValidationModel.getValidator(h.type);
-    if (!c || !((L = c.skipDefaultFontRender) != null && L.call(c, h, u, { unitId: o, subUnitId: i, row: l, column: s })))
+    if (!c || !((L = c.skipDefaultFontRender) != null && L.call(c, h, u, { unitId: i, subUnitId: o, row: l, column: s })))
       return;
-    const m = c.parseFormulaSync(h, o, i), { formula1: I } = m, D = this._calc(d, n), { a: v, d: C } = e.getTransform(), f = Dn(D.left, v), w = Dn(D.top, C), b = zr.create().composeMatrix({
+    const m = c.parseFormulaSync(h, i, o), { formula1: I } = m, V = this._calc(d, n), { a: v, d: C } = e.getTransform(), f = Tn(V.left, v), w = Tn(V.top, C), M = Kr.create().composeMatrix({
       left: f,
       top: w,
       scaleX: 1,
@@ -2487,10 +2491,10 @@ let ln = class {
       flipY: !1
     }), g = d.endX - d.startX, p = d.endY - d.startY;
     e.save(), e.beginPath(), e.rect(d.startX, d.startY, g, p), e.clip();
-    const _ = b.getMatrix();
+    const _ = M.getMatrix();
     e.transform(_[0], _[1], _[2], _[3], _[4], _[5]);
     const T = ((y = n == null ? void 0 : n.fs) != null ? y : 10) * 1.6, A = String(u) === String(I), P = this._themeService.getColorFromTheme("primary.600");
-    Kr.drawWith(e, {
+    Gr.drawWith(e, {
       checked: A,
       width: T,
       height: T,
@@ -2498,20 +2502,20 @@ let ln = class {
     }), e.restore();
   }
   isHit(e, t) {
-    const n = t.primaryWithCoord.isMergedMainCell ? t.primaryWithCoord.mergeInfo : t.primaryWithCoord, r = this._calc(n, t.style), o = r.top, i = r.top + r.height, a = r.left, l = r.left + r.width, { x: s, y: d } = e;
-    return s <= l && s >= a && d <= i && d >= o;
+    const n = t.primaryWithCoord.isMergedMainCell ? t.primaryWithCoord.mergeInfo : t.primaryWithCoord, r = this._calc(n, t.style), i = r.top, o = r.top + r.height, a = r.left, l = r.left + r.width, { x: s, y: d } = e;
+    return s <= l && s >= a && d <= o && d >= i;
   }
   async onPointerDown(e, t) {
     var I;
     if (t.button === 2)
       return;
-    const { primaryWithCoord: n, unitId: r, subUnitId: o, worksheet: i, row: a, col: l } = e, s = ie(i.getCellRaw(a, l)), d = this._dataValidationModel.getRuleByLocation(r, o, a, l);
+    const { primaryWithCoord: n, unitId: r, subUnitId: i, worksheet: o, row: a, col: l } = e, s = oe(o.getCellRaw(a, l)), d = this._dataValidationModel.getRuleByLocation(r, i, a, l);
     if (!d)
       return;
     const u = this._dataValidationModel.getValidator(d.type);
-    if (!u || !((I = u.skipDefaultFontRender) != null && I.call(u, d, s, { unitId: r, subUnitId: o, row: a, column: l })))
+    if (!u || !((I = u.skipDefaultFontRender) != null && I.call(u, d, s, { unitId: r, subUnitId: i, row: a, column: l })))
       return;
-    const { formula1: h, formula2: c } = await this._parseFormula(d, r, o), m = {
+    const { formula1: h, formula2: c } = await this._parseFormula(d, r, i), m = {
       range: {
         startColumn: n.actualColumn,
         endColumn: n.actualColumn,
@@ -2519,145 +2523,145 @@ let ln = class {
         endRow: n.actualRow
       },
       value: {
-        v: String(s) === go(String(h)) ? c : h,
+        v: String(s) === gi(String(h)) ? c : h,
         p: null
       }
     };
     this._commandService.executeCommand(
-      dt.id,
+      ut.id,
       m
     );
   }
   onPointerEnter(e, t) {
     var n, r;
-    (r = (n = Ke(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ge.POINTER);
+    (r = (n = Ge(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(qe.POINTER);
   }
   onPointerLeave(e, t) {
     var n, r;
-    (r = (n = Ke(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ge.DEFAULT);
+    (r = (n = Ge(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(qe.DEFAULT);
   }
 };
-ln = Ti([
-  Ye(0, oe),
+cn = Po([
+  Ye(0, ie),
   Ye(1, pe),
-  Ye(2, E(uo)),
-  Ye(3, E(zn)),
-  Ye(4, E(xe)),
-  Ye(5, E(ae))
-], ln);
-var Oi = Object.getOwnPropertyDescriptor, Ai = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Oi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
-}, Pi = (e, t) => (n, r) => t(n, r, e);
+  Ye(2, D(ui)),
+  Ye(3, D(Gn)),
+  Ye(4, D(xe)),
+  Ye(5, D(ae))
+], cn);
+var Lo = Object.getOwnPropertyDescriptor, ko = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? Lo(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, No = (e, t) => (n, r) => t(n, r, e);
 let Ce = class {
   constructor(e) {
-    V(this, "canvasRender", null);
-    V(this, "dropdownType");
-    V(this, "optionsInput");
-    V(this, "formulaInput", mn);
+    E(this, "canvasRender", null);
+    E(this, "dropdownType");
+    E(this, "optionsInput");
+    E(this, "formulaInput", _n);
     this.injector = e;
   }
 };
-Ce = Ai([
-  Pi(0, E(Ve))
+Ce = ko([
+  No(0, D(Ve))
 ], Ce);
-class Li extends Ce {
+class Uo extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", X.CHECKBOX);
-    V(this, "canvasRender", this.injector.createInstance(ln));
-    V(this, "formulaInput", dr);
+    E(this, "id", X.CHECKBOX);
+    E(this, "canvasRender", this.injector.createInstance(cn));
+    E(this, "formulaInput", ur);
   }
 }
-class ki extends Ce {
+class Fo extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", X.CUSTOM);
-    V(this, "formulaInput", lr);
+    E(this, "id", X.CUSTOM);
+    E(this, "formulaInput", cr);
   }
 }
-const Ni = "data-validation.formula-input";
-class Ui extends Ce {
+const $o = "data-validation.formula-input";
+class xo extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", X.DATE);
-    V(this, "formulaInput", Ni);
-    V(this, "optionsInput", At.componentKey);
-    V(this, "dropdownType", fe.DATE);
+    E(this, "id", X.DATE);
+    E(this, "formulaInput", $o);
+    E(this, "optionsInput", Lt.componentKey);
+    E(this, "dropdownType", fe.DATE);
   }
 }
-class Fi extends Ce {
+class Bo extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", X.DECIMAL);
-    V(this, "formulaInput", kt);
+    E(this, "id", X.DECIMAL);
+    E(this, "formulaInput", Nt);
   }
 }
-const Tr = 4, $i = 0, Xt = 4, Or = 4, dn = 6, Pt = 6, Ae = 14;
-function xi(e, t) {
-  const n = Gr.getTextSize(e, t), r = n.width + Tr * 2, { ba: o, bd: i } = n, a = o + i;
+const Ar = 4, Wo = 0, zt = 4, Pr = 4, un = 6, kt = 6, Ae = 14;
+function Ho(e, t) {
+  const n = qr.getTextSize(e, t), r = n.width + Ar * 2, { ba: i, bd: o } = n, a = i + o;
   return {
     width: r,
-    height: a + $i * 2,
-    ba: o
+    height: a + Wo * 2,
+    ba: i
   };
 }
-function Zt(e, t, n, r) {
-  const o = Ae + dn * 2, i = n - o, a = r - Pt * 2, l = e.map((c) => ({
-    layout: xi(c, t),
+function Kt(e, t, n, r) {
+  const i = Ae + un * 2, o = n - i, a = r - kt * 2, l = e.map((c) => ({
+    layout: Ho(c, t),
     text: c
   }));
   let s;
   const d = [];
   l.forEach((c) => {
-    const { layout: m } = c, { width: I, height: D } = m;
-    !s || s.width + I + Xt > i ? (s = {
+    const { layout: m } = c, { width: I, height: V } = m;
+    !s || s.width + I + zt > o ? (s = {
       width: I,
-      height: D,
+      height: V,
       items: [{
         ...c,
         left: 0
       }]
     }, d.push(s)) : (s.items.push({
       ...c,
-      left: s.width + Xt
-    }), s.width = s.width + I + Xt);
+      left: s.width + zt
+    }), s.width = s.width + I + zt);
   });
   let u = 0, h = 0;
   return d.forEach((c, m) => {
-    h = Math.max(h, c.width), m === d.length - 1 ? u += c.height : u += c.height + Or;
+    h = Math.max(h, c.width), m === d.length - 1 ? u += c.height : u += c.height + Pr;
   }), {
     lines: d,
     totalHeight: u,
-    contentWidth: i,
+    contentWidth: o,
     contentHeight: a,
-    cellAutoHeight: u + Pt * 2,
-    calcAutoWidth: h + o
+    cellAutoHeight: u + kt * 2,
+    calcAutoWidth: h + i
   };
 }
-const Bi = 8;
-class Wi extends qr {
+const jo = 8;
+class Yo extends Jr {
   static drawWith(t, n) {
-    const { fontString: r, info: o, fill: i, color: a } = n, { layout: l, text: s } = o;
-    t.save(), qn.drawWith(t, {
+    const { fontString: r, info: i, fill: o, color: a } = n, { layout: l, text: s } = i;
+    t.save(), Qn.drawWith(t, {
       width: l.width,
       height: l.height,
-      radius: Bi,
-      fill: i || ke
-    }), t.translateWithPrecision(Tr, l.ba), t.font = r, t.fillStyle = a, t.fillText(s, 0, 0), t.restore();
+      radius: jo,
+      fill: o || ke
+    }), t.translateWithPrecision(Ar, l.ba), t.font = r, t.fillStyle = a, t.fillText(s, 0, 0), t.restore();
   }
 }
-var Hi = Object.getOwnPropertyDescriptor, ji = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Hi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
-}, It = (e, t) => (n, r) => t(n, r, e);
-const Yi = 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 cn = class {
+var Xo = Object.getOwnPropertyDescriptor, Zo = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? Xo(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, Rt = (e, t) => (n, r) => t(n, r, e);
+const zo = 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 hn = class {
   constructor(e, t, n, r) {
-    V(this, "zIndex");
-    V(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    E(this, "zIndex");
+    E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     this._commandService = e, this._univerInstanceService = t, this._renderManagerService = n, this._dataValidationModel = r;
   }
   _ensureMap(e) {
@@ -2667,10 +2671,10 @@ let cn = class {
   _generateKey(e, t) {
     return `${e}.${t}`;
   }
-  _drawDownIcon(e, t, n, r, o) {
-    const i = n - Ae + 4;
+  _drawDownIcon(e, t, n, r, i) {
+    const o = n - Ae + 4;
     let a = 4;
-    switch (o) {
+    switch (i) {
       case he.MIDDLE:
         a = (r - Ae) / 2 + 4;
         break;
@@ -2678,24 +2682,24 @@ let cn = class {
         a = r - Ae + 4;
         break;
     }
-    e.save(), e.translateWithPrecision(t.startX + i, t.startY + a), e.fillStyle = "#565656", e.fill(Yi), e.restore();
+    e.save(), e.translateWithPrecision(t.startX + o, t.startY + a), e.fillStyle = "#565656", e.fill(zo), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, n, r) {
     var le, de;
-    const { primaryWithCoord: o, row: i, col: a, style: l, data: s, subUnitId: d } = t, u = o.isMergedMainCell ? o.mergeInfo : o, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: c = 0, rightOffset: m = 0, topOffset: I = 0, downOffset: D = 0 } = h || {}, v = this._ensureMap(d), C = this._generateKey(i, a), f = o.isMergedMainCell ? o.mergeInfo.startRow : i, w = o.isMergedMainCell ? o.mergeInfo.startColumn : a, b = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, f, w);
-    if (!b)
+    const { primaryWithCoord: i, row: o, col: a, style: l, data: s, subUnitId: d } = t, u = i.isMergedMainCell ? i.mergeInfo : i, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: c = 0, rightOffset: m = 0, topOffset: I = 0, downOffset: V = 0 } = h || {}, v = this._ensureMap(d), C = this._generateKey(o, a), f = i.isMergedMainCell ? i.mergeInfo.startRow : o, w = i.isMergedMainCell ? i.mergeInfo.startColumn : a, M = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, f, w);
+    if (!M)
       return;
-    const g = this._dataValidationModel.getValidator(b.type);
+    const g = this._dataValidationModel.getValidator(M.type);
     if (!g)
       return;
     const p = {
       startX: u.startX + c,
       endX: u.endX - m,
       startY: u.startY + I,
-      endY: u.endY - D
-    }, _ = p.endX - p.startX, T = p.endY - p.startY, { cl: A } = l || {}, P = (le = typeof A == "object" ? A == null ? void 0 : A.rgb : A) != null ? le : "#000", L = Le(l != null ? l : void 0), { vt: y, ht: O } = l || {}, U = y != null ? y : he.MIDDLE, k = (de = ie(s)) != null ? de : "", x = g.parseCellValue(k), te = g.getListWithColorMap(b), j = Zt(x, L, _, T);
-    this._drawDownIcon(e, p, _, T, U), e.save(), e.translateWithPrecision(p.startX, p.startY), e.beginPath(), e.rect(0, 0, _ - Ae, T), e.clip(), e.translateWithPrecision(dn, Pt);
+      endY: u.endY - V
+    }, _ = p.endX - p.startX, T = p.endY - p.startY, { cl: A } = l || {}, P = (le = typeof A == "object" ? A == null ? void 0 : A.rgb : A) != null ? le : "#000", L = Le(l != null ? l : void 0), { vt: y, ht: O } = l || {}, U = y != null ? y : he.MIDDLE, k = (de = oe(s)) != null ? de : "", x = g.parseCellValue(k), te = g.getListWithColorMap(M), j = Kt(x, L, _, T);
+    this._drawDownIcon(e, p, _, T, U), e.save(), e.translateWithPrecision(p.startX, p.startY), e.beginPath(), e.rect(0, 0, _ - Ae, T), e.clip(), e.translateWithPrecision(un, kt);
     let se = 0;
     switch (U) {
       case he.MIDDLE:
@@ -2705,9 +2709,9 @@ let cn = class {
         se = j.contentHeight - j.totalHeight;
         break;
     }
-    e.translateWithPrecision(0, se), j.lines.forEach((Me, Q) => {
+    e.translateWithPrecision(0, se), j.lines.forEach((be, Q) => {
       e.save();
-      const { width: G, height: ce, items: ee } = Me;
+      const { width: G, height: ce, items: ee } = be;
       let q = 0;
       switch (O) {
         case Ee.RIGHT:
@@ -2717,101 +2721,101 @@ let cn = class {
           q = (j.contentWidth - G) / 2;
           break;
       }
-      e.translate(q, Q * (ce + Or)), ee.forEach((M) => {
-        e.save(), e.translateWithPrecision(M.left, 0), Wi.drawWith(e, {
+      e.translate(q, Q * (ce + Pr)), ee.forEach((b) => {
+        e.save(), e.translateWithPrecision(b.left, 0), Yo.drawWith(e, {
           ...L,
-          info: M,
+          info: b,
           color: P,
-          fill: te[M.text]
+          fill: te[b.text]
         }), e.restore();
       }), e.restore();
     }), e.restore(), v.set(C, {
       left: p.startX,
       top: p.startY,
-      width: j.contentWidth + dn + Ae,
-      height: j.contentHeight + Pt * 2
+      width: j.contentWidth + un + Ae,
+      height: j.contentHeight + kt * 2
     });
   }
   calcCellAutoHeight(e) {
     var g;
-    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 || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
+    const { primaryWithCoord: t, style: n, data: r, row: i, col: o } = e, a = r == null ? void 0 : r.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
       startX: h.startX + l,
       endX: h.endX - s,
       startY: h.startY + d,
       endY: h.endY - u
-    }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
+    }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!m)
       return;
     const I = this._dataValidationModel.getValidator(m.type);
     if (!I)
       return;
-    const D = c.endX - c.startX, v = c.endY - c.startY, C = (g = ie(r)) != null ? g : "", f = I.parseCellValue(C), w = Le(n != null ? n : void 0);
-    return Zt(f, w, D, v).cellAutoHeight;
+    const V = c.endX - c.startX, v = c.endY - c.startY, C = (g = oe(r)) != null ? g : "", f = I.parseCellValue(C), w = Le(n != null ? n : void 0);
+    return Kt(f, w, V, v).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
     var g;
-    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 || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
+    const { primaryWithCoord: t, style: n, data: r, row: i, col: o } = e, a = r == null ? void 0 : r.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
       startX: h.startX + l,
       endX: h.endX - s,
       startY: h.startY + d,
       endY: h.endY - u
-    }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
+    }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!m)
       return;
     const I = this._dataValidationModel.getValidator(m.type);
     if (!I)
       return;
-    const D = c.endX - c.startX, v = c.endY - c.startY, C = (g = ie(r)) != null ? g : "", f = I.parseCellValue(C), w = Le(n != null ? n : void 0);
-    return Zt(f, w, D, v).calcAutoWidth;
+    const V = c.endX - c.startX, v = c.endY - c.startY, C = (g = oe(r)) != null ? g : "", f = I.parseCellValue(C), w = Le(n != null ? n : void 0);
+    return Kt(f, w, V, v).calcAutoWidth;
   }
   isHit(e, t) {
-    const { primaryWithCoord: n } = t, r = n.isMergedMainCell ? n.mergeInfo : n, { endX: o } = r, { x: i } = e;
-    return i >= o - Ae && i <= o;
+    const { primaryWithCoord: n } = t, r = n.isMergedMainCell ? n.mergeInfo : n, { endX: i } = r, { x: o } = e;
+    return o >= i - Ae && o <= i;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
       return;
-    const { unitId: n, subUnitId: r, row: o, col: i } = e, a = {
+    const { unitId: n, subUnitId: r, row: i, col: o } = e, a = {
       unitId: n,
       subUnitId: r,
-      row: o,
-      column: i
+      row: i,
+      column: o
     };
-    this._commandService.executeCommand(Ut.id, a);
+    this._commandService.executeCommand(Ft.id, a);
   }
   onPointerEnter(e, t) {
     var n, r;
-    return (r = (n = Ke(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null ? void 0 : r.setCursor(Ge.POINTER);
+    return (r = (n = Ge(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null ? void 0 : r.setCursor(qe.POINTER);
   }
   onPointerLeave(e, t) {
     var n, r;
-    return (r = (n = Ke(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null ? void 0 : r.setCursor(Ge.DEFAULT);
+    return (r = (n = Ge(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null ? void 0 : r.setCursor(qe.DEFAULT);
   }
 };
-cn = ji([
-  It(0, oe),
-  It(1, pe),
-  It(2, E(xe)),
-  It(3, E(ae))
-], cn);
-class Xi extends Ce {
+hn = Zo([
+  Rt(0, ie),
+  Rt(1, pe),
+  Rt(2, D(xe)),
+  Rt(3, D(ae))
+], hn);
+class Ko extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", X.LIST_MULTIPLE);
-    V(this, "canvasRender", this.injector.createInstance(cn));
-    V(this, "dropdownType", fe.MULTIPLE_LIST);
+    E(this, "id", X.LIST_MULTIPLE);
+    E(this, "canvasRender", this.injector.createInstance(hn));
+    E(this, "dropdownType", fe.MULTIPLE_LIST);
   }
 }
-var Zi = Object.getOwnPropertyDescriptor, zi = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Zi(t, n) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
-}, lt = (e, t) => (n, r) => t(n, r, e);
-const Xe = 4, wt = 4, me = 14, zt = 1, we = 6, Ze = 3, Kt = 8, Ki = "#565656", Wn = 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 Hn(e, t, n, r, o, i, a = !0) {
+var Go = Object.getOwnPropertyDescriptor, qo = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? Go(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, ct = (e, t) => (n, r) => t(n, r, e);
+const Xe = 4, yt = 4, me = 14, Gt = 1, we = 6, ze = 3, qt = 8, Jo = "#565656", jn = 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 Yn(e, t, n, r, i, o, a = !0) {
   let l = 0;
-  const s = a ? Ze : 0;
-  switch (o) {
+  const s = a ? ze : 0;
+  switch (i) {
     case he.BOTTOM:
       l = t - r - s;
       break;
@@ -2822,9 +2826,9 @@ function Hn(e, t, n, r, o, i, a = !0) {
       l = s;
       break;
   }
-  l = Math.max(Ze, l);
+  l = Math.max(ze, l);
   let d = 0;
-  switch (i) {
+  switch (o) {
     case Ee.CENTER:
       d = (e - n) / 2;
       break;
@@ -2837,11 +2841,11 @@ function Hn(e, t, n, r, o, i, a = !0) {
     paddingTop: l
   };
 }
-let un = class {
-  constructor(e, t, n, r, o) {
-    V(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
-    V(this, "zIndex");
-    this._univerInstanceService = e, this._localeService = t, this._commandService = n, this._renderManagerService = r, this._dataValidationModel = o;
+let pn = class {
+  constructor(e, t, n, r, i) {
+    E(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
+    E(this, "zIndex");
+    this._univerInstanceService = e, this._localeService = t, this._commandService = n, this._renderManagerService = r, this._dataValidationModel = i;
   }
   _ensureMap(e) {
     let t = this._dropdownInfoMap.get(e);
@@ -2850,54 +2854,54 @@ let un = class {
   _generateKey(e, t) {
     return `${e}.${t}`;
   }
-  _drawDownIcon(e, t, n, r, o, i, a) {
+  _drawDownIcon(e, t, n, r, i, o, a) {
     const { t: l = re.pd.t, b: s = re.pd.b } = a, d = n - me;
     let u;
-    switch (i) {
+    switch (o) {
       case he.MIDDLE:
-        u = (r - wt) / 2;
+        u = (r - yt) / 2;
         break;
       case he.BOTTOM:
-        u = r - s - o - Ze + (o / 2 - wt / 2);
+        u = r - s - i - ze + (i / 2 - yt / 2);
         break;
       default:
-        u = l + Ze + (o / 2 - wt / 2);
+        u = l + ze + (i / 2 - yt / 2);
         break;
     }
-    e.save(), e.translateWithPrecision(t.startX + d, t.startY + u), e.fillStyle = "#565656", e.fill(Wn), e.restore();
+    e.save(), e.translateWithPrecision(t.startX + d, t.startY + u), e.fillStyle = "#565656", e.fill(jn), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(e, t, n) {
-    var te, j, se, le, de, Me;
-    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, h = r.isMergedMainCell ? r.mergeInfo.startColumn : i, c = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, u, h);
+    var te, j, se, le, de, be;
+    const { primaryWithCoord: r, row: i, col: o, style: a, data: l, subUnitId: s } = t, d = r.isMergedMainCell ? r.mergeInfo : r, u = r.isMergedMainCell ? r.mergeInfo.startRow : i, h = r.isMergedMainCell ? r.mergeInfo.startColumn : o, c = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, u, h);
     if (!c)
       return;
     const m = this._dataValidationModel.getValidator(c.type);
     if (!m)
       return;
-    const I = l == null ? void 0 : l.fontRenderExtension, { leftOffset: D = 0, rightOffset: v = 0, topOffset: C = 0, downOffset: f = 0 } = I || {};
+    const I = l == null ? void 0 : l.fontRenderExtension, { leftOffset: V = 0, rightOffset: v = 0, topOffset: C = 0, downOffset: f = 0 } = I || {};
     if (!c || !m || !m || m.id.indexOf(X.LIST) !== 0 || !m.skipDefaultFontRender(c))
       return;
     const w = {
-      startX: d.startX + D,
+      startX: d.startX + V,
       endX: d.endX - v,
       startY: d.startY + C,
       endY: d.endY - f
-    }, b = w.endX - w.startX, g = w.endY - w.startY, p = this._ensureMap(s), _ = this._generateKey(o, i), T = m.getListWithColorMap(c), A = ie(l), P = `${A != null ? A : ""}`, L = T[P];
+    }, M = w.endX - w.startX, g = w.endY - w.startY, p = this._ensureMap(s), _ = this._generateKey(i, o), T = m.getListWithColorMap(c), A = oe(l), P = `${A != null ? A : ""}`, L = T[P];
     let { tb: y, vt: O, ht: U, pd: k } = a || {};
     y = y != null ? y : Se.WRAP, O = O != null ? O : he.BOTTOM, U = U != null ? U : re.ht, k = k != null ? k : re.pd;
     const x = Le(a).fontCache;
     if (c.renderMode === ue.ARROW) {
-      const { l: Q = re.pd.l, t: G = re.pd.t, r: ce = re.pd.r, b: ee = re.pd.b } = k, q = b - Q - ce - me - 4, M = new at(
+      const { l: Q = re.pd.l, t: G = re.pd.t, r: ce = re.pd.r, b: ee = re.pd.b } = k, q = M - Q - ce - me - 4, b = new lt(
         P,
         x,
         y === Se.WRAP,
         q,
         1 / 0
       );
-      M.calculate();
-      const $ = M.getTotalWidth(), N = M.getTotalHeight(), { paddingTop: J, paddingLeft: R } = Hn(q, g - G - ee, $, N, O, U, !0);
-      this._drawDownIcon(e, w, b, g, N, O, k), e.save(), e.translateWithPrecision(w.startX + Q, w.startY + G), e.beginPath(), e.rect(0, 0, b - Q - ce, g - G - ee), e.clip(), e.translateWithPrecision(0, J), e.save(), e.translateWithPrecision(R, 0), e.beginPath(), e.rect(0, 0, q, N), e.clip(), Vn.drawWith(e, {
+      b.calculate();
+      const $ = b.getTotalWidth(), N = b.getTotalHeight(), { paddingTop: J, paddingLeft: R } = Yn(q, g - G - ee, $, N, O, U, !0);
+      this._drawDownIcon(e, w, M, g, N, O, k), e.save(), e.translateWithPrecision(w.startX + Q, w.startY + G), e.beginPath(), e.rect(0, 0, M - Q - ce, g - G - ee), e.clip(), e.translateWithPrecision(0, J), e.save(), e.translateWithPrecision(R, 0), e.beginPath(), e.rect(0, 0, q, N), e.clip(), On.drawWith(e, {
         text: P,
         fontStyle: x,
         width: q,
@@ -2907,15 +2911,15 @@ let un = class {
         underline: !!((se = a == null ? void 0 : a.ul) != null && se.s),
         warp: y === Se.WRAP,
         hAlign: Ee.LEFT
-      }, M), e.restore(), e.restore(), p.set(_, {
+      }, b), e.restore(), e.restore(), p.set(_, {
         left: w.endX - me + n.rowHeaderWidth,
         top: w.startY + G + n.columnHeaderHeight,
         width: me,
         height: g - G - ee
       });
     } else {
-      e.save(), e.translateWithPrecision(w.startX, w.startY), e.beginPath(), e.rect(0, 0, b, g), e.clip();
-      const Q = b - we * 2 - Xe - me - 4, G = new at(
+      e.save(), e.translateWithPrecision(w.startX, w.startY), e.beginPath(), e.rect(0, 0, M, g), e.clip();
+      const Q = M - we * 2 - Xe - me - 4, G = new lt(
         P,
         x,
         y === Se.WRAP,
@@ -2923,32 +2927,32 @@ let un = class {
         1 / 0
       );
       G.calculate();
-      const ce = G.getTotalWidth(), ee = G.getTotalHeight(), q = ee + zt * 2, M = Math.max(b - we * 2, 1), { paddingTop: $ } = Hn(M, g, ce, q, O, U);
-      e.translateWithPrecision(we, $), qn.drawWith(e, {
-        width: M,
+      const ce = G.getTotalWidth(), ee = G.getTotalHeight(), q = ee + Gt * 2, b = Math.max(M - we * 2, 1), { paddingTop: $ } = Yn(b, g, ce, q, O, U);
+      e.translateWithPrecision(we, $), Qn.drawWith(e, {
+        width: b,
         height: q,
         fill: L || ke,
-        radius: Kt
-      }), e.save(), e.translateWithPrecision(Xe, zt), e.beginPath(), e.rect(0, 0, Q, ee), e.clip(), Vn.drawWith(e, {
+        radius: qt
+      }), e.save(), e.translateWithPrecision(Xe, Gt), e.beginPath(), e.rect(0, 0, Q, ee), e.clip(), On.drawWith(e, {
         text: P,
         fontStyle: x,
         width: Q,
         height: ee,
         color: (le = a == null ? void 0 : a.cl) == null ? void 0 : le.rgb,
         strokeLine: !!((de = a == null ? void 0 : a.st) != null && de.s),
-        underline: !!((Me = a == null ? void 0 : a.ul) != null && Me.s),
+        underline: !!((be = a == null ? void 0 : a.ul) != null && be.s),
         warp: y === Se.WRAP,
         hAlign: Ee.LEFT
-      }, G), e.restore(), e.translateWithPrecision(Q + Xe + 4, (ee - wt) / 2), e.fillStyle = Ki, e.fill(Wn), e.restore(), p.set(_, {
+      }, G), e.restore(), e.translateWithPrecision(Q + Xe + 4, (ee - yt) / 2), e.fillStyle = Jo, e.fill(jn), e.restore(), p.set(_, {
         left: w.startX + we + n.rowHeaderWidth,
         top: w.startY + $ + n.columnHeaderHeight,
-        width: M,
+        width: b,
         height: q
       });
     }
   }
   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: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
+    const { primaryWithCoord: t, style: n, data: r, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = r == null ? void 0 : r.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!c || c.renderMode === ue.TEXT)
       return;
     const m = {
@@ -2956,31 +2960,31 @@ let un = class {
       endX: a.endX - d,
       startY: a.startY + u,
       endY: a.endY - h
-    }, I = m.endX - m.startX, D = ie(r), v = `${D != null ? D : ""}`;
+    }, I = m.endX - m.startX, V = oe(r), v = `${V != null ? V : ""}`;
     let { tb: C, pd: f } = n || {};
-    const { t: w = re.pd.t, b = re.pd.b } = f != null ? f : {};
+    const { t: w = re.pd.t, b: M = re.pd.b } = f != null ? f : {};
     if (C = C != null ? C : Se.WRAP, c.renderMode === ue.ARROW) {
-      const { l: g = re.pd.l, r: p = re.pd.r } = f != null ? f : {}, _ = I - g - p - me - 4, T = new at(
+      const { l: g = re.pd.l, r: p = re.pd.r } = f != null ? f : {}, _ = I - g - p - me - 4, T = new lt(
         v,
         Le(n).fontCache,
         C === Se.WRAP,
         _,
         1 / 0
       );
-      return T.calculate(), T.getTotalHeight() + w + b + Ze * 2;
+      return T.calculate(), T.getTotalHeight() + w + M + ze * 2;
     } else {
-      const g = Math.max(I - we * 2 - Xe - me - 4, 10), p = new at(
+      const g = Math.max(I - we * 2 - Xe - me - 4, 10), p = new lt(
         v,
         Le(n).fontCache,
         C === Se.WRAP,
         g,
         1 / 0
       );
-      return p.calculate(), p.getTotalHeight() + Ze * 2 + zt * 2;
+      return p.calculate(), p.getTotalHeight() + ze * 2 + Gt * 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: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, o, i);
+    const { primaryWithCoord: t, style: n, data: r, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = r == null ? void 0 : r.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
     if (!c || c.renderMode === ue.TEXT)
       return;
     const m = {
@@ -2988,23 +2992,23 @@ let un = class {
       endX: a.endX - d,
       startY: a.startY + u,
       endY: a.endY - h
-    }, I = m.endX - m.startX, D = ie(r), v = `${D != null ? D : ""}`;
+    }, I = m.endX - m.startX, V = oe(r), v = `${V != null ? V : ""}`;
     let { tb: C, pd: f } = n || {};
-    const { l: w = re.pd.l, r: b = re.pd.r } = f != null ? f : {};
+    const { l: w = re.pd.l, r: M = re.pd.r } = f != null ? f : {};
     C = C != null ? C : Se.WRAP;
     let g = we * 2 + me;
     switch (c.renderMode) {
       case ue.ARROW:
-        g = me + 4 + b + w;
+        g = me + 4 + M + w;
         break;
       case ue.CUSTOM:
-        g = me + we * 2 + Xe * 2 + b + w + Kt / 2 + 1;
+        g = me + we * 2 + Xe * 2 + M + w + qt / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        g = me + we * 2 + Xe * 2 + b + w + Kt / 2 + 1;
+        g = me + we * 2 + Xe * 2 + M + w + qt / 2 + 1;
     }
-    const p = I - g, _ = new at(
+    const p = I - g, _ = new lt(
       v,
       Le(n).fontCache,
       C === Se.WRAP,
@@ -3014,7 +3018,7 @@ let un = class {
     return _.calculate(), _.getTotalWidth() + g;
   }
   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);
+    const { subUnitId: n, row: r, col: i } = t, a = this._ensureMap(n).get(this._generateKey(r, i)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, r, i);
     if (!l || !a || l.renderMode === ue.TEXT)
       return !1;
     const { top: s, left: d, width: u, height: h } = a, { x: c, y: m } = e;
@@ -3023,70 +3027,70 @@ let un = class {
   onPointerDown(e, t) {
     if (t.button === 2)
       return;
-    const { unitId: n, subUnitId: r, row: o, col: i } = e, a = {
+    const { unitId: n, subUnitId: r, row: i, col: o } = e, a = {
       unitId: n,
       subUnitId: r,
-      row: o,
-      column: i
+      row: i,
+      column: o
     };
-    this._commandService.executeCommand(Ut.id, a);
+    this._commandService.executeCommand(Ft.id, a);
   }
   onPointerEnter(e, t) {
     var n, r;
-    (r = (n = Ke(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ge.POINTER);
+    (r = (n = Ge(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(qe.POINTER);
   }
   onPointerLeave(e, t) {
     var n, r;
-    (r = (n = Ke(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(Ge.DEFAULT);
+    (r = (n = Ge(H.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : n.mainComponent) == null || r.setCursor(qe.DEFAULT);
   }
 };
-un = zi([
-  lt(0, pe),
-  lt(1, E(ge)),
-  lt(2, oe),
-  lt(3, E(xe)),
-  lt(4, E(ae))
-], un);
-class Gi extends Ce {
+pn = qo([
+  ct(0, pe),
+  ct(1, D(ge)),
+  ct(2, ie),
+  ct(3, D(xe)),
+  ct(4, D(ae))
+], pn);
+class Qo extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", X.LIST);
-    V(this, "canvasRender", this.injector.createInstance(un));
-    V(this, "dropdownType", fe.LIST);
-    V(this, "optionsInput", Ot.componentKey);
-    V(this, "formulaInput", mn);
+    E(this, "id", X.LIST);
+    E(this, "canvasRender", this.injector.createInstance(pn));
+    E(this, "dropdownType", fe.LIST);
+    E(this, "optionsInput", Pt.componentKey);
+    E(this, "formulaInput", _n);
   }
 }
-class qi extends Ce {
+class ea extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", X.TEXT_LENGTH);
-    V(this, "formulaInput", kt);
+    E(this, "id", X.TEXT_LENGTH);
+    E(this, "formulaInput", Nt);
   }
 }
-class Ji extends Ce {
+class ta extends Ce {
   constructor() {
     super(...arguments);
-    V(this, "id", X.WHOLE);
-    V(this, "formulaInput", kt);
+    E(this, "id", X.WHOLE);
+    E(this, "formulaInput", Nt);
   }
 }
-var Qi = Object.getOwnPropertyDescriptor, ea = (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;
-}, Gt = (e, t) => (n, r) => t(n, r, e);
-let rt = class extends pn {
+var na = Object.getOwnPropertyDescriptor, ra = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? na(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, Jt = (e, t) => (n, r) => t(n, r, e);
+let it = class extends vn {
   constructor(e, t, n) {
     super(), this._injector = e, this._componentManger = t, this._dataValidatorRegistryService = n, this._initComponents(), this._registerValidatorViews();
   }
   _initComponents() {
     [
-      ["DataValidationIcon", br],
-      [Vt, Si],
-      [Ot.componentKey, Ot],
-      [At.componentKey, At],
-      ...bi
+      ["DataValidationIcon", Dr],
+      [Ot, wo],
+      [Pt.componentKey, Pt],
+      [Lt.componentKey, Lt],
+      ...Vo
     ].forEach(([e, t]) => {
       this.disposeWithMe(this._componentManger.register(
         e,
@@ -3096,146 +3100,145 @@ let rt = class extends pn {
   }
   _registerValidatorViews() {
     [
-      Fi,
-      Ji,
-      qi,
-      Ui,
-      Li,
-      Gi,
-      Xi,
-      ki
+      Bo,
+      ta,
+      ea,
+      xo,
+      Uo,
+      Qo,
+      Ko,
+      Fo
     ].forEach((e) => {
       const t = this._injector.createInstance(e), n = this._dataValidatorRegistryService.getValidatorItem(t.id);
       n && (n.formulaInput = t.formulaInput, n.canvasRender = t.canvasRender, n.dropdownType = t.dropdownType, n.optionsInput = t.optionsInput);
     });
   }
 };
-rt = ea([
-  Gt(0, E(Ve)),
-  Gt(1, E(Sn)),
-  Gt(2, E(Te))
-], rt);
-var ta = Object.getOwnPropertyDescriptor, na = (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;
-}, qt = (e, t) => (n, r) => t(n, r, e);
-const ra = "SHEET_DATA_VALIDATION_UI_PLUGIN";
-var Rt;
-let jn = (Rt = class extends Kn {
-  constructor(e = Dt, t, n, r) {
+it = ra([
+  Jt(0, D(Ve)),
+  Jt(1, D(In)),
+  Jt(2, D(Te))
+], it);
+var ia = Object.getOwnPropertyDescriptor, oa = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? ia(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, Qt = (e, t) => (n, r) => t(n, r, e), Ze;
+let Xn = (Ze = class extends qn {
+  constructor(e = Tt, t, n, r) {
     super(), this._config = e, this._injector = t, this._commandService = n, this._configService = r;
-    const { menu: o, ...i } = Gn(
+    const { menu: i, ...o } = Jn(
       {},
-      Dt,
+      Tt,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Et, i);
+    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(Vt, o);
   }
   onStarting() {
     [
       [_e],
       [$e],
-      [gt],
-      [Qe],
+      [mt],
+      [et],
+      [rt],
       [nt],
       [tt],
-      [et],
-      [rt]
+      [it]
     ].forEach((e) => {
       this._injector.add(e);
     }), [
+      $t,
       Ft,
-      Ut,
-      Ir,
-      wn,
+      Rr,
+      yn,
       Be,
-      Cr
+      wr
     ].forEach((e) => {
       this._commandService.registerCommand(e);
     });
   }
   onReady() {
-    this._injector.get(et), this._injector.get(tt), this._injector.get(xe).registerRenderModule(
+    this._injector.get(tt), this._injector.get(nt), this._injector.get(xe).registerRenderModule(
       H.UNIVER_SHEET,
-      [Tt]
+      [At]
     );
   }
   onRendered() {
-    this._injector.get(rt), this._injector.get(nt);
+    this._injector.get(it), this._injector.get(rt);
   }
   onSteady() {
-    this._injector.get(Qe);
-  }
-}, V(Rt, "pluginName", ra), V(Rt, "type", H.UNIVER_SHEET), Rt);
-jn = na([
-  qt(1, E(Ve)),
-  qt(2, oe),
-  qt(3, hn)
-], jn);
-var oa = Object.defineProperty, ia = Object.getOwnPropertyDescriptor, aa = (e, t, n) => t in e ? oa(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, sa = (e, t, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? ia(t, n) : t, i = e.length - 1, a; i >= 0; i--)
-    (a = e[i]) && (o = a(o) || o);
-  return o;
-}, Jt = (e, t) => (n, r) => t(n, r, e), Ar = (e, t, n) => aa(e, typeof t != "symbol" ? t + "" : t, n);
-const la = "SHEET_DATA_VALIDATION_UI_PLUGIN";
-let Lt = class extends Kn {
-  constructor(e = Dt, t, n, r) {
+    this._injector.get(et);
+  }
+}, E(Ze, "pluginName", "SHEET_DATA_VALIDATION_UI_PLUGIN"), E(Ze, "packageName", Dt.name), E(Ze, "version", Dt.version), E(Ze, "type", H.UNIVER_SHEET), Ze);
+Xn = oa([
+  Qt(1, D(Ve)),
+  Qt(2, ie),
+  Qt(3, gn)
+], Xn);
+var aa = Object.defineProperty, sa = Object.getOwnPropertyDescriptor, la = (e, t, n) => t in e ? aa(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, da = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? sa(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (i = a(i) || i);
+  return i;
+}, en = (e, t) => (n, r) => t(n, r, e), xt = (e, t, n) => la(e, typeof t != "symbol" ? t + "" : t, n);
+let ot = class extends qn {
+  constructor(e = Tt, t, n, r) {
     super(), this._config = e, this._injector = t, this._commandService = n, this._configService = r;
-    const { menu: o, ...i } = Gn(
+    const { menu: i, ...o } = Jn(
       {},
-      Dt,
+      Tt,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Et, i);
+    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(Vt, o);
   }
   onStarting() {
     [
       [_e],
       [$e],
-      [gt],
-      [Qe],
+      [mt],
+      [et],
+      [rt],
       [nt],
       [tt],
-      [et],
-      [Je],
-      [rt]
+      [Qe],
+      [it]
     ].forEach((e) => {
       this._injector.add(e);
     }), [
+      $t,
       Ft,
-      Ut,
-      Ir,
-      wn,
+      Rr,
+      yn,
       Be,
-      Cr
+      wr
     ].forEach((e) => {
       this._commandService.registerCommand(e);
     });
   }
   onReady() {
-    this._injector.get(et), this._injector.get(tt), this._injector.get(Je), this._injector.get(gt), this._injector.get(xe).registerRenderModule(
+    this._injector.get(tt), this._injector.get(nt), this._injector.get(Qe), this._injector.get(mt), this._injector.get(xe).registerRenderModule(
       H.UNIVER_SHEET,
-      [Tt]
+      [At]
     );
   }
   onRendered() {
-    this._injector.get(rt), this._injector.get(nt);
+    this._injector.get(it), this._injector.get(rt);
   }
   onSteady() {
-    this._injector.get(Qe);
+    this._injector.get(et);
   }
 };
-Ar(Lt, "pluginName", la);
-Ar(Lt, "type", H.UNIVER_SHEET);
-Lt = sa([
-  Zr(vo),
-  Jt(1, E(Ve)),
-  Jt(2, oe),
-  Jt(3, hn)
-], Lt);
+xt(ot, "pluginName", "SHEET_DATA_VALIDATION_UI_PLUGIN");
+xt(ot, "packageName", Dt.name);
+xt(ot, "version", Dt.version);
+xt(ot, "type", H.UNIVER_SHEET);
+ot = da([
+  zr(vi),
+  en(1, D(Ve)),
+  en(2, ie),
+  en(3, gn)
+], ot);
 export {
   Ce as BaseSheetDataValidatorView,
-  jn as UniverSheetsDataValidationMobileUIPlugin,
-  Lt as UniverSheetsDataValidationUIPlugin
+  Xn as UniverSheetsDataValidationMobileUIPlugin,
+  ot as UniverSheetsDataValidationUIPlugin
 };