@univerjs/sheets-conditional-formatting 0.2.11 → 0.2.13

package/lib/es/index.js

@@ -2,7 +2,7 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
-import { Tools, Inject, Injector, CommandType, ObjectMatrix, Range, ICommandService, Disposable, toDisposable, RefAlias, CellValueType, BooleanNumber, ColorKit, Rectangle, createInterceptorKey, OnLifecycle, LifecycleStages, IUniverInstanceService, IResourceManagerService, InterceptorManager, UniverInstanceType, Plugin } from "@univerjs/core";
+import { Tools, Inject, Injector, CommandType, ObjectMatrix, Range, ICommandService, Disposable, toDisposable, RefAlias, CellValueType, BooleanNumber, ColorKit, Rectangle, createInterceptorKey, OnLifecycle, LifecycleStages, IUniverInstanceService, IResourceManagerService, InterceptorManager, UniverInstanceType, Plugin, IConfigService } from "@univerjs/core";
 import { SheetInterceptorService, RemoveSheetCommand, ReorderRangeMutation, MoveRangeMutation, MoveColsMutation, MoveRowsMutation, InsertRowMutation, RemoveRowMutation, RemoveColMutation, InsertColMutation, SetRangeValuesMutation } from "@univerjs/sheets";
 import { Subject, Observable } from "rxjs";
 import { bufferTime, filter, map } from "rxjs/operators";
@@ -565,16 +565,17 @@ const dataBarUKey = "sheet-conditional-rule-data-bar", defaultDataBarPositiveCol
     __publicField(this, "Z_INDEX", EXTENSION_Z_INDEX$1);
     __publicField(this, "_radius", 1);
   }
