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

package/lib/cjs/index.js

@@ -86,7 +86,14 @@ let DataValidationCacheService = class DataValidationCacheService extends _unive
 				if (cellValue) {
 					const range = new _univerjs_core.ObjectMatrix(cellValue).getDataRange();
 					if (range.endRow === -1) return;
-					const intersectsRanges = this._sheetDataValidationModel.getRules(unitId, subUnitId).map((rule) => rule.ranges).flat().map((ruleRange) => (0, _univerjs_core.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 = (0, _univerjs_core.getIntersectRange)(ruleRange, range);
+						if (intersect) intersectsRanges.push(intersect);
+					}
 					if (intersectsRanges.length) this.markRangeDirty(unitId, subUnitId, intersectsRanges, true);
 				}
 			}
@@ -382,31 +389,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: (0, _univerjs_core.isFormulaString)(formula1) ? lexerTreeBuilder.moveFormulaRefOffset(formula1, offsetColumn, offsetRow, true) : formula1,
-		transformedFormula2: (0, _univerjs_core.isFormulaString)(formula2) ? lexerTreeBuilder.moveFormulaRefOffset(formula2, offsetColumn, offsetRow, true) : formula2
-	};
-}
-
 //#endregion
 //#region src/services/dv-list-cache.service.ts
 let DataValidationListCacheService = class DataValidationListCacheService extends _univerjs_core.Disposable {
@@ -477,7 +459,7 @@ let DataValidationListCacheService = class DataValidationListCacheService extend
 	computeAndCache(unitId, subUnitId, rule, formulaResult) {
 		var _formulaResult$;
 		const { formula1 = "", formula2 = "" } = rule;
-		const list = (0, _univerjs_core.isFormulaString)(formula1) ? this._getRuleFormulaResultSet(formulaResult === null || formulaResult === void 0 || (_formulaResult$ = formulaResult[0]) === null || _formulaResult$ === void 0 || (_formulaResult$ = _formulaResult$.result) === null || _formulaResult$ === void 0 || (_formulaResult$ = _formulaResult$[0]) === null || _formulaResult$ === void 0 ? void 0 : _formulaResult$[0]) : deserializeListOptions(formula1);
+		const list = (0, _univerjs_core.isFormulaString)(formula1) ? this._getRuleFormulaResultSet(formulaResult === null || formulaResult === void 0 || (_formulaResult$ = formulaResult[0]) === null || _formulaResult$ === void 0 || (_formulaResult$ = _formulaResult$.result) === null || _formulaResult$ === void 0 || (_formulaResult$ = _formulaResult$[0]) === null || _formulaResult$ === void 0 ? void 0 : _formulaResult$[0]) : (0, _univerjs_sheets.deserializeListOptions)(formula1);
 		const colorList = formula2.split(",");
 		const listWithColor = list.map((label, i) => ({
 			label,
@@ -1005,21 +987,103 @@ SheetDataValidationModel = __decorate([
 	__decorateParam(6, _univerjs_core.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 = {
+	[_univerjs_core.DataValidationOperator.BETWEEN]: "sheets-data-validation.operators.between",
+	[_univerjs_core.DataValidationOperator.EQUAL]: "sheets-data-validation.operators.equal",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "sheets-data-validation.operators.greaterThan",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.operators.greaterThanOrEqual",
+	[_univerjs_core.DataValidationOperator.LESS_THAN]: "sheets-data-validation.operators.lessThan",
+	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.operators.lessThanOrEqual",
+	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.operators.notBetween",
+	[_univerjs_core.DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.operators.notEqual"
+};
+const OperatorTitleMap = {
+	[_univerjs_core.DataValidationOperator.BETWEEN]: "sheets-data-validation.ruleName.between",
+	[_univerjs_core.DataValidationOperator.EQUAL]: "sheets-data-validation.ruleName.equal",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "sheets-data-validation.ruleName.greaterThan",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.ruleName.greaterThanOrEqual",
+	[_univerjs_core.DataValidationOperator.LESS_THAN]: "sheets-data-validation.ruleName.lessThan",
+	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.ruleName.lessThanOrEqual",
+	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.ruleName.notBetween",
+	[_univerjs_core.DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.ruleName.notEqual",
+	NONE: "sheets-data-validation.ruleName.legal"
+};
+const OperatorErrorTitleMap = {
+	[_univerjs_core.DataValidationOperator.BETWEEN]: "sheets-data-validation.errorMsg.between",
+	[_univerjs_core.DataValidationOperator.EQUAL]: "sheets-data-validation.errorMsg.equal",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "sheets-data-validation.errorMsg.greaterThan",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.errorMsg.greaterThanOrEqual",
+	[_univerjs_core.DataValidationOperator.LESS_THAN]: "sheets-data-validation.errorMsg.lessThan",
+	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.errorMsg.lessThanOrEqual",
+	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.errorMsg.notBetween",
+	[_univerjs_core.DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.errorMsg.notEqual",
+	NONE: "sheets-data-validation.errorMsg.legal"
+};
+const TextLengthErrorTitleMap = {
+	[_univerjs_core.DataValidationOperator.BETWEEN]: "sheets-data-validation.textLength.errorMsg.between",
+	[_univerjs_core.DataValidationOperator.EQUAL]: "sheets-data-validation.textLength.errorMsg.equal",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "sheets-data-validation.textLength.errorMsg.greaterThan",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.textLength.errorMsg.greaterThanOrEqual",
+	[_univerjs_core.DataValidationOperator.LESS_THAN]: "sheets-data-validation.textLength.errorMsg.lessThan",
+	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.textLength.errorMsg.lessThanOrEqual",
+	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.textLength.errorMsg.notBetween",
+	[_univerjs_core.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 _univerjs_data_validation.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 (_univerjs_core.Tools.isBlank(formula)) return localeService.t("dataValidation.validFail.value");
-	if ((0, _univerjs_core.isFormulaString)(formula)) return localeService.t("dataValidation.validFail.primitive");
+	if (_univerjs_core.Tools.isBlank(formula)) return localeService.t("sheets-data-validation.validFail.value");
+	if ((0, _univerjs_core.isFormulaString)(formula)) return localeService.t("sheets-data-validation.validFail.primitive");
 	return "";
 }
 const transformCheckboxValue = (value) => _univerjs_core.Tools.isDefine(value) && String(value).toLowerCase() === "true" ? "1" : String(value).toLowerCase() === "false" ? "0" : value;
-var CheckboxValidator = class extends _univerjs_data_validation.BaseDataValidator {
+var CheckboxValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "id", _univerjs_core.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);
@@ -1038,8 +1102,8 @@ var CheckboxValidator = class extends _univerjs_data_validation.BaseDataValidato
 		if (_univerjs_core.Tools.isBlank(formula1) && _univerjs_core.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);
@@ -1089,7 +1153,7 @@ var CheckboxValidator = class extends _univerjs_data_validation.BaseDataValidato
 		return _univerjs_core.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;
@@ -1114,46 +1178,46 @@ var CheckboxValidator = class extends _univerjs_data_validation.BaseDataValidato
 * limitations under the License.
 */
 const DateOperatorNameMap = {
-	[_univerjs_core.DataValidationOperator.BETWEEN]: "dataValidation.date.operators.between",
-	[_univerjs_core.DataValidationOperator.EQUAL]: "dataValidation.date.operators.equal",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.date.operators.greaterThanOrEqual",
-	[_univerjs_core.DataValidationOperator.LESS_THAN]: "dataValidation.date.operators.lessThan",
-	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.date.operators.lessThanOrEqual",
-	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "dataValidation.date.operators.notBetween",
-	[_univerjs_core.DataValidationOperator.NOT_EQUAL]: "dataValidation.date.operators.notEqual"
+	[_univerjs_core.DataValidationOperator.BETWEEN]: "sheets-data-validation.date.operators.between",
+	[_univerjs_core.DataValidationOperator.EQUAL]: "sheets-data-validation.date.operators.equal",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "sheets-data-validation.date.operators.greaterThan",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.date.operators.greaterThanOrEqual",
+	[_univerjs_core.DataValidationOperator.LESS_THAN]: "sheets-data-validation.date.operators.lessThan",
+	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.date.operators.lessThanOrEqual",
+	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.date.operators.notBetween",
+	[_univerjs_core.DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.date.operators.notEqual"
 };
 const DateOperatorTextMap = {
-	[_univerjs_core.DataValidationOperator.BETWEEN]: "dataValidation.date.operators.between",
-	[_univerjs_core.DataValidationOperator.EQUAL]: "dataValidation.date.operators.equal",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "dataValidation.date.operators.greaterThan",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.date.operators.greaterThanOrEqual",
-	[_univerjs_core.DataValidationOperator.LESS_THAN]: "dataValidation.date.operators.lessThan",
-	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.date.operators.lessThanOrEqual",
-	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "dataValidation.date.operators.notBetween",
-	[_univerjs_core.DataValidationOperator.NOT_EQUAL]: "dataValidation.date.operators.notEqual"
+	[_univerjs_core.DataValidationOperator.BETWEEN]: "sheets-data-validation.date.operators.between",
+	[_univerjs_core.DataValidationOperator.EQUAL]: "sheets-data-validation.date.operators.equal",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "sheets-data-validation.date.operators.greaterThan",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.date.operators.greaterThanOrEqual",
+	[_univerjs_core.DataValidationOperator.LESS_THAN]: "sheets-data-validation.date.operators.lessThan",
+	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.date.operators.lessThanOrEqual",
+	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.date.operators.notBetween",
+	[_univerjs_core.DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.date.operators.notEqual"
 };
 const DateOperatorTitleMap = {
-	[_univerjs_core.DataValidationOperator.BETWEEN]: "dataValidation.date.ruleName.between",
-	[_univerjs_core.DataValidationOperator.EQUAL]: "dataValidation.date.ruleName.equal",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "dataValidation.date.ruleName.greaterThan",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.date.ruleName.greaterThanOrEqual",
-	[_univerjs_core.DataValidationOperator.LESS_THAN]: "dataValidation.date.ruleName.lessThan",
-	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.date.ruleName.lessThanOrEqual",
-	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "dataValidation.date.ruleName.notBetween",
-	[_univerjs_core.DataValidationOperator.NOT_EQUAL]: "dataValidation.date.ruleName.notEqual",
-	NONE: "dataValidation.date.ruleName.legal"
+	[_univerjs_core.DataValidationOperator.BETWEEN]: "sheets-data-validation.date.ruleName.between",
+	[_univerjs_core.DataValidationOperator.EQUAL]: "sheets-data-validation.date.ruleName.equal",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "sheets-data-validation.date.ruleName.greaterThan",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.date.ruleName.greaterThanOrEqual",
+	[_univerjs_core.DataValidationOperator.LESS_THAN]: "sheets-data-validation.date.ruleName.lessThan",
+	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.date.ruleName.lessThanOrEqual",
+	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.date.ruleName.notBetween",
+	[_univerjs_core.DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.date.ruleName.notEqual",
+	NONE: "sheets-data-validation.date.ruleName.legal"
 };
 const DateOperatorErrorTitleMap = {
-	[_univerjs_core.DataValidationOperator.BETWEEN]: "dataValidation.date.errorMsg.between",
-	[_univerjs_core.DataValidationOperator.EQUAL]: "dataValidation.date.errorMsg.equal",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "dataValidation.date.errorMsg.greaterThan",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.greaterThanOrEqual",
-	[_univerjs_core.DataValidationOperator.LESS_THAN]: "dataValidation.date.errorMsg.lessThan",
-	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.date.errorMsg.lessThanOrEqual",
-	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "dataValidation.date.errorMsg.notBetween",
-	[_univerjs_core.DataValidationOperator.NOT_EQUAL]: "dataValidation.date.errorMsg.notEqual",
-	NONE: "dataValidation.date.errorMsg.legal"
+	[_univerjs_core.DataValidationOperator.BETWEEN]: "sheets-data-validation.date.errorMsg.between",
+	[_univerjs_core.DataValidationOperator.EQUAL]: "sheets-data-validation.date.errorMsg.equal",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "sheets-data-validation.date.errorMsg.greaterThan",
+	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "sheets-data-validation.date.errorMsg.greaterThanOrEqual",
+	[_univerjs_core.DataValidationOperator.LESS_THAN]: "sheets-data-validation.date.errorMsg.lessThan",
+	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "sheets-data-validation.date.errorMsg.lessThanOrEqual",
+	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "sheets-data-validation.date.errorMsg.notBetween",
+	[_univerjs_core.DataValidationOperator.NOT_EQUAL]: "sheets-data-validation.date.errorMsg.notEqual",
+	NONE: "sheets-data-validation.date.errorMsg.legal"
 };
 
 //#endregion
@@ -1195,6 +1259,25 @@ const TWO_FORMULA_OPERATOR_COUNT = [_univerjs_core.DataValidationOperator.BETWEE
 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: (0, _univerjs_core.isFormulaString)(formula1) ? lexerTreeBuilder.moveFormulaRefOffset(formula1, offsetColumn, offsetRow, true) : formula1,
+		transformedFormula2: (0, _univerjs_core.isFormulaString)(formula2) ? lexerTreeBuilder.moveFormulaRefOffset(formula2, offsetColumn, offsetRow, true) : formula2
+	};
+}
+
 //#endregion
 //#region src/validators/date-validator.ts
 const transformDate2SerialNumber = (value) => {
@@ -1205,11 +1288,11 @@ const transformDate2SerialNumber = (value) => {
 	if (_univerjs_core.Tools.isDefine(v)) return v;
 	return (_numfmt$parseDate2 = _univerjs_core.numfmt.parseDate((0, _univerjs_core.dateKit)(value).format("YYYY-MM-DD HH:mm:ss"))) === null || _numfmt$parseDate2 === void 0 ? void 0 : _numfmt$parseDate2.v;
 };
-var DateValidator = class extends _univerjs_data_validation.BaseDataValidator {
+var DateValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "id", _univerjs_core.DataValidationType.DATE);
-		_defineProperty(this, "title", "dataValidation.date.title");
+		_defineProperty(this, "title", "sheets-data-validation.date.title");
 		_defineProperty(this, "order", 40);
 		_defineProperty(this, "operators", [
 			_univerjs_core.DataValidationOperator.BETWEEN,
@@ -1249,7 +1332,7 @@ var DateValidator = class extends _univerjs_data_validation.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 {
@@ -1305,67 +1388,18 @@ var DateValidator = class extends _univerjs_data_validation.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 = {
-	[_univerjs_core.DataValidationOperator.BETWEEN]: "dataValidation.operators.between",
-	[_univerjs_core.DataValidationOperator.EQUAL]: "dataValidation.operators.equal",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "dataValidation.operators.greaterThan",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.operators.greaterThanOrEqual",
-	[_univerjs_core.DataValidationOperator.LESS_THAN]: "dataValidation.operators.lessThan",
-	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.operators.lessThanOrEqual",
-	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "dataValidation.operators.notBetween",
-	[_univerjs_core.DataValidationOperator.NOT_EQUAL]: "dataValidation.operators.notEqual"
-};
-const OperatorTitleMap = {
-	[_univerjs_core.DataValidationOperator.BETWEEN]: "dataValidation.ruleName.between",
-	[_univerjs_core.DataValidationOperator.EQUAL]: "dataValidation.ruleName.equal",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "dataValidation.ruleName.greaterThan",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.ruleName.greaterThanOrEqual",
-	[_univerjs_core.DataValidationOperator.LESS_THAN]: "dataValidation.ruleName.lessThan",
-	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.ruleName.lessThanOrEqual",
-	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "dataValidation.ruleName.notBetween",
-	[_univerjs_core.DataValidationOperator.NOT_EQUAL]: "dataValidation.ruleName.notEqual"
-};
-const OperatorErrorTitleMap = {
-	[_univerjs_core.DataValidationOperator.BETWEEN]: "dataValidation.errorMsg.between",
-	[_univerjs_core.DataValidationOperator.EQUAL]: "dataValidation.errorMsg.equal",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN]: "dataValidation.errorMsg.greaterThan",
-	[_univerjs_core.DataValidationOperator.GREATER_THAN_OR_EQUAL]: "dataValidation.errorMsg.greaterThanOrEqual",
-	[_univerjs_core.DataValidationOperator.LESS_THAN]: "dataValidation.errorMsg.lessThan",
-	[_univerjs_core.DataValidationOperator.LESS_THAN_OR_EQUAL]: "dataValidation.errorMsg.lessThanOrEqual",
-	[_univerjs_core.DataValidationOperator.NOT_BETWEEN]: "dataValidation.errorMsg.notBetween",
-	[_univerjs_core.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 _univerjs_data_validation.BaseDataValidator {
+var DecimalValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "_customFormulaService", this.injector.get(DataValidationCustomFormulaService));
 		_defineProperty(this, "id", _univerjs_core.DataValidationType.DECIMAL);
 		_defineProperty(this, "_lexerTreeBuilder", this.injector.get(_univerjs_engine_formula.LexerTreeBuilder));
-		_defineProperty(this, "title", "dataValidation.decimal.title");
+		_defineProperty(this, "title", "sheets-data-validation.decimal.title");
 		_defineProperty(this, "order", 20);
 		_defineProperty(this, "operators", [
 			_univerjs_core.DataValidationOperator.BETWEEN,
@@ -1414,7 +1448,7 @@ var DecimalValidator = class extends _univerjs_data_validation.BaseDataValidator
 		const formula1Success = _univerjs_core.Tools.isDefine(rule.formula1) && this._isFormulaOrNumber(rule.formula1);
 		const formula2Success = _univerjs_core.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,
@@ -1476,7 +1510,7 @@ function isRuleIntersects(rule, sheetName) {
 	}
 	return false;
 }
-var ListValidator = class extends _univerjs_data_validation.BaseDataValidator {
+var ListValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "formulaService", this.injector.get(DataValidationFormulaService));
@@ -1486,7 +1520,7 @@ var ListValidator = class extends _univerjs_data_validation.BaseDataValidator {
 		_defineProperty(this, "order", 50);
 		_defineProperty(this, "offsetFormulaByRange", false);
 		_defineProperty(this, "id", _univerjs_core.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) => {
@@ -1501,7 +1535,7 @@ var ListValidator = class extends _univerjs_data_validation.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 }) {
@@ -1517,7 +1551,7 @@ var ListValidator = class extends _univerjs_data_validation.BaseDataValidator {
 		return { tb };
 	}
 	parseCellValue(cellValue) {
-		return deserializeListOptions(cellValue.toString());
+		return (0, _univerjs_sheets.deserializeListOptions)(cellValue.toString());
 	}
 	async parseFormula(rule, unitId, subUnitId) {
 		var _results$;
@@ -1532,18 +1566,18 @@ var ListValidator = class extends _univerjs_data_validation.BaseDataValidator {
 	async isValidType(cellInfo, formula, rule) {
 		const { value, unitId, subUnitId } = cellInfo;
 		const { formula1 = "" } = rule;
-		const formula1Result = (0, _univerjs_core.isFormulaString)(formula1) ? this._listCacheService.getOrCompute(unitId, subUnitId, rule).list : deserializeListOptions(formula1);
+		const formula1Result = (0, _univerjs_core.isFormulaString)(formula1) ? this._listCacheService.getOrCompute(unitId, subUnitId, rule).list : (0, _univerjs_sheets.deserializeListOptions)(formula1);
 		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(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
+		const workbook = (_ref2 = currentUnitId ? this._univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) !== null && _ref2 !== void 0 ? _ref2 : this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.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;
@@ -1565,7 +1599,7 @@ var ListValidator = class extends _univerjs_data_validation.BaseDataValidator {
 		if (!location) return [];
 		const { unitId, subUnitId } = location;
 		const results = await this.formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);
-		return (0, _univerjs_core.isFormulaString)(formula1) ? getRuleFormulaResultSet(results === null || results === void 0 || (_results$2 = results[0]) === null || _results$2 === void 0 || (_results$2 = _results$2.result) === null || _results$2 === void 0 ? void 0 : _results$2[0][0]) : deserializeListOptions(formula1);
+		return (0, _univerjs_core.isFormulaString)(formula1) ? getRuleFormulaResultSet(results === null || results === void 0 || (_results$2 = results[0]) === null || _results$2 === void 0 || (_results$2 = _results$2.result) === null || _results$2 === void 0 ? void 0 : _results$2[0][0]) : (0, _univerjs_sheets.deserializeListOptions)(formula1);
 	}
 	getListWithColor(rule, currentUnitId, currentSubUnitId) {
 		const location = this._getUnitAndSubUnit(currentUnitId, currentSubUnitId);
@@ -1583,11 +1617,11 @@ var ListValidator = class extends _univerjs_data_validation.BaseDataValidator {
 
 //#endregion
 //#region src/validators/text-length-validator.ts
-var TextLengthValidator = class extends _univerjs_data_validation.BaseDataValidator {
+var TextLengthValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "id", _univerjs_core.DataValidationType.TEXT_LENGTH);
-		_defineProperty(this, "title", "dataValidation.textLength.title");
+		_defineProperty(this, "title", "sheets-data-validation.textLength.title");
 		_defineProperty(this, "_lexerTreeBuilder", this.injector.get(_univerjs_engine_formula.LexerTreeBuilder));
 		_defineProperty(this, "order", 30);
 		_defineProperty(this, "operators", [
@@ -1612,7 +1646,7 @@ var TextLengthValidator = class extends _univerjs_data_validation.BaseDataValida
 		const formula1Success = _univerjs_core.Tools.isDefine(rule.formula1) && this._isFormulaOrInt(rule.formula1);
 		const formula2Success = _univerjs_core.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,
@@ -1651,7 +1685,7 @@ var TextLengthValidator = class extends _univerjs_data_validation.BaseDataValida
 	generateRuleErrorMessage(rule, pos) {
 		if (!rule.operator) return this.titleStr;
 		const { transformedFormula1, transformedFormula2 } = getTransformedFormula(this._lexerTreeBuilder, rule, pos);
-		return `${this.localeService.t(_univerjs_data_validation.TextLengthErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 !== null && transformedFormula1 !== void 0 ? transformedFormula1 : "").replace(FORMULA2, transformedFormula2 !== null && transformedFormula2 !== void 0 ? transformedFormula2 : "")}`;
+		return `${this.localeService.t(TextLengthErrorTitleMap[rule.operator]).replace(FORMULA1, transformedFormula1 !== null && transformedFormula1 !== void 0 ? transformedFormula1 : "").replace(FORMULA2, transformedFormula2 !== null && transformedFormula2 !== void 0 ? transformedFormula2 : "")}`;
 	}
 };
 
@@ -2246,7 +2280,7 @@ let DataValidationFormulaController = class DataValidationFormulaController exte
 			if (typeof node === "string") continue;
 			const { token } = node;
 			const sequenceGrid = (0, _univerjs_engine_formula.deserializeRangeWithSheetWithCache)(token);
-			const workbook = this._univerInstanceService.getCurrentUnitForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
+			const workbook = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
 			let targetSheet = workbook.getActiveSheet();
 			const unitId = workbook.getUnitId();
 			if (sequenceGrid.sheetName) {
@@ -2275,7 +2309,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
@@ -2667,7 +2701,7 @@ let SheetDataValidationSheetController = class SheetDataValidationSheetControlle
 			if (commandInfo.id === _univerjs_sheets.RemoveSheetCommand.id) {
 				var _workbook$getActiveSh;
 				const params = commandInfo.params;
-				const unitId = params.unitId || this._univerInstanceService.getCurrentUnitForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).getUnitId();
+				const unitId = params.unitId || this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).getUnitId();
 				const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
 				if (!workbook) return {
 					redos: [],
@@ -2758,11 +2792,11 @@ SheetDataValidationSheetController = __decorate([
 
 //#endregion
 //#region src/validators/any-validator.ts
-var AnyValidator = class extends _univerjs_data_validation.BaseDataValidator {
+var AnyValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "id", _univerjs_core.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);
@@ -2782,17 +2816,17 @@ var AnyValidator = class extends _univerjs_data_validation.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 _univerjs_data_validation.BaseDataValidator {
+var CustomFormulaValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "id", _univerjs_core.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);
@@ -2806,7 +2840,7 @@ var CustomFormulaValidator = class extends _univerjs_data_validation.BaseDataVal
 		const valid = this._lexerTreeBuilder.checkIfAddBracket(formulaText) === 0 && formulaText.startsWith(_univerjs_engine_formula.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) {
@@ -2831,11 +2865,11 @@ var CustomFormulaValidator = class extends _univerjs_data_validation.BaseDataVal
 		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 : "");
 	}
 };
 
@@ -2860,7 +2894,7 @@ var ListMultipleValidator = class extends ListValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "id", _univerjs_core.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;
@@ -2870,13 +2904,13 @@ var ListMultipleValidator = class extends ListValidator {
 
 //#endregion
 //#region src/validators/whole-validator.ts
-var WholeValidator = class extends _univerjs_data_validation.BaseDataValidator {
+var WholeValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
 		_defineProperty(this, "_customFormulaService", this.injector.get(DataValidationCustomFormulaService));
 		_defineProperty(this, "_lexerTreeBuilder", this.injector.get(_univerjs_engine_formula.LexerTreeBuilder));
 		_defineProperty(this, "id", _univerjs_core.DataValidationType.WHOLE);
-		_defineProperty(this, "title", "dataValidation.whole.title");
+		_defineProperty(this, "title", "sheets-data-validation.whole.title");
 		_defineProperty(this, "order", 10);
 		_defineProperty(this, "operators", [
 			_univerjs_core.DataValidationOperator.BETWEEN,
@@ -2928,7 +2962,7 @@ var WholeValidator = class extends _univerjs_data_validation.BaseDataValidator {
 		const formula1Success = _univerjs_core.Tools.isDefine(rule.formula1) && this._isFormulaOrInt(rule.formula1);
 		const formula2Success = _univerjs_core.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,
@@ -2984,7 +3018,7 @@ let DataValidationController = class DataValidationController extends _univerjs_
 		this._sheetInterceptorService.interceptCommand({ getMutations: (commandInfo) => {
 			if (commandInfo.id === _univerjs_sheets.ClearSelectionAllCommand.id) {
 				var _this$_selectionManag;
-				const workbook = this._univerInstanceService.getCurrentUnitForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
+				const workbook = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
 				const unitId = workbook.getUnitId();
 				const worksheet = workbook.getActiveSheet();
 				if (!worksheet) throw new Error("No active sheet found");
@@ -3015,7 +3049,7 @@ DataValidationController = __decorate([
 ], DataValidationController);
 
 //#endregion
-//#region src/services/dv-validator-service.ts
+//#region src/services/dv-validator.service.ts
 let SheetsDataValidationValidatorService = class SheetsDataValidationValidatorService extends _univerjs_core.Disposable {
 	constructor(_univerInstanceService, _sheetDataValidationModel, _dataValidationCacheService, _lifecycleService) {
 		super();
@@ -3028,7 +3062,7 @@ let SheetsDataValidationValidatorService = class SheetsDataValidationValidatorSe
 	_initRecalculate() {
 		const handleDirtyRanges = (ranges) => {
 			if (ranges.length === 0) return;
-			const workbook = this._univerInstanceService.getCurrentUnitForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
+			const workbook = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
 			const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getActiveSheet();
 			const map = {};
 			ranges.flat().forEach((range) => {
@@ -3090,8 +3124,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) => (0, _univerjs_core.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 = (0, _univerjs_core.getIntersectRange)(range, ruleRange);
+			if (intersect) intersectRanges.push(intersect);
+		}
 		const mergeCells = [];
 		const result = await Promise.all(intersectRanges.map((range, resultRowIndex) => {
 			const promises = [];
@@ -3154,7 +3194,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];
@@ -3250,10 +3295,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
 exports.AddSheetDataValidationCommand = AddSheetDataValidationCommand;
@@ -3323,7 +3368,6 @@ exports.UpdateSheetDataValidationOptionsCommand = UpdateSheetDataValidationOptio
 exports.UpdateSheetDataValidationRangeCommand = UpdateSheetDataValidationRangeCommand;
 exports.UpdateSheetDataValidationSettingCommand = UpdateSheetDataValidationSettingCommand;
 exports.createDefaultNewRule = createDefaultNewRule;
-exports.deserializeListOptions = deserializeListOptions;
 exports.getCellValueNumber = getCellValueNumber;
 exports.getCellValueOrigin = getCellValueOrigin;
 exports.getDataValidationCellValue = getDataValidationCellValue;
@@ -3332,5 +3376,4 @@ exports.getFormulaCellData = getFormulaCellData;
 exports.getFormulaResult = getFormulaResult;
 exports.getTransformedFormula = getTransformedFormula;
 exports.isLegalFormulaResult = isLegalFormulaResult;
-exports.serializeListOptions = serializeListOptions;
 exports.transformCheckboxValue = transformCheckboxValue;