@univerjs/sheets-data-validation-ui 1.0.0-beta.0 → 1.0.0-beta.2

package/lib/cjs/index.js

@@ -162,7 +162,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
@@ -450,7 +451,7 @@ 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,
@@ -775,7 +776,7 @@ function DropdownPresets({ onChange }) {
 				children: presets.map((values) => /* @__PURE__ */ (0, react_jsx_runtime.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((0, _univerjs_sheets.serializeListOptions)(values)),
 					children: values.map((value) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						className: "univer-w-full univer-break-words",
@@ -990,7 +991,7 @@ const menuSchema = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-data-validation-ui";
-var version = "1.0.0-beta.0";
+var version = "1.0.0-beta.2";
 
 //#endregion
 //#region src/views/components/DataValidationOptions.tsx
@@ -1001,7 +1002,7 @@ function DataValidationOptions(props) {
 	const [show, setShow] = (0, react.useState)(false);
 	const ExtraOptions = extraComponent ? componentManager.get(extraComponent) : null;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.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__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.MoreUpIcon, { className: "univer-ml-1" }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.MoreDownIcon, { className: "univer-ml-1" })]
 	}), show && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
@@ -1401,7 +1402,7 @@ const DataValidationItem = (props) => {
 		};
 	}, [markSelectionService]);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-		className: (0, _univerjs_design.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: (0, _univerjs_design.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
 		}),
@@ -1425,7 +1426,7 @@ const DataValidationItem = (props) => {
 		},
 		children: [
 			/* @__PURE__ */ (0, react_jsx_runtime.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__ */ (0, react_jsx_runtime.jsx)("div", {
@@ -1433,7 +1434,7 @@ const DataValidationItem = (props) => {
 				children: rule.ranges.map((range) => (0, _univerjs_engine_formula.serializeRange)(range)).join(",")
 			}),
 			isHover && /* @__PURE__ */ (0, react_jsx_runtime.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__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.DeleteIcon, {})
 			})
@@ -1684,7 +1685,7 @@ function CustomFormulaInput(props) {
 		error: formula1Res,
 		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_sheets_formula_ui.FormulaEditor, {
 			ref: formulaEditorRef,
-			className: (0, _univerjs_design.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", _univerjs_design.borderClassName),
+			className: (0, _univerjs_design.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", _univerjs_design.borderClassName),
 			initValue: (value === null || value === void 0 ? void 0 : value.formula1) ?? "=",
 			unitId,
 			subUnitId,
@@ -1765,6 +1766,9 @@ const DEFAULT_COLOR_PRESET = [
 const ColorSelect = (props) => {
 	const { value, onChange, disabled } = props;
 	const [open, setOpen] = (0, react.useState)(false);
+	const themeService = (0, _univerjs_ui.useDependency)(_univerjs_core.ThemeService);
+	(0, _univerjs_ui.useObservable)(themeService.currentTheme$);
+	const backgroundColor = value.includes(".") && themeService.isValidThemeColor(value) ? themeService.getColorFromTheme(value) : value;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Dropdown, {
 		align: "start",
 		disabled,
@@ -1782,10 +1786,10 @@ const ColorSelect = (props) => {
 			}, color))
 		}),
 		children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-			className: (0, _univerjs_design.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", _univerjs_design.borderClassName),
+			className: (0, _univerjs_design.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", _univerjs_design.borderClassName),
 			children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: "univer-box-border univer-size-4 univer-rounded univer-text-base",
-				style: { background: value }
+				style: { background: backgroundColor }
 			}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.MoreDownIcon, {})]
 		})
 	});
@@ -1870,7 +1874,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: (0, _univerjs_core.generateRandomId)(4)
 		}));
@@ -1891,7 +1895,7 @@ function ListFormulaInput(props) {
 	};
 	const refFinalList = (0, react.useMemo)(() => refOptions.map((label, i) => ({
 		label,
-		color: refColors[i] || "#ECECEC",
+		color: refColors[i] || "gray.100",
 		id: `${i}`,
 		isRef: true
 	})), [refColors, refOptions]);
