@univerjs/sheets-conditional-formatting-ui 0.9.2 → 0.9.3-nightly.202507250819

package/lib/index.js

@@ -2,12 +2,12 @@ var lr = Object.defineProperty;
 var cr = (t, e, r) => e in t ? lr(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
 var Se = (t, e, r) => cr(t, typeof e != "symbol" ? e + "" : e, r);
 import { CommandType as me, ICommandService as te, IUniverInstanceService as Z, ColorKit as mn, BooleanNumber as le, LocaleService as re, UniverInstanceType as A, Tools as Bt, get as ur, set as dr, createInterceptorKey as fn, InterceptorManager as hr, Inject as P, Disposable as ue, Injector as fe, Rectangle as ye, generateRandomId as vr, ObjectMatrix as Me, Range as be, toDisposable as pn, InterceptorEffectEnum as gr, DependentOn as Cn, IConfigService as yn, Plugin as bn, merge as In, registerDependencies as mr, touchDependencies as kt } from "@univerjs/core";
-import { getSheetCommandTarget as Ie, SheetsSelectionsService as je, RemoveSheetMutation as fr, SetWorksheetActiveOperation as Wt, setEndForRange as pr, SetSelectionsOperation as Cr, checkRangesEditablePermission as mt, SheetInterceptorService as qt, ClearSelectionFormatCommand as yr, ClearSelectionAllCommand as br, RangeMergeUtil as Ir, rangeToDiscreteRange as Sr, findAllRectangle as ft, createTopMatrixFromMatrix as pt, SheetPermissionCheckController as _r, WorksheetEditPermission as Sn, WorksheetSetCellStylePermission as _n, RangeProtectionPermissionEditPoint as wn, WorkbookEditablePermission as Rn, RefRangeService as wr, handleDefaultRangeChangeWithEffectRefCommands as Rr, INTERCEPTOR_POINT as Tr, AFTER_CELL_EDIT as xr } from "@univerjs/sheets";
-import { ConditionalFormattingRuleModel as Q, CFSubRuleType as F, CFRuleType as L, AddConditionalRuleMutation as se, CFNumberOperator as U, getColorScaleFromValue as Er, iconMap as Ve, DEFAULT_BG_COLOR as Nr, DEFAULT_FONT_COLOR as Mr, defaultDataBarPositiveColor as Ke, defaultDataBarNativeColor as Xe, CFValueType as D, createDefaultValueByValueType as Je, removeUndefinedAttr as Vr, createDefaultValue as Ct, CFTextOperator as H, CFTimePeriodOperator as ve, iconGroup as kr, getOppositeOperator as Ht, compareWithNumber as Fr, EMPTY_ICON_TYPE as Lr, SetCfCommand as Ur, AddCfCommand as Tn, SetConditionalRuleMutation as _e, DeleteConditionalRuleMutation as we, MoveConditionalRuleMutation as xn, ClearWorksheetCfCommand as En, DeleteCfCommand as Yt, MoveCfCommand as Pr, ClearRangeCfCommand as Or, createDefaultRule as xe, setConditionalRuleMutationUndoFactory as $e, DeleteConditionalRuleMutationUndoFactory as Ae, ConditionalFormattingViewModel as it, SHEET_CONDITIONAL_FORMATTING_PLUGIN as st, AddConditionalRuleMutationUndoFactory as Nn, isRangesEqual as Dr, ConditionalFormattingService as Mn, DEFAULT_PADDING as $r, DEFAULT_WIDTH as Ar, UniverSheetsConditionalFormattingPlugin as Vn, CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH as Hr } from "@univerjs/sheets-conditional-formatting";
+import { getSheetCommandTarget as Ie, SheetsSelectionsService as Be, RemoveSheetMutation as fr, SetWorksheetActiveOperation as Wt, setEndForRange as pr, SetSelectionsOperation as Cr, checkRangesEditablePermission as mt, SheetInterceptorService as qt, ClearSelectionFormatCommand as yr, ClearSelectionAllCommand as br, RangeMergeUtil as Ir, rangeToDiscreteRange as Sr, findAllRectangle as ft, createTopMatrixFromMatrix as pt, SheetPermissionCheckController as _r, WorksheetEditPermission as Sn, WorksheetSetCellStylePermission as _n, RangeProtectionPermissionEditPoint as wn, WorkbookEditablePermission as Rn, RefRangeService as wr, handleDefaultRangeChangeWithEffectRefCommands as Rr, INTERCEPTOR_POINT as Tr, AFTER_CELL_EDIT as xr } from "@univerjs/sheets";
+import { ConditionalFormattingRuleModel as Q, CFSubRuleType as F, CFRuleType as L, AddConditionalRuleMutation as se, CFNumberOperator as U, getColorScaleFromValue as Er, iconMap as Ve, DEFAULT_BG_COLOR as Nr, DEFAULT_FONT_COLOR as Mr, defaultDataBarPositiveColor as Ke, defaultDataBarNativeColor as Xe, CFValueType as D, createDefaultValueByValueType as Je, removeUndefinedAttr as Vr, createDefaultValue as Ct, CFTextOperator as H, CFTimePeriodOperator as ve, iconGroup as kr, getOppositeOperator as Ht, compareWithNumber as Fr, EMPTY_ICON_TYPE as Lr, SetCfCommand as Ur, AddCfCommand as Tn, SetConditionalRuleMutation as _e, DeleteConditionalRuleMutation as we, MoveConditionalRuleMutation as xn, ClearWorksheetCfCommand as En, DeleteCfCommand as Yt, MoveCfCommand as Pr, ClearRangeCfCommand as Or, createDefaultRule as xe, setConditionalRuleMutationUndoFactory as Ae, DeleteConditionalRuleMutationUndoFactory as He, ConditionalFormattingViewModel as it, SHEET_CONDITIONAL_FORMATTING_PLUGIN as st, AddConditionalRuleMutationUndoFactory as Nn, isRangesEqual as Dr, ConditionalFormattingService as Mn, DEFAULT_PADDING as $r, DEFAULT_WIDTH as Ar, UniverSheetsConditionalFormattingPlugin as Vn, CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH as Hr } from "@univerjs/sheets-conditional-formatting";
 import { useDependency as q, useSidebarClick as Nt, ILayoutService as jr, useScrollYOverContainer as Br, ISidebarService as kn, useObservable as Wr, ComponentManager as qr, getMenuHiddenObservable as Gr, MenuItemType as Zr, RibbonDataGroup as zr, IMenuManagerService as Yr } from "@univerjs/ui";
 import { jsx as c, jsxs as k, Fragment as jt } from "react/jsx-runtime";
-import { forwardRef as oe, useRef as ge, createElement as de, useMemo as J, useState as N, useEffect as K } from "react";
-import { Dropdown as Gt, clsx as X, ColorPicker as Kr, borderClassName as Be, Select as ce, InputNumber as ke, RadioGroup as Xr, Radio as Kt, Checkbox as yt, Input as Jr, Button as Xt, Tooltip as Jt, ReactGridLayout as Qr } from "@univerjs/design";
+import { forwardRef as oe, useRef as ge, createElement as de, useMemo as J, useState as N, useEffect as X } from "react";
+import { Dropdown as Gt, clsx as Y, ColorPicker as Kr, borderClassName as Le, Select as ce, InputNumber as ke, RadioGroup as Xr, Radio as Kt, Checkbox as yt, Input as Jr, Button as Xt, Tooltip as Jt, ReactGridLayout as Qr } from "@univerjs/design";
 import { serializeRange as Fn, deserializeRangeWithSheet as ei } from "@univerjs/engine-formula";
 import { FormulaEditor as Mt, RangeSelector as ti } from "@univerjs/sheets-formula-ui";
 import { useHighlightRange as ni, ISheetClipboardService as ri, COPY_TYPE as Qt, PREDEFINED_HOOK_NAME as Ft, virtualizeDiscreteRanges as Ln, getRepeatRange as ii, SheetSkeletonManagerService as Un, IAutoFillService as si, APPLY_TYPE as Lt, getAutoFillRepeatRange as oi, getCurrentRangeDisable$ as ai, IFormatPainterService as li, FormatPainterStatus as Ut } from "@univerjs/sheets-ui";
@@ -369,7 +369,7 @@ tr.displayName = "UnderlineIcon";
 const Fe = (t) => {
   const { color: e, onChange: r, disable: n = !1, Icon: i = Jn, className: s } = t, o = J(() => new mn(e), [e]), u = () => {
     const a = {
-      className: X("univer-fill-primary-600", n && s),
+      className: Y("univer-fill-primary-600", n && s),
       extend: { colorChannel1: o.isValid ? e : "" }
     };
     return /* @__PURE__ */ c(i, { ...a });
@@ -381,7 +381,7 @@ const Fe = (t) => {
       children: /* @__PURE__ */ c(
         "span",
         {
-          className: X("univer-flex univer-cursor-pointer univer-items-center univer-rounded univer-p-1 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700", s),
+          className: Y("univer-flex univer-cursor-pointer univer-items-center univer-rounded univer-p-1 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700", s),
           children: u()
         }
       )
@@ -450,7 +450,7 @@ const Fe = (t) => {
       return /* @__PURE__ */ c(
         "div",
         {
-          className: X(i, {
+          className: Y(i, {
             "univer-font-bold": x,
             "univer-italic": R
           }),
@@ -460,7 +460,7 @@ const Fe = (t) => {
       );
     }
   }
-}, at = X("univer-mt-5 univer-px-1 univer-py-2 univer-rounded", Be), Ee = (t, e) => ({ label: e.t(`sheet.cf.valueType.${t}`), value: t }), Pt = (t) => {
+}, at = Y("univer-mt-5 univer-px-1 univer-py-2 univer-rounded", Le), Ee = (t, e) => ({ label: e.t(`sheet.cf.valueType.${t}`), value: t }), Pt = (t) => {
   var y;
   const { type: e, className: r, onChange: n, id: i, value: s } = t, o = q(Z), u = o.getCurrentUnitForType(A.UNIVER_SHEET).getUnitId(), a = (y = o.getCurrentUnitForType(A.UNIVER_SHEET).getActiveSheet()) == null ? void 0 : y.getSheetId(), h = J(() => String(s).startsWith("=") ? String(s) : "=", [s]), l = J(() => [D.max, D.min, "none"].includes(e) ? { disabled: !0 } : [D.percent, D.percentile].includes(e) ? {
     min: 0,
@@ -476,7 +476,7 @@ const Fe = (t) => {
     Mt,
     {
       ref: d,
-      className: X("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", Be),
+      className: Y("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", Le),
       initValue: h,
       unitId: u,
       subUnitId: a,
@@ -531,10 +531,10 @@ const Fe = (t) => {
     const m = "#2e55ef";
     return n && ((_ = n.config[n.config.length - 1]) == null ? void 0 : _.color) || m;
   }), E = J(() => (m) => {
-    const { minType: _, medianType: j, maxType: Y, minValue: pe, medianValue: Ce, maxValue: Le, minColor: Ue, medianColor: $, maxColor: B } = m, G = [];
-    return G.push({ color: Ue, value: { type: _, value: pe } }), j !== "none" && G.push({ color: $, value: { type: j, value: Ce } }), G.push({ color: B, value: { type: Y, value: Le } }), { config: G.map((ee, ne) => ({ ...ee, index: ne })), type: L.colorScale };
+    const { minType: _, medianType: j, maxType: K, minValue: pe, medianValue: Ce, maxValue: Ue, minColor: Pe, medianColor: $, maxColor: B } = m, G = [];
+    return G.push({ color: Pe, value: { type: _, value: pe } }), j !== "none" && G.push({ color: $, value: { type: j, value: Ce } }), G.push({ color: B, value: { type: K, value: Ue } }), { config: G.map((ee, ne) => ({ ...ee, index: ne })), type: L.colorScale };
   }, []);
-  K(() => e.intercept(e.getInterceptPoints().submit, {
+  X(() => e.intercept(e.getInterceptPoints().submit, {
     handler() {
       return E({ minType: a, medianType: l, maxType: v, minValue: y, medianValue: w, maxValue: R, minColor: T, medianColor: b, maxColor: C });
     }
@@ -774,7 +774,7 @@ const Fe = (t) => {
       )
     ] })
   ] });
-}, Pe = (t, e) => ({ label: e.t(`sheet.cf.valueType.${t}`), value: t }), rn = (t) => {
+}, Oe = (t, e) => ({ label: e.t(`sheet.cf.valueType.${t}`), value: t }), rn = (t) => {
   var f;
   const { onChange: e, className: r, value: n, type: i, id: s, disabled: o = !1 } = t, u = q(Z), a = u.getCurrentUnitOfType(A.UNIVER_SHEET).getUnitId(), h = (f = u.getCurrentUnitOfType(A.UNIVER_SHEET).getActiveSheet()) == null ? void 0 : f.getSheetId(), l = ge(null), [d, v] = N(!1);
   Nt((w) => {
@@ -794,7 +794,7 @@ const Fe = (t) => {
       Mt,
       {
         ref: l,
-        className: X("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", Be),
+        className: Y("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", Le),
         initValue: w,
         unitId: a,
         subUnitId: h,
@@ -822,8 +822,7 @@ const Fe = (t) => {
   var O;
   const { interceptorManager: e } = t, r = q(re), n = ((O = t.rule) == null ? void 0 : O.type) === L.dataBar ? t.rule : void 0, [i, s] = N(() => {
     var _;
-    const m = "0";
-    return n ? (_ = n.config) != null && _.isGradient ? "1" : "0" : m;
+    return n && (_ = n.config) != null && _.isGradient ? "1" : "0";
   }), [o, u] = N(() => {
     var m;
     return n ? ((m = n.config) == null ? void 0 : m.positiveColor) || Ke : Ke;
@@ -831,11 +830,11 @@ const Fe = (t) => {
     var m;
     return n ? ((m = n.config) == null ? void 0 : m.nativeColor) || Xe : Xe;
   }), l = [
-    Pe(D.num, r),
-    Pe(D.percent, r),
-    Pe(D.percentile, r),
-    Pe(D.formula, r)
-  ], d = [Pe(D.min, r), ...l], v = [Pe(D.max, r), ...l], [p, y] = N(() => {
+    Oe(D.num, r),
+    Oe(D.percent, r),
+    Oe(D.percentile, r),
+    Oe(D.formula, r)
+  ], d = [Oe(D.min, r), ...l], v = [Oe(D.max, r), ...l], [p, y] = N(() => {
     var _;
     const m = d[0].value;
     return n && ((_ = n.config) == null ? void 0 : _.min.type) || m;
@@ -862,7 +861,7 @@ const Fe = (t) => {
     positiveColor: m.positiveColor || Ke,
     nativeColor: m.nativeColor || Xe
   }, type: L.dataBar, isShowValue: m.isShowValue });
-  K(() => e.intercept(e.getInterceptPoints().submit, {
+  X(() => e.intercept(e.getInterceptPoints().submit, {
     handler() {
       return S({ isGradient: i, minValue: I, minValueType: p, maxValue: x, maxValueType: f, positiveColor: o, nativeColor: a, isShowValue: g });
     }
@@ -1131,7 +1130,7 @@ const Fe = (t) => {
     const I = "#e8ecfc";
     return (R = e == null ? void 0 : e.bg) != null && R.rgb ? e.bg.rgb : I;
   });
-  K(() => {
+  X(() => {
     const I = {
       bl: i,
       it: o
@@ -1139,11 +1138,11 @@ const Fe = (t) => {
     v !== void 0 && (I.cl = { rgb: v }), y !== void 0 && (I.bg = { rgb: y }), l !== void 0 && (I.st = { s: l }), a !== void 0 && (I.ul = { s: a }), r(Vr(I));
   }, [i, o, a, l, v, y]);
   const w = "univer-flex univer-cursor-pointer univer-items-center univer-rounded univer-px-1";
-  return /* @__PURE__ */ k("div", { className: X("univer-my-2.5 univer-flex univer-justify-between", n), children: [
+  return /* @__PURE__ */ k("div", { className: Y("univer-my-2.5 univer-flex univer-justify-between", n), children: [
     /* @__PURE__ */ c(
       "div",
       {
-        className: X(w, {
+        className: Y(w, {
           "univer-bg-gray-100 dark:!univer-bg-gray-700": ut(i || le.FALSE)
         }),
         onClick: () => s(ct(i)),
@@ -1153,7 +1152,7 @@ const Fe = (t) => {
     /* @__PURE__ */ c(
       "div",
       {
-        className: X(w, {
+        className: Y(w, {
           "univer-bg-gray-100 dark:!univer-bg-gray-700": ut(o || le.FALSE)
         }),
         onClick: () => u(ct(o)),
@@ -1163,7 +1162,7 @@ const Fe = (t) => {
     /* @__PURE__ */ c(
       "div",
       {
-        className: X(w, {
+        className: Y(w, {
           "univer-bg-gray-100 dark:!univer-bg-gray-700": ut(a || le.FALSE)
         }),
         onClick: () => h(ct(a)),
@@ -1173,7 +1172,7 @@ const Fe = (t) => {
     /* @__PURE__ */ c(
       "div",
       {
-        className: X(w, {
+        className: Y(w, {
           "univer-bg-gray-100 dark:!univer-bg-gray-700": ut(l || le.FALSE)
         }),
         onClick: () => d(ct(l)),
@@ -1191,11 +1190,11 @@ const Fe = (t) => {
     type: L.highlightCell,
     subType: F.formula
   });
-  K(() => r.intercept(r.getInterceptPoints().submit, {
+  X(() => r.intercept(r.getInterceptPoints().submit, {
     handler() {
       return R({ style: v });
     }
-  }), [v, y, r]), K(() => r.intercept(r.getInterceptPoints().beforeSubmit, {
+  }), [v, y, r]), X(() => r.intercept(r.getInterceptPoints().beforeSubmit, {
     handler: (b, S, C) => w || y.length === 1 || !y.startsWith("=") ? (I(n.t("sheet.cf.errorMessage.formulaError")), !1) : C(b)
   }), [w, y]);
   const x = (g) => {
@@ -1216,7 +1215,7 @@ const Fe = (t) => {
       Mt,
       {
         ref: d,
-        className: X("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", Be),
+        className: Y("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", Le),
         errorText: w,
         isFocus: h,
         initValue: y,
@@ -1256,7 +1255,7 @@ const Fe = (t) => {
   t.children
 ] }), W = (t, e) => ({ label: e.t(`sheet.cf.operator.${t}`), value: t }), Ei = (t) => {
   const { type: e, operator: r, onChange: n, value: i, interceptorManager: s } = t, o = q(re), [u, a] = N(() => typeof i == "number" ? i : 0), [h, l] = N(""), [d, v] = N(() => typeof i == "string" ? i : ""), [p, y] = N(""), [f, w] = N(() => Array.isArray(i) ? i[0] === void 0 ? 0 : i[0] : 0), [I, R] = N(""), [x, T] = N(() => Array.isArray(i) ? i[1] === void 0 ? 100 : i[1] : 100), [g, b] = N("");
-  switch (K(() => {
+  switch (X(() => {
     switch (e) {
       case F.text: {
         [H.beginsWith, H.endsWith, H.containsText, H.notContainsText, H.equal, H.notEqual].includes(r) && n(d);
@@ -1267,7 +1266,7 @@ const Fe = (t) => {
         break;
       }
     }
-  }, [e]), K(() => {
+  }, [e]), X(() => {
     const S = s.intercept(s.getInterceptPoints().beforeSubmit, {
       handler: (C, M, E) => {
         switch (e) {
@@ -1403,10 +1402,9 @@ const Fe = (t) => {
     return i && i.operator || g;
   }), [d, v] = N(() => {
     var S;
-    const g = "";
-    return i ? (S = i.value) != null ? S : Ct(i.subType, i.operator) : g;
+    return i ? (S = i.value) != null ? S : Ct(i.subType, i.operator) : "";
   }), [p, y] = N({}), f = J(() => (g) => {
-    var b, S, C, M, E, V, O, m, _, j, Y, pe, Ce, Le, Ue;
+    var b, S, C, M, E, V, O, m, _, j, K, pe, Ce, Ue, Pe;
     switch (g.subType || s) {
       case F.text: {
         if ([H.beginsWith, H.endsWith, H.containsText, H.notContainsText, H.equal, H.notEqual].includes(h))
@@ -1433,7 +1431,7 @@ const Fe = (t) => {
             type: L.highlightCell,
             subType: (_ = g.subType) != null ? _ : s,
             operator: (j = g.operator) != null ? j : h,
-            style: (Y = g.style) != null ? Y : p,
+            style: (K = g.style) != null ? K : p,
             value: (pe = g.value) != null ? pe : d
           };
         break;
@@ -1442,15 +1440,15 @@ const Fe = (t) => {
     return {
       type: L.highlightCell,
       subType: (Ce = g.subType) != null ? Ce : s,
-      operator: (Le = g.operator) != null ? Le : h,
-      style: (Ue = g.style) != null ? Ue : p
+      operator: (Ue = g.operator) != null ? Ue : h,
+      style: (Pe = g.style) != null ? Pe : p
     };
   }, [s, h, d, p]);
-  K(() => e.intercept(e.getInterceptPoints().submit, {
+  X(() => e.intercept(e.getInterceptPoints().submit, {
     handler() {
       return f({});
     }
-  }), [f, e]), K(() => {
+  }), [f, e]), X(() => {
     u.some((g) => g.value === s) || o(u[0].value);
   }, [u]);
   const w = (g) => {
@@ -1524,7 +1522,7 @@ const Fe = (t) => {
     /* @__PURE__ */ c(
       ke,
       {
-        className: X({
+        className: Y({
           "univer-border-red-500": e
         }),
         value: Number(t.value) || 0,
@@ -1536,6 +1534,7 @@ const Fe = (t) => {
     Mt,
     {
       ref: u,
+      className: Y("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", Le),
       initValue: String(t.value),
       unitId: s,
       subUnitId: o,
@@ -1678,12 +1677,10 @@ const Fe = (t) => {
                     {
                       className: "univer-font-medium univer-text-gray-600 dark:!univer-text-gray-200",
                       children: [
-                        "(",
                         i.t("sheet.cf.iconSet.when"),
                         i.t(`sheet.cf.symbol.${Ht(I.operator)}`),
                         R,
-                        f ? "" : ` ${i.t("sheet.cf.iconSet.and")} `,
-                        ")"
+                        f ? "" : ` ${i.t("sheet.cf.iconSet.and")} `
                       ]
                     }
                   )
@@ -1691,7 +1688,7 @@ const Fe = (t) => {
               ]
             }
           ),
-          /* @__PURE__ */ k("div", { className: "univer-mt-3 univer-flex univer-items-center univer-justify-between univer-gap-4", children: [
+          /* @__PURE__ */ k("div", { className: "univer-mt-3 univer-grid univer-grid-cols-2 univer-gap-4", children: [
             /* @__PURE__ */ c("div", { className: "univer-flex univer-items-center", children: /* @__PURE__ */ c(
               Gt,
               {
@@ -1699,14 +1696,9 @@ const Fe = (t) => {
                 children: /* @__PURE__ */ k(
                   "div",
                   {
-                    className: X("univer-box-border univer-flex univer-h-8 univer-w-full univer-items-center univer-justify-between univer-rounded-md univer-bg-white univer-px-4 univer-py-2 univer-text-xs univer-text-gray-600 univer-transition-all hover:univer-border-primary-600 dark:!univer-text-gray-200", Be),
+                    className: Y("univer-box-border univer-flex univer-h-8 univer-w-full univer-items-center univer-justify-between univer-rounded-md univer-bg-white univer-px-4 univer-py-2 univer-text-xs univer-text-gray-600 univer-transition-all hover:univer-border-primary-600 dark:!univer-text-gray-200", Le),
                     children: [
-                      y ? /* @__PURE__ */ c("img", { src: y, className: "univer-size-4", draggable: !1 }) : /* @__PURE__ */ c(
-                        ot,
-                        {
-                          className: "univer-size-4"
-                        }
-                      ),
+                      y ? /* @__PURE__ */ c("img", { src: y, className: "univer-size-4", draggable: !1 }) : /* @__PURE__ */ c(ot, { className: "univer-size-4" }),
                       /* @__PURE__ */ c(Zt, {})
                     ]
                   }
@@ -1716,7 +1708,7 @@ const Fe = (t) => {
             f ? /* @__PURE__ */ k(
               "div",
               {
-                className: "univer-mt-0 univer-w-[45%] univer-text-sm univer-text-gray-600 dark:!univer-text-gray-200",
+                className: "univer-mt-0 univer-text-sm univer-text-gray-600 dark:!univer-text-gray-200",
                 children: [
                   i.t("sheet.cf.iconSet.rule"),
                   /* @__PURE__ */ k("span", { className: "univer-font-medium", children: [
@@ -1742,7 +1734,7 @@ const Fe = (t) => {
             /* @__PURE__ */ k(
               "div",
               {
-                className: "univer-mt-3 univer-flex univer-items-center univer-justify-between univer-gap-4 univer-text-sm univer-text-gray-600 dark:!univer-text-gray-200",
+                className: "univer-mt-3 univer-grid univer-grid-cols-2 univer-gap-4 univer-text-sm univer-text-gray-600 dark:!univer-text-gray-200",
                 children: [
                   /* @__PURE__ */ c("div", { children: i.t("sheet.cf.iconSet.type") }),
                   /* @__PURE__ */ c("div", { children: i.t("sheet.cf.iconSet.value") })
@@ -1752,12 +1744,11 @@ const Fe = (t) => {
             /* @__PURE__ */ k(
               "div",
               {
-                className: "univer-mt-3 univer-flex univer-items-center univer-justify-between univer-gap-4",
+                className: "univer-mt-3 univer-grid univer-grid-cols-2 univer-gap-4",
                 children: [
                   /* @__PURE__ */ c(
                     ce,
                     {
-                      className: "univer-flex-shrink-0",
                       options: o,
                       value: d.value.type,
                       onChange: (T) => {
@@ -1765,7 +1756,7 @@ const Fe = (t) => {
                       }
                     }
                   ),
-                  /* @__PURE__ */ c("div", { children: /* @__PURE__ */ c(
+                  /* @__PURE__ */ c(
                     Ni,
                     {
                       id: v,
@@ -1776,7 +1767,7 @@ const Fe = (t) => {
                         u(T, v);
                       }
                     }
-                  ) })
+                  )
                 ]
               }
             )
@@ -1843,7 +1834,7 @@ const Fe = (t) => {
     const b = Ve[g] || [], S = new Array(b.length).fill("").map((C, M, E) => an(g, M, E));
     h(S), s(p(S));
   };
-  K(() => {
+  X(() => {
     const g = e.intercept(e.getInterceptPoints().submit, {
       handler() {
         return { type: L.iconSet, isShowValue: l, config: a };
@@ -1852,7 +1843,7 @@ const Fe = (t) => {
     return () => {
       g();
     };
-  }, [l, a, e]), K(() => {
+  }, [l, a, e]), X(() => {
     const g = e.intercept(e.getInterceptPoints().beforeSubmit, {
       handler() {
         return Object.keys(i).length === 0;
@@ -1887,7 +1878,7 @@ const Fe = (t) => {
         children: /* @__PURE__ */ k(
           "div",
           {
-            className: X("univer-box-border univer-flex univer-h-8 univer-w-full univer-items-center univer-justify-between univer-rounded-md univer-bg-white univer-px-4 univer-py-2 univer-text-xs univer-text-gray-600 univer-transition-all hover:univer-border-primary-600", Be),
+            className: Y("univer-box-border univer-flex univer-h-8 univer-w-full univer-items-center univer-justify-between univer-rounded-md univer-bg-white univer-px-4 univer-py-2 univer-text-xs univer-text-gray-600 univer-transition-all hover:univer-border-primary-600", Le),
             children: [
               v,
               /* @__PURE__ */ c(Zt, {})
@@ -1961,7 +1952,7 @@ const Fe = (t) => {
     if (R === "lessThanAverage")
       return { type: L.highlightCell, subType: F.average, operator: U.lessThan, style: g };
   };
-  K(() => r.intercept(r.getInterceptPoints().submit, {
+  X(() => r.intercept(r.getInterceptPoints().submit, {
     handler() {
       return y({ type: o, isPercent: l, value: a, style: v });
     }
@@ -2037,7 +2028,7 @@ const Fe = (t) => {
   return (e = t.getCurrentUnitForType(A.UNIVER_SHEET).getActiveSheet()) == null ? void 0 : e.getSheetId();
 }, Oi = (t) => {
   var S, C, M;
-  const e = q(re), r = q(te), n = q(Z), i = q(Q), s = q(je), o = ln(n), u = cn(n), [a, h] = N(void 0), l = ge((C = (S = t.rule) == null ? void 0 : S.ranges) != null ? C : []), d = J(() => {
+  const e = q(re), r = q(te), n = q(Z), i = q(Q), s = q(Be), o = ln(n), u = cn(n), [a, h] = N(void 0), l = ge((C = (S = t.rule) == null ? void 0 : S.ranges) != null ? C : []), d = J(() => {
     var V, O, m;
     let E = (V = t.rule) == null ? void 0 : V.ranges;
     return E != null && E.length || (E = (m = (O = s.getCurrentSelections()) == null ? void 0 : O.map((_) => _.range)) != null ? m : []), l.current = E, E != null && E.length ? E.map((_) => {
@@ -2099,7 +2090,7 @@ const Fe = (t) => {
         return on;
     }
   }, [p]);
-  K(() => {
+  X(() => {
     const E = r.onCommandExecuted((V) => {
       if (V.id === fr.id) {
         const O = V.params;
@@ -2121,7 +2112,7 @@ const Fe = (t) => {
       const m = n.getCurrentUnitForType(A.UNIVER_SHEET).getActiveSheet();
       if (!m)
         throw new Error("No active sheet found");
-      return l.current.map((Y) => pr(Y, m.getRowCount(), m.getColumnCount())).filter((Y) => !(Number.isNaN(Y.startRow) || Number.isNaN(Y.startColumn)));
+      return l.current.map((K) => pr(K, m.getRowCount(), m.getColumnCount())).filter((K) => !(Number.isNaN(K.startRow) || Number.isNaN(K.startColumn)));
     })();
     if (w.fetchThroughInterceptors(w.getInterceptPoints().beforeSubmit)(!0, null)) {
       const m = w.fetchThroughInterceptors(w.getInterceptPoints().submit)(null, null);
@@ -2129,8 +2120,8 @@ const Fe = (t) => {
         const _ = ln(n), j = cn(n);
         if (!_ || !j)
           throw new Error("No active sheet found");
-        let Y = {};
-        t.rule && t.rule.cfId ? (Y = { ...t.rule, ranges: V, rule: m }, r.executeCommand(Ur.id, { unitId: _, subUnitId: j, rule: Y }), t.onCancel()) : (Y = { cfId: i.createCfId(_, j), ranges: V, rule: m, stopIfTrue: !1 }, r.executeCommand(Tn.id, { unitId: _, subUnitId: j, rule: Y }), t.onCancel());
+        let K = {};
+        t.rule && t.rule.cfId ? (K = { ...t.rule, ranges: V, rule: m }, r.executeCommand(Ur.id, { unitId: _, subUnitId: j, rule: K }), t.onCancel()) : (K = { cfId: i.createCfId(_, j), ranges: V, rule: m, stopIfTrue: !1 }, r.executeCommand(Tn.id, { unitId: _, subUnitId: j, rule: K }), t.onCancel());
       }
     }
   }, g = () => {
@@ -2194,7 +2185,7 @@ var Di = Object.getOwnPropertyDescriptor, $i = (t, e, r, n) => {
     (o = t[s]) && (i = o(i) || i);
   return i;
 }, Ai = (t, e) => (r, n) => e(r, n, t);
-let He = class extends ue {
+let je = class extends ue {
   constructor(e) {
     super();
     Se(this, "_initLocal", () => {
@@ -2231,9 +2222,9 @@ let He = class extends ue {
     return [];
   }
 };
-He = $i([
+je = $i([
   Ai(0, P(re))
-], He);
+], je);
 const Hi = (t, e) => {
   const r = t.rule;
   switch (r.type) {
@@ -2274,7 +2265,7 @@ const Hi = (t, e) => {
 };
 let un = 0;
 const ji = (t) => {
-  const { onClick: e } = t, r = q(Q), n = q(Z), i = q(je), s = q(te), o = q(re), u = q(fe), a = q(kn), h = q(He), l = Wr(() => n.getCurrentTypeOfUnit$(A.UNIVER_SHEET), void 0, void 0, []), d = l.getUnitId(), v = l.getActiveSheet();
+  const { onClick: e } = t, r = q(Q), n = q(Z), i = q(Be), s = q(te), o = q(re), u = q(fe), a = q(kn), h = q(je), l = Wr(() => n.getCurrentTypeOfUnit$(A.UNIVER_SHEET), void 0, void 0, []), d = l.getUnitId(), v = l.getActiveSheet();
   if (!v)
     throw new Error("No active sheet found");
   const p = v.getSheetId(), [y, f] = N([]), [w, I] = N("2"), [R, x] = N(0), [T, g] = N(-1), [b, S] = N(un), C = ge(null), M = [
@@ -2294,14 +2285,14 @@ const ji = (t) => {
       return [...$];
     return [];
   }, [V, O] = N(E);
-  ni(y), K(() => {
+  ni(y), X(() => {
     const $ = s.onCommandExecuted((B) => {
       B.id === Wt.id && x(Math.random());
     });
     return () => $.dispose();
-  }), K(() => {
+  }), X(() => {
     O(E);
-  }, [w, R, d, p]), K(() => {
+  }, [w, R, d, p]), X(() => {
     if (w === "2")
       return;
     const $ = new Ne((B) => {
@@ -2316,12 +2307,12 @@ const ji = (t) => {
     return () => {
       $.unsubscribe();
     };
-  }, [n, w, d, p]), K(() => {
+  }, [n, w, d, p]), X(() => {
     const $ = r.$ruleChange.subscribe(() => {
       x(Math.random());
     });
     return () => $.unsubscribe();
-  }, [r]), K(() => {
+  }, [r]), X(() => {
     const $ = () => {
       var ee, ne;
       const z = Math.max(0, ((ne = (ee = C.current) == null ? void 0 : ee.getBoundingClientRect().width) != null ? ne : 0) - 8);
@@ -2367,7 +2358,7 @@ const ji = (t) => {
       return Math.min(ar - 1, Math.max(0, or));
     }, Re = V[ne(B.y)].cfId, Te = V[ne(G.y)].cfId;
     Re !== Te && s.executeCommand(Pr.id, { unitId: z, subUnitId: ee, start: { id: Re, type: "self" }, end: { id: Te, type: G.y > B.y ? "after" : "before" } });
-  }, Y = () => {
+  }, K = () => {
     t.onCreate();
   }, pe = () => {
     w === "2" ? s.executeCommand(En.id) : w === "1" && V.map((B) => ({ unitId: d, subUnitId: p, cfId: B.cfId })).forEach((B) => {
@@ -2379,7 +2370,7 @@ const ji = (t) => {
       const z = G.ranges;
       return mt(u, $.getUnitId(), B.getSheetId(), z);
     });
-  }, [V]), Le = Ce.map(($, B) => ({ i: $.cfId, x: 0, w: 12, y: B, h: 1, isResizable: !1 })), Ue = J(() => {
+  }, [V]), Ue = Ce.map(($, B) => ({ i: $.cfId, x: 0, w: 12, y: B, h: 1, isResizable: !1 })), Pe = J(() => {
     const $ = n.getCurrentUnitOfType(A.UNIVER_SHEET), B = $.getActiveSheet();
     return V.every((G) => {
       const z = G.ranges;
@@ -2407,11 +2398,11 @@ const ji = (t) => {
           "a",
           {
             className: "univer-size-5 univer-cursor-pointer",
-            onClick: Y,
+            onClick: K,
             children: /* @__PURE__ */ c(Kn, {})
           }
         ) }),
-        V.length && Ue ? /* @__PURE__ */ c(Jt, { title: o.t("sheet.cf.panel.clear"), placement: "bottom", children: /* @__PURE__ */ c(
+        V.length && Pe ? /* @__PURE__ */ c(Jt, { title: o.t("sheet.cf.panel.clear"), placement: "bottom", children: /* @__PURE__ */ c(
           "a",
           {
             className: "univer-size-5 univer-cursor-pointer",
@@ -2426,7 +2417,7 @@ const ji = (t) => {
       {
         className: "[&_.react-grid-item]:univer-transition-none [&_.react-grid-placeholder]:univer-rounded [&_.react-grid-placeholder]:!univer-bg-gray-200",
         draggableHandle: ".draggableHandle",
-        layout: Le,
+        layout: Ue,
         cols: 12,
         rowHeight: 60,
         width: b,
@@ -2436,7 +2427,7 @@ const ji = (t) => {
         children: Ce == null ? void 0 : Ce.map(($, B) => /* @__PURE__ */ c("div", { children: /* @__PURE__ */ k(
           "div",
           {
-            className: X("univer-group univer-relative univer-flex univer-items-center univer-justify-between univer-rounded univer-py-2 univer-pl-5 univer-pr-8 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700", {
+            className: Y("univer-group univer-relative univer-flex univer-items-center univer-justify-between univer-rounded univer-py-2 univer-pl-5 univer-pr-8 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700", {
               "univer-bg-gray-100 dark:!univer-bg-gray-700": T === B
             }),
             onMouseMove: () => {
@@ -2450,7 +2441,7 @@ const ji = (t) => {
               /* @__PURE__ */ c(
                 "div",
                 {
-                  className: X("univer-absolute univer-left-0 univer-hidden univer-size-5 univer-cursor-grab univer-items-center univer-justify-center univer-rounded group-hover:univer-flex", "draggableHandle"),
+                  className: Y("univer-absolute univer-left-0 univer-hidden univer-size-5 univer-cursor-grab univer-items-center univer-justify-center univer-rounded group-hover:univer-flex", "draggableHandle"),
                   onClick: (G) => G.stopPropagation(),
                   children: /* @__PURE__ */ c(Qn, {})
                 }
@@ -2475,7 +2466,7 @@ const ji = (t) => {
               /* @__PURE__ */ c(
                 "div",
                 {
-                  className: X("univer-absolute univer-right-1 univer-hidden univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded hover:univer-bg-gray-200 group-hover:univer-flex", {
+                  className: Y("univer-absolute univer-right-1 univer-hidden univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded hover:univer-bg-gray-200 group-hover:univer-flex", {
                     "univer-flex univer-items-center univer-justify-center": T === B
                   }),
                   onClick: (G) => {
@@ -2492,7 +2483,7 @@ const ji = (t) => {
   ] });
 }, Bi = (t) => {
   const [e, r] = N(t.rule), [n, i] = N(!!t.rule);
-  return /* @__PURE__ */ c("div", { className: "univer-flex univer-h-full univer-flex-col univer-justify-between", children: n ? /* @__PURE__ */ c(Oi, { onCancel: () => {
+  return /* @__PURE__ */ c("div", { className: "univer-flex univer-h-full univer-flex-col univer-justify-between univer-py-4", children: n ? /* @__PURE__ */ c(Oi, { onCancel: () => {
     i(!1), r(void 0);
   }, rule: e }) : /* @__PURE__ */ c(ji, { onClick: (a) => {
     r(a), i(!0);
@@ -2553,7 +2544,7 @@ const Vt = {
   type: me.OPERATION,
   handler: (t, e) => {
     var u;
-    const r = t.get(Qe), n = t.get(je), i = t.get(te), s = ((u = n.getCurrentSelections()) == null ? void 0 : u.map((a) => a.range)) || [];
+    const r = t.get(Qe), n = t.get(Be), i = t.get(te), s = ((u = n.getCurrentSelections()) == null ? void 0 : u.map((a) => a.range)) || [];
     switch (e.value) {
       case 3: {
         r.openPanel({ ...xe(), ranges: s });
@@ -2688,7 +2679,7 @@ bt = Zi([
   Ge(0, P(fe)),
   Ge(1, P(Z)),
   Ge(2, P(qt)),
-  Ge(3, P(je)),
+  Ge(3, P(Be)),
   Ge(4, P(Q))
 ], bt);
 function dn(t, e, r, n, i) {
@@ -2703,7 +2694,7 @@ function dn(t, e, r, n, i) {
           subUnitId: i,
           rule: { ...u, ranges: h }
         }
-      }, d = $e(t, l.params);
+      }, d = Ae(t, l.params);
       s.push(l), o.push(...d);
     } else {
       const l = {
@@ -2713,7 +2704,7 @@ function dn(t, e, r, n, i) {
           subUnitId: i,
           cfId: u.cfId
         }
-      }, d = Ae(t, l.params);
+      }, d = He(t, l.params);
       s.push(l), o.push(...d);
     }
   }), { redos: s, undos: o };
@@ -2832,8 +2823,8 @@ let et = class extends ue {
           if (!v[O]) {
             const m = R(O), _ = new Me();
             v[O] = _, m.ranges.forEach((j) => {
-              be.foreach(j, (Y, pe) => {
-                _.setValue(Y, pe, 1);
+              be.foreach(j, (K, pe) => {
+                _.setValue(K, pe, 1);
               });
             });
           }
@@ -2850,7 +2841,7 @@ let et = class extends ue {
           subUnitId: o,
           cfId: g
         };
-        x.push({ id: we.id, params: C }), T.push(...Ae(this._injector, C));
+        x.push({ id: we.id, params: C }), T.push(...He(this._injector, C));
       }
       if (f.some((C) => C.cfId === g)) {
         const C = R(g), M = {
@@ -2868,7 +2859,7 @@ let et = class extends ue {
           subUnitId: o,
           rule: { ...C, ranges: S }
         };
-        x.push({ id: _e.id, params: M }), T.push(...$e(this._injector, M));
+        x.push({ id: _e.id, params: M }), T.push(...Ae(this._injector, M));
       }
     }
     return {
@@ -2926,10 +2917,10 @@ let nt = class extends ue {
         if (Dr(l, h))
           return { redos: [], undos: [] };
         if (l.length) {
-          const v = { unitId: n, subUnitId: i, rule: { ...s, ranges: l } }, p = [{ id: _e.id, params: v }], y = $e(this._injector, v);
+          const v = { unitId: n, subUnitId: i, rule: { ...s, ranges: l } }, p = [{ id: _e.id, params: v }], y = Ae(this._injector, v);
           return { redos: p, undos: y };
         } else {
-          const v = { unitId: n, subUnitId: i, cfId: s.cfId }, p = [{ id: we.id, params: v }], y = Ae(this._injector, v);
+          const v = { unitId: n, subUnitId: i, cfId: s.cfId }, p = [{ id: we.id, params: v }], y = He(this._injector, v);
           return { redos: p, undos: y };
         }
       }, u = [];
@@ -2973,7 +2964,7 @@ var es = Object.getOwnPropertyDescriptor, ts = (t, e, r, n) => {
   for (var i = n > 1 ? void 0 : n ? es(e, r) : e, s = t.length - 1, o; s >= 0; s--)
     (o = t[s]) && (i = o(i) || i);
   return i;
-}, Oe = (t, e) => (r, n) => e(r, n, t);
+}, De = (t, e) => (r, n) => e(r, n, t);
 let rt = class extends ue {
   constructor(e, r, n, i, s, o) {
     super();
@@ -3025,12 +3016,12 @@ let rt = class extends ue {
   }
 };
 rt = ts([
-  Oe(0, P(qt)),
-  Oe(1, P(Mn)),
-  Oe(2, P(Z)),
-  Oe(3, P(On)),
-  Oe(4, P(it)),
-  Oe(5, P(Q))
+  De(0, P(qt)),
+  De(1, P(Mn)),
+  De(2, P(Z)),
+  De(3, P(On)),
+  De(4, P(it)),
+  De(5, P(Q))
 ], rt);
 const rr = "sheets-conditional-formatting-ui.config", It = {};
 var ns = Object.defineProperty, rs = Object.getOwnPropertyDescriptor, is = (t, e, r) => e in t ? ns(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, ss = (t, e, r, n) => {
@@ -3046,7 +3037,7 @@ let St = class extends bn {
       It,
       this._config
     );
-    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(rr, s), this._initCommand(), this._injector.add([rt]), this._injector.add([nt]), this._injector.add([et]), this._injector.add([tt]), this._injector.add([He]);
+    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(rr, s), this._initCommand(), this._injector.add([rt]), this._injector.add([nt]), this._injector.add([et]), this._injector.add([tt]), this._injector.add([je]);
   }
   _initCommand() {
     [
@@ -3178,14 +3169,14 @@ let _t = class extends ue {
             subUnitId: u,
             rule: { ...b, ranges: S }
           };
-          h.push({ id: _e.id, params: C }), l.push(...$e(this._injector, C));
+          h.push({ id: _e.id, params: C }), l.push(...Ae(this._injector, C));
         } else {
           const C = {
             unitId: o,
             subUnitId: u,
             cfId: b.cfId
           };
-          h.push({ id: we.id, params: C }), l.push(...Ae(this._injector, C));
+          h.push({ id: we.id, params: C }), l.push(...He(this._injector, C));
         }
       }), {
         undos: l,
@@ -3340,7 +3331,7 @@ const vn = [
     value: ie.clearWorkSheetRules
   }
 ], us = (t) => {
-  const e = t.get(je), r = t.get(te), n = t.get(Z), i = t.get(Q), s = new Ne((a) => Pn(
+  const e = t.get(Be), r = t.get(te), n = t.get(Z), i = t.get(Q), s = new Ne((a) => Pn(
     e.selectionMoveEnd$,
     e.selectionSet$,
     new Ne((h) => {
@@ -3424,7 +3415,7 @@ var gs = Object.getOwnPropertyDescriptor, ms = (t, e, r, n) => {
   for (var i = n > 1 ? void 0 : n ? gs(e, r) : e, s = t.length - 1, o; s >= 0; s--)
     (o = t[s]) && (i = o(i) || i);
   return i;
-}, De = (t, e) => (r, n) => e(r, n, t);
+}, $e = (t, e) => (r, n) => e(r, n, t);
 const fs = (t, e) => {
   const r = (l) => l.endRow - l.startRow + 1, n = (l) => l.endColumn - l.startColumn + 1, i = r(e) % r(t), s = n(e) % n(t), o = Math.floor(r(e) / r(t)), u = Math.floor(n(e) / n(t)), a = [], h = {
     startRow: 0,
@@ -3553,14 +3544,14 @@ let Tt = class extends ue {
                 subUnitId: o,
                 rule: { ...g, ranges: b }
               };
-              p.push({ id: _e.id, params: S }), y.push(...$e(this._injector, S));
+              p.push({ id: _e.id, params: S }), y.push(...Ae(this._injector, S));
             } else {
               const S = {
                 unitId: s,
                 subUnitId: o,
                 cfId: g.cfId
               };
-              p.push({ id: we.id, params: S }), y.push(...Ae(this._injector, S));
+              p.push({ id: we.id, params: S }), y.push(...He(this._injector, S));
             }
           else if (b.length) {
             const S = this._conditionalFormattingRuleModel.getRule(h, l, T);
@@ -3588,14 +3579,14 @@ let Tt = class extends ue {
               subUnitId: l,
               rule: { ...g, ranges: b }
             };
-            p.push({ id: _e.id, params: S }), y.push(...$e(this._injector, S));
+            p.push({ id: _e.id, params: S }), y.push(...Ae(this._injector, S));
           } else {
             const S = {
               unitId: h,
               subUnitId: l,
               cfId: g.cfId
             };
-            p.push({ id: we.id, params: S }), y.push(...Ae(this._injector, S));
+            p.push({ id: we.id, params: S }), y.push(...He(this._injector, S));
           }
         }
       }), {
@@ -3628,12 +3619,12 @@ let Tt = class extends ue {
   }
 };
 Tt = ms([
-  De(0, P(fe)),
-  De(1, P(Z)),
-  De(2, P(li)),
-  De(3, P(je)),
-  De(4, P(Q)),
-  De(5, P(it))
+  $e(0, P(fe)),
+  $e(1, P(Z)),
+  $e(2, P(li)),
+  $e(3, P(Be)),
+  $e(4, P(Q)),
+  $e(5, P(it))
 ], Tt);
 var ps = Object.getOwnPropertyDescriptor, Cs = (t, e, r, n) => {
   for (var i = n > 1 ? void 0 : n ? ps(e, r) : e, s = t.length - 1, o; s >= 0; s--)
@@ -3691,7 +3682,7 @@ let Et = class extends bn {
       [tt],
       [Qe],
       [Rt],
-      [He],
+      [je],
       [wt],
       [bt],
       [Tt],
@@ -3712,7 +3703,7 @@ let Et = class extends bn {
       [bt],
       [et],
       [wt],
-      [He],
+      [je],
       [Tt],
       [tt],
       [nt],