@univerjs/sheets-conditional-formatting-ui 0.8.2 → 0.8.3-nightly.202507010644

package/lib/index.js

@@ -2,8 +2,8 @@ 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 { ConditionalFormattingRuleModel as Q, CFSubRuleType as F, CFRuleType as L, AddConditionalRuleMutation as se, CFNumberOperator as U, getColorScaleFromValue as fr, iconMap as Ve, DEFAULT_BG_COLOR as pr, DEFAULT_FONT_COLOR as Cr, defaultDataBarPositiveColor as Ke, defaultDataBarNativeColor as Xe, CFValueType as D, createDefaultValueByValueType as Je, removeUndefinedAttr as yr, createDefaultValue as mt, CFTextOperator as H, CFTimePeriodOperator as ve, iconGroup as br, getOppositeOperator as Ht, compareWithNumber as Ir, EMPTY_ICON_TYPE as Sr, SetCfCommand as _r, AddCfCommand as Sn, SetConditionalRuleMutation as _e, DeleteConditionalRuleMutation as we, MoveConditionalRuleMutation as _n, ClearWorksheetCfCommand as wn, DeleteCfCommand as Yt, MoveCfCommand as wr, ClearRangeCfCommand as Rr, createDefaultRule as xe, ConditionalFormattingViewModel as it, SHEET_CONDITIONAL_FORMATTING_PLUGIN as st, DeleteConditionalRuleMutationUndoFactory as $e, AddConditionalRuleMutationUndoFactory as Rn, setConditionalRuleMutationUndoFactory as Ae, isRangesEqual as Tr, ConditionalFormattingService as Tn, DEFAULT_PADDING as xr, DEFAULT_WIDTH as Er, UniverSheetsConditionalFormattingPlugin as xn, CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH as Nr } from "@univerjs/sheets-conditional-formatting";
-import { getSheetCommandTarget as Ie, SheetsSelectionsService as je, RemoveSheetMutation as Mr, SetWorksheetActiveOperation as Wt, setEndForRange as Vr, SetSelectionsOperation as kr, checkRangesEditablePermission as ft, rangeToDiscreteRange as Fr, findAllRectangle as pt, createTopMatrixFromMatrix as Ct, SheetPermissionCheckController as Lr, WorksheetEditPermission as En, WorksheetSetCellStylePermission as Nn, RangeProtectionPermissionEditPoint as Mn, WorkbookEditablePermission as Vn, RefRangeService as Ur, handleDefaultRangeChangeWithEffectRefCommands as Pr, SheetInterceptorService as qt, INTERCEPTOR_POINT as Or, ClearSelectionFormatCommand as Dr, ClearSelectionAllCommand as $r, RangeMergeUtil as Ar, AFTER_CELL_EDIT as Hr } from "@univerjs/sheets";
+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 { 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";
@@ -394,7 +394,7 @@ const Fe = (t) => {
   const r = J(() => {
     if (e.type === L.colorScale) {
       const l = e.config.map((p, y) => ({ color: new mn(p.color), value: y })), d = l.length - 1;
-      return new Array(5).fill("").map((p, y, f) => y * d / (f.length - 1)).map((p) => fr(l, p));
+      return new Array(5).fill("").map((p, y, f) => y * d / (f.length - 1)).map((p) => Er(l, p));
     }
     return null;
   }, [e]), n = J(() => {
@@ -442,7 +442,7 @@ const Fe = (t) => {
     case L.iconSet:
       return n && /* @__PURE__ */ c("div", { className: i, children: n.map((l, d) => l ? /* @__PURE__ */ c("img", { className: "univer-h-full", src: l, draggable: !1 }, d) : /* @__PURE__ */ c(ot, {}, d)) });
     case L.highlightCell: {
-      const { ul: l, st: d, it: v, bl: p, bg: y, cl: f } = e.style, w = (l == null ? void 0 : l.s) === le.TRUE, I = (d == null ? void 0 : d.s) === le.TRUE, R = v === le.TRUE, x = p === le.TRUE, T = (u = y == null ? void 0 : y.rgb) != null ? u : pr, g = (a = f == null ? void 0 : f.rgb) != null ? a : Cr, b = {
+      const { ul: l, st: d, it: v, bl: p, bg: y, cl: f } = e.style, w = (l == null ? void 0 : l.s) === le.TRUE, I = (d == null ? void 0 : d.s) === le.TRUE, R = v === le.TRUE, x = p === le.TRUE, T = (u = y == null ? void 0 : y.rgb) != null ? u : Nr, g = (a = f == null ? void 0 : f.rgb) != null ? a : Mr, b = {
         textDecoration: (h = `${w ? "underline" : ""} ${I ? "line-through" : ""}`.replace(/^ /, "")) != null ? h : void 0,
         backgroundColor: T,
         color: g
@@ -1136,7 +1136,7 @@ const Fe = (t) => {
       bl: i,
       it: o
     };
-    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(yr(I));
+    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: [
@@ -1404,7 +1404,7 @@ const Fe = (t) => {
   }), [d, v] = N(() => {
     var S;
     const g = "";
-    return i ? (S = i.value) != null ? S : mt(i.subType, i.operator) : g;
+    return i ? (S = i.value) != null ? S : Ct(i.subType, i.operator) : g;
   }), [p, y] = N({}), f = J(() => (g) => {
     var b, S, C, M, E, V, O, m, _, j, Y, pe, Ce, Le, Ue;
     switch (g.subType || s) {
@@ -1455,7 +1455,7 @@ const Fe = (t) => {
   }, [u]);
   const w = (g) => {
     const b = g, S = sn(b, n), C = S && S[0].value;
-    o(b), l(C), C && v(mt(b, C)), r(f({ subType: b, operator: C }));
+    o(b), l(C), C && v(Ct(b, C)), r(f({ subType: b, operator: C }));
   }, I = (g) => {
     const b = g;
     l(b), r(f({ operator: b }));
@@ -1555,7 +1555,7 @@ const Fe = (t) => {
   const { onClick: r } = t, n = q(re), i = (s) => {
     r(s);
   };
-  return /* @__PURE__ */ c("div", { ref: e, className: "univer-w-80", children: br.map((s, o) => /* @__PURE__ */ k("div", { className: "univer-mb-3", children: [
+  return /* @__PURE__ */ c("div", { ref: e, className: "univer-w-80", children: kr.map((s, o) => /* @__PURE__ */ k("div", { className: "univer-mb-3", children: [
     /* @__PURE__ */ c("div", { className: "univer-mb-1 univer-text-sm", children: n.t(s.title) }),
     /* @__PURE__ */ c("div", { className: "univer-flex univer-flex-wrap", children: s.group.map((u) => /* @__PURE__ */ c(
       "div",
@@ -1605,7 +1605,7 @@ const Fe = (t) => {
       "div",
       {
         className: "univer-mb-2.5 univer-flex univer-cursor-pointer univer-items-center univer-pl-1",
-        onClick: () => n({ iconType: Sr, iconId: "" }),
+        onClick: () => n({ iconType: Lr, iconId: "" }),
         children: [
           /* @__PURE__ */ c(ot, { className: "univer-size-5" }),
           /* @__PURE__ */ c("span", { className: "univer-ml-2", children: "无单元格图标" })
@@ -1639,11 +1639,11 @@ const Fe = (t) => {
     e([String(v), "value", "value"], d);
   }, a = (d, v) => {
     e([String(v), "operator"], d);
-    const p = mt(F.number, d);
+    const p = Ct(F.number, d);
     u(p, v);
   }, h = (d, v) => {
     e([String(v), "value", "type"], d);
-    const p = r[v], y = mt(F.number, p.operator);
+    const p = r[v], y = Ct(F.number, p.operator);
     u(y, v);
   };
   return J(() => r.map((d, v) => {
@@ -1832,7 +1832,7 @@ const Fe = (t) => {
         if (M - 1 < 0 || M === E.length - 1)
           return;
         const O = g[M - 1], m = Ht(O.operator);
-        Ir({ operator: m, value: O.value.value }, C.value.value) || (S[M] = `${n.t(`sheet.cf.form.${m}`, String(O.value.value))} `);
+        Fr({ operator: m, value: O.value.value }, C.value.value) || (S[M] = `${n.t(`sheet.cf.form.${m}`, String(O.value.value))} `);
       }), S;
     }
     return {};
@@ -2101,7 +2101,7 @@ const Fe = (t) => {
   }, [p]);
   K(() => {
     const E = r.onCommandExecuted((V) => {
-      if (V.id === Mr.id) {
+      if (V.id === fr.id) {
         const O = V.params;
         O.subUnitId === u && O.unitId === o && t.onCancel();
       }
@@ -2121,7 +2121,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) => Vr(Y, m.getRowCount(), m.getColumnCount())).filter((Y) => !(Number.isNaN(Y.startRow) || Number.isNaN(Y.startColumn)));
+      return l.current.map((Y) => pr(Y, m.getRowCount(), m.getColumnCount())).filter((Y) => !(Number.isNaN(Y.startRow) || Number.isNaN(Y.startColumn)));
     })();
     if (w.fetchThroughInterceptors(w.getInterceptPoints().beforeSubmit)(!0, null)) {
       const m = w.fetchThroughInterceptors(w.getInterceptPoints().submit)(null, null);
@@ -2130,7 +2130,7 @@ const Fe = (t) => {
         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(_r.id, { unitId: _, subUnitId: j, rule: Y }), t.onCancel()) : (Y = { cfId: i.createCfId(_, j), ranges: V, rule: m, stopIfTrue: !1 }, r.executeCommand(Sn.id, { unitId: _, subUnitId: j, rule: Y }), t.onCancel());
+        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());
       }
     }
   }, g = () => {
@@ -2305,7 +2305,7 @@ const ji = (t) => {
     if (w === "2")
       return;
     const $ = new Ne((B) => {
-      const G = [kr.id, se.id, _e.id, we.id, _n.id], z = s.onCommandExecuted((ee) => {
+      const G = [Cr.id, se.id, _e.id, we.id, xn.id], z = s.onCommandExecuted((ee) => {
         const { id: ne, params: Re } = ee, Te = n.getCurrentUnitOfType(A.UNIVER_SHEET).getUnitId();
         G.includes(ne) && Re.unitId === Te && B.next(null);
       });
@@ -2366,24 +2366,24 @@ const ji = (t) => {
       const ar = V.length;
       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(wr.id, { unitId: z, subUnitId: ee, start: { id: Re, type: "self" }, end: { id: Te, type: G.y > B.y ? "after" : "before" } });
+    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 = () => {
     t.onCreate();
   }, pe = () => {
-    w === "2" ? s.executeCommand(wn.id) : w === "1" && V.map((B) => ({ unitId: d, subUnitId: p, cfId: B.cfId })).forEach((B) => {
+    w === "2" ? s.executeCommand(En.id) : w === "1" && V.map((B) => ({ unitId: d, subUnitId: p, cfId: B.cfId })).forEach((B) => {
       s.executeCommand(Yt.id, B);
     });
   }, Ce = J(() => {
     const $ = n.getCurrentUnitOfType(A.UNIVER_SHEET), B = $.getActiveSheet();
     return V.filter((G) => {
       const z = G.ranges;
-      return ft(u, $.getUnitId(), B.getSheetId(), z);
+      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(() => {
     const $ = n.getCurrentUnitOfType(A.UNIVER_SHEET), B = $.getActiveSheet();
     return V.every((G) => {
       const z = G.ranges;
-      return ft(u, $.getUnitId(), B.getSheetId(), z);
+      return mt(u, $.getUnitId(), B.getSheetId(), z);
     });
   }, [V]);
   return /* @__PURE__ */ k("div", { children: [
@@ -2630,11 +2630,11 @@ const Vt = {
         break;
       }
       case 9: {
-        i.executeCommand(Rr.id, { ranges: s });
+        i.executeCommand(Or.id, { ranges: s });
         break;
       }
       case 10: {
-        i.executeCommand(wn.id);
+        i.executeCommand(En.id);
         break;
       }
     }
@@ -2646,6 +2646,83 @@ var Gi = Object.getOwnPropertyDescriptor, Zi = (t, e, r, n) => {
     (o = t[s]) && (i = o(i) || i);
   return i;
 }, Ge = (t, e) => (r, n) => e(r, n, t);
+let bt = class extends ue {
+  constructor(t, e, r, n, i) {
+    super(), this._injector = t, this._univerInstanceService = e, this._sheetInterceptorService = r, this._selectionManagerService = n, this._conditionalFormattingRuleModel = i, this._init();
+  }
+  _init() {
+    this.disposeWithMe(this._sheetInterceptorService.interceptCommand({
+      getMutations: (t) => {
+        var i;
+        const e = [], r = [], n = { redos: e, undos: r };
+        if ([yr.id, br.id].includes(t.id)) {
+          const s = (i = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : i.map((p) => p.range);
+          if (!s)
+            return n;
+          const o = this._univerInstanceService.getCurrentUnitForType(A.UNIVER_SHEET), u = o.getActiveSheet();
+          if (!u)
+            return n;
+          const a = o.getUnitId(), h = u.getSheetId(), l = this._conditionalFormattingRuleModel.getSubunitRules(a, h);
+          if (!l || !l.length)
+            return n;
+          const { redos: d, undos: v } = dn(this._injector, l, s, a, h);
+          e.push(...d), r.push(...v);
+        }
+        return n;
+      }
+    })), this.disposeWithMe(this._sheetInterceptorService.interceptRanges({
+      getMutations: ({ unitId: t, subUnitId: e, ranges: r }) => {
+        const n = [], i = [], s = { redos: n, undos: i };
+        if (!r || !r.length)
+          return s;
+        const o = this._conditionalFormattingRuleModel.getSubunitRules(t, e);
+        if (!o || !o.length)
+          return s;
+        const { redos: u, undos: a } = dn(this._injector, o, r, t, e);
+        return n.push(...u), i.push(...a), s;
+      }
+    }));
+  }
+};
+bt = Zi([
+  Ge(0, P(fe)),
+  Ge(1, P(Z)),
+  Ge(2, P(qt)),
+  Ge(3, P(je)),
+  Ge(4, P(Q))
+], bt);
+function dn(t, e, r, n, i) {
+  const s = [], o = [];
+  return e.filter((u) => r.some((a) => u.ranges.some((h) => ye.getIntersects(h, a)))).forEach((u) => {
+    const h = new Ir().add(...u.ranges).subtract(...r).merge();
+    if (h.length) {
+      const l = {
+        id: _e.id,
+        params: {
+          unitId: n,
+          subUnitId: i,
+          rule: { ...u, ranges: h }
+        }
+      }, d = $e(t, l.params);
+      s.push(l), o.push(...d);
+    } else {
+      const l = {
+        id: we.id,
+        params: {
+          unitId: n,
+          subUnitId: i,
+          cfId: u.cfId
+        }
+      }, d = Ae(t, l.params);
+      s.push(l), o.push(...d);
+    }
+  }), { redos: s, undos: o };
+}
+var zi = Object.getOwnPropertyDescriptor, Yi = (t, e, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? zi(e, r) : e, s = t.length - 1, o; s >= 0; s--)
+    (o = t[s]) && (i = o(i) || i);
+  return i;
+}, Ze = (t, e) => (r, n) => e(r, n, t);
 let et = class extends ue {
   constructor(e, r, n, i, s) {
     super();
@@ -2674,7 +2751,7 @@ let et = class extends ue {
         cfMap: s
       }
     };
-    const o = this._injector.invoke((l) => Fr(n, l, e, r));
+    const o = this._injector.invoke((l) => Sr(n, l, e, r));
     if (!o)
       return;
     const { rows: u, cols: a } = o, h = /* @__PURE__ */ new Set();
@@ -2766,14 +2843,14 @@ let et = class extends ue {
     });
     const x = [], T = [];
     for (const g in v) {
-      const b = v[g], S = pt(Ct(b));
+      const b = v[g], S = ft(pt(b));
       if (!S.length) {
         const C = {
           unitId: s,
           subUnitId: o,
           cfId: g
         };
-        x.push({ id: we.id, params: C }), T.push(...$e(this._injector, C));
+        x.push({ id: we.id, params: C }), T.push(...Ae(this._injector, C));
       }
       if (f.some((C) => C.cfId === g)) {
         const C = R(g), M = {
@@ -2781,7 +2858,7 @@ let et = class extends ue {
           subUnitId: o,
           rule: { ...C, ranges: S }
         };
-        x.push({ id: se.id, params: M }), T.push(Rn(this._injector, M));
+        x.push({ id: se.id, params: M }), T.push(Nn(this._injector, M));
       } else {
         const C = this._conditionalFormattingRuleModel.getRule(s, o, g);
         if (!C)
@@ -2791,7 +2868,7 @@ let et = class extends ue {
           subUnitId: o,
           rule: { ...C, ranges: S }
         };
-        x.push({ id: _e.id, params: M }), T.push(...Ae(this._injector, M));
+        x.push({ id: _e.id, params: M }), T.push(...$e(this._injector, M));
       }
     }
     return {
@@ -2800,15 +2877,15 @@ let et = class extends ue {
     };
   }
 };
-et = Zi([
-  Ge(0, P(ri)),
-  Ge(1, P(Q)),
-  Ge(2, P(fe)),
-  Ge(3, P(it)),
-  Ge(4, P(Z))
+et = Yi([
+  Ze(0, P(ri)),
+  Ze(1, P(Q)),
+  Ze(2, P(fe)),
+  Ze(3, P(it)),
+  Ze(4, P(Z))
 ], et);
-var zi = Object.getOwnPropertyDescriptor, Yi = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? zi(e, r) : e, s = t.length - 1, o; s >= 0; s--)
+var Ki = Object.getOwnPropertyDescriptor, Xi = (t, e, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? Ki(e, r) : e, s = t.length - 1, o; s >= 0; s--)
     (o = t[s]) && (i = o(i) || i);
   return i;
 }, Ot = (t, e) => (r, n) => e(r, n, t);
@@ -2819,22 +2896,22 @@ let tt = class extends ue {
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((t) => {
-        t.id === Sn.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
-          workbookTypes: [Vn],
-          rangeTypes: [Mn],
-          worksheetTypes: [En, Nn]
+        t.id === Tn.id && (this._sheetPermissionCheckController.permissionCheckWithRanges({
+          workbookTypes: [Rn],
+          rangeTypes: [wn],
+          worksheetTypes: [Sn, _n]
         }, t.params.rule.ranges) || this._sheetPermissionCheckController.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.setStyleErr")));
       })
     );
   }
 };
-tt = Yi([
+tt = Xi([
   Ot(0, P(re)),
   Ot(1, te),
-  Ot(2, P(Lr))
+  Ot(2, P(_r))
 ], tt);
-var Ki = Object.getOwnPropertyDescriptor, Xi = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Ki(e, r) : e, s = t.length - 1, o; s >= 0; s--)
+var Ji = Object.getOwnPropertyDescriptor, Qi = (t, e, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? Ji(e, r) : e, s = t.length - 1, o; s >= 0; s--)
     (o = t[s]) && (i = o(i) || i);
   return i;
 }, vt = (t, e) => (r, n) => e(r, n, t);
@@ -2845,14 +2922,14 @@ let nt = class extends ue {
   _initRefRange() {
     const t = /* @__PURE__ */ new Map(), e = (n, i, s) => `${n}_${i}_${s}`, r = (n, i, s) => {
       const o = (a) => {
-        const h = [...s.ranges], l = h.map((v) => Pr(v, a)).filter((v) => !!v);
-        if (Tr(l, h))
+        const h = [...s.ranges], l = h.map((v) => Rr(v, a)).filter((v) => !!v);
+        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 = Ae(this._injector, v);
+          const v = { unitId: n, subUnitId: i, rule: { ...s, ranges: l } }, p = [{ id: _e.id, params: v }], y = $e(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 = $e(this._injector, v);
+          const v = { unitId: n, subUnitId: i, cfId: s.cfId }, p = [{ id: we.id, params: v }], y = Ae(this._injector, v);
           return { redos: p, undos: y };
         }
       }, u = [];
@@ -2886,14 +2963,14 @@ let nt = class extends ue {
     }));
   }
 };
-nt = Xi([
+nt = Qi([
   vt(0, P(Q)),
   vt(1, P(Z)),
   vt(2, P(fe)),
-  vt(3, P(Ur))
+  vt(3, P(wr))
 ], nt);
-var Ji = Object.getOwnPropertyDescriptor, Qi = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? Ji(e, r) : e, s = t.length - 1, o; s >= 0; s--)
+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);
@@ -2927,7 +3004,7 @@ let rt = class extends ue {
     ).subscribe(() => this._markDirtySkeleton()));
   }
   _initViewModelInterceptor() {
-    this.disposeWithMe(this._sheetInterceptorService.intercept(Or.CELL_CONTENT, {
+    this.disposeWithMe(this._sheetInterceptorService.intercept(Tr.CELL_CONTENT, {
       effect: gr.Style,
       handler: (e, r, n) => {
         const i = this._conditionalFormattingService.composeStyle(r.unitId, r.subUnitId, r.row, r.col);
@@ -2941,32 +3018,32 @@ let rt = class extends ue {
           };
           Object.assign(u, { s: a });
         }
-        return u.fontRenderExtension || (u.fontRenderExtension = {}, i.isShowValue !== void 0 && (u.fontRenderExtension.isSkip = !i.isShowValue)), i.dataBar && (u.dataBar = i.dataBar), i.iconSet && (u.iconSet = i.iconSet, u.fontRenderExtension.leftOffset = xr + Er), n(u);
+        return u.fontRenderExtension || (u.fontRenderExtension = {}, i.isShowValue !== void 0 && (u.fontRenderExtension.isSkip = !i.isShowValue)), i.dataBar && (u.dataBar = i.dataBar), i.iconSet && (u.iconSet = i.iconSet, u.fontRenderExtension.leftOffset = $r + Ar), n(u);
       },
       priority: 10
     }));
   }
 };
-rt = Qi([
+rt = ts([
   Oe(0, P(qt)),
-  Oe(1, P(Tn)),
+  Oe(1, P(Mn)),
   Oe(2, P(Z)),
   Oe(3, P(On)),
   Oe(4, P(it)),
   Oe(5, P(Q))
 ], rt);
-const rr = "sheets-conditional-formatting-ui.config", bt = {};
-var es = Object.defineProperty, ts = Object.getOwnPropertyDescriptor, ns = (t, e, r) => e in t ? es(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, rs = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? ts(e, r) : e, s = t.length - 1, o; s >= 0; s--)
+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) => {
+  for (var i = n > 1 ? void 0 : n ? rs(e, r) : e, s = t.length - 1, o; s >= 0; s--)
     (o = t[s]) && (i = o(i) || i);
   return i;
-}, Dt = (t, e) => (r, n) => e(r, n, t), ir = (t, e, r) => ns(t, typeof e != "symbol" ? e + "" : e, r);
-let It = class extends bn {
-  constructor(t = bt, e, r, n) {
+}, Dt = (t, e) => (r, n) => e(r, n, t), ir = (t, e, r) => is(t, typeof e != "symbol" ? e + "" : e, r);
+let St = class extends bn {
+  constructor(t = It, e, r, n) {
     super(), this._config = t, this._injector = e, this._commandService = r, this._configService = n;
     const { menu: i, ...s } = In(
       {},
-      bt,
+      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]);
@@ -2988,20 +3065,20 @@ let It = class extends bn {
     });
   }
 };
-ir(It, "pluginName", `${st}_MOBILE_UI_PLUGIN`);
-ir(It, "type", A.UNIVER_SHEET);
-It = rs([
-  Cn(xn),
+ir(St, "pluginName", `${st}_MOBILE_UI_PLUGIN`);
+ir(St, "type", A.UNIVER_SHEET);
+St = ss([
+  Cn(Vn),
   Dt(1, P(fe)),
   Dt(2, P(te)),
   Dt(3, yn)
-], It);
-var is = Object.getOwnPropertyDescriptor, ss = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? is(e, r) : e, s = t.length - 1, o; s >= 0; s--)
+], St);
+var os = Object.getOwnPropertyDescriptor, as = (t, e, r, n) => {
+  for (var i = n > 1 ? void 0 : n ? os(e, r) : e, s = t.length - 1, o; s >= 0; s--)
     (o = t[s]) && (i = o(i) || i);
   return i;
-}, Ze = (t, e) => (r, n) => e(r, n, t);
-let St = class extends ue {
+}, ze = (t, e) => (r, n) => e(r, n, t);
+let _t = class extends ue {
   constructor(t, e, r, n, i) {
     super(), this._injector = t, this._univerInstanceService = e, this._autoFillService = r, this._conditionalFormattingRuleModel = n, this._conditionalFormattingViewModel = i, this._initAutoFill();
   }
@@ -3094,21 +3171,21 @@ let St = class extends ue {
         const b = this._conditionalFormattingRuleModel.getRule(o, u, g);
         if (!b)
           return;
-        const S = pt(Ct(T));
+        const S = ft(pt(T));
         if (S.length) {
           const C = {
             unitId: o,
             subUnitId: u,
             rule: { ...b, ranges: S }
           };
-          h.push({ id: _e.id, params: C }), l.push(...Ae(this._injector, C));
+          h.push({ id: _e.id, params: C }), l.push(...$e(this._injector, C));
         } else {
           const C = {
             unitId: o,
             subUnitId: u,
             cfId: b.cfId
           };
-          h.push({ id: we.id, params: C }), l.push(...$e(this._injector, C));
+          h.push({ id: we.id, params: C }), l.push(...Ae(this._injector, C));
         }
       }), {
         undos: l,
@@ -3127,90 +3204,13 @@ let St = class extends ue {
     this.disposeWithMe(this._autoFillService.addHook(n));
   }
 };
-St = ss([
-  Ze(0, P(fe)),
-  Ze(1, P(Z)),
-  Ze(2, P(si)),
-  Ze(3, P(Q)),
-  Ze(4, P(it))
-], St);
-var os = Object.getOwnPropertyDescriptor, as = (t, e, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? os(e, r) : e, s = t.length - 1, o; s >= 0; s--)
-    (o = t[s]) && (i = o(i) || i);
-  return i;
-}, ze = (t, e) => (r, n) => e(r, n, t);
-let _t = class extends ue {
-  constructor(t, e, r, n, i) {
-    super(), this._injector = t, this._univerInstanceService = e, this._sheetInterceptorService = r, this._selectionManagerService = n, this._conditionalFormattingRuleModel = i, this._init();
-  }
-  _init() {
-    this.disposeWithMe(this._sheetInterceptorService.interceptCommand({
-      getMutations: (t) => {
-        var i;
-        const e = [], r = [], n = { redos: e, undos: r };
-        if ([Dr.id, $r.id].includes(t.id)) {
-          const s = (i = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : i.map((p) => p.range);
-          if (!s)
-            return n;
-          const o = this._univerInstanceService.getCurrentUnitForType(A.UNIVER_SHEET), u = o.getActiveSheet();
-          if (!u)
-            return n;
-          const a = o.getUnitId(), h = u.getSheetId(), l = this._conditionalFormattingRuleModel.getSubunitRules(a, h);
-          if (!l || !l.length)
-            return n;
-          const { redos: d, undos: v } = dn(this._injector, l, s, a, h);
-          e.push(...d), r.push(...v);
-        }
-        return n;
-      }
-    })), this.disposeWithMe(this._sheetInterceptorService.interceptRanges({
-      getMutations: ({ unitId: t, subUnitId: e, ranges: r }) => {
-        const n = [], i = [], s = { redos: n, undos: i };
-        if (!r || !r.length)
-          return s;
-        const o = this._conditionalFormattingRuleModel.getSubunitRules(t, e);
-        if (!o || !o.length)
-          return s;
-        const { redos: u, undos: a } = dn(this._injector, o, r, t, e);
-        return n.push(...u), i.push(...a), s;
-      }
-    }));
-  }
-};
 _t = as([
   ze(0, P(fe)),
   ze(1, P(Z)),
-  ze(2, P(qt)),
-  ze(3, P(je)),
-  ze(4, P(Q))
+  ze(2, P(si)),
+  ze(3, P(Q)),
+  ze(4, P(it))
 ], _t);
-function dn(t, e, r, n, i) {
-  const s = [], o = [];
-  return e.filter((u) => r.some((a) => u.ranges.some((h) => ye.getIntersects(h, a)))).forEach((u) => {
-    const h = new Ar().add(...u.ranges).subtract(...r).merge();
-    if (h.length) {
-      const l = {
-        id: _e.id,
-        params: {
-          unitId: n,
-          subUnitId: i,
-          rule: { ...u, ranges: h }
-        }
-      }, d = Ae(t, l.params);
-      s.push(l), o.push(...d);
-    } else {
-      const l = {
-        id: we.id,
-        params: {
-          unitId: n,
-          subUnitId: i,
-          cfId: u.cfId
-        }
-      }, d = $e(t, l.params);
-      s.push(l), o.push(...d);
-    }
-  }), { redos: s, undos: o };
-}
 var ls = Object.getOwnPropertyDescriptor, cs = (t, e, r, n) => {
   for (var i = n > 1 ? void 0 : n ? ls(e, r) : e, s = t.length - 1, o; s >= 0; s--)
     (o = t[s]) && (i = o(i) || i);
@@ -3229,7 +3229,7 @@ let wt = class extends ue {
     this.disposeWithMe(
       pn(
         this._sheetInterceptorService.writeCellInterceptor.intercept(
-          Hr,
+          xr,
           {
             handler: (t, e, r) => {
               var o, u, a;
@@ -3259,14 +3259,14 @@ let wt = class extends ue {
 };
 wt = cs([
   hn(0, P(qt)),
-  hn(1, P(Tn))
+  hn(1, P(Mn))
 ], wt);
 const vn = [
   Wt.id,
   se.id,
   _e.id,
   we.id,
-  _n.id
+  xn.id
 ], Ye = [
   {
     label: {
@@ -3357,7 +3357,7 @@ const vn = [
     if (!l) return;
     const d = l.getActiveSheet();
     if (!d) return;
-    const y = (i.getSubunitRules(l.getUnitId(), d.getSheetId()) || []).filter((w) => w.ranges.some((I) => h.some((R) => ye.intersects(R, I)))).map((w) => w.ranges).every((w) => ft(t, l.getUnitId(), d.getSheetId(), w));
+    const y = (i.getSubunitRules(l.getUnitId(), d.getSheetId()) || []).filter((w) => w.ranges.some((I) => h.some((R) => ye.intersects(R, I)))).map((w) => w.ranges).every((w) => mt(t, l.getUnitId(), d.getSheetId(), w));
     a.next(y);
   })), o = new Ne(
     (a) => new Ne((h) => {
@@ -3375,7 +3375,7 @@ const vn = [
       const d = i.getSubunitRules(h.getUnitId(), l.getSheetId()) || [];
       if (!d.length)
         return a.next(!1), !1;
-      const v = d.map((p) => p.ranges).every((p) => ft(t, h.getUnitId(), l.getSheetId(), p));
+      const v = d.map((p) => p.ranges).every((p) => mt(t, h.getUnitId(), l.getSheetId(), p));
       a.next(v);
     })
   ), u = new Ne((a) => {
@@ -3394,7 +3394,7 @@ const vn = [
     tooltip: "sheet.cf.title",
     selections: u,
     hidden$: Gr(t, A.UNIVER_SHEET),
-    disabled$: ai(t, { workbookTypes: [Vn], worksheetTypes: [Nn, En], rangeTypes: [Mn] })
+    disabled$: ai(t, { workbookTypes: [Rn], worksheetTypes: [_n, Sn], rangeTypes: [wn] })
   };
 }, ds = {
   [zr.RULES]: {
@@ -3545,7 +3545,7 @@ let Tt = class extends ue {
         r(w, { row: x.startRange.startRow, col: x.startRange.startColumn }, x.repeatRelativeRange, v, { targetUnitId: s, targetSubUnitId: o });
       }), v.forEach((x, T) => {
         if (d) {
-          const g = this._conditionalFormattingRuleModel.getRule(s, o, T), b = pt(Ct(x));
+          const g = this._conditionalFormattingRuleModel.getRule(s, o, T), b = ft(pt(x));
           if (g)
             if (b.length) {
               const S = {
@@ -3553,14 +3553,14 @@ let Tt = class extends ue {
                 subUnitId: o,
                 rule: { ...g, ranges: b }
               };
-              p.push({ id: _e.id, params: S }), y.push(...Ae(this._injector, S));
+              p.push({ id: _e.id, params: S }), y.push(...$e(this._injector, S));
             } else {
               const S = {
                 unitId: s,
                 subUnitId: o,
                 cfId: g.cfId
               };
-              p.push({ id: we.id, params: S }), y.push(...$e(this._injector, S));
+              p.push({ id: we.id, params: S }), y.push(...Ae(this._injector, S));
             }
           else if (b.length) {
             const S = this._conditionalFormattingRuleModel.getRule(h, l, T);
@@ -3574,28 +3574,28 @@ let Tt = class extends ue {
                   ranges: b
                 }
               };
-              p.push({ id: se.id, params: C }), y.push(Rn(this._injector, C));
+              p.push({ id: se.id, params: C }), y.push(Nn(this._injector, C));
             }
           }
         } else {
           const g = this._conditionalFormattingRuleModel.getRule(h, l, T);
           if (!g)
             return;
-          const b = pt(Ct(x));
+          const b = ft(pt(x));
           if (b.length) {
             const S = {
               unitId: h,
               subUnitId: l,
               rule: { ...g, ranges: b }
             };
-            p.push({ id: _e.id, params: S }), y.push(...Ae(this._injector, S));
+            p.push({ id: _e.id, params: S }), y.push(...$e(this._injector, S));
           } else {
             const S = {
               unitId: h,
               subUnitId: l,
               cfId: g.cfId
             };
-            p.push({ id: we.id, params: S }), y.push(...$e(this._injector, S));
+            p.push({ id: we.id, params: S }), y.push(...Ae(this._injector, S));
           }
         }
       }), {
@@ -3652,7 +3652,7 @@ let xt = class extends ue {
       const s = i.with(Un);
       this.disposeWithMe(s.currentSkeleton$.subscribe((o) => {
         if (o) {
-          const u = o.skeleton.rowColumnSegment, a = u.endColumn - u.startColumn + 1, l = (u.endRow - u.startRow + 1) * a * 9, d = Math.max(Nr, l);
+          const u = o.skeleton.rowColumnSegment, a = u.endColumn - u.startColumn + 1, l = (u.endRow - u.startRow + 1) * a * 9, d = Math.max(Hr, l);
           this._conditionalFormattingViewModel.setCacheLength(d);
         }
       }));
@@ -3673,11 +3673,11 @@ var ys = Object.defineProperty, bs = Object.getOwnPropertyDescriptor, Is = (t, e
   return i;
 }, At = (t, e) => (r, n) => e(r, n, t), sr = (t, e, r) => Is(t, typeof e != "symbol" ? e + "" : e, r);
 let Et = class extends bn {
-  constructor(t = bt, e, r, n) {
+  constructor(t = It, e, r, n) {
     super(), this._config = t, this._injector = e, this._commandService = r, this._configService = n;
     const { menu: i, ...s } = In(
       {},
-      bt,
+      It,
       this._config
     );
     i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(rr, s), this._initCommand();
@@ -3687,13 +3687,13 @@ let Et = class extends bn {
       [rt],
       [nt],
       [et],
-      [St],
+      [_t],
       [tt],
       [Qe],
       [Rt],
       [He],
       [wt],
-      [_t],
+      [bt],
       [Tt],
       [xt]
     ]), kt(this._injector, [
@@ -3708,8 +3708,8 @@ let Et = class extends bn {
   }
   onRendered() {
     kt(this._injector, [
-      [St],
       [_t],
+      [bt],
       [et],
       [wt],
       [He],
@@ -3739,7 +3739,7 @@ let Et = class extends bn {
 sr(Et, "pluginName", `${st}_UI_PLUGIN`);
 sr(Et, "type", A.UNIVER_SHEET);
 Et = Ss([
-  Cn(xn),
+  Cn(Vn),
   At(1, P(fe)),
   At(2, P(te)),
   At(3, yn)
@@ -3754,8 +3754,8 @@ export {
   Wn as AddTextCfCommand,
   qn as AddTimePeriodCfCommand,
   Gn as AddUniqueValuesCfCommand,
-  _t as ConditionalFormattingClearController,
+  bt as ConditionalFormattingClearController,
   Vt as OpenConditionalFormattingOperator,
-  It as UniverSheetsConditionalFormattingMobileUIPlugin,
+  St as UniverSheetsConditionalFormattingMobileUIPlugin,
   Et as UniverSheetsConditionalFormattingUIPlugin
 };