@univerjs/sheets-conditional-formatting 1.0.0-rc.0 → 1.0.1

package/lib/es/index.js

@@ -144,9 +144,7 @@ const moveByAnchor = (start, end, ruleList, get) => {
 			ruleList.splice(endIndex + 1, 0, rule);
 			break;
 		case "self":
-		case "after":
-			ruleList.splice(endIndex, 0, rule);
-			break;
+		case "after": ruleList.splice(endIndex, 0, rule);
 	}
 };
 /**
@@ -220,7 +218,7 @@ const isAnchorEqual = (anchor1, anchor2) => {
 const createCfId = () => `${generateRandomId(8)}`;
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -231,7 +229,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -244,14 +242,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -485,7 +483,8 @@ const AddCfCommand = {
 		const undoRedoService = accessor.get(IUndoRedoService);
 		const commandService = accessor.get(ICommandService);
 		const conditionalFormattingRuleModel = accessor.get(ConditionalFormattingRuleModel);
-		const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { unitId, subUnitId } = target;
 		const cfId = conditionalFormattingRuleModel.createCfId(unitId, subUnitId);
@@ -512,7 +511,7 @@ const AddCfCommand = {
 };
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -520,7 +519,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -791,7 +790,8 @@ const DeleteCfCommand = {
 		if (!params) return false;
 		const undoRedoService = accessor.get(IUndoRedoService);
 		const commandService = accessor.get(ICommandService);
-		const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { unitId, subUnitId } = target;
 		const config = {
@@ -859,7 +859,8 @@ const SetCfCommand = {
 		if (!params) return false;
 		const undoRedoService = accessor.get(IUndoRedoService);
 		const commandService = accessor.get(ICommandService);
-		const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), params);
+		const univerInstanceService = accessor.get(IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { unitId, subUnitId } = target;
 		const config = {
@@ -882,13 +883,43 @@ const SetCfCommand = {
 	}
 };
 
+//#endregion
+//#region src/utils/range.ts
+function getRangeInWorksheet(range, worksheet) {
+	const maxRows = worksheet.getMaxRows();
+	const maxColumns = worksheet.getMaxColumns();
+	if (maxRows <= 0 || maxColumns <= 0) return null;
+	const effectiveRange = getIntersectRange(Range.transformRange(range, worksheet), {
+		startRow: 0,
+		endRow: maxRows - 1,
+		startColumn: 0,
+		endColumn: maxColumns - 1
+	});
+	if (!effectiveRange) return null;
+	return {
+		startRow: effectiveRange.startRow,
+		endRow: effectiveRange.endRow,
+		startColumn: effectiveRange.startColumn,
+		endColumn: effectiveRange.endColumn
+	};
+}
+function getRangesInWorksheet(ranges, worksheet) {
+	const effectiveRanges = [];
+	ranges.forEach((range) => {
+		const effectiveRange = getRangeInWorksheet(range, worksheet);
+		if (effectiveRange) effectiveRanges.push(effectiveRange);
+	});
+	return effectiveRanges;
+}
+
 //#endregion
 //#region src/services/conditional-formatting-formula.service.ts
 let ConditionalFormattingFormulaService = class ConditionalFormattingFormulaService extends Disposable {
-	constructor(_registerOtherFormulaService, _conditionalFormattingRuleModel) {
+	constructor(_registerOtherFormulaService, _conditionalFormattingRuleModel, _univerInstanceService) {
 		super();
 		this._registerOtherFormulaService = _registerOtherFormulaService;
 		this._conditionalFormattingRuleModel = _conditionalFormattingRuleModel;
+		this._univerInstanceService = _univerInstanceService;
 		_defineProperty(this, "_formulaMap", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_result$", new Subject());
 		_defineProperty(this, "result$", this._result$.asObservable());
@@ -917,12 +948,10 @@ let ConditionalFormattingFormulaService = class ConditionalFormattingFormulaServ
 	*/
 	_registerRuleFormulas(unitId, subUnitId, rule) {
 		switch (rule.rule.type) {
-			case "highlightCell":
-				if (rule.rule.subType === "formula") {
-					const formulaText = rule.rule.value;
-					if (formulaText) this.registerFormulaWithRange(unitId, subUnitId, rule.cfId, formulaText, rule.ranges);
-				}
-				break;
+			case "highlightCell": if (rule.rule.subType === "formula") {
+				const formulaText = rule.rule.value;
+				if (formulaText) this.registerFormulaWithRange(unitId, subUnitId, rule.cfId, formulaText, rule.ranges);
+			}
 		}
 	}
 	_initFormulaResultChange() {
@@ -967,10 +996,15 @@ let ConditionalFormattingFormulaService = class ConditionalFormattingFormulaServ
 		startColumn: 0,
 		endColumn: 0
 	}]) {
+		var _this$_univerInstance;
 		const formulaMap = this._ensureSubunitFormulaMap(unitId, subUnitId);
 		const cfFormulaId = this.createCFormulaId(cfId, formulaText);
 		if (formulaMap.getValue(cfFormulaId, ["id"])) return;
-		const sortedRanges = [...ranges].sort((a, b) => a.startRow !== b.startRow ? a.startRow - b.startRow : a.startColumn - b.startColumn);
+		const worksheet = (_this$_univerInstance = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getSheetBySheetId(subUnitId);
+		if (!worksheet) return;
+		const effectiveRanges = getRangesInWorksheet(ranges, worksheet);
+		if (!effectiveRanges.length) return;
+		const sortedRanges = effectiveRanges.sort((a, b) => a.startRow !== b.startRow ? a.startRow - b.startRow : a.startColumn - b.startColumn);
 		const formulaId = this._registerOtherFormulaService.registerFormulaWithRange(unitId, subUnitId, formulaText, sortedRanges, void 0, OtherFormulaBizType.CONDITIONAL_FORMATTING, cfId);
 		formulaMap.addValue({
 			formulaText,
@@ -1057,7 +1091,11 @@ let ConditionalFormattingFormulaService = class ConditionalFormattingFormulaServ
 		return `${cfId}_${formulaText}`;
 	}
 };
-ConditionalFormattingFormulaService = __decorate([__decorateParam(0, Inject(RegisterOtherFormulaService)), __decorateParam(1, Inject(ConditionalFormattingRuleModel))], ConditionalFormattingFormulaService);
+ConditionalFormattingFormulaService = __decorate([
+	__decorateParam(0, Inject(RegisterOtherFormulaService)),
+	__decorateParam(1, Inject(ConditionalFormattingRuleModel)),
+	__decorateParam(2, IUniverInstanceService)
+], ConditionalFormattingFormulaService);
 
 //#endregion
 //#region src/models/calculate-unit-v2/base-calculate-unit.ts
@@ -1388,28 +1426,29 @@ var DataBarCalculateUnit = class extends BaseCalculateUnit {
 				isGradient,
 				isShowValue
 			};
-		} else if (min < 0 && max > 0) if (value > 0) {
-			const v = getSafeValue(Math.min(value / max, 1) * 100);
-			if (v === 0) return;
-			return {
-				color: ruleConfig.config.positiveColor || "#ffbe38",
-				startPoint,
-				value: v,
-				isGradient,
-				isShowValue
-			};
-		} else {
-			const v = getSafeValue(Math.min(Math.abs(value) / Math.abs(min), 1) * 100);
-			if (v === 0) return;
-			return {
-				color: ruleConfig.config.nativeColor || "#abd91a",
-				startPoint,
-				value: -v,
-				isGradient,
-				isShowValue
-			};
-		}
-		else if (min >= 0 && max > 0) {
+		} else if (min < 0 && max > 0) {
+			if (value > 0) {
+				const v = getSafeValue(Math.min(value / max, 1) * 100);
+				if (v === 0) return;
+				return {
+					color: ruleConfig.config.positiveColor || "#ffbe38",
+					startPoint,
+					value: v,
+					isGradient,
+					isShowValue
+				};
+			} else {
+				const v = getSafeValue(Math.min(Math.abs(value) / Math.abs(min), 1) * 100);
+				if (v === 0) return;
+				return {
+					color: ruleConfig.config.nativeColor || "#abd91a",
+					startPoint,
+					value: -v,
+					isGradient,
+					isShowValue
+				};
+			}
+		} else if (min >= 0 && max > 0) {
 			const length = max - min;
 			const startPoint = 0;
 			const v = getSafeValue((1 - (max - value) / length) * 100);
@@ -1461,7 +1500,8 @@ var HighlightCellCalculateUnit = class extends BaseCalculateUnit {
 					const cacheMap = /* @__PURE__ */ new Map();
 					ranges.forEach((range) => {
 						Range.foreach(range, (row, col) => {
-							const v = getCellValue(context.getCellValue(row, col));
+							const cell = context.getCellValue(row, col);
+							const v = getCellValue(cell);
 							if (!isNullable(v)) {
 								const cache = cacheMap.get(v);
 								if (cache) cacheMap.set(v, cache + 1);
@@ -1603,18 +1643,19 @@ var HighlightCellCalculateUnit = class extends BaseCalculateUnit {
 		const run = () => {
 			switch (ruleConfig.subType) {
 				case "number": {
-					const v = cellValue && Number(cellValue.v);
-					const isNumber = (cellValue === null || cellValue === void 0 ? void 0 : cellValue.t) === CellValueType.NUMBER;
 					const subRuleConfig = ruleConfig;
-					if (!isNumber) {
-						if (["notEqual", "notBetween"].includes(subRuleConfig.operator)) return true;
-						return false;
-					}
-					if (isNullable(v) || Number.isNaN(v)) return;
+					const value = cellValue === null || cellValue === void 0 ? void 0 : cellValue.v;
+					if ((cellValue === null || cellValue === void 0 ? void 0 : cellValue.t) !== CellValueType.FORCE_STRING && ERROR_TYPE_SET.has(value)) return false;
+					if (value != null && ((cellValue === null || cellValue === void 0 ? void 0 : cellValue.t) === CellValueType.BOOLEAN || (cellValue === null || cellValue === void 0 ? void 0 : cellValue.t) !== CellValueType.NUMBER && typeof value !== "number")) return [
+						"notEqual",
+						"notBetween",
+						"greaterThan",
+						"greaterThanOrEqual"
+					].includes(subRuleConfig.operator);
 					return compareWithNumber({
 						operator: subRuleConfig.operator,
-						value: subRuleConfig.value || 0
-					}, v || 0);
+						value: subRuleConfig.value ?? 0
+					}, Number(value ?? 0));
 				}
 				case "text": {
 					const subRuleConfig = ruleConfig;
@@ -1797,7 +1838,7 @@ var IconSetCalculateUnit = class extends BaseCalculateUnit {
 
 //#endregion
 //#region src/models/conditional-formatting-view-model.ts
-const CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH = 1e3 * 3 * 3;
+const CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH = 9e3;
 let ConditionalFormattingViewModel = class ConditionalFormattingViewModel extends Disposable {
 	constructor(_injector, _conditionalFormattingRuleModel, _conditionalFormattingRangeIndexModel, _conditionalFormattingFormulaService, _univerInstanceService) {
 		super();
@@ -2090,7 +2131,7 @@ const getCacheStyleMatrix = (unitId, subUnitId, rule, context) => {
 	const { accessor } = context;
 	const conditionalFormattingViewModel = accessor.get(ConditionalFormattingViewModel);
 	const matrix = new ObjectMatrix();
-	rule.ranges.forEach((range) => {
+	getRangesInWorksheet(rule.ranges, context.worksheet).forEach((range) => {
 		Range.foreach(range, (row, col) => {
 			const cellCfItem = conditionalFormattingViewModel.getCellCfs(unitId, subUnitId, row, col);
 			if (cellCfItem) {
@@ -2152,7 +2193,7 @@ const getColorScaleFromValue = (colorList, value) => {
 			const maxRgb = prefixRgba(maxItem.color.toRgb());
 			const length = maxItem.value - minItem.value;
 			const v = (value - minItem.value) / length;
-			return new ColorKit([
+			const rgbResult = [
 				"r",
 				"g",
 				"b",
@@ -2161,16 +2202,20 @@ const getColorScaleFromValue = (colorList, value) => {
 				const minV = minRgb[key];
 				obj[key] = (maxRgb[key] - minV) * v + minV;
 				return obj;
-			}, {})).toRgbString();
+			}, {});
+			return new ColorKit(rgbResult).toRgbString();
 		}
 	} else return colorList[colorList.length - 1].color.toRgbString();
 };
 const filterRange = (ranges, maxRow, maxCol) => {
 	return ranges.map((range) => {
-		if (range.startColumn > maxCol || range.startRow > maxRow) return null;
+		if (range.startColumn > maxCol || range.startRow > maxRow || range.endColumn < 0 || range.endRow < 0) return null;
 		const _range = { ...range };
+		_range.startRow = Math.max(_range.startRow, 0);
+		_range.startColumn = Math.max(_range.startColumn, 0);
 		_range.endRow = Math.min(_range.endRow, maxRow);
 		_range.endColumn = Math.min(_range.endColumn, maxCol);
+		if (_range.startRow > _range.endRow || _range.startColumn > _range.endColumn) return null;
 		return _range;
 	}).filter((range) => !!range);
 };
@@ -2511,7 +2556,7 @@ for (const key in iconMap) {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-conditional-formatting";
-var version = "1.0.0-rc.0";
+var version = "1.0.1";
 
 //#endregion
 //#region src/config/config.ts

package/lib/facade.js

@@ -3,7 +3,7 @@ import { AddCfCommand, CFNumberOperator, CFRuleType, CFSubRuleType, CFTextOperat
 import { FRange, FWorksheet } from "@univerjs/sheets/facade";
 import { FEnum } from "@univerjs/core/facade";
 
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -14,7 +14,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -27,14 +27,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -409,11 +409,13 @@ var ConditionalFormatHighlightRuleBuilder = class ConditionalFormatHighlightRule
 	*/
 	setBackground(color) {
 		var _this$_ruleConfig;
-		if (((_this$_ruleConfig = this._ruleConfig) === null || _this$_ruleConfig === void 0 ? void 0 : _this$_ruleConfig.type) === CFRuleType.highlightCell) if (color) {
-			this._ensureAttr(this._ruleConfig, ["style", "bg"]);
-			const colorKit = new ColorKit(color);
-			this._ruleConfig.style.bg.rgb = colorKit.toRgbString();
-		} else delete this._ruleConfig.style.bg;
+		if (((_this$_ruleConfig = this._ruleConfig) === null || _this$_ruleConfig === void 0 ? void 0 : _this$_ruleConfig.type) === CFRuleType.highlightCell) {
+			if (color) {
+				this._ensureAttr(this._ruleConfig, ["style", "bg"]);
+				const colorKit = new ColorKit(color);
+				this._ruleConfig.style.bg.rgb = colorKit.toRgbString();
+			} else delete this._ruleConfig.style.bg;
+		}
 		return this;
 	}
 	/**
@@ -466,11 +468,13 @@ var ConditionalFormatHighlightRuleBuilder = class ConditionalFormatHighlightRule
 	*/
 	setFontColor(color) {
 		var _this$_ruleConfig3;
-		if (((_this$_ruleConfig3 = this._ruleConfig) === null || _this$_ruleConfig3 === void 0 ? void 0 : _this$_ruleConfig3.type) === CFRuleType.highlightCell) if (color) {
-			const colorKit = new ColorKit(color);
-			this._ensureAttr(this._ruleConfig, ["style", "cl"]);
-			this._ruleConfig.style.cl.rgb = colorKit.toRgbString();
-		} else delete this._ruleConfig.style.cl;
+		if (((_this$_ruleConfig3 = this._ruleConfig) === null || _this$_ruleConfig3 === void 0 ? void 0 : _this$_ruleConfig3.type) === CFRuleType.highlightCell) {
+			if (color) {
+				const colorKit = new ColorKit(color);
+				this._ensureAttr(this._ruleConfig, ["style", "cl"]);
+				this._ruleConfig.style.cl.rgb = colorKit.toRgbString();
+			} else delete this._ruleConfig.style.cl;
+		}
 		return this;
 	}
 	/**