@@ -1981,7 +1985,7 @@ function ListFormulaInput(props) {
 		error: formula1Res || localError || void 0,
 		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_sheets_formula_ui.FormulaEditor, {
 			ref: formulaEditorRef,
-			className: (0, _univerjs_design.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", _univerjs_design.borderClassName),
+			className: (0, _univerjs_design.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", _univerjs_design.borderClassName),
 			initValue: formulaStr,
 			unitId,
 			subUnitId,
@@ -2204,52 +2208,36 @@ let DataValidationAutoFillController = class DataValidationAutoFillController ex
 			const ruleMatrixCopy = this._sheetDataValidationModel.getRuleObjectMatrix(unitId, subUnitId).clone();
 			const virtualRange = (0, _univerjs_sheets_ui.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 = _univerjs_sheets.AutoFillTools.getAutoFillRepeatRange(vSourceRange, vTargetRange);
-			const additionMatrix = new _univerjs_core.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
-				};
-				_univerjs_core.Range.foreach(relativeRange, (row, col) => {
-					const sourcePositionRange = _univerjs_core.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 = _univerjs_core.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(_univerjs_core.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 && (0, _univerjs_core.getIntersectRange)(projected, vSourceRange);
+					return intersected ? [_univerjs_core.Rectangle.getRelativeRange(intersected, vSourceRange)] : [];
 				});
+				const targetRanges = repeats.flatMap((repeat) => relativeSourceRanges.flatMap((sourceRange) => {
+					const copiedRange = (0, _univerjs_core.getIntersectRange)(sourceRange, repeat.relativeRange);
+					if (!copiedRange) return [];
+					return mapRange(_univerjs_core.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: (0, _univerjs_core.queryObjectMatrix)(additionMatrix, (value) => value === id)
+				ranges: ranges.length > 1 ? _univerjs_core.Rectangle.mergeRanges(ranges) : ranges
 			}));
 			ruleMatrixCopy.addRangeRules(additions);
 			const { redoMutations, undoMutations } = (0, _univerjs_sheets_data_validation.getDataValidationDiffMutations)(unitId, subUnitId, ruleMatrixCopy.diff(this._sheetDataValidationModel.getRules(unitId, subUnitId)), this._injector, "patched", applyType === _univerjs_sheets.AUTO_FILL_APPLY_TYPE.ONLY_FORMAT);
@@ -2262,13 +2250,8 @@ let DataValidationAutoFillController = class DataValidationAutoFillController ex
 			id: _univerjs_sheets_data_validation.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 === _univerjs_core.DataValidationType.CHECKBOX) {
-						this._autoFillService.setDisableApplyType(_univerjs_sheets.AUTO_FILL_APPLY_TYPE.SERIES, true);
-						return;
-					}
-				}
+				const { projectRange } = (0, _univerjs_sheets_ui.virtualizeDiscreteRanges)([sourceRange]);
+				if (this._sheetDataValidationModel.getRules(unitId, subUnitId).some((rule) => rule.type === _univerjs_core.DataValidationType.CHECKBOX && rule.ranges.some((range) => projectRange(range) !== null))) this._autoFillService.setDisableApplyType(_univerjs_sheets.AUTO_FILL_APPLY_TYPE.SERIES, true);
 			},
 			onFillData: (location, direction, applyType) => {
 				if (applyType === _univerjs_sheets.AUTO_FILL_APPLY_TYPE.COPY || applyType === _univerjs_sheets.AUTO_FILL_APPLY_TYPE.ONLY_FORMAT || applyType === _univerjs_sheets.AUTO_FILL_APPLY_TYPE.SERIES) return generalApplyFunc(location, applyType);
@@ -2317,25 +2300,31 @@ let DataValidationCopyPasteController = class DataValidationCopyPasteController
 		});
 	}
 	_collect(unitId, subUnitId, range) {
-		const matrix = new _univerjs_core.ObjectMatrix();
+		const rules = /* @__PURE__ */ new Map();
 		this._copyInfo = {
 			unitId,
 			subUnitId,
-			matrix
+			rules
 		};
 		const discreteRange = this._injector.invoke((accessor) => {
 			return (0, _univerjs_sheets.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 ?? "");
+		const { projectRange } = (0, _univerjs_sheets_ui.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 ? _univerjs_core.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 = _univerjs_sheets_ui.COPY_TYPE.COPY } = payload;
@@ -2353,51 +2342,38 @@ let DataValidationCopyPasteController = class DataValidationCopyPasteController
 				undos: []
 			};
 		}
+		const sourceVirtualRange = (0, _univerjs_sheets_ui.virtualizeDiscreteRanges)([copyRange]).ranges[0];
+		const targetVirtualization = (0, _univerjs_sheets_ui.virtualizeDiscreteRanges)([pastedRange]);
+		const targetVirtualRange = targetVirtualization.ranges[0];
+		const repeatRange = (0, _univerjs_sheets_ui.getRepeatRange)(sourceVirtualRange, targetVirtualRange, true);
+		const clearTargetRanges = targetVirtualization.mapRange(targetVirtualRange);
+		const getTargetRanges = (sourceRanges) => repeatRange.flatMap(({ startRange }) => sourceRanges.flatMap((sourceRange) => targetVirtualization.mapRange(_univerjs_core.Rectangle.getPositionRange(sourceRange, startRange))));
 		if (pastedUnitId !== copyUnitId || pastedSubUnitId !== copySubUnitId) {
 			const ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(pastedUnitId, pastedSubUnitId).clone();
-			const additionMatrix = new _univerjs_core.ObjectMatrix();
-			const addRules = /* @__PURE__ */ new Set();
-			const { ranges: [vCopyRange, vPastedRange], mapFunc } = (0, _univerjs_sheets_ui.virtualizeDiscreteRanges)([copyRange, pastedRange]);
-			const repeatRange = (0, _univerjs_sheets_ui.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 = _univerjs_core.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: (0, _univerjs_core.queryObjectMatrix)(additionMatrix, (value) => value === id)
-			}));
 			ruleMatrix.addRangeRules(additions);
 			const { redoMutations, undoMutations } = (0, _univerjs_sheets_data_validation.getDataValidationDiffMutations)(pastedUnitId, pastedSubUnitId, ruleMatrix.diffWithAddition(this._sheetDataValidationModel.getRules(pastedUnitId, pastedSubUnitId), additionRules.values()), this._injector, "patched", false);
 			if (copyType === _univerjs_sheets_ui.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: (0, _univerjs_sheets_ui.virtualizeDiscreteRanges)([copyRange]).mapRange(sourceVirtualRange)
 				}]);
 				const { redoMutations: cutRedos, undoMutations: cutUndos } = (0, _univerjs_sheets_data_validation.getDataValidationDiffMutations)(copyUnitId, copySubUnitId, copySheetRuleMatrix.diff(this._sheetDataValidationModel.getRules(copyUnitId, copySubUnitId)), this._injector, "patched", false);
 				redoMutations.push(...cutRedos);
