@univerjs/sheets-data-validation-ui 0.10.8 → 0.10.9-nightly.202509260614

package/lib/index.js

@@ -1,17 +1,17 @@
 var Tr = Object.defineProperty;
 var Pr = (e, t, r) => t in e ? Tr(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
 var V = (e, t, r) => Pr(e, typeof t != "symbol" ? t + "" : t, r);
-import { Disposable as ye, UniverInstanceType as X, toDisposable as Ar, IUniverInstanceService as ce, Inject as M, LocaleService as ue, DataValidationErrorStyle as lt, DataValidationStatus as Ze, ICommandService as te, Injector as be, IConfigService as ln, DataValidationRenderMode as se, DisposableCollection as Lr, dayjs as Nt, numfmt as $n, CellValueType as kr, CommandType as rt, DataValidationType as j, ObjectMatrix as It, Range as Nr, Rectangle as Rt, queryObjectMatrix as zt, Optional as Ur, RxDisposable as dn, InterceptorEffectEnum as jn, sequenceExecute as Yn, bufferDebounceTime as Fr, debounce as xr, UndoCommand as Br, RedoCommand as Wr, isUnitRangesEqual as Hr, shallowEqual as Rn, ThemeService as Xn, ColorKit as $r, isFormulaString as Oe, generateRandomId as yn, VerticalAlign as de, HorizontalAlign as Re, DEFAULT_STYLES as ae, WrapStrategy as me, Plugin as Zn, merge as Kn, DependentOn as jr } from "@univerjs/core";
-import { DeviceInputEventType as gt, IRenderManagerService as xe, fixLineWidthByScale as bn, Transform as Yr, CheckboxShape as Xr, getCurrentTypeOfRenderer as Ke, CURSOR_TYPE as ze, FontCache as Zr, Shape as Kr, Rect as zn, getFontStyleString as Te, DocSimpleSkeleton as it, Text as Mn } from "@univerjs/engine-render";
-import { SheetInterceptorService as cn, VALIDATE_CELL as zr, SheetsSelectionsService as Gn, SetRangeValuesCommand as st, getSheetCommandTarget as qn, rangeToDiscreteRange as Gr, SheetPermissionCheckController as qr, WorksheetEditPermission as Gt, WorksheetSetCellStylePermission as qt, RangeProtectionPermissionEditPoint as Jt, WorkbookEditablePermission as Qt, INTERCEPTOR_POINT as Jn, InterceptCellContentPriority as Qn, checkRangesEditablePermission as Jr } from "@univerjs/sheets";
-import { SheetDataValidationModel as ie, SheetsDataValidationValidatorService as Qr, getDataValidationCellValue as Ut, getCellValueOrigin as re, serializeListOptions as er, createDefaultNewRule as tr, AddSheetDataValidationCommand as un, DATA_VALIDATION_PLUGIN_NAME as nr, getDataValidationDiffMutations as en, UpdateSheetDataValidationRangeCommand as rr, DataValidationCacheService as ir, UpdateSheetDataValidationSettingCommand as En, UpdateSheetDataValidationOptionsCommand as ei, RemoveSheetDataValidationCommand as or, RemoveSheetAllDataValidationCommand as ti, DataValidationFormulaController as ni, deserializeListOptions as ri, CUSTOM_FORMULA_INPUT_NAME as ar, BASE_FORMULA_INPUT_NAME as Pt, LIST_FORMULA_INPUT_NAME as hn, CHECKBOX_FORMULA_INPUT_NAME as sr, DataValidationFormulaService as ii, CHECKBOX_FORMULA_2 as oi, CHECKBOX_FORMULA_1 as ai, getFormulaResult as Ft, isLegalFormulaResult as Dn, transformCheckboxValue as si, UniverSheetsDataValidationPlugin as li } from "@univerjs/sheets-data-validation";
-import { DataValidatorRegistryService as Me, DataValidatorDropdownType as ve, DataValidationModel as pn, DataValidatorRegistryScope as di, TWO_FORMULA_OPERATOR_COUNT as ci, getRuleOptions as Vn, getRuleSetting as On } from "@univerjs/data-validation";
-import { ISidebarService as lr, IDialogService as ui, IZenZoneService as dr, KeyCode as vt, MenuItemType as gn, getMenuHiddenObservable as hi, RibbonDataGroup as pi, IMenuManagerService as gi, useDependency as F, ComponentManager as vn, useObservable as Ae, useEvent as tn, useSidebarClick as cr } from "@univerjs/ui";
-import { filter as fn, BehaviorSubject as Tn, distinctUntilChanged as vi, Subject as fi, debounceTime as ur, bufferTime as hr, of as mi } from "rxjs";
+import { Disposable as ye, UniverInstanceType as X, toDisposable as Ar, IUniverInstanceService as de, Inject as E, LocaleService as ce, DataValidationErrorStyle as lt, DataValidationStatus as Ze, ICommandService as ee, Injector as be, IConfigService as dn, DataValidationRenderMode as ae, DisposableCollection as Lr, dayjs as Nt, numfmt as $n, CellValueType as kr, CommandType as rt, DataValidationType as j, ObjectMatrix as It, Range as Nr, Rectangle as Rt, queryObjectMatrix as Gt, Optional as Ur, RxDisposable as cn, InterceptorEffectEnum as jn, sequenceExecute as Yn, bufferDebounceTime as Fr, debounce as xr, UndoCommand as Br, RedoCommand as Wr, isUnitRangesEqual as Hr, shallowEqual as yn, ThemeService as Xn, ColorKit as $r, isFormulaString as Ve, generateRandomId as bn, VerticalAlign as le, HorizontalAlign as Re, DEFAULT_STYLES as Q, WrapStrategy as fe, Plugin as Zn, merge as Kn, DependentOn as jr } from "@univerjs/core";
+import { DeviceInputEventType as pt, IRenderManagerService as Fe, fixLineWidthByScale as Mn, Transform as Yr, CheckboxShape as Xr, getCurrentTypeOfRenderer as Ke, CURSOR_TYPE as ze, FontCache as Zr, Shape as Kr, Rect as zn, getFontStyleString as Oe, DocSimpleSkeleton as it, Text as En } from "@univerjs/engine-render";
+import { SheetInterceptorService as un, VALIDATE_CELL as zr, SheetsSelectionsService as Gn, SetRangeValuesCommand as st, getSheetCommandTarget as qn, rangeToDiscreteRange as Gr, SheetPermissionCheckController as qr, WorksheetEditPermission as qt, WorksheetSetCellStylePermission as Jt, RangeProtectionPermissionEditPoint as Qt, WorkbookEditablePermission as en, INTERCEPTOR_POINT as Jn, InterceptCellContentPriority as Qn, checkRangesEditablePermission as Jr } from "@univerjs/sheets";
+import { SheetDataValidationModel as ie, SheetsDataValidationValidatorService as Qr, getDataValidationCellValue as Ut, getCellValueOrigin as re, serializeListOptions as er, createDefaultNewRule as tr, AddSheetDataValidationCommand as hn, DATA_VALIDATION_PLUGIN_NAME as nr, getDataValidationDiffMutations as tn, UpdateSheetDataValidationRangeCommand as rr, DataValidationCacheService as ir, UpdateSheetDataValidationSettingCommand as Dn, UpdateSheetDataValidationOptionsCommand as ei, RemoveSheetDataValidationCommand as or, RemoveSheetAllDataValidationCommand as ti, DataValidationFormulaController as ni, deserializeListOptions as ri, CUSTOM_FORMULA_INPUT_NAME as ar, BASE_FORMULA_INPUT_NAME as Pt, LIST_FORMULA_INPUT_NAME as gn, CHECKBOX_FORMULA_INPUT_NAME as sr, DataValidationFormulaService as ii, CHECKBOX_FORMULA_2 as oi, CHECKBOX_FORMULA_1 as ai, getFormulaResult as Ft, isLegalFormulaResult as Vn, transformCheckboxValue as si, UniverSheetsDataValidationPlugin as li } from "@univerjs/sheets-data-validation";
+import { DataValidatorRegistryService as Me, DataValidatorDropdownType as pe, DataValidationModel as pn, DataValidatorRegistryScope as di, TWO_FORMULA_OPERATOR_COUNT as ci, getRuleOptions as On, getRuleSetting as Tn } from "@univerjs/data-validation";
+import { ISidebarService as lr, IDialogService as ui, IZenZoneService as dr, KeyCode as vt, MenuItemType as vn, getMenuHiddenObservable as hi, RibbonDataGroup as gi, IMenuManagerService as pi, useDependency as F, ComponentManager as fn, useObservable as Pe, useEvent as nn, useSidebarClick as cr } from "@univerjs/ui";
+import { filter as mn, BehaviorSubject as Pn, distinctUntilChanged as vi, Subject as fi, debounceTime as ur, bufferTime as hr, of as mi } from "rxjs";
 import { getPatternType as _i } from "@univerjs/sheets-numfmt";
-import { ISheetCellDropdownManagerService as Si, IEditorBridgeService as pr, SetCellEditVisibleOperation as ft, HoverManagerService as Ci, CellAlertManagerService as wi, CellAlertType as Ii, IAutoFillService as Ri, APPLY_TYPE as ot, virtualizeDiscreteRanges as nn, getAutoFillRepeatRange as yi, ISheetClipboardService as bi, COPY_TYPE as Pn, PREDEFINED_HOOK_NAME as mt, getRepeatRange as An, getCurrentRangeDisable$ as Mi, AutoHeightController as gr, SheetSkeletonManagerService as dt, IMarkSelectionService as Ei } from "@univerjs/sheets-ui";
-import { Button as Ge, FormLayout as Y, RadioGroup as mn, Radio as Le, Checkbox as At, Input as ke, Select as Ln, clsx as Ue, borderClassName as yt, DraggableList as Di, Dropdown as Vi } from "@univerjs/design";
-import { createElement as Ie, forwardRef as Be, useRef as pt, useState as W, useMemo as ct, useEffect as Ne } from "react";
+import { ISheetCellDropdownManagerService as Si, IEditorBridgeService as gr, SetCellEditVisibleOperation as ft, HoverManagerService as Ci, CellAlertManagerService as wi, CellAlertType as Ii, IAutoFillService as Ri, APPLY_TYPE as ot, virtualizeDiscreteRanges as rn, getAutoFillRepeatRange as yi, ISheetClipboardService as bi, COPY_TYPE as An, PREDEFINED_HOOK_NAME as mt, getRepeatRange as Ln, getCurrentRangeDisable$ as Mi, AutoHeightController as pr, SheetSkeletonManagerService as dt, IMarkSelectionService as Ei } from "@univerjs/sheets-ui";
+import { Button as Ge, FormLayout as Y, RadioGroup as _n, Radio as Ae, Checkbox as At, Input as Le, Select as kn, clsx as Ne, borderClassName as yt, DraggableList as Di, Dropdown as Vi } from "@univerjs/design";
+import { createElement as Ie, forwardRef as xe, useRef as gt, useState as H, useMemo as ct, useEffect as ke } from "react";
 import { jsxs as $, Fragment as ut, jsx as S } from "react/jsx-runtime";
 import { deserializeRangeWithSheet as Oi, serializeRange as vr } from "@univerjs/engine-formula";
 import { RangeSelector as Ti, FormulaEditor as fr } from "@univerjs/sheets-formula-ui";
@@ -19,18 +19,18 @@ var Pi = Object.getOwnPropertyDescriptor, Ai = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Pi(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, kn = (e, t) => (r, n) => t(r, n, e);
-let Se = class extends ye {
+}, Nn = (e, t) => (r, n) => t(r, n, e);
+let me = class extends ye {
   constructor(t, r) {
     super();
-    V(this, "_open$", new Tn(!1));
+    V(this, "_open$", new Pn(!1));
     V(this, "open$", this._open$.pipe(vi()));
     V(this, "_activeRule");
-    V(this, "_activeRule$", new Tn(void 0));
+    V(this, "_activeRule$", new Pn(void 0));
     V(this, "activeRule$", this._activeRule$.asObservable());
     V(this, "_closeDisposable", null);
     this._univerInstanceService = t, this._sidebarService = r, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(X.UNIVER_SHEET).pipe(fn((n) => !n)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(X.UNIVER_SHEET).pipe(mn((n) => !n)).subscribe(() => {
         this.close();
       })
     ), this.disposeWithMe(this._sidebarService.sidebarOptions$.subscribe((n) => {
@@ -65,16 +65,16 @@ let Se = class extends ye {
     this._activeRule = t, this._activeRule$.next(t);
   }
 };
-Se = Ai([
-  kn(0, ce),
-  kn(1, lr)
-], Se);
-const Pe = "#ECECEC", _n = "sheets-data-validation-ui.config", bt = {};
+me = Ai([
+  Nn(0, de),
+  Nn(1, lr)
+], me);
+const Te = "#ECECEC", Sn = "sheets-data-validation-ui.config", bt = {};
 var Li = Object.getOwnPropertyDescriptor, ki = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Li(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, $e = (e, t) => (r, n) => t(r, n, e);
+}, He = (e, t) => (r, n) => t(r, n, e);
 let qe = class extends ye {
   constructor(e, t, r, n, i, o) {
     super(), this._sheetInterceptorService = e, this._dataValidationModel = t, this._dataValidatorRegistryService = r, this._dialogService = n, this._localeService = i, this._sheetsDataValidationValidatorService = o, this._initEditorBridgeInterceptor();
@@ -144,18 +144,18 @@ let qe = class extends ye {
   }
 };
 qe = ki([
-  $e(0, M(cn)),
-  $e(1, M(ie)),
-  $e(2, M(Me)),
-  $e(3, ui),
-  $e(4, M(ue)),
-  $e(5, M(Qr))
+  He(0, E(un)),
+  He(1, E(ie)),
+  He(2, E(Me)),
+  He(3, ui),
+  He(4, E(ce)),
+  He(5, E(Qr))
 ], qe);
 var Ni = Object.getOwnPropertyDescriptor, Ui = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Ni(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, pe = (e, t) => (r, n) => t(r, n, e);
+}, he = (e, t) => (r, n) => t(r, n, e);
 const xt = (e) => {
   if (e == null || typeof e == "boolean")
     return;
@@ -179,15 +179,15 @@ function Fi(e, t) {
       return "HH:mm:ss";
   }
 }
-let Fe = class extends ye {
-  constructor(t, r, n, i, o, a, l, s, d, u, h) {
+let Ue = class extends ye {
+  constructor(t, r, n, i, o, a, l, s, d, u, g) {
     super();
     V(this, "_activeDropdown");
     V(this, "_activeDropdown$", new fi());
     V(this, "_currentPopup", null);
     V(this, "activeDropdown$", this._activeDropdown$.asObservable());
     V(this, "_zenVisible", !1);
-    this._univerInstanceService = t, this._dataValidatorRegistryService = r, this._zenZoneService = n, this._dataValidationModel = i, this._sheetsSelectionsService = o, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = d, this._injector = u, this._configService = h, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
+    this._univerInstanceService = t, this._dataValidatorRegistryService = r, this._zenZoneService = n, this._dataValidationModel = i, this._sheetsSelectionsService = o, this._cellDropdownManagerService = a, this._sheetDataValidationModel = l, this._commandService = s, this._editorBridgeService = d, this._injector = u, this._configService = g, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
   }
@@ -219,7 +219,7 @@ let Fe = class extends ye {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   showDropdown(t) {
-    var b, y, g, C;
+    var M, y, w, C;
     const { location: r } = t, { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = r;
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
@@ -230,12 +230,12 @@ let Fe = class extends ye {
     const u = this._dataValidatorRegistryService.getValidatorItem(d.type);
     if (!(u != null && u.dropdownType))
       return;
-    let h;
-    const c = async (v, I) => {
-      var O, P, k;
-      if (!v)
+    let g;
+    const c = async (p, I) => {
+      var D, T, k;
+      if (!p)
         return !0;
-      const w = v, _ = s.getCell(n, i), R = w.format(I === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), L = (O = $n.parseDate(R)) == null ? void 0 : O.v, N = I === "time" ? L % 1 : L, E = l.getStyles().getStyleByCell(_), T = (k = (P = E == null ? void 0 : E.n) == null ? void 0 : P.pattern) != null ? k : "";
+      const _ = p, v = s.getCell(n, i), R = _.format(I === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss"), A = (D = $n.parseDate(R)) == null ? void 0 : D.v, N = I === "time" ? A % 1 : A, O = l.getStyles().getStyleByCell(v), L = (k = (T = O == null ? void 0 : O.n) == null ? void 0 : T.pattern) != null ? k : "";
       return d.errorStyle !== lt.STOP || await u.validator({
         value: N,
         unitId: o,
@@ -263,63 +263,63 @@ let Fe = class extends ye {
           si: null,
           s: {
             n: {
-              pattern: Fi(I, T)
+              pattern: Fi(I, L)
             }
           }
         }
       }), await this._commandService.executeCommand(ft.id, {
         visible: !1,
-        eventType: gt.Keyboard,
+        eventType: pt.Keyboard,
         unitId: o,
         keycode: vt.ESC
       }), !0) : (this._injector.has(qe) && this._injector.get(qe).showReject(u.getRuleFinalError(d, { row: n, col: i, unitId: o, subUnitId: a })), !1);
     };
-    let m;
+    let f;
     switch (u.dropdownType) {
-      case ve.DATE: {
-        const v = re(s.getCellRaw(n, i)), I = xt(v), w = !!((b = d.bizInfo) != null && b.showTime);
-        m = {
+      case pe.DATE: {
+        const p = re(s.getCellRaw(n, i)), I = xt(p), _ = !!((M = d.bizInfo) != null && M.showTime);
+        f = {
           location: r,
           type: "datepicker",
           props: {
-            showTime: w,
-            onChange: (_) => c(_, w ? "datetime" : "date"),
+            showTime: _,
+            onChange: (v) => c(v, _ ? "datetime" : "date"),
             defaultValue: I,
             patternType: "date"
           }
         };
         break;
       }
-      case ve.TIME: {
-        const v = re(s.getCellRaw(n, i)), I = xt(v);
-        m = {
+      case pe.TIME: {
+        const p = re(s.getCellRaw(n, i)), I = xt(p);
+        f = {
           location: r,
           type: "datepicker",
           props: {
-            onChange: (w) => c(w, "time"),
+            onChange: (_) => c(_, "time"),
             defaultValue: I,
             patternType: "time"
           }
         };
         break;
       }
-      case ve.DATETIME: {
-        const v = re(s.getCellRaw(n, i)), I = xt(v);
-        m = {
+      case pe.DATETIME: {
+        const p = re(s.getCellRaw(n, i)), I = xt(p);
+        f = {
           location: r,
           type: "datepicker",
           props: {
-            onChange: (w) => c(w, "datetime"),
+            onChange: (_) => c(_, "datetime"),
             defaultValue: I,
             patternType: "datetime"
           }
         };
         break;
       }
-      case ve.LIST:
-      case ve.MULTIPLE_LIST: {
-        const v = u.dropdownType === ve.MULTIPLE_LIST, I = async (E) => {
-          const T = er(E), O = {
+      case pe.LIST:
+      case pe.MULTIPLE_LIST: {
+        const p = u.dropdownType === pe.MULTIPLE_LIST, I = async (O) => {
+          const L = er(O), D = {
             unitId: o,
             subUnitId: a,
             range: {
@@ -329,47 +329,47 @@ let Fe = class extends ye {
               endRow: n
             },
             value: {
-              v: T,
+              v: L,
               p: null,
               f: null,
               si: null
             }
           };
-          return this._commandService.executeCommand(st.id, O), this._editorBridgeService.isVisible().visible && await this._commandService.executeCommand(ft.id, {
+          return this._commandService.executeCommand(st.id, D), this._editorBridgeService.isVisible().visible && await this._commandService.executeCommand(ft.id, {
             visible: !1,
-            eventType: gt.Keyboard,
+            eventType: pt.Keyboard,
             unitId: o,
             keycode: vt.ESC
-          }), !v;
-        }, w = (d == null ? void 0 : d.renderMode) === se.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, _ = u.getListWithColor(d, o, a), R = Ut(s.getCellRaw(n, i)), L = () => {
-          this._commandService.executeCommand(We.id, {
+          }), !p;
+        }, _ = (d == null ? void 0 : d.renderMode) === ae.CUSTOM || (d == null ? void 0 : d.renderMode) === void 0, v = u.getListWithColor(d, o, a), R = Ut(s.getCellRaw(n, i)), A = () => {
+          this._commandService.executeCommand(Be.id, {
             ruleId: d.uid
-          }), h == null || h.dispose();
-        }, N = _.map((E) => ({
-          label: E.label,
-          value: E.label,
-          color: w || E.color ? E.color || Pe : "transparent"
+          }), g == null || g.dispose();
+        }, N = v.map((O) => ({
+          label: O.label,
+          value: O.label,
+          color: _ || O.color ? O.color || Te : "transparent"
         }));
-        m = {
+        f = {
           location: r,
           type: "list",
           props: {
-            onChange: (E) => I(E),
+            onChange: (O) => I(O),
             options: N,
-            onEdit: L,
+            onEdit: A,
             defaultValue: R,
-            multiple: v,
-            showEdit: (g = (y = this._configService.getConfig(_n)) == null ? void 0 : y.showEditOnDropdown) != null ? g : !0
+            multiple: p,
+            showEdit: (w = (y = this._configService.getConfig(Sn)) == null ? void 0 : y.showEditOnDropdown) != null ? w : !0
           }
         };
         break;
       }
-      case ve.CASCADE: {
-        m = {
+      case pe.CASCADE: {
+        f = {
           type: "cascader",
           props: {
             onChange: (I) => {
-              const w = {
+              const _ = {
                 unitId: o,
                 subUnitId: a,
                 range: {
@@ -385,9 +385,9 @@ let Fe = class extends ye {
                   si: null
                 }
               };
-              return this._commandService.syncExecuteCommand(st.id, w), this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(ft.id, {
+              return this._commandService.syncExecuteCommand(st.id, _), this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(ft.id, {
                 visible: !1,
-                eventType: gt.Keyboard,
+                eventType: pt.Keyboard,
                 unitId: o,
                 keycode: vt.ESC
               }), !0;
@@ -399,12 +399,12 @@ let Fe = class extends ye {
         };
         break;
       }
-      case ve.COLOR: {
-        m = {
+      case pe.COLOR: {
+        f = {
           type: "color",
           props: {
             onChange: (I) => {
-              const w = {
+              const _ = {
                 unitId: o,
                 subUnitId: a,
                 range: {
@@ -420,9 +420,9 @@ let Fe = class extends ye {
                   si: null
                 }
               };
-              return this._commandService.syncExecuteCommand(st.id, w), this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(ft.id, {
+              return this._commandService.syncExecuteCommand(st.id, _), this._editorBridgeService.isVisible().visible && this._commandService.syncExecuteCommand(ft.id, {
                 visible: !1,
-                eventType: gt.Keyboard,
+                eventType: pt.Keyboard,
                 unitId: o,
                 keycode: vt.ESC
               }), !0;
@@ -436,20 +436,20 @@ let Fe = class extends ye {
       default:
         throw new Error("[DataValidationDropdownManagerService]: unknown type!");
     }
-    if (h = this._cellDropdownManagerService.showDropdown({
-      ...m,
+    if (g = this._cellDropdownManagerService.showDropdown({
+      ...f,
       onHide: () => {
         this._activeDropdown = null, this._activeDropdown$.next(null);
       }
-    }), !h)
+    }), !g)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
-    const p = new Lr();
-    p.add(h), p.add({
+    const h = new Lr();
+    h.add(g), h.add({
       dispose: () => {
-        var v, I;
-        (I = (v = this._activeDropdown) == null ? void 0 : v.onHide) == null || I.call(v);
+        var p, I;
+        (I = (p = this._activeDropdown) == null ? void 0 : p.onHide) == null || I.call(p);
       }
-    }), this._currentPopup = p;
+    }), this._currentPopup = h;
   }
   hideDropdown() {
     this._activeDropdown && (this._currentPopup && this._currentPopup.dispose(), this._currentPopup = null, this._activeDropdown = null, this._activeDropdown$.next(null));
@@ -482,32 +482,32 @@ let Fe = class extends ye {
     });
   }
 };
-Fe = Ui([
-  pe(0, ce),
-  pe(1, M(Me)),
-  pe(2, dr),
-  pe(3, M(ie)),
-  pe(4, M(Gn)),
-  pe(5, M(Si)),
-  pe(6, M(ie)),
-  pe(7, te),
-  pe(8, pr),
-  pe(9, M(be)),
-  pe(10, ln)
-], Fe);
-const Mt = "DataValidationPanel", We = {
+Ue = Ui([
+  he(0, de),
+  he(1, E(Me)),
+  he(2, dr),
+  he(3, E(ie)),
+  he(4, E(Gn)),
+  he(5, E(Si)),
+  he(6, E(ie)),
+  he(7, ee),
+  he(8, gr),
+  he(9, E(be)),
+  he(10, dn)
+], Ue);
+const Mt = "DataValidationPanel", Be = {
   id: "data-validation.operation.open-validation-panel",
   type: rt.OPERATION,
   handler(e, t) {
     if (!t)
       return !1;
-    const { ruleId: r, isAdd: n } = t, i = e.get(Se), o = e.get(pn), a = e.get(ce), l = e.get(lr), s = qn(a);
+    const { ruleId: r, isAdd: n } = t, i = e.get(me), o = e.get(pn), a = e.get(de), l = e.get(lr), s = qn(a);
     if (!s) return !1;
-    const { unitId: d, subUnitId: u } = s, h = r ? o.getRuleById(d, u, r) : void 0;
-    i.open(), i.setActiveRule(h && {
+    const { unitId: d, subUnitId: u } = s, g = r ? o.getRuleById(d, u, r) : void 0;
+    i.open(), i.setActiveRule(g && {
       unitId: d,
       subUnitId: u,
-      rule: h
+      rule: g
     });
     const c = l.open({
       id: Mt,
@@ -518,18 +518,18 @@ const Mt = "DataValidationPanel", We = {
     });
     return i.setCloseDisposable(c), !0;
   }
-}, Sn = {
+}, Cn = {
   id: "data-validation.operation.close-validation-panel",
   type: rt.OPERATION,
   handler(e) {
-    return e.get(Se).close(), !0;
+    return e.get(me).close(), !0;
   }
 }, mr = {
   id: "data-validation.operation.toggle-validation-panel",
   type: rt.OPERATION,
   handler(e) {
-    const t = e.get(te), r = e.get(Se);
-    return r.open(), r.isOpen ? t.executeCommand(Sn.id) : t.executeCommand(We.id), !0;
+    const t = e.get(ee), r = e.get(me);
+    return r.open(), r.isOpen ? t.executeCommand(Cn.id) : t.executeCommand(Be.id), !0;
   }
 }, Lt = {
   type: rt.OPERATION,
@@ -537,7 +537,7 @@ const Mt = "DataValidationPanel", We = {
   handler(e, t) {
     if (!t)
       return !1;
-    const r = e.get(Fe), { unitId: n, subUnitId: i, row: o, column: a } = t, l = r.activeDropdown, s = l == null ? void 0 : l.location;
+    const r = e.get(Ue), { unitId: n, subUnitId: i, row: o, column: a } = t, l = r.activeDropdown, s = l == null ? void 0 : l.location;
     return s && s.unitId === n && s.subUnitId === i && s.row === o && s.col === a || r.showDataValidationDropdown(
       n,
       i,
@@ -549,20 +549,20 @@ const Mt = "DataValidationPanel", We = {
   type: rt.OPERATION,
   id: "sheet.operation.hide-data-validation-dropdown",
   handler(e, t) {
-    return t ? (e.get(Fe).hideDropdown(), !0) : !1;
+    return t ? (e.get(Ue).hideDropdown(), !0) : !1;
   }
 }, kt = {
   type: rt.COMMAND,
   id: "data-validation.command.addRuleAndOpen",
   handler(e) {
-    const t = e.get(ce), r = qn(t);
+    const t = e.get(de), r = qn(t);
     if (!r) return !1;
-    const { workbook: n, worksheet: i } = r, o = tr(e), a = e.get(te), l = n.getUnitId(), s = i.getSheetId(), d = {
+    const { workbook: n, worksheet: i } = r, o = tr(e), a = e.get(ee), l = n.getUnitId(), s = i.getSheetId(), d = {
       rule: o,
       unitId: l,
       subUnitId: s
     };
-    return a.syncExecuteCommand(un.id, d) ? (a.syncExecuteCommand(We.id, {
+    return a.syncExecuteCommand(hn.id, d) ? (a.syncExecuteCommand(Be.id, {
       ruleId: o.uid,
       isAdd: !0
     }), !0) : !1;
@@ -572,7 +572,7 @@ var xi = Object.getOwnPropertyDescriptor, Bi = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? xi(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, je = (e, t) => (r, n) => t(r, n, e);
+}, $e = (e, t) => (r, n) => t(r, n, e);
 const Ee = "SHEET_DATA_VALIDATION_ALERT";
 let ht = class extends ye {
   constructor(e, t, r, n, i, o) {
@@ -625,12 +625,12 @@ let ht = class extends ye {
   }
 };
 ht = Bi([
-  je(0, M(Ci)),
-  je(1, M(wi)),
-  je(2, ce),
-  je(3, M(ue)),
-  je(4, dr),
-  je(5, M(ie))
+  $e(0, E(Ci)),
+  $e(1, E(wi)),
+  $e(2, de),
+  $e(3, E(ce)),
+  $e(4, dr),
+  $e(5, E(ie))
 ], ht);
 var Wi = Object.getOwnPropertyDescriptor, Hi = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Wi(t, r) : t, o = e.length - 1, a; o >= 0; o--)
@@ -644,48 +644,48 @@ let Je = class extends ye {
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const e = () => ({ redos: [], undos: [] }), t = (n, i) => {
-      const { source: o, target: a, unitId: l, subUnitId: s } = n, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = nn([o, a]), [h, c] = u.ranges, { mapFunc: m } = u, p = {
-        row: h.startRow,
-        col: h.startColumn
-      }, b = yi(h, c), y = new It(), g = /* @__PURE__ */ new Set();
-      b.forEach((_) => {
-        const R = _.repeatStartCell, L = _.relativeRange, N = {
-          startRow: p.row,
-          startColumn: p.col,
-          endColumn: p.col,
-          endRow: p.row
-        }, E = {
+      const { source: o, target: a, unitId: l, subUnitId: s } = n, d = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = rn([o, a]), [g, c] = u.ranges, { mapFunc: f } = u, h = {
+        row: g.startRow,
+        col: g.startColumn
+      }, M = yi(g, c), y = new It(), w = /* @__PURE__ */ new Set();
+      M.forEach((v) => {
+        const R = v.repeatStartCell, A = v.relativeRange, N = {
+          startRow: h.row,
+          startColumn: h.col,
+          endColumn: h.col,
+          endRow: h.row
+        }, O = {
           startRow: R.row,
           startColumn: R.col,
           endColumn: R.col,
           endRow: R.row
         };
-        Nr.foreach(L, (T, O) => {
-          const P = Rt.getPositionRange(
+        Nr.foreach(A, (L, D) => {
+          const T = Rt.getPositionRange(
             {
-              startRow: T,
-              startColumn: O,
-              endColumn: O,
-              endRow: T
+              startRow: L,
+              startColumn: D,
+              endColumn: D,
+              endRow: L
             },
             N
-          ), { row: k, col: H } = m(P.startRow, P.startColumn), B = this._sheetDataValidationModel.getRuleIdByLocation(l, s, k, H) || "", J = Rt.getPositionRange(
+          ), { row: k, col: B } = f(T.startRow, T.startColumn), z = this._sheetDataValidationModel.getRuleIdByLocation(l, s, k, B) || "", te = Rt.getPositionRange(
             {
-              startRow: T,
-              startColumn: O,
-              endColumn: O,
-              endRow: T
+              startRow: L,
+              startColumn: D,
+              endColumn: D,
+              endRow: L
             },
-            E
-          ), { row: ne, col: oe } = m(J.startRow, J.startColumn);
-          y.setValue(ne, oe, B), g.add(B);
+            O
+          ), { row: W, col: ne } = f(te.startRow, te.startColumn);
+          y.setValue(W, ne, z), w.add(z);
         });
       });
-      const C = Array.from(g).map((_) => ({ id: _, ranges: zt(y, (R) => R === _) }));
+      const C = Array.from(w).map((v) => ({ id: v, ranges: Gt(y, (R) => R === v) }));
       d.addRangeRules(C);
-      const v = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: I, undoMutations: w } = en(l, s, v, this._injector, "patched", i === ot.ONLY_FORMAT);
+      const p = d.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: I, undoMutations: _ } = tn(l, s, p, this._injector, "patched", i === ot.ONLY_FORMAT);
       return {
-        undos: w,
+        undos: _,
         redos: I
       };
     }, r = {
@@ -710,8 +710,8 @@ let Je = class extends ye {
 };
 Je = Hi([
   Bt(0, Ri),
-  Bt(1, M(ie)),
-  Bt(2, M(be))
+  Bt(1, E(ie)),
+  Bt(2, E(be))
 ], Je);
 var $i = Object.getOwnPropertyDescriptor, ji = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? $i(t, r) : t, o = e.length - 1, a; o >= 0; o--)
@@ -729,7 +729,7 @@ let Qe = class extends ye {
       id: nr,
       onBeforeCopy: (t, r, n) => this._collect(t, r, n),
       onPasteCells: (t, r, n, i) => {
-        const { copyType: o = Pn.COPY, pasteType: a } = i, { range: l } = t || {}, { range: s, unitId: d, subUnitId: u } = r;
+        const { copyType: o = An.COPY, pasteType: a } = i, { range: l } = t || {}, { range: s, unitId: d, subUnitId: u } = r;
         return this._generateMutations(s, { copyType: o, pasteType: a, copyRange: l, unitId: d, subUnitId: u });
       }
     });
@@ -746,9 +746,9 @@ let Qe = class extends ye {
       return;
     const { rows: a, cols: l } = o;
     a.forEach((s, d) => {
-      l.forEach((u, h) => {
+      l.forEach((u, g) => {
         const c = this._sheetDataValidationModel.getRuleIdByLocation(t, r, s, u);
-        i.setValue(d, h, c != null ? c : "");
+        i.setValue(d, g, c != null ? c : "");
       });
     });
   }
@@ -756,7 +756,7 @@ let Qe = class extends ye {
   _generateMutations(t, r) {
     if (!this._copyInfo)
       return { redos: [], undos: [] };
-    if (r.copyType === Pn.CUT)
+    if (r.copyType === An.CUT)
       return this._copyInfo = null, { redos: [], undos: [] };
     if (!this._copyInfo || !this._copyInfo.matrix.getSizeOf() || !r.copyRange)
       return { redos: [], undos: [] };
@@ -769,58 +769,58 @@ let Qe = class extends ye {
       return { redos: [], undos: [] };
     const { unitId: i, subUnitId: o } = this._copyInfo;
     if (r.unitId !== i || o !== r.subUnitId) {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(r.unitId, r.subUnitId).clone(), l = new It(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = nn([r.copyRange, t]), c = An(d, u, !0), m = /* @__PURE__ */ new Map();
-      c.forEach(({ startRange: g }) => {
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(r.unitId, r.subUnitId).clone(), l = new It(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: g } = rn([r.copyRange, t]), c = Ln(d, u, !0), f = /* @__PURE__ */ new Map();
+      c.forEach(({ startRange: w }) => {
         var C;
-        (C = this._copyInfo) == null || C.matrix.forValue((v, I, w) => {
-          const _ = Rt.getPositionRange(
+        (C = this._copyInfo) == null || C.matrix.forValue((p, I, _) => {
+          const v = Rt.getPositionRange(
             {
-              startRow: v,
-              endRow: v,
+              startRow: p,
+              endRow: p,
               startColumn: I,
               endColumn: I
             },
-            g
-          ), R = `${o}-${w}`, L = this._sheetDataValidationModel.getRuleById(i, o, w);
-          !this._sheetDataValidationModel.getRuleById(r.unitId, r.subUnitId, R) && L && m.set(R, { ...L, uid: R });
-          const { row: N, col: E } = h(_.startRow, _.startColumn);
-          s.add(R), l.setValue(N, E, R);
+            w
+          ), R = `${o}-${_}`, A = this._sheetDataValidationModel.getRuleById(i, o, _);
+          !this._sheetDataValidationModel.getRuleById(r.unitId, r.subUnitId, R) && A && f.set(R, { ...A, uid: R });
+          const { row: N, col: O } = g(v.startRow, v.startColumn);
+          s.add(R), l.setValue(N, O, R);
         });
       });
-      const p = Array.from(s).map((g) => ({ id: g, ranges: zt(l, (C) => C === g) }));
-      a.addRangeRules(p);
-      const { redoMutations: b, undoMutations: y } = en(
+      const h = Array.from(s).map((w) => ({ id: w, ranges: Gt(l, (C) => C === w) }));
+      a.addRangeRules(h);
+      const { redoMutations: M, undoMutations: y } = tn(
         r.unitId,
         r.subUnitId,
-        a.diffWithAddition(this._sheetDataValidationModel.getRules(r.unitId, r.subUnitId), m.values()),
+        a.diffWithAddition(this._sheetDataValidationModel.getRules(r.unitId, r.subUnitId), f.values()),
         this._injector,
         "patched",
         !1
       );
       return {
-        redos: b,
+        redos: M,
         undos: y
       };
     } else {
-      const a = this._sheetDataValidationModel.getRuleObjectMatrix(i, o).clone(), l = new It(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: h } = nn([r.copyRange, t]);
-      An(d, u, !0).forEach(({ startRange: y }) => {
-        var g;
-        (g = this._copyInfo) == null || g.matrix.forValue((C, v, I) => {
-          const w = Rt.getPositionRange(
+      const a = this._sheetDataValidationModel.getRuleObjectMatrix(i, o).clone(), l = new It(), s = /* @__PURE__ */ new Set(), { ranges: [d, u], mapFunc: g } = rn([r.copyRange, t]);
+      Ln(d, u, !0).forEach(({ startRange: y }) => {
+        var w;
+        (w = this._copyInfo) == null || w.matrix.forValue((C, p, I) => {
+          const _ = Rt.getPositionRange(
             {
               startRow: C,
               endRow: C,
-              startColumn: v,
-              endColumn: v
+              startColumn: p,
+              endColumn: p
             },
             y
-          ), { row: _, col: R } = h(w.startRow, w.startColumn);
-          l.setValue(_, R, I), s.add(I);
+          ), { row: v, col: R } = g(_.startRow, _.startColumn);
+          l.setValue(v, R, I), s.add(I);
         });
       });
-      const m = Array.from(s).map((y) => ({ id: y, ranges: zt(l, (g) => g === y) }));
-      a.addRangeRules(m);
-      const { redoMutations: p, undoMutations: b } = en(
+      const f = Array.from(s).map((y) => ({ id: y, ranges: Gt(l, (w) => w === y) }));
+      a.addRangeRules(f);
+      const { redoMutations: h, undoMutations: M } = tn(
         i,
         o,
         a.diff(this._sheetDataValidationModel.getRules(i, o)),
@@ -829,16 +829,16 @@ let Qe = class extends ye {
         !1
       );
       return {
-        redos: p,
-        undos: b
+        redos: h,
+        undos: M
       };
     }
   }
 };
 Qe = ji([
   Wt(0, bi),
-  Wt(1, M(ie)),
-  Wt(2, M(be))
+  Wt(1, E(ie)),
+  Wt(2, E(be))
 ], Qe);
 var Yi = Object.getOwnPropertyDescriptor, Xi = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Yi(t, r) : t, o = e.length - 1, a; o >= 0; o--)
@@ -852,55 +852,55 @@ let et = class extends ye {
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((e) => {
-        e.id === un.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
-          workbookTypes: [Qt],
-          rangeTypes: [Jt],
-          worksheetTypes: [Gt, qt]
+        e.id === hn.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
+          workbookTypes: [en],
+          rangeTypes: [Qt],
+          worksheetTypes: [qt, Jt]
         }) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr"))), e.id === rr.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
-          workbookTypes: [Qt],
-          rangeTypes: [Jt],
-          worksheetTypes: [Gt, qt]
+          workbookTypes: [en],
+          rangeTypes: [Qt],
+          worksheetTypes: [qt, Jt]
         }, e.params.ranges) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr")));
       })
     );
   }
 };
 et = Xi([
-  Ht(0, M(ue)),
-  Ht(1, te),
-  Ht(2, M(qr))
+  Ht(0, E(ce)),
+  Ht(1, ee),
+  Ht(2, E(qr))
 ], et);
 const Sr = "sheet.menu.data-validation";
 function Zi(e) {
   return {
     id: Sr,
-    type: gn.SUBITEMS,
+    type: vn.SUBITEMS,
     icon: "DataValidationIcon",
     tooltip: "dataValidation.title",
     hidden$: hi(e, X.UNIVER_SHEET),
-    disabled$: Mi(e, { workbookTypes: [Qt], worksheetTypes: [qt, Gt], rangeTypes: [Jt] })
+    disabled$: Mi(e, { workbookTypes: [en], worksheetTypes: [Jt, qt], rangeTypes: [Qt] })
   };
 }
 function Ki(e) {
   return {
-    id: We.id,
+    id: Be.id,
     title: "dataValidation.panel.title",
-    type: gn.BUTTON
+    type: vn.BUTTON
   };
 }
 function zi(e) {
   return {
     id: kt.id,
     title: "dataValidation.panel.add",
-    type: gn.BUTTON
+    type: vn.BUTTON
   };
 }
 const Gi = {
-  [pi.RULES]: {
+  [gi.RULES]: {
     [Sr]: {
       order: 0,
       menuItemFactory: Zi,
-      [We.id]: {
+      [Be.id]: {
         order: 0,
         menuItemFactory: Ki
       },
@@ -922,7 +922,7 @@ const wr = {
     color: "#fe4b4b"
   }
 };
-let tt = class extends dn {
+let tt = class extends cn {
   constructor(e, t, r, n, i, o, a, l, s, d, u) {
     super(), this._commandService = e, this._menuManagerService = t, this._renderManagerService = r, this._univerInstanceService = n, this._autoHeightController = i, this._dropdownManagerService = o, this._sheetDataValidationModel = a, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = d, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
@@ -949,7 +949,7 @@ let tt = class extends dn {
           return;
         const u = l.getActiveSheet();
         if (!u) return;
-        const h = this._dropdownManagerService.activeDropdown, c = h == null ? void 0 : h.location;
+        const g = this._dropdownManagerService.activeDropdown, c = g == null ? void 0 : g.location;
         if (c && c.unitId === n && c.subUnitId === i && c.row === o && c.col === a)
           return;
         this._dropdownManagerService.showDropdown(
@@ -980,52 +980,52 @@ let tt = class extends dn {
           priority: Qn.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (e, t, r) => {
-            var g, C, v, I, w;
+            var w, C, p, I, _;
             const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
             if (!d)
               return r(e);
             const u = this._sheetDataValidationModel.getRuleById(o, a, d);
             if (!u)
               return r(e);
-            const h = (g = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? g : Ze.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = t.rawData;
-            let p;
-            const b = {
+            const g = (w = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? w : Ze.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), f = t.rawData;
+            let h;
+            const M = {
               get value() {
-                var _;
-                return p !== void 0 || (p = (_ = re(m)) != null ? _ : null), p;
+                var v;
+                return h !== void 0 || (h = (v = re(f)) != null ? v : null), h;
               }
             }, y = {
               get value() {
-                var _;
-                return `${(_ = b.value) != null ? _ : ""}`;
+                var v;
+                return `${(v = M.value) != null ? v : ""}`;
               }
             };
             return (!e || e === t.rawData) && (e = { ...t.rawData }), e.markers = {
               ...e == null ? void 0 : e.markers,
-              ...h === Ze.INVALID ? wr : null
+              ...g === Ze.INVALID ? wr : null
             }, e.customRender = [
               ...(C = e == null ? void 0 : e.customRender) != null ? C : [],
               ...c != null && c.canvasRender ? [c.canvasRender] : []
             ], e.fontRenderExtension = {
               ...e == null ? void 0 : e.fontRenderExtension,
-              isSkip: ((v = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : v.isSkip) || ((I = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : I.call(c, u, b.value, t))
+              isSkip: ((p = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : p.isSkip) || ((I = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : I.call(c, u, M.value, t))
             }, e.interceptorStyle = {
               ...e == null ? void 0 : e.interceptorStyle,
               ...c == null ? void 0 : c.getExtraStyle(u, y.value, {
                 get style() {
-                  const _ = l.getStyles();
-                  return (typeof (e == null ? void 0 : e.s) == "string" ? _.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
+                  const v = l.getStyles();
+                  return (typeof (e == null ? void 0 : e.s) == "string" ? v.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                 }
               }, n, i)
             }, e.interceptorAutoHeight = () => {
-              var N, E, T, O, P, k;
-              const _ = (E = (N = this._renderManagerService.getRenderById(o)) == null ? void 0 : N.with(dt).getSkeletonParam(a)) == null ? void 0 : E.skeleton;
-              if (!_)
+              var N, O, L, D, T, k;
+              const v = (O = (N = this._renderManagerService.getRenderById(o)) == null ? void 0 : N.with(dt).getSkeletonParam(a)) == null ? void 0 : O.skeleton;
+              if (!v)
                 return;
-              const R = _.worksheet.getMergedCell(n, i), L = {
+              const R = v.worksheet.getMergedCell(n, i), A = {
                 data: e,
-                style: _.getStyles().getStyleByCell(e),
-                primaryWithCoord: _.getCellWithCoordByIndex((T = R == null ? void 0 : R.startRow) != null ? T : n, (O = R == null ? void 0 : R.startColumn) != null ? O : i),
+                style: v.getStyles().getStyleByCell(e),
+                primaryWithCoord: v.getCellWithCoordByIndex((L = R == null ? void 0 : R.startRow) != null ? L : n, (D = R == null ? void 0 : R.startColumn) != null ? D : i),
                 unitId: o,
                 subUnitId: a,
                 row: n,
@@ -1033,16 +1033,16 @@ let tt = class extends dn {
                 workbook: l,
                 worksheet: s
               };
-              return (k = (P = c == null ? void 0 : c.canvasRender) == null ? void 0 : P.calcCellAutoHeight) == null ? void 0 : k.call(P, L);
+              return (k = (T = c == null ? void 0 : c.canvasRender) == null ? void 0 : T.calcCellAutoHeight) == null ? void 0 : k.call(T, A);
             }, e.interceptorAutoWidth = () => {
-              var N, E, T, O, P, k;
-              const _ = (E = (N = this._renderManagerService.getRenderById(o)) == null ? void 0 : N.with(dt).getSkeletonParam(a)) == null ? void 0 : E.skeleton;
-              if (!_)
+              var N, O, L, D, T, k;
+              const v = (O = (N = this._renderManagerService.getRenderById(o)) == null ? void 0 : N.with(dt).getSkeletonParam(a)) == null ? void 0 : O.skeleton;
+              if (!v)
                 return;
-              const R = _.worksheet.getMergedCell(n, i), L = {
+              const R = v.worksheet.getMergedCell(n, i), A = {
                 data: e,
-                style: _.getStyles().getStyleByCell(e),
-                primaryWithCoord: _.getCellWithCoordByIndex((T = R == null ? void 0 : R.startRow) != null ? T : n, (O = R == null ? void 0 : R.startColumn) != null ? O : i),
+                style: v.getStyles().getStyleByCell(e),
+                primaryWithCoord: v.getCellWithCoordByIndex((L = R == null ? void 0 : R.startRow) != null ? L : n, (D = R == null ? void 0 : R.startColumn) != null ? D : i),
                 unitId: o,
                 subUnitId: a,
                 row: n,
@@ -1050,8 +1050,8 @@ let tt = class extends dn {
                 workbook: l,
                 worksheet: s
               };
-              return (k = (P = c == null ? void 0 : c.canvasRender) == null ? void 0 : P.calcCellAutoWidth) == null ? void 0 : k.call(P, L);
-            }, e.coverable = ((w = e == null ? void 0 : e.coverable) != null ? w : !0) && !(u.type === j.LIST || u.type === j.LIST_MULTIPLE), r(e);
+              return (k = (T = c == null ? void 0 : c.canvasRender) == null ? void 0 : T.calcCellAutoWidth) == null ? void 0 : k.call(T, A);
+            }, e.coverable = ((_ = e == null ? void 0 : e.coverable) != null ? _ : !0) && !(u.type === j.LIST || u.type === j.LIST_MULTIPLE), r(e);
           }
         }
       )
@@ -1061,7 +1061,7 @@ let tt = class extends dn {
     this._sheetDataValidationModel.ruleChange$.pipe(
       // patched data-validation change don't need to re-calc row height
       // re-calc of row height will be triggered precisely by the origin command
-      fn((e) => e.source === "command"),
+      mn((e) => e.source === "command"),
       hr(100)
     ).subscribe((e) => {
       if (e.length === 0)
@@ -1078,19 +1078,19 @@ let tt = class extends dn {
   }
 };
 tt = Cr([
-  K(0, te),
-  K(1, gi),
-  K(2, xe),
-  K(3, ce),
-  K(4, M(gr)),
-  K(5, M(Fe)),
-  K(6, M(ie)),
-  K(7, M(Me)),
-  K(8, M(cn)),
-  K(9, M(ir)),
-  K(10, Ur(pr))
+  K(0, ee),
+  K(1, pi),
+  K(2, Fe),
+  K(3, de),
+  K(4, E(pr)),
+  K(5, E(Ue)),
+  K(6, E(ie)),
+  K(7, E(Me)),
+  K(8, E(un)),
+  K(9, E(ir)),
+  K(10, Ur(gr))
 ], tt);
-let Nn = class extends dn {
+let Un = class extends cn {
   constructor(e, t, r, n, i, o, a) {
     super(), this._commandService = e, this._renderManagerService = t, this._autoHeightController = r, this._dataValidatorRegistryService = n, this._sheetInterceptorService = i, this._sheetDataValidationModel = o, this._dataValidationCacheService = a, this._initViewModelIntercept(), this._initAutoHeight();
   }
@@ -1105,40 +1105,40 @@ let Nn = class extends dn {
           priority: Qn.DATA_VALIDATION,
           // eslint-disable-next-line complexity, max-lines-per-function
           handler: (e, t, r) => {
-            var y, g, C, v, I;
+            var y, w, C, p, I;
             const { row: n, col: i, unitId: o, subUnitId: a, workbook: l, worksheet: s } = t, d = this._sheetDataValidationModel.getRuleIdByLocation(o, a, n, i);
             if (!d)
               return r(e);
             const u = this._sheetDataValidationModel.getRuleById(o, a, d);
             if (!u)
               return r(e);
-            const h = (y = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? y : Ze.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), m = s.getCellRaw(n, i), p = re(m), b = `${p != null ? p : ""}`;
+            const g = (y = this._dataValidationCacheService.getValue(o, a, n, i)) != null ? y : Ze.VALID, c = this._dataValidatorRegistryService.getValidatorItem(u.type), f = s.getCellRaw(n, i), h = re(f), M = `${h != null ? h : ""}`;
             return (!e || e === t.rawData) && (e = { ...t.rawData }), e.markers = {
               ...e == null ? void 0 : e.markers,
-              ...h === Ze.INVALID ? wr : null
+              ...g === Ze.INVALID ? wr : null
             }, e.customRender = [
-              ...(g = e == null ? void 0 : e.customRender) != null ? g : [],
+              ...(w = e == null ? void 0 : e.customRender) != null ? w : [],
               ...c != null && c.canvasRender ? [c.canvasRender] : []
             ], e.fontRenderExtension = {
               ...e == null ? void 0 : e.fontRenderExtension,
-              isSkip: ((C = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : C.isSkip) || ((v = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : v.call(c, u, p, t))
+              isSkip: ((C = e == null ? void 0 : e.fontRenderExtension) == null ? void 0 : C.isSkip) || ((p = c == null ? void 0 : c.skipDefaultFontRender) == null ? void 0 : p.call(c, u, h, t))
             }, e.interceptorStyle = {
               ...e == null ? void 0 : e.interceptorStyle,
-              ...c == null ? void 0 : c.getExtraStyle(u, b, {
+              ...c == null ? void 0 : c.getExtraStyle(u, M, {
                 get style() {
-                  const w = l.getStyles();
-                  return (typeof (e == null ? void 0 : e.s) == "string" ? w.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
+                  const _ = l.getStyles();
+                  return (typeof (e == null ? void 0 : e.s) == "string" ? _.get(e == null ? void 0 : e.s) : e == null ? void 0 : e.s) || {};
                 }
               }, n, i)
             }, e.interceptorAutoHeight = () => {
-              var L, N, E, T, O, P;
-              const w = (N = (L = this._renderManagerService.getRenderById(o)) == null ? void 0 : L.with(dt).getSkeletonParam(a)) == null ? void 0 : N.skeleton;
-              if (!w)
+              var A, N, O, L, D, T;
+              const _ = (N = (A = this._renderManagerService.getRenderById(o)) == null ? void 0 : A.with(dt).getSkeletonParam(a)) == null ? void 0 : N.skeleton;
+              if (!_)
                 return;
-              const _ = w.worksheet.getMergedCell(n, i), R = {
+              const v = _.worksheet.getMergedCell(n, i), R = {
                 data: e,
-                style: w.getStyles().getStyleByCell(e),
-                primaryWithCoord: w.getCellWithCoordByIndex((E = _ == null ? void 0 : _.startRow) != null ? E : n, (T = _ == null ? void 0 : _.startColumn) != null ? T : i),
+                style: _.getStyles().getStyleByCell(e),
+                primaryWithCoord: _.getCellWithCoordByIndex((O = v == null ? void 0 : v.startRow) != null ? O : n, (L = v == null ? void 0 : v.startColumn) != null ? L : i),
                 unitId: o,
                 subUnitId: a,
                 row: n,
@@ -1146,16 +1146,16 @@ let Nn = class extends dn {
                 workbook: l,
                 worksheet: s
               };
-              return (P = (O = c == null ? void 0 : c.canvasRender) == null ? void 0 : O.calcCellAutoHeight) == null ? void 0 : P.call(O, R);
+              return (T = (D = c == null ? void 0 : c.canvasRender) == null ? void 0 : D.calcCellAutoHeight) == null ? void 0 : T.call(D, R);
             }, e.interceptorAutoWidth = () => {
-              var L, N, E, T, O, P;
-              const w = (N = (L = this._renderManagerService.getRenderById(o)) == null ? void 0 : L.with(dt).getSkeletonParam(a)) == null ? void 0 : N.skeleton;
-              if (!w)
+              var A, N, O, L, D, T;
+              const _ = (N = (A = this._renderManagerService.getRenderById(o)) == null ? void 0 : A.with(dt).getSkeletonParam(a)) == null ? void 0 : N.skeleton;
+              if (!_)
                 return;
-              const _ = w.worksheet.getMergedCell(n, i), R = {
+              const v = _.worksheet.getMergedCell(n, i), R = {
                 data: e,
-                style: w.getStyles().getStyleByCell(e),
-                primaryWithCoord: w.getCellWithCoordByIndex((E = _ == null ? void 0 : _.startRow) != null ? E : n, (T = _ == null ? void 0 : _.startColumn) != null ? T : i),
+                style: _.getStyles().getStyleByCell(e),
+                primaryWithCoord: _.getCellWithCoordByIndex((O = v == null ? void 0 : v.startRow) != null ? O : n, (L = v == null ? void 0 : v.startColumn) != null ? L : i),
                 unitId: o,
                 subUnitId: a,
                 row: n,
@@ -1163,7 +1163,7 @@ let Nn = class extends dn {
                 workbook: l,
                 worksheet: s
               };
-              return (P = (O = c == null ? void 0 : c.canvasRender) == null ? void 0 : O.calcCellAutoWidth) == null ? void 0 : P.call(O, R);
+              return (T = (D = c == null ? void 0 : c.canvasRender) == null ? void 0 : D.calcCellAutoWidth) == null ? void 0 : T.call(D, R);
             }, e.coverable = ((I = e == null ? void 0 : e.coverable) != null ? I : !0) && !(u.type === j.LIST || u.type === j.LIST_MULTIPLE), r(e);
           }
         }
@@ -1172,7 +1172,7 @@ let Nn = class extends dn {
   }
   _initAutoHeight() {
     this._sheetDataValidationModel.ruleChange$.pipe(
-      fn((e) => e.source === "command"),
+      mn((e) => e.source === "command"),
       hr(16)
     ).subscribe((e) => {
       const t = [];
@@ -1186,20 +1186,20 @@ let Nn = class extends dn {
     });
   }
 };
-Nn = Cr([
-  K(0, te),
-  K(1, xe),
-  K(2, M(gr)),
-  K(3, M(Me)),
-  K(4, M(cn)),
-  K(5, M(ie)),
-  K(6, M(ir))
-], Nn);
+Un = Cr([
+  K(0, ee),
+  K(1, Fe),
+  K(2, E(pr)),
+  K(3, E(Me)),
+  K(4, E(un)),
+  K(5, E(ie)),
+  K(6, E(ir))
+], Un);
 var Ji = Object.getOwnPropertyDescriptor, Qi = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Ji(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Un = (e, t) => (r, n) => t(r, n, e);
+}, Fn = (e, t) => (r, n) => t(r, n, e);
 let Et = class extends ye {
   constructor(e, t, r) {
     super(), this._context = e, this._sheetDataValidationModel = t, this._sheetSkeletonManagerService = r, this._initSkeletonChange();
@@ -1221,17 +1221,17 @@ let Et = class extends ye {
   }
 };
 Et = Qi([
-  Un(1, M(ie)),
-  Un(2, M(dt))
+  Fn(1, E(ie)),
+  Fn(2, E(dt))
 ], Et);
-var le = function() {
-  return le = Object.assign || function(e) {
+var se = function() {
+  return se = Object.assign || function(e) {
     for (var t, r = 1, n = arguments.length; r < n; r++) {
       t = arguments[r];
       for (var i in t) Object.prototype.hasOwnProperty.call(t, i) && (e[i] = t[i]);
     }
     return e;
-  }, le.apply(this, arguments);
+  }, se.apply(this, arguments);
 }, eo = function(e, t) {
   var r = {};
   for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && t.indexOf(n) < 0 && (r[n] = e[n]);
@@ -1239,17 +1239,17 @@ var le = function() {
     for (var i = 0, n = Object.getOwnPropertySymbols(e); i < n.length; i++)
       t.indexOf(n[i]) < 0 && Object.prototype.propertyIsEnumerable.call(e, n[i]) && (r[n[i]] = e[n[i]]);
   return r;
-}, He = Be(function(e, t) {
-  var r = e.icon, n = e.id, i = e.className, o = e.extend, a = eo(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), s = pt("_".concat(ro()));
-  return Ir(r, "".concat(n), { defIds: r.defIds, idSuffix: s.current }, le({ ref: t, className: l }, a), o);
+}, We = xe(function(e, t) {
+  var r = e.icon, n = e.id, i = e.className, o = e.extend, a = eo(e, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), s = gt("_".concat(ro()));
+  return Ir(r, "".concat(n), { defIds: r.defIds, idSuffix: s.current }, se({ ref: t, className: l }, a), o);
 });
 function Ir(e, t, r, n, i) {
-  return Ie(e.tag, le(le({ key: t }, to(e, r, i)), n), (no(e, r).children || []).map(function(o, a) {
+  return Ie(e.tag, se(se({ key: t }, to(e, r, i)), n), (no(e, r).children || []).map(function(o, a) {
     return Ir(o, "".concat(t, "-").concat(e.tag, "-").concat(a), r, void 0, i);
   }));
 }
 function to(e, t, r) {
-  var n = le({}, e.attrs);
+  var n = se({}, e.attrs);
   r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1), e.tag === "mask" && n.id && (n.id = n.id + t.idSuffix), Object.entries(n).forEach(function(o) {
     var a = o[0], l = o[1];
     a === "mask" && typeof l == "string" && (n[a] = l.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
@@ -1262,56 +1262,56 @@ function to(e, t, r) {
 }
 function no(e, t) {
   var r, n = t.defIds;
-  return !n || n.length === 0 ? e : e.tag === "defs" && (!((r = e.children) === null || r === void 0) && r.length) ? le(le({}, e), { children: e.children.map(function(i) {
-    return typeof i.attrs.id == "string" && n && n.includes(i.attrs.id) ? le(le({}, i), { attrs: le(le({}, i.attrs), { id: i.attrs.id + t.idSuffix }) }) : i;
+  return !n || n.length === 0 ? e : e.tag === "defs" && (!((r = e.children) === null || r === void 0) && r.length) ? se(se({}, e), { children: e.children.map(function(i) {
+    return typeof i.attrs.id == "string" && n && n.includes(i.attrs.id) ? se(se({}, i), { attrs: se(se({}, i.attrs), { id: i.attrs.id + t.idSuffix }) }) : i;
   }) }) : e;
 }
 function ro() {
   return Math.random().toString(36).substring(2, 8);
 }
-He.displayName = "UniverIcon";
-var io = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M1.4917 3.07803C1.4917 2.19437 2.20804 1.47803 3.0917 1.47803H5.6917C6.57536 1.47803 7.2917 2.19437 7.2917 3.07803V5.67803C7.2917 6.56168 6.57535 7.27803 5.6917 7.27803H3.0917C2.20804 7.27803 1.4917 6.56168 1.4917 5.67803V3.07803ZM3.0917 2.67803C2.87078 2.67803 2.6917 2.85711 2.6917 3.07803V5.67803C2.6917 5.89894 2.87079 6.07803 3.0917 6.07803H5.6917C5.91261 6.07803 6.0917 5.89894 6.0917 5.67803V3.07803C6.0917 2.85711 5.91261 2.67803 5.6917 2.67803H3.0917Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M14.6175 2.45279C14.8518 2.68711 14.8518 3.06701 14.6175 3.30132L11.6151 6.30365C11.3957 6.52307 11.0451 6.53897 10.8067 6.34031L8.80915 4.67566C8.55458 4.46352 8.52019 4.08518 8.73233 3.83062C8.94447 3.57605 9.32281 3.54166 9.57737 3.7538L11.154 5.06767L13.769 2.45278C14.0033 2.21847 14.3832 2.21848 14.6175 2.45279Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M14.1175 9.19746C14.3518 9.43178 14.3518 9.81168 14.1175 10.046L12.5418 11.6217L14.1175 13.1975C14.3518 13.4318 14.3518 13.8117 14.1175 14.046C13.8832 14.2803 13.5033 14.2803 13.269 14.046L11.6933 12.4703L10.1175 14.046C9.88321 14.2803 9.50331 14.2803 9.269 14.046C9.03468 13.8117 9.03468 13.4318 9.269 13.1975L10.8447 11.6217L9.269 10.046C9.03468 9.81168 9.03468 9.43178 9.269 9.19746C9.50331 8.96315 9.88321 8.96315 10.1175 9.19746L11.6933 10.7732L13.269 9.19746C13.5033 8.96315 13.8832 8.96315 14.1175 9.19746Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M3.0917 8.72168C2.20804 8.72168 1.4917 9.43802 1.4917 10.3217V12.9217C1.4917 13.8053 2.20804 14.5217 3.0917 14.5217H5.6917C6.57535 14.5217 7.2917 13.8053 7.2917 12.9217V10.3217C7.2917 9.43802 6.57536 8.72168 5.6917 8.72168H3.0917ZM2.6917 10.3217C2.6917 10.1008 2.87078 9.92168 3.0917 9.92168H5.6917C5.91261 9.92168 6.0917 10.1008 6.0917 10.3217V12.9217C6.0917 13.1426 5.91261 13.3217 5.6917 13.3217H3.0917C2.87079 13.3217 2.6917 13.1426 2.6917 12.9217V10.3217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Rr = Be(function(e, t) {
-  return Ie(He, Object.assign({}, e, {
+We.displayName = "UniverIcon";
+var io = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M1.4917 3.07803C1.4917 2.19437 2.20804 1.47803 3.0917 1.47803H5.6917C6.57536 1.47803 7.2917 2.19437 7.2917 3.07803V5.67803C7.2917 6.56168 6.57535 7.27803 5.6917 7.27803H3.0917C2.20804 7.27803 1.4917 6.56168 1.4917 5.67803V3.07803ZM3.0917 2.67803C2.87078 2.67803 2.6917 2.85711 2.6917 3.07803V5.67803C2.6917 5.89894 2.87079 6.07803 3.0917 6.07803H5.6917C5.91261 6.07803 6.0917 5.89894 6.0917 5.67803V3.07803C6.0917 2.85711 5.91261 2.67803 5.6917 2.67803H3.0917Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M14.6175 2.45279C14.8518 2.68711 14.8518 3.06701 14.6175 3.30132L11.6151 6.30365C11.3957 6.52307 11.0451 6.53897 10.8067 6.34031L8.80915 4.67566C8.55458 4.46352 8.52019 4.08518 8.73233 3.83062C8.94447 3.57605 9.32281 3.54166 9.57737 3.7538L11.154 5.06767L13.769 2.45278C14.0033 2.21847 14.3832 2.21848 14.6175 2.45279Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M14.1175 9.19746C14.3518 9.43178 14.3518 9.81168 14.1175 10.046L12.5418 11.6217L14.1175 13.1975C14.3518 13.4318 14.3518 13.8117 14.1175 14.046C13.8832 14.2803 13.5033 14.2803 13.269 14.046L11.6933 12.4703L10.1175 14.046C9.88321 14.2803 9.50331 14.2803 9.269 14.046C9.03468 13.8117 9.03468 13.4318 9.269 13.1975L10.8447 11.6217L9.269 10.046C9.03468 9.81168 9.03468 9.43178 9.269 9.19746C9.50331 8.96315 9.88321 8.96315 10.1175 9.19746L11.6933 10.7732L13.269 9.19746C13.5033 8.96315 13.8832 8.96315 14.1175 9.19746Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M3.0917 8.72168C2.20804 8.72168 1.4917 9.43802 1.4917 10.3217V12.9217C1.4917 13.8053 2.20804 14.5217 3.0917 14.5217H5.6917C6.57535 14.5217 7.2917 13.8053 7.2917 12.9217V10.3217C7.2917 9.43802 6.57536 8.72168 5.6917 8.72168H3.0917ZM2.6917 10.3217C2.6917 10.1008 2.87078 9.92168 3.0917 9.92168H5.6917C5.91261 9.92168 6.0917 10.1008 6.0917 10.3217V12.9217C6.0917 13.1426 5.91261 13.3217 5.6917 13.3217H3.0917C2.87079 13.3217 2.6917 13.1426 2.6917 12.9217V10.3217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Rr = xe(function(e, t) {
+  return Ie(We, Object.assign({}, e, {
     id: "data-validation-icon",
     ref: t,
     icon: io
   }));
 });
 Rr.displayName = "DataValidationIcon";
-var oo = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993 0.866699 5.9313 0.866699H10.069C10.4004 0.866699 10.669 1.13533 10.669 1.4667C10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443C14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928L9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171C10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778L9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539C9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263L6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539C5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778L6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Cn = Be(function(e, t) {
-  return Ie(He, Object.assign({}, e, {
+var oo = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993 0.866699 5.9313 0.866699H10.069C10.4004 0.866699 10.669 1.13533 10.669 1.4667C10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443C14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928L9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171C10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778L9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539C9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263L6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539C5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778L6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, wn = xe(function(e, t) {
+  return Ie(We, Object.assign({}, e, {
     id: "delete-icon",
     ref: t,
     icon: oo
   }));
 });
-Cn.displayName = "DeleteIcon";
-var ao = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z" } }] }, yr = Be(function(e, t) {
-  return Ie(He, Object.assign({}, e, {
+wn.displayName = "DeleteIcon";
+var ao = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z" } }] }, yr = xe(function(e, t) {
+  return Ie(We, Object.assign({}, e, {
     id: "increase-icon",
     ref: t,
     icon: ao
   }));
 });
 yr.displayName = "IncreaseIcon";
-var so = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M11.3536 6.14645C11.5488 6.34171 11.5488 6.65829 11.3536 6.85355L8.35355 9.85355C8.15829 10.0488 7.84171 10.0488 7.64645 9.85355L4.64645 6.85355C4.45118 6.65829 4.45118 6.34171 4.64645 6.14645C4.84171 5.95118 5.15829 5.95118 5.35355 6.14645L8 8.79289L10.6464 6.14645C10.8417 5.95118 11.1583 5.95118 11.3536 6.14645Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, wn = Be(function(e, t) {
-  return Ie(He, Object.assign({}, e, {
+var so = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M11.3536 6.14645C11.5488 6.34171 11.5488 6.65829 11.3536 6.85355L8.35355 9.85355C8.15829 10.0488 7.84171 10.0488 7.64645 9.85355L4.64645 6.85355C4.45118 6.65829 4.45118 6.34171 4.64645 6.14645C4.84171 5.95118 5.15829 5.95118 5.35355 6.14645L8 8.79289L10.6464 6.14645C10.8417 5.95118 11.1583 5.95118 11.3536 6.14645Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, In = xe(function(e, t) {
+  return Ie(We, Object.assign({}, e, {
     id: "more-down-icon",
     ref: t,
     icon: so
   }));
 });
-wn.displayName = "MoreDownIcon";
-var lo = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M4.64645 9.85355C4.45118 9.65829 4.45118 9.34171 4.64645 9.14645L7.64645 6.14645C7.84171 5.95118 8.15829 5.95118 8.35355 6.14645L11.3536 9.14645C11.5488 9.34171 11.5488 9.65829 11.3536 9.85355C11.1583 10.0488 10.8417 10.0488 10.6464 9.85355L8 7.20711L5.35355 9.85355C5.15829 10.0488 4.84171 10.0488 4.64645 9.85355Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, br = Be(function(e, t) {
-  return Ie(He, Object.assign({}, e, {
+In.displayName = "MoreDownIcon";
+var lo = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M4.64645 9.85355C4.45118 9.65829 4.45118 9.34171 4.64645 9.14645L7.64645 6.14645C7.84171 5.95118 8.15829 5.95118 8.35355 6.14645L11.3536 9.14645C11.5488 9.34171 11.5488 9.65829 11.3536 9.85355C11.1583 10.0488 10.8417 10.0488 10.6464 9.85355L8 7.20711L5.35355 9.85355C5.15829 10.0488 4.84171 10.0488 4.64645 9.85355Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, br = xe(function(e, t) {
+  return Ie(We, Object.assign({}, e, {
     id: "more-up-icon",
     ref: t,
     icon: lo
   }));
 });
 br.displayName = "MoreUpIcon";
-var co = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "mask", attrs: { id: "mask0_622_8", width: 16, height: 16, x: 0, y: 0, maskUnits: "userSpaceOnUse" }, children: [{ tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }] }, { tag: "g", attrs: { fill: "currentColor", mask: "url(#mask0_622_8)" }, children: [{ tag: "path", attrs: { d: "M6 5C6.55228 5 7 4.55228 7 4C7 3.44772 6.55228 3 6 3C5.44772 3 5 3.44772 5 4C5 4.55228 5.44772 5 6 5Z" } }, { tag: "path", attrs: { d: "M6 9C6.55228 9 7 8.55229 7 8C7 7.44772 6.55228 7 6 7C5.44772 7 5 7.44772 5 8C5 8.55229 5.44772 9 6 9Z" } }, { tag: "path", attrs: { d: "M7 12C7 12.5523 6.55228 13 6 13C5.44772 13 5 12.5523 5 12C5 11.4477 5.44772 11 6 11C6.55228 11 7 11.4477 7 12Z" } }, { tag: "path", attrs: { d: "M10 5C10.5523 5 11 4.55228 11 4C11 3.44772 10.5523 3 10 3C9.44771 3 9 3.44772 9 4C9 4.55228 9.44771 5 10 5Z" } }, { tag: "path", attrs: { d: "M11 8C11 8.55229 10.5523 9 10 9C9.44771 9 9 8.55229 9 8C9 7.44772 9.44771 7 10 7C10.5523 7 11 7.44772 11 8Z" } }, { tag: "path", attrs: { d: "M10 13C10.5523 13 11 12.5523 11 12C11 11.4477 10.5523 11 10 11C9.44771 11 9 11.4477 9 12C9 12.5523 9.44771 13 10 13Z" } }] }] }, Mr = Be(function(e, t) {
-  return Ie(He, Object.assign({}, e, {
+var co = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "mask", attrs: { id: "mask0_622_8", width: 16, height: 16, x: 0, y: 0, maskUnits: "userSpaceOnUse" }, children: [{ tag: "path", attrs: { fill: "#D9D9D9", d: "M0 0H16V16H0z" } }] }, { tag: "g", attrs: { fill: "currentColor", mask: "url(#mask0_622_8)" }, children: [{ tag: "path", attrs: { d: "M6 5C6.55228 5 7 4.55228 7 4C7 3.44772 6.55228 3 6 3C5.44772 3 5 3.44772 5 4C5 4.55228 5.44772 5 6 5Z" } }, { tag: "path", attrs: { d: "M6 9C6.55228 9 7 8.55229 7 8C7 7.44772 6.55228 7 6 7C5.44772 7 5 7.44772 5 8C5 8.55229 5.44772 9 6 9Z" } }, { tag: "path", attrs: { d: "M7 12C7 12.5523 6.55228 13 6 13C5.44772 13 5 12.5523 5 12C5 11.4477 5.44772 11 6 11C6.55228 11 7 11.4477 7 12Z" } }, { tag: "path", attrs: { d: "M10 5C10.5523 5 11 4.55228 11 4C11 3.44772 10.5523 3 10 3C9.44771 3 9 3.44772 9 4C9 4.55228 9.44771 5 10 5Z" } }, { tag: "path", attrs: { d: "M11 8C11 8.55229 10.5523 9 10 9C9.44771 9 9 8.55229 9 8C9 7.44772 9.44771 7 10 7C10.5523 7 11 7.44772 11 8Z" } }, { tag: "path", attrs: { d: "M10 13C10.5523 13 11 12.5523 11 12C11 11.4477 10.5523 11 10 11C9.44771 11 9 11.4477 9 12C9 12.5523 9.44771 13 10 13Z" } }] }] }, Mr = xe(function(e, t) {
+  return Ie(We, Object.assign({}, e, {
     id: "sequence-icon",
     ref: t,
     icon: co
@@ -1320,7 +1320,7 @@ var co = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none
 Mr.displayName = "SequenceIcon";
 function uo(e) {
   var d;
-  const t = F(ue), r = F(vn), { value: n, onChange: i, extraComponent: o } = e, [a, l] = W(!1), s = o ? r.get(o) : null;
+  const t = F(ce), r = F(fn), { value: n, onChange: i, extraComponent: o } = e, [a, l] = H(!1), s = o ? r.get(o) : null;
   return /* @__PURE__ */ $(ut, { children: [
     /* @__PURE__ */ $(
       "div",
@@ -1329,7 +1329,7 @@ function uo(e) {
         onClick: () => l(!a),
         children: [
           t.t("dataValidation.panel.options"),
-          a ? /* @__PURE__ */ S(br, { className: "univer-ml-1" }) : /* @__PURE__ */ S(wn, { className: "univer-ml-1" })
+          a ? /* @__PURE__ */ S(br, { className: "univer-ml-1" }) : /* @__PURE__ */ S(In, { className: "univer-ml-1" })
         ]
       }
     ),
@@ -1340,13 +1340,13 @@ function uo(e) {
         {
           label: t.t("dataValidation.panel.invalid"),
           children: /* @__PURE__ */ $(
-            mn,
+            _n,
             {
               value: `${(d = n.errorStyle) != null ? d : lt.WARNING}`,
               onChange: (u) => i({ ...n, errorStyle: +u }),
               children: [
-                /* @__PURE__ */ S(Le, { value: `${lt.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ S(Le, { value: `${lt.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
+                /* @__PURE__ */ S(Ae, { value: `${lt.WARNING}`, children: t.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ S(Ae, { value: `${lt.STOP}`, children: t.t("dataValidation.panel.rejectInput") })
               ]
             }
           )
@@ -1369,7 +1369,7 @@ function uo(e) {
           )
         }
       ),
-      n.showErrorMessage ? /* @__PURE__ */ S(Y, { children: /* @__PURE__ */ S(ke, { value: n.error, onChange: (u) => i({ ...n, error: u }) }) }) : null
+      n.showErrorMessage ? /* @__PURE__ */ S(Y, { children: /* @__PURE__ */ S(Le, { value: n.error, onChange: (u) => i({ ...n, error: u }) }) }) : null
     ] })
   ] });
 }
@@ -1380,248 +1380,248 @@ const ho = (e) => xr(
   },
   1e3
 );
-function po(e, t, r) {
+function go(e, t, r) {
   var n, i, o, a;
   return t ? ((i = (n = e.getUnit(t)) == null ? void 0 : n.getSheetBySheetName(r)) == null ? void 0 : i.getSheetId()) || "" : ((a = (o = e.getCurrentUnitForType(X.UNIVER_SHEET)) == null ? void 0 : o.getSheetBySheetName(r)) == null ? void 0 : a.getSheetId()) || "";
 }
-function go() {
-  var D, U;
-  const [e, t] = W(0), r = F(Se), n = Ae(r.activeRule$, r.activeRule), { unitId: i, subUnitId: o, rule: a } = n || {}, l = a.uid, s = F(Me), d = F(ce), u = F(vn), h = F(te), c = F(pn), m = F(ue), [p, b] = W(a), y = s.getValidatorItem(p.type), [g, C] = W(!1), v = s.getValidatorsByScope(di.SHEET), [I, w] = W(() => p.ranges.map((f) => ({ unitId: "", sheetId: "", range: f }))), _ = ct(() => ho(h), [h]), [R, L] = W(!1), [N, E] = W(!1), T = pt(null), O = F(Gn);
-  if (Ne(() => () => {
-    const f = O.getCurrentLastSelection();
-    f && O.setSelections([f]);
-  }, [O]), Ne(() => {
-    h.onCommandExecuted((f) => {
-      (f.id === Br.id || f.id === Wr.id) && setTimeout(() => {
-        const A = c.getRuleById(i, o, l);
-        t((x) => x + 1), A && (b(A), w(A.ranges.map((x) => ({ unitId: "", sheetId: "", range: x }))));
+function po() {
+  var b, U;
+  const [e, t] = H(0), r = F(me), n = Pe(r.activeRule$, r.activeRule), { unitId: i, subUnitId: o, rule: a } = n || {}, l = a.uid, s = F(Me), d = F(de), u = F(fn), g = F(ee), c = F(pn), f = F(ce), [h, M] = H(a), y = s.getValidatorItem(h.type), [w, C] = H(!1), p = s.getValidatorsByScope(di.SHEET), [I, _] = H(() => h.ranges.map((m) => ({ unitId: "", sheetId: "", range: m }))), v = ct(() => ho(g), [g]), [R, A] = H(!1), [N, O] = H(!1), L = gt(null), D = F(Gn);
+  if (ke(() => () => {
+    const m = D.getCurrentLastSelection();
+    m && D.setSelections([m]);
+  }, [D]), ke(() => {
+    g.onCommandExecuted((m) => {
+      (m.id === Br.id || m.id === Wr.id) && setTimeout(() => {
+        const P = c.getRuleById(i, o, l);
+        t((x) => x + 1), P && (M(P), _(P.ranges.map((x) => ({ unitId: "", sheetId: "", range: x }))));
       }, 20);
     });
-  }, [h, c, l, o, i]), !y)
+  }, [g, c, l, o, i]), !y)
     return null;
-  const P = y.operators, k = y.operatorNames, H = p.operator ? ci.includes(p.operator) : !1, B = () => {
-    var f, A, x;
-    (A = (f = T.current) == null ? void 0 : f.editor) != null && A.isFocus() && J((x = T.current) == null ? void 0 : x.getValue()), !(!p.ranges.length || R) && (y.validatorFormula(p, i, o).success ? r.setActiveRule(null) : C(!0));
-  }, J = tn((f) => {
-    const A = f.split(",").filter(Boolean).map(Oi).map((ee) => {
-      const In = ee.sheetName;
-      if (In) {
-        const Or = po(d, ee.unitId, In);
-        return { ...ee, sheetId: Or };
+  const T = y.operators, k = y.operatorNames, B = h.operator ? ci.includes(h.operator) : !1, z = () => {
+    var m, P, x;
+    (P = (m = L.current) == null ? void 0 : m.editor) != null && P.isFocus() && te((x = L.current) == null ? void 0 : x.getValue()), !(!h.ranges.length || R) && (y.validatorFormula(h, i, o).success ? r.setActiveRule(null) : C(!0));
+  }, te = nn((m) => {
+    const P = m.split(",").filter(Boolean).map(Oi).map((J) => {
+      const Rn = J.sheetName;
+      if (Rn) {
+        const Or = go(d, J.unitId, Rn);
+        return { ...J, sheetId: Or };
       }
       return {
-        ...ee,
+        ...J,
         sheetId: ""
       };
     });
-    if (Hr(A, I))
+    if (Hr(P, I))
       return;
-    w(A);
-    const x = A.filter((ee) => (!ee.unitId || ee.unitId === i) && (!ee.sheetId || ee.sheetId === o)).map((ee) => ee.range);
-    if (b({
-      ...p,
+    _(P);
+    const x = P.filter((J) => (!J.unitId || J.unitId === i) && (!J.sheetId || J.sheetId === o)).map((J) => J.range);
+    if (M({
+      ...h,
       ranges: x
     }), x.length === 0)
       return;
-    const we = {
+    const ue = {
       unitId: i,
       subUnitId: o,
       ruleId: l,
       ranges: x
     };
-    _(rr.id, we);
-  }), ne = (f) => {
-    if (Rn(f, On(p)))
+    v(rr.id, ue);
+  }), W = (m) => {
+    if (yn(m, Tn(h)))
       return;
-    b({
-      ...p,
-      ...f
+    M({
+      ...h,
+      ...m
     });
-    const A = {
+    const P = {
       unitId: i,
       subUnitId: o,
       ruleId: l,
-      setting: f
+      setting: m
     };
-    _(
-      En.id,
-      A,
+    v(
+      Dn.id,
+      P,
       void 0
     );
-  }, oe = async () => {
-    await h.executeCommand(or.id, {
+  }, ne = async () => {
+    await g.executeCommand(or.id, {
       ruleId: l,
       unitId: i,
       subUnitId: o
     }), r.setActiveRule(null);
-  }, he = {
-    type: p.type,
-    operator: p.operator,
-    formula1: p.formula1,
-    formula2: p.formula2,
-    allowBlank: p.allowBlank
-  }, z = (f) => {
-    const A = s.getValidatorItem(f);
-    if (!A)
+  }, oe = {
+    type: h.type,
+    operator: h.operator,
+    formula1: h.formula1,
+    formula2: h.formula2,
+    allowBlank: h.allowBlank
+  }, Se = (m) => {
+    const P = s.getValidatorItem(m);
+    if (!P)
       return;
-    const x = A.operators, we = c.getRuleById(i, o, l), ee = f === (we == null ? void 0 : we.type) || f.includes("list") && (we != null && we.type.includes("list")) ? {
-      ...we,
-      type: f
+    const x = P.operators, ue = c.getRuleById(i, o, l), J = m === (ue == null ? void 0 : ue.type) || m.includes("list") && (ue != null && ue.type.includes("list")) ? {
+      ...ue,
+      type: m
     } : {
-      ...p,
-      type: f,
+      ...h,
+      type: m,
       operator: x[0],
       formula1: void 0,
       formula2: void 0
     };
-    b(ee), h.executeCommand(En.id, {
+    M(J), g.executeCommand(Dn.id, {
       unitId: i,
       subUnitId: o,
-      ruleId: p.uid,
-      setting: On(ee)
+      ruleId: h.uid,
+      setting: Tn(J)
     });
-  }, Z = u.get(y.formulaInput), fe = ct(() => I.map((f) => vr(f.range)).join(","), []), Q = Vn(p), q = (f) => {
-    Rn(f, Vn(p)) || (b({
-      ...p,
-      ...f
-    }), _(
+  }, Ce = u.get(y.formulaInput), G = ct(() => I.map((m) => vr(m.range)).join(","), []), Z = On(h), ve = (m) => {
+    yn(m, On(h)) || (M({
+      ...h,
+      ...m
+    }), v(
       ei.id,
       {
         unitId: i,
         subUnitId: o,
         ruleId: l,
-        options: f
+        options: m
       }
     ));
-  }, G = P.length && !p.operator;
+  }, q = T.length && !h.operator;
   return /* @__PURE__ */ $("div", { "data-u-comp": "data-validation-detail", className: "univer-py-2", children: [
     /* @__PURE__ */ S(
       Y,
       {
-        label: m.t("dataValidation.panel.range"),
-        error: !p.ranges.length || R ? m.t("dataValidation.panel.rangeError") : "",
+        label: f.t("dataValidation.panel.range"),
+        error: !h.ranges.length || R ? f.t("dataValidation.panel.rangeError") : "",
         children: /* @__PURE__ */ S(
           Ti,
           {
-            selectorRef: T,
+            selectorRef: L,
             unitId: i,
             subUnitId: o,
-            initialValue: fe,
-            onChange: (f, A) => {
+            initialValue: G,
+            onChange: (m, P) => {
               var x;
-              !N && ((x = T.current) != null && x.verify()) && J(A);
+              !N && ((x = L.current) != null && x.verify()) && te(P);
             },
-            onFocusChange: (f, A) => {
+            onFocusChange: (m, P) => {
               var x;
-              E(f), !f && A && ((x = T.current) != null && x.verify()) && J(A);
+              O(m), !m && P && ((x = L.current) != null && x.verify()) && te(P);
             },
-            onVerify: (f) => L(!f)
+            onVerify: (m) => A(!m)
           }
         )
       }
     ),
-    /* @__PURE__ */ S(Y, { label: m.t("dataValidation.panel.type"), children: /* @__PURE__ */ S(
-      Ln,
+    /* @__PURE__ */ S(Y, { label: f.t("dataValidation.panel.type"), children: /* @__PURE__ */ S(
+      kn,
       {
         className: "univer-w-full",
-        value: p.type,
-        options: (D = v == null ? void 0 : v.sort((f, A) => f.order - A.order)) == null ? void 0 : D.map((f) => ({
-          label: m.t(f.title),
-          value: f.id
+        value: h.type,
+        options: (b = p == null ? void 0 : p.sort((m, P) => m.order - P.order)) == null ? void 0 : b.map((m) => ({
+          label: f.t(m.title),
+          value: m.id
         })),
-        onChange: z
+        onChange: Se
       }
     ) }),
-    P != null && P.length ? /* @__PURE__ */ S(Y, { label: m.t("dataValidation.panel.operator"), children: /* @__PURE__ */ S(
-      Ln,
+    T != null && T.length ? /* @__PURE__ */ S(Y, { label: f.t("dataValidation.panel.operator"), children: /* @__PURE__ */ S(
+      kn,
       {
         className: "univer-w-full",
-        value: `${p.operator}`,
+        value: `${h.operator}`,
         options: [
           {
             value: "",
-            label: m.t("dataValidation.operators.legal")
+            label: f.t("dataValidation.operators.legal")
           },
-          ...P.map((f, A) => ({
-            value: `${f}`,
-            label: k[A]
+          ...T.map((m, P) => ({
+            value: `${m}`,
+            label: k[P]
           }))
         ],
-        onChange: (f) => {
-          ne({
-            ...he,
-            operator: f
+        onChange: (m) => {
+          W({
+            ...oe,
+            operator: m
           });
         }
       }
     ) }) : null,
-    Z && !G ? /* @__PURE__ */ S(
-      Z,
+    Ce && !q ? /* @__PURE__ */ S(
+      Ce,
       {
-        isTwoFormula: H,
+        isTwoFormula: B,
         value: {
-          formula1: p.formula1,
-          formula2: p.formula2
+          formula1: h.formula1,
+          formula2: h.formula2
         },
-        onChange: (f) => {
-          ne({
-            ...he,
-            ...f
+        onChange: (m) => {
+          W({
+            ...oe,
+            ...m
           });
         },
-        showError: g,
-        validResult: y.validatorFormula(p, i, o),
+        showError: w,
+        validResult: y.validatorFormula(h, i, o),
         unitId: i,
         subUnitId: o,
         ruleId: l
       },
-      e + p.type
+      e + h.type
     ) : null,
     /* @__PURE__ */ S(Y, { children: /* @__PURE__ */ S(
       At,
       {
-        checked: (U = p.allowBlank) != null ? U : !0,
+        checked: (U = h.allowBlank) != null ? U : !0,
         onChange: () => {
-          var f;
-          return ne({
-            ...he,
-            allowBlank: !((f = p.allowBlank) == null || f)
+          var m;
+          return W({
+            ...oe,
+            allowBlank: !((m = h.allowBlank) == null || m)
           });
         },
-        children: m.t("dataValidation.panel.allowBlank")
+        children: f.t("dataValidation.panel.allowBlank")
       }
     ) }),
-    /* @__PURE__ */ S(uo, { value: Q, onChange: q, extraComponent: y.optionsInput }),
+    /* @__PURE__ */ S(uo, { value: Z, onChange: ve, extraComponent: y.optionsInput }),
     /* @__PURE__ */ $("div", { className: "univer-mt-5 univer-flex univer-flex-row univer-justify-end", children: [
-      /* @__PURE__ */ S(Ge, { className: "univer-ml-3", onClick: oe, children: m.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ S(Ge, { className: "univer-ml-3", variant: "primary", onClick: B, children: m.t("dataValidation.panel.done") })
+      /* @__PURE__ */ S(Ge, { className: "univer-ml-3", onClick: ne, children: f.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ S(Ge, { className: "univer-ml-3", variant: "primary", onClick: z, children: f.t("dataValidation.panel.done") })
     ] })
   ] });
 }
 const vo = (e) => {
-  const { rule: t, onClick: r, unitId: n, subUnitId: i, disable: o } = e, a = F(Me), l = F(te), s = F(Ei), d = a.getValidatorItem(t.type), u = pt(void 0), [h, c] = W(!1), m = F(Xn), p = Ae(m.currentTheme$), b = ct(() => {
-    var w;
-    const g = m.getColorFromTheme("primary.600"), C = m.getColorFromTheme("loop-color.2"), v = (w = m.getColorFromTheme(C)) != null ? w : g, I = new $r(v).toRgb();
+  const { rule: t, onClick: r, unitId: n, subUnitId: i, disable: o } = e, a = F(Me), l = F(ee), s = F(Ei), d = a.getValidatorItem(t.type), u = gt(void 0), [g, c] = H(!1), f = F(Xn), h = Pe(f.currentTheme$), M = ct(() => {
+    var _;
+    const w = f.getColorFromTheme("primary.600"), C = f.getColorFromTheme("loop-color.2"), p = (_ = f.getColorFromTheme(C)) != null ? _ : w, I = new $r(p).toRgb();
     return {
       fill: `rgba(${I.r}, ${I.g}, ${I.b}, 0.1)`,
-      stroke: v
+      stroke: p
     };
-  }, [p]), y = (g) => {
+  }, [h]), y = (w) => {
     l.executeCommand(or.id, {
       ruleId: t.uid,
       unitId: n,
       subUnitId: i
-    }), g.stopPropagation();
+    }), w.stopPropagation();
   };
-  return Ne(() => () => {
-    var g;
-    u.current && ((g = u.current) == null || g.forEach((C) => {
+  return ke(() => () => {
+    var w;
+    u.current && ((w = u.current) == null || w.forEach((C) => {
       C && s.removeShape(C);
     }));
   }, [s]), /* @__PURE__ */ $(
     "div",
     {
-      className: Ue(
+      className: Ne(
         `
                   univer-bg-secondary univer-relative univer--ml-2 univer--mr-2 univer-box-border univer-flex
                   univer-w-[287px] univer-cursor-pointer univer-flex-col univer-justify-between univer-overflow-hidden
@@ -1634,15 +1634,15 @@ const vo = (e) => {
       ),
       onClick: r,
       onMouseEnter: () => {
-        o || (c(!0), u.current = t.ranges.map((g) => s.addShape({
-          range: g,
-          style: b,
+        o || (c(!0), u.current = t.ranges.map((w) => s.addShape({
+          range: w,
+          style: M,
           primary: null
         })));
       },
       onMouseLeave: () => {
-        var g;
-        c(!1), (g = u.current) == null || g.forEach((C) => {
+        var w;
+        c(!1), (w = u.current) == null || w.forEach((C) => {
           C && s.removeShape(C);
         }), u.current = void 0;
       },
@@ -1658,15 +1658,15 @@ const vo = (e) => {
           "div",
           {
             className: "univer-text-secondary univer-truncate univer-text-xs univer-leading-[18px] dark:!univer-text-gray-300",
-            children: t.ranges.map((g) => vr(g)).join(",")
+            children: t.ranges.map((w) => vr(w)).join(",")
           }
         ),
-        h ? /* @__PURE__ */ S(
+        g ? /* @__PURE__ */ S(
           "div",
           {
             className: "univer-absolute univer-right-2 univer-top-[19px] univer-flex univer-h-5 univer-w-5 univer-items-center univer-justify-center univer-rounded hover:univer-bg-gray-200 dark:!univer-text-gray-300 dark:hover:!univer-bg-gray-700",
             onClick: y,
-            children: /* @__PURE__ */ S(Cn, {})
+            children: /* @__PURE__ */ S(wn, {})
           }
         ) : null
       ]
@@ -1674,79 +1674,79 @@ const vo = (e) => {
   );
 };
 function fo(e) {
-  const t = F(ie), r = F(ce), n = F(te), i = F(be), o = F(Se), a = F(ue), [l, s] = W([]), { workbook: d } = e, u = Ae(d.activeSheet$, void 0, !0), h = d.getUnitId(), c = u == null ? void 0 : u.getSheetId();
-  Ne(() => {
-    s(t.getRules(h, c));
-    const C = t.ruleChange$.subscribe((v) => {
-      v.unitId === h && v.subUnitId === c && s(t.getRules(h, c));
+  const t = F(ie), r = F(de), n = F(ee), i = F(be), o = F(me), a = F(ce), [l, s] = H([]), { workbook: d } = e, u = Pe(d.activeSheet$, void 0, !0), g = d.getUnitId(), c = u == null ? void 0 : u.getSheetId();
+  ke(() => {
+    s(t.getRules(g, c));
+    const C = t.ruleChange$.subscribe((p) => {
+      p.unitId === g && p.subUnitId === c && s(t.getRules(g, c));
     });
     return () => {
       C.unsubscribe();
     };
-  }, [h, c, t]);
-  const m = async () => {
-    const C = tr(i), v = {
-      unitId: h,
+  }, [g, c, t]);
+  const f = async () => {
+    const C = tr(i), p = {
+      unitId: g,
       subUnitId: c,
       rule: C
     };
-    await n.executeCommand(un.id, v), o.setActiveRule({
-      unitId: h,
+    await n.executeCommand(hn.id, p), o.setActiveRule({
+      unitId: g,
       subUnitId: c,
       rule: C
     });
-  }, p = () => {
+  }, h = () => {
     n.executeCommand(ti.id, {
-      unitId: h,
+      unitId: g,
       subUnitId: c
     });
   }, y = ((C) => {
-    const v = r.getCurrentUnitForType(X.UNIVER_SHEET), I = v.getActiveSheet(), w = v.getUnitId(), _ = I.getSheetId();
-    return C.map((L) => Jr(i, w, _, L.ranges) ? { ...L } : { ...L, disable: !0 });
-  })(l), g = y == null ? void 0 : y.some((C) => C.disable);
+    const p = r.getCurrentUnitForType(X.UNIVER_SHEET), I = p.getActiveSheet(), _ = p.getUnitId(), v = I.getSheetId();
+    return C.map((A) => Jr(i, _, v, A.ranges) ? { ...A } : { ...A, disable: !0 });
+  })(l), w = y == null ? void 0 : y.some((C) => C.disable);
   return /* @__PURE__ */ $("div", { className: "univer-pb-4", children: [
     y == null ? void 0 : y.map((C) => {
-      var v;
+      var p;
       return /* @__PURE__ */ S(
         vo,
         {
-          unitId: h,
+          unitId: g,
           subUnitId: c,
           onClick: () => {
             C.disable || o.setActiveRule({
-              unitId: h,
+              unitId: g,
               subUnitId: c,
               rule: C
             });
           },
           rule: C,
-          disable: (v = C.disable) != null ? v : !1
+          disable: (p = C.disable) != null ? p : !1
         },
         C.uid
       );
     }),
     /* @__PURE__ */ $("div", { className: "univer-mt-4 univer-flex univer-flex-row univer-justify-end univer-gap-2", children: [
-      l.length && !g ? /* @__PURE__ */ S(Ge, { onClick: p, children: a.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ S(Ge, { variant: "primary", onClick: m, children: a.t("dataValidation.panel.add") })
+      l.length && !w ? /* @__PURE__ */ S(Ge, { onClick: h, children: a.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ S(Ge, { variant: "primary", onClick: f, children: a.t("dataValidation.panel.add") })
     ] })
   ] });
 }
 const mo = () => {
-  const e = F(Se), t = Ae(e.activeRule$, e.activeRule), r = F(ce), n = Ae(
+  const e = F(me), t = Pe(e.activeRule$, e.activeRule), r = F(de), n = Pe(
     () => r.getCurrentTypeOfUnit$(X.UNIVER_SHEET),
     void 0,
     void 0,
     []
-  ), i = Ae(() => {
+  ), i = Pe(() => {
     var o;
     return (o = n == null ? void 0 : n.activeSheet$) != null ? o : mi(null);
   }, void 0, void 0, []);
-  return !n || !i ? null : t && t.subUnitId === i.getSheetId() ? /* @__PURE__ */ S(go, {}, t.rule.uid) : /* @__PURE__ */ S(fo, { workbook: n });
+  return !n || !i ? null : t && t.subUnitId === i.getSheetId() ? /* @__PURE__ */ S(po, {}, t.rule.uid) : /* @__PURE__ */ S(fo, { workbook: n });
 }, _o = (e) => {
-  const { isTwoFormula: t = !1, value: r, onChange: n, showError: i, validResult: o } = e, a = F(ue), l = i ? o == null ? void 0 : o.formula1 : "", s = i ? o == null ? void 0 : o.formula2 : "";
+  const { isTwoFormula: t = !1, value: r, onChange: n, showError: i, validResult: o } = e, a = F(ce), l = i ? o == null ? void 0 : o.formula1 : "", s = i ? o == null ? void 0 : o.formula2 : "";
   return t ? /* @__PURE__ */ $(ut, { children: [
     /* @__PURE__ */ S(Y, { error: l, children: /* @__PURE__ */ S(
-      ke,
+      Le,
       {
         className: "univer-w-full",
         placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
@@ -1761,7 +1761,7 @@ const mo = () => {
     ) }),
     /* @__PURE__ */ S("div", { className: "-univer-mt-2 univer-mb-1 univer-text-sm univer-text-gray-400", children: a.t("dataValidation.panel.formulaAnd") }),
     /* @__PURE__ */ S(Y, { error: s, children: /* @__PURE__ */ S(
-      ke,
+      Le,
       {
         className: "univer-w-full",
         placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
@@ -1775,7 +1775,7 @@ const mo = () => {
       }
     ) })
   ] }) : /* @__PURE__ */ S(Y, { error: l, children: /* @__PURE__ */ S(
-    ke,
+    Le,
     {
       className: "univer-w-full",
       placeholder: a.t("dataValidation.panel.formulaPlaceholder"),
@@ -1787,7 +1787,7 @@ const mo = () => {
   ) });
 };
 function So(e) {
-  const { value: t, onChange: r, showError: n, validResult: i } = e, o = F(ue), a = n ? i == null ? void 0 : i.formula1 : "", l = n ? 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));
+  const { value: t, onChange: r, showError: n, validResult: i } = e, o = F(ce), a = n ? i == null ? void 0 : i.formula1 : "", l = n ? i == null ? void 0 : i.formula2 : "", [s, d] = H(!((t == null ? void 0 : t.formula1) === void 0 && (t == null ? void 0 : t.formula2) === void 0));
   return /* @__PURE__ */ $(ut, { children: [
     /* @__PURE__ */ S(Y, { children: /* @__PURE__ */ S(
       At,
@@ -1804,7 +1804,7 @@ function So(e) {
       }
     ) }),
     s ? /* @__PURE__ */ S(Y, { label: o.t("dataValidation.checkbox.checked"), error: a, children: /* @__PURE__ */ S(
-      ke,
+      Le,
       {
         className: "univer-w-full",
         placeholder: o.t("dataValidation.panel.valuePlaceholder"),
@@ -1818,7 +1818,7 @@ function So(e) {
       }
     ) }) : null,
     s ? /* @__PURE__ */ S(Y, { label: o.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ S(
-      ke,
+      Le,
       {
         className: "univer-w-full",
         placeholder: o.t("dataValidation.panel.valuePlaceholder"),
@@ -1834,26 +1834,26 @@ function So(e) {
   ] });
 }
 function Co(e) {
-  var h;
-  const { unitId: t, subUnitId: r, value: n, onChange: i, showError: o, validResult: a } = e, l = o ? a == null ? void 0 : a.formula1 : void 0, s = pt(null), [d, u] = W(!1);
+  var g;
+  const { unitId: t, subUnitId: r, value: n, onChange: i, showError: o, validResult: a } = e, l = o ? a == null ? void 0 : a.formula1 : void 0, s = gt(null), [d, u] = H(!1);
   return cr((c) => {
-    var p;
-    ((p = s.current) == null ? void 0 : p.isClickOutSide(c)) && u(!1);
+    var h;
+    ((h = s.current) == null ? void 0 : h.isClickOutSide(c)) && u(!1);
   }), /* @__PURE__ */ S(Y, { error: l, children: /* @__PURE__ */ S(
     fr,
     {
       ref: s,
-      className: Ue("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", yt),
-      initValue: (h = n == null ? void 0 : n.formula1) != null ? h : "=",
+      className: Ne("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", yt),
+      initValue: (g = n == null ? void 0 : n.formula1) != null ? g : "=",
       unitId: t,
       subUnitId: r,
       isFocus: d,
       isSupportAcrossSheet: !0,
       onChange: (c) => {
-        const m = (c != null ? c : "").trim();
-        m !== (n == null ? void 0 : n.formula1) && (i == null || i({
+        const f = (c != null ? c : "").trim();
+        f !== (n == null ? void 0 : n.formula1) && (i == null || i({
           ...n,
-          formula1: m
+          formula1: f
         }));
       },
       onFocus: () => u(!0)
@@ -1886,7 +1886,7 @@ const wo = [
   "#9E6DE3",
   "#F248A6"
 ], Io = (e) => {
-  const { value: t, onChange: r, disabled: n } = e, [i, o] = W(!1);
+  const { value: t, onChange: r, disabled: n } = e, [i, o] = H(!1);
   return /* @__PURE__ */ S(
     Vi,
     {
@@ -1902,7 +1902,7 @@ const wo = [
             (a) => /* @__PURE__ */ S(
               "div",
               {
-                className: Ue("univer-box-border univer-size-4 univer-cursor-pointer univer-rounded", yt),
+                className: Ne("univer-box-border univer-size-4 univer-cursor-pointer univer-rounded", yt),
                 style: { background: a },
                 onClick: () => {
                   r(a), o(!1);
@@ -1916,7 +1916,7 @@ const wo = [
       children: /* @__PURE__ */ $(
         "div",
         {
-          className: Ue("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", yt),
+          className: Ne("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", yt),
           children: [
             /* @__PURE__ */ S(
               "div",
@@ -1925,16 +1925,16 @@ const wo = [
                 style: { background: t }
               }
             ),
-            /* @__PURE__ */ S(wn, {})
+            /* @__PURE__ */ S(In, {})
           ]
         }
       )
     }
   );
-}, Fn = (e) => {
+}, xn = (e) => {
   const { item: t, commonProps: r, className: n } = e, { onItemChange: i, onItemDelete: o } = r;
-  return /* @__PURE__ */ $("div", { className: Ue("univer-flex univer-items-center univer-gap-2", n), children: [
-    !t.isRef && /* @__PURE__ */ S("div", { className: Ue("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ S(Mr, {}) }),
+  return /* @__PURE__ */ $("div", { className: Ne("univer-flex univer-items-center univer-gap-2", n), children: [
+    !t.isRef && /* @__PURE__ */ S("div", { className: Ne("univer-cursor-move", "draggableHandle"), children: /* @__PURE__ */ S(Mr, {}) }),
     /* @__PURE__ */ S(
       Io,
       {
@@ -1945,7 +1945,7 @@ const wo = [
       }
     ),
     /* @__PURE__ */ S(
-      ke,
+      Le,
       {
         disabled: t.isRef,
         value: t.label,
@@ -1958,165 +1958,165 @@ const wo = [
       "div",
       {
         className: "univer-ml-1 univer-cursor-pointer univer-rounded univer-text-base hover:univer-bg-gray-200",
-        children: /* @__PURE__ */ S(Cn, { onClick: () => o(t.id) })
+        children: /* @__PURE__ */ S(wn, { onClick: () => o(t.id) })
       }
     )
   ] });
 };
 function Ro(e) {
   const { value: t, onChange: r = () => {
-  }, unitId: n, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, h] = W(() => Oe(s) ? "1" : "0"), [c, m] = W(u === "1" ? s : "="), [p, b] = W(u === "1" ? s : "="), y = F(ue), g = F(Me), C = F(pn), v = F(ni), [I, w] = W(() => d.split(",")), _ = g.getValidatorItem(j.LIST), [R, L] = W([]), [N, E] = W(""), T = a ? o == null ? void 0 : o.formula1 : "", O = ct(() => C.ruleChange$.pipe(ur(16)), []), P = Ae(O), k = tn(r);
-  Ne(() => {
+  }, unitId: n, subUnitId: i, validResult: o, showError: a, ruleId: l } = e, { formula1: s = "", formula2: d = "" } = t || {}, [u, g] = H(() => Ve(s) ? "1" : "0"), [c, f] = H(u === "1" ? s : "="), [h, M] = H(u === "1" ? s : "="), y = F(ce), w = F(Me), C = F(pn), p = F(ni), [I, _] = H(() => d.split(",")), v = w.getValidatorItem(j.LIST), [R, A] = H([]), [N, O] = H(""), L = a ? o == null ? void 0 : o.formula1 : "", D = ct(() => C.ruleChange$.pipe(ur(16)), []), T = Pe(D), k = nn(r);
+  ke(() => {
     (async () => {
-      await new Promise((f) => {
-        setTimeout(() => f(!0), 100);
+      await new Promise((m) => {
+        setTimeout(() => m(!0), 100);
       });
-      const D = C.getRuleById(n, i, l), U = D == null ? void 0 : D.formula1;
-      if (Oe(U) && _ && D) {
-        const f = await _.getListAsync(D, n, i);
-        L(f);
+      const b = C.getRuleById(n, i, l), U = b == null ? void 0 : b.formula1;
+      if (Ve(U) && v && b) {
+        const m = await v.getListAsync(b, n, i);
+        A(m);
       }
     })();
-  }, [C, P, _, l, i, n]), Ne(() => {
-    Oe(s) && s !== p && (m(s), b(p));
-  }, [p, s]);
-  const [H, B] = W(() => {
-    const D = u !== "1" ? ri(s) : [], U = d.split(",");
-    return D.map((f, A) => ({
-      label: f,
-      color: U[A] || Pe,
+  }, [C, T, v, l, i, n]), ke(() => {
+    Ve(s) && s !== h && (f(s), M(h));
+  }, [h, s]);
+  const [B, z] = H(() => {
+    const b = u !== "1" ? ri(s) : [], U = d.split(",");
+    return b.map((m, P) => ({
+      label: m,
+      color: U[P] || Te,
       isRef: !1,
-      id: yn(4)
+      id: bn(4)
     }));
-  }), J = (D, U, f) => {
-    const A = H.find((x) => x.id === D);
-    A && (A.label = U, A.color = f, B([...H]));
-  }, ne = (D) => {
-    const U = H.findIndex((f) => f.id === D);
-    U !== -1 && (H.splice(U, 1), B([...H]));
-  }, oe = d.split(","), he = ct(() => R.map((D, U) => ({
-    label: D,
-    color: oe[U] || Pe,
+  }), te = (b, U, m) => {
+    const P = B.find((x) => x.id === b);
+    P && (P.label = U, P.color = m, z([...B]));
+  }, W = (b) => {
+    const U = B.findIndex((m) => m.id === b);
+    U !== -1 && (B.splice(U, 1), z([...B]));
+  }, ne = d.split(","), oe = ct(() => R.map((b, U) => ({
+    label: b,
+    color: ne[U] || Te,
     id: `${U}`,
     isRef: !0
-  })), [oe, R]), z = (D, U, f) => {
-    const A = [...I];
-    A[+D] = f, w(A), k({
+  })), [ne, R]), Se = (b, U, m) => {
+    const P = [...I];
+    P[+b] = m, _(P), k({
       formula1: s,
-      formula2: A.join(",")
+      formula2: P.join(",")
     });
-  }, Z = () => {
-    B([
-      ...H,
+  }, Ce = () => {
+    z([
+      ...B,
       {
         label: "",
-        color: Pe,
+        color: Te,
         isRef: !1,
-        id: yn(4)
+        id: bn(4)
       }
     ]);
   };
-  Ne(() => {
+  ke(() => {
     if (u === "1")
       return;
-    const D = /* @__PURE__ */ new Set(), U = [];
-    H.map((f) => ({
-      labelList: f.label.split(","),
-      item: f
-    })).forEach(({ item: f, labelList: A }) => {
-      A.forEach((x) => {
-        D.has(x) || (D.add(x), U.push({
+    const b = /* @__PURE__ */ new Set(), U = [];
+    B.map((m) => ({
+      labelList: m.label.split(","),
+      item: m
+    })).forEach(({ item: m, labelList: P }) => {
+      P.forEach((x) => {
+        b.has(x) || (b.add(x), U.push({
           label: x,
-          color: f.color
+          color: m.color
         }));
       });
     }), k({
-      formula1: er(U.map((f) => f.label)),
-      formula2: U.map((f) => f.color === Pe ? "" : f.color).join(",")
+      formula1: er(U.map((m) => m.label)),
+      formula2: U.map((m) => m.color === Te ? "" : m.color).join(",")
     });
-  }, [H, k, u, p, I]);
-  const fe = tn(async (D) => {
-    if (!Oe(D)) {
+  }, [B, k, u, h, I]);
+  const G = nn(async (b) => {
+    if (!Ve(b)) {
       k == null || k({
         formula1: "",
         formula2: d
       });
       return;
     }
-    v.getFormulaRefCheck(D) ? (k == null || k({
-      formula1: Oe(D) ? D : "",
+    p.getFormulaRefCheck(b) ? (k == null || k({
+      formula1: Ve(b) ? b : "",
       formula2: d
-    }), E("")) : (k == null || k({
+    }), O("")) : (k == null || k({
       formula1: "",
       formula2: d
-    }), m("="), E(y.t("dataValidation.validFail.formulaError")));
-  }), Q = pt(null), [q, G] = W(!1);
-  return cr((D) => {
-    var f;
-    ((f = Q.current) == null ? void 0 : f.isClickOutSide(D)) && G(!1);
+    }), f("="), O(y.t("dataValidation.validFail.formulaError")));
+  }), Z = gt(null), [ve, q] = H(!1);
+  return cr((b) => {
+    var m;
+    ((m = Z.current) == null ? void 0 : m.isClickOutSide(b)) && q(!1);
   }), /* @__PURE__ */ $(ut, { children: [
     /* @__PURE__ */ S(Y, { label: y.t("dataValidation.list.options"), children: /* @__PURE__ */ $(
-      mn,
+      _n,
       {
         value: u,
-        onChange: (D) => {
-          h(D), m(p), D === "1" && k({
-            formula1: p === "=" ? "" : p,
+        onChange: (b) => {
+          g(b), f(h), b === "1" && k({
+            formula1: h === "=" ? "" : h,
             formula2: I.join(",")
           });
         },
         children: [
-          /* @__PURE__ */ S(Le, { value: "0", children: y.t("dataValidation.list.customOptions") }),
-          /* @__PURE__ */ S(Le, { value: "1", children: y.t("dataValidation.list.refOptions") })
+          /* @__PURE__ */ S(Ae, { value: "0", children: y.t("dataValidation.list.customOptions") }),
+          /* @__PURE__ */ S(Ae, { value: "1", children: y.t("dataValidation.list.refOptions") })
         ]
       }
     ) }),
-    u === "1" ? /* @__PURE__ */ $(Y, { error: T || N || void 0, children: [
+    u === "1" ? /* @__PURE__ */ $(Y, { error: L || N || void 0, children: [
       /* @__PURE__ */ S(
         fr,
         {
-          ref: Q,
-          className: Ue("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", yt),
+          ref: Z,
+          className: Ne("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", yt),
           initValue: c,
           unitId: n,
           subUnitId: i,
-          isFocus: q,
+          isFocus: ve,
           isSupportAcrossSheet: !0,
-          onFocus: () => G(!0),
-          onChange: (D = "") => {
-            const U = (D != null ? D : "").trim();
-            b(U), fe(U);
+          onFocus: () => q(!0),
+          onChange: (b = "") => {
+            const U = (b != null ? b : "").trim();
+            M(U), G(U);
           }
         }
       ),
-      he.length > 0 && /* @__PURE__ */ S("div", { className: "univer-mt-3", children: he.map((D) => /* @__PURE__ */ S(
-        Fn,
+      oe.length > 0 && /* @__PURE__ */ S("div", { className: "univer-mt-3", children: oe.map((b) => /* @__PURE__ */ S(
+        xn,
         {
           className: "univer-mb-3",
-          item: D,
-          commonProps: { onItemChange: z }
+          item: b,
+          commonProps: { onItemChange: Se }
         },
-        D.id
+        b.id
       )) })
-    ] }) : /* @__PURE__ */ S(Y, { error: T, children: /* @__PURE__ */ $("div", { className: "-univer-mt-3", children: [
+    ] }) : /* @__PURE__ */ S(Y, { error: L, children: /* @__PURE__ */ $("div", { className: "-univer-mt-3", children: [
       /* @__PURE__ */ S(
         Di,
         {
-          list: H,
-          onListChange: B,
+          list: B,
+          onListChange: z,
           rowHeight: 28,
           margin: [0, 12],
           draggableHandle: ".draggableHandle",
-          itemRender: (D) => /* @__PURE__ */ S(
-            Fn,
+          itemRender: (b) => /* @__PURE__ */ S(
+            xn,
             {
-              item: D,
+              item: b,
               commonProps: {
-                onItemChange: J,
-                onItemDelete: ne
+                onItemChange: te,
+                onItemDelete: W
               }
             },
-            D.id
+            b.id
           ),
           idKey: "id"
         }
@@ -2125,7 +2125,7 @@ function Ro(e) {
         "a",
         {
           className: "univer-text-primary univer-flex univer-w-fit univer-cursor-pointer univer-flex-row univer-items-center univer-rounded univer-p-1 univer-px-2 univer-text-sm hover:univer-bg-primary-50 dark:hover:!univer-bg-gray-800",
-          onClick: Z,
+          onClick: Ce,
           children: [
             /* @__PURE__ */ S(yr, { className: "univer-mr-1" }),
             y.t("dataValidation.list.add")
@@ -2145,7 +2145,7 @@ const yo = [
     _o
   ],
   [
-    hn,
+    gn,
     Ro
   ],
   [
@@ -2155,18 +2155,18 @@ const yo = [
 ], bo = "LIST_RENDER_MODE_OPTION_INPUT";
 function Dt(e) {
   var i;
-  const { value: t, onChange: r } = e, n = F(ue);
-  return /* @__PURE__ */ S(Y, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ $(mn, { value: `${(i = t.renderMode) != null ? i : se.CUSTOM}`, onChange: (o) => r({ ...t, renderMode: +o }), children: [
-    /* @__PURE__ */ S(Le, { value: `${se.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
-    /* @__PURE__ */ S(Le, { value: `${se.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
-    /* @__PURE__ */ S(Le, { value: `${se.TEXT}`, children: n.t("dataValidation.renderMode.text") })
+  const { value: t, onChange: r } = e, n = F(ce);
+  return /* @__PURE__ */ S(Y, { label: n.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ $(_n, { value: `${(i = t.renderMode) != null ? i : ae.CUSTOM}`, onChange: (o) => r({ ...t, renderMode: +o }), children: [
+    /* @__PURE__ */ S(Ae, { value: `${ae.CUSTOM}`, children: n.t("dataValidation.renderMode.chip") }),
+    /* @__PURE__ */ S(Ae, { value: `${ae.ARROW}`, children: n.t("dataValidation.renderMode.arrow") }),
+    /* @__PURE__ */ S(Ae, { value: `${ae.TEXT}`, children: n.t("dataValidation.renderMode.text") })
   ] }) });
 }
 Dt.componentKey = bo;
 const Mo = "DATE_SHOW_TIME_OPTION";
 function Vt(e) {
   var i;
-  const { value: t, onChange: r } = e, n = F(ue);
+  const { value: t, onChange: r } = e, n = F(ce);
   return /* @__PURE__ */ S(Y, { children: /* @__PURE__ */ S(
     At,
     {
@@ -2189,21 +2189,21 @@ var Eo = Object.getOwnPropertyDescriptor, Do = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Eo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Ye = (e, t) => (r, n) => t(r, n, e);
+}, je = (e, t) => (r, n) => t(r, n, e);
 const _t = 6;
-let rn = class {
+let on = class {
   constructor(e, t, r, n, i, o) {
     this._commandService = e, this._univerInstanceService = t, this._formulaService = r, this._themeService = n, this._renderManagerService = i, this._dataValidationModel = o;
   }
   _calc(e, t) {
-    var d, u, h;
+    var d, u, g;
     const { vt: r, ht: n } = t || {}, i = e.endX - e.startX - _t * 2, o = e.endY - e.startY, a = ((d = t == null ? void 0 : t.fs) != null ? d : 10) * 1.6;
     let l = 0, s = 0;
     switch (r) {
-      case de.TOP:
+      case le.TOP:
         s = 0;
         break;
-      case de.BOTTOM:
+      case le.BOTTOM:
         s = 0 + (o - a);
         break;
       default:
@@ -2225,7 +2225,7 @@ let rn = class {
       left: e.startX + l,
       top: e.startY + s,
       width: ((u = t == null ? void 0 : t.fs) != null ? u : 10) * 1.6,
-      height: ((h = t == null ? void 0 : t.fs) != null ? h : 10) * 1.6
+      height: ((g = t == null ? void 0 : t.fs) != null ? g : 10) * 1.6
     };
   }
   calcCellAutoHeight(e) {
@@ -2239,25 +2239,25 @@ let rn = class {
     return ((r = t == null ? void 0 : t.fs) != null ? r : 10) * 1.6;
   }
   async _parseFormula(e, t, r) {
-    var d, u, h, c, m, p, b, y, g;
-    const { formula1: n = ai, formula2: i = oi } = e, o = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Ft((h = (u = (d = o == null ? void 0 : o[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Ft((p = (m = (c = o == null ? void 0 : o[1]) == null ? void 0 : c.result) == null ? void 0 : m[0]) == null ? void 0 : p[0]), s = Dn(String(a)) && Dn(String(l));
+    var d, u, g, c, f, h, M, y, w;
+    const { formula1: n = ai, formula2: i = oi } = e, o = await this._formulaService.getRuleFormulaResult(t, r, e.uid), a = Ft((g = (u = (d = o == null ? void 0 : o[0]) == null ? void 0 : d.result) == null ? void 0 : u[0]) == null ? void 0 : g[0]), l = Ft((h = (f = (c = o == null ? void 0 : o[1]) == null ? void 0 : c.result) == null ? void 0 : f[0]) == null ? void 0 : h[0]), s = Vn(String(a)) && Vn(String(l));
     return {
-      formula1: Oe(n) ? Ft((g = (y = (b = o == null ? void 0 : o[0]) == null ? void 0 : b.result) == null ? void 0 : y[0]) == null ? void 0 : g[0]) : n,
-      formula2: Oe(i) ? l : i,
+      formula1: Ve(n) ? Ft((w = (y = (M = o == null ? void 0 : o[0]) == null ? void 0 : M.result) == null ? void 0 : y[0]) == null ? void 0 : w[0]) : n,
+      formula2: Ve(i) ? l : i,
       isFormulaValid: s
     };
   }
   drawWith(e, t) {
-    var T, O, P, k;
-    const { style: r, primaryWithCoord: n, unitId: i, subUnitId: o, worksheet: a, row: l, col: s } = t, d = n.isMergedMainCell ? n.mergeInfo : n, u = re(a.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(i, o, l, s);
-    if (!h)
+    var L, D, T, k;
+    const { style: r, primaryWithCoord: n, unitId: i, subUnitId: o, worksheet: a, row: l, col: s } = t, d = n.isMergedMainCell ? n.mergeInfo : n, u = re(a.getCellRaw(l, s)), g = this._dataValidationModel.getRuleByLocation(i, o, l, s);
+    if (!g)
       return;
-    const c = this._dataValidationModel.getValidator(h.type);
-    if (!c || !((T = c.skipDefaultFontRender) != null && T.call(c, h, u, { unitId: i, subUnitId: o, row: l, column: s })))
+    const c = this._dataValidationModel.getValidator(g.type);
+    if (!c || !((L = c.skipDefaultFontRender) != null && L.call(c, g, u, { unitId: i, subUnitId: o, row: l, column: s })))
       return;
-    const m = c.parseFormulaSync(h, i, o), { formula1: p } = m, b = this._calc(d, r), { a: y, d: g } = e.getTransform(), C = bn(b.left, y), v = bn(b.top, g), I = Yr.create().composeMatrix({
+    const f = c.parseFormulaSync(g, i, o), { formula1: h } = f, M = this._calc(d, r), { a: y, d: w } = e.getTransform(), C = Mn(M.left, y), p = Mn(M.top, w), I = Yr.create().composeMatrix({
       left: C,
-      top: v,
+      top: p,
       scaleX: 1,
       scaleY: 1,
       angle: 0,
@@ -2265,16 +2265,16 @@ let rn = class {
       skewY: 0,
       flipX: !1,
       flipY: !1
-    }), w = d.endX - d.startX, _ = d.endY - d.startY;
-    e.save(), e.beginPath(), e.rect(d.startX, d.startY, w, _), e.clip();
+    }), _ = d.endX - d.startX, v = d.endY - d.startY;
+    e.save(), e.beginPath(), e.rect(d.startX, d.startY, _, v), e.clip();
     const R = I.getMatrix();
     e.transform(R[0], R[1], R[2], R[3], R[4], R[5]);
-    const L = ((O = r == null ? void 0 : r.fs) != null ? O : 10) * 1.6, N = String(u) === String(p), E = this._themeService.getColorFromTheme("primary.600");
+    const A = ((D = r == null ? void 0 : r.fs) != null ? D : 10) * 1.6, N = String(u) === String(h), O = this._themeService.getColorFromTheme("primary.600");
     Xr.drawWith(e, {
       checked: N,
-      width: L,
-      height: L,
-      fill: (k = (P = r == null ? void 0 : r.cl) == null ? void 0 : P.rgb) != null ? k : E
+      width: A,
+      height: A,
+      fill: (k = (T = r == null ? void 0 : r.cl) == null ? void 0 : T.rgb) != null ? k : O
     }), e.restore();
   }
   isHit(e, t) {
@@ -2282,16 +2282,16 @@ let rn = class {
     return s <= l && s >= a && d <= o && d >= i;
   }
   async onPointerDown(e, t) {
-    var p;
+    var h;
     if (t.button === 2)
       return;
     const { primaryWithCoord: r, unitId: n, subUnitId: i, worksheet: o, row: a, col: l } = e, s = re(o.getCellRaw(a, l)), d = this._dataValidationModel.getRuleByLocation(n, i, a, l);
     if (!d)
       return;
     const u = this._dataValidationModel.getValidator(d.type);
-    if (!u || !((p = u.skipDefaultFontRender) != null && p.call(u, d, s, { unitId: n, subUnitId: i, row: a, column: l })))
+    if (!u || !((h = u.skipDefaultFontRender) != null && h.call(u, d, s, { unitId: n, subUnitId: i, row: a, column: l })))
       return;
-    const { formula1: h, formula2: c } = await this._parseFormula(d, n, i), m = {
+    const { formula1: g, formula2: c } = await this._parseFormula(d, n, i), f = {
       range: {
         startColumn: r.actualColumn,
         endColumn: r.actualColumn,
@@ -2299,13 +2299,13 @@ let rn = class {
         endRow: r.actualRow
       },
       value: {
-        v: String(s) === si(String(h)) ? c : h,
+        v: String(s) === si(String(g)) ? c : g,
         p: null
       }
     };
     this._commandService.executeCommand(
       st.id,
-      m
+      f
     );
   }
   onPointerEnter(e, t) {
@@ -2317,40 +2317,40 @@ let rn = class {
     (n = (r = Ke(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(ze.DEFAULT);
   }
 };
-rn = Do([
-  Ye(0, te),
-  Ye(1, ce),
-  Ye(2, M(ii)),
-  Ye(3, M(Xn)),
-  Ye(4, M(xe)),
-  Ye(5, M(ie))
-], rn);
+on = Do([
+  je(0, ee),
+  je(1, de),
+  je(2, E(ii)),
+  je(3, E(Xn)),
+  je(4, E(Fe)),
+  je(5, E(ie))
+], on);
 var Vo = Object.getOwnPropertyDescriptor, Oo = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Vo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, To = (e, t) => (r, n) => t(r, n, e);
-let Ce = class {
+let _e = class {
   constructor(e) {
     V(this, "canvasRender", null);
     V(this, "dropdownType");
     V(this, "optionsInput");
-    V(this, "formulaInput", hn);
+    V(this, "formulaInput", gn);
     this.injector = e;
   }
 };
-Ce = Oo([
-  To(0, M(be))
-], Ce);
-class Po extends Ce {
+_e = Oo([
+  To(0, E(be))
+], _e);
+class Po extends _e {
   constructor() {
     super(...arguments);
     V(this, "id", j.CHECKBOX);
-    V(this, "canvasRender", this.injector.createInstance(rn));
+    V(this, "canvasRender", this.injector.createInstance(on));
     V(this, "formulaInput", sr);
   }
 }
-class Ao extends Ce {
+class Ao extends _e {
   constructor() {
     super(...arguments);
     V(this, "id", j.CUSTOM);
@@ -2358,23 +2358,23 @@ class Ao extends Ce {
   }
 }
 const Lo = "data-validation.formula-input";
-class ko extends Ce {
+class ko extends _e {
   constructor() {
     super(...arguments);
     V(this, "id", j.DATE);
     V(this, "formulaInput", Lo);
     V(this, "optionsInput", Vt.componentKey);
-    V(this, "dropdownType", ve.DATE);
+    V(this, "dropdownType", pe.DATE);
   }
 }
-class No extends Ce {
+class No extends _e {
   constructor() {
     super(...arguments);
     V(this, "id", j.DECIMAL);
     V(this, "formulaInput", Pt);
   }
 }
-const Er = 4, Uo = 0, $t = 4, Dr = 4, on = 6, Ot = 6, Ve = 14;
+const Er = 4, Uo = 0, $t = 4, Dr = 4, an = 6, Ot = 6, De = 14;
 function Fo(e, t) {
   const r = Zr.getTextSize(e, t), n = r.width + Er * 2, { ba: i, bd: o } = r, a = i + o;
   return {
@@ -2384,17 +2384,17 @@ function Fo(e, t) {
   };
 }
 function jt(e, t, r, n) {
-  const i = Ve + on * 2, o = r - i, a = n - Ot * 2, l = e.map((c) => ({
+  const i = De + an * 2, o = r - i, a = n - Ot * 2, l = e.map((c) => ({
     layout: Fo(c, t),
     text: c
   }));
   let s;
   const d = [];
   l.forEach((c) => {
-    const { layout: m } = c, { width: p, height: b } = m;
-    !s || s.width + p + $t > o ? (s = {
-      width: p,
-      height: b,
+    const { layout: f } = c, { width: h, height: M } = f;
+    !s || s.width + h + $t > o ? (s = {
+      width: h,
+      height: M,
       items: [{
         ...c,
         left: 0
@@ -2402,18 +2402,18 @@ function jt(e, t, r, n) {
     }, d.push(s)) : (s.items.push({
       ...c,
       left: s.width + $t
-    }), s.width = s.width + p + $t);
+    }), s.width = s.width + h + $t);
   });
-  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 + Dr;
+  let u = 0, g = 0;
+  return d.forEach((c, f) => {
+    g = Math.max(g, c.width), f === d.length - 1 ? u += c.height : u += c.height + Dr;
   }), {
     lines: d,
     totalHeight: u,
     contentWidth: o,
     contentHeight: a,
     cellAutoHeight: u + Ot * 2,
-    calcAutoWidth: h + i
+    calcAutoWidth: g + i
   };
 }
 const xo = 8;
@@ -2424,7 +2424,7 @@ class Bo extends Kr {
       width: l.width,
       height: l.height,
       radius: xo,
-      fill: o || Pe
+      fill: o || Te
     }), t.translateWithPrecision(Er, l.ba), t.font = n, t.fillStyle = a, t.fillText(s, 0, 0), t.restore();
   }
 }
@@ -2434,7 +2434,7 @@ var Wo = Object.getOwnPropertyDescriptor, Ho = (e, t, r, n) => {
   return i;
 }, St = (e, t) => (r, n) => t(r, n, e);
 const $o = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
-let an = class {
+let sn = class {
   constructor(e, t, r, n) {
     V(this, "zIndex");
     V(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
@@ -2448,105 +2448,105 @@ let an = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, r, n, i) {
-    const o = r - Ve + 4;
+    const o = r - De + 4;
     let a = 4;
     switch (i) {
-      case de.MIDDLE:
-        a = (n - Ve) / 2 + 4;
+      case le.MIDDLE:
+        a = (n - De) / 2 + 4;
         break;
-      case de.BOTTOM:
-        a = n - Ve + 4;
+      case le.BOTTOM:
+        a = n - De + 4;
         break;
     }
     e.save(), e.translateWithPrecision(t.startX + o, t.startY + a), e.fillStyle = "#565656", e.fill($o), e.restore();
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(e, t, r, n) {
-    var ne, oe;
-    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: p = 0, downOffset: b = 0 } = h || {}, y = this._ensureMap(d), g = this._generateKey(o, a), C = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, o, a);
-    if (!C)
+    var oe, Se;
+    const { primaryWithCoord: i, row: o, col: a, style: l, data: s, subUnitId: d } = t, u = i.isMergedMainCell ? i.mergeInfo : i, g = s == null ? void 0 : s.fontRenderExtension, { leftOffset: c = 0, rightOffset: f = 0, topOffset: h = 0, downOffset: M = 0 } = g || {}, y = this._ensureMap(d), w = this._generateKey(o, a), C = i.isMergedMainCell ? i.mergeInfo.startRow : o, p = i.isMergedMainCell ? i.mergeInfo.startColumn : a, I = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, C, p);
+    if (!I)
       return;
-    const v = this._dataValidationModel.getValidator(C.type);
-    if (!v)
+    const _ = this._dataValidationModel.getValidator(I.type);
+    if (!_)
       return;
-    const I = {
+    const v = {
       startX: u.startX + c,
-      endX: u.endX - m,
-      startY: u.startY + p,
-      endY: u.endY - b
-    }, w = I.endX - I.startX, _ = I.endY - I.startY, { cl: R } = l || {}, L = (ne = typeof R == "object" ? R == null ? void 0 : R.rgb : R) != null ? ne : "#000", N = Te(l != null ? l : void 0), { vt: E, ht: T } = l || {}, O = E != null ? E : de.MIDDLE, P = (oe = re(s)) != null ? oe : "", k = v.parseCellValue(P), H = v.getListWithColorMap(C), B = jt(k, N, w, _);
-    this._drawDownIcon(e, I, w, _, O), e.save(), e.translateWithPrecision(I.startX, I.startY), e.beginPath(), e.rect(0, 0, w - Ve, _), e.clip(), e.translateWithPrecision(on, Ot);
-    let J = 0;
-    switch (O) {
-      case de.MIDDLE:
-        J = (B.contentHeight - B.totalHeight) / 2;
+      endX: u.endX - f,
+      startY: u.startY + h,
+      endY: u.endY - M
+    }, R = v.endX - v.startX, A = v.endY - v.startY, { cl: N } = l || {}, O = (oe = typeof N == "object" ? N == null ? void 0 : N.rgb : N) != null ? oe : "#000", L = Oe(l != null ? l : void 0), { vt: D, ht: T } = l || {}, k = D != null ? D : le.MIDDLE, B = (Se = re(s)) != null ? Se : "", z = _.parseCellValue(B), te = _.getListWithColorMap(I), W = jt(z, L, R, A);
+    this._drawDownIcon(e, v, R, A, k), e.save(), e.translateWithPrecision(v.startX, v.startY), e.beginPath(), e.rect(0, 0, R - De, A), e.clip(), e.translateWithPrecision(an, Ot);
+    let ne = 0;
+    switch (k) {
+      case le.MIDDLE:
+        ne = (W.contentHeight - W.totalHeight) / 2;
         break;
-      case de.BOTTOM:
-        J = B.contentHeight - B.totalHeight;
+      case le.BOTTOM:
+        ne = W.contentHeight - W.totalHeight;
         break;
     }
-    e.translateWithPrecision(0, J), B.lines.forEach((he, z) => {
+    e.translateWithPrecision(0, ne), W.lines.forEach((Ce, G) => {
       e.save();
-      const { width: Z, height: fe, items: Q } = he;
-      let q = 0;
+      const { width: Z, height: ve, items: q } = Ce;
+      let b = 0;
       switch (T) {
         case Re.RIGHT:
-          q = B.contentWidth - Z;
+          b = W.contentWidth - Z;
           break;
         case Re.CENTER:
-          q = (B.contentWidth - Z) / 2;
+          b = (W.contentWidth - Z) / 2;
           break;
       }
-      e.translate(q, z * (fe + Dr)), Q.forEach((G) => {
-        e.save(), e.translateWithPrecision(G.left, 0), Bo.drawWith(e, {
-          ...N,
-          info: G,
-          color: L,
-          fill: H[G.text]
+      e.translate(b, G * (ve + Dr)), q.forEach((U) => {
+        e.save(), e.translateWithPrecision(U.left, 0), Bo.drawWith(e, {
+          ...L,
+          info: U,
+          color: O,
+          fill: te[U.text]
         }), e.restore();
       }), e.restore();
-    }), e.restore(), y.set(g, {
-      left: I.startX,
-      top: I.startY,
-      width: B.contentWidth + on + Ve,
-      height: B.contentHeight + Ot * 2
+    }), e.restore(), y.set(w, {
+      left: v.startX,
+      top: v.startY,
+      width: W.contentWidth + an + De,
+      height: W.contentHeight + Ot * 2
     });
   }
   calcCellAutoHeight(e) {
-    var w;
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
-      startX: h.startX + l,
-      endX: h.endX - s,
-      startY: h.startY + d,
-      endY: h.endY - u
-    }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
-    if (!m)
+    var _;
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, g = t.isMergedMainCell ? t.mergeInfo : t, c = {
+      startX: g.startX + l,
+      endX: g.endX - s,
+      startY: g.startY + d,
+      endY: g.endY - u
+    }, f = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
+    if (!f)
       return;
-    const p = this._dataValidationModel.getValidator(m.type);
-    if (!p)
+    const h = this._dataValidationModel.getValidator(f.type);
+    if (!h)
       return;
-    const b = c.endX - c.startX, y = c.endY - c.startY, g = (w = re(n)) != null ? w : "", C = p.parseCellValue(g), v = Te(r != null ? r : void 0);
-    return jt(C, v, b, y).cellAutoHeight;
+    const M = c.endX - c.startX, y = c.endY - c.startY, w = (_ = re(n)) != null ? _ : "", C = h.parseCellValue(w), p = Oe(r != null ? r : void 0);
+    return jt(C, p, M, y).cellAutoHeight;
   }
   calcCellAutoWidth(e) {
-    var w;
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, h = t.isMergedMainCell ? t.mergeInfo : t, c = {
-      startX: h.startX + l,
-      endX: h.endX - s,
-      startY: h.startY + d,
-      endY: h.endY - u
-    }, m = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
-    if (!m)
+    var _;
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: d = 0, downOffset: u = 0 } = a || {}, g = t.isMergedMainCell ? t.mergeInfo : t, c = {
+      startX: g.startX + l,
+      endX: g.endX - s,
+      startY: g.startY + d,
+      endY: g.endY - u
+    }, f = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
+    if (!f)
       return;
-    const p = this._dataValidationModel.getValidator(m.type);
-    if (!p)
+    const h = this._dataValidationModel.getValidator(f.type);
+    if (!h)
       return;
-    const b = c.endX - c.startX, y = c.endY - c.startY, g = (w = re(n)) != null ? w : "", C = p.parseCellValue(g), v = Te(r != null ? r : void 0);
-    return jt(C, v, b, y).calcAutoWidth;
+    const M = c.endX - c.startX, y = c.endY - c.startY, w = (_ = re(n)) != null ? _ : "", C = h.parseCellValue(w), p = Oe(r != null ? r : void 0);
+    return jt(C, p, M, y).calcAutoWidth;
   }
   isHit(e, t) {
     const { primaryWithCoord: r } = t, n = r.isMergedMainCell ? r.mergeInfo : r, { endX: i } = n, { x: o } = e;
-    return o >= i - Ve && o <= i;
+    return o >= i - De && o <= i;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2568,18 +2568,18 @@ let an = class {
     return (n = (r = Ke(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null ? void 0 : n.setCursor(ze.DEFAULT);
   }
 };
-an = Ho([
-  St(0, te),
-  St(1, ce),
-  St(2, M(xe)),
-  St(3, M(ie))
-], an);
-class jo extends Ce {
+sn = Ho([
+  St(0, ee),
+  St(1, de),
+  St(2, E(Fe)),
+  St(3, E(ie))
+], sn);
+class jo extends _e {
   constructor() {
     super(...arguments);
     V(this, "id", j.LIST_MULTIPLE);
-    V(this, "canvasRender", this.injector.createInstance(an));
-    V(this, "dropdownType", ve.MULTIPLE_LIST);
+    V(this, "canvasRender", this.injector.createInstance(sn));
+    V(this, "dropdownType", pe.MULTIPLE_LIST);
   }
 }
 var Yo = Object.getOwnPropertyDescriptor, Xo = (e, t, r, n) => {
@@ -2587,15 +2587,15 @@ var Yo = Object.getOwnPropertyDescriptor, Xo = (e, t, r, n) => {
     (a = e[o]) && (i = a(i) || i);
   return i;
 }, at = (e, t) => (r, n) => t(r, n, e);
-const De = 4, Ct = 4, ge = 14, xn = 1, _e = 6, Xe = 3, Yt = 8, Zo = "#565656", Bn = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
+const Ye = 4, Ct = 4, ge = 14, Yt = 1, we = 6, Xe = 3, Xt = 8, Zo = "#565656", Bn = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
 function Wn(e, t, r, n, i, o, a = !0) {
   let l = 0;
   const s = a ? Xe : 0;
   switch (i) {
-    case de.BOTTOM:
+    case le.BOTTOM:
       l = t - n - s;
       break;
-    case de.MIDDLE:
+    case le.MIDDLE:
       l = (t - n) / 2;
       break;
     default:
@@ -2612,12 +2612,12 @@ function Wn(e, t, r, n, i, o, a = !0) {
       d = e - r;
       break;
   }
-  return d = Math.max(_e, d), {
+  return d = Math.max(we, d), {
     paddingLeft: d,
     paddingTop: l
   };
 }
-let sn = class {
+let ln = class {
   constructor(e, t, r, n, i) {
     V(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     V(this, "zIndex");
@@ -2631,13 +2631,13 @@ let sn = class {
     return `${e}.${t}`;
   }
   _drawDownIcon(e, t, r, n, i, o, a) {
-    const { t: l = ae.pd.t, b: s = ae.pd.b } = a, d = r - ge;
+    const { t: l = Q.pd.t, b: s = Q.pd.b } = a, d = r - ge;
     let u;
     switch (o) {
-      case de.MIDDLE:
+      case le.MIDDLE:
         u = (n - Ct) / 2;
         break;
-      case de.BOTTOM:
+      case le.BOTTOM:
         u = n - s - i - Xe + (i / 2 - Ct / 2);
         break;
       default:
@@ -2648,157 +2648,157 @@ let sn = class {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(e, t, r) {
-    var H, B, J, ne, oe, he;
-    const { primaryWithCoord: n, row: i, col: o, style: a, data: l, subUnitId: s } = t, d = n.isMergedMainCell ? n.mergeInfo : n, u = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, i, o);
-    if (!u)
+    var te, W, ne, oe, Se, Ce;
+    const { primaryWithCoord: n, row: i, col: o, style: a, data: l, subUnitId: s } = t, d = n.isMergedMainCell ? n.mergeInfo : n, u = n.isMergedMainCell ? n.mergeInfo.startRow : i, g = n.isMergedMainCell ? n.mergeInfo.startColumn : o, c = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, u, g);
+    if (!c)
       return;
-    const h = this._dataValidationModel.getValidator(u.type);
-    if (!h)
+    const f = this._dataValidationModel.getValidator(c.type);
+    if (!f)
       return;
-    const c = l == null ? void 0 : l.fontRenderExtension, { leftOffset: m = 0, rightOffset: p = 0, topOffset: b = 0, downOffset: y = 0 } = c || {};
-    if (!u || !h || !h || h.id.indexOf(j.LIST) !== 0 || !h.skipDefaultFontRender(u))
+    const h = l == null ? void 0 : l.fontRenderExtension, { leftOffset: M = 0, rightOffset: y = 0, topOffset: w = 0, downOffset: C = 0 } = h || {};
+    if (!c || !f || !f || f.id.indexOf(j.LIST) !== 0 || !f.skipDefaultFontRender(c))
       return;
-    const g = {
-      startX: d.startX + m,
-      endX: d.endX - p,
-      startY: d.startY + b,
-      endY: d.endY - y
-    }, C = g.endX - g.startX, v = g.endY - g.startY, I = this._ensureMap(s), w = this._generateKey(i, o), _ = h.getListWithColor(u), R = re(l), L = `${R != null ? R : ""}`, N = _.find((z) => z.label === L);
-    let { tb: E, vt: T, ht: O, pd: P } = a || {};
-    E = E != null ? E : me.WRAP, T = T != null ? T : de.BOTTOM, O = O != null ? O : ae.ht, P = P != null ? P : ae.pd;
-    const k = Te(a).fontCache;
-    if (u.renderMode === se.ARROW) {
-      const { l: z = ae.pd.l, t: Z = ae.pd.t, r: fe = ae.pd.r, b: Q = ae.pd.b } = P, q = C - z - fe - ge - 4, G = new it(
-        L,
-        k,
-        E === me.WRAP,
-        q,
+    const p = {
+      startX: d.startX + M,
+      endX: d.endX - y,
+      startY: d.startY + w,
+      endY: d.endY - C
+    }, I = p.endX - p.startX, _ = p.endY - p.startY, v = this._ensureMap(s), R = this._generateKey(i, o), A = f.getListWithColor(c), N = re(l), O = `${N != null ? N : ""}`, L = A.find((G) => G.label === O);
+    let { tb: D, vt: T, ht: k, pd: B } = a || {};
+    D = D != null ? D : fe.WRAP, T = T != null ? T : le.BOTTOM, k = k != null ? k : Q.ht, B = B != null ? B : Q.pd;
+    const z = Oe(a).fontCache;
+    if (c.renderMode === ae.ARROW) {
+      const { l: G = Q.pd.l, t: Z = Q.pd.t, r: ve = Q.pd.r, b: q = Q.pd.b } = B, b = I - G - ve - ge - 4, U = new it(
+        O,
+        z,
+        D === fe.WRAP,
+        b,
         1 / 0
       );
-      G.calculate();
-      const D = G.getTotalWidth(), U = G.getTotalHeight(), { paddingTop: f, paddingLeft: A } = Wn(q, v - Z - Q, D, U, T, O, !0);
-      this._drawDownIcon(e, g, C, v, U, T, P), e.save(), e.translateWithPrecision(g.startX + z, g.startY + Z), e.beginPath(), e.rect(0, 0, C - z - fe, v - Z - Q), e.clip(), e.translateWithPrecision(0, f), e.save(), e.translateWithPrecision(De, 0), e.beginPath(), e.rect(0, 0, q, U), e.clip(), Mn.drawWith(e, {
-        text: L,
-        fontStyle: k,
-        width: q,
-        height: U,
-        color: (H = a == null ? void 0 : a.cl) == null ? void 0 : H.rgb,
-        strokeLine: !!((B = a == null ? void 0 : a.st) != null && B.s),
-        underline: !!((J = a == null ? void 0 : a.ul) != null && J.s),
-        warp: E === me.WRAP,
+      U.calculate();
+      const m = U.getTotalWidth(), P = U.getTotalHeight(), { paddingTop: x, paddingLeft: ue } = Wn(b, _ - Z - q, m, P, T, k, !0);
+      this._drawDownIcon(e, p, I, _, P, T, B), e.save(), e.translateWithPrecision(p.startX + G, p.startY + Z), e.beginPath(), e.rect(0, 0, I - G - ve, _ - Z - q), e.clip(), e.translateWithPrecision(0, x), e.save(), e.translateWithPrecision(ue, 0), e.beginPath(), e.rect(0, 0, b, P), e.clip(), En.drawWith(e, {
+        text: O,
+        fontStyle: z,
+        width: b,
+        height: P,
+        color: (te = a == null ? void 0 : a.cl) == null ? void 0 : te.rgb,
+        strokeLine: !!((W = a == null ? void 0 : a.st) != null && W.s),
+        underline: !!((ne = a == null ? void 0 : a.ul) != null && ne.s),
+        warp: D === fe.WRAP,
         hAlign: Re.LEFT
-      }, G), e.translateWithPrecision(A, 0), e.restore(), e.restore(), I.set(w, {
-        left: g.endX + z + r.rowHeaderWidth - ge,
-        top: g.startY + Z + r.columnHeaderHeight,
+      }, U), e.restore(), e.restore(), v.set(R, {
+        left: p.endX - ge + r.rowHeaderWidth,
+        top: p.startY + Z + r.columnHeaderHeight,
         width: ge,
-        height: v - Z - Q
+        height: _ - Z - q
       });
     } else {
-      e.save(), e.translateWithPrecision(g.startX, g.startY), e.beginPath(), e.rect(0, 0, C, v), e.clip();
-      const z = C - _e * 2 - De - ge - 4, Z = new it(
-        L,
-        k,
-        E === me.WRAP,
+      e.save(), e.translateWithPrecision(p.startX, p.startY), e.beginPath(), e.rect(0, 0, I, _), e.clip();
+      const G = I - we * 2 - Ye - ge - 4, Z = new it(
+        O,
         z,
+        D === fe.WRAP,
+        G,
         1 / 0
       );
       Z.calculate();
-      const fe = Z.getTotalWidth(), Q = Z.getTotalHeight(), q = Q + xn * 2, G = Math.max(C - _e * 2, 1), { paddingTop: D, paddingLeft: U } = Wn(G, v, fe, q, T, O);
-      e.translateWithPrecision(_e, D), zn.drawWith(e, {
+      const ve = Z.getTotalWidth(), q = Z.getTotalHeight(), b = q + Yt * 2, U = Math.max(I - we * 2, 1), { paddingTop: m } = Wn(U, _, ve, b, T, k);
+      e.translateWithPrecision(we, m), zn.drawWith(e, {
+        width: U,
+        height: b,
+        fill: (L == null ? void 0 : L.color) || Te,
+        radius: Xt
+      }), e.save(), e.translateWithPrecision(Ye, Yt), e.beginPath(), e.rect(0, 0, G, q), e.clip(), En.drawWith(e, {
+        text: O,
+        fontStyle: z,
         width: G,
         height: q,
-        fill: (N == null ? void 0 : N.color) || Pe,
-        radius: Yt
-      }), e.save(), e.translateWithPrecision(De, xn), e.beginPath(), e.rect(0, 0, z, Q), e.clip(), e.translateWithPrecision(U, 0), Mn.drawWith(e, {
-        text: L,
-        fontStyle: k,
-        width: z,
-        height: Q,
-        color: (ne = a == null ? void 0 : a.cl) == null ? void 0 : ne.rgb,
-        strokeLine: !!((oe = a == null ? void 0 : a.st) != null && oe.s),
-        underline: !!((he = a == null ? void 0 : a.ul) != null && he.s),
-        warp: E === me.WRAP,
+        color: (oe = a == null ? void 0 : a.cl) == null ? void 0 : oe.rgb,
+        strokeLine: !!((Se = a == null ? void 0 : a.st) != null && Se.s),
+        underline: !!((Ce = a == null ? void 0 : a.ul) != null && Ce.s),
+        warp: D === fe.WRAP,
         hAlign: Re.LEFT
-      }, Z), e.restore(), e.translateWithPrecision(z + De + 4, (Q - Ct) / 2), e.fillStyle = Zo, e.fill(Bn), e.restore(), I.set(w, {
-        left: g.startX + _e + r.rowHeaderWidth,
-        top: g.startY + D + r.columnHeaderHeight,
-        width: G,
-        height: q
+      }, Z), e.restore(), e.translateWithPrecision(G + Ye + 4, (q - Ct) / 2), e.fillStyle = Zo, e.fill(Bn), e.restore(), v.set(R, {
+        left: p.startX + we + r.rowHeaderWidth,
+        top: p.startY + m + r.columnHeaderHeight,
+        width: U,
+        height: b
       });
     }
   }
   calcCellAutoHeight(e) {
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
-    if (!c || c.renderMode === se.TEXT)
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: g = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
+    if (!c || c.renderMode === ae.TEXT)
       return;
-    const m = {
+    const f = {
       startX: a.startX + s,
       endX: a.endX - d,
       startY: a.startY + u,
-      endY: a.endY - h
-    }, p = m.endX - m.startX, b = re(n), y = `${b != null ? b : ""}`;
-    let { tb: g, pd: C } = r || {};
-    const { t: v = ae.pd.t, b: I = ae.pd.b } = C != null ? C : {};
-    if (g = g != null ? g : me.WRAP, c.renderMode === se.ARROW) {
-      const w = p - ge, _ = new it(
+      endY: a.endY - g
+    }, h = f.endX - f.startX, M = re(n), y = `${M != null ? M : ""}`;
+    let { tb: w, pd: C } = r || {};
+    const { t: p = Q.pd.t, b: I = Q.pd.b } = C != null ? C : {};
+    if (w = w != null ? w : fe.WRAP, c.renderMode === ae.ARROW) {
+      const { l: _ = Q.pd.l, r: v = Q.pd.r } = C != null ? C : {}, R = h - _ - v - ge - 4, A = new it(
         y,
-        Te(r).fontCache,
-        g === me.WRAP,
-        w,
+        Oe(r).fontCache,
+        w === fe.WRAP,
+        R,
         1 / 0
       );
-      return _.calculate(), _.getTotalHeight() + v + I + Xe * 2;
+      return A.calculate(), A.getTotalHeight() + p + I + Xe * 2;
     } else {
-      const w = Math.max(p - _e * 2 - De - ge, 10), _ = new it(
+      const _ = Math.max(h - we * 2 - Ye - ge - 4, 10), v = new it(
         y,
-        Te(r).fontCache,
-        g === me.WRAP,
-        w,
+        Oe(r).fontCache,
+        w === fe.WRAP,
+        _,
         1 / 0
       );
-      return _.calculate(), _.getTotalHeight() + Xe * 2 + 2;
+      return v.calculate(), v.getTotalHeight() + Xe * 2 + Yt * 2;
     }
   }
   calcCellAutoWidth(e) {
-    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
-    if (!c || c.renderMode === se.TEXT)
+    const { primaryWithCoord: t, style: r, data: n, row: i, col: o } = e, a = t.isMergedMainCell ? t.mergeInfo : t, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: d = 0, topOffset: u = 0, downOffset: g = 0 } = l || {}, c = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, o);
+    if (!c || c.renderMode === ae.TEXT)
       return;
-    const m = {
+    const f = {
       startX: a.startX + s,
       endX: a.endX - d,
       startY: a.startY + u,
-      endY: a.endY - h
-    }, p = m.endX - m.startX, b = re(n), y = `${b != null ? b : ""}`;
-    let { tb: g, pd: C } = r || {};
-    const { l: v = ae.pd.l, r: I = ae.pd.r } = C != null ? C : {};
-    g = g != null ? g : me.WRAP;
-    let w = _e * 2 + ge;
+      endY: a.endY - g
+    }, h = f.endX - f.startX, M = re(n), y = `${M != null ? M : ""}`;
+    let { tb: w, pd: C } = r || {};
+    const { l: p = Q.pd.l, r: I = Q.pd.r } = C != null ? C : {};
+    w = w != null ? w : fe.WRAP;
+    let _ = we * 2 + ge;
     switch (c.renderMode) {
-      case se.ARROW:
-        w = ge + _e * 2 + I + v;
+      case ae.ARROW:
+        _ = ge + 4 + I + p;
         break;
-      case se.CUSTOM:
-        w = ge + _e * 2 + De * 2 + I + v + Yt / 2 + 1;
+      case ae.CUSTOM:
+        _ = ge + we * 2 + Ye * 2 + I + p + Xt / 2 + 1;
         break;
       // default is CUSTOM
       default:
-        w = ge + _e * 2 + De * 2 + I + v + Yt / 2 + 1;
+        _ = ge + we * 2 + Ye * 2 + I + p + Xt / 2 + 1;
     }
-    const _ = p - w, R = new it(
+    const v = h - _, R = new it(
       y,
-      Te(r).fontCache,
-      g === me.WRAP,
-      _,
+      Oe(r).fontCache,
+      w === fe.WRAP,
+      v,
       1 / 0
     );
-    return R.calculate(), R.getTotalWidth() + w;
+    return R.calculate(), R.getTotalWidth() + _;
   }
   isHit(e, t) {
     const { subUnitId: r, row: n, col: i } = t, a = this._ensureMap(r).get(this._generateKey(n, i)), l = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, n, i);
-    if (!l || !a || l.renderMode === se.TEXT)
+    if (!l || !a || l.renderMode === ae.TEXT)
       return !1;
-    const { top: s, left: d, width: u, height: h } = a, { x: c, y: m } = e;
-    return c >= d && c <= d + u && m >= s && m <= s + h;
+    const { top: s, left: d, width: u, height: g } = a, { x: c, y: f } = e;
+    return c >= d && c <= d + u && f >= s && f <= s + g;
   }
   onPointerDown(e, t) {
     if (t.button === 2)
@@ -2820,31 +2820,31 @@ let sn = class {
     (n = (r = Ke(X.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.mainComponent) == null || n.setCursor(ze.DEFAULT);
   }
 };
-sn = Xo([
-  at(0, ce),
-  at(1, M(ue)),
-  at(2, te),
-  at(3, M(xe)),
-  at(4, M(ie))
-], sn);
-class Ko extends Ce {
+ln = Xo([
+  at(0, de),
+  at(1, E(ce)),
+  at(2, ee),
+  at(3, E(Fe)),
+  at(4, E(ie))
+], ln);
+class Ko extends _e {
   constructor() {
     super(...arguments);
     V(this, "id", j.LIST);
-    V(this, "canvasRender", this.injector.createInstance(sn));
-    V(this, "dropdownType", ve.LIST);
+    V(this, "canvasRender", this.injector.createInstance(ln));
+    V(this, "dropdownType", pe.LIST);
     V(this, "optionsInput", Dt.componentKey);
-    V(this, "formulaInput", hn);
+    V(this, "formulaInput", gn);
   }
 }
-class zo extends Ce {
+class zo extends _e {
   constructor() {
     super(...arguments);
     V(this, "id", j.TEXT_LENGTH);
     V(this, "formulaInput", Pt);
   }
 }
-class Go extends Ce {
+class Go extends _e {
   constructor() {
     super(...arguments);
     V(this, "id", j.WHOLE);
@@ -2855,8 +2855,8 @@ var qo = Object.getOwnPropertyDescriptor, Jo = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? qo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Xt = (e, t) => (r, n) => t(r, n, e);
-let nt = class extends dn {
+}, Zt = (e, t) => (r, n) => t(r, n, e);
+let nt = class extends cn {
   constructor(e, t, r) {
     super(), this._injector = e, this._componentManger = t, this._dataValidatorRegistryService = r, this._initComponents(), this._registerValidatorViews();
   }
@@ -2891,15 +2891,15 @@ let nt = class extends dn {
   }
 };
 nt = Jo([
-  Xt(0, M(be)),
-  Xt(1, M(vn)),
-  Xt(2, M(Me))
+  Zt(0, E(be)),
+  Zt(1, E(fn)),
+  Zt(2, E(Me))
 ], nt);
 var Qo = Object.getOwnPropertyDescriptor, ea = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? Qo(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Zt = (e, t) => (r, n) => t(r, n, e);
+}, Kt = (e, t) => (r, n) => t(r, n, e);
 const ta = "SHEET_DATA_VALIDATION_UI_PLUGIN";
 var wt;
 let Hn = (wt = class extends Zn {
@@ -2910,12 +2910,12 @@ let Hn = (wt = class extends Zn {
       bt,
       this._config
     );
-    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(_n, o);
+    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(Sn, o);
   }
   onStarting() {
     [
-      [Se],
-      [Fe],
+      [me],
+      [Ue],
       [ht],
       [Je],
       [tt],
@@ -2928,15 +2928,15 @@ let Hn = (wt = class extends Zn {
       kt,
       Lt,
       _r,
-      Sn,
-      We,
+      Cn,
+      Be,
       mr
     ].forEach((e) => {
       this._commandService.registerCommand(e);
     });
   }
   onReady() {
-    this._injector.get(Qe), this._injector.get(et), this._injector.get(xe).registerRenderModule(
+    this._injector.get(Qe), this._injector.get(et), this._injector.get(Fe).registerRenderModule(
       X.UNIVER_SHEET,
       [Et]
     );
@@ -2949,15 +2949,15 @@ let Hn = (wt = class extends Zn {
   }
 }, V(wt, "pluginName", ta), V(wt, "type", X.UNIVER_SHEET), wt);
 Hn = ea([
-  Zt(1, M(be)),
-  Zt(2, te),
-  Zt(3, ln)
+  Kt(1, E(be)),
+  Kt(2, ee),
+  Kt(3, dn)
 ], Hn);
 var na = Object.defineProperty, ra = Object.getOwnPropertyDescriptor, ia = (e, t, r) => t in e ? na(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, oa = (e, t, r, n) => {
   for (var i = n > 1 ? void 0 : n ? ra(t, r) : t, o = e.length - 1, a; o >= 0; o--)
     (a = e[o]) && (i = a(i) || i);
   return i;
-}, Kt = (e, t) => (r, n) => t(r, n, e), Vr = (e, t, r) => ia(e, typeof t != "symbol" ? t + "" : t, r);
+}, zt = (e, t) => (r, n) => t(r, n, e), Vr = (e, t, r) => ia(e, typeof t != "symbol" ? t + "" : t, r);
 const aa = "SHEET_DATA_VALIDATION_UI_PLUGIN";
 let Tt = class extends Zn {
   constructor(e = bt, t, r, n) {
@@ -2967,12 +2967,12 @@ let Tt = class extends Zn {
       bt,
       this._config
     );
-    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(_n, o);
+    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(Sn, o);
   }
   onStarting() {
     [
-      [Se],
-      [Fe],
+      [me],
+      [Ue],
       [ht],
       [Je],
       [tt],
@@ -2986,15 +2986,15 @@ let Tt = class extends Zn {
       kt,
       Lt,
       _r,
-      Sn,
-      We,
+      Cn,
+      Be,
       mr
     ].forEach((e) => {
       this._commandService.registerCommand(e);
     });
   }
   onReady() {
-    this._injector.get(Qe), this._injector.get(et), this._injector.get(qe), this._injector.get(ht), this._injector.get(xe).registerRenderModule(
+    this._injector.get(Qe), this._injector.get(et), this._injector.get(qe), this._injector.get(ht), this._injector.get(Fe).registerRenderModule(
       X.UNIVER_SHEET,
       [Et]
     );
@@ -3010,12 +3010,12 @@ Vr(Tt, "pluginName", aa);
 Vr(Tt, "type", X.UNIVER_SHEET);
 Tt = oa([
   jr(li),
-  Kt(1, M(be)),
-  Kt(2, te),
-  Kt(3, ln)
+  zt(1, E(be)),
+  zt(2, ee),
+  zt(3, dn)
 ], Tt);
 export {
-  Ce as BaseSheetDataValidatorView,
+  _e as BaseSheetDataValidatorView,
   Hn as UniverSheetsDataValidationMobileUIPlugin,
   Tt as UniverSheetsDataValidationUIPlugin
 };