@univerjs/sheets-conditional-formatting 0.10.10-experimental.20251010-3f807c5 → 0.10.10-experimental.20251016-33b0941

package/lib/es/index.js

@@ -6,7 +6,7 @@ import { isRangesEqual as H1 } from "@univerjs/core";
 import { getSheetCommandTarget as t2, SheetsSelectionsService as t0, findAllRectangle as n0, createTopMatrixFromMatrix as r0, SheetInterceptorService as s0, RemoveSheetCommand as i0, ReorderRangeMutation as a0, MoveRangeMutation as l0, MoveColsMutation as o0, MoveRowsMutation as c0, InsertRowMutation as u0, RemoveRowMutation as d0, RemoveColMutation as h0, InsertColMutation as g0, SetRangeValuesMutation as C0 } from "@univerjs/sheets";
 import { Subject as h2, BehaviorSubject as D0 } from "rxjs";
 import { IActiveDirtyManagerService as f0, SetFormulaCalculationResultMutation as m0, SetOtherFormulaMutation as w0, RemoveOtherFormulaMutation as F0, ERROR_TYPE_SET as S2, BooleanValue as b2 } from "@univerjs/engine-formula";
-import { distinctUntilChanged as v0, bufferTime as E0, filter as p0, map as A0 } from "rxjs/operators";
+import { distinctUntilChanged as v0, bufferTime as p0, filter as E0, map as A0 } from "rxjs/operators";
 import { isObject as x0, SpreadsheetExtensionRegistry as W2, SheetExtension as q2, FIX_ONE_PIXEL_BLUR_OFFSET as _0 } from "@univerjs/engine-render";
 const Z2 = "SHEET_CONDITIONAL_FORMATTING_PLUGIN";
 var L = /* @__PURE__ */ ((s) => (s.beginsWith = "beginsWith", s.endsWith = "endsWith", s.containsText = "containsText", s.notContainsText = "notContainsText", s.equal = "equal", s.notEqual = "notEqual", s.containsBlanks = "containsBlanks", s.notContainsBlanks = "notContainsBlanks", s.containsErrors = "containsErrors", s.notContainsErrors = "notContainsErrors", s))(L || {}), k = /* @__PURE__ */ ((s) => (s.today = "today", s.yesterday = "yesterday", s.tomorrow = "tomorrow", s.last7Days = "last7Days", s.thisMonth = "thisMonth", s.lastMonth = "lastMonth", s.nextMonth = "nextMonth", s.thisWeek = "thisWeek", s.lastWeek = "lastWeek", s.nextWeek = "nextWeek", s))(k || {}), F = /* @__PURE__ */ ((s) => (s.greaterThan = "greaterThan", s.greaterThanOrEqual = "greaterThanOrEqual", s.lessThan = "lessThan", s.lessThanOrEqual = "lessThanOrEqual", s.notBetween = "notBetween", s.between = "between", s.equal = "equal", s.notEqual = "notEqual", s))(F || {}), S = /* @__PURE__ */ ((s) => (s.highlightCell = "highlightCell", s.dataBar = "dataBar", s.colorScale = "colorScale", s.iconSet = "iconSet", s))(S || {}), A = /* @__PURE__ */ ((s) => (s.uniqueValues = "uniqueValues", s.duplicateValues = "duplicateValues", s.rank = "rank", s.text = "text", s.timePeriod = "timePeriod", s.number = "number", s.average = "average", s.formula = "formula", s))(A || {}), I = /* @__PURE__ */ ((s) => (s.num = "num", s.min = "min", s.max = "max", s.percent = "percent", s.percentile = "percentile", s.formula = "formula", s))(I || {});
