@univerjs/sheets-data-validation 1.0.0-insiders.20260813-7c9aa50 → 1.0.0

package/lib/cjs/index.js

@@ -7,7 +7,36 @@ let rxjs = require("rxjs");
 let _univerjs_protocol = require("@univerjs/protocol");
 let _univerjs_sheets_formula = require("@univerjs/sheets-formula");
 
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region src/utils/range.ts
+function getRangeInWorksheet(range, worksheet) {
+	const maxRows = worksheet.getMaxRows();
+	const maxColumns = worksheet.getMaxColumns();
+	if (maxRows <= 0 || maxColumns <= 0) return null;
+	const effectiveRange = (0, _univerjs_core.getIntersectRange)(_univerjs_core.Range.transformRange(range, worksheet), {
+		startRow: 0,
+		endRow: maxRows - 1,
+		startColumn: 0,
+		endColumn: maxColumns - 1
+	});
+	if (!effectiveRange) return null;
+	return {
+		startRow: effectiveRange.startRow,
+		endRow: effectiveRange.endRow,
+		startColumn: effectiveRange.startColumn,
+		endColumn: effectiveRange.endColumn
+	};
+}
+function getRangesInWorksheet(ranges, worksheet) {
+	const effectiveRanges = [];
+	ranges.forEach((range) => {
+		const effectiveRange = getRangeInWorksheet(range, worksheet);
+		if (effectiveRange) effectiveRanges.push(effectiveRange);
+	});
+	return effectiveRanges;
+}
+
+//#endregion
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -18,7 +47,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -31,14 +60,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -49,7 +78,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -57,7 +86,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -133,9 +162,15 @@ let DataValidationCacheService = class DataValidationCacheService extends _unive
 	removeRule(unitId, subUnitId, rule) {
 		this._deleteRange(unitId, subUnitId, rule.ranges);
 	}
