@univerjs/sheets-conditional-formatting 0.2.1 → 0.2.3

package/lib/es/index.js

@@ -1,7 +1,7 @@
 var CA = Object.defineProperty;
 var YA = (f, v, e) => v in f ? CA(f, v, { enumerable: !0, configurable: !0, writable: !0, value: e }) : f[v] = e;
 var D = (f, v, e) => YA(f, typeof v != "symbol" ? v + "" : v, e);
-import { Tools as _, ObjectMatrix as Y, Range as W, CommandType as vA, ICommandService as PA, Disposable as WA, toDisposable as OA, RefAlias as jA, CellValueType as c, BooleanNumber as EA, ColorKit as JA, Rectangle as R, createInterceptorKey as hA, OnLifecycle as UA, LifecycleStages as RA, IUniverInstanceService as MA, IResourceManagerService as VA, afterInitApply as bA, InterceptorManager as FA, UniverInstanceType as NA, Plugin as IA } from "@univerjs/core";
+import { Tools as _, ObjectMatrix as Y, Range as W, CommandType as vA, ICommandService as PA, Disposable as WA, toDisposable as OA, RefAlias as hA, CellValueType as c, BooleanNumber as EA, ColorKit as JA, Rectangle as R, createInterceptorKey as jA, OnLifecycle as UA, LifecycleStages as RA, IUniverInstanceService as MA, IResourceManagerService as VA, afterInitApply as bA, InterceptorManager as FA, UniverInstanceType as NA, Plugin as IA } from "@univerjs/core";
 import { Inject as J, Injector as XA } from "@wendellhu/redi";
 import { SheetInterceptorService as zA, RemoveSheetCommand as qA, ReorderRangeMutation as KA, MoveRangeMutation as yA, MoveColsMutation as xA, MoveRowsMutation as GA, InsertRowMutation as _A, RemoveRowMutation as $A, RemoveColMutation as Av, InsertColMutation as vv, SetRangeValuesMutation as ev } from "@univerjs/sheets";
 import { Subject as LA } from "rxjs";
