@univerjs/sheets-data-validation 0.4.1 → 0.4.2

package/lib/es/index.js

@@ -6,7 +6,7 @@ import { Inject, ICommandService, Disposable, ObjectMatrix, Range, Injector, Uni
 import { DataValidationModel, DataValidatorRegistryService, UpdateRuleType, BaseDataValidator, TextLengthErrorTitleMap, AddDataValidationMutation, RemoveDataValidationMutation, UpdateDataValidationMutation, getRuleSetting, getRuleOptions, UniverDataValidationPlugin } from "@univerjs/data-validation";
 import { SetRangeValuesMutation, RemoveSheetMutation, getSheetCommandTarget, SetRangeValuesUndoMutationFactory, SheetsSelectionsService, SheetInterceptorService, ClearSelectionAllCommand, WorksheetViewPermission, RefRangeService, handleCommonDefaultRangeChangeWithEffectRefCommands, RemoveSheetCommand } from "@univerjs/sheets";
 import { Subject, bufferWhen, filter } from "rxjs";
-import { LexerTreeBuilder, isReferenceString, sequenceNodeType, deserializeRangeWithSheet, ERROR_TYPE_SET } from "@univerjs/engine-formula";
+import { LexerTreeBuilder, ERROR_TYPE_SET, isReferenceString, sequenceNodeType, deserializeRangeWithSheet, deserializeRangeWithSheetWithCache } from "@univerjs/engine-formula";
 import { RegisterOtherFormulaService, FormulaRefRangeService } from "@univerjs/sheets-formula";
 const DATA_VALIDATION_PLUGIN_NAME = "SHEET_DATA_VALIDATION_PLUGIN";
 var __defProp$9 = Object.defineProperty, __getOwnPropDesc$9 = Object.getOwnPropertyDescriptor, __decorateClass$9 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
@@ -863,7 +863,8 @@ const _RuleMatrix = class _RuleMatrix {
         type: "update",
         ruleId: rule.uid,
         oldRanges,
-        newRanges
+        newRanges: Rectangle.sort(newRanges),
+        rule
       }), newRanges.length === 0 && (mutations.push({
         type: "delete",
         rule,
@@ -881,7 +882,8 @@ const _RuleMatrix = class _RuleMatrix {
         type: "update",
         ruleId: rule.uid,
         oldRanges,
-        newRanges
+        newRanges: Rectangle.sort(newRanges),
+        rule
       }), newRanges.length === 0 && (mutations.push({
         type: "delete",
         rule,
@@ -894,7 +896,7 @@ const _RuleMatrix = class _RuleMatrix {
         type: "add",
         rule: {
           ...rule,
-          ranges: newRanges
+          ranges: Rectangle.sort(newRanges)
         }
       });
     }), mutations;
@@ -956,16 +958,16 @@ let SheetDataValidationModel = (_a5 = class extends Disposable {
     for (const [unitId, subUnitMap] of allRules)
       for (const [subUnitId, rules] of subUnitMap)
         for (const rule of rules)
-          this._ruleChange$.next({
+          this._addRule(unitId, subUnitId, rule), this._ruleChange$.next({
             type: "add",
             unitId,
             subUnitId,
             rule,
             source: "patched"
-          }), this._addRule(unitId, subUnitId, rule);
+          });
     this.disposeWithMe(
       this._dataValidationModel.ruleChange$.subscribe((ruleChange) => {
-        switch (this._ruleChange$.next(ruleChange), ruleChange.type) {
+        switch (ruleChange.type) {
           case "add":
             this._addRule(ruleChange.unitId, ruleChange.subUnitId, ruleChange.rule);
             break;
@@ -976,6 +978,7 @@ let SheetDataValidationModel = (_a5 = class extends Disposable {
             this._removeRule(ruleChange.unitId, ruleChange.subUnitId, ruleChange.rule);
             break;
         }
+        this._ruleChange$.next(ruleChange);
       })
     );
   }
@@ -1112,6 +1115,10 @@ function getFormulaCellData(result) {
   return (_a12 = result == null ? void 0 : result[0]) == null ? void 0 : _a12[0];
 }
 __name(getFormulaCellData, "getFormulaCellData");
+function isLegalFormulaResult(res) {
+  return !ERROR_TYPE_SET.has(res);
+}
+__name(isLegalFormulaResult, "isLegalFormulaResult");
 const CHECKBOX_FORMULA_1 = 1, CHECKBOX_FORMULA_2 = 0;
 function getFailMessage(formula, localeService) {
   return Tools.isBlank(formula) ? localeService.t("dataValidation.validFail.value") : isFormulaString(formula) ? localeService.t("dataValidation.validFail.primitive") : "";
@@ -1151,12 +1158,13 @@ const transformCheckboxValue = /* @__PURE__ */ __name((value) => Tools.isDefine(
   }
   async parseFormula(rule, unitId, subUnitId) {
     var _a12, _b;
-    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), originFormula1 = isFormulaString(formula1) ? getFormulaResult((_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result) : formula1, originFormula2 = isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2;
+    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), originFormula1 = isFormulaString(formula1) ? getFormulaResult((_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result) : formula1, originFormula2 = isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2, isFormulaValid = isLegalFormulaResult(String(originFormula1)) && isLegalFormulaResult(String(originFormula2));
     return {
       formula1: transformCheckboxValue(originFormula1),
       formula2: transformCheckboxValue(originFormula2),
       originFormula1,
-      originFormula2
+      originFormula2,
+      isFormulaValid
     };
   }
   getExtraStyle(rule, value) {
@@ -1213,8 +1221,8 @@ var dayjs_min = { exports: {} };
       return { M: c, y: h, w: o, d: a, D: d, h: u, m: s, s: i, ms: r, Q: f }[t2] || String(t2 || "").toLowerCase().replace(/s$/, "");
     }, "p"), u: /* @__PURE__ */ __name(function(t2) {
       return t2 === void 0;
-    }, "u") }, g = "en", D2 = {};
-    D2[g] = M;
+    }, "u") }, g = "en", D = {};
+    D[g] = M;
     var p = "$isDayjsObject", S = /* @__PURE__ */ __name(function(t2) {
       return t2 instanceof _ || !(!t2 || !t2[p]);
     }, "S"), w = /* @__PURE__ */ __name(function t2(e2, n2, r2) {
@@ -1222,12 +1230,12 @@ var dayjs_min = { exports: {} };
       if (!e2) return g;
       if (typeof e2 == "string") {
         var s2 = e2.toLowerCase();
-        D2[s2] && (i2 = s2), n2 && (D2[s2] = n2, i2 = s2);
+        D[s2] && (i2 = s2), n2 && (D[s2] = n2, i2 = s2);
         var u2 = e2.split("-");
         if (!i2 && u2.length > 1) return t2(u2[0]);
       } else {
         var a2 = e2.name;
-        D2[a2] = e2, i2 = a2;
+        D[a2] = e2, i2 = a2;
       }
       return !r2 && i2 && (g = i2), i2 || !r2 && g;
     }, "t"), O = /* @__PURE__ */ __name(function(t2, e2) {
@@ -1292,8 +1300,8 @@ var dayjs_min = { exports: {} };
           case c:
             return r2 ? l2(1, M3) : l2(0, M3 + 1);
           case o:
-            var g2 = this.$locale().weekStart || 0, D3 = (y2 < g2 ? y2 + 7 : y2) - g2;
-            return l2(r2 ? m3 - D3 : m3 + (6 - D3), M3);
+            var g2 = this.$locale().weekStart || 0, D2 = (y2 < g2 ? y2 + 7 : y2) - g2;
+            return l2(r2 ? m3 - D2 : m3 + (6 - D2), M3);
           case a:
           case d:
             return $2(v2 + "Hours", 0);
@@ -1403,18 +1411,18 @@ var dayjs_min = { exports: {} };
       }, m2.utcOffset = function() {
         return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
       }, m2.diff = function(r2, d2, l2) {
-        var $2, y2 = this, M3 = b.p(d2), m3 = O(r2), v2 = (m3.utcOffset() - this.utcOffset()) * e, g2 = this - m3, D3 = /* @__PURE__ */ __name(function() {
+        var $2, y2 = this, M3 = b.p(d2), m3 = O(r2), v2 = (m3.utcOffset() - this.utcOffset()) * e, g2 = this - m3, D2 = /* @__PURE__ */ __name(function() {
           return b.m(y2, m3);
         }, "D");
         switch (M3) {
           case h:
-            $2 = D3() / 12;
+            $2 = D2() / 12;
             break;
           case c:
-            $2 = D3();
+            $2 = D2();
             break;
           case f:
-            $2 = D3() / 3;
+            $2 = D2() / 3;
             break;
           case o:
             $2 = (g2 - v2) / 6048e5;
@@ -1438,7 +1446,7 @@ var dayjs_min = { exports: {} };
       }, m2.daysInMonth = function() {
         return this.endOf(c).$D;
       }, m2.$locale = function() {
-        return D2[this.$L];
+        return D[this.$L];
       }, m2.locale = function(t2, e2) {
         if (!t2) return this.$L;
         var n2 = this.clone(), r2 = w(t2, e2, !0);
@@ -1463,7 +1471,7 @@ var dayjs_min = { exports: {} };
       return t2.$i || (t2(e2, _, O), t2.$i = !0), O;
     }, O.locale = w, O.isDayjs = S, O.unix = function(t2) {
       return O(1e3 * t2);
-    }, O.en = D2[g], O.Ls = D2, O.p = {}, O;
+    }, O.en = D[g], O.Ls = D, O.p = {}, O;
   });
 })(dayjs_min);
 var dayjs_minExports = dayjs_min.exports;
@@ -1527,10 +1535,11 @@ const DateOperatorTitleMap = {
   }
   async parseFormula(rule, unitId, subUnitId) {
     var _a12, _b;
-    const results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
+    const results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule, formulaResult1 = getFormulaResult((_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result), formulaResult2 = getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result), isFormulaValid = isLegalFormulaResult(String(formulaResult1)) && isLegalFormulaResult(String(formulaResult2));
     return {
-      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult((_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result) : formula1),
-      formula2: transformDate2SerialNumber(isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2)
+      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? formulaResult1 : formula1),
+      formula2: transformDate2SerialNumber(isFormulaString(formula2) ? formulaResult2 : formula2),
+      isFormulaValid
     };
   }
   parseFormulaSync(rule, unitId, subUnitId) {
@@ -1692,11 +1701,12 @@ const _DecimalValidator = class _DecimalValidator extends BaseDataValidator {
     return formula == null ? Number.NaN : +formula;
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a12, _b, _c, _d, _e, _f, _g, _h;
-    const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
+    var _a12, _b;
+    const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule, formulaResult1 = getFormulaResult((_a12 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a12.result), formulaResult2 = getFormulaResult((_b = formulaInfo == null ? void 0 : formulaInfo[1]) == null ? void 0 : _b.result), isFormulaValid = isLegalFormulaResult(String(formulaResult1)) && isLegalFormulaResult(String(formulaResult2));
     return {
-      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a12 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a12.result) == null ? void 0 : _b[0]) == null ? void 0 : _c[0]) == null ? void 0 : _d.v : formula1),
-      formula2: this._parseNumber(isFormulaString(formula2) ? (_h = (_g = (_f = (_e = formulaInfo == null ? void 0 : formulaInfo[1]) == null ? void 0 : _e.result) == null ? void 0 : _f[0]) == null ? void 0 : _g[0]) == null ? void 0 : _h.v : formula2)
+      formula1: this._parseNumber(isFormulaString(formula1) ? formulaResult1 : formula1),
+      formula2: this._parseNumber(isFormulaString(formula2) ? formulaResult2 : formula2),
+      isFormulaValid
     };
   }
   validatorFormula(rule, unitId, subUnitId) {
@@ -1783,7 +1793,7 @@ function getRuleFormulaResultSet(result) {
             resultSet.add(numfmt.format(cell.s.n.pattern, value, { throws: !1 }));
             return;
           }
-          resultSet.add(value.toString());
+          isLegalFormulaResult(value.toString()) && resultSet.add(value.toString());
         }
       });
     }