@@ -2409,27 +2385,13 @@ let DataValidationCopyPasteController = class DataValidationCopyPasteController
 			};
 		} else {
 			const ruleMatrix = this._sheetDataValidationModel.getRuleObjectMatrix(copyUnitId, copySubUnitId).clone();
-			const additionMatrix = new _univerjs_core.ObjectMatrix();
-			const additionRules = /* @__PURE__ */ new Set();
-			const { ranges: [vCopyRange, vPastedRange], mapFunc } = (0, _univerjs_sheets_ui.virtualizeDiscreteRanges)([copyRange, pastedRange]);
-			(0, _univerjs_sheets_ui.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 = _univerjs_core.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: (0, _univerjs_core.queryObjectMatrix)(additionMatrix, (value) => value === id)
-			}));
+				ranges: getTargetRanges(ranges)
+			}))];
 			ruleMatrix.addRangeRules(additions);
 			const { redoMutations, undoMutations } = (0, _univerjs_sheets_data_validation.getDataValidationDiffMutations)(pastedUnitId, pastedSubUnitId, ruleMatrix.diff(this._sheetDataValidationModel.getRules(copyUnitId, copySubUnitId)), this._injector, "patched", false);
 			return {
@@ -3165,7 +3127,7 @@ var Dropdown = class extends _univerjs_engine_render.Shape {
 			width: layout.width,
 			height: layout.height,
 			radius: RADIUS,
-			fill: fill || "#ECECEC"
+			fill: fill || "gray.100"
 		});
 		ctx.translateWithPrecision(4, layout.ba);
 		ctx.font = fontString;
