@univerjs/sheets-data-validation 0.24.0 → 0.25.0-insiders.20260608-e4336f7

package/lib/facade.js

@@ -1,12 +1,12 @@
-import { CanceledError, DataValidationErrorStyle, DataValidationOperator, DataValidationStatus, DataValidationType, ICommandService, IUniverInstanceService, generateRandomId, toDisposable } from "@univerjs/core";
+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 { 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";
-import { filter } from "rxjs";
 
-//#region \0@oxc-project+runtime@0.129.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.134.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.129.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.134.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.129.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.134.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.129.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -55,7 +55,8 @@ function _defineProperty(e, r, t) {
 * ```typescript
 * // Set the data validation for cell A1 to require a value from B1:B10
 * const fWorkbook = univerAPI.getActiveWorkbook();
-* const fWorksheet = fWorkbook.getActiveSheet();
+* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+* if (!fWorksheet) return;
 * const fRange = fWorksheet.getRange('B1:B2');
 * fRange.setValues([
 *   ['Yes'],
@@ -90,7 +91,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number between 1 and 10 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -114,7 +116,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number between 1 and 10 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -212,7 +215,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Set the data validation for cell A1:A10 to require a checkbox with default 1 and 0 values
 	* const fRange = fWorksheet.getRange('A1:A10');
@@ -242,7 +246,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Set some date values in the range A1:B2
 	* const fRange = fWorksheet.getRange('A1:B2');
@@ -275,7 +280,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Set some date values in the range A1:B2
 	* const fRange = fWorksheet.getRange('A1:B2');
@@ -310,7 +316,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Set some date values in the range A1:B2
 	* const fRange = fWorksheet.getRange('A1:B2');
@@ -344,7 +351,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Set some date values in the range A1:B2
 	* const fRange = fWorksheet.getRange('A1:B2');
@@ -383,7 +391,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Set some date values in the range A1:B2
 	* const fRange = fWorksheet.getRange('A1:B2');
@@ -417,7 +426,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Set some date values in the range A1:B2
 	* const fRange = fWorksheet.getRange('A1:B2');
@@ -451,7 +461,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Set some date values in the range A1:B2
 	* const fRange = fWorksheet.getRange('A1:B2');
@@ -485,7 +496,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Set some values in the range A1:B2 and C1:D2
 	* const cell = fWorksheet.getRange('A1:B2');
@@ -529,7 +541,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number between 1 and 10 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -559,7 +572,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number equal to 10 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -589,7 +603,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number greater than 10 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -619,7 +634,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number greater than 10 or equal to 10 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -649,7 +665,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number less than 10 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -679,7 +696,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number less than 10 or equal to 10 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -710,7 +728,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number not between 1 and 10 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -740,7 +759,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number not equal to 10 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -772,7 +792,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires the user to enter a value from the list ['Yes', 'No'] for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -789,7 +810,7 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	*/
 	requireValueInList(values, multiple, showDropdown) {
 		this._rule.type = multiple ? DataValidationType.LIST_MULTIPLE : DataValidationType.LIST;
-		this._rule.formula1 = values.join(",");
+		this._rule.formula1 = serializeListOptions(values);
 		this._rule.formula2 = void 0;
 		this._rule.showDropDown = showDropdown !== null && showDropdown !== void 0 ? showDropdown : true;
 		return this;
@@ -804,7 +825,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Set the values in the range B1:B2
 	* const fRange = fWorksheet.getRange('B1:B2');
@@ -846,7 +868,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Set the data validation for cell A1:B2 to allow invalid data, so A1:B2 will display a warning when invalid data is entered
 	* const fRange = fWorksheet.getRange('A1:B2');
@@ -877,7 +900,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* ```typescript
 	* // Assume current sheet is empty data
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Set the data validation for cell A1:B2 to allow blank values
 	* const fRange = fWorksheet.getRange('A1:B2');
@@ -907,7 +931,8 @@ var FDataValidationBuilder = class FDataValidationBuilder {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires the user to enter a value from the list ['Yes', 'No'] for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -948,7 +973,8 @@ var FDataValidation = class {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const rules = fWorksheet.getDataValidations();
 	* rules.forEach((rule) => {
 	*   console.log(rule, rule.getAllowInvalid());
@@ -964,7 +990,8 @@ var FDataValidation = class {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const rules = fWorksheet.getDataValidations();
 	* rules.forEach((rule) => {
 	*   console.log(rule, rule.getCriteriaType());
@@ -980,7 +1007,8 @@ var FDataValidation = class {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const rules = fWorksheet.getDataValidations();
 	* rules.forEach((rule) => {
 	*   console.log(rule);
@@ -1003,7 +1031,8 @@ var FDataValidation = class {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const fRange = fWorksheet.getRange('A1:B10');
 	* const rule = univerAPI.newDataValidation()
 	*   .requireNumberBetween(1, 10)
@@ -1026,7 +1055,8 @@ var FDataValidation = class {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const fRange = fWorksheet.getRange('A1:B10');
 	* const rule = univerAPI.newDataValidation()
 	*   .requireNumberBetween(1, 10)
@@ -1057,7 +1087,8 @@ var FDataValidation = class {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const rules = fWorksheet.getDataValidations();
 	* rules.forEach((rule) => {
 	*   console.log(rule, rule.getApplied());
@@ -1079,7 +1110,8 @@ var FDataValidation = class {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const rules = fWorksheet.getDataValidations();
 	* rules.forEach((rule) => {
 	*   console.log(rule);
@@ -1101,7 +1133,8 @@ var FDataValidation = class {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const fRange = fWorksheet.getRange('A1:B10');
 	* console.log(fRange.getDataValidation().getUnitId());
 	* ```
@@ -1116,7 +1149,8 @@ var FDataValidation = class {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const fRange = fWorksheet.getRange('A1:B10');
 	* console.log(fRange.getDataValidation().getSheetId());
 	* ```
@@ -1134,7 +1168,8 @@ var FDataValidation = class {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number equal to 20 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -1179,7 +1214,8 @@ var FDataValidation = class {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number equal to 20 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -1218,7 +1254,8 @@ var FDataValidation = class {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number equal to 20 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -1250,7 +1287,8 @@ var FDataValidation = class {
 	* @example
 	* ```typescript
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new data validation rule that requires a number equal to 20 for the range A1:B10
 	* const fRange = fWorksheet.getRange('A1:B10');
@@ -1377,7 +1415,10 @@ var FUniverSheetsDataValidationMixin = class extends FUniver {
 			if (!injector.has(SheetDataValidationModel)) return { dispose: () => {} };
 			return injector.get(SheetDataValidationModel).ruleChange$.subscribe((ruleChange) => {
 				const { unitId, subUnitId, rule, oldRule, type } = ruleChange;
-				const target = this.getSheetTarget(unitId, subUnitId);
+				const target = this.getSheetCommandTarget({
+					unitId,
+					subUnitId
+				});
 				if (!target) return;
 				const { workbook, worksheet } = target;
 				const eventParams = {
@@ -1395,7 +1436,10 @@ var FUniverSheetsDataValidationMixin = class extends FUniver {
 			if (!injector.has(SheetDataValidationModel)) return { dispose: () => {} };
 			return injector.get(SheetDataValidationModel).validStatusChange$.subscribe((statusChange) => {
 				const { unitId, subUnitId, ruleId, status, row, col } = statusChange;
-				const target = this.getSheetTarget(unitId, subUnitId);
+				const target = this.getSheetCommandTarget({
+					unitId,
+					subUnitId
+				});
 				if (!target) return;
 				const { workbook, worksheet } = target;
 				const rule = worksheet.getDataValidation(ruleId);
@@ -1414,13 +1458,14 @@ var FUniverSheetsDataValidationMixin = class extends FUniver {
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetDataValidationAdd, () => commandService.beforeCommandExecuted((commandInfo) => {
 			if (commandInfo.id === AddSheetDataValidationCommand.id) {
 				const params = commandInfo.params;
-				const target = this.getSheetTarget(params.unitId, params.subUnitId);
+				const target = this.getSheetCommandTarget(params);
 				if (!target) return;
 				const { workbook, worksheet } = target;
+				const { rule } = params;
 				const eventParams = {
 					worksheet,
 					workbook,
-					rule: params.rule
+					rule
 				};
 				this.fireEvent(this.Event.BeforeSheetDataValidationAdd, eventParams);
 				if (eventParams.cancel) throw new CanceledError();
@@ -1429,17 +1474,18 @@ var FUniverSheetsDataValidationMixin = class extends FUniver {
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetDataValidationCriteriaUpdate, () => commandService.beforeCommandExecuted((commandInfo) => {
 			if (commandInfo.id === UpdateSheetDataValidationSettingCommand.id) {
 				const params = commandInfo.params;
-				const target = this.getSheetTarget(params.unitId, params.subUnitId);
+				const target = this.getSheetCommandTarget(params);
 				if (!target) return;
 				const { workbook, worksheet } = target;
-				const rule = worksheet.getDataValidation(params.ruleId);
+				const { ruleId, setting: newCriteria } = params;
+				const rule = worksheet.getDataValidation(ruleId);
 				if (!rule) return;
 				const eventParams = {
 					worksheet,
 					workbook,
 					rule,
-					ruleId: params.ruleId,
-					newCriteria: params.setting
+					ruleId,
+					newCriteria
 				};
 				this.fireEvent(this.Event.BeforeSheetDataValidationCriteriaUpdate, eventParams);
 				if (eventParams.cancel) throw new CanceledError();
@@ -1448,17 +1494,18 @@ var FUniverSheetsDataValidationMixin = class extends FUniver {
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetDataValidationRangeUpdate, () => commandService.beforeCommandExecuted((commandInfo) => {
 			if (commandInfo.id === UpdateSheetDataValidationRangeCommand.id) {
 				const params = commandInfo.params;
-				const target = this.getSheetTarget(params.unitId, params.subUnitId);
+				const target = this.getSheetCommandTarget(params);
 				if (!target) return;
 				const { workbook, worksheet } = target;
-				const rule = worksheet.getDataValidation(params.ruleId);
+				const { ruleId, ranges: newRanges } = params;
+				const rule = worksheet.getDataValidation(ruleId);
 				if (!rule) return;
 				const eventParams = {
 					worksheet,
 					workbook,
 					rule,
-					ruleId: params.ruleId,
-					newRanges: params.ranges
+					ruleId,
+					newRanges
 				};
 				this.fireEvent(this.Event.BeforeSheetDataValidationRangeUpdate, eventParams);
 				if (eventParams.cancel) throw new CanceledError();
@@ -1467,17 +1514,18 @@ var FUniverSheetsDataValidationMixin = class extends FUniver {
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetDataValidationOptionsUpdate, () => commandService.beforeCommandExecuted((commandInfo) => {
 			if (commandInfo.id === UpdateSheetDataValidationOptionsCommand.id) {
 				const params = commandInfo.params;
-				const target = this.getSheetTarget(params.unitId, params.subUnitId);
+				const target = this.getSheetCommandTarget(params);
 				if (!target) return;
 				const { workbook, worksheet } = target;
-				const rule = worksheet.getDataValidation(params.ruleId);
+				const { ruleId, options: newOptions } = params;
+				const rule = worksheet.getDataValidation(ruleId);
 				if (!rule) return;
 				const eventParams = {
 					worksheet,
 					workbook,
 					rule,
-					ruleId: params.ruleId,
-					newOptions: params.options
+					ruleId,
+					newOptions
 				};
 				this.fireEvent(this.Event.BeforeSheetDataValidationOptionsUpdate, eventParams);
 				if (eventParams.cancel) throw new CanceledError();
@@ -1486,16 +1534,17 @@ var FUniverSheetsDataValidationMixin = class extends FUniver {
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetDataValidationDelete, () => commandService.beforeCommandExecuted((commandInfo) => {
 			if (commandInfo.id === RemoveSheetDataValidationCommand.id) {
 				const params = commandInfo.params;
-				const target = this.getSheetTarget(params.unitId, params.subUnitId);
+				const target = this.getSheetCommandTarget(params);
 				if (!target) return;
 				const { workbook, worksheet } = target;
-				const rule = worksheet.getDataValidation(params.ruleId);
+				const { ruleId } = params;
+				const rule = worksheet.getDataValidation(ruleId);
 				if (!rule) return;
 				const eventParams = {
 					worksheet,
 					workbook,
 					rule,
-					ruleId: params.ruleId
+					ruleId
 				};
 				this.fireEvent(this.Event.BeforeSheetDataValidationDelete, eventParams);
 				if (eventParams.cancel) throw new CanceledError();
@@ -1504,7 +1553,7 @@ var FUniverSheetsDataValidationMixin = class extends FUniver {
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetDataValidationDeleteAll, () => commandService.beforeCommandExecuted((commandInfo) => {
 			if (commandInfo.id === RemoveSheetAllDataValidationCommand.id) {
 				const params = commandInfo.params;
-				const target = this.getSheetTarget(params.unitId, params.subUnitId);
+				const target = this.getSheetCommandTarget(params);
 				if (!target) return;
 				const { workbook, worksheet } = target;
 				const eventParams = {
@@ -1588,66 +1637,6 @@ var FWorkbookSheetsDataValidationMixin = class extends FWorkbook {
 			rule
 		};
 	}
-	onDataValidationChange(callback) {
-		return toDisposable(this._dataValidationModel.ruleChange$.pipe(filter((change) => change.unitId === this._workbook.getUnitId())).subscribe(callback));
-	}
-	onDataValidationStatusChange(callback) {
-		return toDisposable(this._dataValidationModel.validStatusChange$.pipe(filter((change) => change.unitId === this._workbook.getUnitId())).subscribe(callback));
-	}
-	onBeforeAddDataValidation(callback) {
-		return toDisposable(this._commandService.beforeCommandExecuted((commandInfo, options) => {
-			const params = commandInfo.params;
-			if (commandInfo.id === AddSheetDataValidationCommand.id) {
-				if (params.unitId !== this._workbook.getUnitId()) return;
-				if (callback(params, options) === false) throw new Error("Command is stopped by the hook onBeforeAddDataValidation");
-			}
-		}));
-	}
-	onBeforeUpdateDataValidationCriteria(callback) {
-		return toDisposable(this._commandService.beforeCommandExecuted((commandInfo, options) => {
-			const params = commandInfo.params;
-			if (commandInfo.id === UpdateSheetDataValidationSettingCommand.id) {
-				if (params.unitId !== this._workbook.getUnitId()) return;
-				if (callback(params, options) === false) throw new Error("Command is stopped by the hook onBeforeUpdateDataValidationCriteria");
-			}
-		}));
-	}
-	onBeforeUpdateDataValidationRange(callback) {
-		return toDisposable(this._commandService.beforeCommandExecuted((commandInfo, options) => {
-			const params = commandInfo.params;
-			if (commandInfo.id === UpdateSheetDataValidationRangeCommand.id) {
-				if (params.unitId !== this._workbook.getUnitId()) return;
-				if (callback(params, options) === false) throw new Error("Command is stopped by the hook onBeforeUpdateDataValidationRange");
-			}
-		}));
-	}
-	onBeforeUpdateDataValidationOptions(callback) {
-		return toDisposable(this._commandService.beforeCommandExecuted((commandInfo, options) => {
-			const params = commandInfo.params;
-			if (commandInfo.id === UpdateSheetDataValidationOptionsCommand.id) {
-				if (params.unitId !== this._workbook.getUnitId()) return;
-				if (callback(params, options) === false) throw new Error("Command is stopped by the hook onBeforeUpdateDataValidationOptions");
-			}
-		}));
-	}
-	onBeforeDeleteDataValidation(callback) {
-		return toDisposable(this._commandService.beforeCommandExecuted((commandInfo, options) => {
-			const params = commandInfo.params;
-			if (commandInfo.id === RemoveSheetDataValidationCommand.id) {
-				if (params.unitId !== this._workbook.getUnitId()) return;
-				if (callback(params, options) === false) throw new Error("Command is stopped by the hook onBeforeDeleteDataValidation");
-			}
-		}));
-	}
-	onBeforeDeleteAllDataValidation(callback) {
-		return toDisposable(this._commandService.beforeCommandExecuted((commandInfo, options) => {
-			const params = commandInfo.params;
-			if (commandInfo.id === RemoveSheetAllDataValidationCommand.id) {
-				if (params.unitId !== this._workbook.getUnitId()) return;
-				if (callback(params, options) === false) throw new Error("Command is stopped by the hook onBeforeDeleteAllDataValidation");
-			}
-		}));
-	}
 };
 FWorkbook.extend(FWorkbookSheetsDataValidationMixin);
 
@@ -1660,11 +1649,8 @@ var FWorksheetDataValidationMixin = class extends FWorksheet {
 	getDataValidations() {
 		return this._injector.get(DataValidationModel).getRules(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((rule) => new FDataValidation(rule, this._worksheet, this._injector));
 	}
-	getValidatorStatus() {
-		return this._injector.get(SheetsDataValidationValidatorService).validatorWorksheet(this._workbook.getUnitId(), this._worksheet.getSheetId());
-	}
 	getValidatorStatusAsync() {
-		return this.getValidatorStatus();
+		return this._injector.get(SheetsDataValidationValidatorService).validatorWorksheet(this._workbook.getUnitId(), this._worksheet.getSheetId());
 	}
 	getDataValidation(ruleId) {
 		const rule = this._injector.get(DataValidationModel).getRuleById(this._workbook.getUnitId(), this._worksheet.getSheetId(), ruleId);