@univerjs/sheets-data-validation 0.6.3 → 0.6.4-nightly.202503101606

package/lib/es/facade.js

@@ -1,20 +1,20 @@
 var H = Object.defineProperty;
-var j = (g, e, t) => e in g ? H(g, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : g[e] = t;
-var f = (g, e, t) => j(g, typeof e != "symbol" ? e + "" : e, t);
-import { UpdateSheetDataValidationSettingCommand as b, UpdateSheetDataValidationOptionsCommand as U, UpdateSheetDataValidationRangeCommand as C, RemoveSheetDataValidationCommand as A, ClearRangeDataValidationCommand as q, AddSheetDataValidationCommand as T, SheetsDataValidationValidatorService as S, SheetDataValidationModel as k, RemoveSheetAllDataValidationCommand as O } from "@univerjs/sheets-data-validation";
-import { FRange as y, FWorkbook as x, FWorksheet as N } from "@univerjs/sheets/facade";
-import { DataValidationType as o, generateRandomId as L, DataValidationErrorStyle as V, DataValidationOperator as h, IUniverInstanceService as W, ICommandService as p, CanceledError as m, toDisposable as c } from "@univerjs/core";
+var q = (h, e, t) => e in h ? H(h, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[e] = t;
+var _ = (h, e, t) => q(h, typeof e != "symbol" ? e + "" : e, t);
+import { UpdateSheetDataValidationSettingCommand as b, UpdateSheetDataValidationOptionsCommand as U, UpdateSheetDataValidationRangeCommand as C, RemoveSheetDataValidationCommand as A, ClearRangeDataValidationCommand as j, AddSheetDataValidationCommand as T, SheetsDataValidationValidatorService as S, SheetDataValidationModel as f, RemoveSheetAllDataValidationCommand as O } from "@univerjs/sheets-data-validation";
+import { FRange as y, FWorkbook as x, FWorksheet as M } from "@univerjs/sheets/facade";
+import { DataValidationType as a, generateRandomId as L, DataValidationErrorStyle as k, DataValidationOperator as u, IUniverInstanceService as W, ICommandService as p, CanceledError as c, toDisposable as g } from "@univerjs/core";
 import { DataValidationModel as w, getRuleOptions as $ } from "@univerjs/data-validation";
 import { serializeRangeToRefString as F } from "@univerjs/engine-formula";
-import { FUniver as M, FEventName as P } from "@univerjs/core/facade";
+import { FUniver as N, FEventName as P } from "@univerjs/core/facade";
 import { filter as R } from "rxjs";
 class E {
   constructor(e) {
-    f(this, "_rule");
+    _(this, "_rule");
     this._rule = e != null ? e : {
       uid: L(),
       ranges: void 0,
-      type: o.CUSTOM
+      type: a.CUSTOM
     };
   }
   /**
@@ -39,7 +39,7 @@ class E {
    * ```
    */
   build() {
-    return new _(this._rule);
+    return new m(this._rule);
   }
   /**
    * Creates a duplicate of the current DataValidationBuilder object
@@ -82,7 +82,7 @@ class E {
    * ```
    */
   getAllowInvalid() {
-    return this._rule.errorStyle !== V.STOP;
+    return this._rule.errorStyle !== k.STOP;
   }
   /**
    * Gets the data validation type of the rule
@@ -159,7 +159,7 @@ class E {
    * ```
    */
   requireCheckbox(e, t) {
-    return this._rule.type = o.CHECKBOX, this._rule.formula1 = e, this._rule.formula2 = t, this;
+    return this._rule.type = a.CHECKBOX, this._rule.formula1 = e, this._rule.formula2 = t, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be after a specific date.
@@ -189,7 +189,7 @@ class E {
    * ```
    */
   requireDateAfter(e) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.operator = h.GREATER_THAN, this;
+    return this._rule.type = a.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.operator = u.GREATER_THAN, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be before a specific date.
@@ -219,7 +219,7 @@ class E {
    * ```
    */
   requireDateBefore(e) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = h.LESS_THAN, this;
+    return this._rule.type = a.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = u.LESS_THAN, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be within a specific date range.
@@ -250,7 +250,7 @@ class E {
    * ```
    */
   requireDateBetween(e, t) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = t.toLocaleDateString(), this._rule.operator = h.BETWEEN, this;
+    return this._rule.type = a.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = t.toLocaleDateString(), this._rule.operator = u.BETWEEN, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be equal to a specific date.
@@ -284,7 +284,7 @@ class E {
    * ```
    */
   requireDateEqualTo(e) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = h.EQUAL, this;
+    return this._rule.type = a.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = u.EQUAL, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be not within a specific date range.
@@ -315,7 +315,7 @@ class E {
    * ```
    */
   requireDateNotBetween(e, t) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = t.toLocaleDateString(), this._rule.operator = h.NOT_BETWEEN, this;
+    return this._rule.type = a.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = t.toLocaleDateString(), this._rule.operator = u.NOT_BETWEEN, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be on or after a specific date.
@@ -345,7 +345,7 @@ class E {
    * ```
    */
   requireDateOnOrAfter(e) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = h.GREATER_THAN_OR_EQUAL, this;
+    return this._rule.type = a.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = u.GREATER_THAN_OR_EQUAL, this;
   }
   /**
    * Set the data validation type to DATE and configure the validation rules to be on or before a specific date.
@@ -375,7 +375,7 @@ class E {
    * ```
    */
   requireDateOnOrBefore(e) {
-    return this._rule.type = o.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = h.LESS_THAN_OR_EQUAL, this;
+    return this._rule.type = a.DATE, this._rule.formula1 = e.toLocaleDateString(), this._rule.formula2 = void 0, this._rule.operator = u.LESS_THAN_OR_EQUAL, this;
   }
   /**
    * Sets the data validation rule to require that the given formula evaluates to `true`.
@@ -414,7 +414,7 @@ class E {
    * ```
    */
   requireFormulaSatisfied(e) {
-    return this._rule.type = o.CUSTOM, this._rule.formula1 = e, this._rule.formula2 = void 0, this;
+    return this._rule.type = a.CUSTOM, this._rule.formula1 = e, this._rule.formula2 = void 0, this;
   }
   /**
    * Sets the data validation rule to require a number that falls between, or is either of, two specified numbers.
@@ -441,7 +441,7 @@ class E {
    * ```
    */
   requireNumberBetween(e, t, i) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = `${t}`, this._rule.operator = h.BETWEEN, this._rule.type = i ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = `${t}`, this._rule.operator = u.BETWEEN, this._rule.type = i ? a.WHOLE : a.DECIMAL, this;
   }
   /**
    * Sets the data validation rule to require a number equal to the given value.
@@ -467,7 +467,7 @@ class E {
    * ```
    */
   requireNumberEqualTo(e, t) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.EQUAL, this._rule.type = t ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = u.EQUAL, this._rule.type = t ? a.WHOLE : a.DECIMAL, this;
   }
   /**
    * Sets the data validation rule to require a number greater than the given value.
@@ -493,7 +493,7 @@ class E {
    * ```
    */
   requireNumberGreaterThan(e, t) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.GREATER_THAN, this._rule.type = t ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = u.GREATER_THAN, this._rule.type = t ? a.WHOLE : a.DECIMAL, this;
   }
   /**
    * Sets the data validation rule to require a number greater than or equal to the given value.
@@ -519,7 +519,7 @@ class E {
    * ```
    */
   requireNumberGreaterThanOrEqualTo(e, t) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.GREATER_THAN_OR_EQUAL, this._rule.type = t ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = u.GREATER_THAN_OR_EQUAL, this._rule.type = t ? a.WHOLE : a.DECIMAL, this;
   }
   /**
    * Sets the data validation rule to require a number less than the given value.
@@ -545,7 +545,7 @@ class E {
    * ```
    */
   requireNumberLessThan(e, t) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.LESS_THAN, this._rule.type = t ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = u.LESS_THAN, this._rule.type = t ? a.WHOLE : a.DECIMAL, this;
   }
   /**
    * Sets the data validation rule to require a number less than or equal to the given value.
@@ -571,7 +571,7 @@ class E {
    * ```
    */
   requireNumberLessThanOrEqualTo(e, t) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.LESS_THAN_OR_EQUAL, this._rule.type = t ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = u.LESS_THAN_OR_EQUAL, this._rule.type = t ? a.WHOLE : a.DECIMAL, this;
   }
   /**
    * Sets the data validation rule to require a number that does not fall between, and is neither of, two specified numbers.
@@ -598,7 +598,7 @@ class E {
    * ```
    */
   requireNumberNotBetween(e, t, i) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = `${t}`, this._rule.operator = h.NOT_BETWEEN, this._rule.type = i ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = `${t}`, this._rule.operator = u.NOT_BETWEEN, this._rule.type = i ? a.WHOLE : a.DECIMAL, this;
   }
   /**
    * Sets the data validation rule to require a number not equal to the given value.
@@ -624,7 +624,7 @@ class E {
    * ```
    */
   requireNumberNotEqualTo(e, t) {
-    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = h.NOT_EQUAL, this._rule.type = t ? o.WHOLE : o.DECIMAL, this;
+    return this._rule.formula1 = `${e}`, this._rule.formula2 = void 0, this._rule.operator = u.NOT_EQUAL, this._rule.type = t ? a.WHOLE : a.DECIMAL, this;
   }
   /**
    * Sets a data validation rule that requires the user to enter a value from a list of specific values.
@@ -652,7 +652,7 @@ class E {
    * ```
    */
   requireValueInList(e, t, i) {
-    return this._rule.type = t ? o.LIST_MULTIPLE : o.LIST, this._rule.formula1 = e.join(","), this._rule.formula2 = void 0, this._rule.showDropDown = i != null ? i : !0, this;
+    return this._rule.type = t ? a.LIST_MULTIPLE : a.LIST, this._rule.formula1 = e.join(","), this._rule.formula2 = void 0, this._rule.showDropDown = i != null ? i : !0, this;
   }
   /**
    * Sets a data validation rule that requires the user to enter a value within a specific range.
@@ -687,7 +687,7 @@ class E {
    * ```
    */
   requireValueInRange(e, t, i) {
-    return this._rule.type = t ? o.LIST_MULTIPLE : o.LIST, this._rule.formula1 = `=${F({
+    return this._rule.type = t ? a.LIST_MULTIPLE : a.LIST, this._rule.formula1 = `=${F({
       unitId: e.getUnitId(),
       sheetName: e.getSheetName(),
       range: e.getRange()
@@ -722,7 +722,7 @@ class E {
    * ```
    */
   setAllowInvalid(e) {
-    return this._rule.errorStyle = e ? V.WARNING : V.STOP, this;
+    return this._rule.errorStyle = e ? k.WARNING : k.STOP, this;
   }
   /**
    * Sets whether to allow blank values.
@@ -780,11 +780,11 @@ class E {
     return Object.assign(this._rule, e), this;
   }
 }
-class _ {
+class m {
   constructor(e, t, i) {
-    f(this, "rule");
-    f(this, "_worksheet");
-    f(this, "_injector");
+    _(this, "rule");
+    _(this, "_worksheet");
+    _(this, "_injector");
     this._injector = i, this.rule = e, this._worksheet = t;
   }
   /**
@@ -801,7 +801,7 @@ class _ {
    * ```
    */
   getAllowInvalid() {
-    return this.rule.errorStyle !== V.STOP;
+    return this.rule.errorStyle !== k.STOP;
   }
   /**
    * Gets the data validation type of the rule
@@ -1106,7 +1106,7 @@ class _ {
 class G extends y {
   setDataValidation(e) {
     if (!e)
-      return this._commandService.syncExecuteCommand(q.id, {
+      return this._commandService.syncExecuteCommand(j.id, {
         unitId: this._workbook.getUnitId(),
         subUnitId: this._worksheet.getSheetId(),
         ranges: [this._range]
@@ -1127,14 +1127,14 @@ class G extends y {
       this._worksheet.getSheetId(),
       [this._range]
     );
-    return t && new _(t, this._worksheet, this._injector);
+    return t && new m(t, this._worksheet, this._injector);
   }
   getDataValidations() {
     return this._injector.get(S).getDataValidations(
       this._workbook.getUnitId(),
       this._worksheet.getSheetId(),
       [this._range]
-    ).map((t) => new _(t, this._worksheet, this._injector));
+    ).map((t) => new m(t, this._worksheet, this._injector));
   }
   async getValidatorStatus() {
     return this._injector.get(S).validatorRanges(
@@ -1145,7 +1145,7 @@ class G extends y {
   }
 }
 y.extend(G);
-class Q extends M {
+class Q extends N {
   /**
    * @deprecated use `univerAPI.newDataValidation()` as instead.
    * @returns {FDataValidationBuilder} A new instance of the FDataValidationBuilder class
@@ -1161,164 +1161,165 @@ class Q extends M {
    */
   // eslint-disable-next-line max-lines-per-function
   _initialize(e) {
-    if (!e.has(k)) return;
-    const t = e.get(k), i = e.get(p);
+    const t = e.get(p);
     this.registerEventHandler(
       this.Event.SheetDataValidationChanged,
-      () => t.ruleChange$.subscribe((r) => {
-        const { unitId: a, subUnitId: n, rule: u, oldRule: l, type: s } = r, d = this.getSheetTarget(a, n);
-        if (!d)
+      () => e.has(f) ? e.get(f).ruleChange$.subscribe((r) => {
+        const { unitId: o, subUnitId: l, rule: s, oldRule: n, type: d } = r, D = this.getSheetTarget(o, l);
+        if (!D)
           return;
-        const { workbook: D, worksheet: I } = d, v = new _(u, I.getSheet(), this._injector);
+        const { workbook: I, worksheet: V } = D, v = new m(s, V.getSheet(), this._injector);
         this.fireEvent(this.Event.SheetDataValidationChanged, {
           origin: r,
-          worksheet: I,
-          workbook: D,
-          changeType: s,
-          oldRule: l,
+          worksheet: V,
+          workbook: I,
+          changeType: d,
+          oldRule: n,
           rule: v
         });
-      })
+      }) : { dispose: () => {
+      } }
     ), this.registerEventHandler(
       this.Event.SheetDataValidatorStatusChanged,
-      () => t.validStatusChange$.subscribe((r) => {
-        const { unitId: a, subUnitId: n, ruleId: u, status: l, row: s, col: d } = r, D = this.getSheetTarget(a, n);
-        if (!D)
+      () => e.has(f) ? e.get(f).validStatusChange$.subscribe((r) => {
+        const { unitId: o, subUnitId: l, ruleId: s, status: n, row: d, col: D } = r, I = this.getSheetTarget(o, l);
+        if (!I)
           return;
-        const { workbook: I, worksheet: v } = D, B = v.getDataValidation(u);
+        const { workbook: V, worksheet: v } = I, B = v.getDataValidation(s);
         B && this.fireEvent(this.Event.SheetDataValidatorStatusChanged, {
-          workbook: I,
+          workbook: V,
           worksheet: v,
-          row: s,
-          column: d,
+          row: d,
+          column: D,
           rule: B,
-          status: l
+          status: n
         });
-      })
+      }) : { dispose: () => {
+      } }
     ), this.registerEventHandler(
       this.Event.BeforeSheetDataValidationAdd,
-      () => i.beforeCommandExecuted((r) => {
-        if (r.id === T.id) {
-          const a = r.params, n = this.getSheetTarget(a.unitId, a.subUnitId);
-          if (!n)
+      () => t.beforeCommandExecuted((i) => {
+        if (i.id === T.id) {
+          const r = i.params, o = this.getSheetTarget(r.unitId, r.subUnitId);
+          if (!o)
             return;
-          const { workbook: u, worksheet: l } = n, s = {
-            worksheet: l,
-            workbook: u,
-            rule: a.rule
+          const { workbook: l, worksheet: s } = o, n = {
+            worksheet: s,
+            workbook: l,
+            rule: r.rule
           };
-          if (this.fireEvent(this.Event.BeforeSheetDataValidationAdd, s), s.cancel)
-            throw new m();
+          if (this.fireEvent(this.Event.BeforeSheetDataValidationAdd, n), n.cancel)
+            throw new c();
         }
       })
     ), this.registerEventHandler(
       this.Event.BeforeSheetDataValidationCriteriaUpdate,
-      () => i.beforeCommandExecuted((r) => {
-        if (r.id === b.id) {
-          const a = r.params, n = this.getSheetTarget(a.unitId, a.subUnitId);
-          if (!n)
+      () => t.beforeCommandExecuted((i) => {
+        if (i.id === b.id) {
+          const r = i.params, o = this.getSheetTarget(r.unitId, r.subUnitId);
+          if (!o)
             return;
-          const { workbook: u, worksheet: l } = n, s = l.getDataValidation(a.ruleId);
-          if (!s)
+          const { workbook: l, worksheet: s } = o, n = s.getDataValidation(r.ruleId);
+          if (!n)
             return;
           const d = {
-            worksheet: l,
-            workbook: u,
-            rule: s,
-            ruleId: a.ruleId,
-            newCriteria: a.setting
+            worksheet: s,
+            workbook: l,
+            rule: n,
+            ruleId: r.ruleId,
+            newCriteria: r.setting
           };
           if (this.fireEvent(this.Event.BeforeSheetDataValidationCriteriaUpdate, d), d.cancel)
-            throw new m();
+            throw new c();
         }
       })
     ), this.registerEventHandler(
       this.Event.BeforeSheetDataValidationRangeUpdate,
-      () => i.beforeCommandExecuted((r) => {
-        if (r.id === C.id) {
-          const a = r.params, n = this.getSheetTarget(a.unitId, a.subUnitId);
-          if (!n)
+      () => t.beforeCommandExecuted((i) => {
+        if (i.id === C.id) {
+          const r = i.params, o = this.getSheetTarget(r.unitId, r.subUnitId);
+          if (!o)
             return;
-          const { workbook: u, worksheet: l } = n, s = l.getDataValidation(a.ruleId);
-          if (!s)
+          const { workbook: l, worksheet: s } = o, n = s.getDataValidation(r.ruleId);
+          if (!n)
             return;
           const d = {
-            worksheet: l,
-            workbook: u,
-            rule: s,
-            ruleId: a.ruleId,
-            newRanges: a.ranges
+            worksheet: s,
+            workbook: l,
+            rule: n,
+            ruleId: r.ruleId,
+            newRanges: r.ranges
           };
           if (this.fireEvent(this.Event.BeforeSheetDataValidationRangeUpdate, d), d.cancel)
-            throw new m();
+            throw new c();
         }
       })
     ), this.registerEventHandler(
       this.Event.BeforeSheetDataValidationOptionsUpdate,
-      () => i.beforeCommandExecuted((r) => {
-        if (r.id === U.id) {
-          const a = r.params, n = this.getSheetTarget(a.unitId, a.subUnitId);
-          if (!n)
+      () => t.beforeCommandExecuted((i) => {
+        if (i.id === U.id) {
+          const r = i.params, o = this.getSheetTarget(r.unitId, r.subUnitId);
+          if (!o)
             return;
-          const { workbook: u, worksheet: l } = n, s = l.getDataValidation(a.ruleId);
-          if (!s)
+          const { workbook: l, worksheet: s } = o, n = s.getDataValidation(r.ruleId);
+          if (!n)
             return;
           const d = {
-            worksheet: l,
-            workbook: u,
-            rule: s,
-            ruleId: a.ruleId,
-            newOptions: a.options
+            worksheet: s,
+            workbook: l,
+            rule: n,
+            ruleId: r.ruleId,
+            newOptions: r.options
           };
           if (this.fireEvent(this.Event.BeforeSheetDataValidationOptionsUpdate, d), d.cancel)
-            throw new m();
+            throw new c();
         }
       })
     ), this.registerEventHandler(
       this.Event.BeforeSheetDataValidationDelete,
-      () => i.beforeCommandExecuted((r) => {
-        if (r.id === A.id) {
-          const a = r.params, n = this.getSheetTarget(a.unitId, a.subUnitId);
-          if (!n)
+      () => t.beforeCommandExecuted((i) => {
+        if (i.id === A.id) {
+          const r = i.params, o = this.getSheetTarget(r.unitId, r.subUnitId);
+          if (!o)
             return;
-          const { workbook: u, worksheet: l } = n, s = l.getDataValidation(a.ruleId);
-          if (!s)
+          const { workbook: l, worksheet: s } = o, n = s.getDataValidation(r.ruleId);
+          if (!n)
             return;
           const d = {
-            worksheet: l,
-            workbook: u,
-            rule: s,
-            ruleId: a.ruleId
+            worksheet: s,
+            workbook: l,
+            rule: n,
+            ruleId: r.ruleId
           };
           if (this.fireEvent(this.Event.BeforeSheetDataValidationDelete, d), d.cancel)
-            throw new m();
+            throw new c();
         }
       })
     ), this.registerEventHandler(
       this.Event.BeforeSheetDataValidationDeleteAll,
-      () => i.beforeCommandExecuted((r) => {
-        if (r.id === O.id) {
-          const a = r.params, n = this.getSheetTarget(a.unitId, a.subUnitId);
-          if (!n)
+      () => t.beforeCommandExecuted((i) => {
+        if (i.id === O.id) {
+          const r = i.params, o = this.getSheetTarget(r.unitId, r.subUnitId);
+          if (!o)
             return;
-          const { workbook: u, worksheet: l } = n, s = {
-            worksheet: l,
-            workbook: u,
-            rules: l.getDataValidations()
+          const { workbook: l, worksheet: s } = o, n = {
+            worksheet: s,
+            workbook: l,
+            rules: s.getDataValidations()
           };
-          if (this.fireEvent(this.Event.BeforeSheetDataValidationDeleteAll, s), s.cancel)
-            throw new m();
+          if (this.fireEvent(this.Event.BeforeSheetDataValidationDeleteAll, n), n.cancel)
+            throw new c();
         }
       })
     );
   }
 }
-M.extend(Q);
+N.extend(Q);
 class z extends x {
   _initialize() {
     Object.defineProperty(this, "_dataValidationModel", {
       get() {
-        return this._injector.get(k);
+        return this._injector.get(f);
       }
     });
   }
@@ -1327,13 +1328,13 @@ class z extends x {
   }
   // region DataValidationHooks
   onDataValidationChange(e) {
-    return c(this._dataValidationModel.ruleChange$.pipe(R((t) => t.unitId === this._workbook.getUnitId())).subscribe(e));
+    return g(this._dataValidationModel.ruleChange$.pipe(R((t) => t.unitId === this._workbook.getUnitId())).subscribe(e));
   }
   onDataValidationStatusChange(e) {
-    return c(this._dataValidationModel.validStatusChange$.pipe(R((t) => t.unitId === this._workbook.getUnitId())).subscribe(e));
+    return g(this._dataValidationModel.validStatusChange$.pipe(R((t) => t.unitId === this._workbook.getUnitId())).subscribe(e));
   }
   onBeforeAddDataValidation(e) {
-    return c(this._commandService.beforeCommandExecuted((t, i) => {
+    return g(this._commandService.beforeCommandExecuted((t, i) => {
       const r = t.params;
       if (t.id === T.id) {
         if (r.unitId !== this._workbook.getUnitId())
@@ -1344,7 +1345,7 @@ class z extends x {
     }));
   }
   onBeforeUpdateDataValidationCriteria(e) {
-    return c(this._commandService.beforeCommandExecuted((t, i) => {
+    return g(this._commandService.beforeCommandExecuted((t, i) => {
       const r = t.params;
       if (t.id === b.id) {
         if (r.unitId !== this._workbook.getUnitId())
@@ -1355,7 +1356,7 @@ class z extends x {
     }));
   }
   onBeforeUpdateDataValidationRange(e) {
-    return c(this._commandService.beforeCommandExecuted((t, i) => {
+    return g(this._commandService.beforeCommandExecuted((t, i) => {
       const r = t.params;
       if (t.id === C.id) {
         if (r.unitId !== this._workbook.getUnitId())
@@ -1366,7 +1367,7 @@ class z extends x {
     }));
   }
   onBeforeUpdateDataValidationOptions(e) {
-    return c(this._commandService.beforeCommandExecuted((t, i) => {
+    return g(this._commandService.beforeCommandExecuted((t, i) => {
       const r = t.params;
       if (t.id === U.id) {
         if (r.unitId !== this._workbook.getUnitId())
@@ -1377,7 +1378,7 @@ class z extends x {
     }));
   }
   onBeforeDeleteDataValidation(e) {
-    return c(this._commandService.beforeCommandExecuted((t, i) => {
+    return g(this._commandService.beforeCommandExecuted((t, i) => {
       const r = t.params;
       if (t.id === A.id) {
         if (r.unitId !== this._workbook.getUnitId())
@@ -1388,7 +1389,7 @@ class z extends x {
     }));
   }
   onBeforeDeleteAllDataValidation(e) {
-    return c(this._commandService.beforeCommandExecuted((t, i) => {
+    return g(this._commandService.beforeCommandExecuted((t, i) => {
       const r = t.params;
       if (t.id === O.id) {
         if (r.unitId !== this._workbook.getUnitId())
@@ -1400,9 +1401,9 @@ class z extends x {
   }
 }
 x.extend(z);
-class K extends N {
+class K extends M {
   getDataValidations() {
-    return this._injector.get(w).getRules(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((t) => new _(t, this._worksheet, this._injector));
+    return this._injector.get(w).getRules(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((t) => new m(t, this._worksheet, this._injector));
   }
   getValidatorStatus() {
     return this._injector.get(S).validatorWorksheet(
@@ -1415,10 +1416,10 @@ class K extends N {
   }
   getDataValidation(e) {
     const i = this._injector.get(w).getRuleById(this._workbook.getUnitId(), this._worksheet.getSheetId(), e);
-    return i ? new _(i, this._worksheet, this._injector) : null;
+    return i ? new m(i, this._worksheet, this._injector) : null;
   }
 }
-N.extend(K);
+M.extend(K);
 class X {
   get SheetDataValidationChanged() {
     return "SheetDataValidationChanged";
@@ -1447,6 +1448,6 @@ class X {
 }
 P.extend(X);
 export {
-  _ as FDataValidation,
+  m as FDataValidation,
   E as FDataValidationBuilder
 };