@univerjs/sheets-data-validation-ui 1.0.0-alpha.8 → 1.0.0-beta.1

package/lib/es/index.js

@@ -1,5 +1,5 @@
-import { ComponentManager, IDialogService, IMenuManagerService, ISidebarService, IconManager, KeyCode, MenuItemType, RibbonDataGroup, RibbonInsertGroup, UniverMobileUIPlugin, UniverUIPlugin, getMenuHiddenObservable, useDependency, useEvent, useObservable, useSidebarClick } from "@univerjs/ui";
-import { CellValueType, ColorKit, CommandType, DEFAULT_STYLES, DataValidationErrorStyle, DataValidationRenderMode, DataValidationStatus, DataValidationType, DependentOn, Disposable, DisposableCollection, HorizontalAlign, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, LocaleService, ObjectMatrix, Optional, Plugin, Range, Rectangle, RedoCommand, RxDisposable, ThemeService, UndoCommand, UniverInstanceType, VerticalAlign, WrapStrategy, bufferDebounceTime, dateKit, debounce, generateRandomId, isFormulaString, isUnitRangesEqual, merge, numfmt, queryObjectMatrix, sequenceExecute, shallowEqual, toDisposable } from "@univerjs/core";
+import { ComponentManager, IDialogService, IMenuManagerService, ISidebarService, IconManager, KeyCode, MenuItemType, RibbonDataGroup, RibbonInsertGroup, UniverMobileUIPlugin, getMenuHiddenObservable, useDependency, useEvent, useObservable, useSidebarClick } from "@univerjs/ui";
+import { CellValueType, ColorKit, CommandType, DEFAULT_STYLES, DataValidationErrorStyle, DataValidationRenderMode, DataValidationStatus, DataValidationType, DependentOn, Disposable, DisposableCollection, HorizontalAlign, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, LocaleService, Optional, Plugin, Rectangle, RedoCommand, RxDisposable, ThemeService, UndoCommand, UniverInstanceType, VerticalAlign, WrapStrategy, bufferDebounceTime, dateKit, debounce, generateRandomId, getIntersectRange, isFormulaString, isUnitRangesEqual, merge, numfmt, sequenceExecute, shallowEqual, toDisposable } from "@univerjs/core";
 import { AUTO_FILL_APPLY_TYPE, AutoFillTools, IAutoFillService, INTERCEPTOR_POINT, InterceptCellContentPriority, RangeProtectionPermissionEditPoint, SetRangeValuesCommand, SetWorksheetActiveOperation, SheetInterceptorService, SheetPermissionCheckController, SheetsSelectionsService, UniverSheetsPlugin, VALIDATE_CELL, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, checkRangesEditablePermission, deserializeListOptions, getSheetCommandTarget, rangeToDiscreteRange, serializeListOptions } from "@univerjs/sheets";
 import { AddSheetDataValidationCommand, BASE_FORMULA_INPUT_NAME, CHECKBOX_FORMULA_1, CHECKBOX_FORMULA_2, CHECKBOX_FORMULA_INPUT_NAME, CUSTOM_FORMULA_INPUT_NAME, ClearRangeDataValidationCommand, DATA_VALIDATION_PLUGIN_NAME, DataValidationCacheService, DataValidationFormulaController, DataValidationFormulaService, LIST_FORMULA_INPUT_NAME, RemoveSheetAllDataValidationCommand, RemoveSheetDataValidationCommand, SheetDataValidationModel, SheetsDataValidationValidatorService, UniverSheetsDataValidationPlugin, UpdateSheetDataValidationOptionsCommand, UpdateSheetDataValidationRangeCommand, UpdateSheetDataValidationSettingCommand, createDefaultNewRule, getCellValueOrigin, getDataValidationCellValue, getDataValidationDiffMutations, getFormulaResult, isLegalFormulaResult, transformCheckboxValue } from "@univerjs/sheets-data-validation";
 import { DataValidationModel, DataValidatorDropdownType, DataValidatorRegistryScope, DataValidatorRegistryService, TWO_FORMULA_OPERATOR_COUNT, UniverDataValidationPlugin, getRuleOptions, getRuleSetting } from "@univerjs/data-validation";
@@ -161,7 +161,8 @@ const defaultPluginConfig = {};
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-const DROP_DOWN_DEFAULT_COLOR = "#ECECEC";
+const DROP_DOWN_DEFAULT_COLOR = "gray.100";
+const DROP_DOWN_ICON_COLOR = "gray.600";
 
 //#endregion
 //#region src/controllers/dv-reject-input.controller.ts
