@univerjs/sheets-data-validation 0.2.14 → 0.3.0-alpha.0

package/lib/es/index.js

@@ -2,24 +2,24 @@ 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, debounce, Rectangle, Tools, OnLifecycle, LifecycleStages, DataValidationStatus, ICommandService, DataValidationOperator, createInternalEditorID, useDependency, LocaleService, IPermissionService, ThemeService, VerticalAlign, HorizontalAlign, WrapStrategy, DataValidationErrorStyle, numfmt, CellValueType, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DisposableCollection, toDisposable, CommandType, BuildTextUtils, DataValidationRenderMode, IConfigService, UndoCommand, RedoCommand, isUnitRangesEqual, isValidRange, shallowEqual, Injector, DEFAULT_STYLES, DocumentDataModel, DEFAULT_EMPTY_DOCUMENT_VALUE, BooleanNumber, IUndoRedoService, sequenceExecuteAsync, sequenceExecute, RxDisposable, queryObjectMatrix, isRangesEqual, Optional, InterceptorEffectEnum, DependentOn, Plugin } 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";
-import { LexerTreeBuilder, isReferenceString, deserializeRangeWithSheet, serializeRange, sequenceNodeType, ERROR_TYPE_SET } from "@univerjs/engine-formula";
+import { RemoveSheetMutation, SheetsSelectionsService, WorksheetViewPermission, SetRangeValuesCommand, getSheetCommandTarget, WorkbookEditablePermission, RangeProtectionPermissionEditPoint, WorksheetEditPermission, checkRangesEditablePermission, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, WorksheetSetCellStylePermission, SheetInterceptorService, ClearSelectionAllCommand, RefRangeService, handleCommonDefaultRangeChangeWithEffectRefCommands, INTERCEPTOR_POINT, InterceptCellContentPriority, UniverSheetsPlugin, RemoveSheetCommand } from "@univerjs/sheets";
+import { IEditorBridgeService, SheetCanvasPopManagerService, SheetPermissionInterceptorBaseController, IMarkSelectionService, getCurrentRangeDisable$, HoverManagerService, CellAlertManagerService, CellAlertType, COPY_TYPE, rangeToDiscreteRange, PREDEFINED_HOOK_NAME, virtualizeDiscreteRanges, getRepeatRange, ISheetClipboardService, AutoHeightController, SheetSkeletonManagerService, UniverSheetsUIPlugin, IAutoFillService, APPLY_TYPE, getAutoFillRepeatRange } from "@univerjs/sheets-ui";
 import { Subject, debounceTime, filter, BehaviorSubject, distinctUntilChanged, bufferTime } from "rxjs";
+import { LexerTreeBuilder, deserializeRangeWithSheet, serializeRange, isReferenceString, sequenceNodeType, ERROR_TYPE_SET } from "@univerjs/engine-formula";
 import { RegisterOtherFormulaService, FormulaRefRangeService } from "@univerjs/sheets-formula";
 import React, { forwardRef, useRef, createElement, useState, useMemo, useEffect } from "react";