@@ -3212,7 +3174,7 @@ 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();
 	}
@@ -3411,7 +3373,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;
@@ -3482,7 +3443,7 @@ 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();
 	}
@@ -3576,7 +3537,7 @@ let DropdownWidget = class DropdownWidget {
 			_univerjs_engine_render.Rect.drawWith(ctx, {
 				width: rectWidth,
 				height: rectHeight,
-				fill: activeColor || "#ECECEC",
+				fill: activeColor || "gray.100",
 				radius: RADIUS_BG
 			});
 			ctx.save();

package/lib/cjs/locale/ar-SA.js

@@ -20,20 +20,7 @@ const locale = { "sheets-data-validation-ui": {
 		}
 	},
 	operators: { legal: "نوع قانوني" },
-	validFail: {
-		value: "يُرجى إدخال قيمة",
-		common: "يُرجى إدخال قيمة أو صيغة",
-		number: "يُرجى إدخال رقم أو صيغة",
-		formula: "يُرجى إدخال صيغة",
-		integer: "يُرجى إدخال عدد صحيح أو صيغة",
-		date: "يُرجى إدخال تاريخ أو صيغة",
-		list: "يُرجى إدخال خيارات",
-		listInvalid: "يجب أن يكون مصدر القائمة قائمة مفصولة بالفواصل أو مرجعًا لصف أو عمود واحد",
-		checkboxEqual: "أدخل قيمًا مختلفة لمحتويات الخلية المحددة وغير المحددة.",
-		formulaError: "يحتوي نطاق المرجع على بيانات غير مرئية، يُرجى إعادة ضبط النطاق",
-		listIntersects: "لا يمكن أن يتقاطع النطاق المحدد مع نطاق القواعد",
-		primitive: "الصيغ غير مسموح بها للقيم المخصصة المحددة وغير المحددة."
-	},
+	validFail: { formulaError: "يحتوي نطاق المرجع على بيانات غير مرئية، يُرجى إعادة ضبط النطاق" },
 	panel: {
 		title: "إدارة التحقق من صحة البيانات",
 		addTitle: "إنشاء تحقق جديد من صحة البيانات",
@@ -56,43 +43,21 @@ const locale = { "sheets-data-validation-ui": {
 		rangeError: "النطاقات غير قانونية",
 		allowBlank: "السماح بالقيم الفارغة"
 	},
-	any: {
-		title: "أي قيمة",
-		error: "محتوى هذه الخلية ينتهك قاعدة التحقق"
-	},
 	date: { title: "تاريخ" },
 	list: {
 		title: "قائمة منسدلة",
-		name: "القيمة تحتوي على واحدة من النطاق",
-		error: "يجب أن يكون الإدخال ضمن النطاق المحدد",
-		emptyError: "يُرجى إدخال قيمة",
 		add: "إضافة",
-		dropdown: "تحديد",
 		options: "خيارات",
 		customOptions: "مخصص",
 		refOptions: "من نطاق",
-		formulaError: "يجب أن يكون مصدر القائمة قائمة بيانات مفصولة بالفواصل، أو مرجعًا لصف أو عمود واحد.",
 		edit: "تحرير"
 	},
-	listMultiple: {
-		title: "قائمة منسدلة - متعددة",
-		dropdown: "تحديد متعدد"
-	},
-	textLength: { title: "طول النص" },
-	decimal: { title: "رقم" },
-	whole: { title: "عدد صحيح" },
 	checkbox: {
 		title: "خانة اختيار",
-		error: "محتوى هذه الخلية ينتهك قاعدة التحقق",
 		tips: "استخدم قيمًا مخصصة داخل الخلايا",
 		checked: "القيمة المحددة",
 		unchecked: "القيمة غير المحددة"
 	},
-	custom: {
-		title: "صيغة مخصصة",
-		error: "محتوى هذه الخلية ينتهك قاعدة التحقق",
-		validFail: "يُرجى إدخال صيغة صالحة"
-	},
 	alert: {
 		title: "خطأ",
 		ok: "موافق"

package/lib/cjs/locale/ca-ES.js

@@ -20,20 +20,7 @@ const locale = { "sheets-data-validation-ui": {
 		}
 	},
 	operators: { legal: "és tipus legal" },
-	validFail: {
-		value: "Si us plau, introdueix un valor",
-		common: "Si us plau, introdueix un valor o una fórmula",
-		number: "Si us plau, introdueix un número o una fórmula",
-		formula: "Si us plau, introdueix una fórmula",
-		integer: "Si us plau, introdueix un enter o una fórmula",
-		date: "Si us plau, introdueix una data o una fórmula",
-		list: "Si us plau, introdueix opcions",
-		listInvalid: "La font de la llista ha de ser una llista delimitada o una referència a una sola fila o columna",
-		checkboxEqual: "Introdueix valors diferents per als continguts de cel·la marcats i desmarcats.",
-		formulaError: "L’interval de referència conté dades invisibles, ajusta l’interval",
-		listIntersects: "L’interval seleccionat no pot creuar-se amb l’àmbit de les regles",
-		primitive: "No es permeten fórmules per a valors personalitzats marcats i desmarcats."
-	},
+	validFail: { formulaError: "L’interval de referència conté dades invisibles, ajusta l’interval" },
 	panel: {
 		title: "Gestió de la validació de dades",
 		addTitle: "Crea una nova validació de dades",
@@ -56,43 +43,21 @@ const locale = { "sheets-data-validation-ui": {
 		rangeError: "Els intervals no són vàlids",
 		allowBlank: "Permet valors en blanc"
 	},
-	any: {
-		title: "Qualsevol valor",
-		error: "El contingut d’aquesta cel·la incompleix la regla de validació"
-	},
 	date: { title: "Data" },
 	list: {
 		title: "Desplegable",
-		name: "El valor conté un del rang",
-		error: "L’entrada ha d’estar dins del rang especificat",
-		emptyError: "Si us plau, introdueix un valor",
 		add: "Afegeix",
-		dropdown: "Selecciona",
 		options: "Opcions",
 		customOptions: "Personalitzat",
 		refOptions: "D’un interval",
-		formulaError: "La font de la llista ha de ser una llista delimitada de dades o una referència a una sola fila o columna.",
 		edit: "Edita"
 	},
-	listMultiple: {
-		title: "Desplegable-múltiple",
-		dropdown: "Selecció múltiple"
-	},
-	textLength: { title: "Longitud del text" },
-	decimal: { title: "Número" },
-	whole: { title: "Enter" },
 	checkbox: {
 		title: "Casella de selecció",
-		error: "El contingut d’aquesta cel·la incompleix la seva regla de validació",
 		tips: "Utilitza valors personalitzats dins de les cel·les",
 		checked: "Valor seleccionat",
 		unchecked: "Valor no seleccionat"
 	},
-	custom: {
-		title: "Fórmula personalitzada",
-		error: "El contingut d’aquesta cel·la incompleix la seva regla de validació",
-		validFail: "Si us plau, introdueix una fórmula vàlida"
-	},
 	alert: {
 		title: "Error",
 		ok: "OK"

package/lib/cjs/locale/de-DE.js

@@ -20,20 +20,7 @@ const locale = { "sheets-data-validation-ui": {
 		}
 	},
 	operators: { legal: "ist gültiger Typ" },
-	validFail: {
-		value: "Bitte einen Wert eingeben",
-		common: "Bitte Wert oder Formel eingeben",
-		number: "Bitte Zahl oder Formel eingeben",
-		formula: "Bitte Formel eingeben",
-		integer: "Bitte Ganzzahl oder Formel eingeben",
-		date: "Bitte Datum oder Formel eingeben",
-		list: "Bitte Optionen eingeben",
-		listInvalid: "Die Listenquelle muss eine durch Trennzeichen getrennte Liste oder ein Bezug auf eine einzelne Zeile oder Spalte sein",
-		checkboxEqual: "Geben Sie unterschiedliche Werte für angekreuzte und nicht angekreuzte Zelleninhalte ein.",
-		formulaError: "Der Referenzbereich enthält unsichtbare Daten, bitte passen Sie den Bereich an",
-		listIntersects: "Der ausgewählte Bereich darf sich nicht mit dem Gültigkeitsbereich der Regeln überschneiden",
-		primitive: "Formeln sind für benutzerdefinierte angekreuzte und nicht angekreuzte Werte nicht zulässig."
-	},
+	validFail: { formulaError: "Der Referenzbereich enthält unsichtbare Daten, bitte passen Sie den Bereich an" },
 	panel: {
 		title: "Datenüberprüfungsverwaltung",
 		addTitle: "Neue Datenüberprüfung erstellen",
@@ -56,43 +43,21 @@ const locale = { "sheets-data-validation-ui": {
 		rangeError: "Bereiche sind ungültig",
 		allowBlank: "Leere Werte zulassen"
 	},
-	any: {
-		title: "Beliebiger Wert",
-		error: "Der Inhalt dieser Zelle verstößt gegen die Überprüfungsregel"
-	},
 	date: { title: "Datum" },
 	list: {
 		title: "Dropdown",
-		name: "Wert enthält einen aus dem Bereich",
-		error: "Eingabe muss innerhalb des angegebenen Bereichs liegen",
-		emptyError: "Bitte einen Wert eingeben",
 		add: "Hinzufügen",
-		dropdown: "Auswählen",
 		options: "Optionen",
 		customOptions: "Benutzerdefiniert",
 		refOptions: "Aus einem Bereich",
-		formulaError: "Die Listenquelle muss eine durch Trennzeichen getrennte Liste von Daten oder ein Bezug auf eine einzelne Zeile oder Spalte sein.",
 		edit: "Bearbeiten"
 	},
-	listMultiple: {
-		title: "Dropdown-Mehrfachauswahl",
-		dropdown: "Mehrfachauswahl"
-	},
-	textLength: { title: "Textlänge" },
-	decimal: { title: "Zahl" },
-	whole: { title: "Ganzzahl" },
 	checkbox: {
 		title: "Kontrollkästchen",
-		error: "Der Inhalt dieser Zelle verstößt gegen die Überprüfungsregel",
 		tips: "Benutzerdefinierte Werte in Zellen verwenden",
 		checked: "Ausgewählter Wert",
 		unchecked: "Nicht ausgewählter Wert"
 	},
-	custom: {
-		title: "Benutzerdefinierte Formel",
-		error: "Der Inhalt dieser Zelle verstößt gegen die Überprüfungsregel",
-		validFail: "Bitte eine gültige Formel eingeben"
-	},
 	alert: {
 		title: "Fehler",
 		ok: "OK"