@univerjs/data-validation 0.5.0 → 0.5.1-nightly.202412011605

package/lib/es/index.js

@@ -1,7 +1,7 @@
-var F = Object.defineProperty;
-var J = (t, e, a) => e in t ? F(t, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : t[e] = a;
-var c = (t, e, a) => J(t, typeof e != "symbol" ? e + "" : e, a);
-import { Disposable as P, Tools as B, ILogService as T, Inject as O, UniverInstanceType as x, IResourceManagerService as z, IUniverInstanceService as K, toDisposable as Y, CommandType as E, ICommandService as S, IUndoRedoService as M, Plugin as X, Injector as $, IConfigService as Z, DataValidationOperator as s, LocaleService as k } from "@univerjs/core";
+var W = Object.defineProperty;
+var J = (t, e, r) => e in t ? W(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
+var c = (t, e, r) => J(t, typeof e != "symbol" ? e + "" : e, r);
+import { Disposable as P, Tools as B, ILogService as N, Inject as O, UniverInstanceType as x, IResourceManagerService as z, IUniverInstanceService as K, toDisposable as Y, CommandType as E, ICommandService as T, IUndoRedoService as A, Plugin as X, Injector as $, IConfigService as Z, DataValidationOperator as s, LocaleService as k } from "@univerjs/core";
 import { Subject as ee, debounceTime as te, BehaviorSubject as ae } from "rxjs";
 function G(t) {
   return {
@@ -27,12 +27,12 @@ function q(t) {
     bizInfo: t.bizInfo
   };
 }
-var m = /* @__PURE__ */ ((t) => (t[t.SETTING = 0] = "SETTING", t[t.RANGE = 1] = "RANGE", t[t.OPTIONS = 2] = "OPTIONS", t[t.ALL = 3] = "ALL", t))(m || {}), re = Object.defineProperty, oe = Object.getOwnPropertyDescriptor, ne = (t, e, a, r) => {
-  for (var o = r > 1 ? void 0 : r ? oe(e, a) : e, n = t.length - 1, i; n >= 0; n--)
-    (i = t[n]) && (o = (r ? i(e, a, o) : i(o)) || o);
-  return r && o && re(e, a, o), o;
-}, ie = (t, e) => (a, r) => e(a, r, t);
-let h = class extends P {
+var h = /* @__PURE__ */ ((t) => (t[t.SETTING = 0] = "SETTING", t[t.RANGE = 1] = "RANGE", t[t.OPTIONS = 2] = "OPTIONS", t[t.ALL = 3] = "ALL", t))(h || {}), re = Object.defineProperty, oe = Object.getOwnPropertyDescriptor, ne = (t, e, r, a) => {
+  for (var o = a > 1 ? void 0 : a ? oe(e, r) : e, n = t.length - 1, i; n >= 0; n--)
+    (i = t[n]) && (o = (a ? i(e, r, o) : i(o)) || o);
+  return a && o && re(e, r, o), o;
+}, ie = (t, e) => (r, a) => e(r, a, t);
+let m = class extends P {
   constructor(e) {
     super();
     c(this, "_model", /* @__PURE__ */ new Map());
@@ -45,80 +45,80 @@ let h = class extends P {
       }
     });
   }
-  _ensureMap(e, a) {
+  _ensureMap(e, r) {
     this._model.has(e) || this._model.set(e, /* @__PURE__ */ new Map());
-    const r = this._model.get(e);
-    if (r.has(a))
-      return r.get(a);
+    const a = this._model.get(e);
+    if (a.has(r))
+      return a.get(r);
     const o = { map: /* @__PURE__ */ new Map(), list: [] };
-    return r.set(a, o), o;
+    return a.set(r, o), o;
   }
-  _addSubUnitRule(e, a, r) {
-    const { map: o, list: n } = e, l = (Array.isArray(a) ? a : [a]).filter((d) => !o.has(d.uid));
-    typeof r == "number" && r < n.length ? n.splice(r, 0, ...l) : n.push(...l), l.forEach((d) => {
+  _addSubUnitRule(e, r, a) {
+    const { map: o, list: n } = e, l = (Array.isArray(r) ? r : [r]).filter((d) => !o.has(d.uid));
+    typeof a == "number" && a < n.length ? n.splice(a, 0, ...l) : n.push(...l), l.forEach((d) => {
       o.set(d.uid, d);
     });
   }
-  _removeSubUnitRule(e, a) {
-    const { map: r, list: o } = e, n = o.findIndex((i) => i.uid === a);
-    n > -1 && (o.splice(n, 1), r.delete(a));
+  _removeSubUnitRule(e, r) {
+    const { map: a, list: o } = e, n = o.findIndex((i) => i.uid === r);
+    n > -1 && (o.splice(n, 1), a.delete(r));
   }
-  _updateSubUnitRule(e, a, r) {
-    const { map: o, list: n } = e, i = o.get(a), l = n.findIndex((u) => a === u.uid);
+  _updateSubUnitRule(e, r, a) {
+    const { map: o, list: n } = e, i = o.get(r), l = n.findIndex((u) => r === u.uid);
     if (!i)
-      throw new Error(`Data validation rule is not found, ruleId: ${a}.`);
+      throw new Error(`Data validation rule is not found, ruleId: ${r}.`);
     const d = { ...i };
-    switch (r.type) {
-      case m.RANGE: {
-        d.ranges = r.payload;
+    switch (a.type) {
+      case h.RANGE: {
+        d.ranges = a.payload;
         break;
       }
-      case m.SETTING: {
-        Object.assign(d, G(r.payload));
+      case h.SETTING: {
+        Object.assign(d, G(a.payload));
         break;
       }
-      case m.OPTIONS: {
-        Object.assign(d, q(r.payload));
+      case h.OPTIONS: {
+        Object.assign(d, q(a.payload));
         break;
       }
-      case m.ALL: {
-        Object.assign(d, r.payload);
+      case h.ALL: {
+        Object.assign(d, a.payload);
         break;
       }
     }
-    return n[l] = d, o.set(a, d), d;
+    return n[l] = d, o.set(r, d), d;
   }
-  _addRuleSideEffect(e, a, r, o) {
-    if (!this._ensureMap(e, a).map.get(r.uid))
+  _addRuleSideEffect(e, r, a, o) {
+    if (!this._ensureMap(e, r).map.get(a.uid))
       return {
-        rule: r,
+        rule: a,
         type: "add",
         unitId: e,
-        subUnitId: a,
+        subUnitId: r,
         source: o
       };
   }
-  addRule(e, a, r, o, n) {
+  addRule(e, r, a, o, n) {
     try {
-      const i = this._ensureMap(e, a), d = (Array.isArray(r) ? r : [r]).map((u) => this._addRuleSideEffect(e, a, u, o));
-      this._addSubUnitRule(i, r, n), d.forEach((u) => {
+      const i = this._ensureMap(e, r), d = (Array.isArray(a) ? a : [a]).map((u) => this._addRuleSideEffect(e, r, u, o));
+      this._addSubUnitRule(i, a, n), d.forEach((u) => {
         u && this._ruleChange$.next(u);
       });
     } catch (i) {
       this._logService.error(i);
     }
   }
-  updateRule(e, a, r, o, n) {
+  updateRule(e, r, a, o, n) {
     try {
-      const i = this._ensureMap(e, a), l = B.deepClone(i.map.get(r));
+      const i = this._ensureMap(e, r), l = B.deepClone(i.map.get(a));
       if (!l)
-        throw new Error(`Data validation rule is not found, ruleId: ${r}.`);
-      const d = this._updateSubUnitRule(i, r, o);
+        throw new Error(`Data validation rule is not found, ruleId: ${a}.`);
+      const d = this._updateSubUnitRule(i, a, o);
       this._ruleChange$.next({
         rule: d,
         type: "update",
         unitId: e,
-        subUnitId: a,
+        subUnitId: r,
         source: n,
         updatePayload: o,
         oldRule: l
@@ -127,73 +127,73 @@ let h = class extends P {
       this._logService.error(i);
     }
   }
-  removeRule(e, a, r, o) {
+  removeRule(e, r, a, o) {
     try {
-      const n = this._ensureMap(e, a), i = n.map.get(r);
-      i && (this._removeSubUnitRule(n, r), this._ruleChange$.next({
+      const n = this._ensureMap(e, r), i = n.map.get(a);
+      i && (this._removeSubUnitRule(n, a), this._ruleChange$.next({
         rule: i,
         type: "remove",
         unitId: e,
-        subUnitId: a,
+        subUnitId: r,
         source: o
       }));
     } catch (n) {
       this._logService.error(n);
     }
   }
-  getRuleById(e, a, r) {
-    return this._ensureMap(e, a).map.get(r);
+  getRuleById(e, r, a) {
+    return this._ensureMap(e, r).map.get(a);
   }
-  getRuleIndex(e, a, r) {
-    return this._ensureMap(e, a).list.findIndex((n) => n.uid === r);
+  getRuleIndex(e, r, a) {
+    return this._ensureMap(e, r).list.findIndex((n) => n.uid === a);
   }
-  getRules(e, a) {
-    return [...this._ensureMap(e, a).list];
+  getRules(e, r) {
+    return [...this._ensureMap(e, r).list];
   }
   getUnitRules(e) {
-    const a = this._model.get(e);
-    if (!a)
+    const r = this._model.get(e);
+    if (!r)
       return [];
-    const r = [];
-    return a.forEach((o, n) => {
-      r.push([n, o.list]);
-    }), r;
+    const a = [];
+    return r.forEach((o, n) => {
+      a.push([n, o.list]);
+    }), a;
   }
   deleteUnitRules(e) {
     this._model.delete(e);
   }
   getSubUnitIds(e) {
-    var a, r;
-    return Array.from((r = (a = this._model.get(e)) == null ? void 0 : a.keys()) != null ? r : []);
+    var r, a;
+    return Array.from((a = (r = this._model.get(e)) == null ? void 0 : r.keys()) != null ? a : []);
   }
   getAll() {
     return Array.from(this._model.keys()).map((e) => [e, this.getUnitRules(e)]);
   }
 };
-h = ne([
-  ie(0, T)
-], h);
-var se = Object.defineProperty, de = Object.getOwnPropertyDescriptor, le = (t, e, a, r) => {
-  for (var o = r > 1 ? void 0 : r ? de(e, a) : e, n = t.length - 1, i; n >= 0; n--)
-    (i = t[n]) && (o = (r ? i(e, a, o) : i(o)) || o);
-  return r && o && se(e, a, o), o;
-}, y = (t, e) => (a, r) => e(a, r, t);
+m = ne([
+  ie(0, N)
+], m);
+var se = Object.defineProperty, de = Object.getOwnPropertyDescriptor, le = (t, e, r, a) => {
+  for (var o = a > 1 ? void 0 : a ? de(e, r) : e, n = t.length - 1, i; n >= 0; n--)
+    (i = t[n]) && (o = (a ? i(e, r, o) : i(o)) || o);
+  return a && o && se(e, r, o), o;
+}, y = (t, e) => (r, a) => e(r, a, t);
 const ue = "SHEET_DATA_VALIDATION_PLUGIN";
 let I = class extends P {
-  constructor(t, e, a) {
-    super(), this._resourceManagerService = t, this._univerInstanceService = e, this._dataValidationModel = a, this._initSnapshot();
+  constructor(t, e, r) {
+    super(), this._resourceManagerService = t, this._univerInstanceService = e, this._dataValidationModel = r, this._initSnapshot();
   }
   _initSnapshot() {
-    const t = (a) => {
-      const r = this._dataValidationModel.getUnitRules(a), o = {};
-      return r ? (r.forEach(([n, i]) => {
+    const t = (r) => {
+      const a = this._dataValidationModel.getUnitRules(r), o = {};
+      return a ? (a.forEach(([n, i]) => {
         o[n] = i;
       }), JSON.stringify(o)) : "";
-    }, e = (a) => {
-      if (!a)
+    }, e = (r) => {
+      if (!r)
         return {};
       try {
-        return JSON.parse(a);
+        return JSON.parse(r);
       } catch {
         return {};
       }
@@ -202,15 +202,15 @@ let I = class extends P {
       this._resourceManagerService.registerPluginResource({
         pluginName: ue,
         businesses: [x.UNIVER_SHEET],
-        toJson: (a) => t(a),
-        parseJson: (a) => e(a),
-        onUnLoad: (a) => {
-          this._dataValidationModel.deleteUnitRules(a);
+        toJson: (r) => t(r),
+        parseJson: (r) => e(r),
+        onUnLoad: (r) => {
+          this._dataValidationModel.deleteUnitRules(r);
         },
-        onLoad: (a, r) => {
-          Object.keys(r).forEach((o) => {
-            r[o].forEach((i) => {
-              this._dataValidationModel.addRule(a, o, i, "patched");
+        onLoad: (r, a) => {
+          Object.keys(a).forEach((o) => {
+            a[o].forEach((i) => {
+              this._dataValidationModel.addRule(r, o, i, "patched");
             });
           });
         }
@@ -221,7 +221,7 @@ let I = class extends P {
 I = le([
   y(0, z),
   y(1, K),
-  y(2, O(h))
+  y(2, O(m))
 ], I);
 var ce = /* @__PURE__ */ ((t) => (t.SHEET = "sheet", t))(ce || {});
 class H {
@@ -231,26 +231,26 @@ class H {
     c(this, "_validatorsChange$", new ae(void 0));
     c(this, "validatorsChange$", this._validatorsChange$.asObservable());
   }
-  _addValidatorToScope(e, a) {
-    this._validatorByScopes.has(a) || this._validatorByScopes.set(a, []);
-    const r = this._validatorByScopes.get(a);
-    if (r.findIndex((o) => o.id === e.id) > -1)
+  _addValidatorToScope(e, r) {
+    this._validatorByScopes.has(r) || this._validatorByScopes.set(r, []);
+    const a = this._validatorByScopes.get(r);
+    if (a.findIndex((o) => o.id === e.id) > -1)
       throw new Error(`Validator item with the same id ${e.id} has already been added!`);
-    r.push(e);
+    a.push(e);
   }
-  _removeValidatorFromScope(e, a) {
-    const r = this._validatorByScopes.get(a);
-    if (!r)
+  _removeValidatorFromScope(e, r) {
+    const a = this._validatorByScopes.get(r);
+    if (!a)
       return;
-    const o = r.findIndex((n) => n.id === e.id);
-    o > -1 && r.splice(o, 1);
+    const o = a.findIndex((n) => n.id === e.id);
+    o > -1 && a.splice(o, 1);
   }
   register(e) {
-    return this._validatorMap.set(e.id, e), Array.isArray(e.scopes) ? e.scopes.forEach((a) => {
-      this._addValidatorToScope(e, a);
+    return this._validatorMap.set(e.id, e), Array.isArray(e.scopes) ? e.scopes.forEach((r) => {
+      this._addValidatorToScope(e, r);
     }) : this._addValidatorToScope(e, e.scopes), this._validatorsChange$.next(), Y(() => {
-      this._validatorMap.delete(e.id), Array.isArray(e.scopes) ? e.scopes.forEach((a) => {
-        this._removeValidatorFromScope(e, a);
+      this._validatorMap.delete(e.id), Array.isArray(e.scopes) ? e.scopes.forEach((r) => {
+        this._removeValidatorFromScope(e, r);
       }) : this._removeValidatorFromScope(e, e.scopes), this._validatorsChange$.next();
     });
   }
@@ -261,97 +261,97 @@ class H {
     return this._validatorByScopes.get(e);
   }
 }
-const A = {
+const S = {
   type: E.MUTATION,
   id: "data-validation.mutation.addRule",
   handler(t, e) {
     if (!e)
       return !1;
-    const { unitId: a, subUnitId: r, rule: o, index: n, source: i = "command" } = e;
-    return t.get(h).addRule(a, r, o, i, n), !0;
+    const { unitId: r, subUnitId: a, rule: o, index: n, source: i = "command" } = e;
+    return t.get(m).addRule(r, a, o, i, n), !0;
   }
-}, v = {
+}, f = {
   type: E.MUTATION,
   id: "data-validation.mutation.removeRule",
   handler(t, e) {
     if (!e)
       return !1;
-    const { unitId: a, subUnitId: r, ruleId: o, source: n = "command" } = e, i = t.get(h);
+    const { unitId: r, subUnitId: a, ruleId: o, source: n = "command" } = e, i = t.get(m);
     return Array.isArray(o) ? o.forEach((l) => {
-      i.removeRule(a, r, l, n);
-    }) : i.removeRule(a, r, o, n), !0;
+      i.removeRule(r, a, l, n);
+    }) : i.removeRule(r, a, o, n), !0;
   }
-}, f = {
+}, v = {
   type: E.MUTATION,
   id: "data-validation.mutation.updateRule",
   handler(t, e) {
     if (!e)
       return !1;
-    const { unitId: a, subUnitId: r, ruleId: o, payload: n, source: i = "command" } = e;
-    return t.get(h).updateRule(a, r, o, n, i), !0;
+    const { unitId: r, subUnitId: a, ruleId: o, payload: n, source: i = "command" } = e;
+    return t.get(m).updateRule(r, a, o, n, i), !0;
   }
 }, pe = {
   type: E.COMMAND,
   id: "data-validation.command.addRule",
   async handler(t, e) {
-    if (t.get(T).error("[Deprecated]: `AddDataValidationCommand` is deprecated, please use `AddSheetDataValidationCommand` in `@univerjs/sheets-data-validation` instead!"), !e)
+    if (t.get(N).error("[Deprecated]: `AddDataValidationCommand` is deprecated, please use `AddSheetDataValidationCommand` in `@univerjs/sheets-data-validation` instead!"), !e)
       return !1;
-    const { rule: r, unitId: o, subUnitId: n } = e, i = t.get(S), l = t.get(M), d = {
+    const { rule: a, unitId: o, subUnitId: n } = e, i = t.get(T), l = t.get(A), d = {
       ...e,
       rule: {
         ...e.rule,
         ranges: [e.rule.range]
       }
     }, u = [{
-      id: A.id,
+      id: S.id,
       params: d
     }], p = [{
-      id: v.id,
+      id: f.id,
       params: {
         unitId: o,
         subUnitId: n,
-        ruleId: r.uid
+        ruleId: a.uid
       }
     }];
     return l.pushUndoRedo({
       unitID: o,
       redoMutations: u,
       undoMutations: p
-    }), await i.executeCommand(A.id, d), !0;
+    }), await i.executeCommand(S.id, d), !0;
   }
-}, he = {
+}, me = {
   type: E.COMMAND,
   id: "data-validation.command.removeRule",
   handler(t, e) {
-    if (t.get(T).error("[Deprecated]: `RemoveDataValidationCommand` is deprecated, please use `RemoveSheetDataValidationCommand` in `@univerjs/sheets-data-validation` instead!"), !e)
+    if (t.get(N).error("[Deprecated]: `RemoveDataValidationCommand` is deprecated, please use `RemoveSheetDataValidationCommand` in `@univerjs/sheets-data-validation` instead!"), !e)
       return !1;
-    const { unitId: r, subUnitId: o, ruleId: n } = e, i = t.get(S), l = t.get(M), d = t.get(h), u = [{
-      id: v.id,
+    const { unitId: a, subUnitId: o, ruleId: n } = e, i = t.get(T), l = t.get(A), d = t.get(m), u = [{
+      id: f.id,
       params: e
     }], p = [{
-      id: A.id,
+      id: S.id,
       params: {
-        unitId: r,
+        unitId: a,
         subUnitId: o,
         rule: {
-          ...d.getRuleById(r, o, n)
+          ...d.getRuleById(a, o, n)
         },
-        index: d.getRuleIndex(r, o, n)
+        index: d.getRuleIndex(a, o, n)
       }
     }];
     return l.pushUndoRedo({
       undoMutations: p,
       redoMutations: u,
       unitID: e.unitId
-    }), i.executeCommand(v.id, e), !0;
+    }), i.executeCommand(f.id, e), !0;
   }
-}, me = {
+}, he = {
   type: E.COMMAND,
   id: "data-validation.command.updateDataValidationSetting",
   handler(t, e) {
-    if (t.get(T).warn("[Deprecated]: `UpdateDataValidationOptionsCommand` is deprecated, please use `UpdateSheetDataValidationOptionsCommand` in `@univerjs/sheets-data-validation` instead!"), !e)
+    if (t.get(N).warn("[Deprecated]: `UpdateDataValidationOptionsCommand` is deprecated, please use `UpdateSheetDataValidationOptionsCommand` in `@univerjs/sheets-data-validation` instead!"), !e)
       return !1;
-    const r = t.get(S), o = t.get(M), n = t.get(h), { unitId: i, subUnitId: l, ruleId: d, options: u } = e, p = n.getRuleById(i, l, d);
+    const a = t.get(T), o = t.get(A), n = t.get(m), { unitId: i, subUnitId: l, ruleId: d, options: u } = e, p = n.getRuleById(i, l, d);
     if (!p)
       return !1;
     const _ = {
@@ -359,94 +359,94 @@ const A = {
       subUnitId: l,
       ruleId: d,
       payload: {
-        type: m.OPTIONS,
+        type: h.OPTIONS,
         payload: u
       }
     }, g = [{
-      id: f.id,
+      id: v.id,
       params: _
-    }], R = {
+    }], M = {
       unitId: i,
       subUnitId: l,
       ruleId: d,
       payload: {
-        type: m.OPTIONS,
+        type: h.OPTIONS,
         payload: q(p)
       }
-    }, N = [{
-      id: f.id,
-      params: R
+    }, R = [{
+      id: v.id,
+      params: M
     }];
     return o.pushUndoRedo({
       unitID: i,
       redoMutations: g,
-      undoMutations: N
-    }), r.executeCommand(f.id, _), !0;
+      undoMutations: R
+    }), a.executeCommand(v.id, _), !0;
   }
 }, _e = {
   type: E.COMMAND,
   id: "data-validation.command.updateDataValidationOptions",
   handler(t, e) {
-    if (t.get(T).error("[Deprecated]: `UpdateDataValidationSettingCommand` is deprecated, please use `UpdateSheetDataValidationSettingCommand` in `@univerjs/sheets-data-validation` instead!"), !e)
+    if (t.get(N).error("[Deprecated]: `UpdateDataValidationSettingCommand` is deprecated, please use `UpdateSheetDataValidationSettingCommand` in `@univerjs/sheets-data-validation` instead!"), !e)
       return !1;
-    const r = t.get(S), o = t.get(M), n = t.get(h), i = t.get(H), { unitId: l, subUnitId: d, ruleId: u, setting: p } = e, _ = i.getValidatorItem(p.type);
+    const a = t.get(T), o = t.get(A), n = t.get(m), i = t.get(H), { unitId: l, subUnitId: d, ruleId: u, setting: p } = e, _ = i.getValidatorItem(p.type);
     if (!_)
       return !1;
     const g = n.getRuleById(l, d, u);
     if (!g)
       return !1;
-    const R = { ...g, ...p };
-    if (!_.validatorFormula(R, l, d).success)
+    const M = { ...g, ...p };
+    if (!_.validatorFormula(M, l, d).success)
       return !1;
-    const N = {
+    const R = {
       unitId: l,
       subUnitId: d,
       ruleId: u,
       payload: {
-        type: m.SETTING,
+        type: h.SETTING,
         payload: {
           ...p,
-          ..._.normalizeFormula(R, l, d)
+          ..._.normalizeFormula(M, l, d)
         }
       }
     }, j = [{
-      id: f.id,
-      params: N
+      id: v.id,
+      params: R
     }], Q = {
       unitId: l,
       subUnitId: d,
       ruleId: u,
       payload: {
-        type: m.SETTING,
+        type: h.SETTING,
         payload: G(g)
       }
-    }, W = [{
-      id: f.id,
+    }, F = [{
+      id: v.id,
       params: Q
     }];
     return o.pushUndoRedo({
       unitID: l,
       redoMutations: j,
-      undoMutations: W
-    }), r.executeCommand(f.id, N), !0;
+      undoMutations: F
+    }), a.executeCommand(v.id, R), !0;
   }
 }, Ee = {
   type: E.COMMAND,
   id: "data-validation.command.removeAll",
   handler(t, e) {
-    if (t.get(T).error("[Deprecated]: `RemoveAllDataValidationCommand` is deprecated, please use `RemoveSheetAllDataValidationCommand` in `@univerjs/sheets-data-validation` instead!"), !e)
+    if (t.get(N).error("[Deprecated]: `RemoveAllDataValidationCommand` is deprecated, please use `RemoveSheetAllDataValidationCommand` in `@univerjs/sheets-data-validation` instead!"), !e)
       return !1;
-    const { unitId: r, subUnitId: o } = e, n = t.get(S), i = t.get(h), l = t.get(M), d = [...i.getRules(r, o)], u = {
-      unitId: r,
+    const { unitId: a, subUnitId: o } = e, n = t.get(T), i = t.get(m), l = t.get(A), d = [...i.getRules(a, o)], u = {
+      unitId: a,
       subUnitId: o,
       ruleId: d.map((g) => g.uid)
     }, p = [{
-      id: v.id,
+      id: f.id,
       params: u
     }], _ = [{
-      id: A.id,
+      id: S.id,
       params: {
-        unitId: r,
+        unitId: a,
         subUnitId: o,
         rule: d
       }
@@ -454,39 +454,39 @@ const A = {
     return l.pushUndoRedo({
       redoMutations: p,
       undoMutations: _,
-      unitID: r
-    }), n.executeCommand(v.id, u), !0;
-  }
-}, ge = "data-validation.config", fe = {};
-var ve = Object.defineProperty, Te = Object.getOwnPropertyDescriptor, Se = (t, e, a, r) => {
-  for (var o = r > 1 ? void 0 : r ? Te(e, a) : e, n = t.length - 1, i; n >= 0; n--)
-    (i = t[n]) && (o = (r ? i(e, a, o) : i(o)) || o);
-  return r && o && ve(e, a, o), o;
-}, L = (t, e) => (a, r) => e(a, r, t);
-const Ae = "UNIVER_DATA_VALIDATION_PLUGIN";
+      unitID: a
+    }), n.executeCommand(f.id, u), !0;
+  }
+}, ge = "data-validation.config", ve = {};
+var fe = Object.defineProperty, Ne = Object.getOwnPropertyDescriptor, Te = (t, e, r, a) => {
+  for (var o = a > 1 ? void 0 : a ? Ne(e, r) : e, n = t.length - 1, i; n >= 0; n--)
+    (i = t[n]) && (o = (a ? i(e, r, o) : i(o)) || o);
+  return a && o && fe(e, r, o), o;
+}, L = (t, e) => (r, a) => e(r, a, t);
+const Se = "UNIVER_DATA_VALIDATION_PLUGIN";
 var V;
 let U = (V = class extends X {
-  constructor(t = fe, e, a, r) {
-    super(), this._config = t, this._injector = e, this._commandService = a, this._configService = r;
+  constructor(t = ve, e, r, a) {
+    super(), this._config = t, this._injector = e, this._commandService = r, this._configService = a;
     const { ...o } = this._config;
     this._configService.setConfig(ge, o);
   }
   onStarting() {
     [
-      [h],
+      [m],
       [H],
       [I]
     ].forEach((t) => this._injector.add(t)), [
       // command
       pe,
       Ee,
-      me,
-      _e,
       he,
+      _e,
+      me,
       // mutation
-      A,
-      f,
-      v
+      S,
+      v,
+      f
     ].forEach((t) => {
       this._commandService.registerCommand(t);
     });
@@ -494,14 +494,14 @@ let U = (V = class extends X {
   onReady() {
     this._injector.get(I);
   }
-}, c(V, "pluginName", Ae), c(V, "type", x.UNIVER_SHEET), V);
-U = Se([
+}, c(V, "pluginName", Se), c(V, "type", x.UNIVER_SHEET), V);
+U = Te([
   L(1, O($)),
-  L(2, S),
+  L(2, T),
   L(3, Z)
 ], U);
 s.BETWEEN + "", s.EQUAL + "", s.GREATER_THAN + "", s.GREATER_THAN_OR_EQUAL + "", s.LESS_THAN + "", s.LESS_THAN_OR_EQUAL + "", s.NOT_BETWEEN + "", s.NOT_EQUAL + "";
-const Me = {
+const Ae = {
   [s.BETWEEN]: "dataValidation.ruleName.between",
   [s.EQUAL]: "dataValidation.ruleName.equal",
   [s.GREATER_THAN]: "dataValidation.ruleName.greaterThan",
@@ -510,7 +510,7 @@ const Me = {
   [s.LESS_THAN_OR_EQUAL]: "dataValidation.ruleName.lessThanOrEqual",
   [s.NOT_BETWEEN]: "dataValidation.ruleName.notBetween",
   [s.NOT_EQUAL]: "dataValidation.ruleName.notEqual"
-}, Re = {
+}, Me = {
   [s.BETWEEN]: "dataValidation.errorMsg.between",
   [s.EQUAL]: "dataValidation.errorMsg.equal",
   [s.GREATER_THAN]: "dataValidation.errorMsg.greaterThan",
@@ -532,12 +532,12 @@ const Me = {
   s.BETWEEN,
   s.NOT_BETWEEN
 ];
-var Ne = Object.defineProperty, Ve = Object.getOwnPropertyDescriptor, Oe = (t, e, a, r) => {
-  for (var o = r > 1 ? void 0 : r ? Ve(e, a) : e, n = t.length - 1, i; n >= 0; n--)
-    (i = t[n]) && (o = (r ? i(e, a, o) : i(o)) || o);
-  return r && o && Ne(e, a, o), o;
-}, D = (t, e) => (a, r) => e(a, r, t);
-const w = "{FORMULA1}", C = "{FORMULA2}", Ie = {
+var Re = Object.defineProperty, Ve = Object.getOwnPropertyDescriptor, Oe = (t, e, r, a) => {
+  for (var o = a > 1 ? void 0 : a ? Ve(e, r) : e, n = t.length - 1, i; n >= 0; n--)
+    (i = t[n]) && (o = (a ? i(e, r, o) : i(o)) || o);
+  return a && o && Re(e, r, o), o;
+}, D = (t, e) => (r, a) => e(r, a, t);
+const w = "{FORMULA1}", b = "{FORMULA2}", Ie = {
   [s.BETWEEN]: "dataValidation.operators.between",
   [s.EQUAL]: "dataValidation.operators.equal",
   [s.GREATER_THAN]: "dataValidation.operators.greaterThan",
@@ -547,9 +547,10 @@ const w = "{FORMULA1}", C = "{FORMULA2}", Ie = {
   [s.NOT_BETWEEN]: "dataValidation.operators.notBetween",
   [s.NOT_EQUAL]: "dataValidation.operators.notEqual"
 };
-let b = class {
+let C = class {
   // #endregion
   constructor(t, e) {
+    c(this, "offsetFormulaByRange", !0);
     // #region UI related
     c(this, "formulaInput");
     c(this, "canvasRender", null);
@@ -565,17 +566,17 @@ let b = class {
     return this.localeService.t(this.title);
   }
   generateRuleName(t) {
-    var a, r;
+    var r, a;
     if (!t.operator)
       return this.titleStr;
-    const e = this.localeService.t(Me[t.operator]).replace(w, (a = t.formula1) != null ? a : "").replace(C, (r = t.formula2) != null ? r : "");
+    const e = this.localeService.t(Ae[t.operator]).replace(w, (r = t.formula1) != null ? r : "").replace(b, (a = t.formula2) != null ? a : "");
     return `${this.titleStr} ${e}`;
   }
   generateRuleErrorMessage(t, e) {
-    var r, o;
-    return t.operator ? `${this.localeService.t(Re[t.operator]).replace(w, (r = t.formula1) != null ? r : "").replace(C, (o = t.formula2) != null ? o : "")}` : this.titleStr;
+    var a, o;
+    return t.operator ? `${this.localeService.t(Me[t.operator]).replace(w, (a = t.formula1) != null ? a : "").replace(b, (o = t.formula2) != null ? o : "")}` : this.titleStr;
   }
-  getExtraStyle(t, e, a, r, o) {
+  getExtraStyle(t, e, r, a, o) {
   }
   getRuleFinalError(t, e) {
     return t.showErrorMessage && t.error ? t.error : this.generateRuleErrorMessage(t, e);
@@ -583,47 +584,61 @@ let b = class {
   isEmptyCellValue(t) {
     return t === "" || t === void 0 || t === null;
   }
-  normalizeFormula(t, e, a) {
+  normalizeFormula(t, e, r) {
     return {
       formula1: t.formula1,
       formula2: t.formula2
     };
   }
-  async isValidType(t, e, a) {
+  async isValidType(t, e, r) {
     return !0;
   }
-  transform(t, e, a) {
+  transform(t, e, r) {
     return t;
   }
-  async validatorIsEqual(t, e, a) {
-    return !0;
+  async validatorIsEqual(t, e, r) {
+    const { formula1: a } = e, { value: o } = t;
+    return Number.isNaN(a) ? !0 : o === a;
   }
-  async validatorIsNotEqual(t, e, a) {
-    return !0;
+  async validatorIsNotEqual(t, e, r) {
+    const { formula1: a } = e;
+    return Number.isNaN(a) ? !0 : t.value !== a;
   }
-  async validatorIsBetween(t, e, a) {
-    return !0;
+  async validatorIsBetween(t, e, r) {
+    const { formula1: a, formula2: o } = e;
+    if (Number.isNaN(a) || Number.isNaN(o))
+      return !0;
+    const n = Math.min(a, o), i = Math.max(a, o);
+    return t.value >= n && t.value <= i;
   }
-  async validatorIsNotBetween(t, e, a) {
-    return !0;
+  async validatorIsNotBetween(t, e, r) {
+    const { formula1: a, formula2: o } = e;
+    if (Number.isNaN(a) || Number.isNaN(o))
+      return !0;
+    const n = Math.min(a, o), i = Math.max(a, o);
+    return t.value < n || t.value > i;
   }
-  async validatorIsGreaterThan(t, e, a) {
-    return !0;
+  async validatorIsGreaterThan(t, e, r) {
+    const { formula1: a } = e;
+    return Number.isNaN(a) ? !0 : t.value > a;
   }
-  async validatorIsGreaterThanOrEqual(t, e, a) {
-    return !0;
+  async validatorIsGreaterThanOrEqual(t, e, r) {
+    const { formula1: a } = e;
+    return Number.isNaN(a) ? !0 : t.value >= a;
   }
-  async validatorIsLessThan(t, e, a) {
-    return !0;
+  async validatorIsLessThan(t, e, r) {
+    const { formula1: a } = e;
+    return Number.isNaN(a) ? !0 : t.value < a;
   }
-  async validatorIsLessThanOrEqual(t, e, a) {
-    return !0;
+  async validatorIsLessThanOrEqual(t, e, r) {
+    const { formula1: a } = e;
+    return Number.isNaN(a) ? !0 : t.value <= a;
   }
   async validator(t, e) {
-    const { value: a, unitId: r, subUnitId: o } = t, n = this.isEmptyCellValue(a), { allowBlank: i = !0, operator: l } = e;
+    const { value: r, unitId: a, subUnitId: o } = t, n = this.isEmptyCellValue(r), { allowBlank: i = !0, operator: l } = e;
     if (n)
       return i;
-    const d = await this.parseFormula(e, r, o, t.row, t.column);
+    const d = await this.parseFormula(e, a, o, t.row, t.column);
     if (!d.isFormulaValid || !await this.isValidType(t, d, e))
       return !1;
     if (!B.isDefine(l))
@@ -651,23 +666,23 @@ let b = class {
     }
   }
 };
-b = Oe([
+C = Oe([
   D(0, O(k)),
   D(1, O($))
-], b);
+], C);
 export {
-  A as AddDataValidationMutation,
-  b as BaseDataValidator,
-  h as DataValidationModel,
+  S as AddDataValidationMutation,
+  C as BaseDataValidator,
+  m as DataValidationModel,
   I as DataValidationResourceController,
   ce as DataValidatorRegistryScope,
   H as DataValidatorRegistryService,
-  v as RemoveDataValidationMutation,
+  f as RemoveDataValidationMutation,
   we as TWO_FORMULA_OPERATOR_COUNT,
   De as TextLengthErrorTitleMap,
   U as UniverDataValidationPlugin,
-  f as UpdateDataValidationMutation,
-  m as UpdateRuleType,
+  v as UpdateDataValidationMutation,
+  h as UpdateRuleType,
   q as getRuleOptions,
   G as getRuleSetting
 };