@univerjs/sheets-data-validation 1.0.0-rc.0 → 1.0.1

package/lib/es/index.js

@@ -6,7 +6,36 @@ import { Subject, bufferWhen, filter, skip } from "rxjs";
 import { UnitAction } from "@univerjs/protocol";
 import { FormulaRefRangeService, UniverSheetsFormulaPlugin } from "@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 = getIntersectRange(Range.transformRange(range, worksheet), {
+		startRow: 0,
+		endRow: maxRows - 1,
+		startColumn: 0,
+		endColumn: maxColumns - 1
+	});
+	if (!effectiveRange) return null;
+	return {
+		startRow: effectiveRange.startRow,
+		endRow: effectiveRange.endRow,
+		startColumn: effectiveRange.startColumn,
+		endColumn: effectiveRange.endColumn
+	};
+}
+function getRangesInWorksheet(ranges, worksheet) {
+	const effectiveRanges = [];
+	ranges.forEach((range) => {
+		const effectiveRange = getRangeInWorksheet(range, worksheet);
+		if (effectiveRange) effectiveRanges.push(effectiveRange);
+	});
+	return effectiveRanges;
+}
+
+//#endregion
+//#region \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) {
@@ -17,7 +46,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];
@@ -30,14 +59,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,
@@ -48,7 +77,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);
@@ -56,7 +85,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);
@@ -132,9 +161,15 @@ let DataValidationCacheService = class DataValidationCacheService extends Dispos
 	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, 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) => {
 			Range.foreach(range, (row, col) => {
 				if (cache.getValue(row, col) !== void 0) cache.setValue(row, col, void 0);
 			});
@@ -148,7 +183,7 @@ let DataValidationCacheService = class DataValidationCacheService extends Dispos
 	}
 	_deleteRange(unitId, subUnitId, ranges) {
 		const cache = this._ensureCache(unitId, subUnitId);
-		ranges.forEach((range) => {
+		this._getEffectiveRanges(unitId, subUnitId, ranges).forEach((range) => {
 			Range.foreach(range, (row, col) => {
 				cache.realDeleteValue(row, col);
 			});
@@ -285,11 +320,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, 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 && 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,
@@ -298,7 +338,7 @@ let DataValidationCustomFormulaService = class DataValidationCustomFormulaServic
 			});
 		}
 		if (formula2 && 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,
@@ -837,9 +877,7 @@ let SheetDataValidationModel = class SheetDataValidationModel extends Disposable
 				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);
 		}));
