@univerjs/sheets-conditional-formatting 1.0.0-alpha.7 → 1.0.0-beta.0

package/lib/cjs/facade.js

@@ -4,7 +4,7 @@ let _univerjs_sheets_conditional_formatting = require("@univerjs/sheets-conditio
 let _univerjs_sheets_facade = require("@univerjs/sheets/facade");
 let _univerjs_core_facade = require("@univerjs/core/facade");
 
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -15,7 +15,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -28,14 +28,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.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.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -2117,50 +2117,6 @@ var FRangeSheetsConditionalFormattingMixin = class extends _univerjs_sheets_faca
 	createConditionalFormattingRule() {
 		return new FConditionalFormattingBuilder({ ranges: [this._range] });
 	}
-	addConditionalFormattingRule(rule) {
-		const params = {
-			unitId: this._workbook.getUnitId(),
-			subUnitId: this._worksheet.getSheetId(),
-			rule
-		};
-		this._commandService.syncExecuteCommand(_univerjs_sheets_conditional_formatting.AddCfCommand.id, params);
-		return this;
-	}
-	deleteConditionalFormattingRule(cfId) {
-		const params = {
-			unitId: this._workbook.getUnitId(),
-			subUnitId: this._worksheet.getSheetId(),
-			cfId
-		};
-		this._commandService.syncExecuteCommand(_univerjs_sheets_conditional_formatting.DeleteCfCommand.id, params);
-		return this;
-	}
-	moveConditionalFormattingRule(cfId, toCfId, type = "after") {
-		const params = {
-			unitId: this._workbook.getUnitId(),
-			subUnitId: this._worksheet.getSheetId(),
-			start: {
-				id: cfId,
-				type: "self"
-			},
-			end: {
-				id: toCfId,
-				type
-			}
-		};
-		this._commandService.syncExecuteCommand(_univerjs_sheets_conditional_formatting.MoveCfCommand.id, params);
-		return this;
-	}
-	setConditionalFormattingRule(cfId, rule) {
-		const params = {
-			unitId: this._workbook.getUnitId(),
-			subUnitId: this._worksheet.getSheetId(),
-			rule,
-			cfId
-		};
-		this._commandService.syncExecuteCommand(_univerjs_sheets_conditional_formatting.SetCfCommand.id, params);
-		return this;
-	}
 	clearConditionalFormatRules() {
 		const params = {
 			unitId: this._workbook.getUnitId(),
@@ -2182,9 +2138,6 @@ var FWorksheetConditionalFormattingMixin = class extends _univerjs_sheets_facade
 	getConditionalFormattingRules() {
 		return [...this._getConditionalFormattingRuleModel().getSubunitRules(this._workbook.getUnitId(), this._worksheet.getSheetId()) || []];
 	}
-	createConditionalFormattingRule() {
-		return new FConditionalFormattingBuilder();
-	}
 	newConditionalFormattingRule() {
 		return new FConditionalFormattingBuilder();
 	}

package/lib/cjs/index.js

@@ -221,7 +221,7 @@ const isAnchorEqual = (anchor1, anchor2) => {
 const createCfId = () => `${(0, _univerjs_core.generateRandomId)(8)}`;
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -232,7 +232,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -245,14 +245,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.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.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -513,7 +513,7 @@ const AddCfCommand = {
 };
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -521,7 +521,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.140.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);
@@ -557,9 +557,8 @@ let ConditionalFormattingRangeIndexModel = class ConditionalFormattingRangeIndex
 		return new Set(Array.from(ids).map((id) => String(id)));
 	}
 	getRulesByRanges(unitId, subUnitId, ranges) {
-		var _this$_conditionalFor;
 		const ids = this.getRuleIdsByRanges(unitId, subUnitId, ranges);
-		return ((_this$_conditionalFor = this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId)) !== null && _this$_conditionalFor !== void 0 ? _this$_conditionalFor : []).filter((rule) => ids.has(rule.cfId));
+		return (this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId) ?? []).filter((rule) => ids.has(rule.cfId));
 	}
 	dispose() {
 		this.clear();
@@ -633,7 +632,7 @@ var ConditionalFormattingRangeTransformService = class {
 	copyIntersectingRanges(sourceRanges, sourceRange, targetAnchor) {
 		const fragments = [];
 		sourceRanges.forEach((range) => {
-			const intersect = _univerjs_core.Rectangle.getIntersects(range, sourceRange);
+			const intersect = (0, _univerjs_core.getIntersectRange)(range, sourceRange);
 			if (!intersect) return;
 			fragments.push(this.translateRange(intersect, {
 				row: targetAnchor.row - sourceRange.startRow,
@@ -688,7 +687,7 @@ const ClearRangeCfCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.clear-range-conditional-rule",
 	handler(accessor, params) {
-		var _ref, _params$ranges, _selectionManagerServ;
+		var _selectionManagerServ;
 		if (!params) return false;
 		const conditionalFormattingRangeIndexModel = accessor.get(ConditionalFormattingRangeIndexModel);
 		const conditionalFormattingRangeTransformService = accessor.get(ConditionalFormattingRangeTransformService);
@@ -699,7 +698,7 @@ const ClearRangeCfCommand = {
 		const target = (0, _univerjs_sheets.getSheetCommandTarget)(univerInstanceService, params);
 		if (!target) return false;
 		const { unitId, subUnitId } = target;
-		const ranges = (_ref = (_params$ranges = params.ranges) !== null && _params$ranges !== void 0 ? _params$ranges : (_selectionManagerServ = selectionManagerService.getCurrentSelections()) === null || _selectionManagerServ === void 0 ? void 0 : _selectionManagerServ.map((selection) => selection.range)) !== null && _ref !== void 0 ? _ref : [];
+		const ranges = params.ranges ?? ((_selectionManagerServ = selectionManagerService.getCurrentSelections()) === null || _selectionManagerServ === void 0 ? void 0 : _selectionManagerServ.map((selection) => selection.range)) ?? [];
 		const allRuleList = conditionalFormattingRangeIndexModel.getRulesByRanges(unitId, subUnitId, ranges).filter((rule) => {
 			var _params$types;
 			return !((_params$types = params.types) === null || _params$types === void 0 ? void 0 : _params$types.length) || params.types.includes(rule.rule.type);
@@ -710,13 +709,14 @@ const ClearRangeCfCommand = {
 		allRuleList.forEach((oldRule) => {
 			const newRanges = conditionalFormattingRangeTransformService.subtractRanges(oldRule.ranges, ranges);
 			if (newRanges.length) {
+				const rule = {
+					...oldRule,
+					ranges: newRanges
+				};
 				const params = {
 					unitId,
 					subUnitId,
-					rule: {
-						...oldRule,
-						ranges: newRanges
-					}
+					rule
 				};
 				const undo = setConditionalRuleMutationUndoFactory(accessor, params);
 				redos.push({
@@ -1477,7 +1477,7 @@ var HighlightCellCalculateUnit = class extends BaseCalculateUnit {
 					allValue.sort((a, b) => b - a);
 					const configRule = context.rule.rule;
 					if (configRule.isPercent) {
-						if (configRule.isBottom) allValue = allValue.toReversed();
+						if (configRule.isBottom) allValue = allValue.slice().reverse();
 						const threshold = _univerjs_core.Tools.clamp(configRule.value, 0, 100) / 100;
 						const targetIndex = Math.floor(threshold * allValue.length);
 						const safeIndex = _univerjs_core.Tools.clamp(targetIndex - 1, 0, allValue.length - 1);
@@ -1682,7 +1682,10 @@ var HighlightCellCalculateUnit = class extends BaseCalculateUnit {
 					const formulaResult = conditionalFormattingFormulaService.getFormulaResultWithCoords(context.unitId, context.subUnitId, context.rule.cfId, _ruleConfig.value, relativeRow, relativeCol);
 					if (formulaResult.status === _univerjs_engine_formula.FormulaResultStatus.SUCCESS && formulaResult.result !== void 0) return isFormulaResultMatched(formulaResult.result);
 					const cache = preComputingResult === null || preComputingResult === void 0 ? void 0 : preComputingResult.value;
-					if (cache) return isFormulaResultMatched(cache.getValue(relativeRow, relativeCol));
+					if (cache) {
+						const value = cache.getValue(relativeRow, relativeCol);
+						return isFormulaResultMatched(value);
+					}
 					return false;
 				}
 			}
@@ -1859,8 +1862,7 @@ let ConditionalFormattingViewModel = class ConditionalFormattingViewModel extend
 		return result;
 	}
 	_getCellCfs(unitId, subUnitId, row, col) {
-		var _this$_conditionalFor;
-		const subunitRules = (_this$_conditionalFor = this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId)) !== null && _this$_conditionalFor !== void 0 ? _this$_conditionalFor : [];
+		const subunitRules = this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId) ?? [];
 		const _calculateUnitManagers = this._ensureCalculateUnitManager(unitId, subUnitId);
 		const list = this._conditionalFormattingRangeIndexModel.getRuleIdsByCell(unitId, subUnitId, row, col);
 		const rules = subunitRules.filter((rule) => list.has(rule.cfId));
@@ -2125,7 +2127,7 @@ const getCacheStyleMatrix = (unitId, subUnitId, rule, context) => {
 			const cellCfItem = conditionalFormattingViewModel.getCellCfs(unitId, subUnitId, row, col);
 			if (cellCfItem) {
 				const item = cellCfItem.find((item) => item.cfId === rule.cfId);
-				!(item === null || item === void 0) && item.result && matrix.setValue(row, col, item.result);
+				item !== null && item !== void 0 && item.result && matrix.setValue(row, col, item.result);
 			}
 		});
 	});
@@ -2541,7 +2543,7 @@ for (const key in iconMap) {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-conditional-formatting";
-var version = "1.0.0-alpha.7";
+var version = "1.0.0-beta.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -2933,7 +2935,7 @@ _defineProperty(UniverSheetsConditionalFormattingPlugin, "packageName", name);
 _defineProperty(UniverSheetsConditionalFormattingPlugin, "version", version);
 _defineProperty(UniverSheetsConditionalFormattingPlugin, "type", _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 UniverSheetsConditionalFormattingPlugin = __decorate([
-	(0, _univerjs_core.DependentOn)(_univerjs_engine_formula.UniverFormulaEnginePlugin),
+	(0, _univerjs_core.DependentOn)(_univerjs_engine_formula.UniverFormulaEnginePlugin, _univerjs_sheets.UniverSheetsPlugin),
 	__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.Injector)),
 	__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_core.ICommandService)),
 	__decorateParam(3, _univerjs_core.IConfigService)

package/lib/es/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.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.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.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.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.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.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.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -2116,50 +2116,6 @@ var FRangeSheetsConditionalFormattingMixin = class extends FRange {
 	createConditionalFormattingRule() {
 		return new FConditionalFormattingBuilder({ ranges: [this._range] });
 	}
-	addConditionalFormattingRule(rule) {
-		const params = {
-			unitId: this._workbook.getUnitId(),
-			subUnitId: this._worksheet.getSheetId(),
-			rule
-		};
-		this._commandService.syncExecuteCommand(AddCfCommand.id, params);
-		return this;
-	}
-	deleteConditionalFormattingRule(cfId) {
-		const params = {
-			unitId: this._workbook.getUnitId(),
-			subUnitId: this._worksheet.getSheetId(),
-			cfId
-		};
-		this._commandService.syncExecuteCommand(DeleteCfCommand.id, params);
-		return this;
-	}
-	moveConditionalFormattingRule(cfId, toCfId, type = "after") {
-		const params = {
-			unitId: this._workbook.getUnitId(),
-			subUnitId: this._worksheet.getSheetId(),
-			start: {
-				id: cfId,
-				type: "self"
-			},
-			end: {
-				id: toCfId,
-				type
-			}
-		};
-		this._commandService.syncExecuteCommand(MoveCfCommand.id, params);
-		return this;
-	}
-	setConditionalFormattingRule(cfId, rule) {
-		const params = {
-			unitId: this._workbook.getUnitId(),
-			subUnitId: this._worksheet.getSheetId(),
-			rule,
-			cfId
-		};
-		this._commandService.syncExecuteCommand(SetCfCommand.id, params);
-		return this;
-	}
 	clearConditionalFormatRules() {
 		const params = {
 			unitId: this._workbook.getUnitId(),
@@ -2181,9 +2137,6 @@ var FWorksheetConditionalFormattingMixin = class extends FWorksheet {
 	getConditionalFormattingRules() {
 		return [...this._getConditionalFormattingRuleModel().getSubunitRules(this._workbook.getUnitId(), this._worksheet.getSheetId()) || []];
 	}
-	createConditionalFormattingRule() {
-		return new FConditionalFormattingBuilder();
-	}
 	newConditionalFormattingRule() {
 		return new FConditionalFormattingBuilder();
 	}

package/lib/es/index.js

@@ -1,5 +1,5 @@
-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, isInternalEditorID, merge, sequenceExecute, touchDependencies } from "@univerjs/core";
-import { CopySheetCommand, InsertColMutation, InsertRowMutation, MoveColsMutation, MoveRangeMutation, MoveRowsMutation, RemoveColMutation, RemoveRowMutation, RemoveSheetCommand, ReorderRangeMutation, SetRangeValuesMutation, SheetInterceptorService, SheetsSelectionsService, getSheetCommandTarget } from "@univerjs/sheets";
+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 { 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";
 import { bufferTime, distinctUntilChanged, filter, map } from "rxjs/operators";
@@ -220,7 +220,7 @@ const isAnchorEqual = (anchor1, anchor2) => {
 const createCfId = () => `${generateRandomId(8)}`;
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -231,7 +231,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -244,14 +244,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.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.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -512,7 +512,7 @@ const AddCfCommand = {
 };
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -520,7 +520,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.140.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);
@@ -556,9 +556,8 @@ let ConditionalFormattingRangeIndexModel = class ConditionalFormattingRangeIndex
 		return new Set(Array.from(ids).map((id) => String(id)));
 	}
 	getRulesByRanges(unitId, subUnitId, ranges) {
-		var _this$_conditionalFor;
 		const ids = this.getRuleIdsByRanges(unitId, subUnitId, ranges);
-		return ((_this$_conditionalFor = this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId)) !== null && _this$_conditionalFor !== void 0 ? _this$_conditionalFor : []).filter((rule) => ids.has(rule.cfId));
+		return (this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId) ?? []).filter((rule) => ids.has(rule.cfId));
 	}
 	dispose() {
 		this.clear();
@@ -632,7 +631,7 @@ var ConditionalFormattingRangeTransformService = class {
 	copyIntersectingRanges(sourceRanges, sourceRange, targetAnchor) {
 		const fragments = [];
 		sourceRanges.forEach((range) => {
-			const intersect = Rectangle.getIntersects(range, sourceRange);
+			const intersect = getIntersectRange(range, sourceRange);
 			if (!intersect) return;
 			fragments.push(this.translateRange(intersect, {
 				row: targetAnchor.row - sourceRange.startRow,
@@ -687,7 +686,7 @@ const ClearRangeCfCommand = {
 	type: CommandType.COMMAND,
 	id: "sheet.command.clear-range-conditional-rule",
 	handler(accessor, params) {
-		var _ref, _params$ranges, _selectionManagerServ;
+		var _selectionManagerServ;
 		if (!params) return false;
 		const conditionalFormattingRangeIndexModel = accessor.get(ConditionalFormattingRangeIndexModel);
 		const conditionalFormattingRangeTransformService = accessor.get(ConditionalFormattingRangeTransformService);
@@ -698,7 +697,7 @@ const ClearRangeCfCommand = {
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
 		const { unitId, subUnitId } = target;
-		const ranges = (_ref = (_params$ranges = params.ranges) !== null && _params$ranges !== void 0 ? _params$ranges : (_selectionManagerServ = selectionManagerService.getCurrentSelections()) === null || _selectionManagerServ === void 0 ? void 0 : _selectionManagerServ.map((selection) => selection.range)) !== null && _ref !== void 0 ? _ref : [];
+		const ranges = params.ranges ?? ((_selectionManagerServ = selectionManagerService.getCurrentSelections()) === null || _selectionManagerServ === void 0 ? void 0 : _selectionManagerServ.map((selection) => selection.range)) ?? [];
 		const allRuleList = conditionalFormattingRangeIndexModel.getRulesByRanges(unitId, subUnitId, ranges).filter((rule) => {
 			var _params$types;
 			return !((_params$types = params.types) === null || _params$types === void 0 ? void 0 : _params$types.length) || params.types.includes(rule.rule.type);
@@ -709,13 +708,14 @@ const ClearRangeCfCommand = {
 		allRuleList.forEach((oldRule) => {
 			const newRanges = conditionalFormattingRangeTransformService.subtractRanges(oldRule.ranges, ranges);
 			if (newRanges.length) {
+				const rule = {
+					...oldRule,
+					ranges: newRanges
+				};
 				const params = {
 					unitId,
 					subUnitId,
-					rule: {
-						...oldRule,
-						ranges: newRanges
-					}
+					rule
 				};
 				const undo = setConditionalRuleMutationUndoFactory(accessor, params);
 				redos.push({
@@ -1476,7 +1476,7 @@ var HighlightCellCalculateUnit = class extends BaseCalculateUnit {
 					allValue.sort((a, b) => b - a);
 					const configRule = context.rule.rule;
 					if (configRule.isPercent) {
-						if (configRule.isBottom) allValue = allValue.toReversed();
+						if (configRule.isBottom) allValue = allValue.slice().reverse();
 						const threshold = Tools.clamp(configRule.value, 0, 100) / 100;
 						const targetIndex = Math.floor(threshold * allValue.length);
 						const safeIndex = Tools.clamp(targetIndex - 1, 0, allValue.length - 1);
@@ -1681,7 +1681,10 @@ var HighlightCellCalculateUnit = class extends BaseCalculateUnit {
 					const formulaResult = conditionalFormattingFormulaService.getFormulaResultWithCoords(context.unitId, context.subUnitId, context.rule.cfId, _ruleConfig.value, relativeRow, relativeCol);
 					if (formulaResult.status === FormulaResultStatus.SUCCESS && formulaResult.result !== void 0) return isFormulaResultMatched(formulaResult.result);
 					const cache = preComputingResult === null || preComputingResult === void 0 ? void 0 : preComputingResult.value;
-					if (cache) return isFormulaResultMatched(cache.getValue(relativeRow, relativeCol));
+					if (cache) {
+						const value = cache.getValue(relativeRow, relativeCol);
+						return isFormulaResultMatched(value);
+					}
 					return false;
 				}
 			}
@@ -1858,8 +1861,7 @@ let ConditionalFormattingViewModel = class ConditionalFormattingViewModel extend
 		return result;
 	}
 	_getCellCfs(unitId, subUnitId, row, col) {
-		var _this$_conditionalFor;
-		const subunitRules = (_this$_conditionalFor = this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId)) !== null && _this$_conditionalFor !== void 0 ? _this$_conditionalFor : [];
+		const subunitRules = this._conditionalFormattingRuleModel.getSubunitRules(unitId, subUnitId) ?? [];
 		const _calculateUnitManagers = this._ensureCalculateUnitManager(unitId, subUnitId);
 		const list = this._conditionalFormattingRangeIndexModel.getRuleIdsByCell(unitId, subUnitId, row, col);
 		const rules = subunitRules.filter((rule) => list.has(rule.cfId));
@@ -2124,7 +2126,7 @@ const getCacheStyleMatrix = (unitId, subUnitId, rule, context) => {
 			const cellCfItem = conditionalFormattingViewModel.getCellCfs(unitId, subUnitId, row, col);
 			if (cellCfItem) {
 				const item = cellCfItem.find((item) => item.cfId === rule.cfId);
-				!(item === null || item === void 0) && item.result && matrix.setValue(row, col, item.result);
+				item !== null && item !== void 0 && item.result && matrix.setValue(row, col, item.result);
 			}
 		});
 	});
@@ -2540,7 +2542,7 @@ for (const key in iconMap) {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-conditional-formatting";
-var version = "1.0.0-alpha.7";
+var version = "1.0.0-beta.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -2932,7 +2934,7 @@ _defineProperty(UniverSheetsConditionalFormattingPlugin, "packageName", name);
 _defineProperty(UniverSheetsConditionalFormattingPlugin, "version", version);
 _defineProperty(UniverSheetsConditionalFormattingPlugin, "type", UniverInstanceType.UNIVER_SHEET);
 UniverSheetsConditionalFormattingPlugin = __decorate([
-	DependentOn(UniverFormulaEnginePlugin),
+	DependentOn(UniverFormulaEnginePlugin, UniverSheetsPlugin),
 	__decorateParam(1, Inject(Injector)),
 	__decorateParam(2, Inject(ICommandService)),
 	__decorateParam(3, IConfigService)

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.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.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.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.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.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.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.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -2116,50 +2116,6 @@ var FRangeSheetsConditionalFormattingMixin = class extends FRange {
 	createConditionalFormattingRule() {
 		return new FConditionalFormattingBuilder({ ranges: [this._range] });
 	}
-	addConditionalFormattingRule(rule) {
-		const params = {
-			unitId: this._workbook.getUnitId(),
-			subUnitId: this._worksheet.getSheetId(),
-			rule
-		};
-		this._commandService.syncExecuteCommand(AddCfCommand.id, params);
-		return this;
-	}
-	deleteConditionalFormattingRule(cfId) {
-		const params = {
-			unitId: this._workbook.getUnitId(),
-			subUnitId: this._worksheet.getSheetId(),
-			cfId
-		};
-		this._commandService.syncExecuteCommand(DeleteCfCommand.id, params);
-		return this;
-	}
-	moveConditionalFormattingRule(cfId, toCfId, type = "after") {
-		const params = {
-			unitId: this._workbook.getUnitId(),
-			subUnitId: this._worksheet.getSheetId(),
-			start: {
-				id: cfId,
-				type: "self"
-			},
-			end: {
-				id: toCfId,
-				type
-			}
-		};
-		this._commandService.syncExecuteCommand(MoveCfCommand.id, params);
-		return this;
-	}
-	setConditionalFormattingRule(cfId, rule) {
-		const params = {
-			unitId: this._workbook.getUnitId(),
-			subUnitId: this._worksheet.getSheetId(),
-			rule,
-			cfId
-		};
-		this._commandService.syncExecuteCommand(SetCfCommand.id, params);
-		return this;
-	}
 	clearConditionalFormatRules() {
 		const params = {
 			unitId: this._workbook.getUnitId(),
@@ -2181,9 +2137,6 @@ var FWorksheetConditionalFormattingMixin = class extends FWorksheet {
 	getConditionalFormattingRules() {
 		return [...this._getConditionalFormattingRuleModel().getSubunitRules(this._workbook.getUnitId(), this._worksheet.getSheetId()) || []];
 	}
-	createConditionalFormattingRule() {
-		return new FConditionalFormattingBuilder();
-	}
 	newConditionalFormattingRule() {
 		return new FConditionalFormattingBuilder();
 	}