@univerjs/sheets-conditional-formatting 1.0.0-insiders.20260809-70eefdd → 1.0.0-rc.0

package/lib/index.js

@@ -1,4 +1,4 @@
-import { BooleanNumber, CellValueType, ColorKit, CommandType, DependentOn, Disposable, ICommandService, IConfigService, IResourceManagerService, IUndoRedoService, IUniverInstanceService, Inject, Injector, LRUMap, ObjectMatrix, Plugin, RTree, Range, Rectangle, RefAlias, Tools, UniverInstanceType, dateKit, generateRandomId, getIntersectRange, isInternalEditorID, merge, sequenceExecute, touchDependencies } from "@univerjs/core";
+import { BooleanNumber, CellValueType, ColorKit, CommandType, DateSystem, DependentOn, Disposable, ICommandService, IConfigService, IResourceManagerService, IUndoRedoService, IUniverInstanceService, Inject, Injector, LRUMap, ObjectMatrix, Plugin, RTree, Range, Rectangle, RefAlias, Tools, UniverInstanceType, dateKit, excelSerialToDateTime, generateRandomId, getIntersectRange, isInternalEditorID, merge, sequenceExecute, touchDependencies } from "@univerjs/core";
 import { CopySheetCommand, InsertColMutation, InsertRowMutation, MoveColsMutation, MoveRangeMutation, MoveRowsMutation, RemoveColMutation, RemoveRowMutation, RemoveSheetCommand, ReorderRangeMutation, SetRangeValuesMutation, SheetInterceptorService, SheetsSelectionsService, UniverSheetsPlugin, getSheetCommandTarget } from "@univerjs/sheets";
 import { BehaviorSubject, Subject } from "rxjs";
 import { BooleanValue, ERROR_TYPE_SET, FormulaResultStatus, OtherFormulaBizType, RegisterOtherFormulaService, UniverFormulaEnginePlugin } from "@univerjs/engine-formula";
@@ -1202,15 +1202,21 @@ var DataBar = class extends SheetExtension {
 		super(..._args);
 		_defineProperty(this, "_paddingRightAndLeft", 2);
 		_defineProperty(this, "_paddingTopAndBottom", 2);
+		_defineProperty(this, "_renderRangeResolver", null);
 		_defineProperty(this, "uKey", dataBarUKey);
 		_defineProperty(this, "Z_INDEX", EXTENSION_Z_INDEX$1);
 		_defineProperty(this, "_radius", 1);
 	}
