@a3s-lab/office 0.40.0 → 0.41.0

package/README.md

@@ -309,6 +309,17 @@ and [CLI reference](./docs/latest/en/cli-reference.md).
 
 ## Current release
 
+Version `0.41.0` aligns Spreadsheet data-validation alerts with the local,
+testable interaction model used by Traditional Office:
+
+- Stop blocks an invalid edit with an accessible notice. Warning and
+  Information ask whether the invalid value should be kept, using the authored
+  title and message plus the current input so the decision is explicit.
+- Keeping a Warning or Information value commits it once through the controlled
+  workbook API; cancelling restores the original value. Selection, focus,
+  Undo, and collaboration remain on the same bounded edit path, and native
+  XLSX `errorStyle` metadata remains lossless on reopen.
+
 Version `0.40.0` extends Writer's local, testable review workflow with atomic
 ordered-list numbering revisions:
 

package/dist/0~spreadsheet-editor.js

@@ -26838,7 +26838,7 @@ function SpreadsheetDataValidationDialog({ source, restoreFocusTarget, onApply,
                             children: [
                                 /*#__PURE__*/ jsx(field_Field, {
                                     label: "错误警告样式",
-                                    description: "三种样式会写入原生文件；当前浏览器网格统一阻止无效值。",
+                                    description: "停止会阻止无效输入；警告和信息会询问是否保留。三种样式都会写入原生文件。",
                                     children: /*#__PURE__*/ jsxs("select", {
                                         "aria-label": "错误警告样式",
                                         value: value.errorStyle,
@@ -27073,6 +27073,55 @@ function use_spreadsheet_data_validation_spreadsheetDataValidationError(content,
         value
     }) ?? fallback;
 }
+function spreadsheetDataValidationErrorStyle(item) {
+    return 'warning' === item.errorStyle || 'information' === item.errorStyle ? item.errorStyle : 'stop';
+}
+function spreadsheetDataValidationInteraction(style) {
+    return 'stop' === style ? 'notice' : 'confirm';
+}
+function spreadsheetDataValidationDialogTitle(item) {
+    const customTitle = item.errorTitle?.trim();
+    if (customTitle) return customTitle;
+    switch(spreadsheetDataValidationErrorStyle(item)){
+        case 'warning':
+            return '数据验证警告';
+        case 'information':
+            return '数据验证提示';
+        default:
+            return '数据验证错误';
+    }
+}
+function spreadsheetDataValidationDialogDescription(failureText, value, item) {
+    const customTitle = item?.errorTitle?.trim();
+    const customMessage = item?.errorMessage?.trim();
+    let message = customMessage || failureText.trim();
+    if (customTitle && message.startsWith(`${customTitle}\n`)) message = message.slice(customTitle.length + 1).trim();
+    message ||= '当前输入不符合此单元格的数据验证规则。';
+    const valueText = spreadsheetDataValidationValueText(value);
+    return valueText ? `${message}\n\n当前输入：${valueText}` : message;
+}
+function spreadsheetDataValidationConfirmLabels(style) {
+    return 'warning' === style ? {
+        cancelLabel: '取消',
+        confirmLabel: '继续输入'
+    } : {
+        cancelLabel: '返回修改',
+        confirmLabel: '保留输入'
+    };
+}
+function spreadsheetDataValidationValueText(value) {
+    if ('string' == typeof value) return value.trim();
+    if ('number' == typeof value || 'boolean' == typeof value) return String(value);
+    return '';
+}
+function cloneSpreadsheetDataValidationItem(item) {
+    return {
+        ...item,
+        errorTitle: item.errorTitle,
+        errorMessage: item.errorMessage,
+        hintTitle: item.hintTitle
+    };
+}
 const spreadsheetCellFormatAttributes = [
     'bl',
     'it',
@@ -29935,6 +29984,28 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
     const activeSheetId = viewActiveSheetId && content.sheets.some((sheet)=>sheet.id === viewActiveSheetId && 1 !== sheet.hide) ? viewActiveSheetId : contentActiveSheetId;
     const activeSheetIdRef = useRef(activeSheetId);
     const focusedSheetIdRef = useRef(null);
+    const pendingDataValidationRef = useRef(null);
+    const [pendingDataValidation, setPendingDataValidation] = useState(null);
+    const queueDataValidationEdit = useCallback((row, column, value, item, failureText, sheetId)=>{
+        const requestSheetId = sheetId ?? activeSheetIdRef.current;
+        if (!requestSheetId || !item || 'object' != typeof item || pendingDataValidationRef.current) return pendingDataValidationRef.current ? false : void 0;
+        const validationItem = item;
+        const style = spreadsheetDataValidationErrorStyle(validationItem);
+        const request = {
+            column,
+            failureText,
+            interaction: spreadsheetDataValidationInteraction(style),
+            item: cloneSpreadsheetDataValidationItem(validationItem),
+            row,
+            sheetId: requestSheetId,
+            value
+        };
+        pendingDataValidationRef.current = request;
+        queueMicrotask(()=>{
+            if (pendingDataValidationRef.current === request) setPendingDataValidation(request);
+        });
+        return false;
+    }, []);
     contentRef.current = materializedContent;
     previewRef.current = preview;
     const controlledHistory = useOfficeHistory({
@@ -29992,6 +30063,100 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
     }, [
         activeSheetId
     ]);
+    useEffect(()=>{
+        const request = pendingDataValidation;
+        if (!request) return;
+        let cancelled = false;
+        const style = spreadsheetDataValidationErrorStyle(request.item);
+        const description = spreadsheetDataValidationDialogDescription(request.failureText, request.value, request.item);
+        const restoreValidationSelection = ()=>{
+            const selection = {
+                row: [
+                    request.row,
+                    request.row
+                ],
+                column: [
+                    request.column,
+                    request.column
+                ],
+                row_focus: request.row,
+                column_focus: request.column
+            };
+            const nextSelection = {
+                sheetId: request.sheetId,
+                selection
+            };
+            selectionStateRef.current.current = nextSelection;
+            selectionStateRef.current.requested = {
+                sheetId: request.sheetId,
+                selection: {
+                    ...selection,
+                    row: [
+                        ...selection.row
+                    ],
+                    column: [
+                        ...selection.column
+                    ]
+                }
+            };
+            setSelectionState(nextSelection);
+            try {
+                workbookRef.current?.setSelection([
+                    {
+                        row: selection.row,
+                        column: selection.column
+                    }
+                ], {
+                    id: request.sheetId
+                });
+            } catch  {}
+        };
+        const finish = (accepted)=>{
+            if (cancelled || pendingDataValidationRef.current !== request) return;
+            pendingDataValidationRef.current = null;
+            setPendingDataValidation(null);
+            if (accepted) try {
+                workbookRef.current?.setCellValue(request.row, request.column, request.value, {
+                    id: request.sheetId,
+                    skipDataValidation: true
+                });
+            } catch  {
+                showToast('无法保留此输入，请重试。', 'error');
+            }
+            restoreValidationSelection();
+        };
+        const showValidationDialog = async ()=>{
+            if ('notice' === request.interaction) {
+                await officeDialog.notice({
+                    title: spreadsheetDataValidationDialogTitle(request.item),
+                    description,
+                    confirmLabel: '知道了',
+                    restoreFocusTarget: getSpreadsheetDialogGridFocusTarget
+                });
+                finish(false);
+                return;
+            }
+            const labels = spreadsheetDataValidationConfirmLabels(style);
+            const accepted = await officeDialog.confirm({
+                title: spreadsheetDataValidationDialogTitle(request.item),
+                description,
+                confirmLabel: labels.confirmLabel,
+                cancelLabel: labels.cancelLabel,
+                confirmTone: 'warning' === style ? 'primary' : 'secondary',
+                restoreFocusTarget: getSpreadsheetDialogGridFocusTarget
+            });
+            finish(accepted);
+        };
+        showValidationDialog();
+        return ()=>{
+            cancelled = true;
+        };
+    }, [
+        getSpreadsheetDialogGridFocusTarget,
+        officeDialog.confirm,
+        officeDialog.notice,
+        pendingDataValidation
+    ]);
     useEffect(()=>{
         if (preview || !activeSheetId || focusedSheetIdRef.current === activeSheetId) return;
         const initialFocus = null === focusedSheetIdRef.current;
@@ -30077,6 +30242,7 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
                 const sheet = contentRef.current.sheets.find((candidate)=>candidate.id === activeSheetIdRef.current);
                 return !sheet || !spreadsheetPivotOutputContains(sheet, row, column);
             },
+            beforeDataValidation: queueDataValidationEdit,
             beforePaste: (selections)=>{
                 const sheet = contentRef.current.sheets.find((candidate)=>candidate.id === activeSheetIdRef.current);
                 if (!sheet) return true;
@@ -30116,7 +30282,8 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
                 }
             }
         }), [
-        collaborationView
+        collaborationView,
+        queueDataValidationEdit
     ]);
     const conditionalFormatKey = useMemo(()=>content.sheets.map((sheet)=>`${sheet.id}:${JSON.stringify(sheet.luckysheet_conditionformat_save ?? [])}`).join('|'), [
         content.sheets

package/dist/internal/features/work/editors/spreadsheet-data-validation-interaction.d.ts

@@ -0,0 +1,23 @@
+import type { WorkSpreadsheetDataValidationErrorStyle, WorkSpreadsheetDataValidationItem } from '../work-types';
+export type SpreadsheetDataValidationInteraction = 'notice' | 'confirm';
+export interface SpreadsheetDataValidationEditRequest {
+    column: number;
+    failureText: string;
+    interaction: SpreadsheetDataValidationInteraction;
+    item: WorkSpreadsheetDataValidationItem;
+    row: number;
+    sheetId: string;
+    value: unknown;
+}
+type SpreadsheetDataValidationMessageSource = Pick<WorkSpreadsheetDataValidationItem, 'errorMessage' | 'errorTitle'>;
+export declare function spreadsheetDataValidationErrorStyle(item: Pick<WorkSpreadsheetDataValidationItem, 'errorStyle'>): WorkSpreadsheetDataValidationErrorStyle;
+export declare function spreadsheetDataValidationInteraction(style: WorkSpreadsheetDataValidationErrorStyle): SpreadsheetDataValidationInteraction;
+export declare function spreadsheetDataValidationDialogTitle(item: Pick<WorkSpreadsheetDataValidationItem, 'errorStyle' | 'errorTitle'>): string;
+export declare function spreadsheetDataValidationDialogDescription(failureText: string, value: unknown, item?: SpreadsheetDataValidationMessageSource): string;
+export declare function spreadsheetDataValidationConfirmLabels(style: WorkSpreadsheetDataValidationErrorStyle): {
+    cancelLabel: string;
+    confirmLabel: string;
+};
+export declare function spreadsheetDataValidationValueText(value: unknown): string;
+export declare function cloneSpreadsheetDataValidationItem(item: WorkSpreadsheetDataValidationItem): WorkSpreadsheetDataValidationItem;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a3s-lab/office",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "description": "Open-source collaborative browser editors for documents, Markdown, spreadsheets, presentations, and PDFs.",
   "keywords": [
     "office",