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

package/lib/es/index.js

@@ -14,7 +14,7 @@ import { CheckboxIcon, DataValidationIcon, DatePickerIcon, DeleteIcon, DropdownL
 import { deserializeRangeWithSheet, serializeRange } from "@univerjs/engine-formula";
 import { FormulaEditor, RangeSelector } from "@univerjs/sheets-formula-ui";
 
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -25,7 +25,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -38,14 +38,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -56,7 +56,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -64,7 +64,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -184,7 +184,7 @@ let DataValidationRejectInputController = class DataValidationRejectInputControl
 			const ruleId = this._dataValidationModel.getRuleIdByLocation(unitId, subUnitId, row, col);
 			const rule = ruleId ? this._dataValidationModel.getRuleById(unitId, subUnitId, ruleId) : void 0;
 			if (cell === false) return next(Promise.resolve(false));
-			if (!rule || rule.errorStyle !== DataValidationErrorStyle.STOP) return next(Promise.resolve(true));
+			if (!rule || rule.showErrorMessage === false || rule.errorStyle !== DataValidationErrorStyle.STOP) return next(Promise.resolve(true));
 			const validator = this._dataValidatorRegistryService.getValidatorItem(rule.type);
 			if (!validator) return next(Promise.resolve(true));
 			if (await this._sheetsDataValidationValidatorService.validatorCell(unitId, subUnitId, row, col) === DataValidationStatus.VALID) return next(Promise.resolve(true));
@@ -337,7 +337,7 @@ let DataValidationDropdownManagerService = class DataValidationDropdownManagerSe
 			return true;
 		};
 		const handleSerialSave = async (serial, targetPatternType, interceptValue) => {
-			if (rule.errorStyle !== DataValidationErrorStyle.STOP || await validator.validator({
+			if (rule.showErrorMessage === false || rule.errorStyle !== DataValidationErrorStyle.STOP || await validator.validator({
 				value: serial,
 				unitId,
 				subUnitId,
@@ -395,7 +395,7 @@ let DataValidationDropdownManagerService = class DataValidationDropdownManagerSe
 				seconds: 0,
 				fractionalSecond: 0
 			} : selectedParts;
-			const serialNum = excelDateTimePartsToSerial({
+			const dateParts = {
 				year: targetPatternType === "time" && originalParts && (originalSerial ?? 0) >= 1 ? originalParts.year : selectedParts.year,
 				month: targetPatternType === "time" && originalParts && (originalSerial ?? 0) >= 1 ? originalParts.month : selectedParts.month,
 				day: targetPatternType === "time" && originalParts && (originalSerial ?? 0) >= 1 ? originalParts.day : targetPatternType === "datetime" && changeType === "time" && isExceptionalDateAnchor ? originalParts.day : selectedParts.day,
@@ -403,7 +403,8 @@ let DataValidationDropdownManagerService = class DataValidationDropdownManagerSe
 				minutes: timeParts.minutes,
 				seconds: timeParts.seconds,
 				fractionalSecond: timeParts.fractionalSecond
-			}, { dateSystem });
+			};
+			const serialNum = excelDateTimePartsToSerial(dateParts, { dateSystem });
 			if (serialNum == null) return false;
 			const serialTime = targetPatternType === "time" && (originalSerial == null || originalSerial < 1) ? serialNum - Math.floor(serialNum) : serialNum;
 			const dateStr = date.format(targetPatternType === "date" ? "YYYY-MM-DD 00:00:00" : "YYYY-MM-DD HH:mm:ss");
@@ -802,7 +803,8 @@ const AddSheetDataValidationAndOpenCommand = {
 	type: CommandType.COMMAND,
 	id: "data-validation.command.addRuleAndOpen",
 	handler(accessor, params) {
-		const target = getSheetCommandTarget(accessor.get(IUniverInstanceService));
+		const univerInstanceService = accessor.get(IUniverInstanceService);
+		const target = getSheetCommandTarget(univerInstanceService);
 		if (!target) return false;
 		const { workbook, worksheet } = target;
 		if (!accessor.get(SheetsSelectionsService).getCurrentSelections().length) return false;
@@ -1070,7 +1072,7 @@ const menuSchema = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-data-validation-ui";
-var version = "1.0.0-rc.0";
+var version = "1.0.0";
 
 //#endregion
 //#region src/controllers/dv-alert.controller.ts
@@ -1198,7 +1200,8 @@ let DataValidationAutoFillController = class DataValidationAutoFillController ex
 				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);
+			const diffs = ruleMatrixCopy.diff(this._sheetDataValidationModel.getRules(unitId, subUnitId));
+			const { redoMutations, undoMutations } = getDataValidationDiffMutations(unitId, subUnitId, diffs, this._injector, "patched", applyType === AUTO_FILL_APPLY_TYPE.ONLY_FORMAT);
 			return {
 				undos: undoMutations,
 				redos: redoMutations
@@ -1643,7 +1646,10 @@ function recalculateAutoHeight(infos, autoHeightController, commandService) {
 		ranges.push(...rule.ranges);
 		rangesBySheet.set(subUnitId, ranges);
 	}
-	for (const [unitId, rangesBySheet] of rangesByUnit) for (const [subUnitId, ranges] of rangesBySheet) sequenceExecute(autoHeightController.getUndoRedoParamsOfAutoHeight(ranges, subUnitId, void 0, unitId).redos, commandService);
+	for (const [unitId, rangesBySheet] of rangesByUnit) for (const [subUnitId, ranges] of rangesBySheet) {
+		const mutations = autoHeightController.getUndoRedoParamsOfAutoHeight(ranges, subUnitId, void 0, unitId);
+		sequenceExecute(mutations.redos, commandService);
+	}
 }
 
 //#endregion
@@ -1678,7 +1684,8 @@ let SheetsDataValidationMobileRenderController = class SheetsDataValidationMobil
 				if (!rule) return next(cell);
 				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 cellOrigin = worksheet.getCellRaw(row, col);
+				const cellValue = getCellValueOrigin(cellOrigin);
 				const valueStr = `${cellValue ?? ""}`;
 				if (!cell || cell === pos.rawData) cell = { ...pos.rawData };
 				cell.markers = {
@@ -1760,7 +1767,7 @@ const MARGIN_H$2 = 6;
 let CheckboxRender = class CheckboxRender {
 	_calc(cellInfo, style) {
 		const { vt, ht } = style || {};
-		const width = cellInfo.endX - cellInfo.startX - MARGIN_H$2 * 2;
+		const width = cellInfo.endX - cellInfo.startX - 12;
 		const height = cellInfo.endY - cellInfo.startY;
 		const size = ((style === null || style === void 0 ? void 0 : style.fs) ?? 10) * 1.6;
 		let widgetLeft = 0;
@@ -1772,9 +1779,7 @@ let CheckboxRender = class CheckboxRender {
 			case VerticalAlign.BOTTOM:
 				widgetTop = 0 + (height - size);
 				break;
-			default:
-				widgetTop = 0 + (height - size) / 2;
-				break;
+			default: widgetTop = 0 + (height - size) / 2;
 		}
 		switch (ht) {
 			case HorizontalAlign.LEFT:
@@ -1783,9 +1788,7 @@ let CheckboxRender = class CheckboxRender {
 			case HorizontalAlign.RIGHT:
 				widgetLeft = MARGIN_H$2 + (width - size);
 				break;
-			default:
-				widgetLeft = MARGIN_H$2 + (width - size) / 2;
-				break;
+			default: widgetLeft = MARGIN_H$2 + (width - size) / 2;
 		}
 		return {
 			left: cellInfo.startX + widgetLeft,
@@ -2073,25 +2076,22 @@ var DecimalValidatorView = class extends BaseSheetDataValidatorView {
 
 //#endregion
 //#region src/views/widgets/shape/layout.ts
-const PADDING_H$1 = 4;
-const PADDING_V$1 = 0;
 const MARGIN_H$1 = 4;
 const MARGIN_V$1 = 4;
-const CELL_PADDING_V = 6;
 function getDropdownItemSize(text, fontStyle) {
 	const bBox = FontCache.getTextSize(text, fontStyle);
-	const rectWidth = bBox.width + 4 * 2;
+	const rectWidth = bBox.width + 8;
 	const { ba, bd } = bBox;
 	return {
 		width: rectWidth,
-		height: ba + bd + 0 * 2,
+		height: ba + bd + 0,
 		ba
 	};
 }
 function layoutDropdowns(items, fontStyle, cellWidth, cellHeight) {
 	const cellPaddingH = 26;
 	const widthAvailableForContent = cellWidth - cellPaddingH;
-	const heightAvailableForContent = cellHeight - 6 * 2;
+	const heightAvailableForContent = cellHeight - 12;
 	const textLayout = items.map((item) => ({
 		layout: getDropdownItemSize(item, fontStyle),
 		text: item
@@ -2131,7 +2131,7 @@ function layoutDropdowns(items, fontStyle, cellWidth, cellHeight) {
 		totalHeight,
 		contentWidth: widthAvailableForContent,
 		contentHeight: heightAvailableForContent,
-		cellAutoHeight: totalHeight + 6 * 2,
+		cellAutoHeight: totalHeight + 12,
 		calcAutoWidth: maxLineWidth + cellPaddingH
 	};
 }
@@ -2188,10 +2188,7 @@ let DropdownMultipleWidget = class DropdownMultipleWidget {
 			case VerticalAlign.MIDDLE:
 				top = (cellHeight - 14) / 2 + 4;
 				break;
-			case VerticalAlign.BOTTOM:
-				top = cellHeight - 14 + 4;
-				break;
-			default: break;
+			case VerticalAlign.BOTTOM: top = cellHeight - 14 + 4;
 		}
 		ctx.save();
 		ctx.translateWithPrecision(cellBounding.startX + left, cellBounding.startY + top);
@@ -2240,10 +2237,7 @@ let DropdownMultipleWidget = class DropdownMultipleWidget {
 			case VerticalAlign.MIDDLE:
 				top = (layout.contentHeight - layout.totalHeight) / 2;
 				break;
-			case VerticalAlign.BOTTOM:
-				top = layout.contentHeight - layout.totalHeight;
-				break;
-			default: break;
+			case VerticalAlign.BOTTOM: top = layout.contentHeight - layout.totalHeight;
 		}
 		ctx.translateWithPrecision(0, top);
 		layout.lines.forEach((line, index) => {
@@ -2254,10 +2248,7 @@ let DropdownMultipleWidget = class DropdownMultipleWidget {
 				case HorizontalAlign.RIGHT:
 					left = layout.contentWidth - width;
 					break;
-				case HorizontalAlign.CENTER:
-					left = (layout.contentWidth - width) / 2;
-					break;
-				default: break;
+				case HorizontalAlign.CENTER: left = (layout.contentWidth - width) / 2;
 			}
 			ctx.translate(left, index * (height + 4));
 			items.forEach((item) => {
@@ -2298,7 +2289,9 @@ let DropdownMultipleWidget = class DropdownMultipleWidget {
 		const cellWidth = cellBounding.endX - cellBounding.startX;
 		const cellHeight = cellBounding.endY - cellBounding.startY;
 		const cellValue = getCellValueOrigin(data) ?? "";
-		return layoutDropdowns(validator.parseCellValue(cellValue), getFontStyleString(style ?? void 0), cellWidth, cellHeight).cellAutoHeight;
+		const items = validator.parseCellValue(cellValue);
+		const fontStyle = getFontStyleString(style ?? void 0);
+		return layoutDropdowns(items, fontStyle, cellWidth, cellHeight).cellAutoHeight;
 	}
 	calcCellAutoWidth(info) {
 		const { primaryWithCoord, style, data, row, col } = info;
@@ -2317,7 +2310,9 @@ let DropdownMultipleWidget = class DropdownMultipleWidget {
 		const cellWidth = cellBounding.endX - cellBounding.startX;
 		const cellHeight = cellBounding.endY - cellBounding.startY;
 		const cellValue = getCellValueOrigin(data) ?? "";
-		return layoutDropdowns(validator.parseCellValue(cellValue), getFontStyleString(style ?? void 0), cellWidth, cellHeight).calcAutoWidth;
+		const items = validator.parseCellValue(cellValue);
+		const fontStyle = getFontStyleString(style ?? void 0);
+		return layoutDropdowns(items, fontStyle, cellWidth, cellHeight).calcAutoWidth;
 	}
 	isHit(position, info) {
 		const { primaryWithCoord } = info;
@@ -2438,9 +2433,7 @@ function calcPadding(cellWidth, cellHeight, fontWidth, fontHeight, vt, ht, margi
 		case VerticalAlign.MIDDLE:
 			paddingTop = (cellHeight - fontHeight) / 2;
 			break;
-		default:
-			paddingTop = realMargin;
-			break;
+		default: paddingTop = realMargin;
 	}
 	paddingTop = Math.max(MARGIN_V, paddingTop);
 	let paddingLeft = 0;
@@ -2448,10 +2441,7 @@ function calcPadding(cellWidth, cellHeight, fontWidth, fontHeight, vt, ht, margi
 		case HorizontalAlign.CENTER:
 			paddingLeft = (cellWidth - fontWidth) / 2;
 			break;
-		case HorizontalAlign.RIGHT:
-			paddingLeft = cellWidth - fontWidth;
-			break;
-		default: break;
+		case HorizontalAlign.RIGHT: paddingLeft = cellWidth - fontWidth;
 	}
 	paddingLeft = Math.max(MARGIN_H, paddingLeft);
 	return {
@@ -2491,9 +2481,7 @@ let DropdownWidget = class DropdownWidget {
 			case VerticalAlign.BOTTOM:
 				top = cellHeight - b - fontHeight - MARGIN_V + (fontHeight / 2 - ICON_SIZE / 2);
 				break;
-			default:
-				top = t + MARGIN_V + (fontHeight / 2 - ICON_SIZE / 2);
-				break;
+			default: top = t + MARGIN_V + (fontHeight / 2 - ICON_SIZE / 2);
 		}
 		ctx.save();
 		ctx.translateWithPrecision(cellBounding.startX + left, cellBounding.startY + top);
@@ -2579,13 +2567,13 @@ let DropdownWidget = class DropdownWidget {
 			ctx.beginPath();
 			ctx.rect(0, 0, cellWidth, cellHeight);
 			ctx.clip();
-			const realWidth = cellWidth - MARGIN_H * 2 - PADDING_H - ICON_PLACE - 4;
+			const realWidth = cellWidth - 12 - PADDING_H - ICON_PLACE - 4;
 			const textSkeleton = new DocSimpleSkeleton(valueStr, fontStyle, Boolean(tb === WrapStrategy.WRAP), realWidth, Infinity);
 			textSkeleton.calculate();
 			const fontWidth = textSkeleton.getTotalWidth();
 			const fontHeight = textSkeleton.getTotalHeight();
-			const rectHeight = fontHeight + PADDING_V * 2;
-			const rectWidth = Math.max(cellWidth - MARGIN_H * 2, 1);
+			const rectHeight = fontHeight + 2;
+			const rectWidth = Math.max(cellWidth - 12, 1);
 			const { paddingTop } = calcPadding(rectWidth, cellHeight, fontWidth, rectHeight, vt, ht);
 			ctx.translateWithPrecision(MARGIN_H, paddingTop);
 			Rect.drawWith(ctx, {
@@ -2646,12 +2634,12 @@ let DropdownWidget = class DropdownWidget {
 			const realWidth = cellWidth - l - r - ICON_PLACE - 4;
 			const skeleton = new DocSimpleSkeleton(valueStr, getFontStyleString(style).fontCache, Boolean(tb === WrapStrategy.WRAP), realWidth, Infinity);
 			skeleton.calculate();
-			return skeleton.getTotalHeight() + t + b + MARGIN_V * 2;
+			return skeleton.getTotalHeight() + t + b + 6;
 		} else {
-			const realWidth = Math.max(cellWidth - MARGIN_H * 2 - PADDING_H - ICON_PLACE - 4, 10);
+			const realWidth = Math.max(cellWidth - 12 - PADDING_H - ICON_PLACE - 4, 10);
 			const skeleton = new DocSimpleSkeleton(valueStr, getFontStyleString(style).fontCache, Boolean(tb === WrapStrategy.WRAP), realWidth, Infinity);
 			skeleton.calculate();
-			return skeleton.getTotalHeight() + MARGIN_V * 2 + PADDING_V * 2;
+			return skeleton.getTotalHeight() + 6 + 2;
 		}
 	}
 	calcCellAutoWidth(info) {
@@ -3263,6 +3251,7 @@ const DataValidationItem = (props) => {
 	const ids = useRef(void 0);
 	const [isHover, setIsHover] = useState(false);
 	const themeService = useDependency(ThemeService);
+	const theme = useObservable(themeService.currentTheme$);
 	const style = useMemo(() => {
 		const defaultColor = themeService.getColorFromTheme("primary.600");
 		const key = themeService.getColorFromTheme("loop-color.2");
@@ -3272,7 +3261,7 @@ const DataValidationItem = (props) => {
 			fill: `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, 0.1)`,
 			stroke: color
 		};
-	}, [useObservable(themeService.currentTheme$)]);
+	}, [theme]);
 	const handleDelete = (e) => {
 		commandService.executeCommand(RemoveSheetDataValidationCommand.id, {
 			ruleId: rule.uid,
@@ -3708,13 +3697,15 @@ function ListFormulaInput(props) {
 	const [refOptions, setRefOptions] = useState([]);
 	const [localError, setLocalError] = useState("");
 	const formula1Res = showError ? validResult === null || validResult === void 0 ? void 0 : validResult.formula1 : "";
-	const ruleChange = useObservable(useMemo(() => dataValidationModel.ruleChange$.pipe(debounceTime(16)), []));
+	const ruleChange$ = useMemo(() => dataValidationModel.ruleChange$.pipe(debounceTime(16)), []);
+	const ruleChange = useObservable(ruleChange$);
 	const onChange = useEvent(_onChange);
 	useEffect(() => {
 		let cancelled = false;
 		const timer = setTimeout(() => {
 			const rule = dataValidationModel.getRuleById(unitId, subUnitId, ruleId);
-			if (isFormulaString(rule === null || rule === void 0 ? void 0 : rule.formula1) && listValidator && rule) listValidator.getListAsync(rule, unitId, subUnitId).then((options) => {
+			const formula1 = rule === null || rule === void 0 ? void 0 : rule.formula1;
+			if (isFormulaString(formula1) && listValidator && rule) listValidator.getListAsync(rule, unitId, subUnitId).then((options) => {
 				if (!cancelled) setRefOptions(options);
 			});
 		}, 100);