-import { FormLayout, Input, RadioGroup, Radio, DraggableList, Select, Checkbox, Button, RectPopup, Scrollbar, DatePanel } from "@univerjs/design";
-import { TextEditor, useObservable, useEvent, ISidebarService, ComponentManager, RangeSelector, IZenZoneService, KeyCode, IDialogService, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, IMenuManagerService } from "@univerjs/ui";
+import { FormLayout, Input, RadioGroup, Radio, DraggableList, Select, Checkbox, Button, DatePanel, RectPopup, Scrollbar } from "@univerjs/design";
+import { TextEditor, RangeSelector } from "@univerjs/docs-ui";
+import { useObservable, useEvent, IDialogService, ComponentManager, IZenZoneService, ISidebarService, KeyCode, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, IMenuManagerService } from "@univerjs/ui";
 import cs from "clsx";
 import { fixLineWidthByScale, Transform, Checkbox as Checkbox$1, IRenderManagerService, DeviceInputEventType, getDocsSkeletonPageSize, Rect, DocumentViewModel, DocumentSkeleton, Documents, FontCache, Shape, getFontStyleString } from "@univerjs/engine-render";
 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 {
+import { RichTextEditingMutation } from "@univerjs/docs";
+const DATA_VALIDATION_PLUGIN_NAME = "SHEET_DATA_VALIDATION_PLUGIN", DROP_DOWN_DEFAULT_COLOR = "#ECECEC", _DataValidationCacheService = class _DataValidationCacheService {
   constructor() {
     __publicField(this, "_cacheMatrix", /* @__PURE__ */ new Map());
   }
@@ -117,8 +117,8 @@ let DataValidationCustomFormulaService = (_a = class extends Disposable {
           for (const subUnitId in unitMap) {
             const results = unitMap[subUnitId], { formulaCellMap, ruleFormulaMap } = this._ensureMaps(unitId, subUnitId);
             results.forEach((result) => {
-              var _a23, _b;
-              const ruleInfo = ruleFormulaMap.get((_a23 = result.extra) == null ? void 0 : _a23.ruleId), cellInfo = formulaCellMap.get(result.formulaId), rule = this._dataValidationModel.getRuleById(unitId, subUnitId, (_b = result.extra) == null ? void 0 : _b.ruleId);
+              var _a24, _b;
+              const ruleInfo = ruleFormulaMap.get((_a24 = result.extra) == null ? void 0 : _a24.ruleId), cellInfo = formulaCellMap.get(result.formulaId), rule = this._dataValidationModel.getRuleById(unitId, subUnitId, (_b = result.extra) == null ? void 0 : _b.ruleId);
               rule && ruleInfo && !ruleInfo.isTransformable && this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, rule.ranges), cellInfo && this._dataValidationCacheService.markCellDirty(unitId, subUnitId, cellInfo.row, cellInfo.column);
             });
           }
@@ -196,8 +196,8 @@ let DataValidationCustomFormulaService = (_a = class extends Disposable {
       });
     }), newRanges.forEach((range) => {
       Range.foreach(range, (row, col) => {
-        var _a23;
-        const oldValue = (_a23 = formulaMap.getValue(row, col)) != null ? _a23 : {};
+        var _a24;
+        const oldValue = (_a24 = formulaMap.getValue(row, col)) != null ? _a24 : {};
         if (oldValue.ruleId !== ruleId) {
           const oldRuleFormula = ruleFormulaMap.get(oldValue.ruleId);
           if (oldRuleFormula != null && oldRuleFormula.isTransformable && deleteFormulaIdList.add(oldValue.formulaId), isTransformable) {
@@ -264,8 +264,8 @@ let DataValidationFormulaService = (_a2 = class extends Disposable {
           for (const subUnitId in unitMap) {
             const results = unitMap[subUnitId], formulaMap = this._ensureRuleFormulaMap(unitId, subUnitId);
             results.forEach((result) => {
-              var _a23, _b;
-              if (formulaMap.get((_a23 = result.extra) == null ? void 0 : _a23.ruleId)) {
+              var _a24, _b;
+              if (formulaMap.get((_a24 = result.extra) == null ? void 0 : _a24.ruleId)) {
                 const rule = this._dataValidationModel.getRuleById(unitId, subUnitId, (_b = result.extra) == null ? void 0 : _b.ruleId);
                 rule && this._dataValidationCacheService.markRangeDirty(unitId, subUnitId, rule.ranges);
               }
@@ -357,75 +357,493 @@ 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) {
-  var _a23;
-  return String((_a23 = getCellValueOrigin(cell)) != null ? _a23 : "");
+  var _a24;
+  return String((_a24 = getCellValueOrigin(cell)) != null ? _a24 : "");
 }
 __name(getStringCellValue, "getStringCellValue");
-const _RuleMatrix = class _RuleMatrix {
-  constructor(value, _worksheet) {
-    __publicField(this, "value");
-    this._worksheet = _worksheet, this.value = value;
+var _a3;
+const Interval = (_a3 = class {
+  /**
+   * Accept two comparable values and creates new instance of interval
+   * Predicate Interval.comparable_less(low, high) supposed to return true on these values
+   * @param low
+   * @param high
+   */
+  constructor(low, high) {
+    this.low = low, this.high = high;
+  }
+  /**
+   * Clone interval
+   * @returns {Interval}
+   */
+  clone() {
+    return new _a3(this.low, this.high);
+  }
+  /**
+   * Propery max returns clone of this interval
+   * @returns {Interval}
+   */
+  get max() {
+    return this.clone();
+  }
+  /**
+   * Predicate returns true is this interval less than other interval
+   * @param other_interval
+   * @returns {boolean}
+   */
+  less_than(other_interval) {
+    return this.low < other_interval.low || this.low === other_interval.low && this.high < other_interval.high;
+  }
+  /**
+   * Predicate returns true is this interval equals to other interval
+   * @param other_interval
+   * @returns {boolean}
+   */
+  equal_to(other_interval) {
+    return this.low === other_interval.low && this.high === other_interval.high;
+  }
+  /**
+   * Predicate returns true if this interval intersects other interval
+   * @param other_interval
+   * @returns {boolean}
+   */
+  intersect(other_interval) {
+    return !this.not_intersect(other_interval);
+  }
+  /**
+   * Predicate returns true if this interval does not intersect other interval
+   * @param other_interval
+   * @returns {boolean}
+   */
+  not_intersect(other_interval) {
+    return this.high < other_interval.low || other_interval.high < this.low;
+  }
+  /**
+   * Returns new interval merged with other interval
+   * @param {Interval} other_interval - Other interval to merge with
+   * @returns {Interval}
+   */
+  merge(other_interval) {
+    return new _a3(
+      this.low === void 0 ? other_interval.low : this.low < other_interval.low ? this.low : other_interval.low,
+      this.high === void 0 ? other_interval.high : this.high > other_interval.high ? this.high : other_interval.high
+    );
   }
-  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);
-        }
-      );
-    });
+  /**
+   * Returns how key should return
+   */
+  output() {
+    return [this.low, this.high];
+  }
+  /**
+   * Function returns maximum between two comparable values
+   * @param interval1
+   * @param interval2
+   * @returns {Interval}
+   */
+  static comparable_max(interval1, interval2) {
+    return interval1.merge(interval2);
+  }
+  /**
+   * Predicate returns true if first value less than second value
+   * @param val1
+   * @param val2
+   * @returns {boolean}
+   */
+  static comparable_less_than(val1, val2) {
+    return val1 < val2;
+  }
+}, __name(_a3, "Interval"), _a3), RB_TREE_COLOR_RED = 0, RB_TREE_COLOR_BLACK = 1, _Node = class _Node {
+  constructor(key = void 0, value = void 0, left = null, right = null, parent = null, color = RB_TREE_COLOR_BLACK) {
+    if (this.left = left, this.right = right, this.parent = parent, this.color = color, this.item = { key, value }, key && key instanceof Array && key.length === 2 && !Number.isNaN(key[0]) && !Number.isNaN(key[1])) {
+      let [low, high] = key;
+      low > high && ([low, high] = [high, low]), this.item.key = new Interval(low, high);
+    }
+    this.max = this.item.key ? this.item.key.max : void 0;
   }
-  removeRange(ranges) {
-    ranges.forEach((range) => {
-      Range.foreach(Range.transformRange(range, this._worksheet), (row, col) => {
-        this.value.realDeleteValue(row, col);
+  isNil() {
+    return this.item.key === void 0 && this.item.value === void 0 && this.left === null && this.right === null && this.color === RB_TREE_COLOR_BLACK;
+  }
+  _value_less_than(other_node) {
+    return this.item.value && other_node.item.value && this.item.value.less_than ? this.item.value.less_than(other_node.item.value) : this.item.value < other_node.item.value;
+  }
+  less_than(other_node) {
+    return this.item.value === this.item.key && other_node.item.value === other_node.item.key ? this.item.key.less_than(other_node.item.key) : this.item.key.less_than(other_node.item.key) || this.item.key.equal_to(other_node.item.key) && this._value_less_than(other_node);
+  }
+  _value_equal(other_node) {
+    return this.item.value && other_node.item.value && this.item.value.equal_to ? this.item.value.equal_to(other_node.item.value) : this.item.value === other_node.item.value;
+  }
+  equal_to(other_node) {
+    return this.item.value === this.item.key && other_node.item.value === other_node.item.key ? this.item.key.equal_to(other_node.item.key) : this.item.key.equal_to(other_node.item.key) && this._value_equal(other_node);
+  }
+  intersect(other_node) {
+    return this.item.key.intersect(other_node.item.key);
+  }
+  copy_data(other_node) {
+    this.item.key = other_node.item.key, this.item.value = other_node.item.value;
+  }
+  update_max() {
+    if (this.max = this.item.key ? this.item.key.max : void 0, this.right && this.right.max) {
+      const comparable_max = this.item.key.constructor.comparable_max;
+      this.max = comparable_max(this.max, this.right.max);
+    }
+    if (this.left && this.left.max) {
+      const comparable_max = this.item.key.constructor.comparable_max;
+      this.max = comparable_max(this.max, this.left.max);
+    }
+  }
+  // Other_node does not intersect any node of left subtree, if this.left.max < other_node.item.key.low
+  not_intersect_left_subtree(search_node) {
+    const comparable_less_than = this.item.key.constructor.comparable_less_than;
+    let high = this.left.max.high !== void 0 ? this.left.max.high : this.left.max;
+    return comparable_less_than(high, search_node.item.key.low);
+  }
+  // Other_node does not intersect right subtree if other_node.item.key.high < this.right.key.low
+  not_intersect_right_subtree(search_node) {
+    const comparable_less_than = this.item.key.constructor.comparable_less_than;
+    let low = this.right.max.low !== void 0 ? this.right.max.low : this.right.item.key.low;
+    return comparable_less_than(search_node.item.key.high, low);
+  }
+};
+__name(_Node, "Node");
+let Node = _Node;
+const _IntervalTree = class _IntervalTree {
+  /**
+   * Construct new empty instance of IntervalTree
+   */
+  constructor() {
+    this.root = null, this.nil_node = new Node();
+  }
+  /**
+   * Returns number of items stored in the interval tree
+   * @returns {number}
+   */
+  get size() {
+    let count = 0;
+    return this.tree_walk(this.root, () => count++), count;
+  }
+  /**
+   * Returns array of sorted keys in the ascending order
+   * @returns {Array}
+   */
+  get keys() {
+    let res = [];
+    return this.tree_walk(this.root, (node) => res.push(
+      node.item.key.output ? node.item.key.output() : node.item.key
+    )), res;
+  }
+  /**
+   * Return array of values in the ascending keys order
+   * @returns {Array}
+   */
+  get values() {
+    let res = [];
+    return this.tree_walk(this.root, (node) => res.push(node.item.value)), res;
+  }
+  /**
+   * Returns array of items (<key,value> pairs) in the ascended keys order
+   * @returns {Array}
+   */
+  get items() {
+    let res = [];
+    return this.tree_walk(this.root, (node) => res.push({
+      key: node.item.key.output ? node.item.key.output() : node.item.key,
+      value: node.item.value
+    })), res;
+  }
+  /**
+   * Returns true if tree is empty
+   * @returns {boolean}
+   */
+  isEmpty() {
+    return this.root == null || this.root === this.nil_node;
+  }
+  /**
+   * Clear tree
+   */
+  clear() {
+    this.root = null;
+  }
+  /**
+   * Insert new item into interval tree
+   * @param {Interval} key - interval object or array of two numbers [low, high]
+   * @param {any} value - value representing any object (optional)
+   * @returns {Node} returns reference to inserted node as an object {key:interval, value: value}
+   */
+  insert(key, value = key) {
+    if (key === void 0) return;
+    let insert_node = new Node(key, value, this.nil_node, this.nil_node, null, RB_TREE_COLOR_RED);
+    return this.tree_insert(insert_node), this.recalc_max(insert_node), insert_node;
+  }
+  /**
+   * Returns true if item {key,value} exist in the tree
+   * @param {Interval} key - interval correspondent to keys stored in the tree
+   * @param {any} value - value object to be checked
+   * @returns {boolean} true if item {key, value} exist in the tree, false otherwise
+   */
+  exist(key, value = key) {
+    let search_node = new Node(key, value);
+    return !!this.tree_search(this.root, search_node);
+  }
+  /**
+   * Remove entry {key, value} from the tree
+   * @param {Interval} key - interval correspondent to keys stored in the tree
+   * @param {any} value - value object
+   * @returns {boolean} true if item {key, value} deleted, false if not found
+   */
+  remove(key, value = key) {
+    let search_node = new Node(key, value), delete_node = this.tree_search(this.root, search_node);
+    return delete_node && this.tree_delete(delete_node), delete_node;
+  }
+  /**
+   * Returns array of entry values which keys intersect with given interval <br/>
+   * If no values stored in the tree, returns array of keys which intersect given interval
+   * @param {Interval} interval - search interval, or tuple [low, high]
+   * @param outputMapperFn(value,key) - optional function that maps (value, key) to custom output
+   * @returns {Array}
+   */
+  search(interval, outputMapperFn = (value, key) => value === key ? key.output() : value) {
+    let search_node = new Node(interval), resp_nodes = [];
+    return this.tree_search_interval(this.root, search_node, resp_nodes), resp_nodes.map((node) => outputMapperFn(node.item.value, node.item.key));
+  }
+  /**
+   * Returns true if intersection between given and any interval stored in the tree found
+   * @param {Interval} interval - search interval or tuple [low, high]
+   * @returns {boolean}
+   */
+  intersect_any(interval) {
+    let search_node = new Node(interval);
+    return this.tree_find_any_interval(this.root, search_node);
+  }
+  /**
+   * Tree visitor. For each node implement a callback function. <br/>
+   * Method calls a callback function with two parameters (key, value)
+   * @param visitor(key,value) - function to be called for each tree item
+   */
+  forEach(visitor) {
+    this.tree_walk(this.root, (node) => visitor(node.item.key, node.item.value));
+  }
+  /**
+   * Value Mapper. Walk through every node and map node value to another value
+   * @param callback(value,key) - function to be called for each tree item
+   */
+  map(callback) {
+    const tree = new _IntervalTree();
+    return this.tree_walk(this.root, (node) => tree.insert(node.item.key, callback(node.item.value, node.item.key))), tree;
+  }
+  /**
+   * @param {Interval} interval - optional if the iterator is intended to start from the beginning
+   * @param outputMapperFn(value,key) - optional function that maps (value, key) to custom output
+   * @returns {Iterator}
+   */
+  *iterate(interval, outputMapperFn = (value, key) => value === key ? key.output() : value) {
+    let node;
+    for (interval ? node = this.tree_search_nearest_forward(this.root, new Node(interval)) : this.root && (node = this.local_minimum(this.root)); node; )
+      yield outputMapperFn(node.item.value, node.item.key), node = this.tree_successor(node);
+  }
+  recalc_max(node) {
+    let node_current = node;
+    for (; node_current.parent != null; )
+      node_current.parent.update_max(), node_current = node_current.parent;
+  }
+  tree_insert(insert_node) {
+    let current_node = this.root, parent_node = null;
+    if (this.root == null || this.root === this.nil_node)
+      this.root = insert_node;
+    else {
+      for (; current_node !== this.nil_node; )
+        parent_node = current_node, insert_node.less_than(current_node) ? current_node = current_node.left : current_node = current_node.right;
+      insert_node.parent = parent_node, insert_node.less_than(parent_node) ? parent_node.left = insert_node : parent_node.right = insert_node;
+    }
+    this.insert_fixup(insert_node);
+  }
+  // After insertion insert_node may have red-colored parent, and this is a single possible violation
+  // Go upwords to the root and re-color until violation will be resolved
+  insert_fixup(insert_node) {
+    let current_node, uncle_node;
+    for (current_node = insert_node; current_node !== this.root && current_node.parent.color === RB_TREE_COLOR_RED; )
+      current_node.parent === current_node.parent.parent.left ? (uncle_node = current_node.parent.parent.right, uncle_node.color === RB_TREE_COLOR_RED ? (current_node.parent.color = RB_TREE_COLOR_BLACK, uncle_node.color = RB_TREE_COLOR_BLACK, current_node.parent.parent.color = RB_TREE_COLOR_RED, current_node = current_node.parent.parent) : (current_node === current_node.parent.right && (current_node = current_node.parent, this.rotate_left(current_node)), current_node.parent.color = RB_TREE_COLOR_BLACK, current_node.parent.parent.color = RB_TREE_COLOR_RED, this.rotate_right(current_node.parent.parent))) : (uncle_node = current_node.parent.parent.left, uncle_node.color === RB_TREE_COLOR_RED ? (current_node.parent.color = RB_TREE_COLOR_BLACK, uncle_node.color = RB_TREE_COLOR_BLACK, current_node.parent.parent.color = RB_TREE_COLOR_RED, current_node = current_node.parent.parent) : (current_node === current_node.parent.left && (current_node = current_node.parent, this.rotate_right(current_node)), current_node.parent.color = RB_TREE_COLOR_BLACK, current_node.parent.parent.color = RB_TREE_COLOR_RED, this.rotate_left(current_node.parent.parent)));
+    this.root.color = RB_TREE_COLOR_BLACK;
+  }
+  tree_delete(delete_node) {
+    let cut_node, fix_node;
+    delete_node.left === this.nil_node || delete_node.right === this.nil_node ? cut_node = delete_node : cut_node = this.tree_successor(delete_node), cut_node.left !== this.nil_node ? fix_node = cut_node.left : fix_node = cut_node.right, fix_node.parent = cut_node.parent, cut_node === this.root ? this.root = fix_node : (cut_node === cut_node.parent.left ? cut_node.parent.left = fix_node : cut_node.parent.right = fix_node, cut_node.parent.update_max()), this.recalc_max(fix_node), cut_node !== delete_node && (delete_node.copy_data(cut_node), delete_node.update_max(), this.recalc_max(delete_node)), /*fix_node != this.nil_node && */
+    cut_node.color === RB_TREE_COLOR_BLACK && this.delete_fixup(fix_node);
+  }
+  delete_fixup(fix_node) {
+    let current_node = fix_node, brother_node;
+    for (; current_node !== this.root && current_node.parent != null && current_node.color === RB_TREE_COLOR_BLACK; )
+      current_node === current_node.parent.left ? (brother_node = current_node.parent.right, brother_node.color === RB_TREE_COLOR_RED && (brother_node.color = RB_TREE_COLOR_BLACK, current_node.parent.color = RB_TREE_COLOR_RED, this.rotate_left(current_node.parent), brother_node = current_node.parent.right), brother_node.left.color === RB_TREE_COLOR_BLACK && brother_node.right.color === RB_TREE_COLOR_BLACK ? (brother_node.color = RB_TREE_COLOR_RED, current_node = current_node.parent) : (brother_node.right.color === RB_TREE_COLOR_BLACK && (brother_node.color = RB_TREE_COLOR_RED, brother_node.left.color = RB_TREE_COLOR_BLACK, this.rotate_right(brother_node), brother_node = current_node.parent.right), brother_node.color = current_node.parent.color, current_node.parent.color = RB_TREE_COLOR_BLACK, brother_node.right.color = RB_TREE_COLOR_BLACK, this.rotate_left(current_node.parent), current_node = this.root)) : (brother_node = current_node.parent.left, brother_node.color === RB_TREE_COLOR_RED && (brother_node.color = RB_TREE_COLOR_BLACK, current_node.parent.color = RB_TREE_COLOR_RED, this.rotate_right(current_node.parent), brother_node = current_node.parent.left), brother_node.left.color === RB_TREE_COLOR_BLACK && brother_node.right.color === RB_TREE_COLOR_BLACK ? (brother_node.color = RB_TREE_COLOR_RED, current_node = current_node.parent) : (brother_node.left.color === RB_TREE_COLOR_BLACK && (brother_node.color = RB_TREE_COLOR_RED, brother_node.right.color = RB_TREE_COLOR_BLACK, this.rotate_left(brother_node), brother_node = current_node.parent.left), brother_node.color = current_node.parent.color, current_node.parent.color = RB_TREE_COLOR_BLACK, brother_node.left.color = RB_TREE_COLOR_BLACK, this.rotate_right(current_node.parent), current_node = this.root));
+    current_node.color = RB_TREE_COLOR_BLACK;
+  }
+  tree_search(node, search_node) {
+    if (!(node == null || node === this.nil_node))
+      return search_node.equal_to(node) ? node : search_node.less_than(node) ? this.tree_search(node.left, search_node) : this.tree_search(node.right, search_node);
+  }
+  tree_search_nearest_forward(node, search_node) {
+    let best, curr = node;
+    for (; curr && curr !== this.nil_node; )
+      curr.less_than(search_node) ? curr.intersect(search_node) ? (best = curr, curr = curr.left) : curr = curr.right : ((!best || curr.less_than(best)) && (best = curr), curr = curr.left);
+    return best || null;
+  }
+  // Original search_interval method; container res support push() insertion
+  // Search all intervals intersecting given one
+  tree_search_interval(node, search_node, res) {
+    node != null && node !== this.nil_node && (node.left !== this.nil_node && !node.not_intersect_left_subtree(search_node) && this.tree_search_interval(node.left, search_node, res), node.intersect(search_node) && res.push(node), node.right !== this.nil_node && !node.not_intersect_right_subtree(search_node) && this.tree_search_interval(node.right, search_node, res));
+  }
+  tree_find_any_interval(node, search_node) {
+    let found = !1;
+    return node != null && node !== this.nil_node && (node.left !== this.nil_node && !node.not_intersect_left_subtree(search_node) && (found = this.tree_find_any_interval(node.left, search_node)), found || (found = node.intersect(search_node)), !found && node.right !== this.nil_node && !node.not_intersect_right_subtree(search_node) && (found = this.tree_find_any_interval(node.right, search_node))), found;
+  }
+  local_minimum(node) {
+    let node_min = node;
+    for (; node_min.left != null && node_min.left !== this.nil_node; )
+      node_min = node_min.left;
+    return node_min;
+  }
+  // not in use
+  local_maximum(node) {
+    let node_max = node;
+    for (; node_max.right != null && node_max.right !== this.nil_node; )
+      node_max = node_max.right;
+    return node_max;
+  }
+  tree_successor(node) {
+    let node_successor, current_node, parent_node;
+    if (node.right !== this.nil_node)
+      node_successor = this.local_minimum(node.right);
+    else {
+      for (current_node = node, parent_node = node.parent; parent_node != null && parent_node.right === current_node; )
+        current_node = parent_node, parent_node = parent_node.parent;
+      node_successor = parent_node;
+    }
+    return node_successor;
+  }
+  //           |            right-rotate(T,y)       |
+  //           y            ---------------.       x
+  //          / \                                  / \
+  //         x   c          left-rotate(T,x)      a   y
+  //        / \             <---------------         / \
+  //       a   b                                    b   c
+  rotate_left(x) {
+    let y = x.right;
+    x.right = y.left, y.left !== this.nil_node && (y.left.parent = x), y.parent = x.parent, x === this.root ? this.root = y : x === x.parent.left ? x.parent.left = y : x.parent.right = y, y.left = x, x.parent = y, x != null && x !== this.nil_node && x.update_max(), y = x.parent, y != null && y !== this.nil_node && y.update_max();
+  }
+  rotate_right(y) {
+    let x = y.left;
+    y.left = x.right, x.right !== this.nil_node && (x.right.parent = y), x.parent = y.parent, y === this.root ? this.root = x : y === y.parent.left ? y.parent.left = x : y.parent.right = x, x.right = y, y.parent = x, y !== null && y !== this.nil_node && y.update_max(), x = y.parent, x != null && x !== this.nil_node && x.update_max();
+  }
+  tree_walk(node, action) {
+    node != null && node !== this.nil_node && (this.tree_walk(node.left, action), action(node), this.tree_walk(node.right, action));
+  }
+  /* Return true if all red nodes have exactly two black child nodes */
+  testRedBlackProperty() {
+    let res = !0;
+    return this.tree_walk(this.root, function(node) {
+      node.color === RB_TREE_COLOR_RED && (node.left.color === RB_TREE_COLOR_BLACK && node.right.color === RB_TREE_COLOR_BLACK || (res = !1));
+    }), res;
+  }
+  /* Throw error if not every path from root to bottom has same black height */
+  testBlackHeightProperty(node) {
+    let height = 0, heightLeft = 0, heightRight = 0;
+    if (node.color === RB_TREE_COLOR_BLACK && height++, node.left !== this.nil_node ? heightLeft = this.testBlackHeightProperty(node.left) : heightLeft = 1, node.right !== this.nil_node ? heightRight = this.testBlackHeightProperty(node.right) : heightRight = 1, heightLeft !== heightRight)
+      throw new Error("Red-black height property violated");
+    return height += heightLeft, height;
+  }
+};
+__name(_IntervalTree, "IntervalTree");
+let IntervalTree = _IntervalTree;
+const _RuleMatrix = class _RuleMatrix {
+  constructor(value, _unitId, _subUnitId, _univerInstanceService, _disableTree = !1) {
+    __publicField(this, "_map");
+    __publicField(this, "_tree", /* @__PURE__ */ new Map());
+    __publicField(this, "_dirty", !0);
+    __publicField(this, "_buildTree", /* @__PURE__ */ __name(() => {
+      if (!this._dirty || this._disableTree)
+        return;
+      const map = /* @__PURE__ */ new Map();
+      this._map.forEach((ranges, ruleId) => {
+        ranges.forEach((range) => {
+          for (let col = range.startColumn; col <= range.endColumn; col++) {
+            let items = map.get(col);
+            items || (items = [], map.set(col, items)), items.push({
+              startRow: range.startRow,
+              endRow: range.endRow,
+              ruleId
+            });
+          }
+        });
       });
-    });
+      const treeMap = /* @__PURE__ */ new Map();
+      map.forEach((items, col) => {
+        const tree = new IntervalTree();
+        items.forEach((item) => {
+          tree.insert([item.startRow, item.endRow], item.ruleId);
+        }), treeMap.set(col, tree);
+      }), this._tree = treeMap, this._dirty = !1;
+    }, "_buildTree"));
+    __publicField(this, "_debonceBuildTree", debounce(this._buildTree, 0));
+    this._unitId = _unitId, this._subUnitId = _subUnitId, this._univerInstanceService = _univerInstanceService, this._disableTree = _disableTree, this._map = value, this._buildTree();
+  }
+  get _worksheet() {
+    var _a24;
+    return (_a24 = this._univerInstanceService.getUnit(this._unitId, UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _a24.getSheetBySheetId(this._subUnitId);
+  }
+  addRule(rule) {
+    if (!this._worksheet)
+      return;
+    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._dirty = !0, this._map.set(ruleId, ranges), this._debonceBuildTree();
+  }
+  removeRange(_ranges) {
+    if (!this._worksheet)
+      return;
+    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);
+    }), this._dirty = !0, this._debonceBuildTree();
   }
   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), this._dirty = !0, this._debonceBuildTree();
   }
-  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) {
+    if (!this._worksheet)
+      return;
+    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), this._dirty = !0, this._debonceBuildTree();
+  }
+  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);
       });
-    });
+    }), this._dirty = !0, this._debonceBuildTree();
   }
   diff(rules) {
     const mutations = [];
     let deleteIndex = 0;
     return rules.forEach((rule, index) => {
-      const newRanges = queryObjectMatrix(this.value, (ruleId) => ruleId === rule.uid), oldRanges = rule.ranges;
-      (newRanges.length !== oldRanges.length || newRanges.some((range, i) => !Rectangle.equals(range, oldRanges[i]))) && mutations.push({
+      var _a24;
+      const newRanges = (_a24 = this._map.get(rule.uid)) != null ? _a24 : [], oldRanges = rule.ranges;
+      newRanges.length !== 0 && (newRanges.length !== oldRanges.length || newRanges.some((range, i) => !Rectangle.equals(range, oldRanges[i]))) && mutations.push({
         type: "update",
         ruleId: rule.uid,
         oldRanges,
@@ -441,8 +859,9 @@ 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;
-      (newRanges.length !== oldRanges.length || newRanges.some((range, i) => !Rectangle.equals(range, oldRanges[i]))) && mutations.push({
+      var _a24;
+      const newRanges = (_a24 = this._map.get(rule.uid)) != null ? _a24 : [], oldRanges = rule.ranges;
+      newRanges.length !== 0 && (newRanges.length !== oldRanges.length || newRanges.some((range, i) => !Rectangle.equals(range, oldRanges[i]))) && mutations.push({
         type: "update",
         ruleId: rule.uid,
         oldRanges,
@@ -453,7 +872,8 @@ const _RuleMatrix = class _RuleMatrix {
         index: index - deleteIndex
       }), deleteIndex++);
     }), Array.from(additionRules).forEach((rule) => {
-      const newRanges = queryObjectMatrix(this.value, (ruleId) => ruleId === rule.uid);
+      var _a24;
+      const newRanges = (_a24 = this._map.get(rule.uid)) != null ? _a24 : [];
       mutations.push({
         type: "add",
         rule: {
@@ -464,13 +884,22 @@ 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._unitId,
+      this._subUnitId,
+      this._univerInstanceService,
+      // disable tree on cloned matrix, cause there is no need to search
+      !0
+    );
   }
   getValue(row, col) {
-    return this.value.getValue(row, col);
-  }
-  setValue(row, col, value) {
-    return this.value.setValue(row, col, value);
+    this._dirty && this._buildTree();
+    const tree = this._tree.get(col);
+    if (!tree)
+      return;
+    const result = tree.search([row, row]);
+    return result.length > 0 ? result[0] : void 0;
   }
 };
 __name(_RuleMatrix, "RuleMatrix");
@@ -479,18 +908,32 @@ var __defProp$i = Object.defineProperty, __getOwnPropDesc$i = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$i(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$i(target, key, result), result;
-}, "__decorateClass$i"), __decorateParam$i = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$i"), _a3;
-let SheetDataValidationModel = (_a3 = class extends Disposable {
-  constructor(_dataValidationModel, _univerInstanceService, _dataValidatorRegistryService, _dataValidationCacheService, _dataValidationFormulaService, _dataValidationCustomFormulaService) {
+}, "__decorateClass$i"), __decorateParam$i = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$i"), _a4;
+let SheetDataValidationModel = (_a4 = class extends Disposable {
+  constructor(_dataValidationModel, _univerInstanceService, _dataValidatorRegistryService, _dataValidationCacheService, _dataValidationFormulaService, _dataValidationCustomFormulaService, _commandService) {
     super();
     __publicField(this, "_ruleMatrixMap", /* @__PURE__ */ new Map());
     __publicField(this, "_validStatusChange$", new Subject());
     __publicField(this, "_ruleChange$", new Subject());
     __publicField(this, "ruleChange$", this._ruleChange$.asObservable());
     __publicField(this, "validStatusChange$", this._validStatusChange$.asObservable());
-    this._dataValidationModel = _dataValidationModel, this._univerInstanceService = _univerInstanceService, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._dataValidationCacheService = _dataValidationCacheService, this._dataValidationFormulaService = _dataValidationFormulaService, this._dataValidationCustomFormulaService = _dataValidationCustomFormulaService, this._initRuleUpdateListener(), this.disposeWithMe(() => {
+    this._dataValidationModel = _dataValidationModel, this._univerInstanceService = _univerInstanceService, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._dataValidationCacheService = _dataValidationCacheService, this._dataValidationFormulaService = _dataValidationFormulaService, this._dataValidationCustomFormulaService = _dataValidationCustomFormulaService, this._commandService = _commandService, this._initRuleUpdateListener(), this.disposeWithMe(() => {
       this._ruleChange$.complete(), this._validStatusChange$.complete();
-    });
+    }), this._initUniverInstanceListener();
+  }
+  _initUniverInstanceListener() {
+    this.disposeWithMe(
+      this._univerInstanceService.unitDisposed$.subscribe((unit) => {
+        this._ruleMatrixMap.delete(unit.getUnitId());
+      })
+    ), this.disposeWithMe(
+      this._commandService.onCommandExecuted((command) => {
+        if (command.id === RemoveSheetMutation.id) {
+          const { unitId, subUnitId } = command.params, subUnitMap = this._ruleMatrixMap.get(unitId);
+          subUnitMap && subUnitMap.delete(subUnitId);
+        }
+      })
+    );
   }
   _initRuleUpdateListener() {
     const allRules = this._dataValidationModel.getAll();
@@ -522,28 +965,21 @@ let SheetDataValidationModel = (_a3 = class extends Disposable {
   }
   _ensureRuleMatrix(unitId, subUnitId) {
     let unitMap = this._ruleMatrixMap.get(unitId);
-    const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
-    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;
+    return matrix || (matrix = new RuleMatrix(/* @__PURE__ */ new Map(), unitId, subUnitId, this._univerInstanceService), unitMap.set(subUnitId, matrix)), 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);
+    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);
@@ -631,7 +1067,7 @@ let SheetDataValidationModel = (_a3 = class extends Disposable {
   getAll() {
     return this._dataValidationModel.getAll();
   }
-}, __name(_a3, "SheetDataValidationModel"), _a3);
+}, __name(_a4, "SheetDataValidationModel"), _a4);
 SheetDataValidationModel = __decorateClass$i([
   OnLifecycle(LifecycleStages.Starting, SheetDataValidationModel),
   __decorateParam$i(0, Inject(DataValidationModel)),
@@ -639,7 +1075,8 @@ SheetDataValidationModel = __decorateClass$i([
   __decorateParam$i(2, Inject(DataValidatorRegistryService)),
   __decorateParam$i(3, Inject(DataValidationCacheService)),
   __decorateParam$i(4, Inject(DataValidationFormulaService)),
-  __decorateParam$i(5, Inject(DataValidationCustomFormulaService))
+  __decorateParam$i(5, Inject(DataValidationCustomFormulaService)),
+  __decorateParam$i(6, ICommandService)
 ], SheetDataValidationModel);
 function createDefaultNewRule(accessor) {
   const currentRanges = accessor.get(SheetsSelectionsService).getCurrentSelections().map((s) => s.range);
@@ -653,13 +1090,13 @@ function createDefaultNewRule(accessor) {
 }
 __name(createDefaultNewRule, "createDefaultNewRule");
 function getFormulaResult(result) {
-  var _a23, _b;
-  return (_b = (_a23 = result == null ? void 0 : result[0]) == null ? void 0 : _a23[0]) == null ? void 0 : _b.v;
+  var _a24, _b;
+  return (_b = (_a24 = result == null ? void 0 : result[0]) == null ? void 0 : _a24[0]) == null ? void 0 : _b.v;
 }
 __name(getFormulaResult, "getFormulaResult");
 function getFormulaCellData(result) {
-  var _a23;
-  return (_a23 = result == null ? void 0 : result[0]) == null ? void 0 : _a23[0];
+  var _a24;
+  return (_a24 = result == null ? void 0 : result[0]) == null ? void 0 : _a24[0];
 }
 __name(getFormulaCellData, "getFormulaCellData");
 var commonjsGlobal = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
@@ -692,12 +1129,12 @@ reactJsxRuntime_production_min.jsxs = q;
 jsxRuntime.exports = reactJsxRuntime_production_min;
 var jsxRuntimeExports = jsxRuntime.exports;
 function CustomFormulaInput(props) {
-  var _a23;
+  var _a24;
   const { unitId, subUnitId, value, onChange, showError, validResult } = props, formula1Res = showError ? validResult == null ? void 0 : validResult.formula1 : "";
   return /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { error: formula1Res, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
     TextEditor,
     {
-      value: (_a23 = value == null ? void 0 : value.formula1) != null ? _a23 : "",
+      value: (_a24 = value == null ? void 0 : value.formula1) != null ? _a24 : "",
       id: createInternalEditorID(`dataValidation-custom-formula-${unitId}-${subUnitId}`),
       onChange: /* @__PURE__ */ __name((newValue) => {
         onChange == null || onChange({
@@ -795,15 +1232,15 @@ function replaceRuntimeIdsAndExtInAttrs(node, runtimeProps, extend) {
   var attrs = __assign({}, node.attrs);
   extend != null && extend.colorChannel1 && attrs.fill === "colorChannel1" && (attrs.fill = extend.colorChannel1);
   var defIds = runtimeProps.defIds;
-  return !defIds || defIds.length === 0 || (node.tag === "use" && attrs["xlink:href"] && (attrs["xlink:href"] = attrs["xlink:href"] + runtimeProps.idSuffix), Object.entries(attrs).forEach(function(_a23) {
-    var key = _a23[0], value = _a23[1];
+  return !defIds || defIds.length === 0 || (node.tag === "use" && attrs["xlink:href"] && (attrs["xlink:href"] = attrs["xlink:href"] + runtimeProps.idSuffix), Object.entries(attrs).forEach(function(_a24) {
+    var key = _a24[0], value = _a24[1];
     typeof value == "string" && (attrs[key] = value.replace(/url\(#(.*)\)/, "url(#$1".concat(runtimeProps.idSuffix, ")")));
   })), attrs;
 }
 __name(replaceRuntimeIdsAndExtInAttrs, "replaceRuntimeIdsAndExtInAttrs");
 function replaceRuntimeIdsInDefs(node, runtimeProps) {
-  var _a23, defIds = runtimeProps.defIds;
-  return !defIds || defIds.length === 0 ? node : node.tag === "defs" && (!((_a23 = node.children) === null || _a23 === void 0) && _a23.length) ? __assign(__assign({}, node), { children: node.children.map(function(child) {
+  var _a24, defIds = runtimeProps.defIds;
+  return !defIds || defIds.length === 0 ? node : node.tag === "defs" && (!((_a24 = node.children) === null || _a24 === void 0) && _a24.length) ? __assign(__assign({}, node), { children: node.children.map(function(child) {
     return typeof child.attrs.id == "string" && defIds && defIds.indexOf(child.attrs.id) > -1 ? __assign(__assign({}, child), { attrs: __assign(__assign({}, child.attrs), { id: child.attrs.id + runtimeProps.idSuffix }) }) : child;
   }) }) : node;
 }
@@ -869,31 +1306,17 @@ var element = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width:
   }));
 });
 SequenceSingle.displayName = "SequenceSingle";
-function serializeListOptions(options) {
-  return options.filter(Boolean).join(",");
-}
-__name(serializeListOptions, "serializeListOptions");
-function deserializeListOptions(optionsStr) {
-  return optionsStr.split(",").filter(Boolean);
-}
-__name(deserializeListOptions, "deserializeListOptions");
-function getDataValidationCellValue(cellData) {
-  const cellValue = getCellValueOrigin(cellData);
-  return cellValue == null ? "" : cellValue.toString();
-}
-__name(getDataValidationCellValue, "getDataValidationCellValue");
-const DATA_VALIDATION_PLUGIN_NAME = "SHEET_DATA_VALIDATION_PLUGIN", DROP_DOWN_DEFAULT_COLOR = "#ECECEC";
 var P = /* @__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))(P || {}), __defProp$h = Object.defineProperty, __getOwnPropDesc$h = Object.getOwnPropertyDescriptor, __decorateClass$h = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$h(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$h(target, key, result), result;
-}, "__decorateClass$h"), __decorateParam$h = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$h"), _a4;
-let DataValidationFormulaController = (_a4 = class extends Disposable {
+}, "__decorateClass$h"), __decorateParam$h = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$h"), _a5;
+let DataValidationFormulaController = (_a5 = class extends Disposable {
   constructor(_univerInstanceService, _permissionService, _lexerTreeBuilder) {
     super(), this._univerInstanceService = _univerInstanceService, this._permissionService = _permissionService, this._lexerTreeBuilder = _lexerTreeBuilder;
   }
   getFormulaRefCheck(formulaString) {
-    var _a23, _b;
+    var _a24, _b;
     const sequenceNodes = this._lexerTreeBuilder.sequenceNodesBuilder(formulaString);
     if (!sequenceNodes)
       return !0;
@@ -915,20 +1338,33 @@ let DataValidationFormulaController = (_a4 = class extends Disposable {
       const { startRow, endRow, startColumn, endColumn } = sequenceGrid.range;
       for (let i2 = startRow; i2 <= endRow; i2++)
         for (let j = startColumn; j <= endColumn; j++) {
-          const permission = (_b = (_a23 = targetSheet.getCell(i2, j)) == null ? void 0 : _a23.selectionProtection) == null ? void 0 : _b[0];
+          const permission = (_b = (_a24 = targetSheet.getCell(i2, j)) == null ? void 0 : _a24.selectionProtection) == null ? void 0 : _b[0];
           if ((permission == null ? void 0 : permission[P.View]) === !1)
             return !1;
         }
     }
     return !0;
   }
-}, __name(_a4, "DataValidationFormulaController"), _a4);
+}, __name(_a5, "DataValidationFormulaController"), _a5);
 DataValidationFormulaController = __decorateClass$h([
   OnLifecycle(LifecycleStages.Rendered, DataValidationFormulaController),
   __decorateParam$h(0, IUniverInstanceService),
   __decorateParam$h(1, IPermissionService),
   __decorateParam$h(2, Inject(LexerTreeBuilder))
 ], DataValidationFormulaController);
+function serializeListOptions(options) {
+  return options.filter(Boolean).join(",");
+}
+__name(serializeListOptions, "serializeListOptions");
+function deserializeListOptions(optionsStr) {
+  return optionsStr.split(",").filter(Boolean);
+}
+__name(deserializeListOptions, "deserializeListOptions");
+function getDataValidationCellValue(cellData) {
+  const cellValue = getCellValueOrigin(cellData);
+  return cellValue == null ? "" : cellValue.toString();
+}
+__name(getDataValidationCellValue, "getDataValidationCellValue");
 const DEFAULT_COLOR_PRESET = [
   "#FFFFFF",
   "#FEE7E7",
@@ -1241,14 +1677,14 @@ var __defProp$g = Object.defineProperty, __getOwnPropDesc$g = Object.getOwnPrope
   return kind && result && __defProp$g(target, key, result), result;
 }, "__decorateClass$g"), __decorateParam$g = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$g");
 const MARGIN_H$2 = 6;
-var _a5;
-let CheckboxRender = (_a5 = class {
+var _a6;
+let CheckboxRender = (_a6 = class {
   constructor(_commandService, _formulaService, _themeService) {
     this._commandService = _commandService, this._formulaService = _formulaService, this._themeService = _themeService;
   }
   _calc(cellInfo, style) {
-    var _a23, _b, _c;
-    const { vt, ht } = style || {}, width = cellInfo.endX - cellInfo.startX - MARGIN_H$2 * 2, height = cellInfo.endY - cellInfo.startY, size = ((_a23 = style == null ? void 0 : style.fs) != null ? _a23 : 10) * 1.6;
+    var _a24, _b, _c;
+    const { vt, ht } = style || {}, width = cellInfo.endX - cellInfo.startX - MARGIN_H$2 * 2, height = cellInfo.endY - cellInfo.startY, size = ((_a24 = style == null ? void 0 : style.fs) != null ? _a24 : 10) * 1.6;
     let widgetLeft = 0, widgetTop = 0;
     switch (vt) {
       case VerticalAlign.TOP:
@@ -1280,25 +1716,25 @@ let CheckboxRender = (_a5 = class {
     };
   }
   calcCellAutoHeight(info) {
-    var _a23;
+    var _a24;
     const { style } = info;
-    return ((_a23 = style == null ? void 0 : style.fs) != null ? _a23 : 10) * 1.6;
+    return ((_a24 = style == null ? void 0 : style.fs) != null ? _a24 : 10) * 1.6;
   }
   async _parseFormula(rule, unitId, subUnitId) {
-    var _a23, _b;
+    var _a24, _b;
     const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);
     return {
-      formula1: isFormulaString(formula1) ? getFormulaResult((_a23 = results == null ? void 0 : results[0]) == null ? void 0 : _a23.result) : formula1,
+      formula1: isFormulaString(formula1) ? getFormulaResult((_a24 = results == null ? void 0 : results[0]) == null ? void 0 : _a24.result) : formula1,
       formula2: isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2
     };
   }
   drawWith(ctx, info) {
-    var _a23, _b, _c, _d, _e;
-    const { style, data, primaryWithCoord, unitId, subUnitId, worksheet, row, col } = info, cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, value = getCellValueOrigin(worksheet.getCellRaw(row, col)), rule = (_a23 = data.dataValidation) == null ? void 0 : _a23.rule, validator = (_b = data.dataValidation) == null ? void 0 : _b.validator;
+    var _a24, _b, _c, _d, _e, _f;
+    const { style, data, primaryWithCoord, unitId, subUnitId, worksheet, row, col } = info, cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, value = getCellValueOrigin(worksheet.getCellRaw(row, col)), rule = (_a24 = data.dataValidation) == null ? void 0 : _a24.rule, validator = (_b = data.dataValidation) == null ? void 0 : _b.validator;
     if (!rule || !validator)
       return;
     const colors = this._themeService.getCurrentTheme();
-    if (!validator.skipDefaultFontRender(rule, value, { unitId, subUnitId }))
+    if (!((_c = validator.skipDefaultFontRender) != null && _c.call(validator, rule, value, { unitId, subUnitId })))
       return;
     const result = validator.parseFormulaSync(rule, unitId, subUnitId), { formula1 } = result, layout = this._calc(cellBounding, style), { a: scaleX, d: scaleY } = ctx.getTransform(), left = fixLineWidthByScale(layout.left, scaleX), top = fixLineWidthByScale(layout.top, scaleY), transform = Transform.create().composeMatrix({
       left,
@@ -1314,12 +1750,12 @@ let CheckboxRender = (_a5 = class {
     ctx.save(), ctx.beginPath(), ctx.rect(cellBounding.startX, cellBounding.startY, cellWidth, cellHeight), ctx.clip();
     const m2 = transform.getMatrix();
     ctx.transform(m2[0], m2[1], m2[2], m2[3], m2[4], m2[5]);
-    const size = ((_c = style == null ? void 0 : style.fs) != null ? _c : 10) * 1.6, checked = String(value) === String(formula1), defaultColor = colors.hyacinth500;
+    const size = ((_d = style == null ? void 0 : style.fs) != null ? _d : 10) * 1.6, checked = String(value) === String(formula1), defaultColor = colors.hyacinth500;
     Checkbox$1.drawWith(ctx, {
       checked,
       width: size,
       height: size,
-      fill: (_e = (_d = style == null ? void 0 : style.cl) == null ? void 0 : _d.rgb) != null ? _e : defaultColor
+      fill: (_f = (_e = style == null ? void 0 : style.cl) == null ? void 0 : _e.rgb) != null ? _f : defaultColor
     }), ctx.restore();
   }
   isHit(evt, info) {
@@ -1327,11 +1763,11 @@ let CheckboxRender = (_a5 = class {
     return offsetX <= endX && offsetX >= startX && offsetY <= endY && offsetY >= startY;
   }
   async onPointerDown(info, evt) {
-    var _a23, _b;
+    var _a24, _b, _c;
     if (evt.button === 2)
       return;
-    const { primaryWithCoord, unitId, subUnitId, data, worksheet, row, col } = info, value = getCellValueOrigin(worksheet.getCellRaw(row, col)), rule = (_a23 = data.dataValidation) == null ? void 0 : _a23.rule, validator = (_b = data.dataValidation) == null ? void 0 : _b.validator;
-    if (!rule || !validator || !validator.skipDefaultFontRender(rule, value, { unitId, subUnitId }))
+    const { primaryWithCoord, unitId, subUnitId, data, worksheet, row, col } = info, value = getCellValueOrigin(worksheet.getCellRaw(row, col)), rule = (_a24 = data.dataValidation) == null ? void 0 : _a24.rule, validator = (_b = data.dataValidation) == null ? void 0 : _b.validator;
+    if (!rule || !validator || !((_c = validator.skipDefaultFontRender) != null && _c.call(validator, rule, value, { unitId, subUnitId })))
       return;
     const { formula1, formula2 } = await this._parseFormula(rule, unitId, subUnitId), params = {
       range: {
@@ -1350,7 +1786,7 @@ let CheckboxRender = (_a5 = class {
       params
     );
   }
-}, __name(_a5, "CheckboxRender"), _a5);
+}, __name(_a6, "CheckboxRender"), _a6);
 CheckboxRender = __decorateClass$g([
   __decorateParam$g(0, ICommandService),
   __decorateParam$g(1, Inject(DataValidationFormulaService)),
@@ -1371,10 +1807,10 @@ const transformCheckboxValue = /* @__PURE__ */ __name((value) => Tools.isDefine(
     __publicField(this, "formulaInput", CHECKBOX_FORMULA_INPUT_NAME);
     __publicField(this, "canvasRender", this.injector.createInstance(CheckboxRender));
     __publicField(this, "_formulaService", this.injector.get(DataValidationFormulaService));
-  }
-  skipDefaultFontRender(rule, cellValue, pos) {
-    const { formula1, formula2 } = this.parseFormulaSync(rule, pos.unitId, pos.subUnitId), valueStr = `${cellValue != null ? cellValue : ""}`;
-    return !valueStr || valueStr === `${formula1}` || valueStr === `${formula2}`;
+    __publicField(this, "skipDefaultFontRender", /* @__PURE__ */ __name((rule, cellValue, pos) => {
+      const { formula1, formula2 } = this.parseFormulaSync(rule, pos.unitId, pos.subUnitId), valueStr = `${cellValue != null ? cellValue : ""}`;
+      return !valueStr || valueStr === `${formula1}` || valueStr === `${formula2}`;
+    }, "skipDefaultFontRender"));
   }
   validatorFormula(rule, unitId, subUnitId) {
     const { formula1, formula2 } = rule, isEqual = formula1 === formula2;
@@ -1396,8 +1832,8 @@ const transformCheckboxValue = /* @__PURE__ */ __name((value) => Tools.isDefine(
     };
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a23, _b;
-    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(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;
+    var _a24, _b;
+    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), originFormula1 = isFormulaString(formula1) ? getFormulaResult((_a24 = results == null ? void 0 : results[0]) == null ? void 0 : _a24.result) : formula1, originFormula2 = isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2;
     return {
       formula1: transformCheckboxValue(originFormula1),
       formula2: transformCheckboxValue(originFormula2),
@@ -1405,9 +1841,14 @@ 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;
+    var _a24, _b;
+    const { formula1 = CHECKBOX_FORMULA_1, formula2 = CHECKBOX_FORMULA_2 } = rule, results = this._formulaService.getRuleFormulaResultSync(unitId, subUnitId, rule.uid), originFormula1 = isFormulaString(formula1) ? getFormulaResult((_a24 = results == null ? void 0 : results[0]) == null ? void 0 : _a24.result) : formula1, originFormula2 = isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2;
     return {
       formula1: transformCheckboxValue(originFormula1),
       formula2: transformCheckboxValue(originFormula2),
@@ -1458,430 +1899,255 @@ const DateOperatorTitleMap = {
   DataValidationOperator.BETWEEN,
   DataValidationOperator.NOT_BETWEEN
 ];
+var utc$1 = { exports: {} };
+(function(module, exports) {
+  (function(t, i) {
+    module.exports = i();
+  })(commonjsGlobal, function() {
+    var t = "minute", i = /[+-]\d\d(?::?\d\d)?/g, e = /([+-]|\d\d)/g;
+    return function(s, f2, n2) {
+      var u = f2.prototype;
+      n2.utc = function(t2) {
+        var i2 = { date: t2, utc: !0, args: arguments };
+        return new f2(i2);
+      }, u.utc = function(i2) {
+        var e2 = n2(this.toDate(), { locale: this.$L, utc: !0 });
+        return i2 ? e2.add(this.utcOffset(), t) : e2;
+      }, u.local = function() {
+        return n2(this.toDate(), { locale: this.$L, utc: !1 });
+      };
+      var o = u.parse;
+      u.parse = function(t2) {
+        t2.utc && (this.$u = !0), this.$utils().u(t2.$offset) || (this.$offset = t2.$offset), o.call(this, t2);
+      };
+      var r = u.init;
+      u.init = function() {
+        if (this.$u) {
+          var t2 = this.$d;
+          this.$y = t2.getUTCFullYear(), this.$M = t2.getUTCMonth(), this.$D = t2.getUTCDate(), this.$W = t2.getUTCDay(), this.$H = t2.getUTCHours(), this.$m = t2.getUTCMinutes(), this.$s = t2.getUTCSeconds(), this.$ms = t2.getUTCMilliseconds();
+        } else r.call(this);
+      };
+      var a = u.utcOffset;
+      u.utcOffset = function(s2, f3) {
+        var n3 = this.$utils().u;
+        if (n3(s2)) return this.$u ? 0 : n3(this.$offset) ? a.call(this) : this.$offset;
+        if (typeof s2 == "string" && (s2 = function(t2) {
+          t2 === void 0 && (t2 = "");
+          var s3 = t2.match(i);
+          if (!s3) return null;
+          var f4 = ("" + s3[0]).match(e) || ["-", 0, 0], n4 = f4[0], u3 = 60 * +f4[1] + +f4[2];
+          return u3 === 0 ? 0 : n4 === "+" ? u3 : -u3;
+        }(s2), s2 === null)) return this;
+        var u2 = Math.abs(s2) <= 16 ? 60 * s2 : s2, o2 = this;
+        if (f3) return o2.$offset = u2, o2.$u = s2 === 0, o2;
+        if (s2 !== 0) {
+          var r2 = this.$u ? this.toDate().getTimezoneOffset() : -1 * this.utcOffset();
+          (o2 = this.local().add(u2 + r2, t)).$offset = u2, o2.$x.$localOffset = r2;
+        } else o2 = this.utc();
+        return o2;
+      };
+      var h = u.format;
+      u.format = function(t2) {
+        var i2 = t2 || (this.$u ? "YYYY-MM-DDTHH:mm:ss[Z]" : "");
+        return h.call(this, i2);
+      }, u.valueOf = function() {
+        var t2 = this.$utils().u(this.$offset) ? 0 : this.$offset + (this.$x.$localOffset || this.$d.getTimezoneOffset());
+        return this.$d.valueOf() - 6e4 * t2;
+      }, u.isUTC = function() {
+        return !!this.$u;
+      }, u.toISOString = function() {
+        return this.toDate().toISOString();
+      }, u.toString = function() {
+        return this.toDate().toUTCString();
+      };
+      var l2 = u.toDate;
+      u.toDate = function(t2) {
+        return t2 === "s" && this.$offset ? n2(this.format("YYYY-MM-DD HH:mm:ss:SSS")).toDate() : l2.call(this);
+      };
+      var c = u.diff;
+      u.diff = function(t2, i2, e2) {
+        if (t2 && this.$u === t2.$u) return c.call(this, t2, i2, e2);
+        var s2 = this.local(), f3 = n2(t2).local();
+        return c.call(s2, f3, i2, e2);
+      };
+    };
+  });
+})(utc$1);
+var utcExports = utc$1.exports;
+const utc = /* @__PURE__ */ getDefaultExportFromCjs(utcExports);
 var __defProp$f = Object.defineProperty, __getOwnPropDesc$f = Object.getOwnPropertyDescriptor, __decorateClass$f = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$f(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$f(target, key, result), result;
-}, "__decorateClass$f"), __decorateParam$f = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$f"), _a6;
-let DataValidationPanelService = (_a6 = class extends Disposable {
-  constructor(_univerInstanceService, _sidebarService) {
-    super();
-    __publicField(this, "_open$", new BehaviorSubject(!1));
-    __publicField(this, "open$", this._open$.pipe(distinctUntilChanged()));
-    __publicField(this, "_activeRule");
-    __publicField(this, "_activeRule$", new BehaviorSubject(void 0));
-    __publicField(this, "activeRule$", this._activeRule$.asObservable());
-    __publicField(this, "_closeDisposable", null);
-    this._univerInstanceService = _univerInstanceService, this._sidebarService = _sidebarService, this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(filter((sheet) => !sheet)).subscribe(() => {
-        this.close();
-      })
-    );
-  }
-  get activeRule() {
-    return this._activeRule;
-  }
-  get isOpen() {
-    return this._open$.getValue();
-  }
-  dispose() {
-    var _a23;
-    super.dispose(), this._open$.next(!1), this._open$.complete(), this._activeRule$.complete(), (_a23 = this._closeDisposable) == null || _a23.dispose();
-  }
-  open() {
-    this._open$.next(!0);
-  }
-  close() {
-    var _a23;
-    this._open$.next(!1), (_a23 = this._closeDisposable) == null || _a23.dispose();
-  }
-  setCloseDisposable(disposable) {
-    this._closeDisposable = toDisposable(() => {
-      disposable.dispose(), this._closeDisposable = null;
-    });
-  }
-  setActiveRule(rule) {
-    this._activeRule = rule, this._activeRule$.next(rule);
+}, "__decorateClass$f"), __decorateParam$f = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$f"), _a7;
+let DataValidationRejectInputController = (_a7 = class extends Disposable {
+  constructor(_editorBridgeService, _dataValidationModel, _dataValidatorRegistryService, _dialogService, _localeService) {
+    super(), this._editorBridgeService = _editorBridgeService, this._dataValidationModel = _dataValidationModel, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._dialogService = _dialogService, this._localeService = _localeService, this._initEditorBridgeInterceptor();
   }
-}, __name(_a6, "DataValidationPanelService"), _a6);
-DataValidationPanelService = __decorateClass$f([
-  __decorateParam$f(0, IUniverInstanceService),
-  __decorateParam$f(1, ISidebarService)
-], DataValidationPanelService);
-const dataValidationOptionsButton = "univer-data-validation-options-button", dataValidationOptionsButtonIcon = "univer-data-validation-options-button-icon", styles$5 = {
-  dataValidationOptionsButton,
-  dataValidationOptionsButtonIcon
-};
-function DataValidationOptions(props) {
-  var _a23;
-  const localeService = useDependency(LocaleService), componentManager = useDependency(ComponentManager), { value, onChange, extraComponent } = props, [show, setShow] = useState(!1), ExtraOptions = extraComponent ? componentManager.get(extraComponent) : null;
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
-    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$5.dataValidationOptionsButton, onClick: /* @__PURE__ */ __name(() => setShow(!show), "onClick"), children: [
-      localeService.t("dataValidation.panel.options"),
-      show ? /* @__PURE__ */ jsxRuntimeExports.jsx(MoreUpSingle, { className: styles$5.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ jsxRuntimeExports.jsx(MoreDownSingle, { className: styles$5.dataValidationOptionsButtonIcon })
-    ] }),
-    show && /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
-      ExtraOptions ? /* @__PURE__ */ jsxRuntimeExports.jsx(ExtraOptions, { value, onChange }) : null,
-      /* @__PURE__ */ jsxRuntimeExports.jsx(
-        FormLayout,
-        {
-          label: localeService.t("dataValidation.panel.invalid"),
-          children: /* @__PURE__ */ jsxRuntimeExports.jsxs(
-            RadioGroup,
+  _initEditorBridgeInterceptor() {
+    this._editorBridgeService.interceptor.intercept(
+      this._editorBridgeService.interceptor.getInterceptPoints().AFTER_CELL_EDIT_ASYNC,
+      {
+        handler: /* @__PURE__ */ __name(async (cellPromise, context, next) => {
+          var _a24;
+          const cell = await cellPromise, { worksheet, row, col, unitId, subUnitId, workbook } = context, ruleId = this._dataValidationModel.getRuleIdByLocation(unitId, subUnitId, row, col), rule = ruleId ? this._dataValidationModel.getRuleById(unitId, subUnitId, ruleId) : void 0;
+          if (!rule || rule.errorStyle !== DataValidationErrorStyle.STOP)
+            return next(Promise.resolve(cell));
+          const validator = await this._dataValidatorRegistryService.getValidatorItem(rule.type);
+          if (!validator || await validator.validator(
             {
-              value: `${(_a23 = value.errorStyle) != null ? _a23 : DataValidationErrorStyle.WARNING}`,
-              onChange: /* @__PURE__ */ __name((errorStyle) => onChange({ ...value, errorStyle: +errorStyle }), "onChange"),
-              children: [
-                /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationErrorStyle.WARNING}`, children: localeService.t("dataValidation.panel.showWarning") }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationErrorStyle.STOP}`, children: localeService.t("dataValidation.panel.rejectInput") })
-              ]
-            }
-          )
-        }
-      ),
-      /* @__PURE__ */ jsxRuntimeExports.jsx(
-        FormLayout,
-        {
-          label: localeService.t("dataValidation.panel.messageInfo"),
-          children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-            Checkbox,
-            {
-              checked: value.showErrorMessage,
-              onChange: /* @__PURE__ */ __name(() => onChange({
-                ...value,
-                showErrorMessage: !value.showErrorMessage
-              }), "onChange"),
-              children: localeService.t("dataValidation.panel.showInfo")
-            }
-          )
-        }
-      ),
-      value.showErrorMessage ? /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(Input, { value: value.error, onChange: /* @__PURE__ */ __name((error) => onChange({ ...value, error }), "onChange") }) }) : null
-    ] })
-  ] });
-}
-__name(DataValidationOptions, "DataValidationOptions");
-const dataValidationDetailFormItem = "univer-data-validation-detail-form-item", dataValidationDetailButtons = "univer-data-validation-detail-buttons", dataValidationDetailButton = "univer-data-validation-detail-button", styles$4 = {
-  dataValidationDetailFormItem,
-  dataValidationDetailButtons,
-  dataValidationDetailButton
-}, debounceExecuteFactory = /* @__PURE__ */ __name((commandService) => debounce(
-  async (id, params, options, callback) => {
-    const res = await commandService.executeCommand(id, params, options);
-    callback == null || callback(res);
-  },
-  1e3
-), "debounceExecuteFactory");
-function DataValidationDetail() {
-  const [key, setKey] = useState(0), dataValidationPanelService = useDependency(DataValidationPanelService), activeRuleInfo = useObservable(dataValidationPanelService.activeRule$, dataValidationPanelService.activeRule), { unitId, subUnitId, rule } = activeRuleInfo || {}, ruleId = rule.uid, validatorService = useDependency(DataValidatorRegistryService), componentManager = useDependency(ComponentManager), commandService = useDependency(ICommandService), dataValidationModel = useDependency(DataValidationModel), localeService = useDependency(LocaleService), [localRule, setLocalRule] = useState(rule), validator = validatorService.getValidatorItem(localRule.type), [showError, setShowError] = useState(!1), validators = validatorService.getValidatorsByScope(DataValidatorRegistryScope.SHEET), [localRanges, setLocalRanges] = useState(() => localRule.ranges.map((i) => ({ unitId: "", sheetId: "", range: i }))), debounceExecute = useMemo(() => debounceExecuteFactory(commandService), [commandService]);
-  if (useEffect(() => {
-    commandService.onCommandExecuted((commandInfo) => {
-      (commandInfo.id === UndoCommand.id || commandInfo.id === RedoCommand.id) && setTimeout(() => {
-        const activeRule = dataValidationModel.getRuleById(unitId, subUnitId, ruleId);
-        setKey((k2) => k2 + 1), activeRule && (setLocalRule(activeRule), setLocalRanges(activeRule.ranges.map((i) => ({ unitId: "", sheetId: "", range: i }))));
-      }, 20);
+              value: getCellValueOrigin(cell),
+              interceptValue: getCellValueOrigin((_a24 = context == null ? void 0 : context.origin) != null ? _a24 : cell),
+              row,
+              column: col,
+              unitId,
+              subUnitId,
+              worksheet,
+              workbook,
+              t: cell == null ? void 0 : cell.t
+            },
+            rule
+          ))
+            return next(Promise.resolve(cell));
+          const oldCell = worksheet.getCellRaw(row, col);
+          return this._dialogService.open({
+            width: 368,
+            title: {
+              title: this._localeService.t("dataValidation.alert.title")
+            },
+            id: "reject-input-dialog",
+            children: {
+              title: validator.getRuleFinalError(rule)
+            },
+            footer: {
+              title: React.createElement(
+                Button,
+                {
+                  type: "primary",
+                  onClick: /* @__PURE__ */ __name(() => this._dialogService.close("reject-input-dialog"), "onClick")
+                },
+                this._localeService.t("dataValidation.alert.ok")
+              )
+            },
+            onClose: /* @__PURE__ */ __name(() => {
+              this._dialogService.close("reject-input-dialog");
+            }, "onClose")
+          }), next(Promise.resolve(oldCell));
+        }, "handler")
+      }
+    );
+  }
+  showReject(title) {
+    this._dialogService.open({
+      width: 368,
+      title: {
+        title: this._localeService.t("dataValidation.alert.title")
+      },
+      id: "reject-input-dialog",
+      children: {
+        title
+      },
+      footer: {
+        title: React.createElement(
+          Button,
+          {
+            type: "primary",
+            onClick: /* @__PURE__ */ __name(() => this._dialogService.close("reject-input-dialog"), "onClick")
+          },
+          this._localeService.t("dataValidation.alert.ok")
+        )
+      },
+      onClose: /* @__PURE__ */ __name(() => {
+        this._dialogService.close("reject-input-dialog");
+      }, "onClose")
     });
-  }, [commandService, dataValidationModel, ruleId, subUnitId, unitId]), !validator)
-    return null;
-  const operators = validator.operators, operatorNames = validator.operatorNames, isTwoFormula = localRule.operator ? TWO_FORMULA_OPERATOR_COUNT$1.includes(localRule.operator) : !1, handleOk = /* @__PURE__ */ __name(() => {
-    localRule.ranges.length && (validator.validatorFormula(localRule, unitId, subUnitId).success ? dataValidationPanelService.setActiveRule(null) : setShowError(!0));
-  }, "handleOk"), handleUpdateRuleRanges = useEvent((unitRanges) => {
-    if (isUnitRangesEqual(unitRanges, localRanges))
-      return;
-    setLocalRanges(unitRanges);
-    const ranges = unitRanges.filter((i) => (!i.unitId || i.unitId === unitId) && (!i.sheetId || i.sheetId === subUnitId)).map((i) => i.range);
-    if (setLocalRule({
-      ...localRule,
-      ranges
-    }), ranges.length === 0)
-      return;
-    const params = {
-      unitId,
-      subUnitId,
-      ruleId,
-      ranges
-    };
-    debounceExecute(UpdateSheetDataValidationRangeCommand.id, params);
-  }), handleUpdateRuleSetting = /* @__PURE__ */ __name((setting) => {
-    if (shallowEqual(setting, getRuleSetting(localRule)))
+  }
+}, __name(_a7, "DataValidationRejectInputController"), _a7);
+DataValidationRejectInputController = __decorateClass$f([
+  OnLifecycle(LifecycleStages.Ready, DataValidationRejectInputController),
+  __decorateParam$f(0, IEditorBridgeService),
+  __decorateParam$f(1, Inject(SheetDataValidationModel)),
+  __decorateParam$f(2, Inject(DataValidatorRegistryService)),
+  __decorateParam$f(3, IDialogService),
+  __decorateParam$f(4, Inject(LocaleService))
+], DataValidationRejectInputController);
+const dvDateDropdown = "univer-dv-date-dropdown", dvDateDropdownBtns = "univer-dv-date-dropdown-btns", styles$5 = {
+  dvDateDropdown,
+  dvDateDropdownBtns
+};
+dayjs.extend(utc);
+const transformDate = /* @__PURE__ */ __name((value) => {
+  if (value == null || typeof value == "boolean")
+    return;
+  if (typeof value == "number" || !Number.isNaN(+value))
+    return dayjs(numfmt.format("yyyy-MM-dd HH:mm:ss", Number(value)));
+  const date = dayjs(value);
+  if (date.isValid())
+    return date;
+}, "transformDate");
+function DateDropdown(props) {
+  var _a24, _b, _c;
+  const { location, hideFn } = props, { worksheet, row, col, unitId, subUnitId, workbook } = location, commandService = useDependency(ICommandService), rejectInputController = useDependency(DataValidationRejectInputController), cellData = worksheet.getCell(row, col), rule = (_a24 = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _a24.rule, validator = (_b = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _b.validator, cellStr = getCellValueOrigin(worksheet.getCellRaw(row, col)), originDate = transformDate(cellStr), [localDate, setLocalDate] = useState(originDate), showTime = !!((_c = rule == null ? void 0 : rule.bizInfo) != null && _c.showTime), date = localDate && localDate.isValid() ? localDate : dayjs(), localeService = useDependency(LocaleService);
+  if (!cellData || !rule || !validator)
+    return;
+  const handleSave = /* @__PURE__ */ __name(async () => {
+    var _a25, _b2, _c2;
+    if (!date)
       return;
-    setLocalRule({
-      ...localRule,
-      ...setting
-    });
-    const params = {
+    const dateStr = date.format(showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), serialTime = (_a25 = numfmt.parseDate(dateStr)) == null ? void 0 : _a25.v, cellStyle = workbook.getStyles().getStyleByCell(cellData), format = (_c2 = (_b2 = cellStyle == null ? void 0 : cellStyle.n) == null ? void 0 : _b2.pattern) != null ? _c2 : "", patternType = getPatternType(format);
+    rule.errorStyle !== DataValidationErrorStyle.STOP || await validator.validator({
+      value: serialTime,
       unitId,
       subUnitId,
-      ruleId,
-      setting
-    };
-    debounceExecute(
-      UpdateSheetDataValidationSettingCommand.id,
-      params,
-      void 0
-    );
-  }, "handleUpdateRuleSetting"), handleDelete = /* @__PURE__ */ __name(async () => {
-    await commandService.executeCommand(RemoveSheetDataValidationCommand.id, {
-      ruleId,
-      unitId,
-      subUnitId
-    }), dataValidationPanelService.setActiveRule(null);
-  }, "handleDelete"), baseRule = {
-    type: localRule.type,
-    operator: localRule.operator,
-    formula1: localRule.formula1,
-    formula2: localRule.formula2,
-    allowBlank: localRule.allowBlank
-  }, handleChangeType = /* @__PURE__ */ __name((newType) => {
-    const validator2 = validatorService.getValidatorItem(newType);
-    if (!validator2)
-      return;
-    const operators2 = validator2.operators, rule2 = dataValidationModel.getRuleById(unitId, subUnitId, ruleId), newRule = newType === (rule2 == null ? void 0 : rule2.type) || newType.includes("list") && (rule2 != null && rule2.type.includes("list")) ? {
-      ...rule2,
-      type: newType
-    } : {
-      ...localRule,
-      type: newType,
-      operator: operators2[0],
-      formula1: void 0,
-      formula2: void 0
-    };
-    setLocalRule(newRule), commandService.executeCommand(UpdateSheetDataValidationSettingCommand.id, {
+      row,
+      column: col,
+      worksheet,
+      workbook,
+      interceptValue: dateStr.replace("Z", "").replace("T", " "),
+      t: CellValueType.NUMBER
+    }, rule) ? (commandService.executeCommand(SetRangeValuesCommand.id, {
       unitId,
       subUnitId,
-      ruleId: localRule.uid,
-      setting: getRuleSetting(newRule)
-    });
-  }, "handleChangeType"), FormulaInput = componentManager.get(validator.formulaInput), rangeStr = useMemo(() => localRanges.map((i) => serializeRange(i.range)).join(","), []), options = getRuleOptions(localRule), handleUpdateRuleOptions = /* @__PURE__ */ __name((newOptions) => {
-    shallowEqual(newOptions, getRuleOptions(localRule)) || (setLocalRule({
-      ...localRule,
-      ...newOptions
-    }), debounceExecute(
-      UpdateSheetDataValidationOptionsCommand.id,
-      {
-        unitId,
-        subUnitId,
-        ruleId,
-        options: newOptions
+      range: {
+        startColumn: col,
+        endColumn: col,
+        startRow: row,
+        endRow: row
+      },
+      value: {
+        v: serialTime,
+        t: 2,
+        p: null,
+        f: null,
+        si: null,
+        s: {
+          n: {
+            pattern: showTime ? patternType === "datetime" ? format : "yyyy-MM-dd hh:mm:ss" : patternType === "date" ? format : "yyyy-MM-dd"
+          }
+        }
       }
-    ));
-  }, "handleUpdateRuleOptions");
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
+    }), hideFn()) : rejectInputController.showReject(validator.getRuleFinalError(rule));
+  }, "handleSave");
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$5.dvDateDropdown, children: [
     /* @__PURE__ */ jsxRuntimeExports.jsx(
-      FormLayout,
+      DatePanel,
       {
-        label: localeService.t("dataValidation.panel.range"),
-        error: localRule.ranges.length ? "" : localeService.t("dataValidation.panel.rangeError"),
-        children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-          RangeSelector,
-          {
-            className: styles$4.dataValidationDetailFormItem,
-            value: rangeStr,
-            id: createInternalEditorID("data-validation-detail"),
-            openForSheetUnitId: unitId,
-            openForSheetSubUnitId: subUnitId,
-            onChange: /* @__PURE__ */ __name((newRange) => {
-              newRange.some((i) => !isValidRange(i.range) || i.range.endColumn < i.range.startColumn || i.range.endRow < i.range.startRow) || handleUpdateRuleRanges(newRange);
-            }, "onChange")
-          },
-          key
-        )
+        defaultValue: date,
+        pickerValue: date,
+        showTime: showTime || void 0,
+        onSelect: /* @__PURE__ */ __name(async (newValue) => {
+          setLocalDate(newValue);
+        }, "onSelect"),
+        onPanelChange: /* @__PURE__ */ __name((value) => {
+          setLocalDate(value);
+        }, "onPanelChange"),
+        disabledDate: /* @__PURE__ */ __name((current) => !numfmt.parseDate(current.format("YYYY-MM-DD")), "disabledDate")
       }
     ),
-    /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { label: localeService.t("dataValidation.panel.type"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-      Select,
-      {
-        options: validators == null ? void 0 : validators.map((validator2) => ({
-          label: localeService.t(validator2.title),
-          value: validator2.id
-        })),
-        value: localRule.type,
-        onChange: handleChangeType,
-        className: styles$4.dataValidationDetailFormItem
-      }
-    ) }),
-    operators != null && operators.length ? /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { label: localeService.t("dataValidation.panel.operator"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-      Select,
-      {
-        options: operators.map((op, i) => ({
-          value: `${op}`,
-          label: operatorNames[i]
-        })),
-        value: `${localRule.operator}`,
-        onChange: /* @__PURE__ */ __name((operator) => {
-          handleUpdateRuleSetting({
-            ...baseRule,
-            operator
-          });
-        }, "onChange"),
-        className: styles$4.dataValidationDetailFormItem
-      }
-    ) }) : null,
-    FormulaInput ? /* @__PURE__ */ jsxRuntimeExports.jsx(
-      FormulaInput,
-      {
-        isTwoFormula,
-        value: {
-          formula1: localRule.formula1,
-          formula2: localRule.formula2
-        },
-        onChange: /* @__PURE__ */ __name((value) => {
-          handleUpdateRuleSetting({
-            ...baseRule,
-            ...value
-          });
-        }, "onChange"),
-        showError,
-        validResult: validator.validatorFormula(localRule, unitId, subUnitId),
-        unitId,
-        subUnitId,
-        ruleId
-      },
-      key + localRule.type
-    ) : null,
-    /* @__PURE__ */ jsxRuntimeExports.jsx(DataValidationOptions, { value: options, onChange: handleUpdateRuleOptions, extraComponent: validator.optionsInput }),
-    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$4.dataValidationDetailButtons, children: [
-      /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { className: styles$4.dataValidationDetailButton, onClick: handleDelete, children: localeService.t("dataValidation.panel.removeRule") }),
-      /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { className: styles$4.dataValidationDetailButton, type: "primary", onClick: handleOk, children: localeService.t("dataValidation.panel.done") })
-    ] })
-  ] });
-}
-__name(DataValidationDetail, "DataValidationDetail");
-const dataValidationItemContainer = "univer-data-validation-item-container", dataValidationItemTitle = "univer-data-validation-item-title", dataValidationItemContent = "univer-data-validation-item-content", dataValidationItemIcon = "univer-data-validation-item-icon", styles$3 = {
-  dataValidationItemContainer,
-  dataValidationItemTitle,
-  dataValidationItemContent,
-  dataValidationItemIcon
-}, DataValidationItem = /* @__PURE__ */ __name((props) => {
-  const { rule, onClick, unitId, subUnitId, disable } = props, validatorRegistry = useDependency(DataValidatorRegistryService), commandService = useDependency(ICommandService), markSelectionService = useDependency(IMarkSelectionService), validator = validatorRegistry.getValidatorItem(rule.type), ids = useRef(), [isHover, setIsHover] = useState(!1), handleDelete = /* @__PURE__ */ __name((e) => {
-    commandService.executeCommand(RemoveSheetDataValidationCommand.id, {
-      ruleId: rule.uid,
-      unitId,
-      subUnitId
-    }), e.stopPropagation();
-  }, "handleDelete");
-  return useEffect(() => () => {
-    var _a23;
-    ids.current && ((_a23 = ids.current) == null || _a23.forEach((id) => {
-      id && markSelectionService.removeShape(id);
-    }));
-  }, [markSelectionService]), /* @__PURE__ */ jsxRuntimeExports.jsxs(
-    "div",
-    {
-      className: styles$3.dataValidationItemContainer,
-      onClick,
-      onMouseEnter: /* @__PURE__ */ __name(() => {
-        disable || (setIsHover(!0), ids.current = rule.ranges.map((range) => markSelectionService.addShape({
-          range,
-          style: {
-            hasAutoFill: !1,
-            fill: "rgba(73, 184, 17, 0.05)",
-            strokeWidth: 1,
-            stroke: "#49B811",
-            widgets: {}
-          },
-          primary: {
-            startColumn: range.startColumn,
-            endColumn: range.endColumn,
-            startRow: range.startRow,
-            endRow: range.endRow,
-            actualRow: range.startRow,
-            actualColumn: range.startColumn,
-            isMerged: !1,
-            isMergedMainCell: !1
-          }
-        })));
-      }, "onMouseEnter"),
-      onMouseLeave: /* @__PURE__ */ __name(() => {
-        var _a23;
-        setIsHover(!1), (_a23 = ids.current) == null || _a23.forEach((id) => {
-          id && markSelectionService.removeShape(id);
-        }), ids.current = void 0;
-      }, "onMouseLeave"),
-      children: [
-        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$3.dataValidationItemTitle, children: validator == null ? void 0 : validator.generateRuleName(rule) }),
-        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$3.dataValidationItemContent, children: rule.ranges.map((range) => serializeRange(range)).join(",") }),
-        isHover ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$3.dataValidationItemIcon, onClick: handleDelete, children: /* @__PURE__ */ jsxRuntimeExports.jsx(DeleteSingle, {}) }) : null
-      ]
-    }
-  );
-}, "DataValidationItem"), dataValidationListButtons = "univer-data-validation-list-buttons", dataValidationListButton = "univer-data-validation-list-button", styles$2 = {
-  dataValidationListButtons,
-  dataValidationListButton
-};
-function DataValidationList() {
-  const univerInstanceService = useDependency(IUniverInstanceService), workbook = useObservable(
-    () => univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET),
-    void 0,
-    void 0,
-    []
-  );
-  return workbook ? /* @__PURE__ */ jsxRuntimeExports.jsx(DataValidationListWithWorkbook, { workbook }) : null;
-}
-__name(DataValidationList, "DataValidationList");
-function DataValidationListWithWorkbook(props) {
-  const sheetDataValidationModel = useDependency(SheetDataValidationModel), univerInstanceService = useDependency(IUniverInstanceService), commandService = useDependency(ICommandService), injector = useDependency(Injector), dataValidationPanelService = useDependency(DataValidationPanelService), localeService = useDependency(LocaleService), [rules, setRules] = useState([]), { workbook } = props, worksheet = useObservable(workbook.activeSheet$, void 0, !0), unitId = workbook.getUnitId(), subUnitId = worksheet == null ? void 0 : worksheet.getSheetId();
-  useEffect(() => {
-    setRules(sheetDataValidationModel.getRules(unitId, subUnitId));
-    const subscription = sheetDataValidationModel.ruleChange$.subscribe((change) => {
-      change.unitId === unitId && change.subUnitId === subUnitId && setRules(sheetDataValidationModel.getRules(unitId, subUnitId));
-    });
-    return () => {
-      subscription.unsubscribe();
-    };
-  }, [unitId, subUnitId, sheetDataValidationModel]);
-  const handleAddRule = /* @__PURE__ */ __name(async () => {
-    const rule = createDefaultNewRule(injector), params = {
-      unitId,
-      subUnitId,
-      rule
-    };
-    await commandService.executeCommand(AddSheetDataValidationCommand.id, params), dataValidationPanelService.setActiveRule({
-      unitId,
-      subUnitId,
-      rule
-    });
-  }, "handleAddRule"), handleRemoveAll = /* @__PURE__ */ __name(() => {
-    commandService.executeCommand(RemoveSheetAllDataValidationCommand.id, {
-      unitId,
-      subUnitId
-    });
-  }, "handleRemoveAll"), rulesByPermissionCheck = (/* @__PURE__ */ __name((rules2) => {
-    const workbook2 = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET), worksheet2 = workbook2.getActiveSheet(), unitId2 = workbook2.getUnitId(), subUnitId2 = worksheet2.getSheetId();
-    return rules2.map((rule) => checkRangesEditablePermission(injector, unitId2, subUnitId2, rule.ranges) ? { ...rule } : { ...rule, disable: !0 });
-  }, "getDvRulesByPermissionCorrect"))(rules), hasDisableRule = rulesByPermissionCheck == null ? void 0 : rulesByPermissionCheck.some((rule) => rule.disable);
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
-    rulesByPermissionCheck == null ? void 0 : rulesByPermissionCheck.map((rule) => {
-      var _a23;
-      return /* @__PURE__ */ jsxRuntimeExports.jsx(
-        DataValidationItem,
-        {
-          unitId,
-          subUnitId,
-          onClick: /* @__PURE__ */ __name(() => {
-            rule.disable || dataValidationPanelService.setActiveRule({
-              unitId,
-              subUnitId,
-              rule
-            });
-          }, "onClick"),
-          rule,
-          disable: (_a23 = rule.disable) != null ? _a23 : !1
-        },
-        rule.uid
-      );
-    }),
-    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$2.dataValidationListButtons, children: [
-      rules.length && !hasDisableRule ? /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { className: styles$2.dataValidationListButton, onClick: handleRemoveAll, children: localeService.t("dataValidation.panel.removeAll") }) : null,
-      /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { className: styles$2.dataValidationListButton, type: "primary", onClick: handleAddRule, children: localeService.t("dataValidation.panel.add") })
-    ] })
+    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$5.dvDateDropdownBtns, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { size: "small", type: "primary", onClick: handleSave, disabled: !date.isValid(), children: localeService.t("dataValidation.alert.ok") }) })
   ] });
 }