@@ -305,23 +305,23 @@ const i2 = {
       return !1;
     const g = [], h = [];
     c.forEach((w) => {
-      const E = new O();
-      w.ranges.forEach((p) => {
-        U.foreach(p, (R, b) => {
-          E.setValue(R, b, 1);
+      const p = new O();
+      w.ranges.forEach((E) => {
+        U.foreach(E, (R, b) => {
+          p.setValue(R, b, 1);
         });
-      }), d.forEach((p) => {
-        U.foreach(p, (R, b) => {
-          E.realDeleteValue(R, b);
+      }), d.forEach((E) => {
+        U.foreach(E, (R, b) => {
+          p.realDeleteValue(R, b);
         });
       });
-      const M = n0(r0(E));
+      const M = n0(r0(p));
       if (M.length) {
-        const p = { ...w, ranges: M }, R = { unitId: l, subUnitId: o, rule: p }, b = H2(s, R);
+        const E = { ...w, ranges: M }, R = { unitId: l, subUnitId: o, rule: E }, b = H2(s, R);
         g.push({ id: a2.id, params: R }), h.push(...b);
       } else {
-        const p = { unitId: l, subUnitId: o, cfId: w.cfId }, R = w2(s, p);
-        g.push({ id: K.id, params: p }), h.push(...R);
+        const E = { unitId: l, subUnitId: o, cfId: w.cfId }, R = w2(s, E);
+        g.push({ id: K.id, params: E }), h.push(...R);
       }
     });
     const D = T2(g, n).result;
@@ -398,7 +398,7 @@ var T0 = Object.getOwnPropertyDescriptor, V0 = (s, r, t, e) => {
   for (var n = e > 1 ? void 0 : e ? T0(r, t) : r, i = s.length - 1, a; i >= 0; i--)
     (a = s[i]) && (n = a(n) || n);
   return n;
-}, p2 = (s, r) => (t, e) => r(t, e, s), N = /* @__PURE__ */ ((s) => (s[s.NOT_REGISTER = 1] = "NOT_REGISTER", s[s.SUCCESS = 2] = "SUCCESS", s[s.WAIT = 3] = "WAIT", s[s.ERROR = 4] = "ERROR", s))(N || {});
+}, E2 = (s, r) => (t, e) => r(t, e, s), N = /* @__PURE__ */ ((s) => (s[s.NOT_REGISTER = 1] = "NOT_REGISTER", s[s.SUCCESS = 2] = "SUCCESS", s[s.WAIT = 3] = "WAIT", s[s.ERROR = 4] = "ERROR", s))(N || {});
 const O0 = (s) => {
   const r = s && s[0] && s[0][0];
   return (r == null ? void 0 : r.t) === _.BOOLEAN ? r.v === V2.TRUE || r.v === !0 : r ? r.v : !1;
@@ -583,9 +583,9 @@ let z = class extends y2 {
   }
 };
 z = V0([
-  p2(0, x(P)),
-  p2(1, x(f0)),
-  p2(2, x(y))
+  E2(0, x(P)),
+  E2(1, x(f0)),
+  E2(2, x(y))
 ], z);
 var V = /* @__PURE__ */ ((s) => (s.preComputingStart = "preComputingStart", s.preComputing = "preComputing", s.preComputingEnd = "preComputingEnd", s.preComputingError = "preComputingError", s))(V || {});
 class F2 {
@@ -733,9 +733,9 @@ class G0 extends q2 {
           return;
         u.add($);
       }
-      const { color: f, value: w, startPoint: E, isGradient: M } = D.dataBar, { startX: p, endX: R, startY: b, endY: v2 } = c || g ? h : d, l2 = R - p, E2 = v2 + _0 - b, Z = l2 - this._paddingRightAndLeft * 2, I2 = E2 - this._paddingTopAndBottom * 2;
+      const { color: f, value: w, startPoint: p, isGradient: M } = D.dataBar, { startX: E, endX: R, startY: b, endY: v2 } = c || g ? h : d, l2 = R - E, p2 = v2 + _0 - b, Z = l2 - this._paddingRightAndLeft * 2, I2 = p2 - this._paddingTopAndBottom * 2;
       if (w > 0) {
-        const $ = Math.max(Z * (1 - E / 100) * w / 100, 1), G = p + this._paddingRightAndLeft + E / 100 * Z, H = b + this._paddingTopAndBottom;
+        const $ = Math.max(Z * (1 - p / 100) * w / 100, 1), G = E + this._paddingRightAndLeft + p / 100 * Z, H = b + this._paddingTopAndBottom;
         if (M) {
           const j = t.createLinearGradient(G, H, G + $, H);
           j.addColorStop(0, f), j.addColorStop(1, "rgb(255 255 255)"), t.fillStyle = j, t.strokeStyle = f, t.lineWidth = 1;
@@ -743,7 +743,7 @@ class G0 extends q2 {
           t.fillStyle = f;
         this._drawRectWithRoundedCorner(t, G, H, $, I2, !1, !0, !0, !1), M && t.stroke();
       } else {
-        const $ = Math.max(Z * E / 100 * Math.abs(w) / 100, 1), G = p + this._paddingRightAndLeft + E / 100 * Z - $, H = b + this._paddingTopAndBottom;
+        const $ = Math.max(Z * p / 100 * Math.abs(w) / 100, 1), G = E + this._paddingRightAndLeft + p / 100 * Z - $, H = b + this._paddingTopAndBottom;
         if (M) {
           const j = t.createLinearGradient(G, H, G + $, H);
           j.addColorStop(0, "rgb(255 255 255)"), j.addColorStop(1, f), t.fillStyle = j, t.strokeStyle = f, t.lineWidth = 1;
@@ -772,10 +772,10 @@ class j0 extends F2 {
     const n = e.rule, i = n.rule, a = e.worksheet, u = new O();
     ![n.rule.config.max, n.rule.config.min].every((h) => h.type === I.num) && R2(n.ranges, a.getMaxRows() - 1, a.getMaxColumns() - 1).forEach((D) => {
       U.foreach(D, (f, w) => {
-        const E = e.getCellValue(f, w), M = E && E.v;
-        if (!B(M) && (E == null ? void 0 : E.t) === _.NUMBER) {
-          const p = Number(M);
-          !Number.isNaN(p) && u.setValue(f, w, p);
+        const p = e.getCellValue(f, w), M = p && p.v;
+        if (!B(M) && (p == null ? void 0 : p.t) === _.NUMBER) {
+          const E = Number(M);
+          !Number.isNaN(E) && u.setValue(f, w, E);
         }
       });
     });
@@ -1170,7 +1170,7 @@ let Q = class extends y2 {
      */
     m(this, "markRuleDirty", (() => {
       const r = new h2();
-      return this.disposeWithMe(r.pipe(E0(100), p0((t) => !!t.length), A0((t) => {
+      return this.disposeWithMe(r.pipe(p0(100), E0((t) => !!t.length), A0((t) => {
         const e = /* @__PURE__ */ new Set(), n = [];
         return t.forEach((i) => {
           const a = `${i.unitId}_${i.subUnitId}_${i.cfId}`;
@@ -1218,6 +1218,9 @@ let Q = class extends y2 {
       } : null;
     }).filter((c) => !!c).map((c, g) => ({ ...c, priority: g })) : [];
   }
+  dispose() {
+    this._calculateUnitManagers.clear(), this._cellCache.clear(), this._rTreeManager.clear(), super.dispose();
+  }
   _handleCustomFormulasSeparately() {
     this.disposeWithMe(
       this._conditionalFormattingRuleModel.$ruleChange.subscribe((r) => {
@@ -1654,7 +1657,7 @@ let s2 = class extends y2 {
         toJson: (t) => s(t),
         parseJson: (t) => r(t),
         onUnLoad: (t) => {
-          this._conditionalFormattingRuleModel.deleteUnitId(t);
+          this._conditionalFormattingRuleModel.deleteUnitId(t), this._conditionalFormattingViewModelV2.dispose();
         },
         onLoad: (t, e) => {
           Object.keys(e).forEach((n) => {
@@ -1796,7 +1799,7 @@ const w1 = (s) => s.getCurrentUnitForType(m2.UNIVER_SHEET).getUnitId(), F1 = (s)
   var r;
   return (r = s.getCurrentUnitForType(m2.UNIVER_SHEET).getActiveSheet()) == null ? void 0 : r.getSheetId();
 };
-var v1 = Object.getOwnPropertyDescriptor, E1 = (s, r, t, e) => {
+var v1 = Object.getOwnPropertyDescriptor, p1 = (s, r, t, e) => {
   for (var n = e > 1 ? void 0 : e ? v1(r, t) : r, i = s.length - 1, a; i >= 0; i--)
     (a = s[i]) && (n = a(n) || n);
   return n;
@@ -1836,12 +1839,12 @@ let N2 = (u2 = class extends z2 {
     this._injector.get(s2), Q2(this._injector, [[s2], [Q]]);
   }
 }, m(u2, "pluginName", Z2), m(u2, "type", m2.UNIVER_SHEET), u2);
-N2 = E1([
+N2 = p1([
   _2(1, x(M2)),
   _2(2, x(P)),
   _2(3, e0)
 ], N2);
-const p1 = "sheet-conditional-rule-icon", A1 = 35, x1 = 15, _1 = 2, y1 = (s) => {
+const E1 = "sheet-conditional-rule-icon", A1 = 35, x1 = 15, _1 = 2, y1 = (s) => {
   const { startRow: r, endRow: t, startColumn: e, endColumn: n } = s;
   return `${r}-${t}-${e}-${n}`;
 };
@@ -1851,7 +1854,7 @@ class M1 extends q2 {
     m(this, "_paddingRightAndLeft", _1);
     m(this, "_width", x1);
     m(this, "_imageMap", /* @__PURE__ */ new Map());
-    m(this, "uKey", p1);
+    m(this, "uKey", E1);
     m(this, "Z_INDEX", A1);
     m(this, "_radius", 1);
     this._init();
@@ -1871,8 +1874,8 @@ class M1 extends q2 {
       const { iconType: f, iconId: w } = D.iconSet;
       if (f === C1)
         return;
-      const E = this._imageMap.get(this._createKey(f, w));
-      if (!E || !this.isRenderDiffRangesByCell(h, i))
+      const p = this._imageMap.get(this._createKey(f, w));
+      if (!p || !this.isRenderDiffRangesByCell(h, i))
         return;
       if (c || g) {
         const Z = y1(h);
@@ -1880,11 +1883,11 @@ class M1 extends q2 {
           return;
         u.add(Z);
       }
-      const { startX: M, endX: p, startY: R, endY: b } = c || g ? h : d, v2 = p - M, l2 = b - R;
+      const { startX: M, endX: E, startY: R, endY: b } = c || g ? h : d, v2 = E - M, l2 = b - R;
       if (this._width > l2 || this._width > v2 + this._paddingRightAndLeft * 2)
         return;
-      const E2 = (l2 - this._width) / 2 + R;
-      t.drawImage(E, M + this._paddingRightAndLeft, E2, this._width, this._width);
+      const p2 = (l2 - this._width) / 2 + R;
+      t.drawImage(p, M + this._paddingRightAndLeft, p2, this._width, this._width);
     }), t.restore();
   }
   _init() {
@@ -1941,7 +1944,7 @@ export {
   w2 as DeleteConditionalRuleMutationUndoFactory,
   C1 as EMPTY_ICON_TYPE,
   N as FormulaResultStatus,
-  p1 as IconUKey,
+  E1 as IconUKey,
   N0 as MoveCfCommand,
   i2 as MoveConditionalRuleMutation,
   I0 as MoveConditionalRuleMutationUndoFactory,

package/lib/index.js

@@ -6,7 +6,7 @@ import { isRangesEqual as H1 } from "@univerjs/core";
 import { getSheetCommandTarget as t2, SheetsSelectionsService as t0, findAllRectangle as n0, createTopMatrixFromMatrix as r0, SheetInterceptorService as s0, RemoveSheetCommand as i0, ReorderRangeMutation as a0, MoveRangeMutation as l0, MoveColsMutation as o0, MoveRowsMutation as c0, InsertRowMutation as u0, RemoveRowMutation as d0, RemoveColMutation as h0, InsertColMutation as g0, SetRangeValuesMutation as C0 } from "@univerjs/sheets";
 import { Subject as h2, BehaviorSubject as D0 } from "rxjs";
 import { IActiveDirtyManagerService as f0, SetFormulaCalculationResultMutation as m0, SetOtherFormulaMutation as w0, RemoveOtherFormulaMutation as F0, ERROR_TYPE_SET as S2, BooleanValue as b2 } from "@univerjs/engine-formula";
-import { distinctUntilChanged as v0, bufferTime as E0, filter as p0, map as A0 } from "rxjs/operators";
+import { distinctUntilChanged as v0, bufferTime as p0, filter as E0, map as A0 } from "rxjs/operators";
 import { isObject as x0, SpreadsheetExtensionRegistry as W2, SheetExtension as q2, FIX_ONE_PIXEL_BLUR_OFFSET as _0 } from "@univerjs/engine-render";
 const Z2 = "SHEET_CONDITIONAL_FORMATTING_PLUGIN";
 var L = /* @__PURE__ */ ((s) => (s.beginsWith = "beginsWith", s.endsWith = "endsWith", s.containsText = "containsText", s.notContainsText = "notContainsText", s.equal = "equal", s.notEqual = "notEqual", s.containsBlanks = "containsBlanks", s.notContainsBlanks = "notContainsBlanks", s.containsErrors = "containsErrors", s.notContainsErrors = "notContainsErrors", s))(L || {}), k = /* @__PURE__ */ ((s) => (s.today = "today", s.yesterday = "yesterday", s.tomorrow = "tomorrow", s.last7Days = "last7Days", s.thisMonth = "thisMonth", s.lastMonth = "lastMonth", s.nextMonth = "nextMonth", s.thisWeek = "thisWeek", s.lastWeek = "lastWeek", s.nextWeek = "nextWeek", s))(k || {}), F = /* @__PURE__ */ ((s) => (s.greaterThan = "greaterThan", s.greaterThanOrEqual = "greaterThanOrEqual", s.lessThan = "lessThan", s.lessThanOrEqual = "lessThanOrEqual", s.notBetween = "notBetween", s.between = "between", s.equal = "equal", s.notEqual = "notEqual", s))(F || {}), S = /* @__PURE__ */ ((s) => (s.highlightCell = "highlightCell", s.dataBar = "dataBar", s.colorScale = "colorScale", s.iconSet = "iconSet", s))(S || {}), A = /* @__PURE__ */ ((s) => (s.uniqueValues = "uniqueValues", s.duplicateValues = "duplicateValues", s.rank = "rank", s.text = "text", s.timePeriod = "timePeriod", s.number = "number", s.average = "average", s.formula = "formula", s))(A || {}), I = /* @__PURE__ */ ((s) => (s.num = "num", s.min = "min", s.max = "max", s.percent = "percent", s.percentile = "percentile", s.formula = "formula", s))(I || {});
@@ -305,23 +305,23 @@ const i2 = {
       return !1;
     const g = [], h = [];
     c.forEach((w) => {
-      const E = new O();
-      w.ranges.forEach((p) => {
-        U.foreach(p, (R, b) => {
-          E.setValue(R, b, 1);
+      const p = new O();
+      w.ranges.forEach((E) => {
+        U.foreach(E, (R, b) => {
+          p.setValue(R, b, 1);
         });
-      }), d.forEach((p) => {
-        U.foreach(p, (R, b) => {
-          E.realDeleteValue(R, b);
+      }), d.forEach((E) => {
+        U.foreach(E, (R, b) => {
+          p.realDeleteValue(R, b);
         });
       });
-      const M = n0(r0(E));
+      const M = n0(r0(p));
       if (M.length) {
-        const p = { ...w, ranges: M }, R = { unitId: l, subUnitId: o, rule: p }, b = H2(s, R);
+        const E = { ...w, ranges: M }, R = { unitId: l, subUnitId: o, rule: E }, b = H2(s, R);
         g.push({ id: a2.id, params: R }), h.push(...b);
       } else {
-        const p = { unitId: l, subUnitId: o, cfId: w.cfId }, R = w2(s, p);
-        g.push({ id: K.id, params: p }), h.push(...R);
+        const E = { unitId: l, subUnitId: o, cfId: w.cfId }, R = w2(s, E);
+        g.push({ id: K.id, params: E }), h.push(...R);
       }
     });
     const D = T2(g, n).result;
@@ -398,7 +398,7 @@ var T0 = Object.getOwnPropertyDescriptor, V0 = (s, r, t, e) => {
   for (var n = e > 1 ? void 0 : e ? T0(r, t) : r, i = s.length - 1, a; i >= 0; i--)
     (a = s[i]) && (n = a(n) || n);
   return n;
-}, p2 = (s, r) => (t, e) => r(t, e, s), N = /* @__PURE__ */ ((s) => (s[s.NOT_REGISTER = 1] = "NOT_REGISTER", s[s.SUCCESS = 2] = "SUCCESS", s[s.WAIT = 3] = "WAIT", s[s.ERROR = 4] = "ERROR", s))(N || {});
+}, E2 = (s, r) => (t, e) => r(t, e, s), N = /* @__PURE__ */ ((s) => (s[s.NOT_REGISTER = 1] = "NOT_REGISTER", s[s.SUCCESS = 2] = "SUCCESS", s[s.WAIT = 3] = "WAIT", s[s.ERROR = 4] = "ERROR", s))(N || {});
 const O0 = (s) => {
   const r = s && s[0] && s[0][0];
   return (r == null ? void 0 : r.t) === _.BOOLEAN ? r.v === V2.TRUE || r.v === !0 : r ? r.v : !1;
@@ -583,9 +583,9 @@ let z = class extends y2 {
   }
 };
 z = V0([
-  p2(0, x(P)),
-  p2(1, x(f0)),
-  p2(2, x(y))
+  E2(0, x(P)),
+  E2(1, x(f0)),
+  E2(2, x(y))
 ], z);
 var V = /* @__PURE__ */ ((s) => (s.preComputingStart = "preComputingStart", s.preComputing = "preComputing", s.preComputingEnd = "preComputingEnd", s.preComputingError = "preComputingError", s))(V || {});
 class F2 {
@@ -733,9 +733,9 @@ class G0 extends q2 {
           return;
         u.add($);
       }
-      const { color: f, value: w, startPoint: E, isGradient: M } = D.dataBar, { startX: p, endX: R, startY: b, endY: v2 } = c || g ? h : d, l2 = R - p, E2 = v2 + _0 - b, Z = l2 - this._paddingRightAndLeft * 2, I2 = E2 - this._paddingTopAndBottom * 2;
+      const { color: f, value: w, startPoint: p, isGradient: M } = D.dataBar, { startX: E, endX: R, startY: b, endY: v2 } = c || g ? h : d, l2 = R - E, p2 = v2 + _0 - b, Z = l2 - this._paddingRightAndLeft * 2, I2 = p2 - this._paddingTopAndBottom * 2;
       if (w > 0) {
-        const $ = Math.max(Z * (1 - E / 100) * w / 100, 1), G = p + this._paddingRightAndLeft + E / 100 * Z, H = b + this._paddingTopAndBottom;
+        const $ = Math.max(Z * (1 - p / 100) * w / 100, 1), G = E + this._paddingRightAndLeft + p / 100 * Z, H = b + this._paddingTopAndBottom;
         if (M) {
           const j = t.createLinearGradient(G, H, G + $, H);
           j.addColorStop(0, f), j.addColorStop(1, "rgb(255 255 255)"), t.fillStyle = j, t.strokeStyle = f, t.lineWidth = 1;
@@ -743,7 +743,7 @@ class G0 extends q2 {
           t.fillStyle = f;
         this._drawRectWithRoundedCorner(t, G, H, $, I2, !1, !0, !0, !1), M && t.stroke();
       } else {
-        const $ = Math.max(Z * E / 100 * Math.abs(w) / 100, 1), G = p + this._paddingRightAndLeft + E / 100 * Z - $, H = b + this._paddingTopAndBottom;
+        const $ = Math.max(Z * p / 100 * Math.abs(w) / 100, 1), G = E + this._paddingRightAndLeft + p / 100 * Z - $, H = b + this._paddingTopAndBottom;
         if (M) {
           const j = t.createLinearGradient(G, H, G + $, H);
           j.addColorStop(0, "rgb(255 255 255)"), j.addColorStop(1, f), t.fillStyle = j, t.strokeStyle = f, t.lineWidth = 1;
@@ -772,10 +772,10 @@ class j0 extends F2 {
     const n = e.rule, i = n.rule, a = e.worksheet, u = new O();
     ![n.rule.config.max, n.rule.config.min].every((h) => h.type === I.num) && R2(n.ranges, a.getMaxRows() - 1, a.getMaxColumns() - 1).forEach((D) => {
       U.foreach(D, (f, w) => {
-        const E = e.getCellValue(f, w), M = E && E.v;
-        if (!B(M) && (E == null ? void 0 : E.t) === _.NUMBER) {
-          const p = Number(M);
-          !Number.isNaN(p) && u.setValue(f, w, p);
+        const p = e.getCellValue(f, w), M = p && p.v;
+        if (!B(M) && (p == null ? void 0 : p.t) === _.NUMBER) {
+          const E = Number(M);
+          !Number.isNaN(E) && u.setValue(f, w, E);
         }
       });
     });
@@ -1170,7 +1170,7 @@ let Q = class extends y2 {
      */
     m(this, "markRuleDirty", (() => {
       const r = new h2();
-      return this.disposeWithMe(r.pipe(E0(100), p0((t) => !!t.length), A0((t) => {
+      return this.disposeWithMe(r.pipe(p0(100), E0((t) => !!t.length), A0((t) => {
         const e = /* @__PURE__ */ new Set(), n = [];
         return t.forEach((i) => {
           const a = `${i.unitId}_${i.subUnitId}_${i.cfId}`;
@@ -1218,6 +1218,9 @@ let Q = class extends y2 {
       } : null;
     }).filter((c) => !!c).map((c, g) => ({ ...c, priority: g })) : [];
   }
+  dispose() {
+    this._calculateUnitManagers.clear(), this._cellCache.clear(), this._rTreeManager.clear(), super.dispose();
+  }
   _handleCustomFormulasSeparately() {
     this.disposeWithMe(
       this._conditionalFormattingRuleModel.$ruleChange.subscribe((r) => {
@@ -1654,7 +1657,7 @@ let s2 = class extends y2 {
         toJson: (t) => s(t),
         parseJson: (t) => r(t),
         onUnLoad: (t) => {
-          this._conditionalFormattingRuleModel.deleteUnitId(t);
+          this._conditionalFormattingRuleModel.deleteUnitId(t), this._conditionalFormattingViewModelV2.dispose();
         },
         onLoad: (t, e) => {
           Object.keys(e).forEach((n) => {
@@ -1796,7 +1799,7 @@ const w1 = (s) => s.getCurrentUnitForType(m2.UNIVER_SHEET).getUnitId(), F1 = (s)
   var r;
   return (r = s.getCurrentUnitForType(m2.UNIVER_SHEET).getActiveSheet()) == null ? void 0 : r.getSheetId();
 };
-var v1 = Object.getOwnPropertyDescriptor, E1 = (s, r, t, e) => {
+var v1 = Object.getOwnPropertyDescriptor, p1 = (s, r, t, e) => {
   for (var n = e > 1 ? void 0 : e ? v1(r, t) : r, i = s.length - 1, a; i >= 0; i--)
     (a = s[i]) && (n = a(n) || n);
   return n;
@@ -1836,12 +1839,12 @@ let N2 = (u2 = class extends z2 {
     this._injector.get(s2), Q2(this._injector, [[s2], [Q]]);
   }
 }, m(u2, "pluginName", Z2), m(u2, "type", m2.UNIVER_SHEET), u2);
-N2 = E1([
+N2 = p1([
   _2(1, x(M2)),
   _2(2, x(P)),
   _2(3, e0)
 ], N2);
-const p1 = "sheet-conditional-rule-icon", A1 = 35, x1 = 15, _1 = 2, y1 = (s) => {
+const E1 = "sheet-conditional-rule-icon", A1 = 35, x1 = 15, _1 = 2, y1 = (s) => {
   const { startRow: r, endRow: t, startColumn: e, endColumn: n } = s;
   return `${r}-${t}-${e}-${n}`;
 };
@@ -1851,7 +1854,7 @@ class M1 extends q2 {
     m(this, "_paddingRightAndLeft", _1);
     m(this, "_width", x1);
     m(this, "_imageMap", /* @__PURE__ */ new Map());
-    m(this, "uKey", p1);
+    m(this, "uKey", E1);
     m(this, "Z_INDEX", A1);
     m(this, "_radius", 1);
     this._init();
@@ -1871,8 +1874,8 @@ class M1 extends q2 {
       const { iconType: f, iconId: w } = D.iconSet;
       if (f === C1)
         return;
-      const E = this._imageMap.get(this._createKey(f, w));
-      if (!E || !this.isRenderDiffRangesByCell(h, i))
+      const p = this._imageMap.get(this._createKey(f, w));
+      if (!p || !this.isRenderDiffRangesByCell(h, i))
         return;
       if (c || g) {
         const Z = y1(h);
@@ -1880,11 +1883,11 @@ class M1 extends q2 {
           return;
         u.add(Z);
       }
-      const { startX: M, endX: p, startY: R, endY: b } = c || g ? h : d, v2 = p - M, l2 = b - R;
+      const { startX: M, endX: E, startY: R, endY: b } = c || g ? h : d, v2 = E - M, l2 = b - R;
       if (this._width > l2 || this._width > v2 + this._paddingRightAndLeft * 2)
         return;
-      const E2 = (l2 - this._width) / 2 + R;
-      t.drawImage(E, M + this._paddingRightAndLeft, E2, this._width, this._width);
+      const p2 = (l2 - this._width) / 2 + R;
+      t.drawImage(p, M + this._paddingRightAndLeft, p2, this._width, this._width);
     }), t.restore();
   }
   _init() {
@@ -1941,7 +1944,7 @@ export {
   w2 as DeleteConditionalRuleMutationUndoFactory,
   C1 as EMPTY_ICON_TYPE,
   N as FormulaResultStatus,
-  p1 as IconUKey,
+  E1 as IconUKey,
   N0 as MoveCfCommand,
   i2 as MoveConditionalRuleMutation,
   I0 as MoveConditionalRuleMutationUndoFactory,

package/lib/types/models/conditional-formatting-view-model.d.ts

@@ -48,6 +48,7 @@ export declare class ConditionalFormattingViewModel extends Disposable {
      * Here,multiple dirties are merged into one..
      */
     markRuleDirty: (unitId: string, subUnitId: string, cfId: string, isNeedResetPreComputingCache?: boolean) => void;
+    dispose(): void;
     private _handleCustomFormulasSeparately;
     private _initRuleListener;
     private _ensureCalculateUnitManager;