@@ -1855,11 +1865,12 @@ const _ListValidator = class _ListValidator extends BaseDataValidator {
     return deserializeListOptions(cellString);
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a12;
-    const { formula1 = "" } = rule, results = await this.formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);
+    var _a12, _b;
+    const { formula1 = "" } = rule, results = await this.formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), formulaResult1 = getFormulaResult((_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result), isFormulaValid = isLegalFormulaResult(String(formulaResult1));
     return {
-      formula1: isFormulaString(formula1) ? getRuleFormulaResultSet((_a12 = results == null ? void 0 : results[0]) == null ? void 0 : _a12.result) : deserializeListOptions(formula1),
-      formula2: void 0
+      formula1: isFormulaString(formula1) ? getRuleFormulaResultSet((_b = results == null ? void 0 : results[0]) == null ? void 0 : _b.result) : deserializeListOptions(formula1),
+      formula2: void 0,
+      isFormulaValid
     };
   }
   async isValidType(cellInfo, formula, rule) {
@@ -1947,11 +1958,12 @@ const FORMULA1 = "{FORMULA1}", FORMULA2 = "{FORMULA2}", _TextLengthValidator = c
     return !Number.isNaN(formula);
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a12, _b, _c, _d, _e, _f, _g, _h;
-    const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
+    var _a12, _b;
+    const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule, formulaResult1 = getFormulaResult((_a12 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a12.result), formulaResult2 = getFormulaResult((_b = formulaInfo == null ? void 0 : formulaInfo[1]) == null ? void 0 : _b.result), isFormulaValid = isLegalFormulaResult(String(formulaResult1)) && isLegalFormulaResult(String(formulaResult2));
     return {
-      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a12 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a12.result) == null ? void 0 : _b[0]) == null ? void 0 : _c[0]) == null ? void 0 : _d.v : formula1),
-      formula2: this._parseNumber(isFormulaString(formula2) ? (_h = (_g = (_f = (_e = formulaInfo == null ? void 0 : formulaInfo[1]) == null ? void 0 : _e.result) == null ? void 0 : _f[0]) == null ? void 0 : _g[0]) == null ? void 0 : _h.v : formula2)
+      formula1: this._parseNumber(isFormulaString(formula1) ? formulaResult1 : formula1),
+      formula2: this._parseNumber(isFormulaString(formula2) ? formulaResult2 : formula2),
+      isFormulaValid
     };
   }
   transform(cellInfo, _formula, _rule) {
@@ -2015,7 +2027,7 @@ function isBlankCell(cellData) {
 }
 __name(isBlankCell, "isBlankCell");
 function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, source = "command", fillDefaultValue = !0) {
-  const redoMutations = [], undoMutations = [], sheetDataValidationModel = accessor.get(SheetDataValidationModel), univerInstanceService = accessor.get(IUniverInstanceService), target = getSheetCommandTarget(univerInstanceService, { unitId, subUnitId });
+  const lexerTreeBuilder = accessor.get(LexerTreeBuilder), redoMutations = [], undoMutations = [], sheetDataValidationModel = accessor.get(SheetDataValidationModel), univerInstanceService = accessor.get(IUniverInstanceService), target = getSheetCommandTarget(univerInstanceService, { unitId, subUnitId });
   if (!target)
     return {
       redoMutations,
@@ -2056,7 +2068,7 @@ function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, sour
         });
         break;
       case "update": {
-        redoMutations.push({
+        if (redoMutations.push({
           id: UpdateDataValidationMutation.id,
           params: {
             unitId,
@@ -2080,7 +2092,35 @@ function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, sour
             },
             source
           }
-        });
+        }), diff.rule.type === DataValidationType.CUSTOM) {
+          const originRow = diff.oldRanges[0].startRow, originColumn = diff.oldRanges[0].startColumn, newRow = diff.newRanges[0].startRow, newColumn = diff.newRanges[0].startColumn, rowDiff = newRow - originRow, columnDiff = newColumn - originColumn, newFormula = lexerTreeBuilder.moveFormulaRefOffset(diff.rule.formula1, columnDiff, rowDiff);
+          newFormula !== diff.rule.formula1 && (redoMutations.push({
+            id: UpdateDataValidationMutation.id,
+            params: {
+              unitId,
+              subUnitId,
+              ruleId: diff.ruleId,
+              payload: {
+                type: UpdateRuleType.SETTING,
+                payload: {
+                  ...getRuleSetting(diff.rule),
+                  formula1: newFormula
+                }
+              }
+            }
+          }), undoMutations.unshift({
+            id: UpdateDataValidationMutation.id,
+            params: {
+              unitId,
+              subUnitId,
+              ruleId: diff.ruleId,
+              payload: {
+                type: UpdateRuleType.SETTING,
+                payload: getRuleSetting(diff.rule)
+              }
+            }
+          }));
+        }
         const rule = sheetDataValidationModel.getRuleById(unitId, subUnitId, diff.ruleId);
         if (rule && rule.type === DataValidationType.CHECKBOX) {
           const formula = sheetDataValidationModel.getValidator(DataValidationType.CHECKBOX).parseFormulaSync(rule, unitId, subUnitId);
@@ -2388,11 +2428,35 @@ const UpdateSheetDataValidationRangeCommand = {
       unitID: params.unitId
     }), commandService.executeCommand(RemoveDataValidationMutation.id, params), !0;
   }