+	setRenderRangeResolver(resolver) {
+		this._renderRangeResolver = resolver;
+	}
 	draw(ctx, _parentScale, spreadsheetSkeleton, diffRanges) {
 		const { worksheet } = spreadsheetSkeleton;
 		if (!worksheet) return false;
 		const mergeCellRendered = /* @__PURE__ */ new Set();
-		const renderRanges = (diffRanges === null || diffRanges === void 0 ? void 0 : diffRanges.length) ? diffRanges : [spreadsheetSkeleton.rowColumnSegment];
+		const sourceRanges = (diffRanges === null || diffRanges === void 0 ? void 0 : diffRanges.length) ? diffRanges : [spreadsheetSkeleton.rowColumnSegment];
+		const renderRanges = this._renderRangeResolver && worksheet.getMergeData().length === 0 ? this._renderRangeResolver(worksheet.getUnitId(), worksheet.getSheetId(), sourceRanges) ?? sourceRanges : sourceRanges;
+		if (!renderRanges.length) return;
 		ctx.save();
 		renderRanges.forEach((range) => {
 			Range.foreach(range, (row, col) => {
@@ -1265,6 +1271,10 @@ var DataBar = class extends SheetExtension {
 		});
 		ctx.restore();
 	}
+	dispose() {
+		this._renderRangeResolver = null;
+		super.dispose();
+	}
 	_drawRectWithRoundedCorner(ctx, x, y, width, height, topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius) {
 		const radius = this._radius;
 		if (!height || !width) return;
@@ -1628,7 +1638,7 @@ var HighlightCellCalculateUnit = class extends BaseCalculateUnit {
 				case "timePeriod": {
 					const value = getCellValue(cellValue);
 					if (isNullable(value) || Number.isNaN(Number(value)) || (cellValue === null || cellValue === void 0 ? void 0 : cellValue.t) !== CellValueType.NUMBER || !preComputingResult) return;
-					const v = serialTimeToTimestamp(Number(value));
+					const v = serialTimeToTimestamp(Number(value), context.workbook.getDateSystem());
 					const { start, end } = preComputingResult.value;
 					return v >= start && v <= end;
 				}
@@ -1799,7 +1809,9 @@ let ConditionalFormattingViewModel = class ConditionalFormattingViewModel extend
 		_defineProperty(this, "_calculateUnitManagers", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_cellCache", new LRUMap(CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH));
 		_defineProperty(this, "_markDirty$", new Subject());
+		_defineProperty(this, "_cacheClear$", new Subject());
 		_defineProperty(this, "markDirty$", this._markDirty$.asObservable());
+		_defineProperty(this, "cacheClear$", this._cacheClear$.asObservable());
 		_defineProperty(this, "_markRuleDirtyAtOnce", (unitId, subUnitId, cfId, isNeedResetPreComputingCache = true) => {
 			this._cellCache.clear();
 			if (isNeedResetPreComputingCache) {
@@ -1885,6 +1897,7 @@ let ConditionalFormattingViewModel = class ConditionalFormattingViewModel extend
 	clearCache() {
 		this._calculateUnitManagers.clear();
 		this._cellCache.clear();
+		this._cacheClear$.next();
 	}
 	_handleCustomFormulasSeparately() {
 		this.disposeWithMe(this._conditionalFormattingRuleModel.$ruleChange.subscribe((e) => {
@@ -1998,54 +2011,10 @@ const getCellValue = (cell) => {
 	const dataStream = (_cell$p = cell.p) === null || _cell$p === void 0 || (_cell$p = _cell$p.body) === null || _cell$p === void 0 ? void 0 : _cell$p.dataStream.replace(/\r\n$/, "");
 	return !isNullable(v) ? v : !isNullable(dataStream) ? dataStream : null;
 };
-const DAY_SIZE = 86400;
-function toYMD_1900(ord, leap1900 = true) {
-	if (leap1900 && ord >= 0) {
-		if (ord === 0) return [
-			1900,
-			1,
-			0
-		];
-		if (ord === 60) return [
-			1900,
-			2,
-			29
-		];
-		if (ord < 60) return [
-			1900,
-			ord < 32 ? 1 : 2,
-			(ord - 1) % 31 + 1
-		];
-	}
-	let l = ord + 68569 + 2415019;
-	const n = Math.floor(4 * l / 146097);
-	l = l - Math.floor((146097 * n + 3) / 4);
-	const i = Math.floor(4e3 * (l + 1) / 1461001);
-	l = l - Math.floor(1461 * i / 4) + 31;
-	const j = Math.floor(80 * l / 2447);
-	const nDay = l - Math.floor(2447 * j / 80);
-	l = Math.floor(j / 11);
-	const nMonth = j + 2 - 12 * l;
-	return [
-		100 * (n - 49) + i + l | 0,
-		nMonth | 0,
-		nDay | 0
-	];
-}
-const serialTimeToTimestamp = (value) => {
-	let date = value | 0;
-	const t = DAY_SIZE * (value - date);
-	let time = Math.floor(t);
-	if (t - time > .9999) {
-		time += 1;
-		if (time === DAY_SIZE) {
-			time = 0;
-			date += 1;
-		}
-	}
-	const x = time < 0 ? DAY_SIZE + time : time;
-	const [y, m, d] = toYMD_1900(value, true);
-	return dateKit(`${y}/${m}/${d} ${Math.floor(x / 60 / 60) % 60}:${Math.floor(x / 60) % 60}:${Math.floor(x) % 60}`).valueOf();
+const serialTimeToTimestamp = (value, dateSystem = DateSystem.Date1900) => {
+	const utcDate = excelSerialToDateTime(value, dateSystem);
+	if (Number.isNaN(utcDate.getTime())) return NaN;
+	return new Date(utcDate.getUTCFullYear(), utcDate.getUTCMonth(), utcDate.getUTCDate(), utcDate.getUTCHours(), utcDate.getUTCMinutes(), utcDate.getUTCSeconds(), utcDate.getUTCMilliseconds()).getTime();
 };
 const getValueByType = (value, matrix, context) => {
 	switch (value.type) {
@@ -2542,7 +2511,7 @@ for (const key in iconMap) {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-conditional-formatting";
-var version = "1.0.0-insiders.20260809-70eefdd";
+var version = "1.0.0-rc.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -2567,14 +2536,28 @@ const defaultPluginConfig = {};
 
 //#endregion
 //#region src/services/conditional-formatting-style-composer.service.ts
-let ConditionalFormattingStyleComposer = class ConditionalFormattingStyleComposer {
+let ConditionalFormattingStyleComposer = class ConditionalFormattingStyleComposer extends Disposable {
 	constructor(_conditionalFormattingRuleModel, _conditionalFormattingViewModel) {
+		super();
 		this._conditionalFormattingRuleModel = _conditionalFormattingRuleModel;
 		this._conditionalFormattingViewModel = _conditionalFormattingViewModel;
+		_defineProperty(this, "_cache", new LRUMap(CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH));
+		this.disposeWithMe(this._conditionalFormattingRuleModel.$ruleChange.subscribe(() => this._cache.clear()));
+		this.disposeWithMe(this._conditionalFormattingViewModel.markDirty$.subscribe(() => this._cache.clear()));
+		this.disposeWithMe(this._conditionalFormattingViewModel.cacheClear$.subscribe(() => this._cache.clear()));
+	}
+	dispose() {
+		this._cache.clear();
+		super.dispose();
 	}
 	composeStyle(unitId, subUnitId, row, col) {
+		const cacheKey = `${unitId}_${subUnitId}_${row}_${col}`;
+		if (this._cache.has(cacheKey)) return this._cache.get(cacheKey) ?? null;
 		const cellCfs = this._conditionalFormattingViewModel.getCellCfs(unitId, subUnitId, row, col);
-		if (!(cellCfs === null || cellCfs === void 0 ? void 0 : cellCfs.length)) return null;
+		if (!(cellCfs === null || cellCfs === void 0 ? void 0 : cellCfs.length)) {
+			this._cache.set(cacheKey, null);
+			return null;
+		}
 		const matchedRules = [];
 		let stopIfTrueIndex = -1;
 		for (const cacheItem of cellCfs) {
@@ -2586,13 +2569,17 @@ let ConditionalFormattingStyleComposer = class ConditionalFormattingStyleCompose
 			});
 			if (stopIfTrueIndex === -1 && rule.stopIfTrue && this._isRuleMatched(rule, cacheItem.result)) stopIfTrueIndex = matchedRules.length - 1;
 		}
-		if (!matchedRules.length) return null;
+		if (!matchedRules.length) {
+			this._cache.set(cacheKey, null);
+			return null;
+		}
 		const effectiveRules = stopIfTrueIndex > -1 ? matchedRules.slice(0, stopIfTrueIndex + 1) : matchedRules;
 		const result = {};
 		for (let i = effectiveRules.length - 1; i >= 0; i--) {
 			const { rule, cacheItem } = effectiveRules[i];
 			this._mergeComposeResult(result, rule, cacheItem.result);
 		}
+		this._cache.set(cacheKey, result);
 		return result;
 	}
 	_mergeComposeResult(result, rule, ruleResult) {
@@ -2956,16 +2943,22 @@ var ConditionalFormattingIcon = class extends SheetExtension {
 		_defineProperty(this, "_paddingRightAndLeft", 2);
 		_defineProperty(this, "_width", 15);
 		_defineProperty(this, "_imageMap", /* @__PURE__ */ new Map());
+		_defineProperty(this, "_renderRangeResolver", null);
 		_defineProperty(this, "uKey", IconUKey);
 		_defineProperty(this, "Z_INDEX", EXTENSION_Z_INDEX);
 		_defineProperty(this, "_radius", 1);
 		this._init();
 	}
+	setRenderRangeResolver(resolver) {
+		this._renderRangeResolver = resolver;
+	}
 	draw(ctx, _parentScale, spreadsheetSkeleton, diffRanges) {
 		const { worksheet } = spreadsheetSkeleton;
 		if (!worksheet) return false;
 		const mergeCellRendered = /* @__PURE__ */ new Set();
-		const renderRanges = (diffRanges === null || diffRanges === void 0 ? void 0 : diffRanges.length) ? diffRanges : [spreadsheetSkeleton.rowColumnSegment];
+		const sourceRanges = (diffRanges === null || diffRanges === void 0 ? void 0 : diffRanges.length) ? diffRanges : [spreadsheetSkeleton.rowColumnSegment];
+		const renderRanges = this._renderRangeResolver && worksheet.getMergeData().length === 0 ? this._renderRangeResolver(worksheet.getUnitId(), worksheet.getSheetId(), sourceRanges) ?? sourceRanges : sourceRanges;
+		if (!renderRanges.length) return;
 		ctx.save();
 		renderRanges.forEach((range) => {
 			Range.foreach(range, (row, col) => {
@@ -2995,6 +2988,10 @@ var ConditionalFormattingIcon = class extends SheetExtension {
 		});
 		ctx.restore();
 	}
+	dispose() {
+		this._renderRangeResolver = null;
+		super.dispose();
+	}
 	_init() {
 		for (const type in iconMap) iconMap[type].forEach((base64, index) => {
 			const key = this._createKey(type, String(index));
@@ -3039,4 +3036,4 @@ function removeUndefinedAttr(obj) {
 }
 
 //#endregion
-export { AddCfCommand, AddConditionalRuleMutation, AddConditionalRuleMutationUndoFactory, CFNumberOperator, CFRuleType, CFSubRuleType, CFTextOperator, CFTimePeriodOperator, CFValueType, CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH, ClearRangeCfCommand, ClearWorksheetCfCommand, ConditionalFormattingFormulaService, ConditionalFormattingIcon, ConditionalFormattingRangeIndexModel, ConditionalFormattingRangeTransformService, ConditionalFormattingRuleModel, ConditionalFormattingService, ConditionalFormattingStyleComposer, ConditionalFormattingViewModel, DEFAULT_BG_COLOR, DEFAULT_FONT_COLOR, DEFAULT_PADDING, DEFAULT_WIDTH, DataBar, DeleteCfCommand, DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, IIconSetType, IconUKey, MoveCfCommand, MoveConditionalRuleMutation, MoveConditionalRuleMutationUndoFactory, SHEET_CONDITIONAL_FORMATTING_PLUGIN, SetCfCommand, SetConditionalRuleMutation, UniverSheetsConditionalFormattingPlugin, anchorUndoFactory, compareWithNumber, createCfId, createDefaultRule, createDefaultValue, createDefaultValueByValueType, dataBarUKey, defaultDataBarNativeColor, defaultDataBarPositiveColor, defaultPlaceholderColor, filterRange, findIndexByAnchor, getCacheStyleMatrix, getCellValue, getColorScaleFromValue, getMaxInFormulaResult, getOppositeOperator, getValueByType, iconGroup, iconMap, isAnchorEqual, isFloatsEqual, isNullable, moveByAnchor, removeUndefinedAttr, serialTimeToTimestamp, setConditionalRuleMutationUndoFactory, toYMD_1900, transformSupportSymmetryAnchor };
+export { AddCfCommand, AddConditionalRuleMutation, AddConditionalRuleMutationUndoFactory, CFNumberOperator, CFRuleType, CFSubRuleType, CFTextOperator, CFTimePeriodOperator, CFValueType, CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH, ClearRangeCfCommand, ClearWorksheetCfCommand, ConditionalFormattingFormulaService, ConditionalFormattingIcon, ConditionalFormattingRangeIndexModel, ConditionalFormattingRangeTransformService, ConditionalFormattingRuleModel, ConditionalFormattingService, ConditionalFormattingStyleComposer, ConditionalFormattingViewModel, DEFAULT_BG_COLOR, DEFAULT_FONT_COLOR, DEFAULT_PADDING, DEFAULT_WIDTH, DataBar, DeleteCfCommand, DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, IIconSetType, IconUKey, MoveCfCommand, MoveConditionalRuleMutation, MoveConditionalRuleMutationUndoFactory, SHEET_CONDITIONAL_FORMATTING_PLUGIN, SetCfCommand, SetConditionalRuleMutation, UniverSheetsConditionalFormattingPlugin, anchorUndoFactory, compareWithNumber, createCfId, createDefaultRule, createDefaultValue, createDefaultValueByValueType, dataBarUKey, defaultDataBarNativeColor, defaultDataBarPositiveColor, defaultPlaceholderColor, filterRange, findIndexByAnchor, getCacheStyleMatrix, getCellValue, getColorScaleFromValue, getMaxInFormulaResult, getOppositeOperator, getValueByType, iconGroup, iconMap, isAnchorEqual, isFloatsEqual, isNullable, moveByAnchor, removeUndefinedAttr, serialTimeToTimestamp, setConditionalRuleMutationUndoFactory, transformSupportSymmetryAnchor };

package/lib/types/models/calculate-unit-v2/utils.d.ts

@@ -16,14 +16,13 @@
 import type { CellValue, ICellData, IObjectMatrixPrimitiveType, IRange, Nullable } from '@univerjs/core';
 import type { IConditionFormattingRule, IValueConfig } from '../type';
 import type { IContext } from './base-calculate-unit';
-import { ColorKit, ObjectMatrix } from '@univerjs/core';
+import { ColorKit, DateSystem, ObjectMatrix } from '@univerjs/core';
 import { FormulaResultStatus } from '@univerjs/engine-formula';
 import { CFNumberOperator } from '../../base/const';
 export declare function isFloatsEqual(a: number, b: number): boolean;
 export declare const isNullable: (v: Nullable<CellValue>) => boolean;
 export declare const getCellValue: (cell?: ICellData) => Nullable<CellValue>;
-export declare function toYMD_1900(ord: number, leap1900?: boolean): number[];
-export declare const serialTimeToTimestamp: (value: number) => number;
+export declare const serialTimeToTimestamp: (value: number, dateSystem?: DateSystem) => number;
 export declare const getValueByType: (value: IValueConfig, matrix: ObjectMatrix<number>, context: IContext & {
     cfId: string;
 }) => {

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

@@ -30,6 +30,7 @@ export declare class ConditionalFormattingViewModel extends Disposable {
      */
     private _cellCache;
     private _markDirty$;
+    private _cacheClear$;
     /**
      * The rendering layer listens to this variable to determine whether a reRender is necessary.
      * @memberof ConditionalFormattingViewModel
@@ -40,6 +41,7 @@ export declare class ConditionalFormattingViewModel extends Disposable {
         subUnitId: string;
         isImmediately?: boolean;
     }>;
+    cacheClear$: import("rxjs").Observable<void>;
     constructor(_injector: Injector, _conditionalFormattingRuleModel: ConditionalFormattingRuleModel, _conditionalFormattingRangeIndexModel: ConditionalFormattingRangeIndexModel, _conditionalFormattingFormulaService: ConditionalFormattingFormulaService, _univerInstanceService: IUniverInstanceService);
     private _initCFFormulaListener;
     getCellCfs(unitId: string, subUnitId: string, row: number, col: number): {

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

@@ -15,6 +15,7 @@
  */
 import type { IRange, IScale } from '@univerjs/core';
 import type { SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';
+import type { IConditionalFormattingRenderRangeResolver } from './type';
 import { SheetExtension } from '@univerjs/engine-render';
 export declare const dataBarUKey = "sheet-conditional-rule-data-bar";
 export declare const defaultDataBarPositiveColor = "#ffbe38";
@@ -23,9 +24,12 @@ export declare const defaultPlaceholderColor = "#000";
 export declare class DataBar extends SheetExtension {
     private _paddingRightAndLeft;
     private _paddingTopAndBottom;
+    private _renderRangeResolver;
     uKey: string;
     Z_INDEX: number;
     _radius: number;
+    setRenderRangeResolver(resolver: IConditionalFormattingRenderRangeResolver | null): void;
     draw(ctx: UniverRenderingContext, _parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges: IRange[]): false | undefined;
+    dispose(): void;
     private _drawRectWithRoundedCorner;
 }

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

@@ -15,6 +15,7 @@
  */
 import type { IRange, IScale } from '@univerjs/core';
 import type { SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';
+import type { IConditionalFormattingRenderRangeResolver } from './type';
 import { SheetExtension } from '@univerjs/engine-render';
 export declare const IconUKey = "sheet-conditional-rule-icon";
 export declare const DEFAULT_WIDTH = 15;
@@ -23,11 +24,14 @@ export declare class ConditionalFormattingIcon extends SheetExtension {
     private _paddingRightAndLeft;
     private _width;
     private _imageMap;
+    private _renderRangeResolver;
     uKey: string;
     Z_INDEX: number;
     _radius: number;
     constructor();
+    setRenderRangeResolver(resolver: IConditionalFormattingRenderRangeResolver | null): void;
     draw(ctx: UniverRenderingContext, _parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges: IRange[]): false | undefined;
+    dispose(): void;
     private _init;
     private _createKey;
 }

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

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ICellData } from '@univerjs/core';
+import type { ICellData, IRange } from '@univerjs/core';
 import type { IIconSetType } from '../models/icon-map';
+export type IConditionalFormattingRenderRangeResolver = (unitId: string, subUnitId: string, ranges: IRange[]) => IRange[] | null;
 export interface IDataBarRenderParams {
     color: string;
     value: number;

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

@@ -15,17 +15,22 @@
  */
 import type { IHighlightCell } from '../models/type';
 import type { IDataBarCellData, IIconSetCellData } from '../render/type';
+import { Disposable } from '@univerjs/core';
 import { ConditionalFormattingRuleModel } from '../models/conditional-formatting-rule-model';
 import { ConditionalFormattingViewModel } from '../models/conditional-formatting-view-model';
-export declare class ConditionalFormattingStyleComposer {
+type IComposedStyle = {
+    style?: IHighlightCell['style'];
+} & IDataBarCellData & IIconSetCellData & {
+    isShowValue: boolean;
+};
+export declare class ConditionalFormattingStyleComposer extends Disposable {
     private _conditionalFormattingRuleModel;
     private _conditionalFormattingViewModel;
+    private _cache;
     constructor(_conditionalFormattingRuleModel: ConditionalFormattingRuleModel, _conditionalFormattingViewModel: ConditionalFormattingViewModel);
-    composeStyle(unitId: string, subUnitId: string, row: number, col: number): ({
-        style?: IHighlightCell["style"];
-    } & IDataBarCellData & IIconSetCellData & {
-        isShowValue: boolean;
-    }) | null;
+    dispose(): void;
+    composeStyle(unitId: string, subUnitId: string, row: number, col: number): IComposedStyle | null;
     private _mergeComposeResult;
     private _isRuleMatched;
 }
+export {};