-__name(DataValidationListWithWorkbook, "DataValidationListWithWorkbook");
-const DataValidationPanel = /* @__PURE__ */ __name(() => {
-  const dataValidationPanelService = useDependency(DataValidationPanelService), activeRule = useObservable(dataValidationPanelService.activeRule$, dataValidationPanelService.activeRule);
-  return activeRule ? /* @__PURE__ */ jsxRuntimeExports.jsx(DataValidationDetail, {}, activeRule.rule.uid) : /* @__PURE__ */ jsxRuntimeExports.jsx(DataValidationList, {});
-}, "DataValidationPanel");
+__name(DateDropdown, "DateDropdown");
 function CellDropdown() {
   const dropdownManagerService = useDependency(DataValidationDropdownManagerService), activeDropdown = useObservable(dropdownManagerService.activeDropdown$, dropdownManagerService.activeDropdown), componentManager = useDependency(ComponentManager);
   if (!activeDropdown)
@@ -1907,8 +2173,8 @@ var __defProp$e = Object.defineProperty, __getOwnPropDesc$e = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$e(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$e(target, key, result), result;
-}, "__decorateClass$e"), __decorateParam$e = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$e"), _a7;
-let DataValidationDropdownManagerService = (_a7 = class extends Disposable {
+}, "__decorateClass$e"), __decorateParam$e = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$e"), _a8;
+let DataValidationDropdownManagerService = (_a8 = class extends Disposable {
   constructor(_canvasPopupManagerService, _univerInstanceService, _dataValidatorRegistryService, _zenZoneService, _renderManagerService, _dataValidationModel, _sheetsSelectionsService) {
     super();
     __publicField(this, "_activeDropdown");
@@ -1970,8 +2236,8 @@ let DataValidationDropdownManagerService = (_a7 = class extends Disposable {
     const disposableCollection = new DisposableCollection();
     disposableCollection.add(popupDisposable), disposableCollection.add({
       dispose: /* @__PURE__ */ __name(() => {
-        var _a23, _b;
-        (_b = (_a23 = this._activeDropdown) == null ? void 0 : _a23.onHide) == null || _b.call(_a23);
+        var _a24, _b;
+        (_b = (_a24 = this._activeDropdown) == null ? void 0 : _a24.onHide) == null || _b.call(_a24);
       }, "dispose")
     }), this._currentPopup = disposableCollection;
   }
@@ -2006,7 +2272,7 @@ let DataValidationDropdownManagerService = (_a7 = class extends Disposable {
       onHide
     });
   }
-}, __name(_a7, "DataValidationDropdownManagerService"), _a7);
+}, __name(_a8, "DataValidationDropdownManagerService"), _a8);
 DataValidationDropdownManagerService = __decorateClass$e([
   __decorateParam$e(0, Inject(SheetCanvasPopManagerService)),
   __decorateParam$e(1, IUniverInstanceService),
@@ -2016,6 +2282,56 @@ DataValidationDropdownManagerService = __decorateClass$e([
   __decorateParam$e(5, Inject(SheetDataValidationModel)),
   __decorateParam$e(6, Inject(SheetsSelectionsService))
 ], DataValidationDropdownManagerService);
+var __defProp$d = Object.defineProperty, __getOwnPropDesc$d = Object.getOwnPropertyDescriptor, __decorateClass$d = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$d(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$d(target, key, result), result;
+}, "__decorateClass$d"), __decorateParam$d = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$d"), _a9;
+let DataValidationPanelService = (_a9 = class extends Disposable {
+  constructor(_univerInstanceService, _sidebarService) {
+    super();
+    __publicField(this, "_open$", new BehaviorSubject(!1));
+    __publicField(this, "open$", this._open$.pipe(distinctUntilChanged()));
+    __publicField(this, "_activeRule");
+    __publicField(this, "_activeRule$", new BehaviorSubject(void 0));
+    __publicField(this, "activeRule$", this._activeRule$.asObservable());
+    __publicField(this, "_closeDisposable", null);
+    this._univerInstanceService = _univerInstanceService, this._sidebarService = _sidebarService, this.disposeWithMe(
+      this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(filter((sheet) => !sheet)).subscribe(() => {
+        this.close();
+      })
+    );
+  }
+  get activeRule() {
+    return this._activeRule;
+  }
+  get isOpen() {
+    return this._open$.getValue();
+  }
+  dispose() {
+    var _a24;
+    super.dispose(), this._open$.next(!1), this._open$.complete(), this._activeRule$.complete(), (_a24 = this._closeDisposable) == null || _a24.dispose();
+  }
+  open() {
+    this._open$.next(!0);
+  }
+  close() {
+    var _a24;
+    this._open$.next(!1), (_a24 = this._closeDisposable) == null || _a24.dispose();
+  }
+  setCloseDisposable(disposable) {
+    this._closeDisposable = toDisposable(() => {
+      disposable.dispose(), this._closeDisposable = null;
+    });
+  }
+  setActiveRule(rule) {
+    this._activeRule = rule, this._activeRule$.next(rule);
+  }
+}, __name(_a9, "DataValidationPanelService"), _a9);
+DataValidationPanelService = __decorateClass$d([
+  __decorateParam$d(0, IUniverInstanceService),
+  __decorateParam$d(1, ISidebarService)
+], DataValidationPanelService);
 const DATA_VALIDATION_PANEL = "DataValidationPanel", OpenValidationPanelOperation = {
   id: "data-validation.operation.open-validation-panel",
   type: CommandType.OPERATION,
@@ -2071,7 +2387,7 @@ const DATA_VALIDATION_PANEL = "DataValidationPanel", OpenValidationPanelOperatio
   handler(accessor, params) {
     return params ? (accessor.get(DataValidationDropdownManagerService).hideDropdown(), !0) : !1;
   }
-}, dvListDropdown = "univer-dv-list-dropdown", dvListDropdownTitle = "univer-dv-list-dropdown-title", dvListDropdownList = "univer-dv-list-dropdown-list", dvListDropdownListContainer = "univer-dv-list-dropdown-list-container", dvListDropdownSelectedIcon = "univer-dv-list-dropdown-selected-icon", dvListDropdownItemContainer = "univer-dv-list-dropdown-item-container", dvListDropdownItem = "univer-dv-list-dropdown-item", dvListDropdownSplit = "univer-dv-list-dropdown-split", dvListDropdownEdit = "univer-dv-list-dropdown-edit", styles$1 = {
+}, PLUGIN_CONFIG_KEY = "sheets-data-validation.config", defaultPluginConfig = {}, dvListDropdown = "univer-dv-list-dropdown", dvListDropdownTitle = "univer-dv-list-dropdown-title", dvListDropdownList = "univer-dv-list-dropdown-list", dvListDropdownListContainer = "univer-dv-list-dropdown-list-container", dvListDropdownSelectedIcon = "univer-dv-list-dropdown-selected-icon", dvListDropdownItemContainer = "univer-dv-list-dropdown-item-container", dvListDropdownItem = "univer-dv-list-dropdown-item", dvListDropdownSplit = "univer-dv-list-dropdown-split", dvListDropdownEdit = "univer-dv-list-dropdown-edit", styles$4 = {
   dvListDropdown,
   dvListDropdownTitle,
   dvListDropdownList,
@@ -2082,10 +2398,20 @@ const DATA_VALIDATION_PANEL = "DataValidationPanel", OpenValidationPanelOperatio
   dvListDropdownSplit,
   dvListDropdownEdit
 }, SelectList = /* @__PURE__ */ __name((props) => {
-  const { value, onChange, multiple, options, title, onEdit, style, filter: filter2 } = props, localeService = useDependency(LocaleService), lowerFilter = filter2 == null ? void 0 : filter2.toLowerCase(), filteredOptions = options.filter((item) => lowerFilter ? item.label.toLowerCase().includes(lowerFilter) : !0);
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$1.dvListDropdown, style, children: [
-    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownTitle, children: title }),
-    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownList, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Scrollbar, { children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownListContainer, children: filteredOptions.map((item, i) => {
+  var _a24, _b;
+  const { value, onChange, multiple, options, title, onEdit, style, filter: filter2, location } = props, localeService = useDependency(LocaleService), configService = useDependency(IConfigService), lowerFilter = filter2 == null ? void 0 : filter2.toLowerCase(), { row, col, unitId, subUnitId } = location, filteredOptions = options.filter((item) => lowerFilter ? item.label.toLowerCase().includes(lowerFilter) : !0), showEditOnDropdown = (_b = (_a24 = configService.getConfig(PLUGIN_CONFIG_KEY)) == null ? void 0 : _a24.showEditOnDropdown) != null ? _b : !0, sheetPermissionInterceptorBaseController = useDependency(SheetPermissionInterceptorBaseController), hasPermission = useMemo(() => sheetPermissionInterceptorBaseController.permissionCheckWithRanges(
+    {
+      workbookTypes: [WorkbookEditablePermission],
+      rangeTypes: [RangeProtectionPermissionEditPoint],
+      worksheetTypes: [WorksheetEditPermission]
+    },
+    [{ startColumn: col, startRow: row, endColumn: col, endRow: row }],
+    unitId,
+    subUnitId
+  ), [sheetPermissionInterceptorBaseController, col, row, unitId, subUnitId]);
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$4.dvListDropdown, style, children: [
+    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$4.dvListDropdownTitle, children: title }),
+    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$4.dvListDropdownList, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Scrollbar, { children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$4.dvListDropdownListContainer, children: filteredOptions.map((item, i) => {
       const selected = value.indexOf(item.value) > -1, handleClick = /* @__PURE__ */ __name(() => {
         let set;
         selected ? set = new Set(value.filter((sub) => sub !== item.value)) : set = new Set(multiple ? [...value, item.value] : [item.value]);
@@ -2094,31 +2420,34 @@ const DATA_VALIDATION_PANEL = "DataValidationPanel", OpenValidationPanelOperatio
           set.has(opt.value) && newValue.push(opt.value);
         }), onChange(newValue);
       }, "handleClick"), index = item.label.toLocaleLowerCase().indexOf(lowerFilter);
-      return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$1.dvListDropdownItemContainer, onClick: handleClick, children: [
-        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownItem, style: { background: item.color || DROP_DOWN_DEFAULT_COLOR }, children: lowerFilter && item.label.toLowerCase().includes(lowerFilter) ? /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+      return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$4.dvListDropdownItemContainer, onClick: handleClick, children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$4.dvListDropdownItem, style: { background: item.color || DROP_DOWN_DEFAULT_COLOR }, children: lowerFilter && item.label.toLowerCase().includes(lowerFilter) ? /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
           /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: item.label.substring(0, index) }),
           /* @__PURE__ */ jsxRuntimeExports.jsx("span", { style: { fontWeight: "bold" }, children: item.label.substring(index, index + lowerFilter.length) }),
           /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: item.label.substring(index + lowerFilter.length) })
         ] }) : item.label }),