-}, PLUGIN_CONFIG_KEY = "sheets-data-validation.config", defaultPluginConfig = {};
-function isLegalFormulaResult(res) {
-  return !ERROR_TYPE_SET.has(res);
-}
-__name(isLegalFormulaResult, "isLegalFormulaResult");
+}, PLUGIN_CONFIG_KEY = "sheets-data-validation.config", defaultPluginConfig = {}, _AnyValidator = class _AnyValidator extends BaseDataValidator {
+  constructor() {
+    super(...arguments);
+    __publicField(this, "id", DataValidationType.ANY);
+    __publicField(this, "title", "dataValidation.any.title");
+    __publicField(this, "operators", []);
+    __publicField(this, "scopes", ["sheet"]);
+  }
+  async parseFormula(rule, unitId, subUnitId) {
+    return {
+      formula1: rule.formula1,
+      formula2: rule.formula2,
+      isFormulaValid: !0
+    };
+  }
+  validatorFormula(rule, unitId, subUnitId) {
+    return {
+      success: !0
+    };
+  }
+  async isValidType(cellInfo, formula, rule) {
+    return !0;
+  }
+  generateRuleErrorMessage(rule) {
+    return this.localeService.t("dataValidation.any.error");
+  }
+};
+__name(_AnyValidator, "AnyValidator");
+let AnyValidator = _AnyValidator;
 const _CustomFormulaValidator = class _CustomFormulaValidator extends BaseDataValidator {
   constructor() {
     super(...arguments);
@@ -2412,16 +2476,21 @@ const _CustomFormulaValidator = class _CustomFormulaValidator extends BaseDataVa
   async parseFormula(_rule, _unitId, _subUnitId) {
     return {
       formula1: void 0,
-      formula2: void 0
+      formula2: void 0,
+      isFormulaValid: !1
     };
   }
   async isValidType(cellInfo, _formula, _rule) {
     const { column, row, unitId, subUnitId } = cellInfo, result = await this._customFormulaService.getCellFormulaValue(unitId, subUnitId, row, column), cellData = getFormulaCellData(result == null ? void 0 : result.result), formulaResult = cellData == null ? void 0 : cellData.v;
-    return Tools.isDefine(formulaResult) && formulaResult !== "" ? cellData.t === CellValueType.BOOLEAN ? !!formulaResult : typeof formulaResult == "boolean" ? formulaResult : typeof formulaResult == "number" ? !!formulaResult : typeof formulaResult == "string" ? isLegalFormulaResult(formulaResult) : !!formulaResult : !1;
+    return isLegalFormulaResult(String(formulaResult)) && Tools.isDefine(formulaResult) && formulaResult !== "" ? cellData.t === CellValueType.BOOLEAN ? !!formulaResult : typeof formulaResult == "boolean" ? formulaResult : typeof formulaResult == "number" ? !!formulaResult : typeof formulaResult == "string" ? isLegalFormulaResult(formulaResult) : !!formulaResult : !1;
   }
   generateRuleErrorMessage(rule) {
     return this.localeService.t("dataValidation.custom.error");
   }
+  generateRuleName(rule) {
+    var _a12;
+    return this.localeService.t("dataValidation.custom.ruleName").replace("{FORMULA1}", (_a12 = rule.formula1) != null ? _a12 : "");
+  }
 };
 __name(_CustomFormulaValidator, "CustomFormulaValidator");
 let CustomFormulaValidator = _CustomFormulaValidator;
@@ -2472,10 +2541,11 @@ const _WholeValidator = class _WholeValidator extends BaseDataValidator {
   }
   async parseFormula(rule, unitId, subUnitId) {
     var _a12, _b, _c, _d, _e, _f, _g, _h;
-    const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
+    const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule, formula1Result = isFormulaString(formula1) ? (_d = (_c = (_b = (_a12 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a12.result) == null ? void 0 : _b[0]) == null ? void 0 : _c[0]) == null ? void 0 : _d.v : formula1, formula2Result = isFormulaString(formula2) ? (_h = (_g = (_f = (_e = formulaInfo == null ? void 0 : formulaInfo[1]) == null ? void 0 : _e.result) == null ? void 0 : _f[0]) == null ? void 0 : _g[0]) == null ? void 0 : _h.v : formula2, isFormulaValid = isLegalFormulaResult(`${formula1Result}`) && isLegalFormulaResult(`${formula2Result}`);
     return {
-      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a12 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a12.result) == null ? void 0 : _b[0]) == null ? void 0 : _c[0]) == null ? void 0 : _d.v : formula1),
-      formula2: this._parseNumber(isFormulaString(formula2) ? (_h = (_g = (_f = (_e = formulaInfo == null ? void 0 : formulaInfo[1]) == null ? void 0 : _e.result) == null ? void 0 : _f[0]) == null ? void 0 : _g[0]) == null ? void 0 : _h.v : formula2)
+      formula1: this._parseNumber(formula1Result),
+      formula2: this._parseNumber(formula2Result),
+      isFormulaValid
     };
   }
   validatorFormula(rule, unitId, subUnitId) {
@@ -2549,6 +2619,7 @@ let DataValidationController = (_a6 = class extends RxDisposable {
   }
   _registerValidators() {
     [
+      AnyValidator,
       DecimalValidator,
       WholeValidator,
       TextLengthValidator,
@@ -2594,7 +2665,7 @@ DataValidationController = __decorateClass$5([
   __decorateParam$5(4, Inject(SheetInterceptorService)),
   __decorateParam$5(5, Inject(SheetDataValidationModel))
 ], DataValidationController);
-var D = /* @__PURE__ */ ((E) => (E[E.View = 0] = "View", E[E.Edit = 1] = "Edit", E[E.ManageCollaborator = 2] = "ManageCollaborator", E[E.Print = 3] = "Print", E[E.Duplicate = 4] = "Duplicate", E[E.Comment = 5] = "Comment", E[E.Copy = 6] = "Copy", E[E.Share = 7] = "Share", E[E.Export = 8] = "Export", E[E.MoveWorksheet = 9] = "MoveWorksheet", E[E.DeleteWorksheet = 10] = "DeleteWorksheet", E[E.HideWorksheet = 11] = "HideWorksheet", E[E.RenameWorksheet = 12] = "RenameWorksheet", E[E.CreateWorksheet = 13] = "CreateWorksheet", E[E.SetWorksheetStyle = 14] = "SetWorksheetStyle", E[E.EditWorksheetCell = 15] = "EditWorksheetCell", E[E.InsertHyperlink = 16] = "InsertHyperlink", E[E.Sort = 17] = "Sort", E[E.Filter = 18] = "Filter", E[E.PivotTable = 19] = "PivotTable", E[E.FloatImg = 20] = "FloatImg", E[E.History = 21] = "History", E[E.RwHgtClWdt = 22] = "RwHgtClWdt", E[E.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", E[E.ViewFilter = 24] = "ViewFilter", E[E.MoveSheet = 25] = "MoveSheet", E[E.DeleteSheet = 26] = "DeleteSheet", E[E.HideSheet = 27] = "HideSheet", E[E.CopySheet = 28] = "CopySheet", E[E.RenameSheet = 29] = "RenameSheet", E[E.CreateSheet = 30] = "CreateSheet", E[E.SelectProtectedCells = 31] = "SelectProtectedCells", E[E.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", E[E.SetCellStyle = 33] = "SetCellStyle", E[E.SetCellValue = 34] = "SetCellValue", E[E.SetRowStyle = 35] = "SetRowStyle", E[E.SetColumnStyle = 36] = "SetColumnStyle", E[E.InsertRow = 37] = "InsertRow", E[E.InsertColumn = 38] = "InsertColumn", E[E.DeleteRow = 39] = "DeleteRow", E[E.DeleteColumn = 40] = "DeleteColumn", E[E.EditExtraObject = 41] = "EditExtraObject", E[E.Delete = 42] = "Delete", E[E.RecoverHistory = 43] = "RecoverHistory", E[E.ViewHistory = 44] = "ViewHistory", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(D || {}), __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor, __decorateClass$4 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+var R = /* @__PURE__ */ ((E) => (E[E.View = 0] = "View", E[E.Edit = 1] = "Edit", E[E.ManageCollaborator = 2] = "ManageCollaborator", E[E.Print = 3] = "Print", E[E.Duplicate = 4] = "Duplicate", E[E.Comment = 5] = "Comment", E[E.Copy = 6] = "Copy", E[E.Share = 7] = "Share", E[E.Export = 8] = "Export", E[E.MoveWorksheet = 9] = "MoveWorksheet", E[E.DeleteWorksheet = 10] = "DeleteWorksheet", E[E.HideWorksheet = 11] = "HideWorksheet", E[E.RenameWorksheet = 12] = "RenameWorksheet", E[E.CreateWorksheet = 13] = "CreateWorksheet", E[E.SetWorksheetStyle = 14] = "SetWorksheetStyle", E[E.EditWorksheetCell = 15] = "EditWorksheetCell", E[E.InsertHyperlink = 16] = "InsertHyperlink", E[E.Sort = 17] = "Sort", E[E.Filter = 18] = "Filter", E[E.PivotTable = 19] = "PivotTable", E[E.FloatImg = 20] = "FloatImg", E[E.History = 21] = "History", E[E.RwHgtClWdt = 22] = "RwHgtClWdt", E[E.ViemRwHgtClWdt = 23] = "ViemRwHgtClWdt", E[E.ViewFilter = 24] = "ViewFilter", E[E.MoveSheet = 25] = "MoveSheet", E[E.DeleteSheet = 26] = "DeleteSheet", E[E.HideSheet = 27] = "HideSheet", E[E.CopySheet = 28] = "CopySheet", E[E.RenameSheet = 29] = "RenameSheet", E[E.CreateSheet = 30] = "CreateSheet", E[E.SelectProtectedCells = 31] = "SelectProtectedCells", E[E.SelectUnProtectedCells = 32] = "SelectUnProtectedCells", E[E.SetCellStyle = 33] = "SetCellStyle", E[E.SetCellValue = 34] = "SetCellValue", E[E.SetRowStyle = 35] = "SetRowStyle", E[E.SetColumnStyle = 36] = "SetColumnStyle", E[E.InsertRow = 37] = "InsertRow", E[E.InsertColumn = 38] = "InsertColumn", E[E.DeleteRow = 39] = "DeleteRow", E[E.DeleteColumn = 40] = "DeleteColumn", E[E.EditExtraObject = 41] = "EditExtraObject", E[E.Delete = 42] = "Delete", E[E.RecoverHistory = 43] = "RecoverHistory", E[E.ViewHistory = 44] = "ViewHistory", E[E.CreatePermissionObject = 45] = "CreatePermissionObject", E[E.UNRECOGNIZED = -1] = "UNRECOGNIZED", E))(R || {}), __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor, __decorateClass$4 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
   return kind && result && __defProp$4(target, key, result), result;
@@ -2612,7 +2683,7 @@ let DataValidationFormulaController = (_a7 = class extends Disposable {
       const node = sequenceNodes[i];
       if (typeof node == "string")
         continue;
-      const { token } = node, sequenceGrid = deserializeRangeWithSheet(token), workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+      const { token } = node, sequenceGrid = deserializeRangeWithSheetWithCache(token), workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
       let targetSheet = workbook.getActiveSheet();
       const unitId = workbook.getUnitId();
       if (sequenceGrid.sheetName) {
@@ -2627,7 +2698,7 @@ let DataValidationFormulaController = (_a7 = class extends Disposable {
       for (let i2 = startRow; i2 <= endRow; i2++)
         for (let j = startColumn; j <= endColumn; j++) {
           const permission = (_b = (_a12 = targetSheet.getCell(i2, j)) == null ? void 0 : _a12.selectionProtection) == null ? void 0 : _b[0];
-          if ((permission == null ? void 0 : permission[D.View]) === !1)
+          if ((permission == null ? void 0 : permission[R.View]) === !1)
             return !1;
         }
     }
@@ -2708,18 +2779,21 @@ let DataValidationRefRangeController = (_a8 = class extends Disposable {
       const currentFormula = this._dataValidationCustomFormulaService.getRuleFormulaInfo(unitId, subUnitId, ruleId);
       if (currentFormula) {
         const disposable = this._formulaRefRangeService.registerFormula(
+          unitId,
+          subUnitId,
           currentFormula.formula,
           (newFormulaString) => handleFormulaChange("formula1", newFormulaString)
         );
         disposeSet.add(() => disposable.dispose());
       }
-    }
-    if (rule.type !== DataValidationType.CUSTOM) {
+    } else {
       const currentFormula = this._dataValidationFormulaService.getRuleFormulaInfo(unitId, subUnitId, ruleId);
       if (currentFormula) {
         const [formula1, formula2] = currentFormula;
         if (formula1) {
           const disposable = this._formulaRefRangeService.registerFormula(
+            unitId,
+            subUnitId,
             formula1.text,
             (newFormulaString) => handleFormulaChange("formula1", newFormulaString)
           );
@@ -2727,6 +2801,8 @@ let DataValidationRefRangeController = (_a8 = class extends Disposable {
         }
         if (formula2) {
           const disposable = this._formulaRefRangeService.registerFormula(
+            unitId,
+            subUnitId,
             formula2.text,
             (newFormulaString) => handleFormulaChange("formula2", newFormulaString)
           );
@@ -3053,6 +3129,7 @@ export {
   getDataValidationDiffMutations,
   getFormulaCellData,
   getFormulaResult,
+  isLegalFormulaResult,
   serializeListOptions,
   transformCheckboxValue
 };

package/lib/types/index.d.ts

@@ -30,4 +30,5 @@ export { DateValidator } from './validators/date-validator';
 export { CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2, CheckboxValidator, transformCheckboxValue } from './validators/checkbox-validator';
 export { ListMultipleValidator } from './validators/list-multiple-validator';
 export { deserializeListOptions, getDataValidationCellValue, serializeListOptions } from './validators/util';
+export { isLegalFormulaResult } from './utils/formula';
 export { AddSheetDataValidationCommand, ClearRangeDataValidationCommand, getDataValidationDiffMutations, type IAddSheetDataValidationCommandParams, type IClearRangeDataValidationCommandParams, type IRemoveSheetAllDataValidationCommandParams, type IRemoveSheetDataValidationCommandParams, type IUpdateSheetDataValidationOptionsCommandParams, type IUpdateSheetDataValidationRangeCommandParams, type IUpdateSheetDataValidationSettingCommandParams, RemoveSheetAllDataValidationCommand, RemoveSheetDataValidationCommand, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand, } from './commands/commands/data-validation.command';

package/lib/types/models/rule-matrix.d.ts

@@ -4,6 +4,7 @@ export type RangeMutation = {
     ruleId: string;
     oldRanges: IRange[];
     newRanges: IRange[];
+    rule: ISheetDataValidationRule;
 } | {
     type: 'delete';
     rule: ISheetDataValidationRule;

package/lib/types/utils/formula.d.ts

@@ -1,3 +1,4 @@
 import { ICellData, Nullable } from '@univerjs/core';
 export declare function getFormulaResult(result: Nullable<Nullable<ICellData>[][]>): Nullable<import('@univerjs/core').CellValue>;
 export declare function getFormulaCellData(result: Nullable<Nullable<ICellData>[][]>): Nullable<ICellData>;
+export declare function isLegalFormulaResult(res: string): boolean;

package/lib/types/validators/any-validator.d.ts

@@ -0,0 +1,12 @@
+import { CellValue, DataValidationOperator, IDataValidationRule, IDataValidationRuleBase } from '@univerjs/core';
+import { IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
+export declare class AnyValidator extends BaseDataValidator {
+    id: string;
+    title: string;
+    operators: DataValidationOperator[];
+    scopes: string | string[];
+    parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult>;
+    validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
+    isValidType(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;
+    generateRuleErrorMessage(rule: IDataValidationRuleBase): string;
+}

package/lib/types/validators/custom-validator.d.ts

@@ -10,4 +10,5 @@ export declare class CustomFormulaValidator extends BaseDataValidator {
     parseFormula(_rule: IDataValidationRule, _unitId: string, _subUnitId: string): Promise<IFormulaResult>;
     isValidType(cellInfo: IValidatorCellInfo<CellValue>, _formula: IFormulaResult, _rule: IDataValidationRule): Promise<boolean>;
     generateRuleErrorMessage(rule: IDataValidationRuleBase): string;
+    generateRuleName(rule: IDataValidationRuleBase): string;
 }

package/lib/types/validators/decimal-validator.d.ts

@@ -24,6 +24,7 @@ export declare class DecimalValidator extends BaseDataValidator<number> {
     parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<{
         formula1: number;
         formula2: number;
+        isFormulaValid: boolean;
     }>;
     validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
     validatorIsEqual(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;

package/lib/types/validators/whole-validator.d.ts

@@ -23,6 +23,7 @@ export declare class WholeValidator extends BaseDataValidator<number> {
     parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<{
         formula1: number;
         formula2: number;
+        isFormulaValid: boolean;
     }>;
     validatorFormula(rule: IDataValidationRuleBase, unitId: string, subUnitId: string): IFormulaValidResult;
     validatorIsEqual(cellInfo: IValidatorCellInfo<CellValue>, formula: IFormulaResult, rule: IDataValidationRule): Promise<boolean>;