@@ -1551,7 +1589,8 @@ var ListValidator = class extends BaseSheetValidator {
 		return { tb };
 	}
 	parseCellValue(cellValue) {
-		return deserializeListOptions(cellValue.toString());
+		const cellString = cellValue.toString();
+		return deserializeListOptions(cellString);
 	}
 	async parseFormula(rule, unitId, subUnitId) {
 		var _results$;
@@ -1702,7 +1741,8 @@ function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, sour
 	const redoMutations = [];
 	const undoMutations = [];
 	const sheetDataValidationModel = accessor.get(SheetDataValidationModel);
-	const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), {
+	const univerInstanceService = accessor.get(IUniverInstanceService);
+	const target = getSheetCommandTarget(univerInstanceService, {
 		unitId,
 		subUnitId
 	});
@@ -1715,7 +1755,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) => {
 			Range.foreach(range, (row, column) => {
 				const cellData = worksheet.getCellRaw(row, column);
 				const value = getStringCellValue(cellData);
@@ -1881,8 +1921,6 @@ function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, sour
 					const formula = sheetDataValidationModel.getValidator(DataValidationType.CHECKBOX).parseFormulaSync(diff.rule, unitId, subUnitId);
 					setRangesDefaultValue(diff.rule.ranges, formula.originFormula2);
 				}
-				break;
-			default: break;
 		}
 	});
 	if (setRangeValue) {
@@ -2021,7 +2059,8 @@ const UpdateSheetDataValidationSettingCommand = {
 		}];
 		if (setting.type === DataValidationType.CHECKBOX) {
 			const ranges = rule.ranges;
-			const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), {
+			const univerInstanceService = accessor.get(IUniverInstanceService);
+			const target = getSheetCommandTarget(univerInstanceService, {
 				unitId,
 				subUnitId
 			});
@@ -2031,7 +2070,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) => {
 					Range.foreach(range, (row, column) => {
 						const cellData = worksheet.getCellRaw(row, column);
 						const value = getStringCellValue(cellData);
@@ -2132,7 +2171,8 @@ const ClearRangeDataValidationCommand = {
 		if (!params) return false;
 		const { unitId, subUnitId, ranges, types } = params;
 		const commandService = accessor.get(ICommandService);
-		const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), {
+		const univerInstanceService = accessor.get(IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService, {
 			unitId,
 			subUnitId
 		});
@@ -2290,7 +2330,9 @@ let DataValidationFormulaController = class DataValidationFormulaController exte
 				if (!this._permissionService.getPermissionPoint(new 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];
@@ -2309,7 +2351,7 @@ DataValidationFormulaController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-data-validation";
-var version = "1.0.0-rc.0";
+var version = "1.0.1";
 
 //#endregion
 //#region src/config/config.ts
@@ -3022,7 +3064,8 @@ let DataValidationController = class DataValidationController extends RxDisposab
 				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
@@ -3060,14 +3103,14 @@ let SheetsDataValidationValidatorService = class SheetsDataValidationValidatorSe
 			if (ranges.length === 0) return;
 			const workbook = this._univerInstanceService.getCurrentUnitOfType(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, 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) => 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]) => {
@@ -3120,11 +3163,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 = getIntersectRange(range, ruleRange);
 			if (intersect) intersectRanges.push(intersect);
 		}
@@ -3157,31 +3199,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 = [];
-				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 = [];
+			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, 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) => {
 			Range.foreach(range, (row, col) => {
 				const ruleId = ruleMatrix.getValue(row, col);
 				if (ruleId) ruleIdSet.add(ruleId);
@@ -3294,4 +3337,4 @@ 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, getCellValueNumber, getCellValueOrigin, getDataValidationCellValue, getDataValidationDiffMutations, getFormulaCellData, getFormulaResult, getTransformedFormula, isLegalFormulaResult, 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, getRangesInWorksheet, getTransformedFormula, isLegalFormulaResult, transformCheckboxValue };

package/lib/facade.js

@@ -1,12 +1,12 @@
 import { CanceledError, DataValidationErrorStyle, DataValidationOperator, DataValidationStatus, DataValidationType, ICommandService, IUniverInstanceService, generateRandomId } from "@univerjs/core";
-import { AddSheetDataValidationCommand, ClearRangeDataValidationCommand, RemoveSheetAllDataValidationCommand, RemoveSheetDataValidationCommand, SheetDataValidationModel, SheetsDataValidationValidatorService, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand } from "@univerjs/sheets-data-validation";
+import { AddSheetDataValidationCommand, ClearRangeDataValidationCommand, RemoveSheetAllDataValidationCommand, RemoveSheetDataValidationCommand, SheetDataValidationModel, SheetsDataValidationValidatorService, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand, getRangesInWorksheet } from "@univerjs/sheets-data-validation";
 import { FRange, FWorkbook, FWorksheet } from "@univerjs/sheets/facade";
 import { DataValidationModel, getRuleOptions } from "@univerjs/data-validation";
 import { serializeRangeToRefString } from "@univerjs/engine-formula";
 import { serializeListOptions } from "@univerjs/sheets";
 import { FEventName, FUniver } from "@univerjs/core/facade";
 
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -17,7 +17,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];
@@ -30,14 +30,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,
@@ -152,7 +152,7 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* ```
 	*/
 	getAllowInvalid() {
-		return this._rule.errorStyle !== DataValidationErrorStyle.STOP;
+		return this._rule.showErrorMessage === false || this._rule.errorStyle !== DataValidationErrorStyle.STOP;
 	}
 	/**
 	* Gets the data validation type of the rule
@@ -960,7 +960,14 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 */
 var FDataValidation = class {
 	constructor(rule, worksheet, _injector) {
-		_defineProperty(this, "rule", void 0);
+		_defineProperty(
+			this,
+			/**
+			* The underlying validation rule data. Use the Facade setters to update a rule attached to a worksheet.
+			*/
+			"rule",
+			void 0
+		);
 		_defineProperty(this, "_worksheet", void 0);
 		_defineProperty(this, "_injector", void 0);
 		this._injector = _injector;
@@ -982,7 +989,7 @@ var FDataValidation = class {
 	* ```
 	*/
 	getAllowInvalid() {
-		return this.rule.errorStyle !== DataValidationErrorStyle.STOP;
+		return this.rule.showErrorMessage === false || this.rule.errorStyle !== DataValidationErrorStyle.STOP;
 	}
 	/**
 	* Gets the data validation type of the rule
@@ -1128,8 +1135,8 @@ var FDataValidation = class {
 		return this.rule.ranges.map((range) => this._injector.createInstance(FRange, workbook, this._worksheet, range));
 	}
 	/**
-	* Gets the unit ID of the worksheet
-	* @returns {string | undefined} The unit ID of the worksheet
+	* Gets the unit ID of the workbook
+	* @returns {string | undefined} The unit ID of the workbook
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
@@ -1359,7 +1366,7 @@ var FRangeSheetsDataValidationMixin = class extends FRange {
 		const worksheet = this._worksheet;
 		const sheetName = worksheet.getName();
 		const errors = [];
-		for (const range of ranges) {
+		for (const range of getRangesInWorksheet(ranges, worksheet)) {
 			const promises = [];
 			for (let row = range.startRow; row <= range.endRow; row++) for (let col = range.startColumn; col <= range.endColumn; col++) promises.push((async () => {
 				try {
@@ -1599,7 +1606,7 @@ var FWorkbookSheetsDataValidationMixin = class extends FWorkbook {
 		if (!worksheet) throw new Error(`Cannot find worksheet with sheetId: ${sheetId}`);
 		const sheetName = worksheet.getName();
 		const errors = [];
-		for (const range of ranges) {
+		for (const range of getRangesInWorksheet(ranges, worksheet)) {
 			const promises = [];
 			for (let row = range.startRow; row <= range.endRow; row++) for (let col = range.startColumn; col <= range.endColumn; col++) promises.push((async () => {
 				try {
@@ -1667,7 +1674,7 @@ var FWorksheetDataValidationMixin = class extends FWorksheet {
 		const worksheet = this._worksheet;
 		const sheetName = worksheet.getName();
 		const errors = [];
-		for (const range of ranges) {
+		for (const range of getRangesInWorksheet(ranges, worksheet)) {
 			const promises = [];
 			for (let row = range.startRow; row <= range.endRow; row++) for (let col = range.startColumn; col <= range.endColumn; col++) promises.push((async () => {
 				try {