@univerjs/sheets-conditional-formatting 0.2.12 → 0.2.14

package/lib/es/index.js

@@ -571,11 +571,11 @@ const dataBarUKey = "sheet-conditional-rule-data-bar", defaultDataBarPositiveCol
     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;
@@ -1678,17 +1678,17 @@ const EMPTY_ICON_TYPE = "EMPTY_ICON_TYPE", IconUKey = "sheet-conditional-rule-ic
     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/plugin.d.ts

@@ -7,5 +7,5 @@ export declare class UniverSheetsConditionalFormattingPlugin extends Plugin {
     private readonly _configService;
     static pluginName: string;
     static type: UniverInstanceType;
-    constructor(_config: Partial<IUniverSheetsConditionalFormattingConfig>, _injector: Injector, _commandService: ICommandService, _configService: IConfigService);
+    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";

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;

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;