@@ -302,7 +303,7 @@ let DataValidationDropdownManagerService = class DataValidationDropdownManagerSe
 		if (!(validator === null || validator === void 0 ? void 0 : validator.dropdownType)) return;
 		let popupDisposable;
 		const handleSave = async (date, targetPatternType) => {
-			var _numfmt$parseDate, _cellStyle$n$pattern, _cellStyle$n;
+			var _numfmt$parseDate, _cellStyle$n;
 			if (!date) return true;
 			const newValue = date;
 			const cellData = worksheet.getCell(row, col);
@@ -310,7 +311,7 @@ let DataValidationDropdownManagerService = class DataValidationDropdownManagerSe
 			const serialNum = (_numfmt$parseDate = numfmt.parseDate(dateStr)) === null || _numfmt$parseDate === void 0 ? void 0 : _numfmt$parseDate.v;
 			const serialTime = targetPatternType === "time" ? serialNum % 1 : serialNum;
 			const cellStyle = workbook.getStyles().getStyleByCell(cellData);
-			const format = (_cellStyle$n$pattern = cellStyle === null || cellStyle === void 0 || (_cellStyle$n = cellStyle.n) === null || _cellStyle$n === void 0 ? void 0 : _cellStyle$n.pattern) !== null && _cellStyle$n$pattern !== void 0 ? _cellStyle$n$pattern : "";
+			const format = (cellStyle === null || cellStyle === void 0 || (_cellStyle$n = cellStyle.n) === null || _cellStyle$n === void 0 ? void 0 : _cellStyle$n.pattern) ?? "";
 			if (rule.errorStyle !== DataValidationErrorStyle.STOP || await validator.validator({
 				value: serialTime,
 				unitId,
@@ -404,11 +405,10 @@ let DataValidationDropdownManagerService = class DataValidationDropdownManagerSe
 			}
 			case DataValidatorDropdownType.LIST:
 			case DataValidatorDropdownType.MULTIPLE_LIST: {
-				var _this$_configService$, _this$_configService$2, _this$_configService$3, _this$_configService$4;
+				var _this$_configService$, _this$_configService$2;
 				const multiple = validator.dropdownType === DataValidatorDropdownType.MULTIPLE_LIST;
 				const handleSave = async (newValue) => {
-					var _newValue$;
-					const str = multiple ? serializeListOptions(newValue) : (_newValue$ = newValue[0]) !== null && _newValue$ !== void 0 ? _newValue$ : "";
+					const str = multiple ? serializeListOptions(newValue) : newValue[0] ?? "";
 					const params = {
 						unitId,
 						subUnitId,
@@ -450,19 +450,18 @@ let DataValidationDropdownManagerService = class DataValidationDropdownManagerSe
 						options: list.map((item) => ({
 							label: item.label,
 							value: item.label,
-							color: showColor || item.color ? item.color || "#ECECEC" : "transparent"
+							color: showColor || item.color ? item.color || "gray.100" : "transparent"
 						})),
 						onEdit: handleEdit,
 						defaultValue: cellStr,
 						multiple,
-						showEdit: (_this$_configService$ = (_this$_configService$2 = this._configService.getConfig("sheets-data-validation-ui.config")) === null || _this$_configService$2 === void 0 ? void 0 : _this$_configService$2.showEditOnDropdown) !== null && _this$_configService$ !== void 0 ? _this$_configService$ : true,
-						showSearch: (_this$_configService$3 = (_this$_configService$4 = this._configService.getConfig("sheets-data-validation-ui.config")) === null || _this$_configService$4 === void 0 ? void 0 : _this$_configService$4.showSearchOnDropdown) !== null && _this$_configService$3 !== void 0 ? _this$_configService$3 : true
+						showEdit: ((_this$_configService$ = this._configService.getConfig("sheets-data-validation-ui.config")) === null || _this$_configService$ === void 0 ? void 0 : _this$_configService$.showEditOnDropdown) ?? true,
+						showSearch: ((_this$_configService$2 = this._configService.getConfig("sheets-data-validation-ui.config")) === null || _this$_configService$2 === void 0 ? void 0 : _this$_configService$2.showSearchOnDropdown) ?? true
 					}
 				};
 				break;
 			}
 			case DataValidatorDropdownType.CASCADE: {
-				var _rule$formula;
 				const handleSave = (newValue) => {
 					const params = {
 						unitId,
@@ -494,7 +493,7 @@ let DataValidationDropdownManagerService = class DataValidationDropdownManagerSe
 					props: {
 						onChange: handleSave,
 						defaultValue: getDataValidationCellValue(worksheet.getCellRaw(row, col)).split("/"),
-						options: JSON.parse((_rule$formula = rule.formula1) !== null && _rule$formula !== void 0 ? _rule$formula : "[]")
+						options: JSON.parse(rule.formula1 ?? "[]")
 					},
 					location
 				};
@@ -776,7 +775,7 @@ function DropdownPresets({ onChange }) {
 				children: presets.map((values) => /* @__PURE__ */ jsx("button", {
 					type: "button",
 					"aria-label": values.join(" / "),
-					className: "univer-flex univer-min-h-20 univer-cursor-pointer univer-flex-col univer-items-start univer-gap-1.5 univer-rounded-md univer-border-0 univer-bg-gray-50 univer-p-3 univer-text-left univer-text-sm univer-leading-5 univer-text-gray-900 univer-transition-colors hover:univer-bg-gray-100 focus-visible:univer-outline-none focus-visible:univer-ring-2 focus-visible:univer-ring-primary-600 focus-visible:univer-ring-offset-0 dark:!univer-bg-gray-800 dark:!univer-text-white dark:hover:!univer-bg-gray-700",
+					className: "univer-flex univer-min-h-20 univer-cursor-pointer univer-flex-col univer-items-start univer-gap-1.5 univer-rounded-md univer-border-0 univer-bg-gray-50 univer-p-3 univer-text-left univer-text-sm univer-leading-5 univer-text-gray-900 univer-transition-colors hover:univer-bg-gray-100 focus-visible:univer-outline-none focus-visible:univer-ring-2 focus-visible:univer-ring-primary-600 focus-visible:univer-ring-offset-0 dark:!univer-bg-gray-800 dark:!univer-text-gray-0 dark:hover:!univer-bg-gray-700",
 					onClick: () => onChange(serializeListOptions(values)),
 					children: values.map((value) => /* @__PURE__ */ jsx("span", {
 						className: "univer-w-full univer-break-words",
@@ -991,19 +990,18 @@ const menuSchema = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-data-validation-ui";
-var version = "1.0.0-alpha.8";
+var version = "1.0.0-beta.1";
 
 //#endregion
 //#region src/views/components/DataValidationOptions.tsx
 function DataValidationOptions(props) {
-	var _value$errorStyle;
 	const localeService = useDependency(LocaleService);
 	const componentManager = useDependency(ComponentManager);
 	const { value, onChange, extraComponent } = props;
 	const [show, setShow] = useState(false);
 	const ExtraOptions = extraComponent ? componentManager.get(extraComponent) : null;
 	return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs("div", {
-		className: "univer-mb-3 univer-flex univer-cursor-pointer univer-items-center univer-text-sm univer-text-gray-900 dark:!univer-text-white",
+		className: "univer-mb-3 univer-flex univer-cursor-pointer univer-items-center univer-text-sm univer-text-gray-900 dark:!univer-text-gray-0",
 		onClick: () => setShow(!show),
 		children: [localeService.t("sheets-data-validation-ui.panel.options"), show ? /* @__PURE__ */ jsx(MoreUpIcon, { className: "univer-ml-1" }) : /* @__PURE__ */ jsx(MoreDownIcon, { className: "univer-ml-1" })]
 	}), show && /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -1014,7 +1012,7 @@ function DataValidationOptions(props) {
 		/* @__PURE__ */ jsx(FormLayout, {
 			label: localeService.t("sheets-data-validation-ui.panel.invalid"),
 			children: /* @__PURE__ */ jsxs(RadioGroup, {
-				value: `${(_value$errorStyle = value.errorStyle) !== null && _value$errorStyle !== void 0 ? _value$errorStyle : DataValidationErrorStyle.WARNING}`,
+				value: `${value.errorStyle ?? DataValidationErrorStyle.WARNING}`,
 				onChange: (errorStyle) => onChange({
 					...value,
 					errorStyle: +errorStyle
@@ -1074,7 +1072,7 @@ function DataValidationDetail() {
 	} });
 }
 function DataValidationDetailInner(props) {
-	var _validators$sort, _localRule$allowBlank;
+	var _validators$sort;
 	const [key, setKey] = useState(0);
 	const dataValidationPanelService = useDependency(DataValidationPanelService);
 	const { unitId, subUnitId, rule } = props.activeRuleInfo;
@@ -1086,10 +1084,7 @@ function DataValidationDetailInner(props) {
 	const dataValidationModel = useDependency(DataValidationModel);
 	const localeService = useDependency(LocaleService);
 	const workbook = useObservable(() => univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET), void 0, void 0, []);
-	const worksheet = useObservable(() => {
-		var _workbook$activeSheet;
-		return (_workbook$activeSheet = workbook === null || workbook === void 0 ? void 0 : workbook.activeSheet$) !== null && _workbook$activeSheet !== void 0 ? _workbook$activeSheet : of(null);
-	}, void 0, void 0, []);
+	const worksheet = useObservable(() => (workbook === null || workbook === void 0 ? void 0 : workbook.activeSheet$) ?? of(null), void 0, void 0, []);
 	const [localRule, setLocalRule] = useState(rule);
 	const validator = validatorService.getValidatorItem(localRule.type);
 	const [showError, setShowError] = useState(false);
@@ -1337,14 +1332,11 @@ function DataValidationDetailInner(props) {
 				ruleId
 			}, key + localRule.type) : null,
 			/* @__PURE__ */ jsx(FormLayout, { children: /* @__PURE__ */ jsx(Checkbox, {
-				checked: (_localRule$allowBlank = localRule.allowBlank) !== null && _localRule$allowBlank !== void 0 ? _localRule$allowBlank : true,
-				onChange: () => {
-					var _localRule$allowBlank2;
-					return handleUpdateRuleSetting({
-						...baseRule,
-						allowBlank: !((_localRule$allowBlank2 = localRule.allowBlank) !== null && _localRule$allowBlank2 !== void 0 ? _localRule$allowBlank2 : true)
-					});
-				},
+				checked: localRule.allowBlank ?? true,
+				onChange: () => handleUpdateRuleSetting({
+					...baseRule,
+					allowBlank: !(localRule.allowBlank ?? true)
+				}),
 				children: localeService.t("sheets-data-validation-ui.panel.allowBlank")
 			}) }),
 			/* @__PURE__ */ jsx(DataValidationOptions, {
@@ -1381,10 +1373,9 @@ const DataValidationItem = (props) => {
 	const [isHover, setIsHover] = useState(false);
 	const themeService = useDependency(ThemeService);
 	const style = useMemo(() => {
-		var _themeService$getColo;
 		const defaultColor = themeService.getColorFromTheme("primary.600");
 		const key = themeService.getColorFromTheme("loop-color.2");
-		const color = (_themeService$getColo = themeService.getColorFromTheme(key)) !== null && _themeService$getColo !== void 0 ? _themeService$getColo : defaultColor;
+		const color = themeService.getColorFromTheme(key) ?? defaultColor;
 		const rgb = new ColorKit(color).toRgb();
 		return {
 			fill: `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, 0.1)`,
@@ -1410,7 +1401,7 @@ const DataValidationItem = (props) => {
 		};
 	}, [markSelectionService]);
 	return /* @__PURE__ */ jsxs("div", {
-		className: clsx("univer-bg-secondary univer-relative univer--mx-2 univer-box-border univer-flex univer-w-[287px] univer-cursor-pointer univer-flex-col univer-justify-between univer-overflow-hidden univer-rounded-md univer-p-2 univer-pr-9", {
+		className: clsx("univer-bg-secondary univer-relative univer--mx-2 univer-box-border univer-flex univer-w-[287px] univer-cursor-pointer univer-flex-col univer-justify-between univer-overflow-hidden univer-rounded-md univer-p-2 univer-pr-9 rtl:univer-pl-9 rtl:univer-pr-2", {
 			"hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-700": !disable,
 			"univer-opacity-50": disable
 		}),
@@ -1434,7 +1425,7 @@ const DataValidationItem = (props) => {
 		},
 		children: [
 			/* @__PURE__ */ jsx("div", {
-				className: "univer-truncate univer-text-sm univer-font-medium univer-leading-[22px] univer-text-gray-900 dark:!univer-text-white",
+				className: "univer-truncate univer-text-sm univer-font-medium univer-leading-[22px] univer-text-gray-900 dark:!univer-text-gray-0",
 				children: validator === null || validator === void 0 ? void 0 : validator.generateRuleName(rule)
 			}),
 			/* @__PURE__ */ jsx("div", {
@@ -1442,7 +1433,7 @@ const DataValidationItem = (props) => {
 				children: rule.ranges.map((range) => serializeRange(range)).join(",")
 			}),
 			isHover && /* @__PURE__ */ jsx("div", {
-				className: "univer-absolute univer-right-2 univer-top-[19px] univer-flex univer-size-5 univer-items-center univer-justify-center univer-rounded hover:univer-bg-gray-200 dark:!univer-text-gray-300 dark:hover:!univer-bg-gray-700",
+				className: "univer-absolute univer-right-2 univer-top-[19px] univer-flex univer-size-5 univer-items-center univer-justify-center univer-rounded hover:univer-bg-gray-200 rtl:univer-left-2 rtl:univer-right-auto dark:!univer-text-gray-300 dark:hover:!univer-bg-gray-700",
 				onClick: handleDelete,
 				children: /* @__PURE__ */ jsx(DeleteIcon, {})
 			})
@@ -1505,23 +1496,20 @@ function DataValidationList(props) {
 	const hasDisableRule = rulesByPermissionCheck === null || rulesByPermissionCheck === void 0 ? void 0 : rulesByPermissionCheck.some((rule) => rule.disable);
 	return /* @__PURE__ */ jsxs("div", {
 		className: "univer-pb-4",
-		children: [rulesByPermissionCheck === null || rulesByPermissionCheck === void 0 ? void 0 : rulesByPermissionCheck.map((rule) => {
-			var _rule$disable;
-			return /* @__PURE__ */ jsx(DataValidationItem, {
-				unitId,
-				subUnitId,
-				onClick: () => {
-					if (rule.disable) return;
-					dataValidationPanelService.setActiveRule({
-						unitId,
-						subUnitId,
-						rule
-					});
-				},
-				rule,
-				disable: (_rule$disable = rule.disable) !== null && _rule$disable !== void 0 ? _rule$disable : false
-			}, rule.uid);
-		}), /* @__PURE__ */ jsxs("div", {
+		children: [rulesByPermissionCheck === null || rulesByPermissionCheck === void 0 ? void 0 : rulesByPermissionCheck.map((rule) => /* @__PURE__ */ jsx(DataValidationItem, {
+			unitId,
+			subUnitId,
+			onClick: () => {
+				if (rule.disable) return;
+				dataValidationPanelService.setActiveRule({
+					unitId,
+					subUnitId,
+					rule
+				});
+			},
+			rule,
+			disable: rule.disable ?? false
+		}, rule.uid)), /* @__PURE__ */ jsxs("div", {
 			className: "univer-mt-4 univer-flex univer-flex-row univer-justify-end univer-gap-2",
 			children: [rules.length && !hasDisableRule ? /* @__PURE__ */ jsx(Button, {
 				onClick: handleRemoveAll,
@@ -1542,10 +1530,7 @@ const DataValidationPanel = () => {
 	const activeRule = useObservable(dataValidationPanelService.activeRule$, dataValidationPanelService.activeRule);
 	const univerInstanceService = useDependency(IUniverInstanceService);
 	const workbook = useObservable(() => univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET), void 0, void 0, []);
-	const worksheet = useObservable(() => {
-		var _workbook$activeSheet;
-		return (_workbook$activeSheet = workbook === null || workbook === void 0 ? void 0 : workbook.activeSheet$) !== null && _workbook$activeSheet !== void 0 ? _workbook$activeSheet : of(null);
-	}, void 0, void 0, []);
+	const worksheet = useObservable(() => (workbook === null || workbook === void 0 ? void 0 : workbook.activeSheet$) ?? of(null), void 0, void 0, []);
 	if (!workbook || !worksheet) return null;
 	return activeRule && (activeRule.subUnitId === worksheet.getSheetId() || activeRule.subUnitId === dataValidationPanelService.getFocusFormulaEditorActiveRuleSubUnitId()) ? /* @__PURE__ */ jsx(DataValidationDetail, {}, activeRule.rule.uid) : /* @__PURE__ */ jsx(DataValidationList, { workbook });
 };
@@ -1687,7 +1672,6 @@ function CheckboxFormulaInput(props) {
 //#endregion
 //#region src/views/components/formula-input/CustomFormulaInput.tsx
 function CustomFormulaInput(props) {
-	var _value$formula;
 	const { unitId, subUnitId, value, onChange, showError, validResult } = props;
 	const formula1Res = showError ? validResult === null || validResult === void 0 ? void 0 : validResult.formula1 : void 0;
 	const formulaEditorRef = useRef(null);
@@ -1700,14 +1684,14 @@ function CustomFormulaInput(props) {
 		error: formula1Res,
 		children: /* @__PURE__ */ jsx(FormulaEditor, {
 			ref: formulaEditorRef,
-			className: clsx("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-white [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent", borderClassName),
-			initValue: (_value$formula = value === null || value === void 0 ? void 0 : value.formula1) !== null && _value$formula !== void 0 ? _value$formula : "=",
+			className: clsx("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-gray-0 univer-pt-2 univer-transition-colors hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-gray-0 [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent", borderClassName),
+			initValue: (value === null || value === void 0 ? void 0 : value.formula1) ?? "=",
 			unitId,
 			subUnitId,
 			isFocus: isFocusFormulaEditor,
 			isSupportAcrossSheet: true,
 			onChange: (newValue) => {
-				const newFormula = (newValue !== null && newValue !== void 0 ? newValue : "").trim();
+				const newFormula = (newValue ?? "").trim();
 				if (newFormula === (value === null || value === void 0 ? void 0 : value.formula1)) return;
 				onChange === null || onChange === void 0 || onChange({
 					...value,
@@ -1781,6 +1765,9 @@ const DEFAULT_COLOR_PRESET = [
 const ColorSelect = (props) => {
 	const { value, onChange, disabled } = props;
 	const [open, setOpen] = useState(false);
+	const themeService = useDependency(ThemeService);
+	useObservable(themeService.currentTheme$);
+	const backgroundColor = value.includes(".") && themeService.isValidThemeColor(value) ? themeService.getColorFromTheme(value) : value;
 	return /* @__PURE__ */ jsx(Dropdown, {
 		align: "start",
 		disabled,
@@ -1798,10 +1785,10 @@ const ColorSelect = (props) => {
 			}, color))
 		}),
 		children: /* @__PURE__ */ jsxs("div", {
-			className: clsx("univer-box-border univer-inline-flex univer-h-8 univer-w-16 univer-cursor-pointer univer-items-center univer-justify-between univer-gap-2 univer-rounded-lg univer-bg-white univer-px-2.5 univer-transition-colors univer-duration-200 hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-white", borderClassName),
+			className: clsx("univer-box-border univer-inline-flex univer-h-8 univer-w-16 univer-cursor-pointer univer-items-center univer-justify-between univer-gap-2 univer-rounded-lg univer-bg-gray-0 univer-px-2.5 univer-transition-colors univer-duration-200 hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-gray-0", borderClassName),
 			children: [/* @__PURE__ */ jsx("div", {
 				className: "univer-box-border univer-size-4 univer-rounded univer-text-base",
-				style: { background: value }
+				style: { background: backgroundColor }
 			}), /* @__PURE__ */ jsx(MoreDownIcon, {})]
 		})
 	});
@@ -1886,7 +1873,7 @@ function ListFormulaInput(props) {
 		const strColors = formula2.split(",");
 		return strOptions.map((label, i) => ({
 			label,
-			color: strColors[i] || "#ECECEC",
+			color: strColors[i] || "gray.100",
 			isRef: false,
 			id: generateRandomId(4)
 		}));
@@ -1907,7 +1894,7 @@ function ListFormulaInput(props) {
 	};
 	const refFinalList = useMemo(() => refOptions.map((label, i) => ({
 		label,
-		color: refColors[i] || "#ECECEC",
+		color: refColors[i] || "gray.100",
 		id: `${i}`,
 		isRef: true
 	})), [refColors, refOptions]);
@@ -1997,7 +1984,7 @@ function ListFormulaInput(props) {
 		error: formula1Res || localError || void 0,
 		children: [/* @__PURE__ */ jsx(FormulaEditor, {
 			ref: formulaEditorRef,
-			className: clsx("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-white [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent", borderClassName),
+			className: clsx("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-gray-0 univer-pt-2 univer-transition-colors hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-gray-0 [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent", borderClassName),
 			initValue: formulaStr,
 			unitId,
 			subUnitId,
@@ -2005,7 +1992,7 @@ function ListFormulaInput(props) {
 			isSupportAcrossSheet: true,
 			onFocus: () => setIsFocusFormulaEditor(true),
 			onChange: (v = "") => {
-				const str = (v !== null && v !== void 0 ? v : "").trim();
+				const str = (v ?? "").trim();
 				setFormulaStrCopy(str);
 				updateFormula(str);
 			}
@@ -2056,13 +2043,12 @@ const FORMULA_INPUTS = [
 //#region src/views/components/ListRenderModeInput.tsx
 const LIST_RENDER_MODE_OPTION_INPUT = "LIST_RENDER_MODE_OPTION_INPUT";
 function ListRenderModeInput(props) {
-	var _value$renderMode;
 	const { value, onChange } = props;
 	const localeService = useDependency(LocaleService);
 	return /* @__PURE__ */ jsx(FormLayout, {
 		label: localeService.t("sheets-data-validation-ui.renderMode.label"),
 		children: /* @__PURE__ */ jsxs(RadioGroup, {
-			value: `${(_value$renderMode = value.renderMode) !== null && _value$renderMode !== void 0 ? _value$renderMode : DataValidationRenderMode.CUSTOM}`,
+			value: `${value.renderMode ?? DataValidationRenderMode.CUSTOM}`,
 			onChange: (renderMode) => onChange({
 				...value,
 				renderMode: +renderMode
@@ -2221,52 +2207,36 @@ let DataValidationAutoFillController = class DataValidationAutoFillController ex
 			const ruleMatrixCopy = this._sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone();
 			const virtualRange = virtualizeDiscreteRanges([sourceRange, targetRange]);
 			const [vSourceRange, vTargetRange] = virtualRange.ranges;
-			const { mapFunc } = virtualRange;
-			const sourceStartCell = {
-				row: vSourceRange.startRow,
-				col: vSourceRange.startColumn
-			};
+			const { mapRange, projectRange } = virtualRange;
 			const repeats = AutoFillTools.getAutoFillRepeatRange(vSourceRange, vTargetRange);
-			const additionMatrix = new ObjectMatrix();
-			const additionRules = /* @__PURE__ */ new Set();
-			repeats.forEach((repeat) => {
-				const targetStartCell = repeat.repeatStartCell;
-				const relativeRange = repeat.relativeRange;
-				const sourceRange = {
-					startRow: sourceStartCell.row,
-					startColumn: sourceStartCell.col,
-					endColumn: sourceStartCell.col,
-					endRow: sourceStartCell.row
-				};
-				const targetRange = {
-					startRow: targetStartCell.row,
-					startColumn: targetStartCell.col,
-					endColumn: targetStartCell.col,
-					endRow: targetStartCell.row
-				};
-				Range.foreach(relativeRange, (row, col) => {
-					const sourcePositionRange = Rectangle.getPositionRange({
-						startRow: row,
-						startColumn: col,
-						endColumn: col,
-						endRow: row
-					}, sourceRange);
-					const { row: sourceRow, col: sourceCol } = mapFunc(sourcePositionRange.startRow, sourcePositionRange.startColumn);
-					const ruleId = this._sheetDataValidationModel.getRuleIdByLocation(unitId, subUnitId, sourceRow, sourceCol) || "";
-					const targetPositionRange = Rectangle.getPositionRange({
-						startRow: row,
-						startColumn: col,
-						endColumn: col,
-						endRow: row
-					}, targetRange);
-					const { row: targetRow, col: targetCol } = mapFunc(targetPositionRange.startRow, targetPositionRange.startColumn);
-					additionMatrix.setValue(targetRow, targetCol, ruleId);
-					additionRules.add(ruleId);
+			const additionsByRuleId = /* @__PURE__ */ new Map();
+			additionsByRuleId.set("", repeats.flatMap((repeat) => mapRange(Rectangle.getPositionRange(repeat.relativeRange, {
+				startRow: repeat.repeatStartCell.row,
+				endRow: repeat.repeatStartCell.row,
+				startColumn: repeat.repeatStartCell.col,
+				endColumn: repeat.repeatStartCell.col
+			}))));
+			this._sheetDataValidationModel.getRules(unitId, subUnitId).forEach((rule) => {
+				const relativeSourceRanges = rule.ranges.flatMap((range) => {
+					const projected = projectRange(range);
+					const intersected = projected && getIntersectRange(projected, vSourceRange);
+					return intersected ? [Rectangle.getRelativeRange(intersected, vSourceRange)] : [];
 				});
+				const targetRanges = repeats.flatMap((repeat) => relativeSourceRanges.flatMap((sourceRange) => {
+					const copiedRange = getIntersectRange(sourceRange, repeat.relativeRange);
+					if (!copiedRange) return [];
+					return mapRange(Rectangle.getPositionRange(copiedRange, {
+						startRow: repeat.repeatStartCell.row,
+						endRow: repeat.repeatStartCell.row,
+						startColumn: repeat.repeatStartCell.col,
+						endColumn: repeat.repeatStartCell.col
+					}));
+				}));
+				if (targetRanges.length) additionsByRuleId.set(rule.uid, targetRanges);
 			});
-			const additions = Array.from(additionRules).map((id) => ({
+			const additions = Array.from(additionsByRuleId, ([id, ranges]) => ({
 				id,
-				ranges: queryObjectMatrix(additionMatrix, (value) => value === id)
+				ranges: ranges.length > 1 ? Rectangle.mergeRanges(ranges) : ranges
 			}));
 			ruleMatrixCopy.addRangeRules(additions);
 			const { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, ruleMatrixCopy.diff(this._sheetDataValidationModel.getRules(unitId, subUnitId)), this._injector, "patched", applyType === AUTO_FILL_APPLY_TYPE.ONLY_FORMAT);
@@ -2279,13 +2249,8 @@ let DataValidationAutoFillController = class DataValidationAutoFillController ex
 			id: DATA_VALIDATION_PLUGIN_NAME,
 			onBeforeFillData: (location) => {
 				const { source: sourceRange, unitId, subUnitId } = location;
-				for (const row of sourceRange.rows) for (const col of sourceRange.cols) {
-					const dv = this._sheetDataValidationModel.getRuleByLocation(unitId, subUnitId, row, col);
-					if (dv && dv.type === DataValidationType.CHECKBOX) {
-						this._autoFillService.setDisableApplyType(AUTO_FILL_APPLY_TYPE.SERIES, true);
-						return;
-					}
-				}
+				const { projectRange } = virtualizeDiscreteRanges([sourceRange]);
+				if (this._sheetDataValidationModel.getRules(unitId, subUnitId).some((rule) => rule.type === DataValidationType.CHECKBOX && rule.ranges.some((range) => projectRange(range) !== null))) this._autoFillService.setDisableApplyType(AUTO_FILL_APPLY_TYPE.SERIES, true);
 			},
 			onFillData: (location, direction, applyType) => {
 				if (applyType === AUTO_FILL_APPLY_TYPE.COPY || applyType === AUTO_FILL_APPLY_TYPE.ONLY_FORMAT || applyType === AUTO_FILL_APPLY_TYPE.SERIES) return generalApplyFunc(location, applyType);
@@ -2334,25 +2299,31 @@ let DataValidationCopyPasteController = class DataValidationCopyPasteController
 		});
 	}
 	_collect(unitId, subUnitId, range) {
-		const matrix = new ObjectMatrix();
+		const rules = /* @__PURE__ */ new Map();
 		this._copyInfo = {
 			unitId,
 			subUnitId,
-			matrix
+			rules
 		};
 		const discreteRange = this._injector.invoke((accessor) => {
 			return rangeToDiscreteRange(range, accessor, unitId, subUnitId);
 		});
 		if (!discreteRange) return;
-		const { rows, cols } = discreteRange;
-		rows.forEach((row, rowIndex) => {
-			cols.forEach((col, colIndex) => {
-				const ruleId = this._sheetDataValidationModel.getRuleIdByLocation(unitId, subUnitId, row, col);
-				matrix.setValue(rowIndex, colIndex, ruleId !== null && ruleId !== void 0 ? ruleId : "");
+		const { projectRange } = virtualizeDiscreteRanges([discreteRange]);
+		this._sheetDataValidationModel.getRules(unitId, subUnitId).forEach((rule) => {
+			const projectedRanges = rule.ranges.flatMap((ruleRange) => {
+				const projected = projectRange(ruleRange);
+				return projected ? [projected] : [];
 			});
+			if (projectedRanges.length) rules.set(rule.uid, projectedRanges.length > 1 ? Rectangle.mergeRanges(projectedRanges) : projectedRanges);
 		});
 	}
 	_generateMutations(pasteFrom, pasteTo, payload) {
+		const copyInfo = this._copyInfo;
+		if (!copyInfo) return {
+			redos: [],
+			undos: []
+		};
 		const { unitId: copyUnitId, subUnitId: copySubUnitId, range: copyRange } = pasteFrom;
 		const { unitId: pastedUnitId, subUnitId: pastedSubUnitId, range: pastedRange } = pasteTo;
 		const { copyType = COPY_TYPE.COPY } = payload;
@@ -2370,51 +2341,38 @@ let DataValidationCopyPasteController = class DataValidationCopyPasteController
 				undos: []
 			};
 		}
+		const sourceVirtualRange = virtualizeDiscreteRanges([copyRange]).ranges[0];
+		const targetVirtualization = virtualizeDiscreteRanges([pastedRange]);
+		const targetVirtualRange = targetVirtualization.ranges[0];
+		const repeatRange = getRepeatRange(sourceVirtualRange, targetVirtualRange, true);
+		const clearTargetRanges = targetVirtualization.mapRange(targetVirtualRange);
+		const getTargetRanges = (sourceRanges) => repeatRange.flatMap(({ startRange }) => sourceRanges.flatMap((sourceRange) => targetVirtualization.mapRange(Rectangle.getPositionRange(sourceRange, startRange))));
 		if (pastedUnitId !== copyUnitId || pastedSubUnitId !== copySubUnitId) {
 			const ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(pastedUnitId, pastedSubUnitId).clone();
-			const additionMatrix = new ObjectMatrix();
-			const addRules = /* @__PURE__ */ new Set();
-			const { ranges: [vCopyRange, vPastedRange], mapFunc } = virtualizeDiscreteRanges([copyRange, pastedRange]);
-			const repeatRange = getRepeatRange(vCopyRange, vPastedRange, true);
 			const additionRules = /* @__PURE__ */ new Map();
-			repeatRange.forEach(({ startRange }) => {
-				var _this$_copyInfo;
-				(_this$_copyInfo = this._copyInfo) === null || _this$_copyInfo === void 0 || _this$_copyInfo.matrix.forValue((row, col, ruleId) => {
-					const range = Rectangle.getPositionRange({
-						startRow: row,
-						endRow: row,
-						startColumn: col,
-						endColumn: col
-					}, startRange);
-					const transformedRuleId = `${copySubUnitId}-${ruleId}`;
-					const oldRule = this._sheetDataValidationModel.getRuleById(copyUnitId, copySubUnitId, ruleId);
-					if (!this._sheetDataValidationModel.getRuleById(pastedUnitId, pastedSubUnitId, transformedRuleId) && oldRule) additionRules.set(transformedRuleId, {
-						...oldRule,
-						uid: transformedRuleId
-					});
-					const { row: startRow, col: startColumn } = mapFunc(range.startRow, range.startColumn);
-					addRules.add(transformedRuleId);
-					additionMatrix.setValue(startRow, startColumn, transformedRuleId);
+			const additions = [{
+				id: "",
+				ranges: clearTargetRanges
+			}];
+			copyInfo.rules.forEach((ranges, ruleId) => {
+				const transformedRuleId = `${copySubUnitId}-${ruleId}`;
+				const oldRule = this._sheetDataValidationModel.getRuleById(copyUnitId, copySubUnitId, ruleId);
+				if (!this._sheetDataValidationModel.getRuleById(pastedUnitId, pastedSubUnitId, transformedRuleId) && oldRule) additionRules.set(transformedRuleId, {
+					...oldRule,
+					uid: transformedRuleId
+				});
+				additions.push({
+					id: transformedRuleId,
+					ranges: getTargetRanges(ranges)
 				});
 			});
-			const additions = Array.from(addRules).map((id) => ({
-				id,
-				ranges: queryObjectMatrix(additionMatrix, (value) => value === id)
-			}));
 			ruleMatrix.addRangeRules(additions);
 			const { redoMutations, undoMutations } = getDataValidationDiffMutations(pastedUnitId, pastedSubUnitId, ruleMatrix.diffWithAddition(this._sheetDataValidationModel.getRules(pastedUnitId, pastedSubUnitId), additionRules.values()), this._injector, "patched", false);
 			if (copyType === COPY_TYPE.CUT) {
 				const copySheetRuleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(copyUnitId, copySubUnitId).clone();
-				const deleteRangeStartCell = mapFunc(vCopyRange.startRow, vCopyRange.startColumn);
-				const deleteRangeEndCell = mapFunc(vCopyRange.endRow, vCopyRange.endColumn);
 				copySheetRuleMatrix.addRangeRules([{
 					id: "",
-					ranges: [{
-						startRow: deleteRangeStartCell.row,
-						endRow: deleteRangeEndCell.row,
-						startColumn: deleteRangeStartCell.col,
-						endColumn: deleteRangeEndCell.col
-					}]
+					ranges: virtualizeDiscreteRanges([copyRange]).mapRange(sourceVirtualRange)
 				}]);
 				const { redoMutations: cutRedos, undoMutations: cutUndos } = getDataValidationDiffMutations(copyUnitId, copySubUnitId, copySheetRuleMatrix.diff(this._sheetDataValidationModel.getRules(copyUnitId, copySubUnitId)), this._injector, "patched", false);
 				redoMutations.push(...cutRedos);
@@ -2426,27 +2384,13 @@ let DataValidationCopyPasteController = class DataValidationCopyPasteController
 			};
 		} else {
 			const ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(copyUnitId, copySubUnitId).clone();
-			const additionMatrix = new ObjectMatrix();
-			const additionRules = /* @__PURE__ */ new Set();
-			const { ranges: [vCopyRange, vPastedRange], mapFunc } = virtualizeDiscreteRanges([copyRange, pastedRange]);
-			getRepeatRange(vCopyRange, vPastedRange, true).forEach(({ startRange }) => {
-				var _this$_copyInfo2;
-				(_this$_copyInfo2 = this._copyInfo) === null || _this$_copyInfo2 === void 0 || _this$_copyInfo2.matrix.forValue((row, col, ruleId) => {
-					const range = Rectangle.getPositionRange({
-						startRow: row,
-						endRow: row,
-						startColumn: col,
-						endColumn: col
-					}, startRange);
-					const { row: startRow, col: startColumn } = mapFunc(range.startRow, range.startColumn);
-					additionMatrix.setValue(startRow, startColumn, ruleId);
-					additionRules.add(ruleId);
-				});
-			});
-			const additions = Array.from(additionRules).map((id) => ({
+			const additions = [{
+				id: "",
+				ranges: clearTargetRanges
+			}, ...Array.from(copyInfo.rules, ([id, ranges]) => ({
 				id,
-				ranges: queryObjectMatrix(additionMatrix, (value) => value === id)
-			}));
+				ranges: getTargetRanges(ranges)
+			}))];
 			ruleMatrix.addRangeRules(additions);
 			const { redoMutations, undoMutations } = getDataValidationDiffMutations(pastedUnitId, pastedSubUnitId, ruleMatrix.diff(this._sheetDataValidationModel.getRules(copyUnitId, copySubUnitId)), this._injector, "patched", false);
 			return {
@@ -2570,32 +2514,30 @@ let SheetsDataValidationRenderController = class SheetsDataValidationRenderContr
 			effect: InterceptorEffectEnum.Style,
 			priority: InterceptCellContentPriority.DATA_VALIDATION,
 			handler: (cell, pos, next) => {
-				var _this$_dataValidation, _cell$customRender, _cell$fontRenderExten, _validator$skipDefaul, _cell$coverable;
+				var _cell$fontRenderExten, _validator$skipDefaul;
 				const { row, col, unitId, subUnitId, workbook, worksheet } = pos;
 				const 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$_dataValidation = this._dataValidationCacheService.getValue(unitId, subUnitId, row, col)) !== null && _this$_dataValidation !== void 0 ? _this$_dataValidation : DataValidationStatus.VALID;
+				const validStatus = this._dataValidationCacheService.getValue(unitId, subUnitId, row, col) ?? DataValidationStatus.VALID;
 				const validator = this._dataValidatorRegistryService.getValidatorItem(rule.type);
 				const cellOrigin = pos.rawData;
 				let cache;
 				const cellValue = { get value() {
-					var _getCellValueOrigin;
 					if (cache !== void 0) return cache;
-					cache = (_getCellValueOrigin = getCellValueOrigin(cellOrigin)) !== null && _getCellValueOrigin !== void 0 ? _getCellValueOrigin : null;
+					cache = getCellValueOrigin(cellOrigin) ?? null;
 					return cache;
 				} };
 				const valueStr = { get value() {
-					var _cellValue$value;
-					return `${(_cellValue$value = cellValue.value) !== null && _cellValue$value !== void 0 ? _cellValue$value : ""}`;
+					return `${cellValue.value ?? ""}`;
 				} };
 				if (!cell || cell === pos.rawData) cell = { ...pos.rawData };
 				cell.markers = {
 					...cell === null || cell === void 0 ? void 0 : cell.markers,
 					...validStatus === DataValidationStatus.INVALID ? INVALID_MARK : null
 				};
-				cell.customRender = [...(_cell$customRender = cell === null || cell === void 0 ? void 0 : cell.customRender) !== null && _cell$customRender !== void 0 ? _cell$customRender : [], ...(validator === null || validator === void 0 ? void 0 : validator.canvasRender) ? [validator.canvasRender] : []];
+				cell.customRender = [...(cell === null || cell === void 0 ? void 0 : cell.customRender) ?? [], ...(validator === null || validator === void 0 ? void 0 : validator.canvasRender) ? [validator.canvasRender] : []];
 				cell.fontRenderExtension = {
 					...cell === null || cell === void 0 ? void 0 : cell.fontRenderExtension,
 					isSkip: (cell === null || cell === void 0 || (_cell$fontRenderExten = cell.fontRenderExtension) === null || _cell$fontRenderExten === void 0 ? void 0 : _cell$fontRenderExten.isSkip) || (validator === null || validator === void 0 || (_validator$skipDefaul = validator.skipDefaultFontRender) === null || _validator$skipDefaul === void 0 ? void 0 : _validator$skipDefaul.call(validator, rule, cellValue.value, pos))
@@ -2608,14 +2550,14 @@ let SheetsDataValidationRenderController = class SheetsDataValidationRenderContr
 					} }, row, col)
 				};
 				cell.interceptorAutoHeight = () => {
-					var _this$_renderManagerS, _mergeCell$startRow, _mergeCell$startColum, _validator$canvasRend, _validator$canvasRend2;
+					var _this$_renderManagerS, _validator$canvasRend, _validator$canvasRend2;
 					const skeleton = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS === void 0 || (_this$_renderManagerS = _this$_renderManagerS.with(SheetSkeletonManagerService).getSkeletonParam(subUnitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.skeleton;
 					if (!skeleton) return;
 					const mergeCell = skeleton.worksheet.getMergedCell(row, col);
 					const info = {
 						data: cell,
 						style: workbook.getStyles().getStyleByCell(cell),
-						primaryWithCoord: skeleton.getCellWithCoordByIndex((_mergeCell$startRow = mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startRow) !== null && _mergeCell$startRow !== void 0 ? _mergeCell$startRow : row, (_mergeCell$startColum = mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startColumn) !== null && _mergeCell$startColum !== void 0 ? _mergeCell$startColum : col),
+						primaryWithCoord: skeleton.getCellWithCoordByIndex((mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startRow) ?? row, (mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startColumn) ?? col),
 						unitId,
 						subUnitId,
 						row,
@@ -2626,14 +2568,14 @@ let SheetsDataValidationRenderController = class SheetsDataValidationRenderContr
 					return validator === null || validator === void 0 || (_validator$canvasRend = validator.canvasRender) === null || _validator$canvasRend === void 0 || (_validator$canvasRend2 = _validator$canvasRend.calcCellAutoHeight) === null || _validator$canvasRend2 === void 0 ? void 0 : _validator$canvasRend2.call(_validator$canvasRend, info);
 				};
 				cell.interceptorAutoWidth = () => {
-					var _this$_renderManagerS2, _mergeCell$startRow2, _mergeCell$startColum2, _validator$canvasRend3, _validator$canvasRend4;
+					var _this$_renderManagerS2, _validator$canvasRend3, _validator$canvasRend4;
 					const skeleton = (_this$_renderManagerS2 = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS2 === void 0 || (_this$_renderManagerS2 = _this$_renderManagerS2.with(SheetSkeletonManagerService).getSkeletonParam(subUnitId)) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.skeleton;
 					if (!skeleton) return;
 					const mergeCell = skeleton.worksheet.getMergedCell(row, col);
 					const info = {
 						data: cell,
 						style: workbook.getStyles().getStyleByCell(cell),
-						primaryWithCoord: skeleton.getCellWithCoordByIndex((_mergeCell$startRow2 = mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startRow) !== null && _mergeCell$startRow2 !== void 0 ? _mergeCell$startRow2 : row, (_mergeCell$startColum2 = mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startColumn) !== null && _mergeCell$startColum2 !== void 0 ? _mergeCell$startColum2 : col),
+						primaryWithCoord: skeleton.getCellWithCoordByIndex((mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startRow) ?? row, (mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startColumn) ?? col),
 						unitId,
 						subUnitId,
 						row,
@@ -2643,7 +2585,7 @@ let SheetsDataValidationRenderController = class SheetsDataValidationRenderContr
 					};
 					return validator === null || validator === void 0 || (_validator$canvasRend3 = validator.canvasRender) === null || _validator$canvasRend3 === void 0 || (_validator$canvasRend4 = _validator$canvasRend3.calcCellAutoWidth) === null || _validator$canvasRend4 === void 0 ? void 0 : _validator$canvasRend4.call(_validator$canvasRend3, info);
 				};
-				cell.coverable = ((_cell$coverable = cell === null || cell === void 0 ? void 0 : cell.coverable) !== null && _cell$coverable !== void 0 ? _cell$coverable : true) && !(rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE);
+				cell.coverable = ((cell === null || cell === void 0 ? void 0 : cell.coverable) ?? true) && !(rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE);
 				return next(cell);
 			}
 		}));
@@ -2693,22 +2635,22 @@ let SheetsDataValidationMobileRenderController = class SheetsDataValidationMobil
 			effect: InterceptorEffectEnum.Style,
 			priority: InterceptCellContentPriority.DATA_VALIDATION,
 			handler: (cell, pos, next) => {
-				var _this$_dataValidation2, _cell$customRender2, _cell$fontRenderExten2, _validator$skipDefaul2, _cell$coverable2;
+				var _cell$fontRenderExten2, _validator$skipDefaul2;
 				const { row, col, unitId, subUnitId, workbook, worksheet } = pos;
 				const 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$_dataValidation2 = this._dataValidationCacheService.getValue(unitId, subUnitId, row, col)) !== null && _this$_dataValidation2 !== void 0 ? _this$_dataValidation2 : DataValidationStatus.VALID;
+				const validStatus = this._dataValidationCacheService.getValue(unitId, subUnitId, row, col) ?? DataValidationStatus.VALID;
 				const validator = this._dataValidatorRegistryService.getValidatorItem(rule.type);
 				const cellValue = getCellValueOrigin(worksheet.getCellRaw(row, col));
-				const valueStr = `${cellValue !== null && cellValue !== void 0 ? cellValue : ""}`;
+				const valueStr = `${cellValue ?? ""}`;
 				if (!cell || cell === pos.rawData) cell = { ...pos.rawData };
 				cell.markers = {
 					...cell === null || cell === void 0 ? void 0 : cell.markers,
 					...validStatus === DataValidationStatus.INVALID ? INVALID_MARK : null
 				};
-				cell.customRender = [...(_cell$customRender2 = cell === null || cell === void 0 ? void 0 : cell.customRender) !== null && _cell$customRender2 !== void 0 ? _cell$customRender2 : [], ...(validator === null || validator === void 0 ? void 0 : validator.canvasRender) ? [validator.canvasRender] : []];
+				cell.customRender = [...(cell === null || cell === void 0 ? void 0 : cell.customRender) ?? [], ...(validator === null || validator === void 0 ? void 0 : validator.canvasRender) ? [validator.canvasRender] : []];
 				cell.fontRenderExtension = {
 					...cell === null || cell === void 0 ? void 0 : cell.fontRenderExtension,
 					isSkip: (cell === null || cell === void 0 || (_cell$fontRenderExten2 = cell.fontRenderExtension) === null || _cell$fontRenderExten2 === void 0 ? void 0 : _cell$fontRenderExten2.isSkip) || (validator === null || validator === void 0 || (_validator$skipDefaul2 = validator.skipDefaultFontRender) === null || _validator$skipDefaul2 === void 0 ? void 0 : _validator$skipDefaul2.call(validator, rule, cellValue, pos))
@@ -2721,14 +2663,14 @@ let SheetsDataValidationMobileRenderController = class SheetsDataValidationMobil
 					} }, row, col)
 				};
 				cell.interceptorAutoHeight = () => {
-					var _this$_renderManagerS3, _mergeCell$startRow3, _mergeCell$startColum3, _validator$canvasRend5, _validator$canvasRend6;
+					var _this$_renderManagerS3, _validator$canvasRend5, _validator$canvasRend6;
 					const skeleton = (_this$_renderManagerS3 = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS3 === void 0 || (_this$_renderManagerS3 = _this$_renderManagerS3.with(SheetSkeletonManagerService).getSkeletonParam(subUnitId)) === null || _this$_renderManagerS3 === void 0 ? void 0 : _this$_renderManagerS3.skeleton;
 					if (!skeleton) return;
 					const mergeCell = skeleton.worksheet.getMergedCell(row, col);
 					const info = {
 						data: cell,
 						style: workbook.getStyles().getStyleByCell(cell),
-						primaryWithCoord: skeleton.getCellWithCoordByIndex((_mergeCell$startRow3 = mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startRow) !== null && _mergeCell$startRow3 !== void 0 ? _mergeCell$startRow3 : row, (_mergeCell$startColum3 = mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startColumn) !== null && _mergeCell$startColum3 !== void 0 ? _mergeCell$startColum3 : col),
+						primaryWithCoord: skeleton.getCellWithCoordByIndex((mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startRow) ?? row, (mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startColumn) ?? col),
 						unitId,
 						subUnitId,
 						row,
@@ -2739,14 +2681,14 @@ let SheetsDataValidationMobileRenderController = class SheetsDataValidationMobil
 					return validator === null || validator === void 0 || (_validator$canvasRend5 = validator.canvasRender) === null || _validator$canvasRend5 === void 0 || (_validator$canvasRend6 = _validator$canvasRend5.calcCellAutoHeight) === null || _validator$canvasRend6 === void 0 ? void 0 : _validator$canvasRend6.call(_validator$canvasRend5, info);
 				};
 				cell.interceptorAutoWidth = () => {
-					var _this$_renderManagerS4, _mergeCell$startRow4, _mergeCell$startColum4, _validator$canvasRend7, _validator$canvasRend8;
+					var _this$_renderManagerS4, _validator$canvasRend7, _validator$canvasRend8;
 					const skeleton = (_this$_renderManagerS4 = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS4 === void 0 || (_this$_renderManagerS4 = _this$_renderManagerS4.with(SheetSkeletonManagerService).getSkeletonParam(subUnitId)) === null || _this$_renderManagerS4 === void 0 ? void 0 : _this$_renderManagerS4.skeleton;
 					if (!skeleton) return;
 					const mergeCell = skeleton.worksheet.getMergedCell(row, col);
 					const info = {
 						data: cell,
 						style: workbook.getStyles().getStyleByCell(cell),
-						primaryWithCoord: skeleton.getCellWithCoordByIndex((_mergeCell$startRow4 = mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startRow) !== null && _mergeCell$startRow4 !== void 0 ? _mergeCell$startRow4 : row, (_mergeCell$startColum4 = mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startColumn) !== null && _mergeCell$startColum4 !== void 0 ? _mergeCell$startColum4 : col),
+						primaryWithCoord: skeleton.getCellWithCoordByIndex((mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startRow) ?? row, (mergeCell === null || mergeCell === void 0 ? void 0 : mergeCell.startColumn) ?? col),
 						unitId,
 						subUnitId,
 						row,
@@ -2756,7 +2698,7 @@ let SheetsDataValidationMobileRenderController = class SheetsDataValidationMobil
 					};
 					return validator === null || validator === void 0 || (_validator$canvasRend7 = validator.canvasRender) === null || _validator$canvasRend7 === void 0 || (_validator$canvasRend8 = _validator$canvasRend7.calcCellAutoWidth) === null || _validator$canvasRend8 === void 0 ? void 0 : _validator$canvasRend8.call(_validator$canvasRend7, info);
 				};
-				cell.coverable = ((_cell$coverable2 = cell === null || cell === void 0 ? void 0 : cell.coverable) !== null && _cell$coverable2 !== void 0 ? _cell$coverable2 : true) && !(rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE);
+				cell.coverable = ((cell === null || cell === void 0 ? void 0 : cell.coverable) ?? true) && !(rule.type === DataValidationType.LIST || rule.type === DataValidationType.LIST_MULTIPLE);
 				return next(cell);
 			}
 		}));
@@ -2818,11 +2760,10 @@ SheetsDataValidationReRenderController = __decorate([__decorateParam(1, Inject(S
 const MARGIN_H$2 = 6;
 let CheckboxRender = class CheckboxRender {
 	_calc(cellInfo, style) {
-		var _style$fs, _style$fs2, _style$fs3;
 		const { vt, ht } = style || {};
 		const width = cellInfo.endX - cellInfo.startX - MARGIN_H$2 * 2;
 		const height = cellInfo.endY - cellInfo.startY;
-		const size = ((_style$fs = style === null || style === void 0 ? void 0 : style.fs) !== null && _style$fs !== void 0 ? _style$fs : 10) * 1.6;
+		const size = ((style === null || style === void 0 ? void 0 : style.fs) ?? 10) * 1.6;
 		let widgetLeft = 0;
 		let widgetTop = 0;
 		switch (vt) {
@@ -2850,8 +2791,8 @@ let CheckboxRender = class CheckboxRender {
 		return {
 			left: cellInfo.startX + widgetLeft,
 			top: cellInfo.startY + widgetTop,
-			width: ((_style$fs2 = style === null || style === void 0 ? void 0 : style.fs) !== null && _style$fs2 !== void 0 ? _style$fs2 : 10) * 1.6,
-			height: ((_style$fs3 = style === null || style === void 0 ? void 0 : style.fs) !== null && _style$fs3 !== void 0 ? _style$fs3 : 10) * 1.6
+			width: ((style === null || style === void 0 ? void 0 : style.fs) ?? 10) * 1.6,
+			height: ((style === null || style === void 0 ? void 0 : style.fs) ?? 10) * 1.6
 		};
 	}
 	constructor(_commandService, _univerInstanceService, _formulaService, _themeService, _renderManagerService, _dataValidationModel) {
@@ -2863,14 +2804,12 @@ let CheckboxRender = class CheckboxRender {
 		this._dataValidationModel = _dataValidationModel;
 	}
 	calcCellAutoHeight(info) {
-		var _style$fs4;
 		const { style } = info;
-		return ((_style$fs4 = style === null || style === void 0 ? void 0 : style.fs) !== null && _style$fs4 !== void 0 ? _style$fs4 : 10) * 1.6;
+		return ((style === null || style === void 0 ? void 0 : style.fs) ?? 10) * 1.6;
 	}
 	calcCellAutoWidth(info) {
-		var _style$fs5;
 		const { style } = info;
-		return ((_style$fs5 = style === null || style === void 0 ? void 0 : style.fs) !== null && _style$fs5 !== void 0 ? _style$fs5 : 10) * 1.6;
+		return ((style === null || style === void 0 ? void 0 : style.fs) ?? 10) * 1.6;
 	}
 	async _parseFormula(rule, unitId, subUnitId) {
 		var _results$, _results$2, _results$3;
@@ -2886,7 +2825,7 @@ let CheckboxRender = class CheckboxRender {
 		};
 	}
 	drawWith(ctx, info) {
-		var _validator$skipDefaul, _style$fs6, _style$cl$rgb, _style$cl;
+		var _validator$skipDefaul, _style$cl;
 		const { style, primaryWithCoord, unitId, subUnitId, worksheet, row, col } = info;
 		const cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;
 		const value = getCellValueOrigin(worksheet.getCellRaw(row, col));
@@ -2924,14 +2863,14 @@ let CheckboxRender = class CheckboxRender {
 		ctx.clip();
 		const m = transform.getMatrix();
 		ctx.transform(m[0], m[1], m[2], m[3], m[4], m[5]);
-		const size = ((_style$fs6 = style === null || style === void 0 ? void 0 : style.fs) !== null && _style$fs6 !== void 0 ? _style$fs6 : 10) * 1.6;
+		const size = ((style === null || style === void 0 ? void 0 : style.fs) ?? 10) * 1.6;
 		const checked = String(value) === String(formula1);
 		const defaultColor = this._themeService.getColorFromTheme("primary.600");
 		CheckboxShape.drawWith(ctx, {
 			checked,
 			width: size,
 			height: size,
-			fill: (_style$cl$rgb = style === null || style === void 0 || (_style$cl = style.cl) === null || _style$cl === void 0 ? void 0 : _style$cl.rgb) !== null && _style$cl$rgb !== void 0 ? _style$cl$rgb : defaultColor
+			fill: (style === null || style === void 0 || (_style$cl = style.cl) === null || _style$cl === void 0 ? void 0 : _style$cl.rgb) ?? defaultColor
 		});
 		ctx.restore();
 	}
@@ -3187,7 +3126,7 @@ var Dropdown$1 = class extends Shape {
 			width: layout.width,
 			height: layout.height,
 			radius: RADIUS,
-			fill: fill || "#ECECEC"
+			fill: fill || "gray.100"
 		});
 		ctx.translateWithPrecision(4, layout.ba);
 		ctx.font = fontString;
@@ -3234,12 +3173,11 @@ let DropdownMultipleWidget = class DropdownMultipleWidget {
 		}
 		ctx.save();
 		ctx.translateWithPrecision(cellBounding.startX + left, cellBounding.startY + top);
-		ctx.fillStyle = "#565656";
+		ctx.fillStyle = DROP_DOWN_ICON_COLOR;
 		ctx.fill(downPath$1);
 		ctx.restore();
 	}
 	drawWith(ctx, info, skeleton, spreadsheets) {
-		var _ref, _getCellValueOrigin;
 		const { primaryWithCoord, row, col, style, data, subUnitId } = info;
 		const _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;
 		const { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = (data === null || data === void 0 ? void 0 : data.fontRenderExtension) || {};
@@ -3260,11 +3198,11 @@ let DropdownMultipleWidget = class DropdownMultipleWidget {
 		const cellWidth = cellBounding.endX - cellBounding.startX;
 		const cellHeight = cellBounding.endY - cellBounding.startY;
 		const { cl } = style || {};
-		const color = (_ref = typeof cl === "object" ? cl === null || cl === void 0 ? void 0 : cl.rgb : cl) !== null && _ref !== void 0 ? _ref : "#000";
-		const fontStyle = getFontStyleString(style !== null && style !== void 0 ? style : void 0);
+		const color = (typeof cl === "object" ? cl === null || cl === void 0 ? void 0 : cl.rgb : cl) ?? "#000";
+		const fontStyle = getFontStyleString(style ?? void 0);
 		const { vt: _vt, ht } = style || {};
-		const vt = _vt !== null && _vt !== void 0 ? _vt : VerticalAlign.MIDDLE;
-		const cellValue = (_getCellValueOrigin = getCellValueOrigin(data)) !== null && _getCellValueOrigin !== void 0 ? _getCellValueOrigin : "";
+		const vt = _vt ?? VerticalAlign.MIDDLE;
+		const cellValue = getCellValueOrigin(data) ?? "";
 		const items = validator.parseCellValue(cellValue);
 		const labelColorMap = validator.getListWithColorMap(rule);
 		const layout = layoutDropdowns(items, fontStyle, cellWidth, cellHeight);
@@ -3322,7 +3260,6 @@ let DropdownMultipleWidget = class DropdownMultipleWidget {
 		});
 	}
 	calcCellAutoHeight(info) {
-		var _getCellValueOrigin2;
 		const { primaryWithCoord, style, data, row, col } = info;
 		const { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = (data === null || data === void 0 ? void 0 : data.fontRenderExtension) || {};
 		const _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;
@@ -3338,11 +3275,10 @@ let DropdownMultipleWidget = class DropdownMultipleWidget {
 		if (!validator) return;
 		const cellWidth = cellBounding.endX - cellBounding.startX;
 		const cellHeight = cellBounding.endY - cellBounding.startY;
-		const cellValue = (_getCellValueOrigin2 = getCellValueOrigin(data)) !== null && _getCellValueOrigin2 !== void 0 ? _getCellValueOrigin2 : "";
-		return layoutDropdowns(validator.parseCellValue(cellValue), getFontStyleString(style !== null && style !== void 0 ? style : void 0), cellWidth, cellHeight).cellAutoHeight;
+		const cellValue = getCellValueOrigin(data) ?? "";
+		return layoutDropdowns(validator.parseCellValue(cellValue), getFontStyleString(style ?? void 0), cellWidth, cellHeight).cellAutoHeight;
 	}
 	calcCellAutoWidth(info) {
-		var _getCellValueOrigin3;
 		const { primaryWithCoord, style, data, row, col } = info;
 		const { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = (data === null || data === void 0 ? void 0 : data.fontRenderExtension) || {};
 		const _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;
@@ -3358,8 +3294,8 @@ let DropdownMultipleWidget = class DropdownMultipleWidget {
 		if (!validator) return;
 		const cellWidth = cellBounding.endX - cellBounding.startX;
 		const cellHeight = cellBounding.endY - cellBounding.startY;
-		const cellValue = (_getCellValueOrigin3 = getCellValueOrigin(data)) !== null && _getCellValueOrigin3 !== void 0 ? _getCellValueOrigin3 : "";
-		return layoutDropdowns(validator.parseCellValue(cellValue), getFontStyleString(style !== null && style !== void 0 ? style : void 0), cellWidth, cellHeight).calcAutoWidth;
+		const cellValue = getCellValueOrigin(data) ?? "";
+		return layoutDropdowns(validator.parseCellValue(cellValue), getFontStyleString(style ?? void 0), cellWidth, cellHeight).calcAutoWidth;
 	}
 	isHit(position, info) {
 		const { primaryWithCoord } = info;
@@ -3436,7 +3372,6 @@ const PADDING_V = 1;
 const MARGIN_H = 6;
 const MARGIN_V = 3;
 const RADIUS_BG = 8;
-const DROP_DOWN_ICON_COLOR = "#565656";
 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");
 function calcPadding(cellWidth, cellHeight, fontWidth, fontHeight, vt, ht, margin = true) {
 	let paddingTop = 0;
@@ -3507,12 +3442,11 @@ let DropdownWidget = class DropdownWidget {
 		}
 		ctx.save();
 		ctx.translateWithPrecision(cellBounding.startX + left, cellBounding.startY + top);
-		ctx.fillStyle = "#565656";
+		ctx.fillStyle = DROP_DOWN_ICON_COLOR;
 		ctx.fill(downPath);
 		ctx.restore();
 	}
 	drawWith(ctx, info, skeleton) {
-		var _tb, _vt, _ht, _pd;
 		const { primaryWithCoord, row, col, style, data, subUnitId } = info;
 		const _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;
 		const _row = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo.startRow : row;
@@ -3535,14 +3469,13 @@ let DropdownWidget = class DropdownWidget {
 		const map = this._ensureMap(subUnitId);
 		const key = this._generateKey(row, col);
 		const colorMap = validator.getListWithColorMap(rule);
-		const value = getCellValueOrigin(data);
-		const valueStr = `${value !== null && value !== void 0 ? value : ""}`;
+		const valueStr = `${getCellValueOrigin(data) ?? ""}`;
 		const activeColor = colorMap[valueStr];
 		let { tb, vt, ht, pd } = style || {};
-		tb = (_tb = tb) !== null && _tb !== void 0 ? _tb : WrapStrategy.WRAP;
-		vt = (_vt = vt) !== null && _vt !== void 0 ? _vt : VerticalAlign.BOTTOM;
-		ht = (_ht = ht) !== null && _ht !== void 0 ? _ht : DEFAULT_STYLES.ht;
-		pd = (_pd = pd) !== null && _pd !== void 0 ? _pd : DEFAULT_STYLES.pd;
+		tb = tb ?? WrapStrategy.WRAP;
+		vt = vt ?? VerticalAlign.BOTTOM;
+		ht = ht ?? DEFAULT_STYLES.ht;
+		pd = pd ?? DEFAULT_STYLES.pd;
 		const fontStyle = getFontStyleString(style).fontCache;
 		if (rule.renderMode === DataValidationRenderMode.ARROW) {
 			var _style$cl, _style$st, _style$ul;
@@ -3603,7 +3536,7 @@ let DropdownWidget = class DropdownWidget {
 			Rect.drawWith(ctx, {
 				width: rectWidth,
 				height: rectHeight,
-				fill: activeColor || "#ECECEC",
+				fill: activeColor || "gray.100",
 				radius: RADIUS_BG
 			});
 			ctx.save();
@@ -3636,7 +3569,6 @@ let DropdownWidget = class DropdownWidget {
 		}
 	}
 	calcCellAutoHeight(info) {
-		var _tb2;
 		const { primaryWithCoord, style, data, row, col } = info;
 		const _cellBounding = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;
 		const { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = (data === null || data === void 0 ? void 0 : data.fontRenderExtension) || {};
@@ -3650,13 +3582,12 @@ let DropdownWidget = class DropdownWidget {
 			endY: _cellBounding.endY - downOffset
 		};
 		const cellWidth = cellBounding.endX - cellBounding.startX;
-		const value = getCellValueOrigin(data);
-		const valueStr = `${value !== null && value !== void 0 ? value : ""}`;
+		const valueStr = `${getCellValueOrigin(data) ?? ""}`;
 		let { tb, pd } = style || {};
-		const { t = DEFAULT_STYLES.pd.t, b = DEFAULT_STYLES.pd.b } = pd !== null && pd !== void 0 ? pd : {};
-		tb = (_tb2 = tb) !== null && _tb2 !== void 0 ? _tb2 : WrapStrategy.WRAP;
+		const { t = DEFAULT_STYLES.pd.t, b = DEFAULT_STYLES.pd.b } = pd ?? {};
+		tb = tb ?? WrapStrategy.WRAP;
 		if (rule.renderMode === DataValidationRenderMode.ARROW) {
-			const { l = DEFAULT_STYLES.pd.l, r = DEFAULT_STYLES.pd.r } = pd !== null && pd !== void 0 ? pd : {};
+			const { l = DEFAULT_STYLES.pd.l, r = DEFAULT_STYLES.pd.r } = pd ?? {};
 			const realWidth = cellWidth - l - r - ICON_PLACE - 4;
 			const skeleton = new DocSimpleSkeleton(valueStr, getFontStyleString(style).fontCache, Boolean(tb === WrapStrategy.WRAP), realWidth, Infinity);
 			skeleton.calculate();
@@ -3669,7 +3600,6 @@ let DropdownWidget = class DropdownWidget {
 		}
 	}
 	calcCellAutoWidth(info) {
-		var _tb3;
 		const { primaryWithCoord, style, data, row, col } = info;
 		const cellRange = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;
 		const { leftOffset = 0, rightOffset = 0, topOffset = 0, downOffset = 0 } = (data === null || data === void 0 ? void 0 : data.fontRenderExtension) || {};
@@ -3683,11 +3613,10 @@ let DropdownWidget = class DropdownWidget {
 			endY: cellRange.endY - downOffset
 		};
 		const cellWidth = cellBounding.endX - cellBounding.startX;
-		const value = getCellValueOrigin(data);
-		const valueStr = `${value !== null && value !== void 0 ? value : ""}`;
+		const valueStr = `${getCellValueOrigin(data) ?? ""}`;
 		let { tb, pd } = style || {};
-		const { l = DEFAULT_STYLES.pd.l, r = DEFAULT_STYLES.pd.r } = pd !== null && pd !== void 0 ? pd : {};
-		tb = (_tb3 = tb) !== null && _tb3 !== void 0 ? _tb3 : WrapStrategy.WRAP;
+		const { l = DEFAULT_STYLES.pd.l, r = DEFAULT_STYLES.pd.r } = pd ?? {};
+		tb = tb ?? WrapStrategy.WRAP;
 		let paddingAll = 26;
 		switch (rule.renderMode) {
 			case DataValidationRenderMode.ARROW:
@@ -3966,7 +3895,7 @@ _defineProperty(UniverSheetsDataValidationUIPlugin, "packageName", name);
 _defineProperty(UniverSheetsDataValidationUIPlugin, "version", version);
 _defineProperty(UniverSheetsDataValidationUIPlugin, "type", UniverInstanceType.UNIVER_SHEET);
 UniverSheetsDataValidationUIPlugin = __decorate([
-	DependentOn(UniverDataValidationPlugin, UniverRenderEnginePlugin, UniverSheetsPlugin, UniverUIPlugin, UniverSheetsUIPlugin, UniverSheetsDataValidationPlugin),
+	DependentOn(UniverDataValidationPlugin, UniverRenderEnginePlugin, UniverSheetsPlugin, UniverSheetsUIPlugin, UniverSheetsDataValidationPlugin),
 	__decorateParam(1, Inject(Injector)),
 	__decorateParam(2, ICommandService),
 	__decorateParam(3, IConfigService)