@@ -10,7 +10,7 @@ import { IActiveDirtyManagerService as nv, SetFormulaCalculationResultMutation a
 import E from "dayjs";
 import { isObject as kv, SpreadsheetExtensionRegistry as aA, SheetExtension as sA, FIX_ONE_PIXEL_BLUR_OFFSET as wv } from "@univerjs/engine-render";
 const oA = "SHEET_CONDITIONAL_FORMATTING_PLUGIN";
-var o = /* @__PURE__ */ ((f) => (f.beginsWith = "beginsWith", f.endsWith = "endsWith", f.containsText = "containsText", f.notContainsText = "notContainsText", f.equal = "equal", f.notEqual = "notEqual", f.containsBlanks = "containsBlanks", f.notContainsBlanks = "notContainsBlanks", f.containsErrors = "containsErrors", f.notContainsErrors = "notContainsErrors", f))(o || {}), g = /* @__PURE__ */ ((f) => (f.today = "today", f.yesterday = "yesterday", f.tomorrow = "tomorrow", f.last7Days = "last7Days", f.thisMonth = "thisMonth", f.lastMonth = "lastMonth", f.nextMonth = "nextMonth", f.thisWeek = "thisWeek", f.lastWeek = "lastWeek", f.nextWeek = "nextWeek", f))(g || {}), H = /* @__PURE__ */ ((f) => (f.greaterThan = "greaterThan", f.greaterThanOrEqual = "greaterThanOrEqual", f.lessThan = "lessThan", f.lessThanOrEqual = "lessThanOrEqual", f.notBetween = "notBetween", f.between = "between", f.equal = "equal", f.notEqual = "notEqual", f))(H || {}), h = /* @__PURE__ */ ((f) => (f.highlightCell = "highlightCell", f.dataBar = "dataBar", f.colorScale = "colorScale", f.iconSet = "iconSet", f))(h || {}), a = /* @__PURE__ */ ((f) => (f.uniqueValues = "uniqueValues", f.duplicateValues = "duplicateValues", f.rank = "rank", f.text = "text", f.timePeriod = "timePeriod", f.number = "number", f.average = "average", f.formula = "formula", f))(a || {}), z = /* @__PURE__ */ ((f) => (f.num = "num", f.min = "min", f.max = "max", f.percent = "percent", f.percentile = "percentile", f.formula = "formula", f))(z || {});
+var o = /* @__PURE__ */ ((f) => (f.beginsWith = "beginsWith", f.endsWith = "endsWith", f.containsText = "containsText", f.notContainsText = "notContainsText", f.equal = "equal", f.notEqual = "notEqual", f.containsBlanks = "containsBlanks", f.notContainsBlanks = "notContainsBlanks", f.containsErrors = "containsErrors", f.notContainsErrors = "notContainsErrors", f))(o || {}), g = /* @__PURE__ */ ((f) => (f.today = "today", f.yesterday = "yesterday", f.tomorrow = "tomorrow", f.last7Days = "last7Days", f.thisMonth = "thisMonth", f.lastMonth = "lastMonth", f.nextMonth = "nextMonth", f.thisWeek = "thisWeek", f.lastWeek = "lastWeek", f.nextWeek = "nextWeek", f))(g || {}), H = /* @__PURE__ */ ((f) => (f.greaterThan = "greaterThan", f.greaterThanOrEqual = "greaterThanOrEqual", f.lessThan = "lessThan", f.lessThanOrEqual = "lessThanOrEqual", f.notBetween = "notBetween", f.between = "between", f.equal = "equal", f.notEqual = "notEqual", f))(H || {}), j = /* @__PURE__ */ ((f) => (f.highlightCell = "highlightCell", f.dataBar = "dataBar", f.colorScale = "colorScale", f.iconSet = "iconSet", f))(j || {}), a = /* @__PURE__ */ ((f) => (f.uniqueValues = "uniqueValues", f.duplicateValues = "duplicateValues", f.rank = "rank", f.text = "text", f.timePeriod = "timePeriod", f.number = "number", f.average = "average", f.formula = "formula", f))(a || {}), z = /* @__PURE__ */ ((f) => (f.num = "num", f.min = "min", f.max = "max", f.percent = "percent", f.percentile = "percentile", f.formula = "formula", f))(z || {});
 const re = "#fff", He = "#000000", Qe = () => ({
   cfId: void 0,
   ranges: [],
@@ -413,6 +413,9 @@ let M = class extends WA {
       this._cache.clear(), this._formulaMap.clear();
     }));
   }
