@univerjs/sheets-data-validation 0.23.0 → 0.24.0-insiders.20260528-29f582d

package/lib/index.js

@@ -1,7 +1,7 @@
 import { CellValueType, CommandType, DataValidationOperator, DataValidationRenderMode, DataValidationStatus, DataValidationType, DependentOn, Disposable, ICommandService, IConfigService, IPermissionService, IUndoRedoService, IUniverInstanceService, Inject, Injector, LifecycleService, LifecycleStages, ObjectMatrix, Plugin, RBush, Range, Rectangle, RxDisposable, Tools, UniverInstanceType, WrapStrategy, bufferDebounceTime, dateKit, debounce, generateRandomId, getIntersectRange, getOriginCellValue, isFormulaString, isRangesEqual, merge, numfmt, sequenceExecute, toDisposable } from "@univerjs/core";
-import { AddDataValidationMutation, BaseDataValidator, DataValidationModel, DataValidatorRegistryService, RemoveDataValidationMutation, TextLengthErrorTitleMap, UniverDataValidationPlugin, UpdateDataValidationMutation, UpdateRuleType, getRuleOptions, getRuleSetting } from "@univerjs/data-validation";
+import { AddDataValidationMutation, BaseDataValidator, DataValidationModel, DataValidatorRegistryService, RemoveDataValidationMutation, UniverDataValidationPlugin, UpdateDataValidationMutation, UpdateRuleType, getRuleOptions, getRuleSetting } from "@univerjs/data-validation";
 import { ERROR_TYPE_SET, LexerTreeBuilder, OtherFormulaBizType, RegisterOtherFormulaService, deserializeRangeWithSheet, deserializeRangeWithSheetWithCache, isReferenceString, operatorToken, sequenceNodeType } from "@univerjs/engine-formula";
-import { ClearSelectionAllCommand, CopySheetCommand, RefRangeService, RemoveSheetCommand, RemoveSheetMutation, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, SheetInterceptorService, SheetsSelectionsService, WorksheetViewPermission, getSheetCommandTarget, handleCommonDefaultRangeChangeWithEffectRefCommands } from "@univerjs/sheets";
+import { ClearSelectionAllCommand, CopySheetCommand, RefRangeService, RemoveSheetCommand, RemoveSheetMutation, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, SheetInterceptorService, SheetsSelectionsService, WorksheetViewPermission, deserializeListOptions, getSheetCommandTarget, handleCommonDefaultRangeChangeWithEffectRefCommands } from "@univerjs/sheets";
 import { Subject, bufferWhen, filter, skip } from "rxjs";
 import { UnitAction } from "@univerjs/protocol";
 import { FormulaRefRangeService, UniverSheetsFormulaPlugin } from "@univerjs/sheets-formula";
@@ -85,7 +85,14 @@ let DataValidationCacheService = class DataValidationCacheService extends Dispos
 				if (cellValue) {
 					const range = new ObjectMatrix(cellValue).getDataRange();
 					if (range.endRow === -1) return;
-					const intersectsRanges = this._sheetDataValidationModel.getRules(unitId, subUnitId).map((rule) => rule.ranges).flat().map((ruleRange) => getIntersectRange(ruleRange, range)).filter(Boolean);
+					const rules = this._sheetDataValidationModel.getRules(unitId, subUnitId);
+					const ranges = [];
+					for (const rule of rules) ranges.push(...rule.ranges);
+					const intersectsRanges = [];
+					for (const ruleRange of ranges) {
+						const intersect = getIntersectRange(ruleRange, range);
+						if (intersect) intersectsRanges.push(intersect);
+					}
 					if (intersectsRanges.length) this.markRangeDirty(unitId, subUnitId, intersectsRanges, true);
 				}
 			}
@@ -381,31 +388,6 @@ function getStringCellValue(cell) {
 	return String((_getCellValueOrigin = getCellValueOrigin(cell)) !== null && _getCellValueOrigin !== void 0 ? _getCellValueOrigin : "");
 }
 
