@univerjs/sheets-data-validation-ui 0.6.0 → 0.6.1

package/lib/es/index.js

@@ -31,7 +31,7 @@ let le = class extends Dt {
       {
         handler: async (t, e, o) => {
           var C;
-          const n = await t, { worksheet: a, row: i, col: r, unitId: l, subUnitId: s, workbook: c } = e, u = this._dataValidationModel.getRuleIdByLocation(l, s, i, r), h = u ? this._dataValidationModel.getRuleById(l, s, u) : void 0;
+          const n = await t, { worksheet: a, row: i, col: r, unitId: s, subUnitId: l, workbook: c } = e, u = this._dataValidationModel.getRuleIdByLocation(s, l, i, r), h = u ? this._dataValidationModel.getRuleById(s, l, u) : void 0;
           if (!h || h.errorStyle !== re.STOP)
             return o(Promise.resolve(n));
           const d = await this._dataValidatorRegistryService.getValidatorItem(h.type);
@@ -41,8 +41,8 @@ let le = class extends Dt {
               interceptValue: rt((C = e == null ? void 0 : e.origin) != null ? C : n),
               row: i,
               column: r,
-              unitId: l,
-              subUnitId: s,
+              unitId: s,
+              subUnitId: l,
               worksheet: a,
               workbook: c,
               t: n == null ? void 0 : n.t
@@ -58,7 +58,7 @@ let le = class extends Dt {
             },
             id: "reject-input-dialog",
             children: {
-              title: d.getRuleFinalError(h, { row: i, col: r, unitId: l, subUnitId: s })
+              title: d.getRuleFinalError(h, { row: i, col: r, unitId: s, subUnitId: l })
             },
             footer: {
               title: An.createElement(
@@ -125,7 +125,7 @@ const Ka = "univer-dv-date-dropdown", Ga = "univer-dv-date-dropdown-btns", Un =
 };
 function qa(t) {
   var g;
-  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l, workbook: s } = e, c = L(tt), u = L(le), h = n.getCell(a, i), d = rt(n.getCellRaw(a, i)), v = Za(d), [p, C] = x(v), R = p && p.isValid() ? p : Ze(), f = L(Q), w = L(at), I = w.getRuleByLocation(r, l, a, i);
+  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: s, workbook: l } = e, c = L(tt), u = L(le), h = n.getCell(a, i), d = rt(n.getCellRaw(a, i)), v = Za(d), [p, C] = x(v), R = p && p.isValid() ? p : Ze(), f = L(Q), w = L(at), I = w.getRuleByLocation(r, s, a, i);
   if (!I)
     return null;
   const V = w.getValidator(I.type);
@@ -135,15 +135,15 @@ function qa(t) {
     var k, F, U;
     if (!R)
       return;
-    const T = R.format(_ ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), N = (k = qe.parseDate(T)) == null ? void 0 : k.v, P = s.getStyles().getStyleByCell(h), b = (U = (F = P == null ? void 0 : P.n) == null ? void 0 : F.pattern) != null ? U : "", A = Ra(b);
+    const T = R.format(_ ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), N = (k = qe.parseDate(T)) == null ? void 0 : k.v, P = l.getStyles().getStyleByCell(h), b = (U = (F = P == null ? void 0 : P.n) == null ? void 0 : F.pattern) != null ? U : "", A = Ra(b);
     I.errorStyle !== re.STOP || await V.validator({
       value: N,
       unitId: r,
-      subUnitId: l,
+      subUnitId: s,
       row: a,
       column: i,
       worksheet: n,
-      workbook: s,
+      workbook: l,
       interceptValue: T.replace("Z", "").replace("T", " "),
       t: Ho.NUMBER
     }, I) ? (o(), await c.executeCommand(an.id, {
@@ -153,7 +153,7 @@ function qa(t) {
       keycode: sn.ESC
     }), await c.executeCommand(vn.id, {
       unitId: r,
-      subUnitId: l,
+      subUnitId: s,
       range: {
         startColumn: i,
         endColumn: i,
@@ -172,7 +172,7 @@ function qa(t) {
           }
         }
       }
-    })) : u.showReject(V.getRuleFinalError(I, { row: a, col: i, unitId: r, subUnitId: l }));
+    })) : u.showReject(V.getRuleFinalError(I, { row: a, col: i, unitId: r, subUnitId: s }));
   };
   return /* @__PURE__ */ j("div", { className: Un.dvDateDropdown, children: [
     /* @__PURE__ */ m(
@@ -209,8 +209,8 @@ var ut = function() {
       e.indexOf(n[a]) < 0 && Object.prototype.propertyIsEnumerable.call(t, n[a]) && (o[n[a]] = t[n[a]]);
   return o;
 }, bt = yt(function(t, e) {
-  var o = t.icon, n = t.id, a = t.className, i = t.extend, r = Ja(t, ["icon", "id", "className", "extend"]), l = "univerjs-icon univerjs-icon-".concat(n, " ").concat(a || "").trim(), s = zt("_".concat(ei()));
-  return _o(o, "".concat(n), { defIds: o.defIds, idSuffix: s.current }, ut({ ref: e, className: l }, r), i);
+  var o = t.icon, n = t.id, a = t.className, i = t.extend, r = Ja(t, ["icon", "id", "className", "extend"]), s = "univerjs-icon univerjs-icon-".concat(n, " ").concat(a || "").trim(), l = zt("_".concat(ei()));
+  return _o(o, "".concat(n), { defIds: o.defIds, idSuffix: l.current }, ut({ ref: e, className: s }, r), i);
 });
 function _o(t, e, o, n, a) {
   return Mt(t.tag, ut(ut({ key: e }, Qa(t, o, a)), n), (ti(t, o).children || []).map(function(i, r) {
@@ -219,11 +219,14 @@ function _o(t, e, o, n, a) {
 }
 function Qa(t, e, o) {
   var n = ut({}, t.attrs);
-  o != null && o.colorChannel1 && n.fill === "colorChannel1" && (n.fill = o.colorChannel1);
+  o != null && o.colorChannel1 && n.fill === "colorChannel1" && (n.fill = o.colorChannel1), t.tag === "mask" && n.id && (n.id = n.id + e.idSuffix), Object.entries(n).forEach(function(i) {
+    var r = i[0], s = i[1];
+    r === "mask" && typeof s == "string" && (n[r] = s.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+  });
   var a = e.defIds;
   return !a || a.length === 0 || (t.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + e.idSuffix), Object.entries(n).forEach(function(i) {
-    var r = i[0], l = i[1];
-    typeof l == "string" && (n[r] = l.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+    var r = i[0], s = i[1];
+    typeof s == "string" && (n[r] = s.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), n;
 }
 function ti(t, e) {
@@ -369,14 +372,14 @@ var hi = Object.getOwnPropertyDescriptor, pi = (t, e, o, n) => {
   return a;
 }, Ot = (t, e) => (o, n) => e(o, n, t);
 let Rt = class extends Dt {
-  constructor(e, o, n, a, i, r, l) {
+  constructor(e, o, n, a, i, r, s) {
     super();
     M(this, "_activeDropdown");
     M(this, "_activeDropdown$", new xa());
     M(this, "_currentPopup", null);
     M(this, "activeDropdown$", this._activeDropdown$.asObservable());
     M(this, "_zenVisible", !1);
-    this._canvasPopupManagerService = e, this._univerInstanceService = o, this._dataValidatorRegistryService = n, this._zenZoneService = a, this._renderManagerService = i, this._dataValidationModel = r, this._sheetsSelectionsService = l, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
+    this._canvasPopupManagerService = e, this._univerInstanceService = o, this._dataValidatorRegistryService = n, this._zenZoneService = a, this._renderManagerService = i, this._dataValidationModel = r, this._sheetsSelectionsService = s, this._init(), this._initSelectionChange(), this.disposeWithMe(() => {
       this._activeDropdown$.complete();
     });
   }
@@ -395,11 +398,11 @@ let Rt = class extends Dt {
     const r = o ? i.getSheetBySheetId(o) : i.getActiveSheet();
     if (!r)
       return;
-    const l = this._dataValidationModel.getRuleByLocation(i.getUnitId(), r.getSheetId(), n, a);
-    if (!l)
+    const s = this._dataValidationModel.getRuleByLocation(i.getUnitId(), r.getSheetId(), n, a);
+    if (!s)
       return;
-    const s = this._dataValidatorRegistryService.getValidatorItem(l.type);
-    return s == null ? void 0 : s.dropdown;
+    const l = this._dataValidatorRegistryService.getValidatorItem(s.type);
+    return l == null ? void 0 : l.dropdown;
   }
   _initSelectionChange() {
     this.disposeWithMe(this._sheetsSelectionsService.selectionMoveEnd$.subscribe((e) => {
@@ -407,11 +410,11 @@ let Rt = class extends Dt {
     }));
   }
   showDropdown(e, o = !0) {
-    const { location: n } = e, { row: a, col: i, unitId: r, subUnitId: l } = n;
+    const { location: n } = e, { row: a, col: i, unitId: r, subUnitId: s } = n;
     if (this._currentPopup && this._currentPopup.dispose(), this._zenVisible)
       return;
     this._activeDropdown = e, this._activeDropdown$.next(this._activeDropdown);
-    const s = this._renderManagerService.getRenderById(jo), c = this._canvasPopupManagerService.attachPopupToCell(
+    const l = this._renderManagerService.getRenderById(jo), c = this._canvasPopupManagerService.attachPopupToCell(
       a,
       i,
       {
@@ -420,10 +423,10 @@ let Rt = class extends Dt {
           o && this.hideDropdown();
         },
         offset: [0, 3],
-        excludeOutside: [s == null ? void 0 : s.engine.getCanvasElement()].filter(Boolean)
+        excludeOutside: [l == null ? void 0 : l.engine.getCanvasElement()].filter(Boolean)
       },
       r,
-      l
+      s
     );
     if (!c)
       throw new Error("[DataValidationDropdownManagerService]: cannot show dropdown!");
@@ -442,13 +445,13 @@ let Rt = class extends Dt {
     const r = this._univerInstanceService.getUnit(e, X.UNIVER_SHEET);
     if (!r)
       return;
-    const l = r.getSheetBySheetId(o);
-    if (!l)
-      return;
-    const s = this._dataValidationModel.getRuleByLocation(r.getUnitId(), l.getSheetId(), n, a);
+    const s = r.getSheetBySheetId(o);
     if (!s)
       return;
-    const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
+    const l = this._dataValidationModel.getRuleByLocation(r.getUnitId(), s.getSheetId(), n, a);
+    if (!l)
+      return;
+    const c = this._dataValidatorRegistryService.getValidatorItem(l.type);
     if (!c || !c.dropdown) {
       this.hideDropdown();
       return;
@@ -456,7 +459,7 @@ let Rt = class extends Dt {
     this.showDropdown({
       location: {
         workbook: r,
-        worksheet: l,
+        worksheet: s,
         row: n,
         col: a,
         unitId: e,
@@ -482,15 +485,15 @@ const Ve = "DataValidationPanel", Wt = {
   handler(t, e) {
     if (!e)
       return !1;
-    const { ruleId: o, isAdd: n } = e, a = t.get(gt), i = t.get(Pe), r = t.get(vt), l = t.get(po), s = Qn(r);
-    if (!s) return !1;
-    const { unitId: c, subUnitId: u } = s, h = o ? i.getRuleById(c, u, o) : void 0;
+    const { ruleId: o, isAdd: n } = e, a = t.get(gt), i = t.get(Pe), r = t.get(vt), s = t.get(po), l = Qn(r);
+    if (!l) return !1;
+    const { unitId: c, subUnitId: u } = l, h = o ? i.getRuleById(c, u, o) : void 0;
     a.open(), a.setActiveRule(h && {
       unitId: c,
       subUnitId: u,
       rule: h
     });
-    const d = l.open({
+    const d = s.open({
       id: Ve,
       header: { title: n ? "dataValidation.panel.addTitle" : "dataValidation.panel.title" },
       children: { label: Ve },
@@ -518,8 +521,8 @@ const Ve = "DataValidationPanel", Wt = {
   handler(t, e) {
     if (!e)
       return !1;
-    const o = t.get(Rt), { unitId: n, subUnitId: a, row: i, column: r } = e, l = o.activeDropdown, s = l == null ? void 0 : l.location;
-    return s && s.unitId === n && s.subUnitId === a && s.row === i && s.col === r || o.showDataValidationDropdown(
+    const o = t.get(Rt), { unitId: n, subUnitId: a, row: i, column: r } = e, s = o.activeDropdown, l = s == null ? void 0 : s.location;
+    return l && l.unitId === n && l.subUnitId === a && l.row === i && l.col === r || o.showDataValidationDropdown(
       n,
       a,
       i,
@@ -544,7 +547,7 @@ const Ve = "DataValidationPanel", Wt = {
   dvListDropdownEdit: wi
 }, Ri = (t) => {
   var _, S;
-  const { value: e, onChange: o, multiple: n, options: a, title: i, onEdit: r, style: l, filter: s, location: c } = t, u = L(Q), h = L(pn), d = s == null ? void 0 : s.toLowerCase(), { row: v, col: p, unitId: C, subUnitId: R } = c, f = a.filter((g) => d ? g.label.toLowerCase().includes(d) : !0), w = (S = (_ = h.getConfig(Vn)) == null ? void 0 : _.showEditOnDropdown) != null ? S : !0, I = L(to), V = Kt(() => I.permissionCheckWithRanges(
+  const { value: e, onChange: o, multiple: n, options: a, title: i, onEdit: r, style: s, filter: l, location: c } = t, u = L(Q), h = L(pn), d = l == null ? void 0 : l.toLowerCase(), { row: v, col: p, unitId: C, subUnitId: R } = c, f = a.filter((g) => d ? g.label.toLowerCase().includes(d) : !0), w = (S = (_ = h.getConfig(Vn)) == null ? void 0 : _.showEditOnDropdown) != null ? S : !0, I = L(to), V = Kt(() => I.permissionCheckWithRanges(
     {
       workbookTypes: [Re],
       rangeTypes: [we],
@@ -554,7 +557,7 @@ const Ve = "DataValidationPanel", Wt = {
     C,
     R
   ), [I, p, v, C, R]);
-  return /* @__PURE__ */ j("div", { className: _t.dvListDropdown, style: l, children: [
+  return /* @__PURE__ */ j("div", { className: _t.dvListDropdown, style: s, children: [
     /* @__PURE__ */ m("div", { className: _t.dvListDropdownTitle, children: i }),
     /* @__PURE__ */ m("div", { className: _t.dvListDropdownList, children: /* @__PURE__ */ m(aa, { children: /* @__PURE__ */ m("div", { className: _t.dvListDropdownListContainer, children: f.map((g, y) => {
       const T = e.indexOf(g.value) > -1, N = () => {
@@ -573,7 +576,7 @@ const Ve = "DataValidationPanel", Wt = {
         ] }) : g.label }),
         /* @__PURE__ */ m("div", { className: _t.dvListDropdownSelectedIcon, children: T ? /* @__PURE__ */ m(So, {}) : null })
       ] }, y);
-    }) }) }, s) }),
+    }) }) }, l) }),
     w && V ? /* @__PURE__ */ j(wt, { children: [
       /* @__PURE__ */ m("div", { className: _t.dvListDropdownSplit }),
       /* @__PURE__ */ m("div", { className: _t.dvListDropdownEdit, children: /* @__PURE__ */ m("a", { onClick: r, children: u.t("dataValidation.list.edit") }) })
@@ -582,7 +585,7 @@ const Ve = "DataValidationPanel", Wt = {
 };
 function Di(t) {
   var F, U, Y, z;
-  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: l } = e, s = L(Pe), [c, u] = x(""), h = L(tt), d = L(Q), [v, p] = x(""), C = L(uo), R = L(vt), f = Kt(() => s.ruleChange$.pipe(wn(16)), []), w = L(at);
+  const { location: e, hideFn: o } = t, { worksheet: n, row: a, col: i, unitId: r, subUnitId: s } = e, l = L(Pe), [c, u] = x(""), h = L(tt), d = L(Q), [v, p] = x(""), C = L(uo), R = L(vt), f = Kt(() => l.ruleChange$.pipe(wn(16)), []), w = L(at);
   $t(f);
   const I = ka.useContext(), V = ((U = (F = I.current) == null ? void 0 : F.right) != null ? U : 0) - ((z = (Y = I.current) == null ? void 0 : Y.left) != null ? z : 0);
   if (It(() => {
@@ -600,7 +603,7 @@ function Di(t) {
     };
   }, [h, C, R]), !n)
     return null;
-  const _ = w.getRuleByLocation(r, l, a, i);
+  const _ = w.getRuleByLocation(r, s, a, i);
   if (!_)
     return null;
   const S = w.getValidator(_.type);
@@ -609,7 +612,7 @@ function Di(t) {
   const g = n.getCell(a, i), y = (_ == null ? void 0 : _.renderMode) === ct.CUSTOM || (_ == null ? void 0 : _.renderMode) === void 0;
   if (!g || !_ || !S || S.id.indexOf(K.LIST) !== 0)
     return;
-  const T = _.type === K.LIST_MULTIPLE, N = S.getListWithColor(_, r, l), P = v || ga(n.getCellRaw(a, i)), b = oo(P), A = () => {
+  const T = _.type === K.LIST_MULTIPLE, N = S.getListWithColor(_, r, s), P = v || ga(n.getCellRaw(a, i)), b = oo(P), A = () => {
     h.executeCommand(Wt.id, {
       ruleId: _.uid
     }), o();
@@ -628,7 +631,7 @@ function Di(t) {
       onChange: async (H) => {
         const G = ao(H), J = {
           unitId: r,
-          subUnitId: l,
+          subUnitId: s,
           range: {
             startColumn: i,
             endColumn: i,
@@ -667,14 +670,14 @@ const Vi = "univer-data-validation-options-button", yi = "univer-data-validation
 };
 function Mi(t) {
   var c;
-  const e = L(Q), o = L(Te), { value: n, onChange: a, extraComponent: i } = t, [r, l] = x(!1), s = i ? o.get(i) : null;
+  const e = L(Q), o = L(Te), { value: n, onChange: a, extraComponent: i } = t, [r, s] = x(!1), l = i ? o.get(i) : null;
   return /* @__PURE__ */ j(wt, { children: [
-    /* @__PURE__ */ j("div", { className: Be.dataValidationOptionsButton, onClick: () => l(!r), children: [
+    /* @__PURE__ */ j("div", { className: Be.dataValidationOptionsButton, onClick: () => s(!r), children: [
       e.t("dataValidation.panel.options"),
       r ? /* @__PURE__ */ m(Ro, { className: Be.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ m(wo, { className: Be.dataValidationOptionsButtonIcon })
     ] }),
     r && /* @__PURE__ */ j(wt, { children: [
-      s ? /* @__PURE__ */ m(s, { value: n, onChange: a }) : null,
+      l ? /* @__PURE__ */ m(l, { value: n, onChange: a }) : null,
       /* @__PURE__ */ m(
         q,
         {
@@ -731,18 +734,18 @@ function Pi(t, e, o) {
 }
 function Ai() {
   var lt;
-  const [t, e] = x(0), o = L(gt), n = $t(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, l = r.uid, s = L(Et), c = L(vt), u = L(Te), h = L(tt), d = L(Pe), v = L(Q), [p, C] = x(r), R = s.getValidatorItem(p.type), [f, w] = x(!1), I = s.getValidatorsByScope(Ba.SHEET), [V, _] = x(() => p.ranges.map((O) => ({ unitId: "", sheetId: "", range: O }))), S = Kt(() => Ti(h), [h]), [g, y] = x(!1), T = zt({}), [N, P] = x(!1), b = L(Jn);
+  const [t, e] = x(0), o = L(gt), n = $t(o.activeRule$, o.activeRule), { unitId: a, subUnitId: i, rule: r } = n || {}, s = r.uid, l = L(Et), c = L(vt), u = L(Te), h = L(tt), d = L(Pe), v = L(Q), [p, C] = x(r), R = l.getValidatorItem(p.type), [f, w] = x(!1), I = l.getValidatorsByScope(Ba.SHEET), [V, _] = x(() => p.ranges.map((O) => ({ unitId: "", sheetId: "", range: O }))), S = Kt(() => Ti(h), [h]), [g, y] = x(!1), T = zt({}), [N, P] = x(!1), b = L(Jn);
   if (It(() => () => {
     const O = b.getCurrentLastSelection();
     O && b.setSelections([O]);
   }, [b]), It(() => {
     h.onCommandExecuted((O) => {
       (O.id === Ko.id || O.id === Go.id) && setTimeout(() => {
-        const D = d.getRuleById(a, i, l);
+        const D = d.getRuleById(a, i, s);
         e((B) => B + 1), D && (C(D), _(D.ranges.map((B) => ({ unitId: "", sheetId: "", range: B }))));
       }, 20);
     });
-  }, [h, d, l, i, a]), !R)
+  }, [h, d, s, i, a]), !R)
     return null;
   const A = R.operators, k = R.operatorNames, F = p.operator ? $a.includes(p.operator) : !1, U = () => {
     !p.ranges.length || g || (R.validatorFormula(p, a, i).success ? o.setActiveRule(null) : w(!0));
@@ -770,7 +773,7 @@ function Ai() {
     const $ = {
       unitId: a,
       subUnitId: i,
-      ruleId: l,
+      ruleId: s,
       ranges: B
     };
     S(io.id, $);
@@ -784,7 +787,7 @@ function Ai() {
     const D = {
       unitId: a,
       subUnitId: i,
-      ruleId: l,
+      ruleId: s,
       setting: O
     };
     S(
@@ -794,7 +797,7 @@ function Ai() {
     );
   }, H = async () => {
     await h.executeCommand(ro.id, {
-      ruleId: l,
+      ruleId: s,
       unitId: a,
       subUnitId: i
     }), o.setActiveRule(null);
@@ -805,10 +808,10 @@ function Ai() {
     formula2: p.formula2,
     allowBlank: p.allowBlank
   }, J = (O) => {
-    const D = s.getValidatorItem(O);
+    const D = l.getValidatorItem(O);
     if (!D)
       return;
-    const B = D.operators, $ = d.getRuleById(a, i, l), W = O === ($ == null ? void 0 : $.type) || O.includes("list") && ($ != null && $.type.includes("list")) ? {
+    const B = D.operators, $ = d.getRuleById(a, i, s), W = O === ($ == null ? void 0 : $.type) || O.includes("list") && ($ != null && $.type.includes("list")) ? {
       ...$,
       type: O
     } : {
@@ -833,7 +836,7 @@ function Ai() {
       {
         unitId: a,
         subUnitId: i,
-        ruleId: l,
+        ruleId: s,
         options: O
       }
     ));
@@ -910,7 +913,7 @@ function Ai() {
         validResult: R.validatorFormula(p, a, i),
         unitId: a,
         subUnitId: i,
-        ruleId: l
+        ruleId: s
       },
       t + p.type
     ) : null,
@@ -941,8 +944,8 @@ const ki = "univer-data-validation-item-container", Fi = "univer-data-validation
   dataValidationItemContent: Ni,
   dataValidationItemIcon: Ui
 }, Bi = (t) => {
-  const { rule: e, onClick: o, unitId: n, subUnitId: a, disable: i } = t, r = L(Et), l = L(tt), s = L(Va), c = r.getValidatorItem(e.type), u = zt(void 0), [h, d] = x(!1), v = (p) => {
-    l.executeCommand(ro.id, {
+  const { rule: e, onClick: o, unitId: n, subUnitId: a, disable: i } = t, r = L(Et), s = L(tt), l = L(Va), c = r.getValidatorItem(e.type), u = zt(void 0), [h, d] = x(!1), v = (p) => {
+    s.executeCommand(ro.id, {
       ruleId: e.uid,
       unitId: n,
       subUnitId: a
@@ -951,15 +954,15 @@ const ki = "univer-data-validation-item-container", Fi = "univer-data-validation
   return It(() => () => {
     var p;
     u.current && ((p = u.current) == null || p.forEach((C) => {
-      C && s.removeShape(C);
+      C && l.removeShape(C);
     }));
-  }, [s]), /* @__PURE__ */ j(
+  }, [l]), /* @__PURE__ */ j(
     "div",
     {
       className: ue.dataValidationItemContainer,
       onClick: o,
       onMouseEnter: () => {
-        i || (d(!0), u.current = e.ranges.map((p) => s.addShape({
+        i || (d(!0), u.current = e.ranges.map((p) => l.addShape({
           range: p,
           style: {
             // hasAutoFill: false,
@@ -974,7 +977,7 @@ const ki = "univer-data-validation-item-container", Fi = "univer-data-validation
       onMouseLeave: () => {
         var p;
         d(!1), (p = u.current) == null || p.forEach((C) => {
-          C && s.removeShape(C);
+          C && l.removeShape(C);
         }), u.current = void 0;
       },
       children: [
@@ -999,11 +1002,11 @@ function xi() {
   return e ? /* @__PURE__ */ m(ji, { workbook: e }) : null;
 }
 function ji(t) {
-  const e = L(at), o = L(vt), n = L(tt), a = L(Bt), i = L(gt), r = L(Q), [l, s] = x([]), { workbook: c } = t, u = $t(c.activeSheet$, void 0, !0), h = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
+  const e = L(at), o = L(vt), n = L(tt), a = L(Bt), i = L(gt), r = L(Q), [s, l] = x([]), { workbook: c } = t, u = $t(c.activeSheet$, void 0, !0), h = c.getUnitId(), d = u == null ? void 0 : u.getSheetId();
   It(() => {
-    s(e.getRules(h, d));
+    l(e.getRules(h, d));
     const w = e.ruleChange$.subscribe((I) => {
-      I.unitId === h && I.subUnitId === d && s(e.getRules(h, d));
+      I.unitId === h && I.subUnitId === d && l(e.getRules(h, d));
     });
     return () => {
       w.unsubscribe();
@@ -1028,7 +1031,7 @@ function ji(t) {
   }, R = ((w) => {
     const I = o.getCurrentUnitForType(X.UNIVER_SHEET), V = I.getActiveSheet(), _ = I.getUnitId(), S = V.getSheetId();
     return w.map((y) => ma(a, _, S, y.ranges) ? { ...y } : { ...y, disable: !0 });
-  })(l), f = R == null ? void 0 : R.some((w) => w.disable);
+  })(s), f = R == null ? void 0 : R.some((w) => w.disable);
   return /* @__PURE__ */ j("div", { className: he.dataValidationList, children: [
     R == null ? void 0 : R.map((w) => {
       var I;
@@ -1051,7 +1054,7 @@ function ji(t) {
       );
     }),
     /* @__PURE__ */ j("div", { className: he.dataValidationListButtons, children: [
-      l.length && !f ? /* @__PURE__ */ m(Ut, { className: he.dataValidationListButton, onClick: p, children: r.t("dataValidation.panel.removeAll") }) : null,
+      s.length && !f ? /* @__PURE__ */ m(Ut, { className: he.dataValidationListButton, onClick: p, children: r.t("dataValidation.panel.removeAll") }) : null,
       /* @__PURE__ */ m(Ut, { className: he.dataValidationListButton, type: "primary", onClick: v, children: r.t("dataValidation.panel.add") })
     ] })
   ] });
@@ -1065,10 +1068,10 @@ const Yi = () => {
   handler(t) {
     const e = t.get(vt), o = Qn(e);
     if (!o) return !1;
-    const { workbook: n, worksheet: a } = o, i = so(t), r = t.get(tt), l = n.getUnitId(), s = a.getSheetId(), c = {
+    const { workbook: n, worksheet: a } = o, i = so(t), r = t.get(tt), s = n.getUnitId(), l = a.getSheetId(), c = {
       rule: i,
-      unitId: l,
-      subUnitId: s
+      unitId: s,
+      subUnitId: l
     };
     return r.syncExecuteCommand(_n.id, c) ? (r.syncExecuteCommand(Wt.id, {
       ruleId: i.uid,
@@ -1101,20 +1104,20 @@ let de = class extends Dt {
           return;
         }
         if (this._dataValidationModel.validator(a, { ...t.location, workbook: o, worksheet: n }) === se.INVALID) {
-          const r = this._cellAlertManagerService.currentAlert.get(Lt), l = (e = r == null ? void 0 : r.alert) == null ? void 0 : e.location;
-          if (l && l.row === t.location.row && l.col === t.location.col && l.subUnitId === t.location.subUnitId && l.unitId === t.location.unitId) {
+          const r = this._cellAlertManagerService.currentAlert.get(Lt), s = (e = r == null ? void 0 : r.alert) == null ? void 0 : e.location;
+          if (s && s.row === t.location.row && s.col === t.location.col && s.subUnitId === t.location.subUnitId && s.unitId === t.location.unitId) {
             this._cellAlertManagerService.removeAlert(Lt);
             return;
           }
-          const s = this._dataValidationModel.getValidator(a.type);
-          if (!s) {
+          const l = this._dataValidationModel.getValidator(a.type);
+          if (!l) {
             this._cellAlertManagerService.removeAlert(Lt);
             return;
           }
           this._cellAlertManagerService.showAlert({
             type: Ea.ERROR,
             title: this._localeService.t("dataValidation.error.title"),
-            message: s == null ? void 0 : s.getRuleFinalError(a, t.location),
+            message: l == null ? void 0 : l.getRuleFinalError(a, t.location),
             location: t.location,
             width: 200,
             height: 74,
@@ -1152,7 +1155,7 @@ let Gt = class extends Dt {
   // eslint-disable-next-line max-lines-per-function
   _initAutoFill() {
     const t = () => ({ redos: [], undos: [] }), e = (n, a) => {
-      const { source: i, target: r, unitId: l, subUnitId: s } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(l, s).clone(), u = rn([i, r]), [h, d] = u.ranges, { mapFunc: v } = u, p = {
+      const { source: i, target: r, unitId: s, subUnitId: l } = n, c = this._sheetDataValidationModel.getRuleObjectMatrix(s, l).clone(), u = rn([i, r]), [h, d] = u.ranges, { mapFunc: v } = u, p = {
         row: h.startRow,
         col: h.startColumn
       }, C = Oa(h, d), R = new Se(), f = /* @__PURE__ */ new Set();
@@ -1177,7 +1180,7 @@ let Gt = class extends Dt {
               endRow: P
             },
             T
-          ), { row: k, col: F } = v(A.startRow, A.startColumn), U = this._sheetDataValidationModel.getRuleIdByLocation(l, s, k, F) || "", Y = Ce.getPositionRange(
+          ), { row: k, col: F } = v(A.startRow, A.startColumn), U = this._sheetDataValidationModel.getRuleIdByLocation(s, l, k, F) || "", Y = Ce.getPositionRange(
             {
               startRow: P,
               startColumn: b,
@@ -1191,7 +1194,7 @@ let Gt = class extends Dt {
       });
       const w = Array.from(f).map((S) => ({ id: S, ranges: Je(R, (g) => g === S) }));
       c.addRangeRules(w);
-      const I = c.diff(this._sheetDataValidationModel.getRules(l, s)), { redoMutations: V, undoMutations: _ } = on(l, s, I, this._injector, "patched", a === oe.ONLY_FORMAT);
+      const I = c.diff(this._sheetDataValidationModel.getRules(s, l)), { redoMutations: V, undoMutations: _ } = on(s, l, I, this._injector, "patched", a === oe.ONLY_FORMAT);
       return {
         undos: _,
         redos: V
@@ -1200,9 +1203,9 @@ let Gt = class extends Dt {
       id: lo,
       onBeforeFillData: (n) => {
         const { source: a, unitId: i, subUnitId: r } = n;
-        for (const l of a.rows)
-          for (const s of a.cols) {
-            const c = this._sheetDataValidationModel.getRuleByLocation(i, r, l, s);
+        for (const s of a.rows)
+          for (const l of a.cols) {
+            const c = this._sheetDataValidationModel.getRuleByLocation(i, r, s, l);
             if (c && c.type === K.CHECKBOX) {
               this._autoFillService.setDisableApplyType(oe.SERIES, !0);
               return;
@@ -1237,8 +1240,8 @@ let Zt = class extends Dt {
       id: lo,
       onBeforeCopy: (e, o, n) => this._collect(e, o, n),
       onPasteCells: (e, o, n, a) => {
-        const { copyType: i = Tn.COPY, pasteType: r } = a, { range: l } = e || {}, { range: s, unitId: c, subUnitId: u } = o;
-        return this._generateMutations(s, { copyType: i, pasteType: r, copyRange: l, unitId: c, subUnitId: u });
+        const { copyType: i = Tn.COPY, pasteType: r } = a, { range: s } = e || {}, { range: l, unitId: c, subUnitId: u } = o;
+        return this._generateMutations(l, { copyType: i, pasteType: r, copyRange: s, unitId: c, subUnitId: u });
       }
     });
   }
@@ -1249,13 +1252,13 @@ let Zt = class extends Dt {
       subUnitId: o,
       matrix: a
     };
-    const i = this._injector.invoke((s) => Ta(n, s, e, o));
+    const i = this._injector.invoke((l) => Ta(n, l, e, o));
     if (!i)
       return;
-    const { rows: r, cols: l } = i;
-    r.forEach((s, c) => {
-      l.forEach((u, h) => {
-        const d = this._sheetDataValidationModel.getRuleIdByLocation(e, o, s, u);
+    const { rows: r, cols: s } = i;
+    r.forEach((l, c) => {
+      s.forEach((u, h) => {
+        const d = this._sheetDataValidationModel.getRuleIdByLocation(e, o, l, u);
         a.setValue(c, h, d != null ? d : "");
       });
     });
@@ -1277,7 +1280,7 @@ let Zt = class extends Dt {
       return { redos: [], undos: [] };
     const { unitId: a, subUnitId: i } = this._copyInfo;
     if (o.unitId !== a || i !== o.subUnitId) {
-      const r = this._sheetDataValidationModel.getRuleObjectMatrix(o.unitId, o.subUnitId).clone(), l = new Se(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = rn([o.copyRange, e]), d = Pn(c, u, !0), v = /* @__PURE__ */ new Map();
+      const r = this._sheetDataValidationModel.getRuleObjectMatrix(o.unitId, o.subUnitId).clone(), s = new Se(), l = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = rn([o.copyRange, e]), d = Pn(c, u, !0), v = /* @__PURE__ */ new Map();
       d.forEach(({ startRange: f }) => {
         var w;
         (w = this._copyInfo) == null || w.matrix.forValue((I, V, _) => {
@@ -1292,10 +1295,10 @@ let Zt = class extends Dt {
           ), g = `${i}-${_}`, y = this._sheetDataValidationModel.getRuleById(a, i, _);
           !this._sheetDataValidationModel.getRuleById(o.unitId, o.subUnitId, g) && y && v.set(g, { ...y, uid: g });
           const { row: T, col: N } = h(S.startRow, S.startColumn);
-          s.add(g), l.setValue(T, N, g);
+          l.add(g), s.setValue(T, N, g);
         });
       });
-      const p = Array.from(s).map((f) => ({ id: f, ranges: Je(l, (w) => w === f) }));
+      const p = Array.from(l).map((f) => ({ id: f, ranges: Je(s, (w) => w === f) }));
       r.addRangeRules(p);
       const { redoMutations: C, undoMutations: R } = on(
         o.unitId,
@@ -1310,7 +1313,7 @@ let Zt = class extends Dt {
         undos: R
       };
     } else {
-      const r = this._sheetDataValidationModel.getRuleObjectMatrix(a, i).clone(), l = new Se(), s = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = rn([o.copyRange, e]);
+      const r = this._sheetDataValidationModel.getRuleObjectMatrix(a, i).clone(), s = new Se(), l = /* @__PURE__ */ new Set(), { ranges: [c, u], mapFunc: h } = rn([o.copyRange, e]);
       Pn(c, u, !0).forEach(({ startRange: R }) => {
         var f;
         (f = this._copyInfo) == null || f.matrix.forValue((w, I, V) => {
@@ -1323,10 +1326,10 @@ let Zt = class extends Dt {
             },
             R
           ), { row: S, col: g } = h(_.startRow, _.startColumn);
-          l.setValue(S, g, V), s.add(V);
+          s.setValue(S, g, V), l.add(V);
         });
       });
-      const v = Array.from(s).map((R) => ({ id: R, ranges: Je(l, (f) => f === R) }));
+      const v = Array.from(l).map((R) => ({ id: R, ranges: Je(s, (f) => f === R) }));
       r.addRangeRules(v);
       const { redoMutations: p, undoMutations: C } = on(
         a,
@@ -1431,8 +1434,8 @@ const To = {
   }
 };
 let Jt = class extends mn {
-  constructor(t, e, o, n, a, i, r, l, s, c, u) {
-    super(), this._commandService = t, this._menuManagerService = e, this._renderManagerService = o, this._univerInstanceService = n, this._autoHeightController = a, this._dropdownManagerService = i, this._sheetDataValidationModel = r, this._dataValidatorRegistryService = l, this._sheetInterceptorService = s, this._dataValidationCacheService = c, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
+  constructor(t, e, o, n, a, i, r, s, l, c, u) {
+    super(), this._commandService = t, this._menuManagerService = e, this._renderManagerService = o, this._univerInstanceService = n, this._autoHeightController = a, this._dropdownManagerService = i, this._sheetDataValidationModel = r, this._dataValidatorRegistryService = s, this._sheetInterceptorService = l, this._dataValidationCacheService = c, this._editorBridgeService = u, this._initMenu(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initMenu() {
     this._menuManagerService.mergeMenu(or);
@@ -1446,16 +1449,16 @@ let Jt = class extends mn {
       }
       const e = this._editorBridgeService.getEditCellState();
       if (e) {
-        const { unitId: n, sheetId: a, row: i, column: r } = e, l = this._univerInstanceService.getUniverSheetInstance(n);
-        if (!l)
-          return;
-        const s = this._sheetDataValidationModel.getRuleByLocation(n, a, i, r);
+        const { unitId: n, sheetId: a, row: i, column: r } = e, s = this._univerInstanceService.getUniverSheetInstance(n);
         if (!s)
           return;
-        const c = this._dataValidatorRegistryService.getValidatorItem(s.type);
+        const l = this._sheetDataValidationModel.getRuleByLocation(n, a, i, r);
+        if (!l)
+          return;
+        const c = this._dataValidatorRegistryService.getValidatorItem(l.type);
         if (!(c != null && c.dropdown))
           return;
-        const u = l.getActiveSheet();
+        const u = s.getActiveSheet();
         if (!u) return;
         const h = this._dropdownManagerService.activeDropdown, d = h == null ? void 0 : h.location;
         if (d && d.unitId === n && d.subUnitId === a && d.row === i && d.col === r)
@@ -1467,7 +1470,7 @@ let Jt = class extends mn {
               subUnitId: a,
               row: i,
               col: r,
-              workbook: l,
+              workbook: s,
               worksheet: u
             },
             componentKey: c.dropdown,
@@ -1492,7 +1495,7 @@ let Jt = class extends mn {
           // eslint-disable-next-line max-lines-per-function, complexity
           handler: (t, e, o) => {
             var f, w, I, V, _;
-            const { row: n, col: a, unitId: i, subUnitId: r, workbook: l, worksheet: s } = e, c = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
+            const { row: n, col: a, unitId: i, subUnitId: r, workbook: s, worksheet: l } = e, c = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
             if (!c)
               return o(t);
             const u = this._sheetDataValidationModel.getRuleById(i, r, c);
@@ -1529,7 +1532,7 @@ let Jt = class extends mn {
                 ...t == null ? void 0 : t.interceptorStyle,
                 ...d == null ? void 0 : d.getExtraStyle(u, R.value, {
                   get style() {
-                    const S = l.getStyles();
+                    const S = s.getStyles();
                     return (typeof (t == null ? void 0 : t.s) == "string" ? S.get(t == null ? void 0 : t.s) : t == null ? void 0 : t.s) || {};
                   }
                 }, n, a)
@@ -1547,8 +1550,8 @@ let Jt = class extends mn {
                   subUnitId: r,
                   row: n,
                   col: a,
-                  workbook: l,
-                  worksheet: s
+                  workbook: s,
+                  worksheet: l
                 };
                 return (k = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoHeight) == null ? void 0 : k.call(A, y);
               },
@@ -1565,8 +1568,8 @@ let Jt = class extends mn {
                   subUnitId: r,
                   row: n,
                   col: a,
-                  workbook: l,
-                  worksheet: s
+                  workbook: s,
+                  worksheet: l
                 };
                 return (k = (A = d == null ? void 0 : d.canvasRender) == null ? void 0 : A.calcCellAutoWidth) == null ? void 0 : k.call(A, y);
               },
@@ -1625,13 +1628,13 @@ let $n = class extends mn {
           // eslint-disable-next-line complexity
           handler: (t, e, o) => {
             var R, f, w, I, V;
-            const { row: n, col: a, unitId: i, subUnitId: r, workbook: l, worksheet: s } = e, c = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
+            const { row: n, col: a, unitId: i, subUnitId: r, workbook: s, worksheet: l } = e, c = this._sheetDataValidationModel.getRuleIdByLocation(i, r, n, a);
             if (!c)
               return o(t);
             const u = this._sheetDataValidationModel.getRuleById(i, r, c);
             if (!u)
               return o(t);
-            const h = (R = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? R : se.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), v = s.getCellRaw(n, a), p = rt(v), C = `${p != null ? p : ""}`;
+            const h = (R = this._dataValidationCacheService.getValue(i, r, n, a)) != null ? R : se.VALID, d = this._dataValidatorRegistryService.getValidatorItem(u.type), v = l.getCellRaw(n, a), p = rt(v), C = `${p != null ? p : ""}`;
             return o({
               ...t,
               markers: {
@@ -1650,7 +1653,7 @@ let $n = class extends mn {
                 ...t == null ? void 0 : t.interceptorStyle,
                 ...d == null ? void 0 : d.getExtraStyle(u, C, {
                   get style() {
-                    const _ = l.getStyles();
+                    const _ = s.getStyles();
                     return (typeof (t == null ? void 0 : t.s) == "string" ? _.get(t == null ? void 0 : t.s) : t == null ? void 0 : t.s) || {};
                   }
                 }, n, a)
@@ -1668,8 +1671,8 @@ let $n = class extends mn {
                   subUnitId: r,
                   row: n,
                   col: a,
-                  workbook: l,
-                  worksheet: s
+                  workbook: s,
+                  worksheet: l
                 };
                 return (A = (b = d == null ? void 0 : d.canvasRender) == null ? void 0 : b.calcCellAutoHeight) == null ? void 0 : A.call(b, g);
               },
@@ -1745,9 +1748,9 @@ const sr = "univer-data-validation-formula", lr = "univer-data-validation-formul
   dataValidationFormulaColorSelectPanel: mr,
   dataValidationFormulaColorItem: gr
 }, fr = (t) => {
-  const { isTwoFormula: e = !1, value: o, onChange: n, showError: a, validResult: i } = t, r = L(Q), l = a ? i == null ? void 0 : i.formula1 : "", s = a ? i == null ? void 0 : i.formula2 : "";
+  const { isTwoFormula: e = !1, value: o, onChange: n, showError: a, validResult: i } = t, r = L(Q), s = a ? i == null ? void 0 : i.formula1 : "", l = a ? i == null ? void 0 : i.formula2 : "";
   return e ? /* @__PURE__ */ j(wt, { children: [
-    /* @__PURE__ */ m(q, { error: l, children: /* @__PURE__ */ m(
+    /* @__PURE__ */ m(q, { error: s, children: /* @__PURE__ */ m(
       Nt,
       {
         className: ot.dataValidationFormula,
@@ -1762,7 +1765,7 @@ const sr = "univer-data-validation-formula", lr = "univer-data-validation-formul
       }
     ) }),
     /* @__PURE__ */ m("div", { className: ot.dataValidationFormulaAnd, children: r.t("dataValidation.panel.formulaAnd") }),
-    /* @__PURE__ */ m(q, { error: s, children: /* @__PURE__ */ m(
+    /* @__PURE__ */ m(q, { error: l, children: /* @__PURE__ */ m(
       Nt,
       {
         className: ot.dataValidationFormula,
@@ -1776,7 +1779,7 @@ const sr = "univer-data-validation-formula", lr = "univer-data-validation-formul
         }
       }
     ) })
-  ] }) : /* @__PURE__ */ m(q, { error: l, children: /* @__PURE__ */ m(
+  ] }) : /* @__PURE__ */ m(q, { error: s, children: /* @__PURE__ */ m(
     Nt,
     {
       className: ot.dataValidationFormula,
@@ -1789,12 +1792,12 @@ const sr = "univer-data-validation-formula", lr = "univer-data-validation-formul
   ) });
 };
 function vr(t) {
-  const { value: e, onChange: o, showError: n, validResult: a } = t, i = L(Q), r = n ? a == null ? void 0 : a.formula1 : "", l = n ? a == null ? void 0 : a.formula2 : "", [s, c] = x(!((e == null ? void 0 : e.formula1) === void 0 && (e == null ? void 0 : e.formula2) === void 0));
+  const { value: e, onChange: o, showError: n, validResult: a } = t, i = L(Q), r = n ? a == null ? void 0 : a.formula1 : "", s = n ? a == null ? void 0 : a.formula2 : "", [l, c] = x(!((e == null ? void 0 : e.formula1) === void 0 && (e == null ? void 0 : e.formula2) === void 0));
   return /* @__PURE__ */ j(wt, { children: [
     /* @__PURE__ */ m(q, { children: /* @__PURE__ */ m(
       Le,
       {
-        checked: s,
+        checked: l,
         onChange: (u) => {
           u ? c(!0) : (c(!1), o == null || o({
             ...e,
@@ -1805,7 +1808,7 @@ function vr(t) {
         children: i.t("dataValidation.checkbox.tips")
       }
     ) }),
-    s ? /* @__PURE__ */ m(q, { label: i.t("dataValidation.checkbox.checked"), error: r, children: /* @__PURE__ */ m(
+    l ? /* @__PURE__ */ m(q, { label: i.t("dataValidation.checkbox.checked"), error: r, children: /* @__PURE__ */ m(
       Nt,
       {
         className: ot.dataValidationFormula,
@@ -1819,7 +1822,7 @@ function vr(t) {
         }
       }
     ) }) : null,
-    s ? /* @__PURE__ */ m(q, { label: i.t("dataValidation.checkbox.unchecked"), error: l, children: /* @__PURE__ */ m(
+    l ? /* @__PURE__ */ m(q, { label: i.t("dataValidation.checkbox.unchecked"), error: s, children: /* @__PURE__ */ m(
       Nt,
       {
         className: ot.dataValidationFormula,
@@ -1837,10 +1840,10 @@ function vr(t) {
 }
 function _r(t) {
   var h;
-  const { unitId: e, subUnitId: o, value: n, onChange: a, showError: i, validResult: r } = t, l = i ? r == null ? void 0 : r.formula1 : void 0, s = zt({}), [c, u] = x(!1);
+  const { unitId: e, subUnitId: o, value: n, onChange: a, showError: i, validResult: r } = t, s = i ? r == null ? void 0 : r.formula1 : void 0, l = zt({}), [c, u] = x(!1);
   return Sn((d) => {
     var p;
-    const v = (p = s.current) == null ? void 0 : p.handleOutClick;
+    const v = (p = l.current) == null ? void 0 : p.handleOutClick;
     v && v(d, () => u(!1));
   }), /* @__PURE__ */ m(
     vo,
@@ -1856,9 +1859,9 @@ function _r(t) {
           formula1: v
         }));
       },
-      errorText: l,
+      errorText: s,
       onFocus: () => u(!0),
-      actions: s.current,
+      actions: l.current,
       isSupportAcrossSheet: !0
     }
   );
@@ -1964,23 +1967,23 @@ const Cr = [
 };
 function wr(t) {
   const { value: e, onChange: o = () => {
-  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: l } = t, { formula1: s = "", formula2: c = "" } = e || {}, u = zt(null), [h, d] = x(() => At(s) ? "1" : "0"), [v, p] = x(h === "1" ? s : "="), [C, R] = x(h === "1" ? s : "="), f = L(Q), w = L(Et), I = L(Pe), V = L(_a), [_, S] = x(() => c.split(",")), g = w.getValidatorItem(K.LIST), [y, T] = x([]), [N, P] = x(""), b = r ? i == null ? void 0 : i.formula1 : "", A = Kt(() => I.ruleChange$.pipe(wn(16)), []), k = $t(A), F = ln(o);
+  }, unitId: n, subUnitId: a, validResult: i, showError: r, ruleId: s } = t, { formula1: l = "", formula2: c = "" } = e || {}, u = zt(null), [h, d] = x(() => At(l) ? "1" : "0"), [v, p] = x(h === "1" ? l : "="), [C, R] = x(h === "1" ? l : "="), f = L(Q), w = L(Et), I = L(Pe), V = L(_a), [_, S] = x(() => c.split(",")), g = w.getValidatorItem(K.LIST), [y, T] = x([]), [N, P] = x(""), b = r ? i == null ? void 0 : i.formula1 : "", A = Kt(() => I.ruleChange$.pipe(wn(16)), []), k = $t(A), F = ln(o);
   It(() => {
     (async () => {
       await new Promise(($) => {
         setTimeout(() => $(!0), 100);
       });
-      const D = I.getRuleById(n, a, l), B = D == null ? void 0 : D.formula1;
+      const D = I.getRuleById(n, a, s), B = D == null ? void 0 : D.formula1;
       if (At(B) && g && D) {
         const $ = await g.getListAsync(D, n, a);
         T($);
       }
     })();
-  }, [I, k, g, l, a, n]), It(() => {
-    At(s) && s !== C && (p(s), R(C));
-  }, [C, s]);
+  }, [I, k, g, s, a, n]), It(() => {
+    At(l) && l !== C && (p(l), R(C));
+  }, [C, l]);
   const [U, Y] = x(() => {
-    const D = h !== "1" ? oo(s) : [], B = c.split(",");
+    const D = h !== "1" ? oo(l) : [], B = c.split(",");
     return D.map(($, W) => ({
       label: $,
       color: B[W] || kt,
@@ -2001,7 +2004,7 @@ function wr(t) {
   })), [G, y]), et = (D, B, $) => {
     const W = [..._];
     W[+D] = $, S(W), F({
-      formula1: s,
+      formula1: l,
       formula2: W.join(",")
     });
   }, nt = () => {
@@ -2183,32 +2186,32 @@ let dn = class {
   _calc(t, e) {
     var c, u, h;
     const { vt: o, ht: n } = e || {}, a = t.endX - t.startX - pe * 2, i = t.endY - t.startY, r = ((c = e == null ? void 0 : e.fs) != null ? c : 10) * 1.6;
-    let l = 0, s = 0;
+    let s = 0, l = 0;
     switch (o) {
       case ht.TOP:
-        s = 0;
+        l = 0;
         break;
       case ht.BOTTOM:
-        s = 0 + (i - r);
+        l = 0 + (i - r);
         break;
       default:
-        s = 0 + (i - r) / 2;
+        l = 0 + (i - r) / 2;
         break;
     }
     switch (n) {
       case Yt.LEFT:
-        l = pe;
+        s = pe;
         break;
       case Yt.RIGHT:
-        l = pe + (a - r);
+        s = pe + (a - r);
         break;
       default:
-        l = pe + (a - r) / 2;
+        s = pe + (a - r) / 2;
         break;
     }
     return {
-      left: t.startX + l,
-      top: t.startY + s,
+      left: t.startX + s,
+      top: t.startY + l,
       width: ((u = e == null ? void 0 : e.fs) != null ? u : 10) * 1.6,
       height: ((h = e == null ? void 0 : e.fs) != null ? h : 10) * 1.6
     };
@@ -2225,23 +2228,23 @@ let dn = class {
   }
   async _parseFormula(t, e, o) {
     var c, u, h, d, v, p, C, R, f;
-    const { formula1: n = Ia, formula2: a = Ca } = t, i = await this._formulaService.getRuleFormulaResult(e, o, t.uid), r = Ue((h = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), l = Ue((p = (v = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : v[0]) == null ? void 0 : p[0]), s = Ln(String(r)) && Ln(String(l));
+    const { formula1: n = Ia, formula2: a = Ca } = t, i = await this._formulaService.getRuleFormulaResult(e, o, t.uid), r = Ue((h = (u = (c = i == null ? void 0 : i[0]) == null ? void 0 : c.result) == null ? void 0 : u[0]) == null ? void 0 : h[0]), s = Ue((p = (v = (d = i == null ? void 0 : i[1]) == null ? void 0 : d.result) == null ? void 0 : v[0]) == null ? void 0 : p[0]), l = Ln(String(r)) && Ln(String(s));
     return {
       formula1: At(n) ? Ue((f = (R = (C = i == null ? void 0 : i[0]) == null ? void 0 : C.result) == null ? void 0 : R[0]) == null ? void 0 : f[0]) : n,
-      formula2: At(a) ? l : a,
-      isFormulaValid: s
+      formula2: At(a) ? s : a,
+      isFormulaValid: l
     };
   }
   drawWith(t, e) {
     var b, A, k, F;
-    const { style: o, primaryWithCoord: n, unitId: a, subUnitId: i, worksheet: r, row: l, col: s } = e, c = n.isMergedMainCell ? n.mergeInfo : n, u = rt(r.getCellRaw(l, s)), h = this._dataValidationModel.getRuleByLocation(a, i, l, s);
+    const { style: o, primaryWithCoord: n, unitId: a, subUnitId: i, worksheet: r, row: s, col: l } = e, c = n.isMergedMainCell ? n.mergeInfo : n, u = rt(r.getCellRaw(s, l)), h = this._dataValidationModel.getRuleByLocation(a, i, s, l);
     if (!h)
       return;
     const d = this._dataValidationModel.getValidator(h.type);
     if (!d)
       return;
     const v = this._themeService.getCurrentTheme();
-    if (!((b = d.skipDefaultFontRender) != null && b.call(d, h, u, { unitId: a, subUnitId: i, row: l, column: s })))
+    if (!((b = d.skipDefaultFontRender) != null && b.call(d, h, u, { unitId: a, subUnitId: i, row: s, column: l })))
       return;
     const p = d.parseFormulaSync(h, a, i), { formula1: C } = p, R = this._calc(c, o), { a: f, d: w } = t.getTransform(), I = bn(R.left, f), V = bn(R.top, w), _ = ra.create().composeMatrix({
       left: I,
@@ -2266,18 +2269,18 @@ let dn = class {
     }), t.restore();
   }
   isHit(t, e) {
-    const o = e.primaryWithCoord.isMergedMainCell ? e.primaryWithCoord.mergeInfo : e.primaryWithCoord, n = this._calc(o, e.style), a = n.top, i = n.top + n.height, r = n.left, l = n.left + n.width, { x: s, y: c } = t;
-    return s <= l && s >= r && c <= i && c >= a;
+    const o = e.primaryWithCoord.isMergedMainCell ? e.primaryWithCoord.mergeInfo : e.primaryWithCoord, n = this._calc(o, e.style), a = n.top, i = n.top + n.height, r = n.left, s = n.left + n.width, { x: l, y: c } = t;
+    return l <= s && l >= r && c <= i && c >= a;
   }
   async onPointerDown(t, e) {
     var p;
     if (e.button === 2)
       return;
-    const { primaryWithCoord: o, unitId: n, subUnitId: a, worksheet: i, row: r, col: l } = t, s = rt(i.getCellRaw(r, l)), c = this._dataValidationModel.getRuleByLocation(n, a, r, l);
+    const { primaryWithCoord: o, unitId: n, subUnitId: a, worksheet: i, row: r, col: s } = t, l = rt(i.getCellRaw(r, s)), c = this._dataValidationModel.getRuleByLocation(n, a, r, s);
     if (!c)
       return;
     const u = this._dataValidationModel.getValidator(c.type);
-    if (!u || !((p = u.skipDefaultFontRender) != null && p.call(u, c, s, { unitId: n, subUnitId: a, row: r, column: l })))
+    if (!u || !((p = u.skipDefaultFontRender) != null && p.call(u, c, l, { unitId: n, subUnitId: a, row: r, column: s })))
       return;
     const { formula1: h, formula2: d } = await this._parseFormula(c, n, a), v = {
       range: {
@@ -2287,7 +2290,7 @@ let dn = class {
         endRow: o.actualRow
       },
       value: {
-        v: String(s) === wa(String(h)) ? d : h,
+        v: String(l) === wa(String(h)) ? d : h,
         p: null
       }
     };
@@ -2371,25 +2374,25 @@ function Nr(t, e) {
   };
 }
 function je(t, e, o, n) {
-  const a = Pt + cn * 2, i = o - a, r = n - Oe * 2, l = t.map((d) => ({
+  const a = Pt + cn * 2, i = o - a, r = n - Oe * 2, s = t.map((d) => ({
     layout: Nr(d, e),
     text: d
   }));
-  let s;
+  let l;
   const c = [];
-  l.forEach((d) => {
+  s.forEach((d) => {
     const { layout: v } = d, { width: p, height: C } = v;
-    !s || s.width + p + xe > i ? (s = {
+    !l || l.width + p + xe > i ? (l = {
       width: p,
       height: C,
       items: [{
         ...d,
         left: 0
       }]
-    }, c.push(s)) : (s.items.push({
+    }, c.push(l)) : (l.items.push({
       ...d,
-      left: s.width + xe
-    }), s.width = s.width + p + xe);
+      left: l.width + xe
+    }), l.width = l.width + p + xe);
   });
   let u = 0, h = 0;
   return c.forEach((d, v) => {
@@ -2406,13 +2409,13 @@ function je(t, e, o, n) {
 const Ur = 8;
 class Br extends da {
   static drawWith(e, o) {
-    const { fontString: n, info: a, fill: i, color: r } = o, { layout: l, text: s } = a;
+    const { fontString: n, info: a, fill: i, color: r } = o, { layout: s, text: l } = a;
     e.save(), qn.drawWith(e, {
-      width: l.width,
-      height: l.height,
+      width: s.width,
+      height: s.height,
       radius: Ur,
       fill: i || kt
-    }), e.translateWithPrecision(Fo, l.ba), e.font = n, e.fillStyle = r, e.fillText(s, 0, 0), e.restore();
+    }), e.translateWithPrecision(Fo, s.ba), e.font = n, e.fillStyle = r, e.fillText(l, 0, 0), e.restore();
   }
 }
 var $r = Object.getOwnPropertyDescriptor, Wr = (t, e, o, n) => {
@@ -2450,7 +2453,7 @@ let un = class {
   // eslint-disable-next-line max-lines-per-function
   drawWith(t, e, o, n) {
     var z, H;
-    const { primaryWithCoord: a, row: i, col: r, style: l, data: s, subUnitId: c } = e, u = a.isMergedMainCell ? a.mergeInfo : a, h = s == null ? void 0 : s.fontRenderExtension, { leftOffset: d = 0, rightOffset: v = 0, topOffset: p = 0, downOffset: C = 0 } = h || {}, R = this._ensureMap(c), f = this._generateKey(i, r), w = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, r);
+    const { primaryWithCoord: a, row: i, col: r, style: s, data: l, subUnitId: c } = e, u = a.isMergedMainCell ? a.mergeInfo : a, h = l == null ? void 0 : l.fontRenderExtension, { leftOffset: d = 0, rightOffset: v = 0, topOffset: p = 0, downOffset: C = 0 } = h || {}, R = this._ensureMap(c), f = this._generateKey(i, r), w = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, i, r);
     if (!w)
       return;
     const I = this._dataValidationModel.getValidator(w.type);
@@ -2461,7 +2464,7 @@ let un = class {
       endX: u.endX - v,
       startY: u.startY + p,
       endY: u.endY - C
-    }, _ = V.endX - V.startX, S = V.endY - V.startY, { cl: g } = l || {}, y = (z = typeof g == "object" ? g == null ? void 0 : g.rgb : g) != null ? z : "#000", T = Ne(l != null ? l : void 0), { vt: N, ht: P } = l || {}, b = N != null ? N : ht.MIDDLE, A = (H = rt(s)) != null ? H : "", k = I.parseCellValue(A), F = I.getListWithColorMap(w), U = je(k, T, _, S);
+    }, _ = V.endX - V.startX, S = V.endY - V.startY, { cl: g } = s || {}, y = (z = typeof g == "object" ? g == null ? void 0 : g.rgb : g) != null ? z : "#000", T = Ne(s != null ? s : void 0), { vt: N, ht: P } = s || {}, b = N != null ? N : ht.MIDDLE, A = (H = rt(l)) != null ? H : "", k = I.parseCellValue(A), F = I.getListWithColorMap(w), U = je(k, T, _, S);
     this._drawDownIcon(t, V, _, S, b), t.save(), t.translateWithPrecision(V.startX, V.startY), t.beginPath(), t.rect(0, 0, _ - Pt, S), t.clip(), t.translateWithPrecision(cn, Oe);
     let Y = 0;
     switch (b) {
@@ -2501,9 +2504,9 @@ let un = class {
   }
   calcCellAutoHeight(t) {
     var _;
-    const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = r || {}, h = e.isMergedMainCell ? e.mergeInfo : e, d = {
-      startX: h.startX + l,
-      endX: h.endX - s,
+    const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: l = 0, topOffset: c = 0, downOffset: u = 0 } = r || {}, h = e.isMergedMainCell ? e.mergeInfo : e, d = {
+      startX: h.startX + s,
+      endX: h.endX - l,
       startY: h.startY + c,
       endY: h.endY - u
     }, v = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
@@ -2517,9 +2520,9 @@ let un = class {
   }
   calcCellAutoWidth(t) {
     var _;
-    const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: s = 0, topOffset: c = 0, downOffset: u = 0 } = r || {}, h = e.isMergedMainCell ? e.mergeInfo : e, d = {
-      startX: h.startX + l,
-      endX: h.endX - s,
+    const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: l = 0, topOffset: c = 0, downOffset: u = 0 } = r || {}, h = e.isMergedMainCell ? e.mergeInfo : e, d = {
+      startX: h.startX + s,
+      endX: h.endX - l,
       startY: h.startY + c,
       endY: h.endY - u
     }, v = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
@@ -2639,20 +2642,20 @@ function fe(t, e, o) {
   };
 }
 function jn(t, e, o, n, a, i, r = !0) {
-  let l = 0;
-  const s = r ? jt : 0;
+  let s = 0;
+  const l = r ? jt : 0;
   switch (a) {
     case ht.BOTTOM:
-      l = e - n - s;
+      s = e - n - l;
       break;
     case ht.MIDDLE:
-      l = (e - n) / 2;
+      s = (e - n) / 2;
       break;
     default:
-      l = s;
+      s = l;
       break;
   }
-  l = Math.max(jt, l);
+  s = Math.max(jt, s);
   let c = 0;
   switch (i) {
     case Yt.CENTER:
@@ -2664,7 +2667,7 @@ function jn(t, e, o, n, a, i, r = !0) {
   }
   return c = Math.max(mt, c), {
     paddingLeft: c,
-    paddingTop: l
+    paddingTop: s
   };
 }
 let hn = class {
@@ -2681,30 +2684,30 @@ let hn = class {
     return `${t}.${e}`;
   }
   _drawDownIcon(t, e, o, n, a, i, r) {
-    const { t: l = dt.pd.t, b: s = dt.pd.b } = r, c = o - pt;
+    const { t: s = dt.pd.t, b: l = dt.pd.b } = r, c = o - pt;
     let u;
     switch (i) {
       case ht.MIDDLE:
         u = (n - ge) / 2;
         break;
       case ht.BOTTOM:
-        u = n - s - a - jt + (a / 2 - ge / 2);
+        u = n - l - a - jt + (a / 2 - ge / 2);
         break;
       default:
-        u = l + jt + (a / 2 - ge / 2);
+        u = s + jt + (a / 2 - ge / 2);
         break;
     }
     t.save(), t.translateWithPrecision(e.startX + c, e.startY + u), t.fillStyle = "#565656", t.fill(xn), t.restore();
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(t, e, o) {
-    const { primaryWithCoord: n, row: a, col: i, style: r, data: l, subUnitId: s } = e, c = n.isMergedMainCell ? n.mergeInfo : n, u = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
+    const { primaryWithCoord: n, row: a, col: i, style: r, data: s, subUnitId: l } = e, c = n.isMergedMainCell ? n.mergeInfo : n, u = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, a, i);
     if (!u)
       return;
     const h = this._dataValidationModel.getValidator(u.type);
     if (!h)
       return;
-    const d = l == null ? void 0 : l.fontRenderExtension, { leftOffset: v = 0, rightOffset: p = 0, topOffset: C = 0, downOffset: R = 0 } = d || {};
+    const d = s == null ? void 0 : s.fontRenderExtension, { leftOffset: v = 0, rightOffset: p = 0, topOffset: C = 0, downOffset: R = 0 } = d || {};
     if (!u || !h || !h || h.id.indexOf(K.LIST) !== 0 || !h.skipDefaultFontRender(u))
       return;
     const f = {
@@ -2712,7 +2715,7 @@ let hn = class {
       endX: c.endX - p,
       startY: c.startY + C,
       endY: c.endY - R
-    }, w = f.endX - f.startX, I = f.endY - f.startY, V = this._ensureMap(s), _ = this._generateKey(a, i), S = h.getListWithColor(u), g = rt(l), y = `${g != null ? g : ""}`, T = S.find((k) => k.label === y);
+    }, w = f.endX - f.startX, I = f.endY - f.startY, V = this._ensureMap(l), _ = this._generateKey(a, i), S = h.getListWithColor(u), g = rt(s), y = `${g != null ? g : ""}`, T = S.find((k) => k.label === y);
     let { tb: N, vt: P, ht: b, pd: A } = r || {};
     if (N = N != null ? N : Ct.WRAP, P = P != null ? P : ht.BOTTOM, b = b != null ? b : dt.ht, A = A != null ? A : dt.pd, u.renderMode === ct.ARROW) {
       const { l: k = dt.pd.l, t: F = dt.pd.t, r: U = dt.pd.r, b: Y = dt.pd.b } = A, z = w - k - U - pt - 4, { documentSkeleton: H, documents: G, docModel: J } = fe(y, this._localeService, r);
@@ -2745,11 +2748,11 @@ let hn = class {
     }
   }
   calcCellAutoHeight(t) {
-    const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = e.isMergedMainCell ? e.mergeInfo : e, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
+    const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = e.isMergedMainCell ? e.mergeInfo : e, s = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = s || {}, d = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
     if (!d || d.renderMode === ct.TEXT)
       return;
     const v = {
-      startX: r.startX + s,
+      startX: r.startX + l,
       endX: r.endX - c,
       startY: r.startY + u,
       endY: r.endY - h
@@ -2771,11 +2774,11 @@ let hn = class {
     }
   }
   calcCellAutoWidth(t) {
-    const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = e.isMergedMainCell ? e.mergeInfo : e, l = n == null ? void 0 : n.fontRenderExtension, { leftOffset: s = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = l || {}, d = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
+    const { primaryWithCoord: e, style: o, data: n, row: a, col: i } = t, r = e.isMergedMainCell ? e.mergeInfo : e, s = n == null ? void 0 : n.fontRenderExtension, { leftOffset: l = 0, rightOffset: c = 0, topOffset: u = 0, downOffset: h = 0 } = s || {}, d = this._dataValidationModel.getRuleByLocation(t.unitId, t.subUnitId, a, i);
     if (!d || d.renderMode === ct.TEXT)
       return;
     const v = {
-      startX: r.startX + s,
+      startX: r.startX + l,
       endX: r.endX - c,
       startY: r.startY + u,
       endY: r.endY - h
@@ -2799,11 +2802,11 @@ let hn = class {
     return f === Ct.WRAP && y.updateDocumentDataPageSize(Math.max(S, 1)), g.calculate(), g.getActualSize(), ne(g).width + _;
   }
   isHit(t, e) {
-    const { subUnitId: o, row: n, col: a } = e, r = this._ensureMap(o).get(this._generateKey(n, a)), l = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, n, a);
-    if (!l || !r || l.renderMode === ct.TEXT)
+    const { subUnitId: o, row: n, col: a } = e, r = this._ensureMap(o).get(this._generateKey(n, a)), s = this._dataValidationModel.getRuleByLocation(e.unitId, e.subUnitId, n, a);
+    if (!s || !r || s.renderMode === ct.TEXT)
       return !1;
-    const { top: s, left: c, width: u, height: h } = r, { x: d, y: v } = t;
-    return d >= c && d <= c + u && v >= s && v <= s + h;
+    const { top: l, left: c, width: u, height: h } = r, { x: d, y: v } = t;
+    return d >= c && d <= c + u && v >= l && v <= l + h;
   }
   onPointerDown(t, e) {
     if (e.button === 2)