@univerjs/sheets-data-validation 0.2.14 → 0.2.15

package/lib/es/index.js

@@ -2,7 +2,7 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
-import { ObjectMatrix, Range, Inject, Disposable, UniverInstanceType, DataValidationType, isFormulaString, IUniverInstanceService, ILogService, DEFAULT_EMPTY_DOCUMENT_VALUE, DataStreamTreeTokenType, queryObjectMatrix, Rectangle, OnLifecycle, LifecycleStages, DataValidationStatus, Tools, DataValidationOperator, createInternalEditorID, useDependency, LocaleService, IPermissionService, ThemeService, ICommandService, VerticalAlign, HorizontalAlign, toDisposable, DataValidationErrorStyle, UndoCommand, RedoCommand, isUnitRangesEqual, isValidRange, debounce, shallowEqual, Injector, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DisposableCollection, CommandType, DataValidationRenderMode, numfmt, CellValueType, DEFAULT_STYLES, WrapStrategy, DocumentDataModel, BooleanNumber, IUndoRedoService, sequenceExecuteAsync, sequenceExecute, RxDisposable, isRangesEqual, Optional, DependentOn, Plugin, IConfigService } from "@univerjs/core";
+import { ObjectMatrix, Range, Inject, Disposable, UniverInstanceType, DataValidationType, isFormulaString, IUniverInstanceService, ILogService, getOriginCellValue, Rectangle, Tools, OnLifecycle, LifecycleStages, DataValidationStatus, DataValidationOperator, createInternalEditorID, useDependency, LocaleService, IPermissionService, ThemeService, ICommandService, VerticalAlign, HorizontalAlign, WrapStrategy, toDisposable, DataValidationErrorStyle, UndoCommand, RedoCommand, isUnitRangesEqual, isValidRange, debounce, shallowEqual, Injector, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DisposableCollection, CommandType, BuildTextUtils, DataValidationRenderMode, numfmt, CellValueType, DEFAULT_STYLES, DocumentDataModel, DEFAULT_EMPTY_DOCUMENT_VALUE, BooleanNumber, IUndoRedoService, sequenceExecuteAsync, sequenceExecute, RxDisposable, queryObjectMatrix, isRangesEqual, Optional, DependentOn, Plugin, IConfigService } from "@univerjs/core";
 import { DataValidationModel, DataValidatorRegistryService, UpdateRuleType, BaseDataValidator, DataValidatorRegistryScope, TWO_FORMULA_OPERATOR_COUNT as TWO_FORMULA_OPERATOR_COUNT$1, getRuleOptions, getRuleSetting, TextLengthErrorTitleMap, AddDataValidationMutation, RemoveDataValidationMutation, UpdateDataValidationMutation, UniverDataValidationPlugin } from "@univerjs/data-validation";
 import { DataValidationModel as DataValidationModel2 } from "@univerjs/data-validation";
 import { SheetsSelectionsService, WorksheetViewPermission, SetRangeValuesCommand, checkRangesEditablePermission, getSheetCommandTarget, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, WorkbookEditablePermission, WorksheetSetCellStylePermission, WorksheetEditPermission, RangeProtectionPermissionEditPoint, SheetInterceptorService, ClearSelectionAllCommand, RefRangeService, handleCommonDefaultRangeChangeWithEffectRefCommands, INTERCEPTOR_POINT, InterceptCellContentPriority, UniverSheetsPlugin, RemoveSheetCommand } from "@univerjs/sheets";