+  dispose() {
+    this._formulaChange$.complete();
+  }
   _initCache() {
     const v = this._injector.get(G);
     this.disposeWithMe(v.ruleComputeStatus$.subscribe((e) => {
@@ -484,7 +487,7 @@ let M = class extends WA {
     let A = this._formulaMap.get(v);
     A || (A = /* @__PURE__ */ new Map(), this._formulaMap.set(v, A));
     let Z = A.get(e);
-    return Z || (Z = new jA([], ["formulaId", "formulaText"]), A.set(e, Z)), Z;
+    return Z || (Z = new hA([], ["formulaId", "formulaText"]), A.set(e, Z)), Z;
   }
   _ensureCacheMap(v, e) {
     let A = this._cache.get(v);
@@ -735,7 +738,7 @@ const av = (f) => {
 }).filter((A) => !!A), K = {};
 Object.freeze(K);
 const gv = {
-  type: h.dataBar,
+  type: j.dataBar,
   handle: async (f, v) => {
     const e = f.rule, A = v.accessor.get(M), { worksheet: Z } = v, n = new Y(), m = tA(f.ranges, Z.getMaxRows() - 1, Z.getMaxColumns() - 1);
     m.forEach((t) => {
@@ -804,7 +807,7 @@ const gv = {
     return T;
   }
 }, cv = {
-  type: h.highlightCell,
+  type: j.highlightCell,
   handle: async (f, v) => {
     const e = f.rule, { worksheet: A } = v, Z = tA(f.ranges, A.getMaxRows() - 1, A.getMaxColumns() - 1), m = (() => {
       switch (e.subType) {
@@ -977,7 +980,7 @@ const gv = {
             return !1;
           const { unitId: k, subUnitId: w } = v, L = v.accessor.get(M), t = (p, Q) => ({ startRow: p, endRow: p, startColumn: Q, endColumn: Q }), B = t(f.ranges[0].startRow, f.ranges[0].startColumn), d = _.deepClone(m.sequenceNodes), r = Array.isArray(d) ? d.map((p) => {
             if (typeof p == "object" && p.nodeType === Nv.REFERENCE) {
-              const Q = Xv(p.token), i = R.getRelativeRange(Q.range, B), j = R.getPositionRange(i, t(S, N), Q.range), y = Lv(j);
+              const Q = Xv(p.token), i = R.getRelativeRange(Q.range, B), h = R.getPositionRange(i, t(S, N), Q.range), y = Lv(h);
               return {
                 ...p,
                 token: y
@@ -1007,7 +1010,7 @@ const gv = {
     }), l;
   }
 }, Cv = "", Yv = {
-  type: h.colorScale,
+  type: j.colorScale,
   handle: async (f, v) => {
     var X;
     const e = f.rule, A = v.accessor.get(M), { worksheet: Z } = v, n = new Y(), m = tA(f.ranges, Z.getMaxRows() - 1, Z.getMaxColumns() - 1);
@@ -1042,7 +1045,7 @@ const gv = {
     }), T;
   }
 }, Ov = {
-  type: h.iconSet,
+  type: j.iconSet,
   handle: async (f, v) => {
     var k;
     const e = f.rule, A = v.accessor.get(M), { worksheet: Z } = v, n = new Y(), m = tA(f.ranges, Z.getMaxRows() - 1, Z.getMaxColumns() - 1);
@@ -1099,12 +1102,12 @@ const gv = {
     }), T;
   }
 };
-var jv = Object.defineProperty, hv = Object.getOwnPropertyDescriptor, Uv = (f, v, e, A) => {
-  for (var Z = A > 1 ? void 0 : A ? hv(v, e) : v, n = f.length - 1, m; n >= 0; n--)
+var hv = Object.defineProperty, jv = Object.getOwnPropertyDescriptor, Uv = (f, v, e, A) => {
+  for (var Z = A > 1 ? void 0 : A ? jv(v, e) : v, n = f.length - 1, m; n >= 0; n--)
     (m = f[n]) && (Z = (A ? m(v, e, Z) : m(Z)) || Z);
-  return A && Z && jv(v, e, Z), Z;
+  return A && Z && hv(v, e, Z), Z;
 }, I = (f, v) => (e, A) => v(e, A, f);
-const Rv = hA("conditional-formatting-before-update-rule-result");
+const Rv = jA("conditional-formatting-before-update-rule-result");
 let G = class extends WA {
   constructor(v, e, A, Z, n, m, T) {
     super();
@@ -1124,15 +1127,15 @@ let G = class extends WA {
       return T > -1 && m.splice(T + 1), m.reduce((S, N) => {
         var w;
         const X = N.rule.type, k = n.cfList.find((L) => L.cfId === N.cfId);
-        if (k != null && k.isDirty && this._handleCalculateUnit(v, e, N), X === h.highlightCell)
+        if (k != null && k.isDirty && this._handleCalculateUnit(v, e, N), X === j.highlightCell)
           k.ruleCache && _.deepMerge(S, { style: k.ruleCache });
-        else if (X === h.colorScale) {
+        else if (X === j.colorScale) {
           const L = k == null ? void 0 : k.ruleCache;
           L && (S.style = { ...(w = S.style) != null ? w : {}, bg: { rgb: L } });
-        } else if (X === h.dataBar) {
+        } else if (X === j.dataBar) {
           const L = k == null ? void 0 : k.ruleCache;
           L && L !== K && (S.dataBar = L, S.isShowValue = L.isShowValue);
-        } else if (X === h.iconSet) {
+        } else if (X === j.iconSet) {
           const L = k == null ? void 0 : k.ruleCache;
           L && L !== K && (S.iconSet = L, S.isShowValue = L.isShowValue);
         }
@@ -1444,12 +1447,12 @@ class yv extends sA {
         if (!l.getColVisible(X) || !l.getRowRawVisible(N))
           return;
         const { color: w, value: L, startPoint: t, isGradient: B } = k.dataBar, d = this.getCellIndex(N, X, m, T, S);
-        let { isMerged: r, isMergedMainCell: u, mergeInfo: p, startY: Q, endY: i, startX: j, endX: y } = d;
-        if (r || (u && (Q = p.startY, i = p.endY, j = p.startX, y = p.endX), !this.isRenderDiffRangesByCell(p, n)))
+        let { isMerged: r, isMergedMainCell: u, mergeInfo: p, startY: Q, endY: i, startX: h, endX: y } = d;
+        if (r || (u && (Q = p.startY, i = p.endY, h = p.startX, y = p.endX), !this.isRenderDiffRangesByCell(p, n)))
           return;
-        const ZA = y - j, kA = i + wv - Q, fA = ZA - this._paddingRightAndLeft * 2, pA = kA - this._paddingTopAndBottom * 2;
+        const ZA = y - h, kA = i + wv - Q, fA = ZA - this._paddingRightAndLeft * 2, pA = kA - this._paddingTopAndBottom * 2;
         if (L > 0) {
-          const x = Math.max(fA * (1 - t / 100) * L / 100, 1), V = j + this._paddingRightAndLeft + t / 100 * fA, b = Q + this._paddingTopAndBottom;
+          const x = Math.max(fA * (1 - t / 100) * L / 100, 1), V = h + this._paddingRightAndLeft + t / 100 * fA, b = Q + this._paddingTopAndBottom;
           if (B) {
             const F = e.createLinearGradient(V, b, V + x, b);
             F.addColorStop(0, w), F.addColorStop(1, "rgb(255 255 255)"), e.fillStyle = F, e.strokeStyle = w, e.lineWidth = 1;
@@ -1457,7 +1460,7 @@ class yv extends sA {
             e.fillStyle = w;
           this._drawRectWithRoundedCorner(e, V, b, x, pA, !1, !0, !0, !1), B && e.stroke();
         } else {
-          const x = Math.max(fA * t / 100 * Math.abs(L) / 100, 1), V = j + this._paddingRightAndLeft + t / 100 * fA - x, b = Q + this._paddingTopAndBottom;
+          const x = Math.max(fA * t / 100 * Math.abs(L) / 100, 1), V = h + this._paddingRightAndLeft + t / 100 * fA - x, b = Q + this._paddingTopAndBottom;
           if (B) {
             const F = e.createLinearGradient(V, b, V + x, b);
             F.addColorStop(0, "rgb(255 255 255)"), F.addColorStop(1, w), e.fillStyle = F, e.strokeStyle = w, e.lineWidth = 1;
@@ -1671,10 +1674,10 @@ class Le extends sA {
         if (!t)
           return;
         const B = this.getCellIndex(N, X, m, T, S);
-        let { isMerged: d, isMergedMainCell: r, mergeInfo: u, startY: p, endY: Q, startX: i, endX: j } = B;
-        if (d || (r && (p = u.startY, Q = u.endY, i = u.startX, j = u.endX), !this.isRenderDiffRangesByCell(u, n)))
+        let { isMerged: d, isMergedMainCell: r, mergeInfo: u, startY: p, endY: Q, startX: i, endX: h } = B;
+        if (d || (r && (p = u.startY, Q = u.endY, i = u.startX, h = u.endX), !this.isRenderDiffRangesByCell(u, n)))
           return;
-        const y = j - i, ZA = Q - p;
+        const y = h - i, ZA = Q - p;
         if (this._width > ZA || this._width > y + this._paddingRightAndLeft * 2)
           return;
         const kA = (ZA - this._width) / 2 + p;
@@ -1700,7 +1703,7 @@ export {
   gA as AddConditionalRuleMutation,
   ie as AddConditionalRuleMutationUndoFactory,
   H as CFNumberOperator,
-  h as CFRuleType,
+  j as CFRuleType,
   a as CFSubRuleType,
   o as CFTextOperator,
   g as CFTimePeriodOperator,

package/lib/types/services/conditional-formatting-formula.service.d.ts

@@ -35,6 +35,7 @@ export declare class ConditionalFormattingFormulaService extends Disposable {
         formulaId: string;
     }>;
     constructor(_commandService: ICommandService, _injector: Injector, _activeDirtyManagerService: IActiveDirtyManagerService, _conditionalFormattingViewModel: ConditionalFormattingViewModel, _conditionalFormattingRuleModel: ConditionalFormattingRuleModel);
+    dispose(): void;
     private _initCache;
     private _initRuleChange;
     private _initFormulaCalculationResultChange;