-//#endregion
-//#region src/validators/util.ts
-function serializeListOptions(options) {
-	return options.filter(Boolean).join(",");
-}
-function deserializeListOptions(optionsStr) {
-	return optionsStr.split(",").filter(Boolean);
-}
-function getDataValidationCellValue(cellData) {
-	const cellValue = getCellValueOrigin(cellData);
-	if (cellValue === void 0 || cellValue === null) return "";
-	return cellValue.toString();
-}
-function getTransformedFormula(lexerTreeBuilder, rule, position) {
-	const { formula1, formula2 } = rule;
-	const originStartRow = rule.ranges[0].startRow;
-	const originStartColumn = rule.ranges[0].startColumn;
-	const offsetRow = position.row - originStartRow;
-	const offsetColumn = position.col - originStartColumn;
-	return {
-		transformedFormula1: isFormulaString(formula1) ? lexerTreeBuilder.moveFormulaRefOffset(formula1, offsetColumn, offsetRow, true) : formula1,
-		transformedFormula2: isFormulaString(formula2) ? lexerTreeBuilder.moveFormulaRefOffset(formula2, offsetColumn, offsetRow, true) : formula2
-	};
-}
-
 //#endregion
 //#region src/services/dv-list-cache.service.ts
 let DataValidationListCacheService = class DataValidationListCacheService extends Disposable {
@@ -1004,21 +986,103 @@ SheetDataValidationModel = __decorate([
 	__decorateParam(6, ICommandService)
 ], SheetDataValidationModel);
 
+//#endregion
+//#region src/types/const/operator-text-map.ts
+/**
+* Copyright 2023-present DreamNum Co., Ltd.
+*
+* 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.
+*/
+const OperatorTextMap = {
+	[DataValidationOperator.BETWEEN]: "sheets-data-validation.operators.between",
+	[DataValidationOperator.EQUAL]: "sheets-data-validation.operators.equal",
+	[DataValidationOperator.GREATER_THAN]: "sheets-data-validation.operators.greaterThan",
+	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.operators.greaterThanOrEqual",
+	[DataValidationOperator.LESS_THAN]: "sheets-data-validation.operators.lessThan",
+	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.operators.lessThanOrEqual",
+	[DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.operators.notBetween",
+	[DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.operators.notEqual"
+};
+const OperatorTitleMap = {
+	[DataValidationOperator.BETWEEN]: "sheets-data-validation.ruleName.between",
+	[DataValidationOperator.EQUAL]: "sheets-data-validation.ruleName.equal",
+	[DataValidationOperator.GREATER_THAN]: "sheets-data-validation.ruleName.greaterThan",
+	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.ruleName.greaterThanOrEqual",
+	[DataValidationOperator.LESS_THAN]: "sheets-data-validation.ruleName.lessThan",
+	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.ruleName.lessThanOrEqual",
+	[DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.ruleName.notBetween",
+	[DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.ruleName.notEqual",
+	NONE: "sheets-data-validation.ruleName.legal"
+};
+const OperatorErrorTitleMap = {
+	[DataValidationOperator.BETWEEN]: "sheets-data-validation.errorMsg.between",
+	[DataValidationOperator.EQUAL]: "sheets-data-validation.errorMsg.equal",
+	[DataValidationOperator.GREATER_THAN]: "sheets-data-validation.errorMsg.greaterThan",
+	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.errorMsg.greaterThanOrEqual",
+	[DataValidationOperator.LESS_THAN]: "sheets-data-validation.errorMsg.lessThan",
+	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.errorMsg.lessThanOrEqual",
+	[DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.errorMsg.notBetween",
+	[DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.errorMsg.notEqual",
+	NONE: "sheets-data-validation.errorMsg.legal"
+};
+const TextLengthErrorTitleMap = {
+	[DataValidationOperator.BETWEEN]: "sheets-data-validation.textLength.errorMsg.between",
+	[DataValidationOperator.EQUAL]: "sheets-data-validation.textLength.errorMsg.equal",
+	[DataValidationOperator.GREATER_THAN]: "sheets-data-validation.textLength.errorMsg.greaterThan",
+	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.textLength.errorMsg.greaterThanOrEqual",
+	[DataValidationOperator.LESS_THAN]: "sheets-data-validation.textLength.errorMsg.lessThan",
+	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.textLength.errorMsg.lessThanOrEqual",
+	[DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.textLength.errorMsg.notBetween",
+	[DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.textLength.errorMsg.notEqual"
+};
+
+//#endregion
+//#region src/validators/base-sheet-validator.ts
+const FORMULA1$1 = "{FORMULA1}";
+const FORMULA2$1 = "{FORMULA2}";
+const TYPE = "{TYPE}";
+var BaseSheetValidator = class extends BaseDataValidator {
+	get operatorNames() {
+		return this.operators.map((operator) => this.localeService.t(OperatorTextMap[operator]));
+	}
+	generateRuleName(rule) {
+		var _rule$formula, _rule$formula2;
+		if (!rule.operator) return this.localeService.t(OperatorTitleMap.NONE).replace(TYPE, this.titleStr);
+		const ruleName = this.localeService.t(OperatorTitleMap[rule.operator]).replace(FORMULA1$1, (_rule$formula = rule.formula1) !== null && _rule$formula !== void 0 ? _rule$formula : "").replace(FORMULA2$1, (_rule$formula2 = rule.formula2) !== null && _rule$formula2 !== void 0 ? _rule$formula2 : "");
+		return `${this.titleStr} ${ruleName}`;
+	}
+	generateRuleErrorMessage(rule, _position) {
+		var _rule$formula3, _rule$formula4;
+		if (!rule.operator) return this.localeService.t(OperatorErrorTitleMap.NONE).replace(TYPE, this.titleStr);
+		return `${this.localeService.t(OperatorErrorTitleMap[rule.operator]).replace(FORMULA1$1, (_rule$formula3 = rule.formula1) !== null && _rule$formula3 !== void 0 ? _rule$formula3 : "").replace(FORMULA2$1, (_rule$formula4 = rule.formula2) !== null && _rule$formula4 !== void 0 ? _rule$formula4 : "")}`;
+	}
+};
+
 //#endregion
 //#region src/validators/checkbox-validator.ts
 const CHECKBOX_FORMULA_1 = 1;
 const CHECKBOX_FORMULA_2 = 0;
 function getFailMessage(formula, localeService) {
-	if (Tools.isBlank(formula)) return localeService.t("dataValidation.validFail.value");
-	if (isFormulaString(formula)) return localeService.t("dataValidation.validFail.primitive");
+	if (Tools.isBlank(formula)) return localeService.t("sheets-data-validation.validFail.value");
+	if (isFormulaString(formula)) return localeService.t("sheets-data-validation.validFail.primitive");
 	return "";
 }
 const transformCheckboxValue = (value) => Tools.isDefine(value) && String(value).toLowerCase() === "true" ? "1" : String(value).toLowerCase() === "false" ? "0" : value;
-var CheckboxValidator = class extends BaseDataValidator {
+var CheckboxValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "id", DataValidationType.CHECKBOX);
-		_defineProperty(this, "title", "dataValidation.checkbox.title");
+		_defineProperty(this, "title", "sheets-data-validation.checkbox.title");
 		_defineProperty(this, "operators", []);
 		_defineProperty(this, "scopes", ["sheet"]);
 		_defineProperty(this, "order", 41);
@@ -1037,8 +1101,8 @@ var CheckboxValidator = class extends BaseDataValidator {
 		if (Tools.isBlank(formula1) && Tools.isBlank(formula2)) return { success: true };
 		if (isEqual) return {
 			success: false,
-			formula1: this.localeService.t("dataValidation.validFail.checkboxEqual"),
-			formula2: this.localeService.t("dataValidation.validFail.checkboxEqual")
+			formula1: this.localeService.t("sheets-data-validation.validFail.checkboxEqual"),
+			formula2: this.localeService.t("sheets-data-validation.validFail.checkboxEqual")
 		};
 		const error1 = getFailMessage(formula1, this.localeService);
 		const error2 = getFailMessage(formula2, this.localeService);
@@ -1088,7 +1152,7 @@ var CheckboxValidator = class extends BaseDataValidator {
 		return Tools.isDefine(value) && (String(value) === String(formula1) || String(value) === String(formula2) || String(value) === String(originFormula1 !== null && originFormula1 !== void 0 ? originFormula1 : "") || String(value) === String(originFormula2 !== null && originFormula2 !== void 0 ? originFormula2 : ""));
 	}
 	generateRuleErrorMessage(rule) {
-		return this.localeService.t("dataValidation.checkbox.error");
+		return this.localeService.t("sheets-data-validation.checkbox.error");
 	}
 	generateRuleName(rule) {
 		return this.titleStr;
@@ -1113,46 +1177,46 @@ var CheckboxValidator = class extends BaseDataValidator {
 * limitations under the License.
 */
 const DateOperatorNameMap = {
-	[DataValidationOperator.BETWEEN]: "dataValidation.date.operators.between",
-	[DataValidationOperator.EQUAL]: "dataValidation.date.operators.equal",
-	[DataValidationOperator.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
-	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.date.operators.greaterThanOrEqual",
-	[DataValidationOperator.LESS_THAN]: "dataValidation.date.operators.lessThan",
-	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.date.operators.lessThanOrEqual",
-	[DataValidationOperator.NOT_BETWEEN]: "dataValidation.date.operators.notBetween",
-	[DataValidationOperator.NOT_EQUAL]: "dataValidation.date.operators.notEqual"
+	[DataValidationOperator.BETWEEN]: "sheets-data-validation.date.operators.between",
+	[DataValidationOperator.EQUAL]: "sheets-data-validation.date.operators.equal",
+	[DataValidationOperator.GREATER_THAN]: "sheets-data-validation.date.operators.greaterThan",
+	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.date.operators.greaterThanOrEqual",
+	[DataValidationOperator.LESS_THAN]: "sheets-data-validation.date.operators.lessThan",
+	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.date.operators.lessThanOrEqual",
+	[DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.date.operators.notBetween",
+	[DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.date.operators.notEqual"
 };
 const DateOperatorTextMap = {
-	[DataValidationOperator.BETWEEN]: "dataValidation.date.operators.between",
-	[DataValidationOperator.EQUAL]: "dataValidation.date.operators.equal",
-	[DataValidationOperator.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
-	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.date.operators.greaterThanOrEqual",
-	[DataValidationOperator.LESS_THAN]: "dataValidation.date.operators.lessThan",
-	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.date.operators.lessThanOrEqual",
-	[DataValidationOperator.NOT_BETWEEN]: "dataValidation.date.operators.notBetween",
-	[DataValidationOperator.NOT_EQUAL]: "dataValidation.date.operators.notEqual"
+	[DataValidationOperator.BETWEEN]: "sheets-data-validation.date.operators.between",
+	[DataValidationOperator.EQUAL]: "sheets-data-validation.date.operators.equal",
+	[DataValidationOperator.GREATER_THAN]: "sheets-data-validation.date.operators.greaterThan",
+	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.date.operators.greaterThanOrEqual",
+	[DataValidationOperator.LESS_THAN]: "sheets-data-validation.date.operators.lessThan",
+	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.date.operators.lessThanOrEqual",
+	[DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.date.operators.notBetween",
+	[DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.date.operators.notEqual"
 };
 const DateOperatorTitleMap = {
-	[DataValidationOperator.BETWEEN]: "dataValidation.date.ruleName.between",
-	[DataValidationOperator.EQUAL]: "dataValidation.date.ruleName.equal",
-	[DataValidationOperator.GREATER_THAN]: "dataValidation.date.ruleName.greaterThan",
-	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.date.ruleName.greaterThanOrEqual",
-	[DataValidationOperator.LESS_THAN]: "dataValidation.date.ruleName.lessThan",
-	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.date.ruleName.lessThanOrEqual",
-	[DataValidationOperator.NOT_BETWEEN]: "dataValidation.date.ruleName.notBetween",
-	[DataValidationOperator.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual",
-	NONE: "dataValidation.date.ruleName.legal"
+	[DataValidationOperator.BETWEEN]: "sheets-data-validation.date.ruleName.between",
+	[DataValidationOperator.EQUAL]: "sheets-data-validation.date.ruleName.equal",
+	[DataValidationOperator.GREATER_THAN]: "sheets-data-validation.date.ruleName.greaterThan",
+	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.date.ruleName.greaterThanOrEqual",
+	[DataValidationOperator.LESS_THAN]: "sheets-data-validation.date.ruleName.lessThan",
+	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.date.ruleName.lessThanOrEqual",
+	[DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.date.ruleName.notBetween",
+	[DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.date.ruleName.notEqual",
+	NONE: "sheets-data-validation.date.ruleName.legal"
 };
 const DateOperatorErrorTitleMap = {
-	[DataValidationOperator.BETWEEN]: "dataValidation.date.errorMsg.between",
-	[DataValidationOperator.EQUAL]: "dataValidation.date.errorMsg.equal",
-	[DataValidationOperator.GREATER_THAN]: "dataValidation.date.errorMsg.greaterThan",
-	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.greaterThanOrEqual",
-	[DataValidationOperator.LESS_THAN]: "dataValidation.date.errorMsg.lessThan",
-	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.lessThanOrEqual",
-	[DataValidationOperator.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
-	[DataValidationOperator.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual",
-	NONE: "dataValidation.date.errorMsg.legal"
+	[DataValidationOperator.BETWEEN]: "sheets-data-validation.date.errorMsg.between",
+	[DataValidationOperator.EQUAL]: "sheets-data-validation.date.errorMsg.equal",
+	[DataValidationOperator.GREATER_THAN]: "sheets-data-validation.date.errorMsg.greaterThan",
+	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.date.errorMsg.greaterThanOrEqual",
+	[DataValidationOperator.LESS_THAN]: "sheets-data-validation.date.errorMsg.lessThan",
+	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.date.errorMsg.lessThanOrEqual",
+	[DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.date.errorMsg.notBetween",
+	[DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.date.errorMsg.notEqual",
+	NONE: "sheets-data-validation.date.errorMsg.legal"
 };
 
 //#endregion
@@ -1194,6 +1258,25 @@ const TWO_FORMULA_OPERATOR_COUNT = [DataValidationOperator.BETWEEN, DataValidati
 const FORMULA1 = "{FORMULA1}";
 const FORMULA2 = "{FORMULA2}";
 
+//#endregion
+//#region src/validators/util.ts
+function getDataValidationCellValue(cellData) {
+	const cellValue = getCellValueOrigin(cellData);
+	if (cellValue === void 0 || cellValue === null) return "";
+	return cellValue.toString();
+}
+function getTransformedFormula(lexerTreeBuilder, rule, position) {
+	const { formula1, formula2 } = rule;
+	const originStartRow = rule.ranges[0].startRow;
+	const originStartColumn = rule.ranges[0].startColumn;
+	const offsetRow = position.row - originStartRow;
+	const offsetColumn = position.col - originStartColumn;
+	return {
+		transformedFormula1: isFormulaString(formula1) ? lexerTreeBuilder.moveFormulaRefOffset(formula1, offsetColumn, offsetRow, true) : formula1,
+		transformedFormula2: isFormulaString(formula2) ? lexerTreeBuilder.moveFormulaRefOffset(formula2, offsetColumn, offsetRow, true) : formula2
+	};
+}
+
 //#endregion
 //#region src/validators/date-validator.ts
 const transformDate2SerialNumber = (value) => {
@@ -1204,11 +1287,11 @@ const transformDate2SerialNumber = (value) => {
 	if (Tools.isDefine(v)) return v;
 	return (_numfmt$parseDate2 = numfmt.parseDate(dateKit(value).format("YYYY-MM-DD HH:mm:ss"))) === null || _numfmt$parseDate2 === void 0 ? void 0 : _numfmt$parseDate2.v;
 };
-var DateValidator = class extends BaseDataValidator {
+var DateValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "id", DataValidationType.DATE);
-		_defineProperty(this, "title", "dataValidation.date.title");
+		_defineProperty(this, "title", "sheets-data-validation.date.title");
 		_defineProperty(this, "order", 40);
 		_defineProperty(this, "operators", [
 			DataValidationOperator.BETWEEN,
@@ -1248,7 +1331,7 @@ var DateValidator = class extends BaseDataValidator {
 		const operator = rule.operator;
 		if (!operator) return { success: true };
 		const formula1Success = this._validatorSingleFormula(rule.formula1);
-		const errorMsg = this.localeService.t("dataValidation.validFail.date");
+		const errorMsg = this.localeService.t("sheets-data-validation.validFail.date");
 		if (TWO_FORMULA_OPERATOR_COUNT.includes(operator)) {
 			const formula2Success = this._validatorSingleFormula(rule.formula2);
 			return {
@@ -1304,67 +1387,18 @@ var DateValidator = class extends BaseDataValidator {
 	}
 };
 
-//#endregion
-//#region src/types/const/operator-text-map.ts
-/**
-* Copyright 2023-present DreamNum Co., Ltd.
-*
-* 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.
-*/
-const OperatorTextMap = {
-	[DataValidationOperator.BETWEEN]: "dataValidation.operators.between",
-	[DataValidationOperator.EQUAL]: "dataValidation.operators.equal",
-	[DataValidationOperator.GREATER_THAN]: "dataValidation.operators.greaterThan",
-	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.operators.greaterThanOrEqual",
-	[DataValidationOperator.LESS_THAN]: "dataValidation.operators.lessThan",
-	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.operators.lessThanOrEqual",
-	[DataValidationOperator.NOT_BETWEEN]: "dataValidation.operators.notBetween",
-	[DataValidationOperator.NOT_EQUAL]: "dataValidation.operators.notEqual"
-};
-const OperatorTitleMap = {
-	[DataValidationOperator.BETWEEN]: "dataValidation.ruleName.between",
-	[DataValidationOperator.EQUAL]: "dataValidation.ruleName.equal",
-	[DataValidationOperator.GREATER_THAN]: "dataValidation.ruleName.greaterThan",
-	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.ruleName.greaterThanOrEqual",
-	[DataValidationOperator.LESS_THAN]: "dataValidation.ruleName.lessThan",
-	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.ruleName.lessThanOrEqual",
-	[DataValidationOperator.NOT_BETWEEN]: "dataValidation.ruleName.notBetween",
-	[DataValidationOperator.NOT_EQUAL]: "dataValidation.ruleName.notEqual"
-};
-const OperatorErrorTitleMap = {
-	[DataValidationOperator.BETWEEN]: "dataValidation.errorMsg.between",
-	[DataValidationOperator.EQUAL]: "dataValidation.errorMsg.equal",
-	[DataValidationOperator.GREATER_THAN]: "dataValidation.errorMsg.greaterThan",
-	[DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.errorMsg.greaterThanOrEqual",
-	[DataValidationOperator.LESS_THAN]: "dataValidation.errorMsg.lessThan",
-	[DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.errorMsg.lessThanOrEqual",
-	[DataValidationOperator.NOT_BETWEEN]: "dataValidation.errorMsg.notBetween",
-	[DataValidationOperator.NOT_EQUAL]: "dataValidation.errorMsg.notEqual",
-	NONE: "dataValidation.errorMsg.legal"
-};
-
 //#endregion
 //#region src/validators/decimal-validator.ts
 function getCellValueNumber(cellValue) {
 	return +cellValue;
 }
-var DecimalValidator = class extends BaseDataValidator {
+var DecimalValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "_customFormulaService", this.injector.get(DataValidationCustomFormulaService));
 		_defineProperty(this, "id", DataValidationType.DECIMAL);
 		_defineProperty(this, "_lexerTreeBuilder", this.injector.get(LexerTreeBuilder));
-		_defineProperty(this, "title", "dataValidation.decimal.title");
+		_defineProperty(this, "title", "sheets-data-validation.decimal.title");
 		_defineProperty(this, "order", 20);
 		_defineProperty(this, "operators", [
 			DataValidationOperator.BETWEEN,
@@ -1413,7 +1447,7 @@ var DecimalValidator = class extends BaseDataValidator {
 		const formula1Success = Tools.isDefine(rule.formula1) && this._isFormulaOrNumber(rule.formula1);
 		const formula2Success = Tools.isDefine(rule.formula2) && this._isFormulaOrNumber(rule.formula2);
 		const isTwoFormula = TWO_FORMULA_OPERATOR_COUNT.includes(operator);
-		const errorMsg = this.localeService.t("dataValidation.validFail.number");
+		const errorMsg = this.localeService.t("sheets-data-validation.validFail.number");
 		if (isTwoFormula) return {
 			success: formula1Success && formula2Success,
 			formula1: formula1Success ? void 0 : errorMsg,
@@ -1475,7 +1509,7 @@ function isRuleIntersects(rule, sheetName) {
 	}
 	return false;
 }
-var ListValidator = class extends BaseDataValidator {
+var ListValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "formulaService", this.injector.get(DataValidationFormulaService));
@@ -1485,7 +1519,7 @@ var ListValidator = class extends BaseDataValidator {
 		_defineProperty(this, "order", 50);
 		_defineProperty(this, "offsetFormulaByRange", false);
 		_defineProperty(this, "id", DataValidationType.LIST);
-		_defineProperty(this, "title", "dataValidation.list.title");
+		_defineProperty(this, "title", "sheets-data-validation.list.title");
 		_defineProperty(this, "operators", []);
 		_defineProperty(this, "scopes", ["sheet"]);
 		_defineProperty(this, "skipDefaultFontRender", (rule) => {
@@ -1500,7 +1534,7 @@ var ListValidator = class extends BaseDataValidator {
 		const isIntersects = isRuleIntersects(rule, sheetName !== null && sheetName !== void 0 ? sheetName : "");
 		return {
 			success: Boolean(success && valid && !isIntersects),
-			formula1: success ? valid ? !isIntersects ? void 0 : this.localeService.t("dataValidation.validFail.listIntersects") : this.localeService.t("dataValidation.validFail.listInvalid") : this.localeService.t("dataValidation.validFail.list")
+			formula1: success ? valid ? !isIntersects ? void 0 : this.localeService.t("sheets-data-validation.validFail.listIntersects") : this.localeService.t("sheets-data-validation.validFail.listInvalid") : this.localeService.t("sheets-data-validation.validFail.list")
 		};
 	}
 	getExtraStyle(rule, value, { style: defaultStyle }) {
@@ -1535,14 +1569,14 @@ var ListValidator = class extends BaseDataValidator {
 		return this.parseCellValue(value).every((i) => formula1Result.includes(i));
 	}
 	generateRuleName() {
-		return this.localeService.t("dataValidation.list.name");
+		return this.localeService.t("sheets-data-validation.list.name");
 	}
 	generateRuleErrorMessage() {
-		return this.localeService.t("dataValidation.list.error");
+		return this.localeService.t("sheets-data-validation.list.error");
 	}
 	_getUnitAndSubUnit(currentUnitId, currentSubUnitId) {
 		var _ref2, _ref3;
-		const workbook = (_ref2 = currentUnitId ? this._univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) !== null && _ref2 !== void 0 ? _ref2 : this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+		const workbook = (_ref2 = currentUnitId ? this._univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) !== null && _ref2 !== void 0 ? _ref2 : this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 		if (!workbook) return null;
 		const worksheet = (_ref3 = currentSubUnitId ? workbook.getSheetBySheetId(currentSubUnitId) : void 0) !== null && _ref3 !== void 0 ? _ref3 : workbook.getActiveSheet();
 		if (!worksheet) return null;
@@ -1582,11 +1616,11 @@ var ListValidator = class extends BaseDataValidator {
 
 //#endregion
 //#region src/validators/text-length-validator.ts
-var TextLengthValidator = class extends BaseDataValidator {
+var TextLengthValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "id", DataValidationType.TEXT_LENGTH);
-		_defineProperty(this, "title", "dataValidation.textLength.title");
+		_defineProperty(this, "title", "sheets-data-validation.textLength.title");
 		_defineProperty(this, "_lexerTreeBuilder", this.injector.get(LexerTreeBuilder));
 		_defineProperty(this, "order", 30);
 		_defineProperty(this, "operators", [
@@ -1611,7 +1645,7 @@ var TextLengthValidator = class extends BaseDataValidator {
 		const formula1Success = Tools.isDefine(rule.formula1) && this._isFormulaOrInt(rule.formula1);
 		const formula2Success = Tools.isDefine(rule.formula2) && this._isFormulaOrInt(rule.formula2);
 		const isTwoFormula = TWO_FORMULA_OPERATOR_COUNT.includes(operator);
-		const errorMsg = this.localeService.t("dataValidation.validFail.number");
+		const errorMsg = this.localeService.t("sheets-data-validation.validFail.number");
 		if (isTwoFormula) return {
 			success: formula1Success && formula2Success,
 			formula1: formula1Success ? void 0 : errorMsg,
@@ -2245,7 +2279,7 @@ let DataValidationFormulaController = class DataValidationFormulaController exte
 			if (typeof node === "string") continue;
 			const { token } = node;
 			const sequenceGrid = deserializeRangeWithSheetWithCache(token);
-			const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+			const workbook = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 			let targetSheet = workbook.getActiveSheet();
 			const unitId = workbook.getUnitId();
 			if (sequenceGrid.sheetName) {
@@ -2274,7 +2308,7 @@ DataValidationFormulaController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-data-validation";
-var version = "0.23.0";
+var version = "0.24.0-insiders.20260528-29f582d";
 
 //#endregion
 //#region src/config/config.ts
@@ -2666,7 +2700,7 @@ let SheetDataValidationSheetController = class SheetDataValidationSheetControlle
 			if (commandInfo.id === RemoveSheetCommand.id) {
 				var _workbook$getActiveSh;
 				const params = commandInfo.params;
-				const unitId = params.unitId || this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getUnitId();
+				const unitId = params.unitId || this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET).getUnitId();
 				const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
 				if (!workbook) return {
 					redos: [],
@@ -2757,11 +2791,11 @@ SheetDataValidationSheetController = __decorate([
 
 //#endregion
 //#region src/validators/any-validator.ts
-var AnyValidator = class extends BaseDataValidator {
+var AnyValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "id", DataValidationType.ANY);
-		_defineProperty(this, "title", "dataValidation.any.title");
+		_defineProperty(this, "title", "sheets-data-validation.any.title");
 		_defineProperty(this, "operators", []);
 		_defineProperty(this, "scopes", ["sheet"]);
 		_defineProperty(this, "order", 0);
@@ -2781,17 +2815,17 @@ var AnyValidator = class extends BaseDataValidator {
 		return true;
 	}
 	generateRuleErrorMessage(rule) {
-		return this.localeService.t("dataValidation.any.error");
+		return this.localeService.t("sheets-data-validation.any.error");
 	}
 };
 
 //#endregion
 //#region src/validators/custom-validator.ts
-var CustomFormulaValidator = class extends BaseDataValidator {
+var CustomFormulaValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "id", DataValidationType.CUSTOM);
-		_defineProperty(this, "title", "dataValidation.custom.title");
+		_defineProperty(this, "title", "sheets-data-validation.custom.title");
 		_defineProperty(this, "operators", []);
 		_defineProperty(this, "scopes", ["sheet"]);
 		_defineProperty(this, "order", 60);
@@ -2805,7 +2839,7 @@ var CustomFormulaValidator = class extends BaseDataValidator {
 		const valid = this._lexerTreeBuilder.checkIfAddBracket(formulaText) === 0 && formulaText.startsWith(operatorToken.EQUALS);
 		return {
 			success: success && valid,
-			formula1: success && valid ? "" : this.localeService.t("dataValidation.validFail.formula")
+			formula1: success && valid ? "" : this.localeService.t("sheets-data-validation.validFail.formula")
 		};
 	}
 	async parseFormula(_rule, _unitId, _subUnitId) {
@@ -2830,11 +2864,11 @@ var CustomFormulaValidator = class extends BaseDataValidator {
 		return false;
 	}
 	generateRuleErrorMessage(rule) {
-		return this.localeService.t("dataValidation.custom.error");
+		return this.localeService.t("sheets-data-validation.custom.error");
 	}
 	generateRuleName(rule) {
 		var _rule$formula2;
-		return this.localeService.t("dataValidation.custom.ruleName").replace("{FORMULA1}", (_rule$formula2 = rule.formula1) !== null && _rule$formula2 !== void 0 ? _rule$formula2 : "");
+		return this.localeService.t("sheets-data-validation.custom.ruleName").replace("{FORMULA1}", (_rule$formula2 = rule.formula1) !== null && _rule$formula2 !== void 0 ? _rule$formula2 : "");
 	}
 };
 
@@ -2859,7 +2893,7 @@ var ListMultipleValidator = class extends ListValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "id", DataValidationType.LIST_MULTIPLE);
-		_defineProperty(this, "title", "dataValidation.listMultiple.title");
+		_defineProperty(this, "title", "sheets-data-validation.listMultiple.title");
 		_defineProperty(this, "offsetFormulaByRange", false);
 		_defineProperty(this, "skipDefaultFontRender", () => {
 			return true;
@@ -2869,13 +2903,13 @@ var ListMultipleValidator = class extends ListValidator {
 
 //#endregion
 //#region src/validators/whole-validator.ts
-var WholeValidator = class extends BaseDataValidator {
+var WholeValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "_customFormulaService", this.injector.get(DataValidationCustomFormulaService));
 		_defineProperty(this, "_lexerTreeBuilder", this.injector.get(LexerTreeBuilder));
 		_defineProperty(this, "id", DataValidationType.WHOLE);
-		_defineProperty(this, "title", "dataValidation.whole.title");
+		_defineProperty(this, "title", "sheets-data-validation.whole.title");
 		_defineProperty(this, "order", 10);
 		_defineProperty(this, "operators", [
 			DataValidationOperator.BETWEEN,
@@ -2927,7 +2961,7 @@ var WholeValidator = class extends BaseDataValidator {
 		const formula1Success = Tools.isDefine(rule.formula1) && this._isFormulaOrInt(rule.formula1);
 		const formula2Success = Tools.isDefine(rule.formula2) && this._isFormulaOrInt(rule.formula2);
 		const isTwoFormula = TWO_FORMULA_OPERATOR_COUNT.includes(operator);
-		const errorMsg = this.localeService.t("dataValidation.validFail.number");
+		const errorMsg = this.localeService.t("sheets-data-validation.validFail.number");
 		if (isTwoFormula) return {
 			success: formula1Success && formula2Success,
 			formula1: formula1Success ? void 0 : errorMsg,
@@ -2983,7 +3017,7 @@ let DataValidationController = class DataValidationController extends RxDisposab
 		this._sheetInterceptorService.interceptCommand({ getMutations: (commandInfo) => {
 			if (commandInfo.id === ClearSelectionAllCommand.id) {
 				var _this$_selectionManag;
-				const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+				const workbook = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 				const unitId = workbook.getUnitId();
 				const worksheet = workbook.getActiveSheet();
 				if (!worksheet) throw new Error("No active sheet found");
@@ -3014,7 +3048,7 @@ DataValidationController = __decorate([
 ], DataValidationController);
 
 //#endregion
-//#region src/services/dv-validator-service.ts
+//#region src/services/dv-validator.service.ts
 let SheetsDataValidationValidatorService = class SheetsDataValidationValidatorService extends Disposable {
 	constructor(_univerInstanceService, _sheetDataValidationModel, _dataValidationCacheService, _lifecycleService) {
 		super();
@@ -3027,7 +3061,7 @@ let SheetsDataValidationValidatorService = class SheetsDataValidationValidatorSe
 	_initRecalculate() {
 		const handleDirtyRanges = (ranges) => {
 			if (ranges.length === 0) return;
-			const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+			const workbook = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 			const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getActiveSheet();
 			const map = {};
 			ranges.flat().forEach((range) => {
@@ -3089,8 +3123,14 @@ let SheetsDataValidationValidatorService = class SheetsDataValidationValidatorSe
 		if (!workbook) throw new Error(`cannot find current workbook, unitId: ${unitId}`);
 		const worksheet = workbook.getSheetBySheetId(subUnitId);
 		if (!worksheet) throw new Error(`cannot find current worksheet, sheetId: ${subUnitId}`);
-		const ruleRanges = this._sheetDataValidationModel.getRules(unitId, subUnitId).map((i) => i.ranges).flat();
-		const intersectRanges = ranges.map((range) => ruleRanges.map((ruleRange) => getIntersectRange(range, ruleRange))).flat().filter(Boolean);
+		const allRules = this._sheetDataValidationModel.getRules(unitId, subUnitId);
+		const ruleRanges = [];
+		for (const rule of allRules) ruleRanges.push(...rule.ranges);
+		const intersectRanges = [];
+		for (const range of ranges) for (const ruleRange of ruleRanges) {
+			const intersect = getIntersectRange(range, ruleRange);
+			if (intersect) intersectRanges.push(intersect);
+		}
 		const mergeCells = [];
 		const result = await Promise.all(intersectRanges.map((range, resultRowIndex) => {
 			const promises = [];
@@ -3153,7 +3193,12 @@ let SheetsDataValidationValidatorService = class SheetsDataValidationValidatorSe
 				if (ruleId) ruleIdSet.add(ruleId);
 			});
 		});
-		return Array.from(ruleIdSet).map((id) => this._sheetDataValidationModel.getRuleById(unitId, subUnitId, id)).filter(Boolean);
+		const rules = [];
+		for (const id of ruleIdSet) {
+			const rule = this._sheetDataValidationModel.getRuleById(unitId, subUnitId, id);
+			if (rule) rules.push(rule);
+		}
+		return rules;
 	}
 	getDataValidation(unitId, subUnitId, ranges) {
 		return this.getDataValidations(unitId, subUnitId, ranges)[0];
@@ -3249,10 +3294,10 @@ function createDefaultNewRule(accessor) {
 
 //#endregion
 //#region src/index.ts
-const CUSTOM_FORMULA_INPUT_NAME = "data-validation.custom-formula-input";
-const BASE_FORMULA_INPUT_NAME = "data-validation.formula-input";
-const LIST_FORMULA_INPUT_NAME = "data-validation.list-formula-input";
-const CHECKBOX_FORMULA_INPUT_NAME = "data-validation.checkbox-formula-input";
+const CUSTOM_FORMULA_INPUT_NAME = "sheets-data-validation.custom-formula-input";
+const BASE_FORMULA_INPUT_NAME = "sheets-data-validation.formula-input";
+const LIST_FORMULA_INPUT_NAME = "sheets-data-validation.list-formula-input";
+const CHECKBOX_FORMULA_INPUT_NAME = "sheets-data-validation.checkbox-formula-input";
 
 //#endregion
-export { AddSheetDataValidationCommand, BASE_FORMULA_INPUT_NAME, CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2, CHECKBOX_FORMULA_INPUT_NAME, CUSTOM_FORMULA_INPUT_NAME, CheckboxValidator, ClearRangeDataValidationCommand, DATA_VALIDATION_PLUGIN_NAME, DataValidationCacheService, DataValidationCustomFormulaService, DataValidationFormulaController, DataValidationFormulaService, DataValidationListCacheService, DateValidator, LIST_FORMULA_INPUT_NAME, ListMultipleValidator, ListValidator, RemoveSheetAllDataValidationCommand, RemoveSheetDataValidationCommand, SheetDataValidationModel, SheetsDataValidationValidatorService, UniverSheetsDataValidationPlugin, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand, createDefaultNewRule, deserializeListOptions, getCellValueNumber, getCellValueOrigin, getDataValidationCellValue, getDataValidationDiffMutations, getFormulaCellData, getFormulaResult, getTransformedFormula, isLegalFormulaResult, serializeListOptions, transformCheckboxValue };
+export { AddSheetDataValidationCommand, BASE_FORMULA_INPUT_NAME, CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2, CHECKBOX_FORMULA_INPUT_NAME, CUSTOM_FORMULA_INPUT_NAME, CheckboxValidator, ClearRangeDataValidationCommand, DATA_VALIDATION_PLUGIN_NAME, DataValidationCacheService, DataValidationCustomFormulaService, DataValidationFormulaController, DataValidationFormulaService, DataValidationListCacheService, DateValidator, LIST_FORMULA_INPUT_NAME, ListMultipleValidator, ListValidator, RemoveSheetAllDataValidationCommand, RemoveSheetDataValidationCommand, SheetDataValidationModel, SheetsDataValidationValidatorService, UniverSheetsDataValidationPlugin, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand, createDefaultNewRule, getCellValueNumber, getCellValueOrigin, getDataValidationCellValue, getDataValidationDiffMutations, getFormulaCellData, getFormulaResult, getTransformedFormula, isLegalFormulaResult, transformCheckboxValue };