@univerjs/sheets-conditional-formatting 0.2.4 → 0.2.5

package/lib/es/index.js

@@ -1,8 +1,7 @@
 var OA = Object.defineProperty;
 var hA = (f, v, e) => v in f ? OA(f, v, { enumerable: !0, configurable: !0, writable: !0, value: e }) : f[v] = e;
 var D = (f, v, e) => hA(f, typeof v != "symbol" ? v + "" : v, e);
-import { Tools as _, ObjectMatrix as Y, Range as W, CommandType as eA, ICommandService as BA, Disposable as EA, toDisposable as jA, RefAlias as UA, CellValueType as c, BooleanNumber as JA, ColorKit as iA, Rectangle as R, createInterceptorKey as RA, OnLifecycle as MA, LifecycleStages as VA, IUniverInstanceService as bA, IResourceManagerService as FA, InterceptorManager as IA, UniverInstanceType as XA, Plugin as zA } from "@univerjs/core";
-import { Inject as J, Injector as LA } from "@wendellhu/redi";
+import { Tools as _, ObjectMatrix as Y, Range as W, Inject as J, Injector as XA, CommandType as eA, ICommandService as BA, Disposable as EA, toDisposable as jA, RefAlias as UA, CellValueType as c, BooleanNumber as JA, ColorKit as iA, Rectangle as R, createInterceptorKey as RA, OnLifecycle as MA, LifecycleStages as VA, IUniverInstanceService as bA, IResourceManagerService as FA, InterceptorManager as IA, UniverInstanceType as LA, Plugin as zA } from "@univerjs/core";
 import { SheetInterceptorService as qA, RemoveSheetCommand as KA, ReorderRangeMutation as yA, MoveRangeMutation as xA, MoveColsMutation as GA, MoveRowsMutation as _A, InsertRowMutation as $A, RemoveRowMutation as Av, RemoveColMutation as vv, InsertColMutation as ev, SetRangeValuesMutation as Zv } from "@univerjs/sheets";
 import { Subject as vA } from "rxjs";
 import { bufferTime as aA, filter as PA, map as sA } from "rxjs/operators";
@@ -11,7 +10,7 @@ import E from "dayjs";
 import { isObject as tv, SpreadsheetExtensionRegistry as oA, SheetExtension as gA, FIX_ONE_PIXEL_BLUR_OFFSET as kv } from "@univerjs/engine-render";
 const cA = "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 || {}), 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 De = "#fff", re = "#000000", He = () => ({