-        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownSelectedIcon, children: selected ? /* @__PURE__ */ jsxRuntimeExports.jsx(CheckMarkSingle, {}) : null })
+        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$4.dvListDropdownSelectedIcon, children: selected ? /* @__PURE__ */ jsxRuntimeExports.jsx(CheckMarkSingle, {}) : null })
       ] }, i);
     }) }) }, filter2) }),
-    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownSplit }),
-    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dvListDropdownEdit, children: /* @__PURE__ */ jsxRuntimeExports.jsx("a", { onClick: onEdit, children: localeService.t("dataValidation.list.edit") }) })
+    showEditOnDropdown && hasPermission ? /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$4.dvListDropdownSplit }),
+      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$4.dvListDropdownEdit, children: /* @__PURE__ */ jsxRuntimeExports.jsx("a", { onClick: onEdit, children: localeService.t("dataValidation.list.edit") }) })
+    ] }) : null
   ] });
 }, "SelectList");
 function ListDropDown(props) {
-  var _a23, _b;
+  var _a24, _b;
   const { location, hideFn } = props, { worksheet, row, col, unitId, subUnitId } = location, dataValidationModel = useDependency(DataValidationModel), [editingText, setEditingText] = useState(""), commandService = useDependency(ICommandService), localeService = useDependency(LocaleService), [localValue, setLocalValue] = useState(""), editorBridgeService = useDependency(IEditorBridgeService), instanceService = useDependency(IUniverInstanceService), ruleChange$ = useMemo(() => dataValidationModel.ruleChange$.pipe(debounceTime(16)), []);
   useObservable(ruleChange$);
   const anchorRect = RectPopup.useContext(), cellWidth = anchorRect.right - anchorRect.left;
   if (useEffect(() => {
     const dispose = commandService.onCommandExecuted((command) => {
+      var _a25, _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 = (_a25 = unit.getSnapshot().body) == null ? void 0 : _a25.dataStream) != null ? _b2 : "");
         setEditingText(text);
       }
     });
@@ -2127,7 +2456,7 @@ function ListDropDown(props) {
     };
   }, [commandService, instanceService]), !worksheet)
     return null;