@@ -17,7 +17,6 @@ import { fixLineWidthByScale, Transform, Checkbox as Checkbox$1, IRenderManagerS
 import dayjs from "dayjs";
 import { IMarkSelectionService, SheetCanvasPopManagerService, IEditorBridgeService, getCurrentRangeDisable$, HoverManagerService, CellAlertManagerService, CellAlertType, COPY_TYPE, rangeToDiscreteRange, PREDEFINED_HOOK_NAME, virtualizeDiscreteRanges, getRepeatRange, ISheetClipboardService, SheetPermissionInterceptorBaseController, AutoHeightController, SheetSkeletonManagerService, UniverSheetsUIPlugin, IAutoFillService, APPLY_TYPE, getAutoFillRepeatRange } from "@univerjs/sheets-ui";
 import { RichTextEditingMutation } from "@univerjs/docs";
-import { getPlainTextFormDocument } from "@univerjs/docs-ui";
 import { getPatternType, UniverSheetsNumfmtPlugin } from "@univerjs/sheets-numfmt";
 const _DataValidationCacheService = class _DataValidationCacheService {
   constructor() {
@@ -357,16 +356,7 @@ DataValidationFormulaService = __decorateClass$j([
   __decorateParam$j(3, Inject(DataValidationModel))
 ], DataValidationFormulaService);
 function getCellValueOrigin(cell) {
-  if (cell === null)
-    return "";
-  if (cell != null && cell.p) {
-    const body = cell == null ? void 0 : cell.p.body;
-    if (body == null)
-      return "";
-    const data = body.dataStream;
-    return (data.substring(data.length - 2, data.length) === DEFAULT_EMPTY_DOCUMENT_VALUE ? data.substring(0, data.length - 2) : data).replaceAll(DataStreamTreeTokenType.CUSTOM_RANGE_START, "").replaceAll(DataStreamTreeTokenType.CUSTOM_RANGE_END, "");
-  }
-  return cell == null ? void 0 : cell.v;
+  return getOriginCellValue(cell);
 }
 __name(getCellValueOrigin, "getCellValueOrigin");
 function getStringCellValue(cell) {
@@ -376,55 +366,40 @@ function getStringCellValue(cell) {
 __name(getStringCellValue, "getStringCellValue");
 const _RuleMatrix = class _RuleMatrix {
   constructor(value, _worksheet) {
-    __publicField(this, "value");
-    this._worksheet = _worksheet, this.value = value;
+    __publicField(this, "_map", /* @__PURE__ */ new Map());
+    this._worksheet = _worksheet, this._map = value;
   }
   addRule(rule) {
-    const ruleId = rule.uid;
-    rule.ranges.forEach((range) => {
-      Range.foreach(
-        Range.transformRange(range, this._worksheet),
-        (row, col) => {
-          this.value.setValue(row, col, ruleId);
-        }
-      );
-    });
-  }
-  removeRange(ranges) {
-    ranges.forEach((range) => {
-      Range.foreach(Range.transformRange(range, this._worksheet), (row, col) => {
-        this.value.realDeleteValue(row, col);
-      });
+    const ruleId = rule.uid, ranges = rule.ranges.map((range) => Range.transformRange(range, this._worksheet));
+    this._map.forEach((value, key) => {
+      const newRanges = Rectangle.subtractMulti(value, ranges);
+      newRanges.length === 0 ? this._map.delete(key) : this._map.set(key, newRanges);
+    }), this._map.set(ruleId, ranges);
+  }
+  removeRange(_ranges) {
+    const ranges = _ranges.map((range) => Range.transformRange(range, this._worksheet));
+    this._map.forEach((value, key) => {
+      const newRanges = Rectangle.subtractMulti(value, ranges);
+      newRanges.length === 0 ? this._map.delete(key) : this._map.set(key, newRanges);
     });
   }
   removeRule(rule) {
-    rule.ranges.forEach((range) => {
-      Range.foreach(Range.transformRange(range, this._worksheet), (row, col) => {
-        this.value.setValue(row, col, "");
-      });
-    });
+    this._map.delete(rule.uid);
   }
-  updateRange(ruleId, _oldRanges, _newRanges) {
-    const tempRuleId = `${ruleId}$`, oldRanges = _oldRanges.map((range) => Range.transformRange(range, this._worksheet)), newRanges = _newRanges.map((range) => Range.transformRange(range, this._worksheet));
-    oldRanges.forEach((range) => {
-      Range.foreach(range, (row, col) => {
-        this.value.getValue(row, col) === ruleId && this.value.setValue(row, col, tempRuleId);
-      });
-    }), newRanges.forEach((range) => {
-      Range.foreach(range, (row, col) => {
-        this.value.setValue(row, col, ruleId);
-      });
-    }), oldRanges.forEach((range) => {
-      Range.foreach(range, (row, col) => {
-        this.value.getValue(row, col) === tempRuleId && this.value.realDeleteValue(row, col);
-      });
-    });
+  updateRange(ruleId, _newRanges) {
+    this._map.delete(ruleId);
+    const ranges = _newRanges.map((range) => Range.transformRange(range, this._worksheet));
+    this._map.forEach((value, key) => {
+      const newRanges = Rectangle.subtractMulti(value, ranges);
+      newRanges.length === 0 ? this._map.delete(key) : this._map.set(key, newRanges);
+    }), this._map.set(ruleId, ranges);
   }
   diff(rules) {
     const mutations = [];
     let deleteIndex = 0;
     return rules.forEach((rule, index) => {
-      const newRanges = queryObjectMatrix(this.value, (ruleId) => ruleId === rule.uid), oldRanges = rule.ranges;
+      var _a23;
+      const newRanges = (_a23 = this._map.get(rule.uid)) != null ? _a23 : [], oldRanges = rule.ranges;
       (newRanges.length !== oldRanges.length || newRanges.some((range, i) => !Rectangle.equals(range, oldRanges[i]))) && mutations.push({
         type: "update",
         ruleId: rule.uid,
@@ -441,7 +416,8 @@ const _RuleMatrix = class _RuleMatrix {
     const mutations = [];
     let deleteIndex = 0;
     return rules.forEach((rule, index) => {
-      const newRanges = queryObjectMatrix(this.value, (ruleId) => ruleId === rule.uid), oldRanges = rule.ranges;
+      var _a23;
+      const newRanges = (_a23 = this._map.get(rule.uid)) != null ? _a23 : [], oldRanges = rule.ranges;
       (newRanges.length !== oldRanges.length || newRanges.some((range, i) => !Rectangle.equals(range, oldRanges[i]))) && mutations.push({
         type: "update",
         ruleId: rule.uid,
@@ -453,7 +429,8 @@ const _RuleMatrix = class _RuleMatrix {
         index: index - deleteIndex
       }), deleteIndex++);
     }), Array.from(additionRules).forEach((rule) => {
-      const newRanges = queryObjectMatrix(this.value, (ruleId) => ruleId === rule.uid);
+      var _a23;
+      const newRanges = (_a23 = this._map.get(rule.uid)) != null ? _a23 : [];
       mutations.push({
         type: "add",
         rule: {
@@ -464,13 +441,27 @@ const _RuleMatrix = class _RuleMatrix {
     }), mutations;
   }
   clone() {
-    return new _RuleMatrix(new ObjectMatrix(this.value.clone()), this._worksheet);
+    return new _RuleMatrix(new Map(Tools.deepClone(Array.from(this._map.entries()))), this._worksheet);
   }
   getValue(row, col) {
-    return this.value.getValue(row, col);
-  }
-  setValue(row, col, value) {
-    return this.value.setValue(row, col, value);
+    var _a23;
+    const keys = Array.from(this._map.keys());
+    for (const id of keys)
+      if (((_a23 = this._map.get(id)) != null ? _a23 : []).find((range) => range.startRow <= row && range.endRow >= row && range.startColumn <= col && range.endColumn >= col))
+        return id;
+  }
+  addRangeRules(rules) {
+    rules.forEach(({ id: ruleId, ranges }) => {
+      if (!ranges.length)
+        return;
+      let current = this._map.get(ruleId);
+      current ? (this._map.set(ruleId, Rectangle.mergeRanges([...current, ...ranges])), current = this._map.get(ruleId)) : (current = ranges, this._map.set(ruleId, current)), this._map.forEach((value, key) => {
+        if (key === ruleId)
+          return;
+        const newRanges = Rectangle.subtractMulti(value, ranges);
+        newRanges.length === 0 ? this._map.delete(key) : this._map.set(key, newRanges);
+      });
+    });
   }
 };
 __name(_RuleMatrix, "RuleMatrix");
@@ -526,24 +517,27 @@ let SheetDataValidationModel = (_a3 = class extends Disposable {
     if (!workbook)
       throw new Error(`workbook not found, unitId: ${unitId}`);
     unitMap || (unitMap = /* @__PURE__ */ new Map(), this._ruleMatrixMap.set(unitId, unitMap));
-    const worksheet = workbook.getSheetBySheetId(subUnitId);
-    if (!worksheet)
-      throw new Error(`worksheet not found, unitId: ${unitId}, subUnitId: ${subUnitId}`);
     let matrix = unitMap.get(subUnitId);
-    return matrix || (matrix = new RuleMatrix(new ObjectMatrix(), worksheet), unitMap.set(subUnitId, matrix)), matrix;
+    if (!matrix) {
+      const worksheet = workbook.getSheetBySheetId(subUnitId);
+      if (!worksheet)
+        throw new Error(`worksheet not found, unitId: ${unitId}, subUnitId: ${subUnitId}`);
+      matrix = new RuleMatrix(/* @__PURE__ */ new Map(), worksheet), unitMap.set(subUnitId, matrix);
+    }
+    return matrix;
   }
   _addRuleSideEffect(unitId, subUnitId, rule) {
     var _a23;
     (rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE) && isReferenceString((_a23 = rule.formula1) != null ? _a23 : "") && (rule.formula1 = `=${rule.formula1}`), this._ensureRuleMatrix(unitId, subUnitId).addRule(rule), this._dataValidationCacheService.addRule(unitId, subUnitId, rule), this._dataValidationFormulaService.addRule(unitId, subUnitId, rule.uid, rule.formula1, rule.formula2), this._dataValidationCustomFormulaService.addRule(unitId, subUnitId, rule);
   }
-  _addRule(unitId, subUnitId, rule, index) {
+  _addRule(unitId, subUnitId, rule) {
     (Array.isArray(rule) ? rule : [rule]).forEach((item) => {
       this._addRuleSideEffect(unitId, subUnitId, item);
     });
   }
   _updateRule(unitId, subUnitId, ruleId, oldRule, payload) {
     const ruleMatrix = this._ensureRuleMatrix(unitId, subUnitId);
-    payload.type === UpdateRuleType.RANGE ? (ruleMatrix.updateRange(ruleId, oldRule.ranges, payload.payload), this._dataValidationCacheService.updateRuleRanges(unitId, subUnitId, ruleId, payload.payload, oldRule.ranges), this._dataValidationCustomFormulaService.updateRuleRanges(unitId, subUnitId, ruleId, oldRule.ranges, payload.payload)) : payload.type === UpdateRuleType.SETTING && (this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, oldRule.ranges), this._dataValidationFormulaService.updateRuleFormulaText(unitId, subUnitId, ruleId, payload.payload.formula1, payload.payload.formula2), this._dataValidationCustomFormulaService.updateRuleFormula(unitId, subUnitId, ruleId, oldRule.ranges, payload.payload.formula1));
+    payload.type === UpdateRuleType.RANGE ? (ruleMatrix.updateRange(ruleId, payload.payload), this._dataValidationCacheService.updateRuleRanges(unitId, subUnitId, ruleId, payload.payload, oldRule.ranges), this._dataValidationCustomFormulaService.updateRuleRanges(unitId, subUnitId, ruleId, oldRule.ranges, payload.payload)) : payload.type === UpdateRuleType.SETTING && (this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, oldRule.ranges), this._dataValidationFormulaService.updateRuleFormulaText(unitId, subUnitId, ruleId, payload.payload.formula1, payload.payload.formula2), this._dataValidationCustomFormulaService.updateRuleFormula(unitId, subUnitId, ruleId, oldRule.ranges, payload.payload.formula1));
   }
   _removeRule(unitId, subUnitId, oldRule) {
     this._ensureRuleMatrix(unitId, subUnitId).removeRule(oldRule), this._dataValidationCacheService.removeRule(unitId, subUnitId, oldRule);
@@ -1405,6 +1399,11 @@ const transformCheckboxValue = /* @__PURE__ */ __name((value) => Tools.isDefine(
       originFormula2
     };
   }
+  getExtraStyle(rule, value) {
+    return {
+      tb: WrapStrategy.CLIP
+    };
+  }
   parseFormulaSync(rule, unitId, subUnitId) {
     var _a23, _b;
     const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = this._formulaService.getRuleFormulaResultSync(unitId, subUnitId, rule.uid), originFormula1 = isFormulaString(formula1) ? getFormulaResult((_a23 = results == null ? void 0 : results[0]) == null ? void 0 : _a23.result) : formula1, originFormula2 = isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2;
@@ -2114,11 +2113,12 @@ function ListDropDown(props) {
   const anchorRect = RectPopup.useContext(), cellWidth = anchorRect.right - anchorRect.left;
   if (useEffect(() => {
     const dispose = commandService.onCommandExecuted((command) => {
+      var _a24, _b2;
       if (command.id === RichTextEditingMutation.id) {
         const params = command.params, { unitId: unitId2 } = params, unit = instanceService.getUnit(unitId2, UniverInstanceType.UNIVER_DOC);
         if (!unit)
           return;
-        const text = getPlainTextFormDocument(unit.getSnapshot());
+        const text = BuildTextUtils.transform.getPlainText((_b2 = (_a24 = unit.getSnapshot().body) == null ? void 0 : _a24.dataStream) != null ? _b2 : "");
         setEditingText(text);
       }
     });
@@ -2604,6 +2604,18 @@ const FORMULA1$1 = "{FORMULA1}", FORMULA2$1 = "{FORMULA2}", transformDate2Serial
 };
 __name(_DateValidator, "DateValidator");
 let DateValidator = _DateValidator;
+const LIST_RENDER_MODE_OPTION_INPUT = "LIST_RENDER_MODE_OPTION_INPUT";
+function ListRenderModeInput(props) {
+  var _a23;
+  const { value, onChange } = props, localeService = useDependency(LocaleService);
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { label: localeService.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ jsxRuntimeExports.jsxs(RadioGroup, { value: `${(_a23 = value.renderMode) != null ? _a23 : DataValidationRenderMode.CUSTOM}`, onChange: /* @__PURE__ */ __name((renderMode) => onChange({ ...value, renderMode: +renderMode }), "onChange"), children: [
+    /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationRenderMode.CUSTOM}`, children: localeService.t("dataValidation.renderMode.chip") }),
+    /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationRenderMode.ARROW}`, children: localeService.t("dataValidation.renderMode.arrow") }),
+    /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationRenderMode.TEXT}`, children: localeService.t("dataValidation.renderMode.text") })
+  ] }) });
+}
+__name(ListRenderModeInput, "ListRenderModeInput");
+ListRenderModeInput.componentKey = LIST_RENDER_MODE_OPTION_INPUT;
 var __defProp$c = Object.defineProperty, __getOwnPropDesc$c = Object.getOwnPropertyDescriptor, __decorateClass$c = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$c(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
@@ -2832,18 +2844,6 @@ DropdownWidget = __decorateClass$c([
   __decorateParam$c(0, Inject(LocaleService)),
   __decorateParam$c(1, ICommandService)
 ], DropdownWidget);
-const LIST_RENDER_MODE_OPTION_INPUT = "LIST_RENDER_MODE_OPTION_INPUT";
-function ListRenderModeInput(props) {
-  var _a23;
-  const { value, onChange } = props, localeService = useDependency(LocaleService);
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { label: localeService.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ jsxRuntimeExports.jsxs(RadioGroup, { value: `${(_a23 = value.renderMode) != null ? _a23 : DataValidationRenderMode.CUSTOM}`, onChange: /* @__PURE__ */ __name((renderMode) => onChange({ ...value, renderMode: +renderMode }), "onChange"), children: [
-    /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationRenderMode.CUSTOM}`, children: localeService.t("dataValidation.renderMode.chip") }),
-    /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationRenderMode.ARROW}`, children: localeService.t("dataValidation.renderMode.arrow") }),
-    /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationRenderMode.TEXT}`, children: localeService.t("dataValidation.renderMode.text") })
-  ] }) });
-}
-__name(ListRenderModeInput, "ListRenderModeInput");
-ListRenderModeInput.componentKey = LIST_RENDER_MODE_OPTION_INPUT;
 function getRuleFormulaResultSet(result) {
   if (!result)
     return [];
@@ -2855,7 +2855,7 @@ function getRuleFormulaResultSet(result) {
         const value = getCellValueOrigin(cell);
         if (value != null) {
           if (typeof value != "string" && typeof (cell == null ? void 0 : cell.s) == "object" && ((_b = (_a23 = cell.s) == null ? void 0 : _a23.n) != null && _b.pattern)) {
-            resultSet.add(numfmt.format(cell.s.n.pattern, value));
+            resultSet.add(numfmt.format(cell.s.n.pattern, value, { throws: !1 }));
             return;
           }
           resultSet.add(value.toString());
@@ -2914,6 +2914,23 @@ const _ListValidator = class _ListValidator extends BaseDataValidator {
       formula1: success ? valid ? isIntersects ? this.localeService.t("dataValidation.validFail.listIntersects") : void 0 : this.localeService.t("dataValidation.validFail.listInvalid") : this.localeService.t("dataValidation.validFail.list")
     };
   }
+  getExtraStyle(rule, value, { style: defaultStyle }) {
+    var _a23;
+    const tb = (_a23 = defaultStyle.tb !== WrapStrategy.OVERFLOW ? defaultStyle.tb : WrapStrategy.CLIP) != null ? _a23 : WrapStrategy.WRAP;
+    if (rule.type === DataValidationType.LIST && (rule.renderMode === DataValidationRenderMode.ARROW || rule.renderMode === DataValidationRenderMode.TEXT)) {
+      const colorMap = this.getListWithColorMap(rule), valueStr = `${value != null ? value : ""}`, color = colorMap[valueStr];
+      if (color)
+        return {
+          bg: {
+            rgb: color
+          },
+          tb
+        };
+    }
+    return {
+      tb
+    };
+  }
   parseCellValue(cellValue) {
     const cellString = cellValue.toString();
     return deserializeListOptions(cellString);
@@ -3308,11 +3325,11 @@ const UpdateSheetDataValidationRangeCommand = {
   async handler(accessor, params) {
     if (!params)
       return !1;
-    const { unitId, subUnitId, ranges, ruleId } = params, sheetDataValidationModel = accessor.get(SheetDataValidationModel), commandService = accessor.get(ICommandService), undoRedoService = accessor.get(IUndoRedoService), currentRule = sheetDataValidationModel.getRuleById(unitId, subUnitId, ruleId);
-    if (!currentRule)
+    const { unitId, subUnitId, ranges, ruleId } = params, sheetDataValidationModel = accessor.get(SheetDataValidationModel), commandService = accessor.get(ICommandService), undoRedoService = accessor.get(IUndoRedoService);
+    if (!sheetDataValidationModel.getRuleById(unitId, subUnitId, ruleId))
       return !1;
-    const oldRanges = currentRule.ranges, matrix = sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone();
-    matrix.updateRange(ruleId, oldRanges, ranges);
+    const matrix = sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone();
+    matrix.updateRange(ruleId, ranges);
     const diffs = matrix.diff(sheetDataValidationModel.getRules(unitId, subUnitId)), { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor);
     return undoRedoService.pushUndoRedo({
       undoMutations,
@@ -4126,7 +4143,7 @@ let DataValidationCopyPasteController = (_a13 = class extends Disposable {
       return { redos: [], undos: [] };
     const { unitId, subUnitId } = this._copyInfo;
     if (copyInfo.unitId !== unitId || subUnitId !== copyInfo.subUnitId) {
-      const ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(copyInfo.unitId, copyInfo.subUnitId).clone(), { ranges: [vCopyRange, vPastedRange], mapFunc } = virtualizeDiscreteRanges([copyInfo.copyRange, pastedRange]), repeatRange = getRepeatRange(vCopyRange, vPastedRange, !0), additionRules = /* @__PURE__ */ new Map();
+      const ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(copyInfo.unitId, copyInfo.subUnitId).clone(), additionMatrix = new ObjectMatrix(), addRules = /* @__PURE__ */ new Set(), { ranges: [vCopyRange, vPastedRange], mapFunc } = virtualizeDiscreteRanges([copyInfo.copyRange, pastedRange]), repeatRange = getRepeatRange(vCopyRange, vPastedRange, !0), additionRules = /* @__PURE__ */ new Map();
       repeatRange.forEach(({ startRange }) => {
         var _a23;
         (_a23 = this._copyInfo) == null || _a23.matrix.forValue((row, col, ruleId) => {
@@ -4141,9 +4158,11 @@ let DataValidationCopyPasteController = (_a13 = class extends Disposable {
           ), transformedRuleId = `${subUnitId}-${ruleId}`, oldRule = this._sheetDataValidationModel.getRuleById(unitId, subUnitId, ruleId);
           !this._sheetDataValidationModel.getRuleById(copyInfo.unitId, copyInfo.subUnitId, transformedRuleId) && oldRule && additionRules.set(transformedRuleId, { ...oldRule, uid: transformedRuleId });
           const { row: startRow, col: startColumn } = mapFunc(range.startRow, range.startColumn);
-          ruleMatrix.setValue(startRow, startColumn, transformedRuleId);
+          addRules.add(transformedRuleId), additionMatrix.setValue(startRow, startColumn, transformedRuleId);
         });
       });
+      const additions = Array.from(addRules).map((id) => ({ id, ranges: queryObjectMatrix(additionMatrix, (value) => value === id) }));
+      ruleMatrix.addRangeRules(additions);
       const { redoMutations, undoMutations } = getDataValidationDiffMutations(
         copyInfo.unitId,
         copyInfo.subUnitId,
@@ -4156,7 +4175,7 @@ let DataValidationCopyPasteController = (_a13 = class extends Disposable {
         undos: undoMutations
       };
     } else {
-      const ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone(), { ranges: [vCopyRange, vPastedRange], mapFunc } = virtualizeDiscreteRanges([copyInfo.copyRange, pastedRange]);
+      const ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone(), additionMatrix = new ObjectMatrix(), additionRules = /* @__PURE__ */ new Set(), { ranges: [vCopyRange, vPastedRange], mapFunc } = virtualizeDiscreteRanges([copyInfo.copyRange, pastedRange]);
       getRepeatRange(vCopyRange, vPastedRange, !0).forEach(({ startRange }) => {
         var _a23;
         (_a23 = this._copyInfo) == null || _a23.matrix.forValue((row, col, ruleId) => {
@@ -4169,9 +4188,11 @@ let DataValidationCopyPasteController = (_a13 = class extends Disposable {
             },
             startRange
           ), { row: startRow, col: startColumn } = mapFunc(range.startRow, range.startColumn);
-          ruleMatrix.setValue(startRow, startColumn, ruleId);
+          additionMatrix.setValue(startRow, startColumn, ruleId), additionRules.add(ruleId);
         });
       });
+      const additions = Array.from(additionRules).map((id) => ({ id, ranges: queryObjectMatrix(additionMatrix, (value) => value === id) }));
+      ruleMatrix.addRangeRules(additions);
       const { redoMutations, undoMutations } = getDataValidationDiffMutations(
         unitId,
         subUnitId,
@@ -4392,7 +4413,7 @@ let DataValidationRefRangeController = (_a15 = class extends Disposable {
 }, __name(_a15, "DataValidationRefRangeController"), _a15);
 DataValidationRefRangeController = __decorateClass$6([
   OnLifecycle(LifecycleStages.Starting, DataValidationRefRangeController),
-  __decorateParam$6(0, Inject(DataValidationModel)),
+  __decorateParam$6(0, Inject(SheetDataValidationModel)),
   __decorateParam$6(1, Inject(Injector)),
   __decorateParam$6(2, Inject(RefRangeService)),
   __decorateParam$6(3, Inject(DataValidationCustomFormulaService)),
@@ -4497,45 +4518,18 @@ let SheetsDataValidationRenderController = (_a16 = class extends RxDisposable {
         {
           // must be after numfmt
           priority: InterceptCellContentPriority.DATA_VALIDATION,
-          // eslint-disable-next-line max-lines-per-function, complexity
+          // eslint-disable-next-line complexity
           handler: /* @__PURE__ */ __name((cell, pos, next) => {
-            var _a23, _b, _c, _d, _e, _f, _g;
-            const { row, col, unitId, subUnitId, workbook, worksheet } = pos, skeleton = (_b = (_a23 = this._renderManagerService.getRenderById(unitId)) == null ? void 0 : _a23.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _b.skeleton;
-            if (!skeleton)
-              return next(cell);
-            const styleMap = pos.workbook.getStyles(), defaultStyle = (typeof (cell == null ? void 0 : cell.s) == "string" ? styleMap.get(cell == null ? void 0 : cell.s) : cell == null ? void 0 : cell.s) || {}, ruleId = this._sheetDataValidationModel.getRuleIdByLocation(unitId, subUnitId, row, col);
+            var _a23, _b, _c, _d;
+            const { row, col, unitId, subUnitId, workbook, worksheet } = pos, styleMap = workbook.getStyles(), defaultStyle = (typeof (cell == null ? void 0 : cell.s) == "string" ? styleMap.get(cell == null ? void 0 : cell.s) : cell == null ? void 0 : cell.s) || {}, ruleId = this._sheetDataValidationModel.getRuleIdByLocation(unitId, subUnitId, row, col);
             if (!ruleId)
               return next(cell);
             const rule = this._sheetDataValidationModel.getRuleById(unitId, subUnitId, ruleId);
             if (!rule)
               return next(cell);
-            const validStatus = this._sheetDataValidationModel.validator(cell, rule, pos), validator = this._dataValidatorRegistryService.getValidatorItem(rule.type), cellOrigin = worksheet.getCellRaw(row, col), cellValue = getCellValueOrigin(cellOrigin);
-            let extra = {};
-            if ((rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE) && (extra = {
-              interceptorStyle: {
-                ...cell == null ? void 0 : cell.interceptorStyle,
-                tb: (_c = defaultStyle.tb !== WrapStrategy.OVERFLOW ? defaultStyle.tb : WrapStrategy.CLIP) != null ? _c : WrapStrategy.WRAP
-              }
-            }), rule.type === DataValidationType.CHECKBOX && (extra = {
-              interceptorStyle: {
-                ...cell == null ? void 0 : cell.interceptorStyle,
-                tb: WrapStrategy.CLIP
-              }
-            }), rule.type === DataValidationType.LIST && (rule.renderMode === DataValidationRenderMode.ARROW || rule.renderMode === DataValidationRenderMode.TEXT)) {
-              const colorMap = validator.getListWithColorMap(rule), valueStr = `${(_d = getCellValueOrigin(cellOrigin)) != null ? _d : ""}`, color = colorMap[valueStr];
-              color && (extra = {
-                ...extra,
-                interceptorStyle: {
-                  ...extra.interceptorStyle,
-                  bg: {
-                    rgb: color
-                  }
-                }
-              });
-            }
+            const validStatus = this._sheetDataValidationModel.validator(cell, rule, pos), validator = this._dataValidatorRegistryService.getValidatorItem(rule.type), cellOrigin = worksheet.getCellRaw(row, col), cellValue = getCellValueOrigin(cellOrigin), valueStr = `${(_a23 = getCellValueOrigin(cellOrigin)) != null ? _a23 : ""}`;
             return next({
               ...cell,
-              ...extra,
               dataValidation: {
                 ruleId,
                 validStatus,
@@ -4547,23 +4541,23 @@ let SheetsDataValidationRenderController = (_a16 = class extends RxDisposable {
                 ...validStatus === DataValidationStatus.INVALID ? INVALID_MARK : null
               },
               customRender: [
-                ...(_e = cell == null ? void 0 : cell.customRender) != null ? _e : [],
+                ...(_b = cell == null ? void 0 : cell.customRender) != null ? _b : [],
                 ...validator != null && validator.canvasRender ? [validator.canvasRender] : []
               ],
               fontRenderExtension: {
                 ...cell == null ? void 0 : cell.fontRenderExtension,
-                isSkip: ((_f = cell == null ? void 0 : cell.fontRenderExtension) == null ? void 0 : _f.isSkip) || (validator == null ? void 0 : validator.skipDefaultFontRender(rule, cellValue, pos))
+                isSkip: ((_c = cell == null ? void 0 : cell.fontRenderExtension) == null ? void 0 : _c.isSkip) || (validator == null ? void 0 : validator.skipDefaultFontRender(rule, cellValue, pos))
               },
               interceptorStyle: {
                 ...cell == null ? void 0 : cell.interceptorStyle,
-                ...extra.interceptorStyle
+                ...validator == null ? void 0 : validator.getExtraStyle(rule, valueStr, { style: defaultStyle })
               },
               interceptorAutoHeight: /* @__PURE__ */ __name(() => {
-                var _a24, _b2, _c2, _d2;
-                const mergeCell = skeleton.mergeData.find((range) => {
-                  const { startColumn, startRow, endColumn, endRow } = range;
-                  return row >= startRow && col >= startColumn && row <= endRow && col <= endColumn;
-                }), info = {
+                var _a24, _b2, _c2, _d2, _e, _f;
+                const skeleton = (_b2 = (_a24 = this._renderManagerService.getRenderById(unitId)) == null ? void 0 : _a24.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _b2.skeleton;
+                if (!skeleton)
+                  return;
+                const mergeCell = skeleton.worksheet.getMergedCell(row, col), info = {
                   data: {
                     ...cell,
                     dataValidation: {
@@ -4574,7 +4568,7 @@ let SheetsDataValidationRenderController = (_a16 = class extends RxDisposable {
                     }
                   },
                   style: skeleton.getsStyles().getStyleByCell(cell),
-                  primaryWithCoord: skeleton.getCellByIndex((_a24 = mergeCell == null ? void 0 : mergeCell.startRow) != null ? _a24 : row, (_b2 = mergeCell == null ? void 0 : mergeCell.startColumn) != null ? _b2 : col),
+                  primaryWithCoord: skeleton.getCellByIndex((_c2 = mergeCell == null ? void 0 : mergeCell.startRow) != null ? _c2 : row, (_d2 = mergeCell == null ? void 0 : mergeCell.startColumn) != null ? _d2 : col),
                   unitId,
                   subUnitId,
                   row,
@@ -4582,9 +4576,9 @@ let SheetsDataValidationRenderController = (_a16 = class extends RxDisposable {
                   workbook,
                   worksheet
                 };
-                return (_d2 = (_c2 = validator == null ? void 0 : validator.canvasRender) == null ? void 0 : _c2.calcCellAutoHeight) == null ? void 0 : _d2.call(_c2, info);
+                return (_f = (_e = validator == null ? void 0 : validator.canvasRender) == null ? void 0 : _e.calcCellAutoHeight) == null ? void 0 : _f.call(_e, info);
               }, "interceptorAutoHeight"),
-              coverable: ((_g = cell == null ? void 0 : cell.coverable) != null ? _g : !0) && !(rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE)
+              coverable: ((_d = cell == null ? void 0 : cell.coverable) != null ? _d : !0) && !(rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE)
             });
           }, "handler")
         }
@@ -4711,10 +4705,7 @@ let SheetsDataValidationMobileRenderController = (_a17 = class extends RxDisposa
               },
               interceptorAutoHeight: /* @__PURE__ */ __name(() => {
                 var _a24, _b2, _c2, _d2;
-                const mergeCell = skeleton.mergeData.find((range) => {
-                  const { startColumn, startRow, endColumn, endRow } = range;
-                  return row >= startRow && col >= startColumn && row <= endRow && col <= endColumn;
-                }), info = {
+                const mergeCell = skeleton.worksheet.getMergedCell(row, col), info = {
                   data: {
                     ...cell,
                     dataValidation: {
@@ -4904,8 +4895,8 @@ let DataValidationAutoFillController = (_a20 = class extends Disposable {
       const { source: sourceRange, target: targetRange, unitId, subUnitId } = location, ruleMatrixCopy = this._dataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone(), virtualRange = virtualizeDiscreteRanges([sourceRange, targetRange]), [vSourceRange, vTargetRange] = virtualRange.ranges, { mapFunc } = virtualRange, sourceStartCell = {
         row: vSourceRange.startRow,
         col: vSourceRange.startColumn
-      };
-      getAutoFillRepeatRange(vSourceRange, vTargetRange).forEach((repeat) => {
+      }, repeats = getAutoFillRepeatRange(vSourceRange, vTargetRange), additionMatrix = new ObjectMatrix(), additionRules = /* @__PURE__ */ new Set();
+      repeats.forEach((repeat) => {
         const targetStartCell = repeat.repeatStartCell, relativeRange = repeat.relativeRange, sourceRange2 = {
           startRow: sourceStartCell.row,
           startColumn: sourceStartCell.col,
@@ -4937,10 +4928,12 @@ let DataValidationAutoFillController = (_a20 = class extends Disposable {
               },
               targetRange2
             ), { row: targetRow, col: targetCol } = mapFunc(targetPositionRange.startRow, targetPositionRange.startColumn);
-            ruleMatrixCopy.setValue(targetRow, targetCol, ruleId);
+            additionMatrix.setValue(targetRow, targetCol, ruleId), additionRules.add(ruleId);
           }
         });
       });
+      const additions = Array.from(additionRules).map((id) => ({ id, ranges: queryObjectMatrix(additionMatrix, (value) => value === id) }));
+      ruleMatrixCopy.addRangeRules(additions);
       const diffs = ruleMatrixCopy.diff(this._dataValidationModel.getRules(unitId, subUnitId)), { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, diffs, this._injector, "patched", applyType === APPLY_TYPE.ONLY_FORMAT);
       return {
         undos: undoMutations,

package/lib/types/controllers/dv-ref-range.controller.d.ts

@@ -1,7 +1,7 @@
 import { Disposable, Injector, ISheetDataValidationRule } from '@univerjs/core';
-import { DataValidationModel } from '@univerjs/data-validation';
 import { RefRangeService } from '@univerjs/sheets';
 import { FormulaRefRangeService } from '@univerjs/sheets-formula';
+import { SheetDataValidationModel } from '../models/sheet-data-validation-model';
 import { DataValidationCustomFormulaService } from '../services/dv-custom-formula.service';
 import { DataValidationFormulaService } from '../services/dv-formula.service';
 export declare class DataValidationRefRangeController extends Disposable {
@@ -12,7 +12,7 @@ export declare class DataValidationRefRangeController extends Disposable {
     private _dataValidationFormulaService;
     private _formulaRefRangeService;
     private _disposableMap;
-    constructor(_dataValidationModel: DataValidationModel, _injector: Injector, _refRangeService: RefRangeService, _dataValidationCustomFormulaService: DataValidationCustomFormulaService, _dataValidationFormulaService: DataValidationFormulaService, _formulaRefRangeService: FormulaRefRangeService);
+    constructor(_dataValidationModel: SheetDataValidationModel, _injector: Injector, _refRangeService: RefRangeService, _dataValidationCustomFormulaService: DataValidationCustomFormulaService, _dataValidationFormulaService: DataValidationFormulaService, _formulaRefRangeService: FormulaRefRangeService);
     private _getIdWithUnitId;
     registerRule: (unitId: string, subUnitId: string, rule: ISheetDataValidationRule) => void;
     registerFormula(unitId: string, subUnitId: string, rule: ISheetDataValidationRule): void;

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

@@ -1,4 +1,4 @@
-import { IRange, ISheetDataValidationRule, Worksheet, ObjectMatrix } from '@univerjs/core';
+import { IRange, ISheetDataValidationRule, Worksheet } from '@univerjs/core';
 export type RangeMutation = {
     type: 'update';
     ruleId: string;
@@ -14,15 +14,18 @@ export type RangeMutation = {
 };
 export declare class RuleMatrix {
     private _worksheet;
-    readonly value: ObjectMatrix<string>;
-    constructor(value: ObjectMatrix<string>, _worksheet: Worksheet);
+    private _map;
+    constructor(value: Map<string, IRange[]>, _worksheet: Worksheet);
     addRule(rule: ISheetDataValidationRule): void;
-    removeRange(ranges: IRange[]): void;
+    removeRange(_ranges: IRange[]): void;
     removeRule(rule: ISheetDataValidationRule): void;
-    updateRange(ruleId: string, _oldRanges: IRange[], _newRanges: IRange[]): void;
+    updateRange(ruleId: string, _newRanges: IRange[]): void;
     diff(rules: ISheetDataValidationRule[]): RangeMutation[];
     diffWithAddition(rules: ISheetDataValidationRule[], additionRules: IterableIterator<ISheetDataValidationRule>): RangeMutation[];
     clone(): RuleMatrix;
-    getValue(row: number, col: number): string;
-    setValue(row: number, col: number, value: string): void;
+    getValue(row: number, col: number): string | undefined;
+    addRangeRules(rules: {
+        id: string;
+        ranges: IRange[];
+    }[]): void;
 }

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

@@ -1,5 +1,5 @@
+import { WrapStrategy, CellValue, DataValidationOperator, IDataValidationRule, IDataValidationRuleBase, ISheetDataValidationRule, Nullable } from '@univerjs/core';
 import { BaseDataValidator, IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';
-import { CellValue, DataValidationOperator, IDataValidationRule, IDataValidationRuleBase, ISheetDataValidationRule, Nullable } from '@univerjs/core';
 import { CheckboxRender } from '../widgets/checkbox-widget';
 export declare const CHECKBOX_FORMULA_1 = 1;
 export declare const CHECKBOX_FORMULA_2 = 0;
@@ -22,6 +22,9 @@ export declare class CheckboxValidator extends BaseDataValidator {
     }): boolean;
     validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
     parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<ICheckboxFormulaResult>;
+    getExtraStyle(rule: IDataValidationRule, value: Nullable<CellValue>): {
+        tb: WrapStrategy;
+    };
     parseFormulaSync(rule: IDataValidationRule, unitId: string, subUnitId: string): {
         formula1: Nullable<CellValue>;
         formula2: Nullable<CellValue>;

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

@@ -1,6 +1,6 @@
-import { CellValue, DataValidationOperator, ICellData, IDataValidationRule, ISheetDataValidationRule, Nullable } from '@univerjs/core';
-import { IBaseDataValidationWidget, IFormulaResult, IFormulaValidResult, IValidatorCellInfo, BaseDataValidator } from '@univerjs/data-validation';
+import { BaseDataValidator, IBaseDataValidationWidget, IFormulaResult, IFormulaValidResult, IValidatorCellInfo } from '@univerjs/data-validation';
 import { LexerTreeBuilder } from '@univerjs/engine-formula';
+import { CellValue, DataValidationOperator, ICellData, IDataValidationRule, ISheetDataValidationRule, IStyleData, Nullable } from '@univerjs/core';
 import { DataValidationFormulaService } from '../services/dv-formula.service';
 export declare function getRuleFormulaResultSet(result: Nullable<Nullable<ICellData>[][]>): string[];
 export declare function isValidListFormula(formula: string, lexer: LexerTreeBuilder): boolean | undefined;
@@ -18,6 +18,9 @@ export declare class ListValidator extends BaseDataValidator {
     optionsInput: string | undefined;
     skipDefaultFontRender(rule: ISheetDataValidationRule): boolean;
     validatorFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): IFormulaValidResult;
+    getExtraStyle(rule: IDataValidationRule, value: Nullable<CellValue>, { style: defaultStyle }: {
+        style: IStyleData;
+    }): Nullable<IStyleData>;
     parseCellValue(cellValue: CellValue): string[];
     parseFormula(rule: IDataValidationRule, unitId: string, subUnitId: string): Promise<IFormulaResult<string[] | undefined>>;
     isValidType(cellInfo: IValidatorCellInfo<Nullable<CellValue>>, formula: IFormulaResult<string[] | undefined>, rule: IDataValidationRule): Promise<boolean>;