+const ue = "#fff", De = "#000000", re = () => ({
   cfId: void 0,
   ranges: [],
   stopIfTrue: !1,
@@ -21,7 +20,7 @@ const De = "#fff", re = "#000000", He = () => ({
     operator: "containsText"
     /* containsText */
   }
-}), Qe = (f, v) => {
+}), He = (f, v) => {
   switch (f) {
     case "text": {
       if ([
@@ -44,7 +43,7 @@ const De = "#fff", re = "#000000", He = () => ({
       ].includes(v) ? [10, 100] : 10;
   }
   return "";
-}, We = (f, v) => {
+}, Qe = (f, v) => {
   switch (f) {
     case "formula":
       return "=";
@@ -133,7 +132,7 @@ const De = "#fff", re = "#000000", He = () => ({
       return [v, { ...f, type: "self" }];
   }
   return null;
-}, Ee = (f, v) => f.id === v.id && f.type === v.type;
+}, We = (f, v) => f.id === v.id && f.type === v.type;
 class ZA {
   constructor() {
     //  Map<unitID ,<sheetId ,ObjectMatrix>>
@@ -321,9 +320,9 @@ let O = class {
 };
 O = Dv([
   HA(0, J(ZA)),
-  HA(1, J(LA))
+  HA(1, J(XA))
 ], O);
-const Je = (f, v) => ({ id: pA.id, params: { unitId: v.unitId, subUnitId: v.subUnitId, cfId: v.rule.cfId } }), CA = {
+const Ee = (f, v) => ({ id: pA.id, params: { unitId: v.unitId, subUnitId: v.subUnitId, cfId: v.rule.cfId } }), CA = {
   type: eA.MUTATION,
   id: "sheet.mutation.add-conditional-rule",
   handler(f, v) {
@@ -341,7 +340,7 @@ const Je = (f, v) => ({ id: pA.id, params: { unitId: v.unitId, subUnitId: v.subU
     const { unitId: e, subUnitId: A, start: Z, end: n } = v;
     return f.get(O).moveRulePriority(e, A, Z, n), !0;
   }
-}, ie = (f) => {
+}, Je = (f) => {
   const { unitId: v, subUnitId: e } = f, A = dv(f.start, f.end);
   if (!A)
     return [];
@@ -558,7 +557,7 @@ let M = class extends EA {
 };
 M = Wv([
   $(0, J(BA)),
-  $(1, J(LA)),
+  $(1, J(XA)),
   $(2, J(fv)),
   $(3, J(ZA)),
   $(4, J(O))
@@ -651,7 +650,7 @@ const iv = (f) => {
       };
     }
   }
-}, ae = (f, v, e, A) => {
+}, ie = (f, v, e, A) => {
   const { accessor: Z } = A, n = Z.get(ZA), m = new Y();
   return e.ranges.forEach((T) => {
     W.foreach(T, (l, S) => {
@@ -1175,7 +1174,7 @@ let G = class extends EA {
     this.disposeWithMe(
       this._resourceManagerService.registerPluginResource({
         pluginName: cA,
-        businesses: [XA.UNIVER_SHEET],
+        businesses: [LA.UNIVER_SHEET],
         toJson: (A) => v(A),
         parseJson: (A) => e(A),
         onUnLoad: (A) => {
@@ -1361,16 +1360,16 @@ let G = class extends EA {
 G = jv([
   MA(VA.Starting, G),
   I(0, J(O)),
-  I(1, J(LA)),
+  I(1, J(XA)),
   I(2, J(ZA)),
   I(3, J(bA)),
   I(4, J(FA)),
   I(5, J(qA)),
   I(6, J(BA))
 ], G);
-const Rv = (f) => f.getCurrentUnitForType(XA.UNIVER_SHEET).getUnitId(), Mv = (f) => {
+const Rv = (f) => f.getCurrentUnitForType(LA.UNIVER_SHEET).getUnitId(), Mv = (f) => {
   var v;
-  return (v = f.getCurrentUnitForType(XA.UNIVER_SHEET).getActiveSheet()) == null ? void 0 : v.getSheetId();
+  return (v = f.getCurrentUnitForType(LA.UNIVER_SHEET).getActiveSheet()) == null ? void 0 : v.getSheetId();
 }, YA = {
   type: eA.MUTATION,
   id: "sheet.mutation.set-conditional-rule",
@@ -1380,7 +1379,7 @@ const Rv = (f) => f.getCurrentUnitForType(XA.UNIVER_SHEET).getUnitId(), Mv = (f)
     const { unitId: e, subUnitId: A, rule: Z } = v, n = v.cfId || v.rule.cfId;
     return f.get(O).setRule(e, A, Z, n), !0;
   }
-}, se = (f, v) => {
+}, ae = (f, v) => {
   const e = f.get(O), { unitId: A, subUnitId: Z } = v, n = v.cfId || v.rule.cfId, m = e.getRule(A, Z, n);
   return m ? [
     {
@@ -1421,15 +1420,15 @@ let WA = (mA = class extends zA {
       this._commandService.registerCommand(f);
     });
   }
-}, D(mA, "pluginName", cA), D(mA, "type", XA.UNIVER_SHEET), mA);
+}, D(mA, "pluginName", cA), D(mA, "type", LA.UNIVER_SHEET), mA);
 WA = Fv([
-  QA(1, J(LA)),
+  QA(1, J(XA)),
   QA(2, J(BA))
 ], WA);
-const oe = (f) => {
+const se = (f) => {
   var e;
   return ((e = f.body) == null ? void 0 : e.dataStream.replace(/\r\n$/, "")) || "";
-}, ge = (f, v) => v.length === f.length && !f.some((e) => v.some((A) => !R.equals(A, e)));
+}, oe = (f, v) => v.length === f.length && !f.some((e) => v.some((A) => !R.equals(A, e)));
 function Iv(f) {
   if (typeof f != "object" || f === null)
     return f;
@@ -1715,7 +1714,7 @@ class Xe extends gA {
 oA.add(Xe);
 export {
   CA as AddConditionalRuleMutation,
-  Je as AddConditionalRuleMutationUndoFactory,
+  Ee as AddConditionalRuleMutationUndoFactory,
   H as CFNumberOperator,
   j as CFRuleType,
   a as CFSubRuleType,
@@ -1728,8 +1727,8 @@ export {
   O as ConditionalFormattingRuleModel,
   G as ConditionalFormattingService,
   ZA as ConditionalFormattingViewModel,
-  De as DEFAULT_BG_COLOR,
-  re as DEFAULT_FONT_COLOR,
+  ue as DEFAULT_BG_COLOR,
+  De as DEFAULT_FONT_COLOR,
   Ne as DEFAULT_PADDING,
   le as DEFAULT_WIDTH,
   Kv as DataBar,
@@ -1740,35 +1739,35 @@ export {
   s as FormulaResultStatus,
   Te as IconUKey,
   dA as MoveConditionalRuleMutation,
-  ie as MoveConditionalRuleMutationUndoFactory,
+  Je as MoveConditionalRuleMutationUndoFactory,
   cA as SHEET_CONDITIONAL_FORMATTING_PLUGIN,
   YA as SetConditionalRuleMutation,
   WA as UniverSheetsConditionalFormattingPlugin,
   dv as anchorUndoFactory,
   AA as compareWithNumber,
   wv as createCfId,
-  He as createDefaultRule,
-  Qe as createDefaultValue,
-  We as createDefaultValueByValueType,
+  re as createDefaultRule,
+  He as createDefaultValue,
+  Qe as createDefaultValueByValueType,
   zv as dataBarUKey,
   tA as filterRange,
   q as findIndexByAnchor,
-  ae as getCacheStyleMatrix,
+  ie as getCacheStyleMatrix,
   U as getCellValue,
   sv as getColorScaleFromValue,
   av as getOppositeOperator,
-  oe as getStringFromDataStream,
+  se as getStringFromDataStream,
   lA as getValueByType,
   ne as iconGroup,
   NA as iconMap,
-  Ee as isAnchorEqual,
+  We as isAnchorEqual,
   SA as isFloatsEqual,
   C as isNullable,
-  ge as isRangesEqual,
+  oe as isRangesEqual,
   Pv as moveByAnchor,
   Iv as removeUndefinedAttr,
   iv as serialTimeToTimestamp,
-  se as setConditionalRuleMutationUndoFactory,
+  ae as setConditionalRuleMutationUndoFactory,
   Jv as toYMD_1900,
   Bv as transformSupportSymmetryAnchor
 };

package/lib/types/commands/mutations/add-conditional-rule.mutation.d.ts

@@ -1,5 +1,4 @@
-import { IMutation } from '@univerjs/core';
-import { IAccessor } from '@wendellhu/redi';
+import { IAccessor, IMutation } from '@univerjs/core';
 import { IConditionFormattingRule } from '../../models/type';
 import { IDeleteConditionalRuleMutationParams } from './delete-conditional-rule.mutation';
 

package/lib/types/commands/mutations/delete-conditional-rule.mutation.d.ts

@@ -1,5 +1,4 @@
-import { IMutation, IMutationInfo } from '@univerjs/core';
-import { IAccessor } from '@wendellhu/redi';
+import { IAccessor, IMutation, IMutationInfo } from '@univerjs/core';
 
 export interface IDeleteConditionalRuleMutationParams {
     unitId: string;

package/lib/types/commands/mutations/set-conditional-rule.mutation.d.ts

@@ -1,5 +1,4 @@
-import { IMutation } from '@univerjs/core';
-import { IAccessor } from '@wendellhu/redi';
+import { IAccessor, IMutation } from '@univerjs/core';
 import { IConditionFormattingRule } from '../../models/type';
 
 export interface ISetConditionalRuleMutationParams {

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

@@ -1,4 +1,4 @@
-import { Injector } from '@wendellhu/redi';
+import { Injector } from '@univerjs/core';
 import { IAnchor } from '../utils/anchor';
 import { IConditionFormattingRule } from './type';
 import { ConditionalFormattingViewModel } from './conditional-formatting-view-model';

package/lib/types/plugin.d.ts

@@ -1,5 +1,4 @@
-import { ICommandService, Plugin, UniverInstanceType } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { ICommandService, Injector, Plugin, UniverInstanceType } from '@univerjs/core';
 
 export declare class UniverSheetsConditionalFormattingPlugin extends Plugin {
     readonly _injector: Injector;

package/lib/types/services/__test__/test.util.d.ts

@@ -1,5 +1,4 @@
-import { ICommandService, Univer } from '@univerjs/core';
-import { Dependency } from '@wendellhu/redi';
+import { Dependency, ICommandService, Univer } from '@univerjs/core';
 import { ConditionalFormattingService } from '../conditional-formatting.service';
 import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
 import { ConditionalFormattingViewModel } from '../../models/conditional-formatting-view-model';
@@ -7,12 +6,12 @@ import { ConditionalFormattingViewModel } from '../../models/conditional-formatt
 export declare const createTestBed: (dependencies?: Dependency[]) => {
     univer: Univer;
     get: {
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.MANY, lookUp?: import('@univerjs/core').LookUp): T[];
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.OPTIONAL, lookUp?: import('@univerjs/core').LookUp): T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.REQUIRED, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity?: import('@univerjs/core').Quantity, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantityOrLookup?: import('@univerjs/core').Quantity | import('@univerjs/core').LookUp, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
     };
     workbook: import('@univerjs/core').Workbook;
     unitId: string;

package/lib/types/services/calculate-unit/type.d.ts

@@ -1,5 +1,4 @@
-import { IAccessor } from '@wendellhu/redi';
-import { ObjectMatrix, Workbook, Worksheet } from '@univerjs/core';
+import { IAccessor, ObjectMatrix, Workbook, Worksheet } from '@univerjs/core';
 import { CFRuleType } from '../../base/const';
 import { IConditionFormattingRule } from '../../models/type';
 

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

@@ -1,5 +1,4 @@
-import { ObjectMatrix, Disposable, ICommandService, RefAlias } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { ObjectMatrix, Disposable, ICommandService, Injector, RefAlias } from '@univerjs/core';
 import { IActiveDirtyManagerService } from '@univerjs/engine-formula';
 import { ConditionalFormattingViewModel } from '../models/conditional-formatting-view-model';
 import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';

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

@@ -1,6 +1,5 @@
-import { Disposable, ICommandService, InterceptorManager, IResourceManagerService, IUniverInstanceService, ObjectMatrix } from '@univerjs/core';
+import { Disposable, ICommandService, Injector, InterceptorManager, IResourceManagerService, IUniverInstanceService, ObjectMatrix } from '@univerjs/core';
 import { SheetInterceptorService } from '@univerjs/sheets';
-import { Injector } from '@wendellhu/redi';
 import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';
 import { ConditionalFormattingViewModel } from '../models/conditional-formatting-view-model';
 import { IHighlightCell } from '../models/type';