-  draw(ctx, parentScale, spreadsheetSkeleton, diffRanges) {
+  // eslint-disable-next-line max-lines-per-function
+  draw(ctx, _parentScale, spreadsheetSkeleton, diffRanges) {
     const { rowHeightAccumulation, columnWidthAccumulation, worksheet, dataMergeCache } = spreadsheetSkeleton;
     if (!worksheet)
       return !1;
     ctx.save(), Range.foreach(spreadsheetSkeleton.rowColumnSegment, (row, col) => {
+      if (!worksheet.getRowVisible(row) || !worksheet.getColVisible(col))
+        return;
       const cellData = worksheet.getCell(row, col);
       if (cellData && cellData.dataBar) {
-        if (!worksheet.getColVisible(col) || !worksheet.getRowRawVisible(row))
-          return;
-        const { color, value, startPoint, isGradient } = cellData.dataBar, cellInfo = this.getCellIndex(row, col, rowHeightAccumulation, columnWidthAccumulation, dataMergeCache);
+        const { color, value, startPoint, isGradient } = cellData.dataBar, cellInfo = this.getCellByIndex(row, col, rowHeightAccumulation, columnWidthAccumulation, dataMergeCache);
         let { isMerged, isMergedMainCell, mergeInfo, startY, endY, startX, endX } = cellInfo;
         if (isMerged || (isMergedMainCell && (startY = mergeInfo.startY, endY = mergeInfo.endY, startX = mergeInfo.startX, endX = mergeInfo.endX), !this.isRenderDiffRangesByCell(mergeInfo, diffRanges)))
           return;
@@ -785,6 +786,7 @@ const serialTimeToTimestamp = /* @__PURE__ */ __name((value) => {
 Object.freeze(EMPTY_STYLE);
 const dataBarCellCalculateUnit = {
   type: CFRuleType.dataBar,
+  // eslint-disable-next-line max-lines-per-function
   handle: /* @__PURE__ */ __name(async (rule, context) => {
     const ruleConfig = rule.rule, conditionalFormattingFormulaService = context.accessor.get(ConditionalFormattingFormulaService), { worksheet } = context, matrix = new ObjectMatrix(), ranges = filterRange(rule.ranges, worksheet.getMaxRows() - 1, worksheet.getMaxColumns() - 1);
     ranges.forEach((range) => {
@@ -814,8 +816,8 @@ const dataBarCellCalculateUnit = {
     if (_max.status === FormulaResultStatus.WAIT)
       return conditionalFormattingFormulaService.getCache(context.unitId, context.subUnitId, rule.cfId) || computeResult;
     if (_max.status === FormulaResultStatus.SUCCESS) {
-      const v = Number(_max.result);
-      max = Number.isNaN(v) ? 0 : v;
+      const v = Number.isNaN(Number(_max.result)) ? 0 : Number(_max.result);
+      max = Math.max(v, min), min = Math.min(v, min);
     } else
       return computeResult;
     const isGradient = ruleConfig.config.isGradient, isShowValue = ruleConfig.isShowValue, getSafeValue = /* @__PURE__ */ __name((v) => Math.max(Math.min(100, v), 0), "getSafeValue");
@@ -1178,6 +1180,8 @@ let ConditionalFormattingService = (_a3 = class extends Disposable {
       configList.forEach((config) => {
         this._handleCalculateUnit(config.unitId, config.subUnitId, config.rule);
       });
+    }), this.disposeWithMe(() => {
+      this.interceptorManager.dispose();
     });
   }
   composeStyle(unitId, subUnitId, row, col) {
@@ -1440,15 +1444,17 @@ const getUnitId = /* @__PURE__ */ __name((u) => u.getCurrentUnitForType(UniverIn
       }
     }
   ] : [];
-}, "setConditionalRuleMutationUndoFactory");
+}, "setConditionalRuleMutationUndoFactory"), PLUGIN_CONFIG_KEY = "ssheets-conditional-formatting.config", defaultPluginConfig = {};
 var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
   return kind && result && __defProp2(target, key, result), result;
 }, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam"), _a4;
 let UniverSheetsConditionalFormattingPlugin = (_a4 = class extends Plugin {
-  constructor(_config, _injector, _commandService) {
-    super(), this._injector = _injector, this._commandService = _commandService, [
+  constructor(_config = defaultPluginConfig, _injector, _commandService, _configService) {
+    super(), this._config = _config, this._injector = _injector, this._commandService = _commandService, this._configService = _configService;
+    const { ...rest } = this._config;
+    this._configService.setConfig(PLUGIN_CONFIG_KEY, rest), [
       [ConditionalFormattingService],
       [ConditionalFormattingFormulaService],
       [ConditionalFormattingRuleModel],
@@ -1468,7 +1474,8 @@ let UniverSheetsConditionalFormattingPlugin = (_a4 = class extends Plugin {
 }, __name(_a4, "UniverSheetsConditionalFormattingPlugin"), __publicField(_a4, "pluginName", SHEET_CONDITIONAL_FORMATTING_PLUGIN), __publicField(_a4, "type", UniverInstanceType.UNIVER_SHEET), _a4);
 UniverSheetsConditionalFormattingPlugin = __decorateClass([
   __decorateParam(1, Inject(Injector)),
-  __decorateParam(2, Inject(ICommandService))
+  __decorateParam(2, Inject(ICommandService)),
+  __decorateParam(3, IConfigService)
 ], UniverSheetsConditionalFormattingPlugin);
 const getStringFromDataStream = /* @__PURE__ */ __name((data) => {
   var _a5;
@@ -1666,22 +1673,22 @@ const EMPTY_ICON_TYPE = "EMPTY_ICON_TYPE", IconUKey = "sheet-conditional-rule-ic
     __publicField(this, "_radius", 1);
     this._init();
   }
-  draw(ctx, parentScale, spreadsheetSkeleton, diffRanges) {
+  draw(ctx, _parentScale, spreadsheetSkeleton, diffRanges) {
     const { rowHeightAccumulation, columnWidthAccumulation, worksheet, dataMergeCache } = spreadsheetSkeleton;
     if (!worksheet)
       return !1;
     ctx.save(), Range.foreach(spreadsheetSkeleton.rowColumnSegment, (row, col) => {
+      if (!worksheet.getRowVisible(row) || !worksheet.getColVisible(col))
+        return;
       const cellData = worksheet.getCell(row, col);
       if (cellData != null && cellData.iconSet) {
-        if (!worksheet.getColVisible(col) || !worksheet.getRowRawVisible(row))
-          return;
         const { iconType, iconId } = cellData.iconSet;
         if (iconType === EMPTY_ICON_TYPE)
           return;
         const icon = this._imageMap.get(this._createKey(iconType, iconId));
         if (!icon)
           return;
-        const cellInfo = this.getCellIndex(row, col, rowHeightAccumulation, columnWidthAccumulation, dataMergeCache);
+        const cellInfo = this.getCellByIndex(row, col, rowHeightAccumulation, columnWidthAccumulation, dataMergeCache);
         let { isMerged, isMergedMainCell, mergeInfo, startY, endY, startX, endX } = cellInfo;
         if (isMerged || (isMergedMainCell && (startY = mergeInfo.startY, endY = mergeInfo.endY, startX = mergeInfo.startX, endX = mergeInfo.endX), !this.isRenderDiffRangesByCell(mergeInfo, diffRanges)))
           return;

package/lib/types/base/const.d.ts

@@ -60,6 +60,6 @@ export declare enum CFValueType {
 }
 export declare const DEFAULT_BG_COLOR = "#fff";
 export declare const DEFAULT_FONT_COLOR = "#000000";
-export declare const createDefaultRule: () => IConditionFormattingRule<import('../models/type').IConditionalFormattingRuleConfig>;
+export declare const createDefaultRule: () => IConditionFormattingRule<import('..').IConditionalFormattingRuleConfig>;
 export declare const createDefaultValue: (subType: CFSubRuleType, operator: CFTextOperator | CFNumberOperator | CFTimePeriodOperator) => 10 | "" | [number, number];
 export declare const createDefaultValueByValueType: (type: CFValueType, defaultValue?: number) => number | "" | "=";

package/lib/types/controllers/config.schema.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare const PLUGIN_CONFIG_KEY = "ssheets-conditional-formatting.config";
+export declare const configSymbol: unique symbol;
+export interface IUniverSheetsConditionalFormattingConfig {
+}
+export declare const defaultPluginConfig: IUniverSheetsConditionalFormattingConfig;

package/lib/types/plugin.d.ts

@@ -1,8 +1,11 @@
-import { ICommandService, Injector, Plugin, UniverInstanceType } from '@univerjs/core';
+import { ICommandService, IConfigService, Injector, Plugin, UniverInstanceType } from '@univerjs/core';
+import { IUniverSheetsConditionalFormattingConfig } from './controllers/config.schema';
 export declare class UniverSheetsConditionalFormattingPlugin extends Plugin {
+    private readonly _config;
     readonly _injector: Injector;
     private _commandService;
+    private readonly _configService;
     static pluginName: string;
     static type: UniverInstanceType;
-    constructor(_config: unknown, _injector: Injector, _commandService: ICommandService);
+    constructor(_config: Partial<IUniverSheetsConditionalFormattingConfig> | undefined, _injector: Injector, _commandService: ICommandService, _configService: IConfigService);
 }

package/lib/types/render/data-bar.render.d.ts

@@ -1,5 +1,5 @@
+import { SheetExtension, SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';
 import { IRange, IScale } from '@univerjs/core';
-import { SpreadsheetSkeleton, UniverRenderingContext, SheetExtension } from '@univerjs/engine-render';
 export declare const dataBarUKey = "sheet-conditional-rule-data-bar";
 export declare const defaultDataBarPositiveColor = "#ffbe38";
 export declare const defaultDataBarNativeColor = "#abd91a";
@@ -9,6 +9,6 @@ export declare class DataBar extends SheetExtension {
     uKey: string;
     Z_INDEX: number;
     _radius: number;
-    draw(ctx: UniverRenderingContext, parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges?: IRange[]): false | undefined;
+    draw(ctx: UniverRenderingContext, _parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges: IRange[]): false | undefined;
     private _drawRectWithRoundedCorner;
 }

package/lib/types/render/icon.render.d.ts

@@ -1,5 +1,5 @@
+import { SheetExtension, SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';
 import { IRange, IScale } from '@univerjs/core';
-import { SpreadsheetSkeleton, UniverRenderingContext, SheetExtension } from '@univerjs/engine-render';
 export declare const IconUKey = "sheet-conditional-rule-icon";
 export declare const DEFAULT_WIDTH = 15;
 export declare const DEFAULT_PADDING = 2;
@@ -11,7 +11,7 @@ export declare class ConditionalFormattingIcon extends SheetExtension {
     Z_INDEX: number;
     _radius: number;
     constructor();
-    draw(ctx: UniverRenderingContext, parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges?: IRange[]): false | undefined;
+    draw(ctx: UniverRenderingContext, _parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges: IRange[]): false | undefined;
     private _init;
     private _createKey;
 }

package/lib/types/services/__test__/calculate.databar.spec.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export {};

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

@@ -5,12 +5,12 @@ import { ConditionalFormattingViewModel } from '../../models/conditional-formatt
 export declare const createTestBed: (dependencies?: Dependency[]) => {
     univer: Univer;
     get: {
-        <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;
+        <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;
     };
     workbook: import('@univerjs/core').Workbook;
     unitId: string;