-  const cellData = worksheet.getCell(row, col), rule = (_a23 = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _a23.rule, validator = (_b = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _b.validator, showColor = (rule == null ? void 0 : rule.renderMode) === DataValidationRenderMode.CUSTOM || (rule == null ? void 0 : rule.renderMode) === void 0;
+  const cellData = worksheet.getCell(row, col), rule = (_a24 = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _a24.rule, validator = (_b = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _b.validator, showColor = (rule == null ? void 0 : rule.renderMode) === DataValidationRenderMode.CUSTOM || (rule == null ? void 0 : rule.renderMode) === void 0;
   if (!cellData || !rule || !validator || validator.id.indexOf(DataValidationType.LIST) !== 0)
     return;
   const multiple = rule.type === DataValidationType.LIST_MULTIPLE, list = validator.getListWithColor(rule, unitId, subUnitId), cellStr = localValue || getDataValidationCellValue(worksheet.getCellRaw(row, col)), value = deserializeListOptions(cellStr), handleEdit = /* @__PURE__ */ __name(() => {
@@ -2172,268 +2501,395 @@ function ListDropDown(props) {
       }, "onChange"),
       options,
       onEdit: handleEdit,
-      filter: editingText
+      filter: editingText,
+      location
     }
   );
 }
 __name(ListDropDown, "ListDropDown");
-var utc$1 = { exports: {} };
-(function(module, exports) {
-  (function(t, i) {
-    module.exports = i();
-  })(commonjsGlobal, function() {
-    var t = "minute", i = /[+-]\d\d(?::?\d\d)?/g, e = /([+-]|\d\d)/g;
-    return function(s, f2, n2) {
-      var u = f2.prototype;
-      n2.utc = function(t2) {
-        var i2 = { date: t2, utc: !0, args: arguments };
-        return new f2(i2);
-      }, u.utc = function(i2) {
-        var e2 = n2(this.toDate(), { locale: this.$L, utc: !0 });
-        return i2 ? e2.add(this.utcOffset(), t) : e2;
-      }, u.local = function() {
-        return n2(this.toDate(), { locale: this.$L, utc: !1 });
-      };
-      var o = u.parse;
-      u.parse = function(t2) {
-        t2.utc && (this.$u = !0), this.$utils().u(t2.$offset) || (this.$offset = t2.$offset), o.call(this, t2);
-      };
-      var r = u.init;
-      u.init = function() {
-        if (this.$u) {
-          var t2 = this.$d;
-          this.$y = t2.getUTCFullYear(), this.$M = t2.getUTCMonth(), this.$D = t2.getUTCDate(), this.$W = t2.getUTCDay(), this.$H = t2.getUTCHours(), this.$m = t2.getUTCMinutes(), this.$s = t2.getUTCSeconds(), this.$ms = t2.getUTCMilliseconds();
-        } else r.call(this);
-      };
-      var a = u.utcOffset;
-      u.utcOffset = function(s2, f3) {
-        var n3 = this.$utils().u;
-        if (n3(s2)) return this.$u ? 0 : n3(this.$offset) ? a.call(this) : this.$offset;
-        if (typeof s2 == "string" && (s2 = function(t2) {
-          t2 === void 0 && (t2 = "");
-          var s3 = t2.match(i);
-          if (!s3) return null;
-          var f4 = ("" + s3[0]).match(e) || ["-", 0, 0], n4 = f4[0], u3 = 60 * +f4[1] + +f4[2];
-          return u3 === 0 ? 0 : n4 === "+" ? u3 : -u3;
-        }(s2), s2 === null)) return this;
-        var u2 = Math.abs(s2) <= 16 ? 60 * s2 : s2, o2 = this;
-        if (f3) return o2.$offset = u2, o2.$u = s2 === 0, o2;
-        if (s2 !== 0) {
-          var r2 = this.$u ? this.toDate().getTimezoneOffset() : -1 * this.utcOffset();
-          (o2 = this.local().add(u2 + r2, t)).$offset = u2, o2.$x.$localOffset = r2;
-        } else o2 = this.utc();
-        return o2;
-      };
-      var h = u.format;
-      u.format = function(t2) {
-        var i2 = t2 || (this.$u ? "YYYY-MM-DDTHH:mm:ss[Z]" : "");
-        return h.call(this, i2);
-      }, u.valueOf = function() {
-        var t2 = this.$utils().u(this.$offset) ? 0 : this.$offset + (this.$x.$localOffset || this.$d.getTimezoneOffset());
-        return this.$d.valueOf() - 6e4 * t2;
-      }, u.isUTC = function() {
-        return !!this.$u;
-      }, u.toISOString = function() {
-        return this.toDate().toISOString();
-      }, u.toString = function() {
-        return this.toDate().toUTCString();
-      };
-      var l2 = u.toDate;
-      u.toDate = function(t2) {
-        return t2 === "s" && this.$offset ? n2(this.format("YYYY-MM-DD HH:mm:ss:SSS")).toDate() : l2.call(this);
-      };
-      var c = u.diff;
-      u.diff = function(t2, i2, e2) {
-        if (t2 && this.$u === t2.$u) return c.call(this, t2, i2, e2);
-        var s2 = this.local(), f3 = n2(t2).local();
-        return c.call(s2, f3, i2, e2);
-      };
+const dataValidationOptionsButton = "univer-data-validation-options-button", dataValidationOptionsButtonIcon = "univer-data-validation-options-button-icon", styles$3 = {
+  dataValidationOptionsButton,
+  dataValidationOptionsButtonIcon
+};
+function DataValidationOptions(props) {
+  var _a24;
+  const localeService = useDependency(LocaleService), componentManager = useDependency(ComponentManager), { value, onChange, extraComponent } = props, [show, setShow] = useState(!1), ExtraOptions = extraComponent ? componentManager.get(extraComponent) : null;
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$3.dataValidationOptionsButton, onClick: /* @__PURE__ */ __name(() => setShow(!show), "onClick"), children: [
+      localeService.t("dataValidation.panel.options"),
+      show ? /* @__PURE__ */ jsxRuntimeExports.jsx(MoreUpSingle, { className: styles$3.dataValidationOptionsButtonIcon }) : /* @__PURE__ */ jsxRuntimeExports.jsx(MoreDownSingle, { className: styles$3.dataValidationOptionsButtonIcon })
+    ] }),
+    show && /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+      ExtraOptions ? /* @__PURE__ */ jsxRuntimeExports.jsx(ExtraOptions, { value, onChange }) : null,
+      /* @__PURE__ */ jsxRuntimeExports.jsx(
+        FormLayout,
+        {
+          label: localeService.t("dataValidation.panel.invalid"),
+          children: /* @__PURE__ */ jsxRuntimeExports.jsxs(
+            RadioGroup,
+            {
+              value: `${(_a24 = value.errorStyle) != null ? _a24 : DataValidationErrorStyle.WARNING}`,
+              onChange: /* @__PURE__ */ __name((errorStyle) => onChange({ ...value, errorStyle: +errorStyle }), "onChange"),
+              children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationErrorStyle.WARNING}`, children: localeService.t("dataValidation.panel.showWarning") }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx(Radio, { value: `${DataValidationErrorStyle.STOP}`, children: localeService.t("dataValidation.panel.rejectInput") })
+              ]
+            }
+          )
+        }
+      ),
+      /* @__PURE__ */ jsxRuntimeExports.jsx(
+        FormLayout,
+        {
+          label: localeService.t("dataValidation.panel.messageInfo"),
+          children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+            Checkbox,
+            {
+              checked: value.showErrorMessage,
+              onChange: /* @__PURE__ */ __name(() => onChange({
+                ...value,
+                showErrorMessage: !value.showErrorMessage
+              }), "onChange"),
+              children: localeService.t("dataValidation.panel.showInfo")
+            }
+          )
+        }
+      ),
+      value.showErrorMessage ? /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(Input, { value: value.error, onChange: /* @__PURE__ */ __name((error) => onChange({ ...value, error }), "onChange") }) }) : null
+    ] })
+  ] });
+}
+__name(DataValidationOptions, "DataValidationOptions");
+const dataValidationDetail = "univer-data-validation-detail", dataValidationDetailFormItem = "univer-data-validation-detail-form-item", dataValidationDetailButtons = "univer-data-validation-detail-buttons", dataValidationDetailButton = "univer-data-validation-detail-button", styles$2 = {
+  dataValidationDetail,
+  dataValidationDetailFormItem,
+  dataValidationDetailButtons,
+  dataValidationDetailButton
+}, debounceExecuteFactory = /* @__PURE__ */ __name((commandService) => debounce(
+  async (id, params, options, callback) => {
+    const res = await commandService.executeCommand(id, params, options);
+    callback == null || callback(res);
+  },
+  1e3
+), "debounceExecuteFactory");
+function DataValidationDetail() {
+  const [key, setKey] = useState(0), dataValidationPanelService = useDependency(DataValidationPanelService), activeRuleInfo = useObservable(dataValidationPanelService.activeRule$, dataValidationPanelService.activeRule), { unitId, subUnitId, rule } = activeRuleInfo || {}, ruleId = rule.uid, validatorService = useDependency(DataValidatorRegistryService), componentManager = useDependency(ComponentManager), commandService = useDependency(ICommandService), dataValidationModel = useDependency(DataValidationModel), localeService = useDependency(LocaleService), [localRule, setLocalRule] = useState(rule), validator = validatorService.getValidatorItem(localRule.type), [showError, setShowError] = useState(!1), validators = validatorService.getValidatorsByScope(DataValidatorRegistryScope.SHEET), [localRanges, setLocalRanges] = useState(() => localRule.ranges.map((i) => ({ unitId: "", sheetId: "", range: i }))), debounceExecute = useMemo(() => debounceExecuteFactory(commandService), [commandService]);
+  if (useEffect(() => {
+    commandService.onCommandExecuted((commandInfo) => {
+      (commandInfo.id === UndoCommand.id || commandInfo.id === RedoCommand.id) && setTimeout(() => {
+        const activeRule = dataValidationModel.getRuleById(unitId, subUnitId, ruleId);
+        setKey((k2) => k2 + 1), activeRule && (setLocalRule(activeRule), setLocalRanges(activeRule.ranges.map((i) => ({ unitId: "", sheetId: "", range: i }))));
+      }, 20);
+    });
+  }, [commandService, dataValidationModel, ruleId, subUnitId, unitId]), !validator)
+    return null;
+  const operators = validator.operators, operatorNames = validator.operatorNames, isTwoFormula = localRule.operator ? TWO_FORMULA_OPERATOR_COUNT$1.includes(localRule.operator) : !1, handleOk = /* @__PURE__ */ __name(() => {
+    localRule.ranges.length && (validator.validatorFormula(localRule, unitId, subUnitId).success ? dataValidationPanelService.setActiveRule(null) : setShowError(!0));
+  }, "handleOk"), handleUpdateRuleRanges = useEvent((unitRanges) => {
+    if (isUnitRangesEqual(unitRanges, localRanges))
+      return;
+    setLocalRanges(unitRanges);
+    const ranges = unitRanges.filter((i) => (!i.unitId || i.unitId === unitId) && (!i.sheetId || i.sheetId === subUnitId)).map((i) => i.range);
+    if (setLocalRule({
+      ...localRule,
+      ranges
+    }), ranges.length === 0)
+      return;
+    const params = {
+      unitId,
+      subUnitId,
+      ruleId,
+      ranges
     };
-  });
-})(utc$1);
-var utcExports = utc$1.exports;
-const utc = /* @__PURE__ */ getDefaultExportFromCjs(utcExports);
-var __defProp$d = Object.defineProperty, __getOwnPropDesc$d = Object.getOwnPropertyDescriptor, __decorateClass$d = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$d(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$d(target, key, result), result;
-}, "__decorateClass$d"), __decorateParam$d = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$d"), _a8;
-let DataValidationRejectInputController = (_a8 = class extends Disposable {
-  constructor(_editorBridgeService, _dataValidationModel, _dataValidatorRegistryService, _dialogService, _localeService) {
-    super(), this._editorBridgeService = _editorBridgeService, this._dataValidationModel = _dataValidationModel, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._dialogService = _dialogService, this._localeService = _localeService, this._initEditorBridgeInterceptor();
-  }
-  _initEditorBridgeInterceptor() {
-    this._editorBridgeService.interceptor.intercept(
-      this._editorBridgeService.interceptor.getInterceptPoints().AFTER_CELL_EDIT_ASYNC,
+    debounceExecute(UpdateSheetDataValidationRangeCommand.id, params);
+  }), handleUpdateRuleSetting = /* @__PURE__ */ __name((setting) => {
+    if (shallowEqual(setting, getRuleSetting(localRule)))
+      return;
+    setLocalRule({
+      ...localRule,
+      ...setting
+    });
+    const params = {
+      unitId,
+      subUnitId,
+      ruleId,
+      setting
+    };
+    debounceExecute(
+      UpdateSheetDataValidationSettingCommand.id,
+      params,
+      void 0
+    );
+  }, "handleUpdateRuleSetting"), handleDelete = /* @__PURE__ */ __name(async () => {
+    await commandService.executeCommand(RemoveSheetDataValidationCommand.id, {
+      ruleId,
+      unitId,
+      subUnitId
+    }), dataValidationPanelService.setActiveRule(null);
+  }, "handleDelete"), baseRule = {
+    type: localRule.type,
+    operator: localRule.operator,
+    formula1: localRule.formula1,
+    formula2: localRule.formula2,
+    allowBlank: localRule.allowBlank
+  }, handleChangeType = /* @__PURE__ */ __name((newType) => {
+    const validator2 = validatorService.getValidatorItem(newType);
+    if (!validator2)
+      return;
+    const operators2 = validator2.operators, rule2 = dataValidationModel.getRuleById(unitId, subUnitId, ruleId), newRule = newType === (rule2 == null ? void 0 : rule2.type) || newType.includes("list") && (rule2 != null && rule2.type.includes("list")) ? {
+      ...rule2,
+      type: newType
+    } : {
+      ...localRule,
+      type: newType,
+      operator: operators2[0],
+      formula1: void 0,
+      formula2: void 0
+    };
+    setLocalRule(newRule), commandService.executeCommand(UpdateSheetDataValidationSettingCommand.id, {
+      unitId,
+      subUnitId,
+      ruleId: localRule.uid,
+      setting: getRuleSetting(newRule)
+    });
+  }, "handleChangeType"), FormulaInput = componentManager.get(validator.formulaInput), rangeStr = useMemo(() => localRanges.map((i) => serializeRange(i.range)).join(","), []), options = getRuleOptions(localRule), handleUpdateRuleOptions = /* @__PURE__ */ __name((newOptions) => {
+    shallowEqual(newOptions, getRuleOptions(localRule)) || (setLocalRule({
+      ...localRule,
+      ...newOptions
+    }), debounceExecute(
+      UpdateSheetDataValidationOptionsCommand.id,
       {
-        handler: /* @__PURE__ */ __name(async (cellPromise, context, next) => {
-          var _a23;
-          const cell = await cellPromise, { worksheet, row, col, unitId, subUnitId, workbook } = context, ruleId = this._dataValidationModel.getRuleIdByLocation(unitId, subUnitId, row, col), rule = ruleId ? this._dataValidationModel.getRuleById(unitId, subUnitId, ruleId) : void 0;
-          if (!rule || rule.errorStyle !== DataValidationErrorStyle.STOP)
-            return next(Promise.resolve(cell));
-          const validator = await this._dataValidatorRegistryService.getValidatorItem(rule.type);
-          if (!validator || await validator.validator(
-            {
-              value: getCellValueOrigin(cell),
-              interceptValue: getCellValueOrigin((_a23 = context == null ? void 0 : context.origin) != null ? _a23 : cell),
-              row,
-              column: col,
-              unitId,
-              subUnitId,
-              worksheet,
-              workbook,
-              t: cell == null ? void 0 : cell.t
-            },
-            rule
-          ))
-            return next(Promise.resolve(cell));
-          const oldCell = worksheet.getCellRaw(row, col);
-          return this._dialogService.open({
-            width: 368,
-            title: {
-              title: this._localeService.t("dataValidation.alert.title")
-            },
-            id: "reject-input-dialog",
-            children: {
-              title: validator.getRuleFinalError(rule)
-            },
-            footer: {
-              title: React.createElement(
-                Button,
-                {
-                  type: "primary",
-                  onClick: /* @__PURE__ */ __name(() => this._dialogService.close("reject-input-dialog"), "onClick")
-                },
-                this._localeService.t("dataValidation.alert.ok")
-              )
-            },
-            onClose: /* @__PURE__ */ __name(() => {
-              this._dialogService.close("reject-input-dialog");
-            }, "onClose")
-          }), next(Promise.resolve(oldCell));
-        }, "handler")
+        unitId,
+        subUnitId,
+        ruleId,
+        options: newOptions
       }
-    );
-  }
-  showReject(title) {
-    this._dialogService.open({
-      width: 368,
-      title: {
-        title: this._localeService.t("dataValidation.alert.title")
-      },
-      id: "reject-input-dialog",
-      children: {
-        title
-      },
-      footer: {
-        title: React.createElement(
-          Button,
+    ));
+  }, "handleUpdateRuleOptions");
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$2.dataValidationDetail, children: [
+    /* @__PURE__ */ jsxRuntimeExports.jsx(
+      FormLayout,
+      {
+        label: localeService.t("dataValidation.panel.range"),
+        error: localRule.ranges.length ? "" : localeService.t("dataValidation.panel.rangeError"),
+        children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+          RangeSelector,
           {
-            type: "primary",
-            onClick: /* @__PURE__ */ __name(() => this._dialogService.close("reject-input-dialog"), "onClick")
+            className: styles$2.dataValidationDetailFormItem,
+            value: rangeStr,
+            id: createInternalEditorID("data-validation-detail"),
+            openForSheetUnitId: unitId,
+            openForSheetSubUnitId: subUnitId,
+            onChange: /* @__PURE__ */ __name((newRange) => {
+              newRange.some((i) => !isValidRange(i.range) || i.range.endColumn < i.range.startColumn || i.range.endRow < i.range.startRow) || handleUpdateRuleRanges(newRange);
+            }, "onChange")
           },
-          this._localeService.t("dataValidation.alert.ok")
+          key
         )
+      }
+    ),
+    /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { label: localeService.t("dataValidation.panel.type"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+      Select,
+      {
+        options: validators == null ? void 0 : validators.map((validator2) => ({
+          label: localeService.t(validator2.title),
+          value: validator2.id
+        })),
+        value: localRule.type,
+        onChange: handleChangeType,
+        className: styles$2.dataValidationDetailFormItem
+      }
+    ) }),
+    operators != null && operators.length ? /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { label: localeService.t("dataValidation.panel.operator"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+      Select,
+      {
+        options: operators.map((op, i) => ({
+          value: `${op}`,
+          label: operatorNames[i]
+        })),
+        value: `${localRule.operator}`,
+        onChange: /* @__PURE__ */ __name((operator) => {
+          handleUpdateRuleSetting({
+            ...baseRule,
+            operator
+          });
+        }, "onChange"),
+        className: styles$2.dataValidationDetailFormItem
+      }
+    ) }) : null,
+    FormulaInput ? /* @__PURE__ */ jsxRuntimeExports.jsx(
+      FormulaInput,
+      {
+        isTwoFormula,
+        value: {
+          formula1: localRule.formula1,
+          formula2: localRule.formula2
+        },
+        onChange: /* @__PURE__ */ __name((value) => {
+          handleUpdateRuleSetting({
+            ...baseRule,
+            ...value
+          });
+        }, "onChange"),
+        showError,
+        validResult: validator.validatorFormula(localRule, unitId, subUnitId),
+        unitId,
+        subUnitId,
+        ruleId
       },
-      onClose: /* @__PURE__ */ __name(() => {
-        this._dialogService.close("reject-input-dialog");
-      }, "onClose")
+      key + localRule.type
+    ) : null,
+    /* @__PURE__ */ jsxRuntimeExports.jsx(DataValidationOptions, { value: options, onChange: handleUpdateRuleOptions, extraComponent: validator.optionsInput }),
+    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$2.dataValidationDetailButtons, children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { className: styles$2.dataValidationDetailButton, onClick: handleDelete, children: localeService.t("dataValidation.panel.removeRule") }),
+      /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { className: styles$2.dataValidationDetailButton, type: "primary", onClick: handleOk, children: localeService.t("dataValidation.panel.done") })
+    ] })
+  ] });
+}
+__name(DataValidationDetail, "DataValidationDetail");
+const dataValidationItemContainer = "univer-data-validation-item-container", dataValidationItemTitle = "univer-data-validation-item-title", dataValidationItemContent = "univer-data-validation-item-content", dataValidationItemIcon = "univer-data-validation-item-icon", styles$1 = {
+  dataValidationItemContainer,
+  dataValidationItemTitle,
+  dataValidationItemContent,
+  dataValidationItemIcon
+}, DataValidationItem = /* @__PURE__ */ __name((props) => {
+  const { rule, onClick, unitId, subUnitId, disable } = props, validatorRegistry = useDependency(DataValidatorRegistryService), commandService = useDependency(ICommandService), markSelectionService = useDependency(IMarkSelectionService), validator = validatorRegistry.getValidatorItem(rule.type), ids = useRef(), [isHover, setIsHover] = useState(!1), handleDelete = /* @__PURE__ */ __name((e) => {
+    commandService.executeCommand(RemoveSheetDataValidationCommand.id, {
+      ruleId: rule.uid,
+      unitId,
+      subUnitId
+    }), e.stopPropagation();
+  }, "handleDelete");
+  return useEffect(() => () => {
+    var _a24;
+    ids.current && ((_a24 = ids.current) == null || _a24.forEach((id) => {
+      id && markSelectionService.removeShape(id);
+    }));
+  }, [markSelectionService]), /* @__PURE__ */ jsxRuntimeExports.jsxs(
+    "div",
+    {
+      className: styles$1.dataValidationItemContainer,
+      onClick,
+      onMouseEnter: /* @__PURE__ */ __name(() => {
+        disable || (setIsHover(!0), ids.current = rule.ranges.map((range) => markSelectionService.addShape({
+          range,
+          style: {
+            hasAutoFill: !1,
+            fill: "rgba(73, 184, 17, 0.05)",
+            strokeWidth: 1,
+            stroke: "#49B811",
+            widgets: {}
+          },
+          primary: {
+            startColumn: range.startColumn,
+            endColumn: range.endColumn,
+            startRow: range.startRow,
+            endRow: range.endRow,
+            actualRow: range.startRow,
+            actualColumn: range.startColumn,
+            isMerged: !1,
+            isMergedMainCell: !1
+          }
+        })));
+      }, "onMouseEnter"),
+      onMouseLeave: /* @__PURE__ */ __name(() => {
+        var _a24;
+        setIsHover(!1), (_a24 = ids.current) == null || _a24.forEach((id) => {
+          id && markSelectionService.removeShape(id);
+        }), ids.current = void 0;
+      }, "onMouseLeave"),
+      children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dataValidationItemTitle, children: validator == null ? void 0 : validator.generateRuleName(rule) }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dataValidationItemContent, children: rule.ranges.map((range) => serializeRange(range)).join(",") }),
+        isHover ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles$1.dataValidationItemIcon, onClick: handleDelete, children: /* @__PURE__ */ jsxRuntimeExports.jsx(DeleteSingle, {}) }) : null
+      ]
+    }
+  );
+}, "DataValidationItem"), dataValidationList = "univer-data-validation-list", dataValidationListButtons = "univer-data-validation-list-buttons", dataValidationListButton = "univer-data-validation-list-button", styles = {
+  dataValidationList,
+  dataValidationListButtons,
+  dataValidationListButton
+};
+function DataValidationList() {
+  const univerInstanceService = useDependency(IUniverInstanceService), workbook = useObservable(
+    () => univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET),
+    void 0,
+    void 0,
+    []
+  );
+  return workbook ? /* @__PURE__ */ jsxRuntimeExports.jsx(DataValidationListWithWorkbook, { workbook }) : null;
+}
+__name(DataValidationList, "DataValidationList");
+function DataValidationListWithWorkbook(props) {
+  const sheetDataValidationModel = useDependency(SheetDataValidationModel), univerInstanceService = useDependency(IUniverInstanceService), commandService = useDependency(ICommandService), injector = useDependency(Injector), dataValidationPanelService = useDependency(DataValidationPanelService), localeService = useDependency(LocaleService), [rules, setRules] = useState([]), { workbook } = props, worksheet = useObservable(workbook.activeSheet$, void 0, !0), unitId = workbook.getUnitId(), subUnitId = worksheet == null ? void 0 : worksheet.getSheetId();
+  useEffect(() => {
+    setRules(sheetDataValidationModel.getRules(unitId, subUnitId));
+    const subscription = sheetDataValidationModel.ruleChange$.subscribe((change) => {
+      change.unitId === unitId && change.subUnitId === subUnitId && setRules(sheetDataValidationModel.getRules(unitId, subUnitId));
     });
-  }
-}, __name(_a8, "DataValidationRejectInputController"), _a8);
-DataValidationRejectInputController = __decorateClass$d([
-  OnLifecycle(LifecycleStages.Ready, DataValidationRejectInputController),
-  __decorateParam$d(0, IEditorBridgeService),
-  __decorateParam$d(1, Inject(SheetDataValidationModel)),
-  __decorateParam$d(2, Inject(DataValidatorRegistryService)),
-  __decorateParam$d(3, IDialogService),
-  __decorateParam$d(4, Inject(LocaleService))
-], DataValidationRejectInputController);
-const dvDateDropdown = "univer-dv-date-dropdown", dvDateDropdownBtns = "univer-dv-date-dropdown-btns", styles = {
-  dvDateDropdown,
-  dvDateDropdownBtns
-};
-dayjs.extend(utc);
-const transformDate = /* @__PURE__ */ __name((value) => {
-  if (value == null || typeof value == "boolean")
-    return;
-  if (typeof value == "number" || !Number.isNaN(+value))
-    return dayjs(numfmt.format("yyyy-MM-dd HH:mm:ss", Number(value)));
-  const date = dayjs(value);
-  if (date.isValid())
-    return date;
-}, "transformDate");
-function DateDropdown(props) {
-  var _a23, _b, _c;
-  const { location, hideFn } = props, { worksheet, row, col, unitId, subUnitId, workbook } = location, commandService = useDependency(ICommandService), rejectInputController = useDependency(DataValidationRejectInputController), cellData = worksheet.getCell(row, col), rule = (_a23 = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _a23.rule, validator = (_b = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _b.validator, cellStr = getCellValueOrigin(worksheet.getCellRaw(row, col)), originDate = transformDate(cellStr), [localDate, setLocalDate] = useState(originDate), showTime = !!((_c = rule == null ? void 0 : rule.bizInfo) != null && _c.showTime), date = localDate && localDate.isValid() ? localDate : dayjs(), localeService = useDependency(LocaleService);
-  if (!cellData || !rule || !validator)
-    return;
-  const handleSave = /* @__PURE__ */ __name(async () => {
-    var _a24, _b2, _c2;
-    if (!date)
-      return;
-    const dateStr = date.format(showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD 00:00:00"), serialTime = (_a24 = numfmt.parseDate(dateStr)) == null ? void 0 : _a24.v, cellStyle = workbook.getStyles().getStyleByCell(cellData), format = (_c2 = (_b2 = cellStyle == null ? void 0 : cellStyle.n) == null ? void 0 : _b2.pattern) != null ? _c2 : "", patternType = getPatternType(format);
-    rule.errorStyle !== DataValidationErrorStyle.STOP || await validator.validator({
-      value: serialTime,
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [unitId, subUnitId, sheetDataValidationModel]);
+  const handleAddRule = /* @__PURE__ */ __name(async () => {
+    const rule = createDefaultNewRule(injector), params = {
       unitId,
       subUnitId,
-      row,
-      column: col,
-      worksheet,
-      workbook,
-      interceptValue: dateStr.replace("Z", "").replace("T", " "),
-      t: CellValueType.NUMBER
-    }, rule) ? (commandService.executeCommand(SetRangeValuesCommand.id, {
+      rule
+    };
+    await commandService.executeCommand(AddSheetDataValidationCommand.id, params), dataValidationPanelService.setActiveRule({
       unitId,
       subUnitId,
-      range: {
-        startColumn: col,
-        endColumn: col,
-        startRow: row,
-        endRow: row
-      },
-      value: {
-        v: serialTime,
-        t: 2,
-        p: null,
-        f: null,
-        si: null,
-        s: {
-          n: {
-            pattern: showTime ? patternType === "datetime" ? format : "yyyy-MM-dd hh:mm:ss" : patternType === "date" ? format : "yyyy-MM-dd"
-          }
-        }
-      }
-    }), hideFn()) : rejectInputController.showReject(validator.getRuleFinalError(rule));
-  }, "handleSave");
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles.dvDateDropdown, children: [
-    /* @__PURE__ */ jsxRuntimeExports.jsx(
-      DatePanel,
-      {
-        defaultValue: date,
-        pickerValue: date,
-        showTime: showTime || void 0,
-        onSelect: /* @__PURE__ */ __name(async (newValue) => {
-          setLocalDate(newValue);
-        }, "onSelect"),
-        onPanelChange: /* @__PURE__ */ __name((value) => {
-          setLocalDate(value);
-        }, "onPanelChange"),
-        disabledDate: /* @__PURE__ */ __name((current) => !numfmt.parseDate(current.format("YYYY-MM-DD")), "disabledDate")
-      }
-    ),
-    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: styles.dvDateDropdownBtns, children: /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { size: "small", type: "primary", onClick: handleSave, disabled: !date.isValid(), children: localeService.t("dataValidation.alert.ok") }) })
+      rule
+    });
+  }, "handleAddRule"), handleRemoveAll = /* @__PURE__ */ __name(() => {
+    commandService.executeCommand(RemoveSheetAllDataValidationCommand.id, {
+      unitId,
+      subUnitId
+    });
+  }, "handleRemoveAll"), rulesByPermissionCheck = (/* @__PURE__ */ __name((rules2) => {
+    const workbook2 = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET), worksheet2 = workbook2.getActiveSheet(), unitId2 = workbook2.getUnitId(), subUnitId2 = worksheet2.getSheetId();
+    return rules2.map((rule) => checkRangesEditablePermission(injector, unitId2, subUnitId2, rule.ranges) ? { ...rule } : { ...rule, disable: !0 });
+  }, "getDvRulesByPermissionCorrect"))(rules), hasDisableRule = rulesByPermissionCheck == null ? void 0 : rulesByPermissionCheck.some((rule) => rule.disable);
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles.dataValidationList, children: [
+    rulesByPermissionCheck == null ? void 0 : rulesByPermissionCheck.map((rule) => {
+      var _a24;
+      return /* @__PURE__ */ jsxRuntimeExports.jsx(
+        DataValidationItem,
+        {
+          unitId,
+          subUnitId,
+          onClick: /* @__PURE__ */ __name(() => {
+            rule.disable || dataValidationPanelService.setActiveRule({
+              unitId,
+              subUnitId,
+              rule
+            });
+          }, "onClick"),
+          rule,
+          disable: (_a24 = rule.disable) != null ? _a24 : !1
+        },
+        rule.uid
+      );
+    }),
+    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles.dataValidationListButtons, children: [
+      rules.length && !hasDisableRule ? /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { className: styles.dataValidationListButton, onClick: handleRemoveAll, children: localeService.t("dataValidation.panel.removeAll") }) : null,
+      /* @__PURE__ */ jsxRuntimeExports.jsx(Button, { className: styles.dataValidationListButton, type: "primary", onClick: handleAddRule, children: localeService.t("dataValidation.panel.add") })
+    ] })
   ] });
 }
-__name(DateDropdown, "DateDropdown");
-const LIST_DROPDOWN_KEY = "data-validation.list.dropdown", DATE_DROPDOWN_KEY = "data-validation.date.dropdown", DATE_SHOW_TIME_OPTION = "DATE_SHOW_TIME_OPTION";
+__name(DataValidationListWithWorkbook, "DataValidationListWithWorkbook");
+const DataValidationPanel = /* @__PURE__ */ __name(() => {
+  const dataValidationPanelService = useDependency(DataValidationPanelService), activeRule = useObservable(dataValidationPanelService.activeRule$, dataValidationPanelService.activeRule);
+  return activeRule ? /* @__PURE__ */ jsxRuntimeExports.jsx(DataValidationDetail, {}, activeRule.rule.uid) : /* @__PURE__ */ jsxRuntimeExports.jsx(DataValidationList, {});
+}, "DataValidationPanel"), LIST_DROPDOWN_KEY = "data-validation.list.dropdown", DATE_DROPDOWN_KEY = "data-validation.date.dropdown", DATE_SHOW_TIME_OPTION = "DATE_SHOW_TIME_OPTION";
 function DateShowTimeOption(props) {
-  var _a23;
+  var _a24;
   const { value, onChange } = props, localeService = useDependency(LocaleService);
   return /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(
     Checkbox,
     {
-      checked: (_a23 = value.bizInfo) == null ? void 0 : _a23.showTime,
+      checked: (_a24 = value.bizInfo) == null ? void 0 : _a24.showTime,
       onChange: /* @__PURE__ */ __name((showTime) => {
         onChange({
           ...value,
@@ -2450,12 +2906,12 @@ function DateShowTimeOption(props) {
 __name(DateShowTimeOption, "DateShowTimeOption");
 DateShowTimeOption.componentKey = DATE_SHOW_TIME_OPTION;
 const FORMULA1$1 = "{FORMULA1}", FORMULA2$1 = "{FORMULA2}", transformDate2SerialNumber = /* @__PURE__ */ __name((value) => {
-  var _a23, _b;
+  var _a24, _b;
   if (value == null || typeof value == "boolean")
     return;
   if (typeof value == "number" || !Number.isNaN(+value))
     return +value;
-  const v = (_a23 = numfmt.parseDate(value)) == null ? void 0 : _a23.v;
+  const v = (_a24 = numfmt.parseDate(value)) == null ? void 0 : _a24.v;
   return Tools.isDefine(v) ? v : (_b = numfmt.parseDate(dayjs(value).format("YYYY-MM-DD HH:mm:ss"))) == null ? void 0 : _b.v;
 }, "transformDate2SerialNumber"), _DateValidator = class _DateValidator extends BaseDataValidator {
   constructor() {
@@ -2478,28 +2934,181 @@ const FORMULA1$1 = "{FORMULA1}", FORMULA2$1 = "{FORMULA2}", transformDate2Serial
     __publicField(this, "dropdown", DATE_DROPDOWN_KEY);
     __publicField(this, "_formulaService", this.injector.get(DataValidationFormulaService));
   }
-  async parseFormula(rule, unitId, subUnitId) {
-    var _a23, _b;
-    const results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
-    return {
-      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult((_a23 = results == null ? void 0 : results[0]) == null ? void 0 : _a23.result) : formula1),
-      formula2: transformDate2SerialNumber(isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2)
-    };
+  async parseFormula(rule, unitId, subUnitId) {
+    var _a24, _b;
+    const results = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
+    return {
+      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult((_a24 = results == null ? void 0 : results[0]) == null ? void 0 : _a24.result) : formula1),
+      formula2: transformDate2SerialNumber(isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2)
+    };
+  }
+  parseFormulaSync(rule, unitId, subUnitId) {
+    var _a24, _b;
+    const results = this._formulaService.getRuleFormulaResultSync(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
+    return {
+      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult((_a24 = results == null ? void 0 : results[0]) == null ? void 0 : _a24.result) : formula1),
+      formula2: transformDate2SerialNumber(isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2)
+    };
+  }
+  async isValidType(info) {
+    const { interceptValue, value } = info;
+    return typeof value == "number" && typeof interceptValue == "string" ? !0 : typeof interceptValue == "string" ? !!numfmt.parseDate(interceptValue) : !1;
+  }
+  _validatorSingleFormula(formula) {
+    return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula) || !!(formula && numfmt.parseDate(formula)));
+  }
+  validatorFormula(rule, unitId, subUnitId) {
+    const operator = rule.operator;
+    if (!operator)
+      return {
+        success: !1
+      };
+    const formula1Success = this._validatorSingleFormula(rule.formula1), errorMsg = this.localeService.t("dataValidation.validFail.date");
+    if (TWO_FORMULA_OPERATOR_COUNT.includes(operator)) {
+      const formula2Success = this._validatorSingleFormula(rule.formula2);
+      return {
+        success: formula1Success && formula2Success,
+        formula1: formula1Success ? void 0 : errorMsg,
+        formula2: formula2Success ? void 0 : errorMsg
+      };
+    }
+    return {
+      success: formula1Success,
+      formula1: formula1Success ? void 0 : errorMsg
+    };
+  }
+  normalizeFormula(rule, _unitId, _subUnitId) {
+    const { formula1, formula2, bizInfo } = rule, normlizeSingleFormula = /* @__PURE__ */ __name((formula) => {
+      var _a24;
+      if (!formula)
+        return formula;
+      let date;
+      if (!Number.isNaN(+formula))
+        date = numfmt.dateFromSerial(+formula);
+      else {
+        const res = (_a24 = numfmt.parseDate(formula)) == null ? void 0 : _a24.v;
+        if (res == null)
+          return "";
+        date = numfmt.dateFromSerial(res);
+      }
+      return dayjs(`${date[0]}/${date[1]}/${date[2]} ${date[3]}:${date[4]}:${date[5]}`).format(bizInfo != null && bizInfo.showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
+    }, "normlizeSingleFormula");
+    return {
+      formula1: isFormulaString(formula1) ? formula1 : normlizeSingleFormula(`${formula1}`),
+      formula2: isFormulaString(formula2) ? formula2 : normlizeSingleFormula(`${formula2}`)
+    };
+  }
+  transform(cellInfo, _formula, _rule) {
+    const { value } = cellInfo;
+    return {
+      ...cellInfo,
+      value: transformDate2SerialNumber(value)
+    };
+  }
+  async validatorIsEqual(cellInfo, formula, rule) {
+    const { formula1 } = formula, { value: cellValue } = cellInfo;
+    return Number.isNaN(formula1) ? !0 : cellValue === formula1;
+  }
+  async validatorIsNotEqual(cellInfo, formula, _rule) {
+    const { formula1 } = formula;
+    return Number.isNaN(formula1) ? !0 : cellInfo.value !== formula1;
+  }
+  async validatorIsBetween(cellInfo, formula, _rule) {
+    const { formula1, formula2 } = formula;
+    if (Number.isNaN(formula1) || Number.isNaN(formula2))
+      return !0;
+    const start = Math.min(formula1, formula2), end = Math.max(formula1, formula2);
+    return cellInfo.value >= start && cellInfo.value <= end;
+  }
+  async validatorIsNotBetween(cellInfo, formula, _rule) {
+    const { formula1, formula2 } = formula;
+    if (Number.isNaN(formula1) || Number.isNaN(formula2))
+      return !0;
+    const start = Math.min(formula1, formula2), end = Math.max(formula1, formula2);
+    return cellInfo.value < start || cellInfo.value > end;
+  }
+  async validatorIsGreaterThan(cellInfo, formula, _rule) {
+    const { formula1 } = formula;
+    return Number.isNaN(formula1) ? !0 : cellInfo.value > formula1;
+  }
+  async validatorIsGreaterThanOrEqual(cellInfo, formula, _rule) {
+    const { formula1 } = formula;
+    return Number.isNaN(formula1) ? !0 : cellInfo.value >= formula1;
+  }
+  async validatorIsLessThan(cellInfo, formula, _rule) {
+    const { formula1 } = formula;
+    return Number.isNaN(formula1) ? !0 : cellInfo.value < formula1;
+  }
+  async validatorIsLessThanOrEqual(cellInfo, formula, _rule) {
+    const { formula1 } = formula;
+    return Number.isNaN(formula1) ? !0 : cellInfo.value <= formula1;
+  }
+  get operatorNames() {
+    return this.operators.map((operator) => this.localeService.t(DateOperatorNameMap[operator]));
+  }
+  generateRuleName(rule) {
+    var _a24, _b;
+    if (!rule.operator)
+      return this.titleStr;
+    const ruleName = this.localeService.t(DateOperatorTitleMap[rule.operator]).replace(FORMULA1$1, (_a24 = rule.formula1) != null ? _a24 : "").replace(FORMULA2$1, (_b = rule.formula2) != null ? _b : "");
+    return `${this.titleStr} ${ruleName}`;
+  }
+  generateRuleErrorMessage(rule) {
+    var _a24, _b;
+    return rule.operator ? `${this.localeService.t(DateOperatorErrorTitleMap[rule.operator]).replace(FORMULA1$1, (_a24 = rule.formula1) != null ? _a24 : "").replace(FORMULA2$1, (_b = rule.formula2) != null ? _b : "")}` : this.titleStr;
+  }
+};
+__name(_DateValidator, "DateValidator");
+let DateValidator = _DateValidator;
+function getCellValueNumber(cellValue) {
+  let str = cellValue;
+  return typeof cellValue == "string" ? ((cellValue.startsWith("¥") || cellValue.startsWith("$")) && (str = cellValue.slice(1)), +str) : +cellValue;
+}
+__name(getCellValueNumber, "getCellValueNumber");
+const _DecimalValidator = class _DecimalValidator extends BaseDataValidator {
+  constructor() {
+    super(...arguments);
+    __publicField(this, "_formulaService", this.injector.get(DataValidationFormulaService));
+    __publicField(this, "id", DataValidationType.DECIMAL);
+    __publicField(this, "title", "dataValidation.decimal.title");
+    __publicField(this, "operators", [
+      DataValidationOperator.BETWEEN,
+      DataValidationOperator.EQUAL,
+      DataValidationOperator.GREATER_THAN,
+      DataValidationOperator.GREATER_THAN_OR_EQUAL,
+      DataValidationOperator.LESS_THAN,
+      DataValidationOperator.LESS_THAN_OR_EQUAL,
+      DataValidationOperator.NOT_BETWEEN,
+      DataValidationOperator.NOT_EQUAL
+    ]);
+    __publicField(this, "scopes", ["sheet"]);
+    __publicField(this, "formulaInput", BASE_FORMULA_INPUT_NAME);
+    __publicField(this, "dropDownInput");
+  }
+  _isFormulaOrNumber(formula) {
+    return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula));
+  }
+  async isValidType(cellInfo, formula, rule) {
+    const { value: cellValue } = cellInfo;
+    return !Number.isNaN(getCellValueNumber(cellValue));
   }
-  parseFormulaSync(rule, unitId, subUnitId) {
-    var _a23, _b;
-    const results = this._formulaService.getRuleFormulaResultSync(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
+  transform(cellInfo, formula, rule) {
+    const { value: cellValue } = cellInfo;
     return {
-      formula1: transformDate2SerialNumber(isFormulaString(formula1) ? getFormulaResult((_a23 = results == null ? void 0 : results[0]) == null ? void 0 : _a23.result) : formula1),
-      formula2: transformDate2SerialNumber(isFormulaString(formula2) ? getFormulaResult((_b = results == null ? void 0 : results[1]) == null ? void 0 : _b.result) : formula2)
+      ...cellInfo,
+      value: getCellValueNumber(cellValue)
     };
   }
-  async isValidType(info) {
-    const { interceptValue, value } = info;
-    return typeof value == "number" && typeof interceptValue == "string" ? !0 : typeof interceptValue == "string" ? !!numfmt.parseDate(interceptValue) : !1;
+  _parseNumber(formula) {
+    return formula == null ? Number.NaN : +formula;
   }
-  _validatorSingleFormula(formula) {
-    return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula) || !!(formula && numfmt.parseDate(formula)));
+  async parseFormula(rule, unitId, subUnitId) {
+    var _a24, _b, _c, _d, _e, _f, _g, _h;
+    const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
+    return {
+      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a24 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a24.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)
+    };
   }
   validatorFormula(rule, unitId, subUnitId) {
     const operator = rule.operator;
@@ -2507,46 +3116,14 @@ const FORMULA1$1 = "{FORMULA1}", FORMULA2$1 = "{FORMULA2}", transformDate2Serial
       return {
         success: !1
       };
-    const formula1Success = this._validatorSingleFormula(rule.formula1), errorMsg = this.localeService.t("dataValidation.validFail.date");
-    if (TWO_FORMULA_OPERATOR_COUNT.includes(operator)) {
-      const formula2Success = this._validatorSingleFormula(rule.formula2);
-      return {
-        success: formula1Success && formula2Success,
-        formula1: formula1Success ? void 0 : errorMsg,
-        formula2: formula2Success ? void 0 : errorMsg
-      };
-    }
-    return {
+    const formula1Success = Tools.isDefine(rule.formula1) && this._isFormulaOrNumber(rule.formula1), formula2Success = Tools.isDefine(rule.formula2) && this._isFormulaOrNumber(rule.formula2), isTwoFormula = TWO_FORMULA_OPERATOR_COUNT.includes(operator), errorMsg = this.localeService.t("dataValidation.validFail.number");
+    return isTwoFormula ? {
+      success: formula1Success && formula2Success,
+      formula1: formula1Success ? void 0 : errorMsg,
+      formula2: formula2Success ? void 0 : errorMsg
+    } : {
       success: formula1Success,
-      formula1: formula1Success ? void 0 : errorMsg
-    };
-  }
-  normalizeFormula(rule, _unitId, _subUnitId) {
-    const { formula1, formula2, bizInfo } = rule, normlizeSingleFormula = /* @__PURE__ */ __name((formula) => {
-      var _a23;
-      if (!formula)
-        return formula;
-      let date;
-      if (!Number.isNaN(+formula))
-        date = numfmt.dateFromSerial(+formula);
-      else {
-        const res = (_a23 = numfmt.parseDate(formula)) == null ? void 0 : _a23.v;
-        if (res == null)
-          return "";
-        date = numfmt.dateFromSerial(res);
-      }
-      return dayjs(`${date[0]}/${date[1]}/${date[2]} ${date[3]}:${date[4]}:${date[5]}`).format(bizInfo != null && bizInfo.showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
-    }, "normlizeSingleFormula");
-    return {
-      formula1: isFormulaString(formula1) ? formula1 : normlizeSingleFormula(`${formula1}`),
-      formula2: isFormulaString(formula2) ? formula2 : normlizeSingleFormula(`${formula2}`)
-    };
-  }
-  transform(cellInfo, _formula, _rule) {
-    const { value } = cellInfo;
-    return {
-      ...cellInfo,
-      value: transformDate2SerialNumber(value)
+      formula1: formula1Success ? "" : errorMsg
     };
   }
   async validatorIsEqual(cellInfo, formula, rule) {
@@ -2587,23 +3164,21 @@ const FORMULA1$1 = "{FORMULA1}", FORMULA2$1 = "{FORMULA2}", transformDate2Serial
     const { formula1 } = formula;
     return Number.isNaN(formula1) ? !0 : cellInfo.value <= formula1;
   }
-  get operatorNames() {
-    return this.operators.map((operator) => this.localeService.t(DateOperatorNameMap[operator]));
-  }
-  generateRuleName(rule) {
-    var _a23, _b;
-    if (!rule.operator)
-      return this.titleStr;
-    const ruleName = this.localeService.t(DateOperatorTitleMap[rule.operator]).replace(FORMULA1$1, (_a23 = rule.formula1) != null ? _a23 : "").replace(FORMULA2$1, (_b = rule.formula2) != null ? _b : "");
-    return `${this.titleStr} ${ruleName}`;
-  }
-  generateRuleErrorMessage(rule) {
-    var _a23, _b;
-    return rule.operator ? `${this.localeService.t(DateOperatorErrorTitleMap[rule.operator]).replace(FORMULA1$1, (_a23 = rule.formula1) != null ? _a23 : "").replace(FORMULA2$1, (_b = rule.formula2) != null ? _b : "")}` : this.titleStr;
-  }
 };
-__name(_DateValidator, "DateValidator");
-let DateValidator = _DateValidator;
+__name(_DecimalValidator, "DecimalValidator");
+let DecimalValidator = _DecimalValidator;
+const LIST_RENDER_MODE_OPTION_INPUT = "LIST_RENDER_MODE_OPTION_INPUT";
+function ListRenderModeInput(props) {
+  var _a24;
+  const { value, onChange } = props, localeService = useDependency(LocaleService);
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { label: localeService.t("dataValidation.renderMode.label"), children: /* @__PURE__ */ jsxRuntimeExports.jsxs(RadioGroup, { value: `${(_a24 = value.renderMode) != null ? _a24 : 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);
@@ -2682,10 +3257,10 @@ function calcPadding(cellWidth, cellHeight, fontWidth, fontHeight, vt, ht, margi
   const realMargin = margin ? MARGIN_V$1 : 0;
   switch (vt) {
     case VerticalAlign.BOTTOM:
-      paddingTop = cellHeight - realMargin * 2 - fontHeight + realMargin;
+      paddingTop = cellHeight - fontHeight - realMargin;
       break;
     case VerticalAlign.MIDDLE:
-      paddingTop = (cellHeight - realMargin * 2 - fontHeight) / 2 + realMargin;
+      paddingTop = (cellHeight - fontHeight) / 2;
       break;
     default:
       paddingTop = realMargin;
@@ -2707,8 +3282,8 @@ function calcPadding(cellWidth, cellHeight, fontWidth, fontHeight, vt, ht, margi
   };
 }
 __name(calcPadding, "calcPadding");
-var _a9;
-let DropdownWidget = (_a9 = class {
+var _a10;
+let DropdownWidget = (_a10 = class {
   constructor(_localeService, _commandService) {
     __publicField(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
     __publicField(this, "zIndex");
@@ -2731,18 +3306,18 @@ let DropdownWidget = (_a9 = class {
         top = (cellHeight - ICON_SIZE) / 2;
         break;
       case VerticalAlign.BOTTOM:
-        top = cellHeight - ICON_SIZE / 2 - b - fontHeight / 2;
+        top = cellHeight - b - fontHeight - MARGIN_V$1 + (fontHeight / 2 - ICON_SIZE / 2);
         break;
       default:
-        top = t + fontHeight / 2 - ICON_SIZE / 2;
+        top = t + MARGIN_V$1 + (fontHeight / 2 - ICON_SIZE / 2);
         break;
     }
     ctx.save(), ctx.translateWithPrecision(cellBounding.startX + left, cellBounding.startY + top), ctx.fillStyle = "#565656", ctx.fill(downPath$1), ctx.restore();
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   drawWith(ctx, info, skeleton) {
-    var _a23, _b;
-    const { primaryWithCoord, row, col, style, data, subUnitId } = info, _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, rule = (_a23 = data.dataValidation) == null ? void 0 : _a23.rule, validator = (_b = data.dataValidation) == null ? void 0 : _b.validator, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {};
+    var _a24, _b;
+    const { primaryWithCoord, row, col, style, data, subUnitId } = info, _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, rule = (_a24 = data.dataValidation) == null ? void 0 : _a24.rule, validator = (_b = data.dataValidation) == null ? void 0 : _b.validator, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {};
     if (!rule || !validator || !validator || validator.id.indexOf(DataValidationType.LIST) !== 0 || !validator.skipDefaultFontRender(rule))
       return;
     const cellBounding = {
@@ -2755,7 +3330,7 @@ let DropdownWidget = (_a9 = class {
     if (tb = tb != null ? tb : WrapStrategy.WRAP, vt = vt != null ? vt : VerticalAlign.BOTTOM, ht = ht != null ? ht : DEFAULT_STYLES.ht, pd = pd != null ? pd : DEFAULT_STYLES.pd, rule.renderMode === DataValidationRenderMode.ARROW) {
       const { l: l2 = DEFAULT_STYLES.pd.l, t = DEFAULT_STYLES.pd.t, r = DEFAULT_STYLES.pd.r, b = DEFAULT_STYLES.pd.b } = pd, realWidth = cellWidth - l2 - r - ICON_PLACE$1, { documentSkeleton, documents, docModel } = createDocuments(valueStr, this._localeService, style);
       tb === WrapStrategy.WRAP && docModel.updateDocumentDataPageSize(Math.max(realWidth, 1)), documentSkeleton.calculate(), documentSkeleton.getActualSize();
-      const textLayout = getDocsSkeletonPageSize(documentSkeleton), { height: fontHeight, width: fontWidth } = textLayout, { paddingTop, paddingLeft } = calcPadding(realWidth, cellHeight - t - b, fontWidth, fontHeight, vt, ht, !1);
+      const textLayout = getDocsSkeletonPageSize(documentSkeleton), { height: fontHeight, width: fontWidth } = textLayout, { paddingTop, paddingLeft } = calcPadding(realWidth, cellHeight - t - b, fontWidth, fontHeight, vt, ht, !0);
       this._drawDownIcon(ctx, cellBounding, cellWidth, cellHeight, fontHeight, vt, pd), ctx.save(), ctx.translateWithPrecision(cellBounding.startX + l2, cellBounding.startY + t), ctx.beginPath(), ctx.rect(0, 0, cellWidth - l2 - r, cellHeight - t - b), ctx.clip(), ctx.translateWithPrecision(0, paddingTop), ctx.save(), ctx.translateWithPrecision(PADDING_H$1, 0), ctx.beginPath(), ctx.rect(0, 0, realWidth, fontHeight), ctx.clip(), documents.render(ctx), ctx.translateWithPrecision(paddingLeft, 0), ctx.restore(), ctx.restore(), map.set(key, {
         left: cellBounding.endX + l2 + skeleton.rowHeaderWidth - ICON_PLACE$1,
         top: cellBounding.startY + t + skeleton.columnHeaderHeight,
@@ -2783,8 +3358,8 @@ let DropdownWidget = (_a9 = class {
     }
   }
   calcCellAutoHeight(info) {
-    var _a23;
-    const { primaryWithCoord, style, data } = info, _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {}, rule = (_a23 = data.dataValidation) == null ? void 0 : _a23.rule;
+    var _a24;
+    const { primaryWithCoord, style, data } = info, _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {}, rule = (_a24 = data.dataValidation) == null ? void 0 : _a24.rule;
     if (!rule || rule.renderMode === DataValidationRenderMode.TEXT)
       return;
     const cellBounding = {
@@ -2799,7 +3374,7 @@ let DropdownWidget = (_a9 = class {
       const realWidth = cellWidth - ICON_PLACE$1, { documentSkeleton, docModel } = createDocuments(valueStr, this._localeService, style);
       tb === WrapStrategy.WRAP && docModel.updateDocumentDataPageSize(Math.max(realWidth, 1)), documentSkeleton.calculate(), documentSkeleton.getActualSize();
       const textLayout = getDocsSkeletonPageSize(documentSkeleton), { height: fontHeight } = textLayout;
-      return fontHeight + t + b;
+      return fontHeight + t + b + MARGIN_V$1 * 2;
     } else {
       const realWidth = cellWidth - MARGIN_H$1 * 2 - PADDING_H$1 - ICON_PLACE$1, { documentSkeleton, docModel } = createDocSkeleton(valueStr, this._localeService, style);
       tb === WrapStrategy.WRAP && docModel.updateDocumentDataPageSize(Math.max(realWidth, 1)), documentSkeleton.calculate();
@@ -2827,23 +3402,11 @@ let DropdownWidget = (_a9 = class {
     };
     this._commandService.executeCommand(ShowDataValidationDropdown.id, params);
   }
-}, __name(_a9, "DropdownWidget"), _a9);
+}, __name(_a10, "DropdownWidget"), _a10);
 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 [];
@@ -2851,11 +3414,11 @@ function getRuleFormulaResultSet(result) {
   return result.forEach(
     (row) => {
       row.forEach((cell) => {
-        var _a23, _b;
+        var _a24, _b;
         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));
+          if (typeof value != "string" && typeof (cell == null ? void 0 : cell.s) == "object" && ((_b = (_a24 = cell.s) == null ? void 0 : _a24.n) != null && _b.pattern)) {
+            resultSet.add(numfmt.format(cell.s.n.pattern, value, { throws: !1 }));
             return;
           }
           resultSet.add(value.toString());
@@ -2902,27 +3465,42 @@ const _ListValidator = class _ListValidator extends BaseDataValidator {
     __publicField(this, "canvasRender", this.injector.createInstance(DropdownWidget));
     __publicField(this, "dropdown", LIST_DROPDOWN_KEY);
     __publicField(this, "optionsInput", ListRenderModeInput.componentKey);
-  }
-  skipDefaultFontRender(rule) {
-    return rule.renderMode !== DataValidationRenderMode.TEXT;
+    __publicField(this, "skipDefaultFontRender", /* @__PURE__ */ __name((rule) => rule.renderMode !== DataValidationRenderMode.TEXT, "skipDefaultFontRender"));
   }
   validatorFormula(rule, unitId, subUnitId) {
-    var _a23, _b, _c;
-    const success = !Tools.isBlank(rule.formula1), valid = isValidListFormula((_a23 = rule.formula1) != null ? _a23 : "", this._lexer), sheetName = (_c = (_b = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _b.getSheetBySheetId(subUnitId)) == null ? void 0 : _c.getName(), isIntersects = isRuleIntersects(rule, sheetName != null ? sheetName : "");
+    var _a24, _b, _c;
+    const success = !Tools.isBlank(rule.formula1), valid = isValidListFormula((_a24 = rule.formula1) != null ? _a24 : "", this._lexer), sheetName = (_c = (_b = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _b.getSheetBySheetId(subUnitId)) == null ? void 0 : _c.getName(), isIntersects = isRuleIntersects(rule, sheetName != null ? sheetName : "");
     return {
       success: !!(success && valid && !isIntersects),
       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 _a24;
+    const tb = (_a24 = defaultStyle.tb !== WrapStrategy.OVERFLOW ? defaultStyle.tb : WrapStrategy.CLIP) != null ? _a24 : 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);
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a23;
+    var _a24;
     const { formula1 = "" } = rule, results = await this.formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid);
     return {
-      formula1: isFormulaString(formula1) ? getRuleFormulaResultSet((_a23 = results == null ? void 0 : results[0]) == null ? void 0 : _a23.result) : deserializeListOptions(formula1),
+      formula1: isFormulaString(formula1) ? getRuleFormulaResultSet((_a24 = results == null ? void 0 : results[0]) == null ? void 0 : _a24.result) : deserializeListOptions(formula1),
       formula2: void 0
     };
   }
@@ -2937,8 +3515,8 @@ const _ListValidator = class _ListValidator extends BaseDataValidator {
     return this.localeService.t("dataValidation.list.error");
   }
   getList(rule, currentUnitId, currentSubUnitId) {
-    var _a23, _b, _c;
-    const { formula1 = "" } = rule, univerInstanceService = this.injector.get(IUniverInstanceService), workbook = (_a23 = currentUnitId ? univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) != null ? _a23 : univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+    var _a24, _b, _c;
+    const { formula1 = "" } = rule, univerInstanceService = this.injector.get(IUniverInstanceService), workbook = (_a24 = currentUnitId ? univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) != null ? _a24 : univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
     if (!workbook) return [];
     const worksheet = (_b = currentSubUnitId ? workbook.getSheetBySheetId(currentSubUnitId) : void 0) != null ? _b : workbook.getActiveSheet();
     if (!worksheet) return [];
@@ -2946,8 +3524,8 @@ const _ListValidator = class _ListValidator extends BaseDataValidator {
     return isFormulaString(formula1) ? getRuleFormulaResultSet((_c = results == null ? void 0 : results[0]) == null ? void 0 : _c.result) : deserializeListOptions(formula1);
   }
   async getListAsync(rule, currentUnitId, currentSubUnitId) {
-    var _a23, _b, _c;
-    const { formula1 = "" } = rule, univerInstanceService = this.injector.get(IUniverInstanceService), workbook = (_a23 = currentUnitId ? univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) != null ? _a23 : univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+    var _a24, _b, _c;
+    const { formula1 = "" } = rule, univerInstanceService = this.injector.get(IUniverInstanceService), workbook = (_a24 = currentUnitId ? univerInstanceService.getUniverSheetInstance(currentUnitId) : void 0) != null ? _a24 : univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
     if (!workbook) return [];
     const worksheet = (_b = currentSubUnitId ? workbook.getSheetBySheetId(currentSubUnitId) : void 0) != null ? _b : workbook.getActiveSheet();
     if (!worksheet) return [];
@@ -2967,113 +3545,6 @@ const _ListValidator = class _ListValidator extends BaseDataValidator {
 };
 __name(_ListValidator, "ListValidator");
 let ListValidator = _ListValidator;
-function getCellValueNumber(cellValue) {
-  let str = cellValue;
-  return typeof cellValue == "string" ? ((cellValue.startsWith("¥") || cellValue.startsWith("$")) && (str = cellValue.slice(1)), +str) : +cellValue;
-}
-__name(getCellValueNumber, "getCellValueNumber");
-const _DecimalValidator = class _DecimalValidator extends BaseDataValidator {
-  constructor() {
-    super(...arguments);
-    __publicField(this, "_formulaService", this.injector.get(DataValidationFormulaService));
-    __publicField(this, "id", DataValidationType.DECIMAL);
-    __publicField(this, "title", "dataValidation.decimal.title");
-    __publicField(this, "operators", [
-      DataValidationOperator.BETWEEN,
-      DataValidationOperator.EQUAL,
-      DataValidationOperator.GREATER_THAN,
-      DataValidationOperator.GREATER_THAN_OR_EQUAL,
-      DataValidationOperator.LESS_THAN,
-      DataValidationOperator.LESS_THAN_OR_EQUAL,
-      DataValidationOperator.NOT_BETWEEN,
-      DataValidationOperator.NOT_EQUAL
-    ]);
-    __publicField(this, "scopes", ["sheet"]);
-    __publicField(this, "formulaInput", BASE_FORMULA_INPUT_NAME);
-    __publicField(this, "dropDownInput");
-  }
-  _isFormulaOrNumber(formula) {
-    return !Tools.isBlank(formula) && (isFormulaString(formula) || !Number.isNaN(+formula));
-  }
-  async isValidType(cellInfo, formula, rule) {
-    const { value: cellValue } = cellInfo;
-    return !Number.isNaN(getCellValueNumber(cellValue));
-  }
-  transform(cellInfo, formula, rule) {
-    const { value: cellValue } = cellInfo;
-    return {
-      ...cellInfo,
-      value: getCellValueNumber(cellValue)
-    };
-  }
-  _parseNumber(formula) {
-    return formula == null ? Number.NaN : +formula;
-  }
-  async parseFormula(rule, unitId, subUnitId) {
-    var _a23, _b, _c, _d, _e, _f, _g, _h;
-    const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
-    return {
-      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a23 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a23.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)
-    };
-  }
-  validatorFormula(rule, unitId, subUnitId) {
-    const operator = rule.operator;
-    if (!operator)
-      return {
-        success: !1
-      };
-    const formula1Success = Tools.isDefine(rule.formula1) && this._isFormulaOrNumber(rule.formula1), formula2Success = Tools.isDefine(rule.formula2) && this._isFormulaOrNumber(rule.formula2), isTwoFormula = TWO_FORMULA_OPERATOR_COUNT.includes(operator), errorMsg = this.localeService.t("dataValidation.validFail.number");
-    return isTwoFormula ? {
-      success: formula1Success && formula2Success,
-      formula1: formula1Success ? void 0 : errorMsg,
-      formula2: formula2Success ? void 0 : errorMsg
-    } : {
-      success: formula1Success,
-      formula1: formula1Success ? "" : errorMsg
-    };
-  }
-  async validatorIsEqual(cellInfo, formula, rule) {
-    const { formula1 } = formula, { value: cellValue } = cellInfo;
-    return Number.isNaN(formula1) ? !0 : cellValue === formula1;
-  }
-  async validatorIsNotEqual(cellInfo, formula, _rule) {
-    const { formula1 } = formula;
-    return Number.isNaN(formula1) ? !0 : cellInfo.value !== formula1;
-  }
-  async validatorIsBetween(cellInfo, formula, _rule) {
-    const { formula1, formula2 } = formula;
-    if (Number.isNaN(formula1) || Number.isNaN(formula2))
-      return !0;
-    const start = Math.min(formula1, formula2), end = Math.max(formula1, formula2);
-    return cellInfo.value >= start && cellInfo.value <= end;
-  }
-  async validatorIsNotBetween(cellInfo, formula, _rule) {
-    const { formula1, formula2 } = formula;
-    if (Number.isNaN(formula1) || Number.isNaN(formula2))
-      return !0;
-    const start = Math.min(formula1, formula2), end = Math.max(formula1, formula2);
-    return cellInfo.value < start || cellInfo.value > end;
-  }
-  async validatorIsGreaterThan(cellInfo, formula, _rule) {
-    const { formula1 } = formula;
-    return Number.isNaN(formula1) ? !0 : cellInfo.value > formula1;
-  }
-  async validatorIsGreaterThanOrEqual(cellInfo, formula, _rule) {
-    const { formula1 } = formula;
-    return Number.isNaN(formula1) ? !0 : cellInfo.value >= formula1;
-  }
-  async validatorIsLessThan(cellInfo, formula, _rule) {
-    const { formula1 } = formula;
-    return Number.isNaN(formula1) ? !0 : cellInfo.value < formula1;
-  }
-  async validatorIsLessThanOrEqual(cellInfo, formula, _rule) {
-    const { formula1 } = formula;
-    return Number.isNaN(formula1) ? !0 : cellInfo.value <= formula1;
-  }
-};
-__name(_DecimalValidator, "DecimalValidator");
-let DecimalValidator = _DecimalValidator;
 const FORMULA1 = "{FORMULA1}", FORMULA2 = "{FORMULA2}", _TextLengthValidator = class _TextLengthValidator extends BaseDataValidator {
   constructor() {
     super(...arguments);
@@ -3119,10 +3590,10 @@ const FORMULA1 = "{FORMULA1}", FORMULA2 = "{FORMULA2}", _TextLengthValidator = c
     return !Number.isNaN(formula);
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a23, _b, _c, _d, _e, _f, _g, _h;
+    var _a24, _b, _c, _d, _e, _f, _g, _h;
     const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
     return {
-      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a23 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a23.result) == null ? void 0 : _b[0]) == null ? void 0 : _c[0]) == null ? void 0 : _d.v : formula1),
+      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a24 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a24.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)
     };
   }
@@ -3175,15 +3646,15 @@ const FORMULA1 = "{FORMULA1}", FORMULA2 = "{FORMULA2}", _TextLengthValidator = c
     return this._isValidFormula(formula1) ? cellValue <= formula1 : !1;
   }
   generateRuleErrorMessage(rule) {
-    var _a23, _b;
-    return rule.operator ? `${this.localeService.t(TextLengthErrorTitleMap[rule.operator]).replace(FORMULA1, (_a23 = rule.formula1) != null ? _a23 : "").replace(FORMULA2, (_b = rule.formula2) != null ? _b : "")}` : this.titleStr;
+    var _a24, _b;
+    return rule.operator ? `${this.localeService.t(TextLengthErrorTitleMap[rule.operator]).replace(FORMULA1, (_a24 = rule.formula1) != null ? _a24 : "").replace(FORMULA2, (_b = rule.formula2) != null ? _b : "")}` : this.titleStr;
   }
 };
 __name(_TextLengthValidator, "TextLengthValidator");
 let TextLengthValidator = _TextLengthValidator;
 function isBlankCell(cellData) {
-  var _a23, _b;
-  return cellData ? cellData.p ? !((_b = (_a23 = cellData.p.body) == null ? void 0 : _a23.dataStream) != null ? _b : "").slice(0, -2).trim() : Tools.isBlank(cellData.v) : !0;
+  var _a24, _b;
+  return cellData ? cellData.p ? !((_b = (_a24 = cellData.p.body) == null ? void 0 : _a24.dataStream) != null ? _b : "").slice(0, -2).trim() : Tools.isBlank(cellData.v) : !0;
 }
 __name(isBlankCell, "isBlankCell");
 function getDataValidationDiffMutations(unitId, subUnitId, diffs, accessor, source = "command", fillDefaultValue = !0) {
@@ -3308,11 +3779,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,
@@ -3576,7 +4047,7 @@ 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);
 }
@@ -3676,8 +4147,8 @@ var __defProp$b = Object.defineProperty, __getOwnPropDesc$b = Object.getOwnPrope
   return kind && result && __defProp$b(target, key, result), result;
 }, "__decorateClass$b"), __decorateParam$b = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$b");
 const downPath = new Path2D("M3.32201 4.84556C3.14417 5.05148 2.85583 5.05148 2.67799 4.84556L0.134292 1.90016C-0.152586 1.56798 0.0505937 1 0.456301 1L5.5437 1C5.94941 1 6.15259 1.56798 5.86571 1.90016L3.32201 4.84556Z");
-var _a10;
-let DropdownMultipleWidget = (_a10 = class {
+var _a11;
+let DropdownMultipleWidget = (_a11 = class {
   constructor(_commandService) {
     __publicField(this, "zIndex");
     __publicField(this, "_dropdownInfoMap", /* @__PURE__ */ new Map());
@@ -3705,7 +4176,7 @@ let DropdownMultipleWidget = (_a10 = class {
   }
   // eslint-disable-next-line max-lines-per-function
   drawWith(ctx, info, skeleton, spreadsheets) {
-    var _a23, _b;
+    var _a24, _b;
     const { primaryWithCoord, row, col, style, data, subUnitId } = info, _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {}, validation = data.dataValidation, map = this._ensureMap(subUnitId), key = this._generateKey(row, col);
     if (!validation)
       return;
@@ -3714,7 +4185,7 @@ let DropdownMultipleWidget = (_a10 = class {
       endX: _cellBounding.endX - rightOffset,
       startY: _cellBounding.startY + topOffset,
       endY: _cellBounding.endY - downOffset
-    }, cellWidth = cellBounding.endX - cellBounding.startX, cellHeight = cellBounding.endY - cellBounding.startY, { cl } = style || {}, color = (_a23 = typeof cl == "object" ? cl == null ? void 0 : cl.rgb : cl) != null ? _a23 : "#000", fontStyle = getFontStyleString(style != null ? style : void 0), { rule, validator: _validator } = validation, validator = _validator, { vt: _vt, ht } = style || {}, vt = _vt != null ? _vt : VerticalAlign.MIDDLE, cellValue = (_b = getCellValueOrigin(data)) != null ? _b : "", items = validator.parseCellValue(cellValue), labelColorMap = validator.getListWithColorMap(rule), layout = layoutDropdowns(items, fontStyle, cellWidth, cellHeight);
+    }, cellWidth = cellBounding.endX - cellBounding.startX, cellHeight = cellBounding.endY - cellBounding.startY, { cl } = style || {}, color = (_a24 = typeof cl == "object" ? cl == null ? void 0 : cl.rgb : cl) != null ? _a24 : "#000", fontStyle = getFontStyleString(style != null ? style : void 0), { rule, validator: _validator } = validation, validator = _validator, { vt: _vt, ht } = style || {}, vt = _vt != null ? _vt : VerticalAlign.MIDDLE, cellValue = (_b = getCellValueOrigin(data)) != null ? _b : "", items = validator.parseCellValue(cellValue), labelColorMap = validator.getListWithColorMap(rule), layout = layoutDropdowns(items, fontStyle, cellWidth, cellHeight);
     this._drawDownIcon(ctx, cellBounding, cellWidth, cellHeight, vt), ctx.save(), ctx.translateWithPrecision(cellBounding.startX, cellBounding.startY), ctx.beginPath(), ctx.rect(0, 0, cellWidth - ICON_PLACE, cellHeight), ctx.clip(), ctx.translateWithPrecision(CELL_PADDING_H, CELL_PADDING_V);
     let top = 0;
     switch (vt) {
@@ -3753,7 +4224,7 @@ let DropdownMultipleWidget = (_a10 = class {
     });
   }
   calcCellAutoHeight(info) {
-    var _a23;
+    var _a24;
     const { primaryWithCoord, style, data } = info, fontRenderExtension = data.fontRenderExtension, { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = fontRenderExtension || {}, _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord, cellBounding = {
       startX: _cellBounding.startX + leftOffset,
       endX: _cellBounding.endX - rightOffset,
@@ -3762,7 +4233,7 @@ let DropdownMultipleWidget = (_a10 = class {
     }, validation = data.dataValidation;
     if (!validation)
       return;
-    const cellWidth = cellBounding.endX - cellBounding.startX, cellHeight = cellBounding.endY - cellBounding.startY, cellValue = (_a23 = getCellValueOrigin(data)) != null ? _a23 : "", { validator: _validator } = validation, items = _validator.parseCellValue(cellValue), fontStyle = getFontStyleString(style != null ? style : void 0);
+    const cellWidth = cellBounding.endX - cellBounding.startX, cellHeight = cellBounding.endY - cellBounding.startY, cellValue = (_a24 = getCellValueOrigin(data)) != null ? _a24 : "", { validator: _validator } = validation, items = _validator.parseCellValue(cellValue), fontStyle = getFontStyleString(style != null ? style : void 0);
     return layoutDropdowns(items, fontStyle, cellWidth, cellHeight).cellAutoHeight;
   }
   isHit(position, info) {
@@ -3780,7 +4251,7 @@ let DropdownMultipleWidget = (_a10 = class {
     };
     this._commandService.executeCommand(ShowDataValidationDropdown.id, params);
   }
-}, __name(_a10, "DropdownMultipleWidget"), _a10);
+}, __name(_a11, "DropdownMultipleWidget"), _a11);
 DropdownMultipleWidget = __decorateClass$b([
   __decorateParam$b(0, ICommandService)
 ], DropdownMultipleWidget);
@@ -3790,9 +4261,7 @@ const _ListMultipleValidator = class _ListMultipleValidator extends ListValidato
     __publicField(this, "id", DataValidationType.LIST_MULTIPLE);
     __publicField(this, "title", "dataValidation.listMultiple.title");
     __publicField(this, "canvasRender", this.injector.createInstance(DropdownMultipleWidget));
-  }
-  skipDefaultFontRender() {
-    return !0;
+    __publicField(this, "skipDefaultFontRender", /* @__PURE__ */ __name(() => !0, "skipDefaultFontRender"));
   }
 };
 __name(_ListMultipleValidator, "ListMultipleValidator");
@@ -3835,10 +4304,10 @@ const _WholeValidator = class _WholeValidator extends BaseDataValidator {
     return formula == null ? Number.NaN : +formula;
   }
   async parseFormula(rule, unitId, subUnitId) {
-    var _a23, _b, _c, _d, _e, _f, _g, _h;
+    var _a24, _b, _c, _d, _e, _f, _g, _h;
     const formulaInfo = await this._formulaService.getRuleFormulaResult(unitId, subUnitId, rule.uid), { formula1, formula2 } = rule;
     return {
-      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a23 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a23.result) == null ? void 0 : _b[0]) == null ? void 0 : _c[0]) == null ? void 0 : _d.v : formula1),
+      formula1: this._parseNumber(isFormulaString(formula1) ? (_d = (_c = (_b = (_a24 = formulaInfo == null ? void 0 : formulaInfo[0]) == null ? void 0 : _a24.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)
     };
   }
@@ -3931,8 +4400,8 @@ var __defProp$a = Object.defineProperty, __getOwnPropDesc$a = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$a(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$a(target, key, result), result;
-}, "__decorateClass$a"), __decorateParam$a = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$a"), _a11;
-let DataValidationController = (_a11 = class extends RxDisposable {
+}, "__decorateClass$a"), __decorateParam$a = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$a"), _a12;
+let DataValidationController = (_a12 = class extends RxDisposable {
   constructor(_univerInstanceService, _dataValidatorRegistryService, _injector, _componentManger, _selectionManagerService, _sheetInterceptorService, _sheetDataValidationModel) {
     super(), this._univerInstanceService = _univerInstanceService, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._injector = _injector, this._componentManger = _componentManger, this._selectionManagerService = _selectionManagerService, this._sheetInterceptorService = _sheetInterceptorService, this._sheetDataValidationModel = _sheetDataValidationModel, this._init();
   }
@@ -3963,12 +4432,12 @@ let DataValidationController = (_a11 = class extends RxDisposable {
   _initCommandInterceptor() {
     this._sheetInterceptorService.interceptCommand({
       getMutations: /* @__PURE__ */ __name((commandInfo) => {
-        var _a23;
+        var _a24;
         if (commandInfo.id === ClearSelectionAllCommand.id) {
           const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET), unitId = workbook.getUnitId(), worksheet = workbook.getActiveSheet();
           if (!worksheet)
             throw new Error("No active sheet found");
-          const subUnitId = worksheet.getSheetId(), selections = (_a23 = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : _a23.map((s) => s.range), ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone();
+          const subUnitId = worksheet.getSheetId(), selections = (_a24 = this._selectionManagerService.getCurrentSelections()) == null ? void 0 : _a24.map((s) => s.range), ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone();
           selections && ruleMatrix.removeRange(selections);
           const diffs = ruleMatrix.diff(this._sheetDataValidationModel.getRules(unitId, subUnitId)), { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, diffs, this._injector, "patched");
           return {
@@ -4000,7 +4469,7 @@ let DataValidationController = (_a11 = class extends RxDisposable {
       ));
     });
   }
-}, __name(_a11, "DataValidationController"), _a11);
+}, __name(_a12, "DataValidationController"), _a12);
 DataValidationController = __decorateClass$a([
   OnLifecycle(LifecycleStages.Rendered, DataValidationController),
   __decorateParam$a(0, IUniverInstanceService),
@@ -4017,8 +4486,8 @@ var __defProp$9 = Object.defineProperty, __getOwnPropDesc$9 = Object.getOwnPrope
   return kind && result && __defProp$9(target, key, result), result;
 }, "__decorateClass$9"), __decorateParam$9 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$9");
 const ALERT_KEY = "SHEET_DATA_VALIDATION_ALERT";
-var _a12;
-let DataValidationAlertController = (_a12 = class extends Disposable {
+var _a13;
+let DataValidationAlertController = (_a13 = class extends Disposable {
   constructor(_hoverManagerService, _cellAlertManagerService, _univerInstanceService, _localeService, _zenZoneService) {
     super(), this._hoverManagerService = _hoverManagerService, this._cellAlertManagerService = _cellAlertManagerService, this._univerInstanceService = _univerInstanceService, this._localeService = _localeService, this._zenZoneService = _zenZoneService, this._init();
   }
@@ -4027,12 +4496,12 @@ let DataValidationAlertController = (_a12 = class extends Disposable {
   }
   _initCellAlertPopup() {
     this.disposeWithMe(this._hoverManagerService.currentCell$.pipe(debounceTime(100)).subscribe((cellPos) => {
-      var _a23, _b;
+      var _a24, _b;
       if (cellPos) {
         const worksheet = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getActiveSheet();
         if (!worksheet) return;
         const cellData = worksheet.getCell(cellPos.location.row, cellPos.location.col);
-        if (((_a23 = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _a23.validStatus) === DataValidationStatus.INVALID) {
+        if (((_a24 = cellData == null ? void 0 : cellData.dataValidation) == null ? void 0 : _a24.validStatus) === DataValidationStatus.INVALID) {
           const currentAlert = this._cellAlertManagerService.currentAlert.get(ALERT_KEY), currentLoc = (_b = currentAlert == null ? void 0 : currentAlert.alert) == null ? void 0 : _b.location;
           if (currentLoc && currentLoc.row === cellPos.location.row && currentLoc.col === cellPos.location.col && currentLoc.subUnitId === cellPos.location.subUnitId && currentLoc.unitId === cellPos.location.unitId)
             return;
@@ -4059,7 +4528,7 @@ let DataValidationAlertController = (_a12 = class extends Disposable {
       visible && this._cellAlertManagerService.removeAlert(ALERT_KEY);
     }));
   }
-}, __name(_a12, "DataValidationAlertController"), _a12);
+}, __name(_a13, "DataValidationAlertController"), _a13);
 DataValidationAlertController = __decorateClass$9([
   OnLifecycle(LifecycleStages.Rendered, DataValidationAlertController),
   __decorateParam$9(0, Inject(HoverManagerService)),
@@ -4072,8 +4541,8 @@ var __defProp$8 = Object.defineProperty, __getOwnPropDesc$8 = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$8(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$8(target, key, result), result;
-}, "__decorateClass$8"), __decorateParam$8 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$8"), _a13;
-let DataValidationCopyPasteController = (_a13 = class extends Disposable {
+}, "__decorateClass$8"), __decorateParam$8 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$8"), _a14;
+let DataValidationCopyPasteController = (_a14 = class extends Disposable {
   constructor(_sheetClipboardService, _sheetDataValidationModel, _injector) {
     super();
     __publicField(this, "_copyInfo");
@@ -4126,10 +4595,10 @@ 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) => {
+        var _a24;
+        (_a24 = this._copyInfo) == null || _a24.matrix.forValue((row, col, ruleId) => {
           const range = Rectangle.getPositionRange(
             {
               startRow: row,
@@ -4141,9 +4610,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,10 +4627,10 @@ 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) => {
+        var _a24;
+        (_a24 = this._copyInfo) == null || _a24.matrix.forValue((row, col, ruleId) => {
           const range = Rectangle.getPositionRange(
             {
               startRow: row,
@@ -4169,9 +4640,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,
@@ -4185,7 +4658,7 @@ let DataValidationCopyPasteController = (_a13 = class extends Disposable {
       };
     }
   }
-}, __name(_a13, "DataValidationCopyPasteController"), _a13);
+}, __name(_a14, "DataValidationCopyPasteController"), _a14);
 DataValidationCopyPasteController = __decorateClass$8([
   OnLifecycle(LifecycleStages.Ready, DataValidationCopyPasteController),
   __decorateParam$8(0, ISheetClipboardService),
@@ -4196,8 +4669,8 @@ var __defProp$7 = Object.defineProperty, __getOwnPropDesc$7 = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$7(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$7(target, key, result), result;
-}, "__decorateClass$7"), __decorateParam$7 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$7"), _a14;
-let DataValidationPermissionController = (_a14 = class extends Disposable {
+}, "__decorateClass$7"), __decorateParam$7 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$7"), _a15;
+let DataValidationPermissionController = (_a15 = class extends Disposable {
   constructor(_localeService, _commandService, _sheetPermissionInterceptorBaseController) {
     super(), this._localeService = _localeService, this._commandService = _commandService, this._sheetPermissionInterceptorBaseController = _sheetPermissionInterceptorBaseController, this._commandExecutedListener();
   }
@@ -4216,7 +4689,7 @@ let DataValidationPermissionController = (_a14 = class extends Disposable {
       })
     );
   }
-}, __name(_a14, "DataValidationPermissionController"), _a14);
+}, __name(_a15, "DataValidationPermissionController"), _a15);
 DataValidationPermissionController = __decorateClass$7([
   OnLifecycle(LifecycleStages.Ready, DataValidationPermissionController),
   __decorateParam$7(0, Inject(LocaleService)),
@@ -4227,8 +4700,8 @@ var __defProp$6 = Object.defineProperty, __getOwnPropDesc$6 = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$6(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$6(target, key, result), result;
-}, "__decorateClass$6"), __decorateParam$6 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$6"), _a15;
-let DataValidationRefRangeController = (_a15 = class extends Disposable {
+}, "__decorateClass$6"), __decorateParam$6 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$6"), _a16;
+let DataValidationRefRangeController = (_a16 = class extends Disposable {
   constructor(_dataValidationModel, _injector, _refRangeService, _dataValidationCustomFormulaService, _dataValidationFormulaService, _formulaRefRangeService) {
     super();
     __publicField(this, "_disposableMap", /* @__PURE__ */ new Map());
@@ -4242,8 +4715,8 @@ let DataValidationRefRangeController = (_a15 = class extends Disposable {
   }
   // eslint-disable-next-line max-lines-per-function
   registerFormula(unitId, subUnitId, rule) {
-    var _a23;
-    const ruleId = rule.uid, id = this._getIdWithUnitId(unitId, subUnitId, ruleId), disposeSet = (_a23 = this._disposableMap.get(id)) != null ? _a23 : /* @__PURE__ */ new Set(), handleFormulaChange = /* @__PURE__ */ __name((type, formulaString) => {
+    var _a24;
+    const ruleId = rule.uid, id = this._getIdWithUnitId(unitId, subUnitId, ruleId), disposeSet = (_a24 = this._disposableMap.get(id)) != null ? _a24 : /* @__PURE__ */ new Set(), handleFormulaChange = /* @__PURE__ */ __name((type, formulaString) => {
       const oldRule = this._dataValidationModel.getRuleById(unitId, subUnitId, ruleId);
       if (!oldRule)
         return { redos: [], undos: [] };
@@ -4320,7 +4793,7 @@ let DataValidationRefRangeController = (_a15 = class extends Disposable {
     }
   }
   register(unitId, subUnitId, rule) {
-    var _a23;
+    var _a24;
     const handleRangeChange = /* @__PURE__ */ __name((commandInfo) => {
       const oldRanges = [...rule.ranges], resultRanges = oldRanges.map((range) => handleCommonDefaultRangeChangeWithEffectRefCommands(range, commandInfo)).filter((range) => !!range).flat();
       if (isRangesEqual(resultRanges, oldRanges))
@@ -4358,10 +4831,15 @@ let DataValidationRefRangeController = (_a15 = class extends Disposable {
       const disposable = this._refRangeService.registerRefRange(range, handleRangeChange, unitId, subUnitId);
       disposeList.push(() => disposable.dispose());
     });
-    const id = this._getIdWithUnitId(unitId, subUnitId, rule.uid), current = (_a23 = this._disposableMap.get(id)) != null ? _a23 : /* @__PURE__ */ new Set();
+    const id = this._getIdWithUnitId(unitId, subUnitId, rule.uid), current = (_a24 = this._disposableMap.get(id)) != null ? _a24 : /* @__PURE__ */ new Set();
     current.add(() => disposeList.forEach((dispose) => dispose())), this._disposableMap.set(id, current);
   }
   _initRefRange() {
+    const allRules = this._dataValidationModel.getAll();
+    for (const [unitId, subUnitMap] of allRules)
+      for (const [subUnitId, rules] of subUnitMap)
+        for (const rule of rules)
+          this.registerRule(unitId, subUnitId, rule);
     this.disposeWithMe(
       this._dataValidationModel.ruleChange$.subscribe((option) => {
         const { unitId, subUnitId, rule } = option;
@@ -4389,10 +4867,10 @@ let DataValidationRefRangeController = (_a15 = class extends Disposable {
       }), this._disposableMap.clear();
     }));
   }
-}, __name(_a15, "DataValidationRefRangeController"), _a15);
+}, __name(_a16, "DataValidationRefRangeController"), _a16);
 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)),
@@ -4426,8 +4904,8 @@ const INVALID_MARK = {
     color: "#fe4b4b"
   }
 };
-var _a16;
-let SheetsDataValidationRenderController = (_a16 = class extends RxDisposable {
+var _a17;
+let SheetsDataValidationRenderController = (_a17 = class extends RxDisposable {
   constructor(_commandService, _menuManagerService, _renderManagerService, _univerInstanceService, _autoHeightController, _dropdownManagerService, _sheetDataValidationModel, _dataValidatorRegistryService, _sheetInterceptorService, _editorBridgeService) {
     super(), this._commandService = _commandService, this._menuManagerService = _menuManagerService, this._renderManagerService = _renderManagerService, this._univerInstanceService = _univerInstanceService, this._autoHeightController = _autoHeightController, this._dropdownManagerService = _dropdownManagerService, this._sheetDataValidationModel = _sheetDataValidationModel, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._sheetInterceptorService = _sheetInterceptorService, this._editorBridgeService = _editorBridgeService, this._initMenu(), this._initSkeletonChange(), this._initDropdown(), this._initViewModelIntercept(), this._initAutoHeight();
   }
@@ -4436,9 +4914,9 @@ let SheetsDataValidationRenderController = (_a16 = class extends RxDisposable {
   }
   _initDropdown() {
     this._editorBridgeService && this.disposeWithMe(this._editorBridgeService.visible$.subscribe((visible) => {
-      var _a23;
+      var _a24;
       if (!visible.visible) {
-        ((_a23 = this._dropdownManagerService.activeDropdown) == null ? void 0 : _a23.trigger) === "editor-bridge" && this._dropdownManagerService.hideDropdown();
+        ((_a24 = this._dropdownManagerService.activeDropdown) == null ? void 0 : _a24.trigger) === "editor-bridge" && this._dropdownManagerService.hideDropdown();
         return;
       }
       const state = this._editorBridgeService.getEditCellState();
@@ -4479,10 +4957,10 @@ let SheetsDataValidationRenderController = (_a16 = class extends RxDisposable {
   }
   _initSkeletonChange() {
     const markSkeletonDirty = /* @__PURE__ */ __name(() => {
-      var _a23, _b, _c;
+      var _a24, _b, _c;
       const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
       if (!workbook) return;
-      const unitId = workbook.getUnitId(), subUnitId = (_a23 = workbook.getActiveSheet()) == null ? void 0 : _a23.getSheetId();
+      const unitId = workbook.getUnitId(), subUnitId = (_a24 = workbook.getActiveSheet()) == null ? void 0 : _a24.getSheetId();
       if (!subUnitId) return;
       const skeleton = (_c = (_b = this._renderManagerService.getRenderById(unitId)) == null ? void 0 : _b.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _c.skeleton, currentRender = this._renderManagerService.getRenderById(unitId);
       skeleton == null || skeleton.makeDirty(!0), skeleton == null || skeleton.calculate(), currentRender && currentRender.mainComponent.makeForceDirty();
@@ -4495,47 +4973,33 @@ let SheetsDataValidationRenderController = (_a16 = class extends RxDisposable {
       this._sheetInterceptorService.intercept(
         INTERCEPTOR_POINT.CELL_CONTENT,
         {
+          effect: InterceptorEffectEnum.Style,
           // must be after numfmt
           priority: InterceptCellContentPriority.DATA_VALIDATION,
           // eslint-disable-next-line max-lines-per-function, 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 _a24, _b, _c, _d;
+            const { row, col, unitId, subUnitId, workbook, worksheet } = pos, 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
+            const validStatus = this._sheetDataValidationModel.validator(cell, rule, pos), validator = this._dataValidatorRegistryService.getValidatorItem(rule.type), cellOrigin = pos.rawData;
+            let cache;
+            const cellValue = {
+              get value() {
+                var _a25;
+                return cache !== void 0 || (cache = (_a25 = getCellValueOrigin(cellOrigin)) != null ? _a25 : null), cache;
               }
-            }), rule.type === DataValidationType.CHECKBOX && (extra = {
-              interceptorStyle: {
-                ...cell == null ? void 0 : cell.interceptorStyle,
-                tb: WrapStrategy.CLIP
+            }, valueStr = {
+              get value() {
+                var _a25;
+                return `${(_a25 = cellValue.value) != null ? _a25 : ""}`;
               }
-            }), 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
-                  }
-                }
-              });
-            }
+            };
             return next({
               ...cell,
-              ...extra,
               dataValidation: {
                 ruleId,
                 validStatus,
@@ -4547,23 +5011,28 @@ let SheetsDataValidationRenderController = (_a16 = class extends RxDisposable {
                 ...validStatus === DataValidationStatus.INVALID ? INVALID_MARK : null
               },
               customRender: [
-                ...(_e = cell == null ? void 0 : cell.customRender) != null ? _e : [],
+                ...(_a24 = cell == null ? void 0 : cell.customRender) != null ? _a24 : [],
                 ...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: ((_b = cell == null ? void 0 : cell.fontRenderExtension) == null ? void 0 : _b.isSkip) || ((_c = validator == null ? void 0 : validator.skipDefaultFontRender) == null ? void 0 : _c.call(validator, rule, cellValue.value, pos))
               },
               interceptorStyle: {
                 ...cell == null ? void 0 : cell.interceptorStyle,
-                ...extra.interceptorStyle
+                ...validator == null ? void 0 : validator.getExtraStyle(rule, valueStr.value, {
+                  get style() {
+                    const styleMap = workbook.getStyles();
+                    return (typeof (cell == null ? void 0 : cell.s) == "string" ? styleMap.get(cell == null ? void 0 : cell.s) : cell == null ? void 0 : cell.s) || {};
+                  }
+                })
               },
               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 _a25, _b2, _c2, _d2, _e, _f;
+                const skeleton = (_b2 = (_a25 = this._renderManagerService.getRenderById(unitId)) == null ? void 0 : _a25.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 +5043,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 +5051,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")
         }
@@ -4600,15 +5069,15 @@ let SheetsDataValidationRenderController = (_a16 = class extends RxDisposable {
     ).subscribe((infos) => {
       const ranges = [];
       if (infos.forEach((info) => {
-        var _a23;
-        (_a23 = info.rule) != null && _a23.ranges && ranges.push(...info.rule.ranges);
+        var _a24;
+        (_a24 = info.rule) != null && _a24.ranges && ranges.push(...info.rule.ranges);
       }), ranges.length) {
         const mutations = this._autoHeightController.getUndoRedoParamsOfAutoHeight(ranges);
         sequenceExecute(mutations.redos, this._commandService);
       }
     });
   }
-}, __name(_a16, "SheetsDataValidationRenderController"), _a16);
+}, __name(_a17, "SheetsDataValidationRenderController"), _a17);
 SheetsDataValidationRenderController = __decorateClass$5([
   OnLifecycle(LifecycleStages.Rendered, SheetsDataValidationRenderController),
   __decorateParam$5(0, ICommandService),
@@ -4622,17 +5091,17 @@ SheetsDataValidationRenderController = __decorateClass$5([
   __decorateParam$5(8, Inject(SheetInterceptorService)),
   __decorateParam$5(9, Optional(IEditorBridgeService))
 ], SheetsDataValidationRenderController);
-var _a17;
-let SheetsDataValidationMobileRenderController = (_a17 = class extends RxDisposable {
+var _a18;
+let SheetsDataValidationMobileRenderController = (_a18 = class extends RxDisposable {
   constructor(_commandService, _renderManagerService, _univerInstanceService, _autoHeightController, _dataValidatorRegistryService, _sheetInterceptorService, _sheetDataValidationModel) {
     super(), this._commandService = _commandService, this._renderManagerService = _renderManagerService, this._univerInstanceService = _univerInstanceService, this._autoHeightController = _autoHeightController, this._dataValidatorRegistryService = _dataValidatorRegistryService, this._sheetInterceptorService = _sheetInterceptorService, this._sheetDataValidationModel = _sheetDataValidationModel, this._initSkeletonChange(), this._initViewModelIntercept(), this._initAutoHeight();
   }
   _initSkeletonChange() {
     const markSkeletonDirty = /* @__PURE__ */ __name(() => {
-      var _a23, _b, _c;
+      var _a24, _b, _c;
       const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
       if (!workbook) return;
-      const unitId = workbook.getUnitId(), subUnitId = (_a23 = workbook.getActiveSheet()) == null ? void 0 : _a23.getSheetId();
+      const unitId = workbook.getUnitId(), subUnitId = (_a24 = workbook.getActiveSheet()) == null ? void 0 : _a24.getSheetId();
       if (!subUnitId) return;
       const skeleton = (_c = (_b = this._renderManagerService.getRenderById(unitId)) == null ? void 0 : _b.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _c.skeleton, currentRender = this._renderManagerService.getRenderById(unitId);
       skeleton == null || skeleton.makeDirty(!0), skeleton == null || skeleton.calculate(), currentRender && currentRender.mainComponent.makeForceDirty();
@@ -4645,46 +5114,21 @@ let SheetsDataValidationMobileRenderController = (_a17 = class extends RxDisposa
       this._sheetInterceptorService.intercept(
         INTERCEPTOR_POINT.CELL_CONTENT,
         {
+          effect: InterceptorEffectEnum.Style,
+          // 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;
-            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 _a24, _b, _c, _d;
+            const { row, col, unitId, subUnitId, workbook, worksheet } = pos, 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 = `${cellValue != null ? cellValue : ""}`;
             return next({
               ...cell,
-              ...extra,
               dataValidation: {
                 ruleId,
                 validStatus,
@@ -4696,25 +5140,28 @@ let SheetsDataValidationMobileRenderController = (_a17 = class extends RxDisposa
                 ...validStatus === DataValidationStatus.INVALID ? INVALID_MARK : null
               },
               customRender: [
-                ...(_e = cell == null ? void 0 : cell.customRender) != null ? _e : [],
+                ...(_a24 = cell == null ? void 0 : cell.customRender) != null ? _a24 : [],
                 ...validator != null && validator.canvasRender ? [validator.canvasRender] : []
               ],
-              // @ts-ignore
               fontRenderExtension: {
-                // @ts-ignore
                 ...cell == null ? void 0 : cell.fontRenderExtension,
-                isSkip: validator == null ? void 0 : validator.skipDefaultFontRender(rule, cellValue, pos)
+                isSkip: ((_b = cell == null ? void 0 : cell.fontRenderExtension) == null ? void 0 : _b.isSkip) || ((_c = validator == null ? void 0 : validator.skipDefaultFontRender) == null ? void 0 : _c.call(validator, rule, cellValue, pos))
               },
               interceptorStyle: {
                 ...cell == null ? void 0 : cell.interceptorStyle,
-                ...extra.interceptorStyle
+                ...validator == null ? void 0 : validator.getExtraStyle(rule, valueStr, {
+                  get style() {
+                    const styleMap = workbook.getStyles();
+                    return (typeof (cell == null ? void 0 : cell.s) == "string" ? styleMap.get(cell == null ? void 0 : cell.s) : cell == null ? void 0 : cell.s) || {};
+                  }
+                })
               },
               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 _a25, _b2, _c2, _d2, _e, _f;
+                const skeleton = (_b2 = (_a25 = this._renderManagerService.getRenderById(unitId)) == null ? void 0 : _a25.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _b2.skeleton;
+                if (!skeleton)
+                  return;
+                const mergeCell = skeleton.worksheet.getMergedCell(row, col), info = {
                   data: {
                     ...cell,
                     dataValidation: {
@@ -4725,16 +5172,17 @@ let SheetsDataValidationMobileRenderController = (_a17 = class extends RxDisposa
                     }
                   },
                   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,
                   col,
-                  worksheet,
-                  workbook
+                  workbook,
+                  worksheet
                 };
-                return (_d2 = (_c2 = validator == null ? void 0 : validator.canvasRender) == null ? void 0 : _c2.calcCellAutoHeight) == null ? void 0 : _d2.call(_c2, info);
-              }, "interceptorAutoHeight")
+                return (_f = (_e = validator == null ? void 0 : validator.canvasRender) == null ? void 0 : _e.calcCellAutoHeight) == null ? void 0 : _f.call(_e, info);
+              }, "interceptorAutoHeight"),
+              coverable: ((_d = cell == null ? void 0 : cell.coverable) != null ? _d : !0) && !(rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE)
             });
           }, "handler")
         }
@@ -4748,15 +5196,15 @@ let SheetsDataValidationMobileRenderController = (_a17 = class extends RxDisposa
     ).subscribe((infos) => {
       const ranges = [];
       if (infos.forEach((info) => {
-        var _a23;
-        (_a23 = info.rule) != null && _a23.ranges && ranges.push(...info.rule.ranges);
+        var _a24;
+        (_a24 = info.rule) != null && _a24.ranges && ranges.push(...info.rule.ranges);
       }), ranges.length) {
         const mutations = this._autoHeightController.getUndoRedoParamsOfAutoHeight(ranges);
         sequenceExecute(mutations.redos, this._commandService);
       }
     });
   }
-}, __name(_a17, "SheetsDataValidationMobileRenderController"), _a17);
+}, __name(_a18, "SheetsDataValidationMobileRenderController"), _a18);
 SheetsDataValidationMobileRenderController = __decorateClass$5([
   OnLifecycle(LifecycleStages.Rendered, SheetsDataValidationMobileRenderController),
   __decorateParam$5(0, ICommandService),
@@ -4771,8 +5219,8 @@ var __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPrope
   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;
-}, "__decorateClass$4"), __decorateParam$4 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$4"), _a18;
-let SheetsDataValidationValidatorService = (_a18 = class {
+}, "__decorateClass$4"), __decorateParam$4 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$4"), _a19;
+let SheetsDataValidationValidatorService = (_a19 = class {
   constructor(_univerInstanceService, _sheetDataValidationModel, _dataValidationCacheService) {
     this._univerInstanceService = _univerInstanceService, this._sheetDataValidationModel = _sheetDataValidationModel, this._dataValidationCacheService = _dataValidationCacheService;
   }
@@ -4825,7 +5273,7 @@ let SheetsDataValidationValidatorService = (_a18 = class {
   getDataValidation(unitId, subUnitId, ranges) {
     return this.getDataValidations(unitId, subUnitId, ranges)[0];
   }
-}, __name(_a18, "SheetsDataValidationValidatorService"), _a18);
+}, __name(_a19, "SheetsDataValidationValidatorService"), _a19);
 SheetsDataValidationValidatorService = __decorateClass$4([
   __decorateParam$4(0, IUniverInstanceService),
   __decorateParam$4(1, Inject(SheetDataValidationModel)),
@@ -4835,8 +5283,8 @@ var __defProp$3 = Object.defineProperty, __getOwnPropDesc$3 = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(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$3(target, key, result), result;
-}, "__decorateClass$3"), __decorateParam$3 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$3"), __publicField$1 = /* @__PURE__ */ __name((obj, key, value) => __defNormalProp$1(obj, typeof key != "symbol" ? key + "" : key, value), "__publicField$1"), _a19;
-let UniverSheetsDataValidationMobilePlugin = (_a19 = class extends Plugin {
+}, "__decorateClass$3"), __decorateParam$3 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$3"), __publicField$1 = /* @__PURE__ */ __name((obj, key, value) => __defNormalProp$1(obj, typeof key != "symbol" ? key + "" : key, value), "__publicField$1"), _a20;
+let UniverSheetsDataValidationMobilePlugin = (_a20 = class extends Plugin {
   constructor(_config = defaultPluginConfig, _injector, _commandService, _configService) {
     super(), this._config = _config, this._injector = _injector, this._commandService = _commandService, this._configService = _configService;
     const { menu, ...rest } = this._config;
@@ -4880,7 +5328,7 @@ let UniverSheetsDataValidationMobilePlugin = (_a19 = class extends Plugin {
       this._commandService.registerCommand(command);
     });
   }
-}, __name(_a19, "UniverSheetsDataValidationMobilePlugin"), _a19);
+}, __name(_a20, "UniverSheetsDataValidationMobilePlugin"), _a20);
 __publicField$1(UniverSheetsDataValidationMobilePlugin, "pluginName", DATA_VALIDATION_PLUGIN_NAME);
 __publicField$1(UniverSheetsDataValidationMobilePlugin, "type", UniverInstanceType.UNIVER_SHEET);
 UniverSheetsDataValidationMobilePlugin = __decorateClass$3([
@@ -4893,8 +5341,8 @@ var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(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$2(target, key, result), result;
-}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$2"), _a20;
-let DataValidationAutoFillController = (_a20 = class extends Disposable {
+}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$2"), _a21;
+let DataValidationAutoFillController = (_a21 = class extends Disposable {
   constructor(_autoFillService, _dataValidationModel, _injector) {
     super(), this._autoFillService = _autoFillService, this._dataValidationModel = _dataValidationModel, this._injector = _injector, this._initAutoFill();
   }
@@ -4904,8 +5352,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 +5385,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,
@@ -4967,7 +5417,7 @@ let DataValidationAutoFillController = (_a20 = class extends Disposable {
     };
     this.disposeWithMe(this._autoFillService.addHook(hook));
   }
-}, __name(_a20, "DataValidationAutoFillController"), _a20);
+}, __name(_a21, "DataValidationAutoFillController"), _a21);
 DataValidationAutoFillController = __decorateClass$2([
   OnLifecycle(LifecycleStages.Ready, DataValidationAutoFillController),
   __decorateParam$2(0, IAutoFillService),
@@ -4978,8 +5428,8 @@ var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPrope
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(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$1(target, key, result), result;
-}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), _a21;
-let SheetDataValidationSheetController = (_a21 = class extends Disposable {
+}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), _a22;
+let SheetDataValidationSheetController = (_a22 = class extends Disposable {
   constructor(_sheetInterceptorService, _univerInstanceService, _sheetDataValidationModel) {
     super(), this._sheetInterceptorService = _sheetInterceptorService, this._univerInstanceService = _univerInstanceService, this._sheetDataValidationModel = _sheetDataValidationModel, this._initSheetChange();
   }
@@ -4987,12 +5437,12 @@ let SheetDataValidationSheetController = (_a21 = class extends Disposable {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: /* @__PURE__ */ __name((commandInfo) => {
-          var _a23;
+          var _a24;
           if (commandInfo.id === RemoveSheetCommand.id) {
             const params = commandInfo.params, unitId = params.unitId || this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getUnitId(), workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
             if (!workbook)
               return { redos: [], undos: [] };
-            const subUnitId = params.subUnitId || ((_a23 = workbook.getActiveSheet()) == null ? void 0 : _a23.getSheetId());
+            const subUnitId = params.subUnitId || ((_a24 = workbook.getActiveSheet()) == null ? void 0 : _a24.getSheetId());
             if (!subUnitId)
               return { redos: [], undos: [] };
             const rules = this._sheetDataValidationModel.getRules(unitId, subUnitId), ids = rules.map((i) => i.uid), redoParams = {
@@ -5022,7 +5472,7 @@ let SheetDataValidationSheetController = (_a21 = class extends Disposable {
       })
     );
   }
-}, __name(_a21, "SheetDataValidationSheetController"), _a21);
+}, __name(_a22, "SheetDataValidationSheetController"), _a22);
 SheetDataValidationSheetController = __decorateClass$1([
   OnLifecycle(LifecycleStages.Ready, SheetDataValidationSheetController),
   __decorateParam$1(0, Inject(SheetInterceptorService)),
@@ -5033,8 +5483,8 @@ var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnProperty
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(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 && __defProp2(target, key, result), result;
-}, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam"), __publicField2 = /* @__PURE__ */ __name((obj, key, value) => __defNormalProp2(obj, typeof key != "symbol" ? key + "" : key, value), "__publicField"), _a22;
-let UniverSheetsDataValidationPlugin = (_a22 = class extends Plugin {
+}, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam"), __publicField2 = /* @__PURE__ */ __name((obj, key, value) => __defNormalProp2(obj, typeof key != "symbol" ? key + "" : key, value), "__publicField"), _a23;
+let UniverSheetsDataValidationPlugin = (_a23 = class extends Plugin {
   constructor(_config = defaultPluginConfig, _injector, _commandService, _configService) {
     super(), this._config = _config, this._injector = _injector, this._commandService = _commandService, this._configService = _configService;
     const { menu, ...rest } = this._config;
@@ -5081,7 +5531,7 @@ let UniverSheetsDataValidationPlugin = (_a22 = class extends Plugin {
       this._commandService.registerCommand(command);
     });
   }
-}, __name(_a22, "UniverSheetsDataValidationPlugin"), _a22);
+}, __name(_a23, "UniverSheetsDataValidationPlugin"), _a23);
 __publicField2(UniverSheetsDataValidationPlugin, "pluginName", DATA_VALIDATION_PLUGIN_NAME);
 __publicField2(UniverSheetsDataValidationPlugin, "type", UniverInstanceType.UNIVER_SHEET);
 UniverSheetsDataValidationPlugin = __decorateClass([