@univerjs/sheets-conditional-formatting 0.15.3 → 0.15.4

package/lib/index.js

@@ -1,7 +1,7 @@
 var H2 = Object.defineProperty;
 var j2 = (s, r, t) => r in s ? H2(s, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[r] = t;
 var m = (s, r, t) => j2(s, typeof r != "symbol" ? r + "" : r, t);
-import { generateRandomId as X2, Tools as J, CommandType as O, IUndoRedoService as e2, ICommandService as W, IUniverInstanceService as q, ObjectMatrix as V, Range as T, sequenceExecute as B2, Inject as S, Disposable as x2, RefAlias as K2, CellValueType as x, BooleanNumber as N2, LRUMap as T2, ColorKit as U2, dayjs as v, Injector as M2, RTree as Y2, IResourceManagerService as J2, merge as V2, UniverInstanceType as D2, isInternalEditorID as z2, Rectangle as n2, DependentOn as Q2, IConfigService as e0, Plugin as t0, touchDependencies as n0 } from "@univerjs/core";
+import { generateRandomId as X2, Tools as J, CommandType as O, IUndoRedoService as e2, ICommandService as W, IUniverInstanceService as q, ObjectMatrix as V, Range as T, sequenceExecute as B2, Inject as b, Disposable as x2, RefAlias as K2, CellValueType as M, BooleanNumber as N2, LRUMap as T2, ColorKit as U2, dayjs as v, Injector as M2, RTree as Y2, IResourceManagerService as J2, merge as V2, UniverInstanceType as D2, isInternalEditorID as z2, Rectangle as n2, DependentOn as Q2, IConfigService as e0, Plugin as t0, touchDependencies as n0 } from "@univerjs/core";
 import { isRangesEqual as X1 } from "@univerjs/core";
 import { getSheetCommandTarget as t2, SheetsSelectionsService as r0, findAllRectangle as s0, createTopMatrixFromMatrix as i0, SheetInterceptorService as a0, RemoveSheetCommand as l0, CopySheetCommand as o0, ReorderRangeMutation as u0, MoveRangeMutation as c0, MoveColsMutation as d0, MoveRowsMutation as h0, InsertRowMutation as g0, RemoveRowMutation as C0, RemoveColMutation as f0, InsertColMutation as D0, SetRangeValuesMutation as m0 } from "@univerjs/sheets";
 import { Subject as d2, BehaviorSubject as F0 } from "rxjs";
@@ -9,7 +9,7 @@ import { RegisterOtherFormulaService as w0, FormulaResultStatus as p, OtherFormu
 import { distinctUntilChanged as E0, bufferTime as A0, filter as _0, map as x0 } from "rxjs/operators";
 import { isObject as M0, SpreadsheetExtensionRegistry as O2, SheetExtension as $2, FIX_ONE_PIXEL_BLUR_OFFSET as y0 } from "@univerjs/engine-render";
 const P2 = "SHEET_CONDITIONAL_FORMATTING_PLUGIN";
-var k = /* @__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))(k || {}), B = /* @__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))(B || {}), w = /* @__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))(w || {}), M = /* @__PURE__ */ ((s) => (s.highlightCell = "highlightCell", s.dataBar = "dataBar", s.colorScale = "colorScale", s.iconSet = "iconSet", s))(M || {}), _ = /* @__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))(_ || {}), b = /* @__PURE__ */ ((s) => (s.num = "num", s.min = "min", s.max = "max", s.percent = "percent", s.percentile = "percentile", s.formula = "formula", s))(b || {});
+var B = /* @__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))(B || {}), N = /* @__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))(N || {}), w = /* @__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))(w || {}), y = /* @__PURE__ */ ((s) => (s.highlightCell = "highlightCell", s.dataBar = "dataBar", s.colorScale = "colorScale", s.iconSet = "iconSet", s))(y || {}), _ = /* @__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))(_ || {}), L = /* @__PURE__ */ ((s) => (s.num = "num", s.min = "min", s.max = "max", s.percent = "percent", s.percentile = "percentile", s.formula = "formula", s))(L || {});
 const V1 = "#fff", O1 = "#000000", $1 = () => ({
   cfId: void 0,
   ranges: [],
@@ -133,7 +133,7 @@ const V1 = "#fff", O1 = "#000000", $1 = () => ({
   }
   return null;
 }, q1 = (s, r) => s.id === r.id && s.type === r.type, S0 = () => `${X2(8)}`;
-class y {
+class R {
   constructor() {
     //  Map<unitID ,<sheetId ,IConditionFormattingRule[]>>
     m(this, "_model", /* @__PURE__ */ new Map());
@@ -206,7 +206,7 @@ const i2 = {
     if (!r)
       return !1;
     const { unitId: t, subUnitId: e, start: n, end: i } = r;
-    return s.get(y).moveRulePriority(t, e, n, i), !0;
+    return s.get(R).moveRulePriority(t, e, n, i), !0;
   }
 }, b0 = (s) => {
   const { unitId: r, subUnitId: t } = s, e = I0(s.start, s.end);
@@ -217,7 +217,7 @@ const i2 = {
     { id: i2.id, params: { unitId: r, subUnitId: t, start: n, end: i } }
   ];
 }, m2 = (s, r) => {
-  const t = s.get(y), { unitId: e, subUnitId: n, cfId: i } = r, a = [...t.getSubunitRules(e, n) || []], c = a.findIndex((o) => o.cfId === i), l = a[c - 1];
+  const t = s.get(R), { unitId: e, subUnitId: n, cfId: i } = r, a = [...t.getSubunitRules(e, n) || []], c = a.findIndex((o) => o.cfId === i), l = a[c - 1];
   if (c > -1) {
     const o = a[c], d = [{
       id: a2.id,
@@ -248,7 +248,7 @@ const i2 = {
     if (!r)
       return !1;
     const { unitId: t, subUnitId: e, cfId: n } = r;
-    return s.get(y).deleteRule(t, e, n), !0;
+    return s.get(R).deleteRule(t, e, n), !0;
   }
 }, q2 = (s, r) => ({ id: K.id, params: { unitId: r.unitId, subUnitId: r.subUnitId, cfId: r.rule.cfId } }), a2 = {
   type: O.MUTATION,
@@ -257,7 +257,7 @@ const i2 = {
     if (!r)
       return !1;
     const { unitId: t, subUnitId: e, rule: n } = r;
-    return s.get(y).addRule(t, e, n), !0;
+    return s.get(R).addRule(t, e, n), !0;
   }
 }, L0 = {
   type: O.COMMAND,
@@ -265,7 +265,7 @@ const i2 = {
   handler(s, r) {
     if (!r)
       return !1;
-    const { rule: t } = r, e = s.get(e2), n = s.get(W), i = s.get(y), a = s.get(q), c = t2(a, r);
+    const { rule: t } = r, e = s.get(e2), n = s.get(W), i = s.get(R), a = s.get(q), c = t2(a, r);
     if (!c) return !1;
     const { unitId: l, subUnitId: o } = c, d = i.createCfId(l, o), u = { unitId: l, subUnitId: o, rule: { ...t, cfId: t.cfId || d } }, h = q2(s, u), g = n.syncExecuteCommand(a2.id, u);
     return g && e.pushUndoRedo({
@@ -281,10 +281,10 @@ const i2 = {
     if (!r)
       return !1;
     const { unitId: t, subUnitId: e, rule: n } = r, i = r.cfId || r.rule.cfId;
-    return s.get(y).setRule(t, e, n, i), !0;
+    return s.get(R).setRule(t, e, n, i), !0;
   }
 }, Z2 = (s, r) => {
-  const t = s.get(y), { unitId: e, subUnitId: n } = r, i = r.cfId || r.rule.cfId, a = t.getRule(e, n, i);
+  const t = s.get(R), { unitId: e, subUnitId: n } = r, i = r.cfId || r.rule.cfId, a = t.getRule(e, n, i);
   return a ? [{
     id: l2.id,
     params: {
@@ -301,7 +301,7 @@ const i2 = {
     var D;
     if (!r)
       return !1;
-    const t = s.get(y), e = s.get(q), n = s.get(W), i = s.get(e2), a = s.get(r0), c = t2(e, r);
+    const t = s.get(R), e = s.get(q), n = s.get(W), i = s.get(e2), a = s.get(r0), c = t2(e, r);
     if (!c) return !1;
     const { unitId: l, subUnitId: o } = c, d = ((D = a.getCurrentSelections()) == null ? void 0 : D.map((F) => F.range)) || [], u = t.getSubunitRules(l, o);
     if (!(u != null && u.length) || !d.length)
@@ -310,21 +310,21 @@ const i2 = {
     u.forEach((F) => {
       const E = new V();
       F.ranges.forEach((A) => {
-        T.foreach(A, (I, L) => {
-          E.setValue(I, L, 1);
+        T.foreach(A, (S, k) => {
+          E.setValue(S, k, 1);
         });
       }), d.forEach((A) => {
-        T.foreach(A, (I, L) => {
-          E.realDeleteValue(I, L);
+        T.foreach(A, (S, k) => {
+          E.realDeleteValue(S, k);
         });
       });
-      const R = s0(i0(E));
-      if (R.length) {
-        const A = { ...F, ranges: R }, I = { unitId: l, subUnitId: o, rule: A }, L = Z2(s, I);
-        h.push({ id: l2.id, params: I }), g.push(...L);
+      const I = s0(i0(E));
+      if (I.length) {
+        const A = { ...F, ranges: I }, S = { unitId: l, subUnitId: o, rule: A }, k = Z2(s, S);
+        h.push({ id: l2.id, params: S }), g.push(...k);
       } else {
-        const A = { unitId: l, subUnitId: o, cfId: F.cfId }, I = m2(s, A);
-        h.push({ id: K.id, params: A }), g.push(...I);
+        const A = { unitId: l, subUnitId: o, cfId: F.cfId }, S = m2(s, A);
+        h.push({ id: K.id, params: A }), g.push(...S);
       }
     });
     const f = B2(h, n).result;
@@ -338,7 +338,7 @@ const i2 = {
   type: O.COMMAND,
   id: "sheet.command.clear-worksheet-conditional-rule",
   handler(s, r) {
-    const t = s.get(y), e = s.get(q), n = s.get(W), i = s.get(e2), a = t2(e, r);
+    const t = s.get(R), e = s.get(q), n = s.get(W), i = s.get(e2), a = t2(e, r);
     if (!a) return !1;
     const { unitId: c, subUnitId: l } = a, o = t.getSubunitRules(c, l);
     if (!(o != null && o.length))
@@ -367,7 +367,7 @@ const i2 = {
   handler(s, r) {
     if (!r)
       return !1;
-    const t = s.get(e2), e = s.get(W), n = s.get(q), i = s.get(y), a = t2(n, r);
+    const t = s.get(e2), e = s.get(W), n = s.get(q), i = s.get(R), a = t2(n, r);
     if (!a) return !1;
     const { unitId: c, subUnitId: l } = a, o = W2(r.start, r.end, i.getSubunitRules(c, l) || [], (D) => D.cfId);
     if (!o)
@@ -408,12 +408,12 @@ let z = class extends x2 {
   _initRuleChange() {
     const r = (t) => {
       switch (t.type) {
-        case M.colorScale:
-          return t.config.some((e) => e.value.type === b.formula);
-        case M.dataBar:
-          return [t.config.max, t.config.min].some((e) => e.type === b.formula);
-        case M.iconSet:
-          return t.config.some((e) => e.value.type === b.formula);
+        case y.colorScale:
+          return t.config.some((e) => e.value.type === L.formula);
+        case y.dataBar:
+          return [t.config.max, t.config.min].some((e) => e.type === L.formula);
+        case y.iconSet:
+          return t.config.some((e) => e.value.type === L.formula);
       }
     };
     this.disposeWithMe(this._conditionalFormattingRuleModel.$ruleChange.subscribe((t) => {
@@ -426,7 +426,7 @@ let z = class extends x2 {
    */
   _registerRuleFormulas(r, t, e) {
     switch (e.rule.type) {
-      case M.highlightCell: {
+      case y.highlightCell: {
         if (e.rule.subType === _.formula) {
           const n = e.rule.value;
           n && this.registerFormulaWithRange(
@@ -526,7 +526,7 @@ let z = class extends x2 {
     if (!r || !r[0] || !r[0][0])
       return !1;
     const t = r[0][0];
-    return (t == null ? void 0 : t.t) === x.BOOLEAN ? t.v === N2.TRUE || t.v === !0 : t == null ? void 0 : t.v;
+    return (t == null ? void 0 : t.t) === M.BOOLEAN ? t.v === N2.TRUE || t.v === !0 : t == null ? void 0 : t.v;
   }
   /**
    * If `formulaText` is not provided, then all caches related to `cfId` will be deleted.
@@ -557,8 +557,8 @@ let z = class extends x2 {
   }
 };
 z = O0([
-  S2(0, S(w0)),
-  S2(1, S(y))
+  S2(0, b(w0)),
+  S2(1, b(R))
 ], z);
 var U = /* @__PURE__ */ ((s) => (s.preComputingStart = "preComputingStart", s.preComputing = "preComputing", s.preComputingEnd = "preComputingEnd", s.preComputingError = "preComputingError", s))(U || {});
 class F2 {
@@ -637,10 +637,10 @@ class F2 {
 class $0 extends F2 {
   preComputing(r, t, e) {
     const n = e.rule, i = e.worksheet, a = new V();
-    !n.rule.config.every((d) => d.value.type === b.num) && w2(n.ranges, i.getMaxRows() - 1, i.getMaxColumns() - 1).forEach((u) => {
+    !n.rule.config.every((d) => d.value.type === L.num) && w2(n.ranges, i.getMaxRows() - 1, i.getMaxColumns() - 1).forEach((u) => {
       T.foreach(u, (h, g) => {
         const f = e.getCellValue(h, g), D = f && f.v;
-        if (!N(D) && (f == null ? void 0 : f.t) === x.NUMBER) {
+        if (!x(D) && (f == null ? void 0 : f.t) === M.NUMBER) {
           const F = Number(D);
           !Number.isNaN(F) && a.setValue(h, g, F);
         }
@@ -667,7 +667,7 @@ class $0 extends F2 {
     if (!e)
       return null;
     const i = n.getCellValue(r, t);
-    if (i.t === x.NUMBER) {
+    if (i.t === M.NUMBER) {
       const a = Number(i.v);
       if (!Number.isNaN(a))
         return n1(e, a);
@@ -706,23 +706,23 @@ class G0 extends $2 {
           return;
         c.add($);
       }
-      const { color: D, value: F, startPoint: E, isGradient: R } = f.dataBar, { startX: A, endX: I, startY: L, endY: v2 } = u || h ? g : d, o2 = I - A, p2 = v2 + y0 - L, Z = o2 - this._paddingRightAndLeft * 2, y2 = p2 - this._paddingTopAndBottom * 2;
+      const { color: D, value: F, startPoint: E, isGradient: I } = f.dataBar, { startX: A, endX: S, startY: k, endY: v2 } = u || h ? g : d, o2 = S - A, p2 = v2 + y0 - k, Z = o2 - this._paddingRightAndLeft * 2, y2 = p2 - this._paddingTopAndBottom * 2;
       if (F > 0) {
-        const $ = Math.max(Z * (1 - E / 100) * F / 100, 1), G = A + this._paddingRightAndLeft + E / 100 * Z, H = L + this._paddingTopAndBottom;
-        if (R) {
+        const $ = Math.max(Z * (1 - E / 100) * F / 100, 1), G = A + this._paddingRightAndLeft + E / 100 * Z, H = k + this._paddingTopAndBottom;
+        if (I) {
           const j = t.createLinearGradient(G, H, G + $, H);
           j.addColorStop(0, D), j.addColorStop(1, "rgb(255 255 255)"), t.fillStyle = j, t.strokeStyle = D, t.lineWidth = 1;
         } else
           t.fillStyle = D;
-        this._drawRectWithRoundedCorner(t, G, H, $, y2, !1, !0, !0, !1), R && t.stroke();
+        this._drawRectWithRoundedCorner(t, G, H, $, y2, !1, !0, !0, !1), I && t.stroke();
       } else {
-        const $ = Math.max(Z * E / 100 * Math.abs(F) / 100, 1), G = A + this._paddingRightAndLeft + E / 100 * Z - $, H = L + this._paddingTopAndBottom;
-        if (R) {
+        const $ = Math.max(Z * E / 100 * Math.abs(F) / 100, 1), G = A + this._paddingRightAndLeft + E / 100 * Z - $, H = k + this._paddingTopAndBottom;
+        if (I) {
           const j = t.createLinearGradient(G, H, G + $, H);
           j.addColorStop(0, "rgb(255 255 255)"), j.addColorStop(1, D), t.fillStyle = j, t.strokeStyle = D, t.lineWidth = 1;
         } else
           t.fillStyle = D;
-        this._drawRectWithRoundedCorner(t, G, H, $, y2, !0, !1, !1, !0), R && t.stroke();
+        this._drawRectWithRoundedCorner(t, G, H, $, y2, !0, !1, !1, !0), I && t.stroke();
       }
     }), t.restore();
   }
@@ -734,7 +734,7 @@ class G0 extends $2 {
 O2.add(G0);
 const u2 = (s) => Math.max(Math.min(100, s), 0), H0 = (s, r, t) => {
   const e = t(s, r);
-  if (e && e.t === x.NUMBER) {
+  if (e && e.t === M.NUMBER) {
     const n = Number(e.v);
     return Number.isNaN(n) ? null : n;
   }
@@ -743,11 +743,11 @@ const u2 = (s) => Math.max(Math.min(100, s), 0), H0 = (s, r, t) => {
 class j0 extends F2 {
   preComputing(r, t, e) {
     const n = e.rule, i = n.rule, a = e.worksheet, c = new V();
-    ![n.rule.config.max, n.rule.config.min].every((g) => g.type === b.num) && w2(n.ranges, a.getMaxRows() - 1, a.getMaxColumns() - 1).forEach((f) => {
+    ![n.rule.config.max, n.rule.config.min].every((g) => g.type === L.num) && w2(n.ranges, a.getMaxRows() - 1, a.getMaxColumns() - 1).forEach((f) => {
       T.foreach(f, (D, F) => {
-        const E = e.getCellValue(D, F), R = E && E.v;
-        if (!N(R) && (E == null ? void 0 : E.t) === x.NUMBER) {
-          const A = Number(R);
+        const E = e.getCellValue(D, F), I = E && E.v;
+        if (!x(I) && (E == null ? void 0 : E.t) === M.NUMBER) {
+          const A = Number(I);
           !Number.isNaN(A) && c.setValue(D, F, A);
         }
       });
@@ -809,8 +809,8 @@ class X0 extends F2 {
           let l = 0, o = 0;
           return i.forEach((d) => {
             T.foreach(d, (u, h) => {
-              const g = e.getCellValue(u, h), f = P(g || void 0);
-              g && g.t === x.NUMBER && f !== void 0 && (l += Number(f) || 0, o++);
+              const g = e.getCellValue(u, h), f = P(g);
+              g && g.t === M.NUMBER && !x(f) && (l += Number(f) || 0, o++);
             });
           }), { value: l / o, type: n.subType };
         }
@@ -819,8 +819,8 @@ class X0 extends F2 {
           const l = /* @__PURE__ */ new Map();
           return i.forEach((o) => {
             T.foreach(o, (d, u) => {
-              const h = e.getCellValue(d, u), g = P(h || void 0);
-              if (g !== void 0) {
+              const h = e.getCellValue(d, u), g = P(h);
+              if (!x(g)) {
                 const f = l.get(g);
                 f ? l.set(g, f + 1) : l.set(g, 1);
               }
@@ -831,8 +831,8 @@ class X0 extends F2 {
           let l = [];
           i.forEach((u) => {
             T.foreach(u, (h, g) => {
-              const f = e.getCellValue(h, g), D = P(f || void 0);
-              f && f.t === x.NUMBER && D !== void 0 && l.push(Number(D) || 0);
+              const f = e.getCellValue(h, g), D = P(f);
+              f && f.t === M.NUMBER && !x(D) && l.push(Number(D) || 0);
             });
           }), l.sort((u, h) => h - u);
           const o = e.rule.rule;
@@ -855,7 +855,7 @@ class X0 extends F2 {
         }
         case _.timePeriod:
           switch (n.operator) {
-            case B.last7Days:
+            case N.last7Days:
               return {
                 value: {
                   start: v().subtract(7, "day").valueOf(),
@@ -863,7 +863,7 @@ class X0 extends F2 {
                 },
                 type: n.subType
               };
-            case B.lastMonth:
+            case N.lastMonth:
               return {
                 value: {
                   start: v().startOf("month").subtract(1, "month").valueOf(),
@@ -871,7 +871,7 @@ class X0 extends F2 {
                 },
                 type: n.subType
               };
-            case B.lastWeek:
+            case N.lastWeek:
               return {
                 value: {
                   start: v().startOf("week").subtract(1, "week").valueOf(),
@@ -879,7 +879,7 @@ class X0 extends F2 {
                 },
                 type: n.subType
               };
-            case B.nextMonth:
+            case N.nextMonth:
               return {
                 value: {
                   start: v().startOf("month").add(1, "month").valueOf(),
@@ -887,7 +887,7 @@ class X0 extends F2 {
                 },
                 type: n.subType
               };
-            case B.nextWeek:
+            case N.nextWeek:
               return {
                 value: {
                   start: v().startOf("week").add(1, "week").valueOf(),
@@ -895,7 +895,7 @@ class X0 extends F2 {
                 },
                 type: n.subType
               };
-            case B.thisMonth:
+            case N.thisMonth:
               return {
                 value: {
                   start: v().startOf("month").valueOf(),
@@ -903,7 +903,7 @@ class X0 extends F2 {
                 },
                 type: n.subType
               };
-            case B.thisWeek:
+            case N.thisWeek:
               return {
                 value: {
                   start: v().startOf("week").valueOf(),
@@ -911,7 +911,7 @@ class X0 extends F2 {
                 },
                 type: n.subType
               };
-            case B.today:
+            case N.today:
               return {
                 value: {
                   start: v().startOf("day").valueOf(),
@@ -919,7 +919,7 @@ class X0 extends F2 {
                 },
                 type: n.subType
               };
-            case B.tomorrow:
+            case N.tomorrow:
               return {
                 value: {
                   start: v().startOf("day").add(1, "day").valueOf(),
@@ -927,7 +927,7 @@ class X0 extends F2 {
                 },
                 type: n.subType
               };
-            case B.yesterday:
+            case N.yesterday:
               return {
                 value: {
                   start: v().startOf("day").subtract(1, "day").valueOf(),
@@ -946,31 +946,31 @@ class X0 extends F2 {
     return (() => {
       switch (a.subType) {
         case _.number: {
-          const o = i && Number(i.v), d = (i == null ? void 0 : i.t) === x.NUMBER, u = a;
-          return d ? N(o) || Number.isNaN(o) ? void 0 : r2({ operator: u.operator, value: u.value || 0 }, o || 0) : !![w.notEqual, w.notBetween].includes(u.operator);
+          const o = i && Number(i.v), d = (i == null ? void 0 : i.t) === M.NUMBER, u = a;
+          return d ? x(o) || Number.isNaN(o) ? void 0 : r2({ operator: u.operator, value: u.value || 0 }, o || 0) : !![w.notEqual, w.notBetween].includes(u.operator);
         }
         case _.text: {
-          const o = a, d = P(i), u = d === null ? "" : String(d), h = o.value || "";
+          const o = a, d = P(i), u = x(d) ? "" : String(d), h = o.value || "";
           switch (o.operator) {
-            case k.beginsWith:
+            case B.beginsWith:
               return u.startsWith(h);
-            case k.containsBlanks:
+            case B.containsBlanks:
               return /^\s*$/.test(u);
-            case k.notContainsBlanks:
+            case B.notContainsBlanks:
               return !/^\s*$/.test(u);
-            case k.containsErrors:
+            case B.containsErrors:
               return R2.has(u);
-            case k.notContainsErrors:
+            case B.notContainsErrors:
               return !R2.has(u);
-            case k.containsText:
+            case B.containsText:
               return u.indexOf(h) > -1;
-            case k.notContainsText:
+            case B.notContainsText:
               return u.indexOf(h) === -1;
-            case k.endsWith:
+            case B.endsWith:
               return u.endsWith(h);
-            case k.equal:
+            case B.equal:
               return u === h;
-            case k.notEqual:
+            case B.notEqual:
               return u !== h;
             default:
               return !1;
@@ -978,16 +978,16 @@ class X0 extends F2 {
         }
         case _.timePeriod: {
           const o = P(i);
-          if (N(o) || Number.isNaN(Number(o)) || (i == null ? void 0 : i.t) !== x.NUMBER || !e)
+          if (x(o) || Number.isNaN(Number(o)) || (i == null ? void 0 : i.t) !== M.NUMBER || !e)
             return;
           const d = e1(Number(o)), { start: u, end: h } = e.value;
           return d >= u && d <= h;
         }
         case _.average: {
-          const o = i && i.v, d = Number(o), u = (i == null ? void 0 : i.t) === x.NUMBER, h = a;
+          const o = i && i.v, d = Number(o), u = (i == null ? void 0 : i.t) === M.NUMBER, h = a;
           if (!u)
             return w.notEqual === h.operator;
-          if (N(o) || Number.isNaN(d) || !e)
+          if (x(o) || Number.isNaN(d) || !e)
             return !1;
           const g = e.value;
           switch (h.operator) {
@@ -1009,18 +1009,21 @@ class X0 extends F2 {
         }
         case _.rank: {
           const o = P(i), d = Number(o);
-          if (N(o) || Number.isNaN(d) || (i == null ? void 0 : i.t) !== x.NUMBER || !e)
+          if (x(o) || Number.isNaN(d) || (i == null ? void 0 : i.t) !== M.NUMBER || !e)
             return !1;
           const u = e.value;
           return a.isBottom ? d <= u : d >= u;
         }
         case _.uniqueValues: {
           const o = P(i);
-          return N(o) || !e ? !1 : e.value.get(o) === 1;
+          return x(o) || !e ? !1 : e.value.get(o) === 1;
         }
         case _.duplicateValues: {
           const o = P(i);
-          return N(o) || !e ? !1 : e.value.get(o) !== 1;
+          if (x(o) || !e)
+            return !1;
+          const d = e.value.get(o);
+          return d && d !== 1;
         }
         case _.formula: {
           const o = e == null ? void 0 : e.value;
@@ -1036,7 +1039,7 @@ class X0 extends F2 {
 }
 const K0 = (s, r, t) => {
   const e = t(s, r);
-  if (e && e.t === x.NUMBER) {
+  if (e && e.t === M.NUMBER) {
     const n = Number(e.v);
     return Number.isNaN(n) ? null : n;
   }
@@ -1045,10 +1048,10 @@ const K0 = (s, r, t) => {
 class Y0 extends F2 {
   preComputing(r, t, e) {
     const n = e.rule.rule, i = e.worksheet, a = new V();
-    !n.config.every((d) => d.value.type === b.num) && w2(e.rule.ranges, i.getMaxRows() - 1, i.getMaxColumns() - 1).forEach((u) => {
+    !n.config.every((d) => d.value.type === L.num) && w2(e.rule.ranges, i.getMaxRows() - 1, i.getMaxColumns() - 1).forEach((u) => {
       T.foreach(u, (h, g) => {
         const f = e.getCellValue(h, g), D = f && f.v;
-        if (!N(D) && (f == null ? void 0 : f.t) === x.NUMBER) {
+        if (!x(D) && (f == null ? void 0 : f.t) === M.NUMBER) {
           const F = Number(D);
           !Number.isNaN(F) && a.setValue(h, g, F);
         }
@@ -1203,7 +1206,7 @@ let Q = class extends x2 {
       this._conditionalFormattingRuleModel.$ruleChange.subscribe((r) => {
         if (r.type === "set") {
           const { unitId: t, subUnitId: e } = r, n = r.oldRule;
-          n.rule.type === M.highlightCell && n.rule.subType === _.formula && this._conditionalFormattingFormulaService.deleteCache(t, e, n.cfId);
+          n.rule.type === y.highlightCell && n.rule.subType === _.formula && this._conditionalFormattingFormulaService.deleteCache(t, e, n.cfId);
         }
       })
     );
@@ -1264,13 +1267,13 @@ let Q = class extends x2 {
       getCellValue: (c, l) => i.getCellRaw(c, l) || {}
     };
     switch (e.rule.type) {
-      case M.colorScale:
+      case y.colorScale:
         return new $0(a);
-      case M.dataBar:
+      case y.dataBar:
         return new j0(a);
-      case M.highlightCell:
+      case y.highlightCell:
         return new X0(a);
-      case M.iconSet:
+      case y.iconSet:
         return new Y0(a);
     }
   }
@@ -1288,22 +1291,22 @@ let Q = class extends x2 {
   }
 };
 Q = z0([
-  c2(0, S(M2)),
-  c2(1, S(y)),
-  c2(2, S(z)),
+  c2(0, b(M2)),
+  c2(1, b(R)),
+  c2(2, b(z)),
   c2(3, q)
 ], Q);
 function h2(s, r) {
   return Math.abs(s - r) < Number.EPSILON;
 }
-const N = (s) => [void 0, null].includes(s), P = (s) => {
+const x = (s) => s == null || typeof s == "string" && s.trim() === "", P = (s) => {
   var e, n;
   if (!s)
     return null;
-  if (s.t === x.BOOLEAN)
+  if (s.t === M.BOOLEAN)
     return s.v === N2.TRUE ? I2.TRUE : I2.FALSE;
   const r = s.v, t = (n = (e = s.p) == null ? void 0 : e.body) == null ? void 0 : n.dataStream.replace(/\r\n$/, "");
-  return N(r) ? N(t) ? null : t : r;
+  return x(r) ? x(t) ? null : t : r;
 }, A2 = 86400;
 function Q0(s, r = !0) {
   if (r && s >= 0) {
@@ -1333,7 +1336,7 @@ const e1 = (s) => {
   return v(`${i}/${a}/${c} ${l}:${o}:${d}`).valueOf();
 }, g2 = (s, r, t) => {
   switch (s.type) {
-    case b.max: {
+    case L.max: {
       let e = 0;
       return r.forValue((n, i, a) => {
         a > e && (e = a);
@@ -1342,7 +1345,7 @@ const e1 = (s) => {
         result: e
       };
     }
-    case b.min: {
+    case L.min: {
       let e;
       return r.forValue((n, i, a) => {
         e === void 0 && (e = a), a < e && (e = a);
@@ -1351,7 +1354,7 @@ const e1 = (s) => {
         result: e
       };
     }
-    case b.percent: {
+    case L.percent: {
       let e, n;
       r.forValue((c, l, o) => {
         (e === void 0 || n === void 0) && (e = o, n = o), o > e && (e = o), o < n && (n = o);
@@ -1362,18 +1365,18 @@ const e1 = (s) => {
         result: i * (a / 100) + (n || 0)
       };
     }
-    case b.percentile: {
+    case L.percentile: {
       const e = r.toNativeArray().sort((o, d) => o - d), n = Math.max(Math.min(Number(s.value) || 0, 100), 0), i = (e.length - 1) * n / 100, a = Math.floor(i), c = i - a, l = e[a] + (e[Math.min(a + 1, e.length - 1)] - e[a]) * c;
       return {
         status: p.SUCCESS,
         result: l
       };
     }
-    case b.formula: {
+    case L.formula: {
       const { accessor: e, unitId: n, subUnitId: i, cfId: a } = t, c = String(s.value), l = e.get(z);
       return l.registerFormulaWithRange(n, i, a, c), l.getFormulaResultWithCoords(n, i, a, c);
     }
-    case b.num:
+    case L.num:
     default: {
       const e = Number(s.value);
       return {
@@ -1595,15 +1598,15 @@ let s2 = class extends x2 {
       return a > -1 && i.splice(a + 1), i.reduce((l, o) => {
         var h;
         const d = o.rule.type, u = n.find((g) => g.cfId === o.cfId);
-        if (d === M.highlightCell)
+        if (d === y.highlightCell)
           u.result && V2(l, { style: u.result });
-        else if (d === M.colorScale) {
+        else if (d === y.colorScale) {
           const g = u == null ? void 0 : u.result;
           g && typeof g == "string" && (l.style = { ...(h = l.style) != null ? h : {}, bg: { rgb: g } });
-        } else if (d === M.dataBar) {
+        } else if (d === y.dataBar) {
           const g = u == null ? void 0 : u.result;
           g && (l.dataBar = g, l.isShowValue = g.isShowValue);
-        } else if (d === M.iconSet) {
+        } else if (d === y.iconSet) {
           const g = u == null ? void 0 : u.result;
           g && (l.iconSet = g, l.isShowValue = g.isShowValue);
         }
@@ -1784,12 +1787,12 @@ let s2 = class extends x2 {
   }
 };
 s2 = m1([
-  Y(0, S(y)),
-  Y(1, S(M2)),
-  Y(2, S(q)),
-  Y(3, S(J2)),
-  Y(4, S(a0)),
-  Y(5, S(W))
+  Y(0, b(R)),
+  Y(1, b(M2)),
+  Y(2, b(q)),
+  Y(3, b(J2)),
+  Y(4, b(a0)),
+  Y(5, b(W))
 ], s2);
 const F1 = (s) => s.getCurrentUnitForType(D2.UNIVER_SHEET).getUnitId(), w1 = (s) => {
   var r;
@@ -1811,7 +1814,7 @@ let f2 = class extends t0 {
     this._configService.setConfig(f1, n), [
       [s2],
       [z],
-      [y],
+      [R],
       [Q]
     ].forEach((i) => {
       this._injector.add(i);
@@ -1841,8 +1844,8 @@ G2(f2, "pluginName", P2);
 G2(f2, "type", D2.UNIVER_SHEET);
 f2 = A1([
   Q2(p0),
-  _2(1, S(M2)),
-  _2(2, S(W)),
+  _2(1, b(M2)),
+  _2(2, b(W)),
   _2(3, e0)
 ], f2);
 const _1 = "sheet-conditional-rule-icon", x1 = 35, M1 = 15, y1 = 2, R1 = (s) => {
@@ -1884,11 +1887,11 @@ class I1 extends $2 {
           return;
         c.add(Z);
       }
-      const { startX: R, endX: A, startY: I, endY: L } = u || h ? g : d, v2 = A - R, o2 = L - I;
+      const { startX: I, endX: A, startY: S, endY: k } = u || h ? g : d, v2 = A - I, o2 = k - S;
       if (this._width > o2 || this._width > v2 + this._paddingRightAndLeft * 2)
         return;
-      const p2 = (o2 - this._width) / 2 + I;
-      t.drawImage(E, R + this._paddingRightAndLeft, p2, this._width, this._width);
+      const p2 = (o2 - this._width) / 2 + S;
+      t.drawImage(E, I + this._paddingRightAndLeft, p2, this._width, this._width);
     }), t.restore();
   }
   _init() {
@@ -1921,17 +1924,17 @@ export {
   a2 as AddConditionalRuleMutation,
   q2 as AddConditionalRuleMutationUndoFactory,
   w as CFNumberOperator,
-  M as CFRuleType,
+  y as CFRuleType,
   _ as CFSubRuleType,
-  k as CFTextOperator,
-  B as CFTimePeriodOperator,
-  b as CFValueType,
+  B as CFTextOperator,
+  N as CFTimePeriodOperator,
+  L as CFValueType,
   E2 as CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH,
   k0 as ClearRangeCfCommand,
   B0 as ClearWorksheetCfCommand,
   z as ConditionalFormattingFormulaService,
   I1 as ConditionalFormattingIcon,
-  y as ConditionalFormattingRuleModel,
+  R as ConditionalFormattingRuleModel,
   s2 as ConditionalFormattingService,
   Q as ConditionalFormattingViewModel,
   V1 as DEFAULT_BG_COLOR,
@@ -1973,7 +1976,7 @@ export {
   C2 as iconMap,
   q1 as isAnchorEqual,
   h2 as isFloatsEqual,
-  N as isNullable,
+  x as isNullable,
   X1 as isRangesEqual,
   R0 as moveByAnchor,
   S1 as removeUndefinedAttr,