+	_getEffectiveRanges(unitId, subUnitId, ranges) {
+		var _this$_univerInstance;
+		const worksheet = (_this$_univerInstance = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getSheetBySheetId(subUnitId);
+		if (!worksheet) return [];
+		return getRangesInWorksheet(ranges, worksheet);
+	}
 	markRangeDirty(unitId, subUnitId, ranges, isSetRange) {
 		const cache = this._ensureCache(unitId, subUnitId);
-		ranges.forEach((range) => {
+		this._getEffectiveRanges(unitId, subUnitId, ranges).forEach((range) => {
 			_univerjs_core.Range.foreach(range, (row, col) => {
 				if (cache.getValue(row, col) !== void 0) cache.setValue(row, col, void 0);
 			});
@@ -149,7 +184,7 @@ let DataValidationCacheService = class DataValidationCacheService extends _unive
 	}
 	_deleteRange(unitId, subUnitId, ranges) {
 		const cache = this._ensureCache(unitId, subUnitId);
-		ranges.forEach((range) => {
+		this._getEffectiveRanges(unitId, subUnitId, ranges).forEach((range) => {
 			_univerjs_core.Range.foreach(range, (row, col) => {
 				cache.realDeleteValue(row, col);
 			});
@@ -286,11 +321,16 @@ let DataValidationCustomFormulaService = class DataValidationCustomFormulaServic
 		}
 	}
 	_addFormulaByRange(unitId, subUnitId, ruleId, formula, formula2, ranges) {
+		var _this$_instanceSrv$ge;
 		const { ruleFormulaMap, ruleFormulaMap2 } = this._ensureMaps(unitId, subUnitId);
-		const originRow = ranges[0].startRow;
-		const originCol = ranges[0].startColumn;
+		const worksheet = (_this$_instanceSrv$ge = this._instanceSrv.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_instanceSrv$ge === void 0 ? void 0 : _this$_instanceSrv$ge.getSheetBySheetId(subUnitId);
+		if (!worksheet) return;
+		const effectiveRanges = getRangesInWorksheet(ranges, worksheet);
+		if (!effectiveRanges.length) return;
+		const originRow = effectiveRanges[0].startRow;
+		const originCol = effectiveRanges[0].startColumn;
 		if (formula && (0, _univerjs_core.isFormulaString)(formula)) {
-			const formulaId = this._registerFormula(unitId, subUnitId, ruleId, formula, ranges);
+			const formulaId = this._registerFormula(unitId, subUnitId, ruleId, formula, effectiveRanges);
 			ruleFormulaMap.set(ruleId, {
 				formula,
 				originCol,
@@ -299,7 +339,7 @@ let DataValidationCustomFormulaService = class DataValidationCustomFormulaServic
 			});
 		}
 		if (formula2 && (0, _univerjs_core.isFormulaString)(formula2)) {
-			const formulaId2 = this._registerFormula(unitId, subUnitId, ruleId, formula2, ranges);
+			const formulaId2 = this._registerFormula(unitId, subUnitId, ruleId, formula2, effectiveRanges);
 			ruleFormulaMap2.set(ruleId, {
 				formula: formula2,
 				originCol,
@@ -838,9 +878,7 @@ let SheetDataValidationModel = class SheetDataValidationModel extends _univerjs_
 				case "update":
 					this._updateRule(ruleChange.unitId, ruleChange.subUnitId, ruleChange.rule.uid, ruleChange.oldRule, ruleChange.updatePayload);
 					break;
-				case "remove":
-					this._removeRule(ruleChange.unitId, ruleChange.subUnitId, ruleChange.rule);
-					break;
+				case "remove": this._removeRule(ruleChange.unitId, ruleChange.subUnitId, ruleChange.rule);
 			}
 			this._ruleChange$.next(ruleChange);
 		}));
@@ -1274,14 +1312,15 @@ function getTransformedFormula(lexerTreeBuilder, rule, position) {
 
 //#endregion
 //#region src/validators/date-validator.ts
-const transformDate2SerialNumber = (value) => {
-	var _numfmt$parseDate, _numfmt$parseDate2;
+const transformDate2SerialNumber = (value, options = {}) => {
+	var _numfmt$parseDate;
 	if (value === void 0 || value === null || typeof value === "boolean") return;
 	if (typeof value === "number" || !Number.isNaN(+value)) return +value;
-	const v = (_numfmt$parseDate = _univerjs_core.numfmt.parseDate(value)) === null || _numfmt$parseDate === void 0 ? void 0 : _numfmt$parseDate.v;
-	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;
+	return (_numfmt$parseDate = _univerjs_core.numfmt.parseDate(value, options)) === null || _numfmt$parseDate === void 0 ? void 0 : _numfmt$parseDate.v;
 };
+function pad(value) {
+	return String(value).padStart(2, "0");
+}
 var DateValidator = class extends BaseSheetValidator {
 	constructor(..._args) {
 		super(..._args);
@@ -1301,6 +1340,14 @@ var DateValidator = class extends BaseSheetValidator {
 		_defineProperty(this, "scopes", ["sheet"]);
 		_defineProperty(this, "_customFormulaService", this.injector.get(DataValidationCustomFormulaService));
 		_defineProperty(this, "_lexerTreeBuilder", this.injector.get(_univerjs_engine_formula.LexerTreeBuilder));
+		_defineProperty(this, "_univerInstanceService", this.injector.get(_univerjs_core.IUniverInstanceService));
+	}
+	_getParseOptions(unitId, workbook) {
+		const targetWorkbook = workbook ?? (unitId ? this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET) : void 0);
+		return targetWorkbook ? {
+			locale: (0, _univerjs_core.getNumfmtLocaleTag)(targetWorkbook.getSnapshot().locale),
+			dateSystem: targetWorkbook.getDateSystem()
+		} : { dateSystem: _univerjs_core.DateSystem.Date1900 };
 	}
 	async parseFormula(rule, unitId, subUnitId, row, column) {
 		const formulaResult1 = await this._customFormulaService.getCellFormulaValue(unitId, subUnitId, rule.uid, row, column);
@@ -1308,27 +1355,29 @@ var DateValidator = class extends BaseSheetValidator {
 		const { formula1, formula2 } = rule;
 		const isFormulaValid = isLegalFormulaResult(String(formulaResult1 === null || formulaResult1 === void 0 ? void 0 : formulaResult1.v)) && isLegalFormulaResult(String(formulaResult2 === null || formulaResult2 === void 0 ? void 0 : formulaResult2.v));
 		return {
-			formula1: transformDate2SerialNumber((0, _univerjs_core.isFormulaString)(formula1) ? formulaResult1 === null || formulaResult1 === void 0 ? void 0 : formulaResult1.v : formula1),
-			formula2: transformDate2SerialNumber((0, _univerjs_core.isFormulaString)(formula2) ? formulaResult2 === null || formulaResult2 === void 0 ? void 0 : formulaResult2.v : formula2),
+			formula1: transformDate2SerialNumber((0, _univerjs_core.isFormulaString)(formula1) ? formulaResult1 === null || formulaResult1 === void 0 ? void 0 : formulaResult1.v : formula1, this._getParseOptions(unitId)),
+			formula2: transformDate2SerialNumber((0, _univerjs_core.isFormulaString)(formula2) ? formulaResult2 === null || formulaResult2 === void 0 ? void 0 : formulaResult2.v : formula2, this._getParseOptions(unitId)),
 			isFormulaValid
 		};
 	}
 	async isValidType(info) {
 		const { interceptValue, value } = info;
-		if (typeof value === "number" && typeof interceptValue === "string") return Boolean(_univerjs_core.numfmt.parseDate(interceptValue));
-		if (typeof interceptValue === "string") return Boolean(_univerjs_core.numfmt.parseDate(interceptValue));
+		const options = this._getParseOptions(info.unitId, info.workbook);
+		if (typeof value === "number" && typeof interceptValue === "string") return Boolean(_univerjs_core.numfmt.parseDate(interceptValue, options));
+		if (typeof interceptValue === "string") return Boolean(_univerjs_core.numfmt.parseDate(interceptValue, options));
 		return false;
 	}
-	_validatorSingleFormula(formula) {
-		return !_univerjs_core.Tools.isBlank(formula) && ((0, _univerjs_core.isFormulaString)(formula) || !Number.isNaN(+formula) || Boolean(formula && _univerjs_core.numfmt.parseDate(formula)));
+	_validatorSingleFormula(formula, options) {
+		return !_univerjs_core.Tools.isBlank(formula) && ((0, _univerjs_core.isFormulaString)(formula) || !Number.isNaN(+formula) || Boolean(formula && _univerjs_core.numfmt.parseDate(formula, options)));
 	}
 	validatorFormula(rule, unitId, subUnitId) {
 		const operator = rule.operator;
 		if (!operator) return { success: true };
-		const formula1Success = this._validatorSingleFormula(rule.formula1);
+		const options = this._getParseOptions(unitId);
+		const formula1Success = this._validatorSingleFormula(rule.formula1, options);
 		const errorMsg = this.localeService.t("sheets-data-validation.validFail.date");
 		if (TWO_FORMULA_OPERATOR_COUNT.includes(operator)) {
-			const formula2Success = this._validatorSingleFormula(rule.formula2);
+			const formula2Success = this._validatorSingleFormula(rule.formula2, options);
 			return {
 				success: formula1Success && formula2Success,
 				formula1: formula1Success ? void 0 : errorMsg,
@@ -1340,19 +1389,18 @@ var DateValidator = class extends BaseSheetValidator {
 			formula1: formula1Success ? void 0 : errorMsg
 		};
 	}
-	normalizeFormula(rule, _unitId, _subUnitId) {
+	normalizeFormula(rule, unitId, _subUnitId) {
 		const { formula1, formula2, bizInfo } = rule;
+		const options = this._getParseOptions(unitId);
 		const normlizeSingleFormula = (formula) => {
+			var _numfmt$parseDate2;
 			if (!formula) return formula;
-			let date;
-			if (!Number.isNaN(+formula)) date = _univerjs_core.numfmt.dateFromSerial(+formula);
-			else {
-				var _numfmt$parseDate3;
-				const res = (_numfmt$parseDate3 = _univerjs_core.numfmt.parseDate(formula)) === null || _numfmt$parseDate3 === void 0 ? void 0 : _numfmt$parseDate3.v;
-				if (res === void 0 || res === null) return "";
-				date = _univerjs_core.numfmt.dateFromSerial(res);
-			}
-			return (0, _univerjs_core.dateKit)(`${date[0]}/${date[1]}/${date[2]} ${date[3]}:${date[4]}:${date[5]}`).format((bizInfo === null || bizInfo === void 0 ? void 0 : bizInfo.showTime) ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
+			const serial = !Number.isNaN(+formula) ? +formula : (_numfmt$parseDate2 = _univerjs_core.numfmt.parseDate(formula, options)) === null || _numfmt$parseDate2 === void 0 ? void 0 : _numfmt$parseDate2.v;
+			if (typeof serial !== "number") return "";
+			const date = (0, _univerjs_core.excelSerialToDateTimeParts)(serial, { dateSystem: options.dateSystem ?? _univerjs_core.DateSystem.Date1900 });
+			if (!date) return "";
+			const dateText = `${String(date.year).padStart(4, "0")}-${pad(date.month)}-${pad(date.day)}`;
+			return (bizInfo === null || bizInfo === void 0 ? void 0 : bizInfo.showTime) ? `${dateText} ${pad(date.hours)}:${pad(date.minutes)}:${pad(date.seconds)}` : dateText;
 		};
 		return {
 			formula1: (0, _univerjs_core.isFormulaString)(formula1) ? formula1 : normlizeSingleFormula(`${formula1}`),
@@ -1363,7 +1411,7 @@ var DateValidator = class extends BaseSheetValidator {
 		const { value } = cellInfo;
 		return {
 			...cellInfo,
-			value: transformDate2SerialNumber(value)
+			value: transformDate2SerialNumber(value, this._getParseOptions(cellInfo.unitId, cellInfo.workbook))
 		};
 	}
 	get operatorNames() {
@@ -1542,7 +1590,8 @@ var ListValidator = class extends BaseSheetValidator {
 		return { tb };
 	}
 	parseCellValue(cellValue) {
-		return (0, _univerjs_sheets.deserializeListOptions)(cellValue.toString());
+		const cellString = cellValue.toString();
+		return (0, _univerjs_sheets.deserializeListOptions)(cellString);
 	}
 	async parseFormula(rule, unitId, subUnitId) {
 		var _results$;
@@ -1693,7 +1742,8 @@ function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, sour
 	const redoMutations = [];
 	const undoMutations = [];
 	const sheetDataValidationModel = accessor.get(SheetDataValidationModel);
-	const target = (0, _univerjs_sheets.getSheetCommandTarget)(accessor.get(_univerjs_core.IUniverInstanceService), {
+	const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+	const target = (0, _univerjs_sheets.getSheetCommandTarget)(univerInstanceService, {
 		unitId,
 		subUnitId
 	});
@@ -1706,7 +1756,7 @@ function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, sour
 	let setRangeValue = false;
 	function setRangesDefaultValue(ranges, defaultValue) {
 		if (!fillDefaultValue) return;
-		ranges.forEach((range) => {
+		getRangesInWorksheet(ranges, worksheet).forEach((range) => {
 			_univerjs_core.Range.foreach(range, (row, column) => {
 				const cellData = worksheet.getCellRaw(row, column);
 				const value = getStringCellValue(cellData);
@@ -1872,8 +1922,6 @@ function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, sour
 					const formula = sheetDataValidationModel.getValidator(_univerjs_core.DataValidationType.CHECKBOX).parseFormulaSync(diff.rule, unitId, subUnitId);
 					setRangesDefaultValue(diff.rule.ranges, formula.originFormula2);
 				}
-				break;
-			default: break;
 		}
 	});
 	if (setRangeValue) {
@@ -2012,7 +2060,8 @@ const UpdateSheetDataValidationSettingCommand = {
 		}];
 		if (setting.type === _univerjs_core.DataValidationType.CHECKBOX) {
 			const ranges = rule.ranges;
-			const target = (0, _univerjs_sheets.getSheetCommandTarget)(accessor.get(_univerjs_core.IUniverInstanceService), {
+			const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+			const target = (0, _univerjs_sheets.getSheetCommandTarget)(univerInstanceService, {
 				unitId,
 				subUnitId
 			});
@@ -2022,7 +2071,7 @@ const UpdateSheetDataValidationSettingCommand = {
 				const { formula2: oldFormula2 = 0, formula1: oldFormula1 = 1 } = rule;
 				const { formula2 = 0, formula1 = 1 } = setting;
 				let setted = false;
-				ranges.forEach((range) => {
+				getRangesInWorksheet(ranges, worksheet).forEach((range) => {
 					_univerjs_core.Range.foreach(range, (row, column) => {
 						const cellData = worksheet.getCellRaw(row, column);
 						const value = getStringCellValue(cellData);
@@ -2123,7 +2172,8 @@ const ClearRangeDataValidationCommand = {
 		if (!params) return false;
 		const { unitId, subUnitId, ranges, types } = params;
 		const commandService = accessor.get(_univerjs_core.ICommandService);
-		const target = (0, _univerjs_sheets.getSheetCommandTarget)(accessor.get(_univerjs_core.IUniverInstanceService), {
+		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+		const target = (0, _univerjs_sheets.getSheetCommandTarget)(univerInstanceService, {
 			unitId,
 			subUnitId
 		});
@@ -2281,7 +2331,9 @@ let DataValidationFormulaController = class DataValidationFormulaController exte
 				if (!this._permissionService.getPermissionPoint(new _univerjs_sheets.WorksheetViewPermission(unitId, subUnitId).id)) return false;
 			}
 			if (!targetSheet) return false;
-			const { startRow, endRow, startColumn, endColumn } = sequenceGrid.range;
+			const range = getRangeInWorksheet(sequenceGrid.range, targetSheet);
+			if (!range) continue;
+			const { startRow, endRow, startColumn, endColumn } = range;
 			for (let i = startRow; i <= endRow; i++) for (let j = startColumn; j <= endColumn; j++) {
 				var _targetSheet$getCell;
 				const permission = (_targetSheet$getCell = targetSheet.getCell(i, j)) === null || _targetSheet$getCell === void 0 || (_targetSheet$getCell = _targetSheet$getCell.selectionProtection) === null || _targetSheet$getCell === void 0 ? void 0 : _targetSheet$getCell[0];
@@ -2300,7 +2352,7 @@ DataValidationFormulaController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-data-validation";
-var version = "1.0.0-insiders.20260813-7c9aa50";
+var version = "1.0.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -3013,7 +3065,8 @@ let DataValidationController = class DataValidationController extends _univerjs_
 				const selections = (_this$_selectionManag = this._selectionManagerService.getCurrentSelections()) === null || _this$_selectionManag === void 0 ? void 0 : _this$_selectionManag.map((s) => s.range);
 				const ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone();
 				if (selections) ruleMatrix.removeRange(selections);
-				const { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, ruleMatrix.diff(this._sheetDataValidationModel.getRules(unitId, subUnitId)), this._injector, "patched");
+				const diffs = ruleMatrix.diff(this._sheetDataValidationModel.getRules(unitId, subUnitId));
+				const { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, diffs, this._injector, "patched");
 				return {
 					undos: undoMutations,
 					redos: redoMutations
@@ -3051,14 +3104,14 @@ let SheetsDataValidationValidatorService = class SheetsDataValidationValidatorSe
 			if (ranges.length === 0) return;
 			const workbook = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
 			const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getActiveSheet();
-			const map = {};
+			const map = Object.create(null);
 			ranges.flat().forEach((range) => {
-				if (!map[range.unitId]) map[range.unitId] = {};
+				if (!map[range.unitId]) map[range.unitId] = Object.create(null);
 				if (!map[range.unitId][range.subUnitId]) map[range.unitId][range.subUnitId] = [];
 				const workbook = this._univerInstanceService.getUnit(range.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 				const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(range.subUnitId);
 				if (!worksheet) return;
-				map[range.unitId][range.subUnitId].push(...range.ranges.map((range) => _univerjs_core.Range.transformRange(range, worksheet)));
+				map[range.unitId][range.subUnitId].push(...getRangesInWorksheet(range.ranges, worksheet));
 			});
 			Object.entries(map).forEach(([unitId, subUnitMap]) => {
 				Object.entries(subUnitMap).forEach(([subUnitId, ranges]) => {
@@ -3111,11 +3164,10 @@ 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 allRules = this._sheetDataValidationModel.getRules(unitId, subUnitId);
-		const ruleRanges = [];
-		for (const rule of allRules) ruleRanges.push(...rule.ranges);
+		const effectiveRanges = getRangesInWorksheet(ranges, worksheet);
+		const ruleRanges = getRangesInWorksheet(this._sheetDataValidationModel.getRules(unitId, subUnitId).flatMap((rule) => rule.ranges), worksheet);
 		const intersectRanges = [];
-		for (const range of ranges) for (const ruleRange of ruleRanges) {
+		for (const range of effectiveRanges) for (const ruleRange of ruleRanges) {
 			const intersect = (0, _univerjs_core.getIntersectRange)(range, ruleRange);
 			if (intersect) intersectRanges.push(intersect);
 		}
@@ -3148,31 +3200,32 @@ 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 rules = this._sheetDataValidationModel.getRules(unitId, subUnitId);
-		await Promise.all(rules.map((rule) => {
-			return Promise.all(rule.ranges.map((range) => {
-				const promises = [];
-				_univerjs_core.Range.foreach(range, (row, col) => {
-					promises.push(this._validatorByCell(workbook, worksheet, row, col));
-				});
-				return Promise.all(promises);
-			}));
+		const ranges = getRangesInWorksheet(this._sheetDataValidationModel.getRules(unitId, subUnitId).flatMap((rule) => rule.ranges), worksheet);
+		await Promise.all(ranges.map((range) => {
+			const promises = [];
+			_univerjs_core.Range.foreach(range, (row, col) => {
+				promises.push(this._validatorByCell(workbook, worksheet, row, col));
+			});
+			return Promise.all(promises);
 		}));
 		return this._dataValidationCacheService.ensureCache(unitId, subUnitId);
 	}
 	async validatorWorkbook(unitId) {
 		const sheetIds = this._sheetDataValidationModel.getSubUnitIds(unitId);
 		const results = await Promise.all(sheetIds.map((id) => this.validatorWorksheet(unitId, id)));
-		const map = {};
+		const map = Object.create(null);
 		results.forEach((result, i) => {
 			map[sheetIds[i]] = result;
 		});
 		return map;
 	}
 	getDataValidations(unitId, subUnitId, ranges) {
+		var _this$_univerInstance;
+		const worksheet = (_this$_univerInstance = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getSheetBySheetId(subUnitId);
+		if (!worksheet) return [];
 		const ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId);
 		const ruleIdSet = /* @__PURE__ */ new Set();
-		ranges.forEach((range) => {
+		getRangesInWorksheet(ranges, worksheet).forEach((range) => {
 			_univerjs_core.Range.foreach(range, (row, col) => {
 				const ruleId = ruleMatrix.getValue(row, col);
 				if (ruleId) ruleIdSet.add(ruleId);
@@ -3358,6 +3411,7 @@ exports.getDataValidationCellValue = getDataValidationCellValue;
 exports.getDataValidationDiffMutations = getDataValidationDiffMutations;
 exports.getFormulaCellData = getFormulaCellData;
 exports.getFormulaResult = getFormulaResult;
+exports.getRangesInWorksheet = getRangesInWorksheet;
 exports.getTransformedFormula = getTransformedFormula;
 exports.isLegalFormulaResult = isLegalFormulaResult;
 exports.transformCheckboxValue = transformCheckboxValue;

package/lib/cjs/locale/ar-SA.js

@@ -1,4 +1,3 @@
-
 //#region src/locale/ar-SA.ts
 const locale = { "sheets-data-validation": {
 	operators: {
@@ -9,8 +8,7 @@ const locale = { "sheets-data-validation": {
 		lessThanOrEqual: "أقل من أو يساوي",
 		equal: "يساوي",
 		notEqual: "لا يساوي",
-		notBetween: "ليس بين",
-		legal: "نوع قانوني"
+		notBetween: "ليس بين"
 	},
 	ruleName: {
 		between: "بين {FORMULA1} و{FORMULA2}",
@@ -43,8 +41,7 @@ const locale = { "sheets-data-validation": {
 			lessThanOrEqual: "في أو قبل",
 			equal: "يساوي",
 			notEqual: "لا يساوي",
-			notBetween: "ليس بين",
-			legal: "تاريخ قانوني"
+			notBetween: "ليس بين"
 		},
 		ruleName: {
 			between: "بين {FORMULA1} و{FORMULA2}",
@@ -86,20 +83,16 @@ const locale = { "sheets-data-validation": {
 	custom: {
 		ruleName: "الصيغة المخصصة هي {FORMULA1}",
 		title: "صيغة مخصصة",
-		validFail: "يرجى إدخال صيغة صالحة",
 		error: "محتويات هذه الخلية تنتهك قاعدة التحقق"
 	},
 	validFail: {
 		value: "يرجى إدخال قيمة",
-		common: "يرجى إدخال قيمة أو صيغة",
 		number: "يرجى إدخال رقم أو صيغة",
 		formula: "يرجى إدخال صيغة",
-		integer: "يرجى إدخال عدد صحيح أو صيغة",
 		date: "يرجى إدخال تاريخ أو صيغة",
 		list: "يرجى إدخال خيارات",
 		listInvalid: "يجب أن يكون مصدر القائمة قائمة محددة بفواصل أو مرجعًا لصف أو عمود واحد",
 		checkboxEqual: "أدخل قيمًا مختلفة لمحتويات الخلية المحددة وغير المحددة.",
-		formulaError: "يحتوي نطاق المرجع على بيانات غير مرئية، يرجى إعادة ضبط النطاق",
 		listIntersects: "لا يمكن أن يتقاطع النطاق المحدد مع نطاق القواعد",
 		primitive: "غير مسموح بالصيغ لقيم المحدد وغير المحدد المخصصة."
 	},
@@ -110,28 +103,14 @@ const locale = { "sheets-data-validation": {
 	list: {
 		title: "قائمة منسدلة",
 		name: "القيمة تحتوي على واحدة من النطاق",
-		error: "يجب أن يكون الإدخال ضمن النطاق المحدد",
-		emptyError: "يرجى إدخال قيمة",
-		add: "إضافة",
-		dropdown: "تحديد",
-		options: "خيارات",
-		customOptions: "مخصص",
-		refOptions: "من نطاق",
-		formulaError: "يجب أن يكون مصدر القائمة قائمة بيانات محددة بفواصل، أو مرجعًا لصف أو عمود واحد.",
-		edit: "تحرير"
-	},
-	listMultiple: {
-		title: "قائمة منسدلة - متعددة",
-		dropdown: "تحديد متعدد"
+		error: "يجب أن يكون الإدخال ضمن النطاق المحدد"
 	},
+	listMultiple: { title: "قائمة منسدلة - متعددة" },
 	decimal: { title: "رقم" },
 	whole: { title: "عدد صحيح" },
 	checkbox: {
 		title: "خانة اختيار",
-		error: "محتويات هذه الخلية تنتهك قاعدة التحقق",
-		tips: "استخدم قيمًا مخصصة داخل الخلايا",
-		checked: "القيمة المحددة",
-		unchecked: "القيمة غير المحددة"
+		error: "محتويات هذه الخلية تنتهك قاعدة التحقق"
 	}
 } };
 

package/lib/cjs/locale/ca-ES.js

@@ -1,4 +1,3 @@
-
 //#region src/locale/ca-ES.ts
 const locale = { "sheets-data-validation": {
 	operators: {
@@ -9,8 +8,7 @@ const locale = { "sheets-data-validation": {
 		lessThanOrEqual: "menys o igual que",
 		equal: "igual",
 		notEqual: "no igual",
-		notBetween: "no entre",
-		legal: "és tipus legal"
+		notBetween: "no entre"
 	},
 	ruleName: {
 		between: "Està entre {FORMULA1} i {FORMULA2}",
@@ -43,8 +41,7 @@ const locale = { "sheets-data-validation": {
 			lessThanOrEqual: "en o abans de",
 			equal: "igual",
 			notEqual: "no igual",
-			notBetween: "no entre",
-			legal: "és una data legal"
+			notBetween: "no entre"
 		},
 		ruleName: {
 			between: "està entre {FORMULA1} i {FORMULA2}",
@@ -86,20 +83,16 @@ const locale = { "sheets-data-validation": {
 	custom: {
 		ruleName: "La fórmula personalitzada és {FORMULA1}",
 		title: "Fórmula personalitzada",
-		validFail: "Si us plau, introdueix una fórmula vàlida",
 		error: "El contingut d’aquesta cel·la incompleix la seva regla de validació"
 	},
 	validFail: {
 		value: "Si us plau, introdueix un valor",
-		common: "Si us plau, introdueix un valor o una fórmula",
 		number: "Si us plau, introdueix un número o una fórmula",
 		formula: "Si us plau, introdueix una fórmula",
-		integer: "Si us plau, introdueix un enter o una fórmula",
 		date: "Si us plau, introdueix una data o una fórmula",
 		list: "Si us plau, introdueix opcions",
 		listInvalid: "La font de la llista ha de ser una llista delimitada o una referència a una sola fila o columna",
 		checkboxEqual: "Introdueix valors diferents per als continguts de cel·la marcats i desmarcats.",
-		formulaError: "L’interval de referència conté dades invisibles, ajusta l’interval",
 		listIntersects: "L’interval seleccionat no pot creuar-se amb l’àmbit de les regles",
 		primitive: "No es permeten fórmules per a valors personalitzats marcats i desmarcats."
 	},
@@ -110,28 +103,14 @@ const locale = { "sheets-data-validation": {
 	list: {
 		title: "Desplegable",
 		name: "El valor conté un del rang",
-		error: "L’entrada ha d’estar dins del rang especificat",
-		emptyError: "Si us plau, introdueix un valor",
-		add: "Afegeix",
-		dropdown: "Selecciona",
-		options: "Opcions",
-		customOptions: "Personalitzat",
-		refOptions: "D’un interval",
-		formulaError: "La font de la llista ha de ser una llista delimitada de dades o una referència a una sola fila o columna.",
-		edit: "Edita"
-	},
-	listMultiple: {
-		title: "Desplegable-múltiple",
-		dropdown: "Selecció múltiple"
+		error: "L’entrada ha d’estar dins del rang especificat"
 	},
+	listMultiple: { title: "Desplegable-múltiple" },
 	decimal: { title: "Número" },
 	whole: { title: "Enter" },
 	checkbox: {
 		title: "Casella de selecció",
-		error: "El contingut d’aquesta cel·la incompleix la seva regla de validació",
-		tips: "Utilitza valors personalitzats dins de les cel·les",
-		checked: "Valor seleccionat",
-		unchecked: "Valor no seleccionat"
+		error: "El contingut d’aquesta cel·la incompleix la seva regla de validació"
 	}
 } };