@a3s-lab/office 0.17.0 → 0.18.0

package/README.md

@@ -561,7 +561,10 @@ interaction model.
   style-only writes, Home and Font Grow/Shrink Font commands with
   `Cmd/Ctrl+Shift+.` / `Cmd/Ctrl+]` and `Cmd/Ctrl+Shift+,` / `Cmd/Ctrl+[` aliases,
   per-cell mixed-size stepping, native rectangle compaction, a 10,000-cell
-  bound, and one-step Undo, plus a cell-border split control with side, all,
+  bound, and one-step Undo, a WPS-style Underline split control with single,
+  double, single-accounting, and double-accounting styles, exact Format Cells
+  and XLSX round trips, and active-style-aware `Cmd/Ctrl+U` toggling, plus a
+  cell-border split control with side, all,
   outside, inside, horizontal, vertical, clear, and diagonal targets, ten
   native line styles, exact color selection, compact overlapping range writes,
   `Cmd/Ctrl+Shift+&` Outside Borders and `Cmd/Ctrl+Shift+_` Clear Borders,
@@ -1519,6 +1522,7 @@ without hard-coded return URLs.
 
 - [Live Playground](https://a3s-lab.github.io/Office/)
 - [Documentation center](https://a3s-lab.github.io/Office/docs/)
+- [A3S Office 0.18.0 documentation](https://a3s-lab.github.io/Office/docs/0.18.0/)
 - [A3S Office 0.17.0 documentation](https://a3s-lab.github.io/Office/docs/0.17.0/)
 - [A3S Office 0.16.0 documentation](https://a3s-lab.github.io/Office/docs/0.16.0/)
 - [A3S Office 0.15.0 documentation](https://a3s-lab.github.io/Office/docs/0.15.0/)

package/dist/0~spreadsheet-editor.js

@@ -4,7 +4,7 @@ import { Workbook } from "@fortune-sheet/react";
 import { AArrowDown, AArrowUp, AlignCenter, AlignLeft, AlignRight, AlignVerticalJustifyCenter, AlignVerticalJustifyEnd, AlignVerticalJustifyStart, ArrowDown, ArrowDownToLine, ArrowLeft, ArrowLeftToLine, ArrowRight, ArrowRightToLine, ArrowUp, ArrowUpToLine, BadgeJapaneseYen, BarChart3, BetweenHorizontalEnd, BetweenHorizontalStart, BetweenVerticalEnd, BetweenVerticalStart, Bold, Bookmark, Calculator, Check, ChevronDown, ChevronLeft, ChevronRight, ClipboardPaste, Cloud, Columns3, Copy, CopyPlus, DecimalsArrowLeft, DecimalsArrowRight, Eraser, Eye, EyeOff, FileX2, Globe2, Grid2X2, Grid3X3, Hash, Italic, KeyRound, Layers2, Link2, Link2Off, ListChecks, ListFilter, LocateFixed, Merge, MessageSquareX, MoveHorizontal, MoveVertical, Paintbrush, Palette, PanelLeft, PanelTop, PanelsTopLeft, Pencil, Percent, Plus, Printer, Redo2, RefreshCw, Rows3, Save, Scissors, Search, Settings2, ShieldCheck, Sigma, SortAsc, SortDesc, Strikethrough, SwatchBook, Table2, TableProperties, Trash2, Underline, Undo2, WrapText, X } from "lucide-react";
 import { Fragment as external_react_Fragment, cloneElement, memo, useCallback, useEffect, useId, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { genarate, indexToColumnChar, update as core_update } from "@fortune-sheet/core";
-import { freezeImportedSpreadsheetCell, withoutEditableRange, spreadsheetMatrixProfile, normalizeSpreadsheetConditionalVisualOptions, effectiveSpreadsheetPageSetup, attachSpreadsheetShownCommentCells, withEditableRange, sameSpreadsheetHistoryValue, createOfficeSpreadsheetCollaborationBinding as createWorkOfficeSpreadsheetCollaborationBinding, isSpreadsheetConditionalComparisonOperator, spreadsheetConditionalIconForValue, defaultSpreadsheetConditionalIconThresholds, normalizeSpreadsheetDateValidationBoundary, sheetProtectionAuthority, editableRangeCellCount, unlockedCellCount, registerDerivedSpreadsheetMatrix, editableRangeRequiresCredentials, SPREADSHEET_CONDITIONAL_COMPARISON_OPERATORS, normalizeSpreadsheetConditionalIconSetFormat, defaultSpreadsheetDataBarOptions, spreadsheetConditionalThresholdValue, normalizeSheetProtectionAuthority, withSheetProtection, spreadsheetProtectionKey, defaultSpreadsheetColorScaleThresholds, protectedSheetCount, SPREADSHEET_CONDITIONAL_ICON_SETS, withSheetSelectionPermissions, spreadsheetConditionalComparisonNeedsUpperValue, drawSpreadsheetConditionalIcon, replaceOfficeSpreadsheetCollaboration as replaceWorkOfficeSpreadsheetCollaboration, readOfficeSpreadsheetCollaboration as readWorkOfficeSpreadsheetCollaboration, spreadsheetConditionalThresholdsEqual } from "./2180.js";
+import { freezeImportedSpreadsheetCell, withoutEditableRange, spreadsheetMatrixProfile, normalizeSpreadsheetConditionalVisualOptions, spreadsheetUnderlineCellValue, effectiveSpreadsheetPageSetup, attachSpreadsheetShownCommentCells, withEditableRange, sameSpreadsheetHistoryValue, createOfficeSpreadsheetCollaborationBinding as createWorkOfficeSpreadsheetCollaborationBinding, isSpreadsheetConditionalComparisonOperator, spreadsheetConditionalIconForValue, defaultSpreadsheetConditionalIconThresholds, spreadsheetUnderlineStyle, normalizeSpreadsheetDateValidationBoundary, sheetProtectionAuthority, editableRangeCellCount, unlockedCellCount, registerDerivedSpreadsheetMatrix, editableRangeRequiresCredentials, SPREADSHEET_CONDITIONAL_COMPARISON_OPERATORS, normalizeSpreadsheetConditionalIconSetFormat, defaultSpreadsheetDataBarOptions, spreadsheetConditionalThresholdValue, normalizeSheetProtectionAuthority, withSheetProtection, spreadsheetProtectionKey, defaultSpreadsheetColorScaleThresholds, protectedSheetCount, SPREADSHEET_CONDITIONAL_ICON_SETS, withSheetSelectionPermissions, spreadsheetConditionalComparisonNeedsUpperValue, drawSpreadsheetConditionalIcon, replaceOfficeSpreadsheetCollaboration as replaceWorkOfficeSpreadsheetCollaboration, readOfficeSpreadsheetCollaboration as readWorkOfficeSpreadsheetCollaboration, spreadsheetConditionalThresholdsEqual, isSpreadsheetUnderlineStyle } from "./1992.js";
 import { workSpreadsheetChartSupportsGrouping, createSpreadsheetChartFromSelection, normalizeWorkSpreadsheetDataLabelPosition, normalizeSpreadsheetPrintTitleColumns, normalizeSpreadsheetPrintTitleRows, formulaHasStructuredReference, normalizeWorkSpreadsheetErrorBars, defaultPivotValueCaption, workSpreadsheetChartSupportsBarSpacing, normalizeWorkSpreadsheetChartGrouping, spreadsheetGridSize, normalizeWorkSpreadsheetChartAxisGroup, normalizeWorkSpreadsheetScatterStyle, cloneSparseMatrix, spreadsheetPivotAggregationLabel, workSpreadsheetChartAxisIsCategoryAxis, reconcileSpreadsheetChartPreviews, normalizeWorkSpreadsheetChartAxes, normalizeWorkSpreadsheetDoughnutHoleSize, normalizeWorkSpreadsheetChartLegendPosition, spreadsheetChartCount, workSpreadsheetChartTypeLabel, sparseArrayEntries, normalizeWorkSpreadsheetTrendline, effectiveSpreadsheetCalculationSettings, spreadsheetPivotIntersects, normalizeWorkSpreadsheetDataLabels, spreadsheetPivotOutputContains, normalizeSpreadsheetPrintArea, spreadsheetCellAddress, formatSpreadsheetCellRanges, normalizeWorkSpreadsheetChartLayout, spreadsheetFormulaRangeForCell, workSpreadsheetChartAxisIsValueAxis, normalizeWorkSpreadsheetChartSmoothLines, spreadsheetPivotFilterValueKey, normalizeWorkSpreadsheetBubbleScale, normalizeWorkSpreadsheetChartSeriesStyle, volatileSpreadsheetFormulaFunctions, sparseArrayIndexes, normalizeWorkSpreadsheetBubbleSizeRepresents, workSpreadsheetChartSupportsTrendlines, normalizeWorkSpreadsheetChartLegendOverlay, parseSpreadsheetChartReference, workSpreadsheetChartGroupingIsStacked, normalizeWorkSpreadsheetChartGapWidth, workSpreadsheetChartSupportsSmoothLines, refreshSpreadsheetPivotTables, createSpreadsheetPivotFromSelection, reconcileSpreadsheetPivots, spreadsheetPivotCount, sparseMatrixColumnCount, workSpreadsheetChartSupportsErrorBars, formulaHasExternalReference, isValidSpreadsheetDefinedName, spreadsheetPivotValidation, deleteSpreadsheetPivotTable, workSpreadsheetChartAxisDefaultLabelPosition, workSpreadsheetChartSupportsSeriesAnalysis, parseSpreadsheetCellRanges, spreadsheetPivotFilterItems, spreadsheetPivotFields, normalizeWorkSpreadsheetChartOverlap, spreadsheetFormulaRangeConflict, spreadsheetSheetsWithChartPreviews, workSpreadsheetChartUsesNumericXAxis, workSpreadsheetChartAxisShowsMajorGridlinesByDefault, workSpreadsheetChartSupportsAxes, normalizeWorkSpreadsheetCombinationSeriesType, normalizeWorkSpreadsheetRadarStyle } from "./8715.js";
 import { moveOfficeMenuFocus, stepOfficeZoom, useOfficeRemoteParticipants, Popover, officePresenceColor, useOfficePublishPresenceLocation, button_Button, icon_button_IconButton, moveOfficeGridMenuFocus, office_text_field_OfficeTextField, useDialogFocusScope, useOfficeEditorWheelZoom } from "./0~6090.js";
 import { useOfficeTaskPaneEscape, OfficeCheckbox, CommittedOfficeNumberField, useOfficeDialog, useOfficeTaskPaneModal, createOfficeKernelClient, officeFontFamilies, CollectionState, OfficeNumberField, handleOfficeTaskPaneKeyDown } from "./0~7048.js";
@@ -187,15 +187,15 @@ function applyDefaultRule(styles, data, rule, blocked, matched) {
         for (const range of rule.cellrange){
             const positions = cellPositions(data, [
                 range
-            ]).filter(({ row, column })=>null != cellValue(data, row, column));
+            ]).filter(({ row, column })=>null != work_spreadsheet_conditional_format_cellValue(data, row, column));
             const occurrences = new Map();
             for (const { row, column } of positions){
-                const key = comparableKey(cellValue(data, row, column));
+                const key = comparableKey(work_spreadsheet_conditional_format_cellValue(data, row, column));
                 occurrences.set(key, (occurrences.get(key) ?? 0) + 1);
             }
             const unique = '1' === values[0];
             for (const { row, column } of positions){
-                const count = occurrences.get(comparableKey(cellValue(data, row, column))) ?? 0;
+                const count = occurrences.get(comparableKey(work_spreadsheet_conditional_format_cellValue(data, row, column))) ?? 0;
                 if (unique && 1 === count || !unique && count > 1) applyDifferentialStyle(styles, blocked, matched, row, column, style);
             }
         }
@@ -215,7 +215,7 @@ function applyDefaultRule(styles, data, rule, blocked, matched) {
         return;
     }
     forEachCell(data, rule.cellrange, ({ row, column })=>{
-        const current = cellValue(data, row, column);
+        const current = work_spreadsheet_conditional_format_cellValue(data, row, column);
         if (matchesCondition(current, rule.conditionName, values)) applyDifferentialStyle(styles, blocked, matched, row, column, style);
     });
 }
@@ -370,13 +370,13 @@ function evaluateFormula(source, row, column, baseRange, data) {
     const blank = /^(NOT\()?ISBLANK\((\$?)([A-Z]{1,3})(\$?)([1-9]\d*)\)\)?$/i.exec(formula);
     if (blank) {
         const target = formulaReference(blank[2], blank[3], blank[4], blank[5], row, column, baseRange);
-        const empty = null == cellValue(data, target.row, target.column) || '' === cellValue(data, target.row, target.column);
+        const empty = null == work_spreadsheet_conditional_format_cellValue(data, target.row, target.column) || '' === work_spreadsheet_conditional_format_cellValue(data, target.row, target.column);
         return blank[1] ? !empty : empty;
     }
     const comparison = /^(\$?)([A-Z]{1,3})(\$?)([1-9]\d*)(=|<>|>=|<=|>|<)(?:"((?:[^"]|"")*)"|(-?\d+(?:\.\d+)?))$/i.exec(formula);
     if (!comparison) return false;
     const target = formulaReference(comparison[1], comparison[2], comparison[3], comparison[4], row, column, baseRange);
-    const left = cellValue(data, target.row, target.column);
+    const left = work_spreadsheet_conditional_format_cellValue(data, target.row, target.column);
     const right = void 0 !== comparison[6] ? comparison[6].replaceAll('""', '"') : Number(comparison[7]);
     return compareWithOperator(left, comparison[5], right);
 }
@@ -445,11 +445,11 @@ function forEachCell(data, ranges, visit) {
         column
     });
 }
-function cellValue(data, row, column) {
+function work_spreadsheet_conditional_format_cellValue(data, row, column) {
     return data[row]?.[column]?.v ?? null;
 }
 function numericCellValue(data, row, column) {
-    const value = cellValue(data, row, column);
+    const value = work_spreadsheet_conditional_format_cellValue(data, row, column);
     return 'number' == typeof value && Number.isFinite(value) ? value : null;
 }
 function comparableKey(value) {
@@ -4049,7 +4049,7 @@ function canApplySpreadsheetCellFormat(content, request) {
         'top',
         'middle',
         'bottom'
-    ].includes(patch.verticalAlignment) || void 0 !== patch.wrapText && 'boolean' != typeof patch.wrapText || void 0 !== patch.rotation && (!Number.isInteger(patch.rotation) || patch.rotation < -90 || patch.rotation > 90) || void 0 !== patch.fontFamily && !validTrimmedString(patch.fontFamily, 128) || void 0 !== patch.fontSize && (!Number.isFinite(patch.fontSize) || patch.fontSize < 1 || patch.fontSize > 409) || void 0 !== patch.fontColor && !normalizeColor(patch.fontColor) || void 0 !== patch.fillColor && null !== patch.fillColor && !normalizeColor(patch.fillColor) || !validOptionalBoolean(patch.bold) || !validOptionalBoolean(patch.italic) || !validOptionalBoolean(patch.underline) || !validOptionalBoolean(patch.strike) || !validOptionalBoolean(patch.locked) || !validOptionalBoolean(patch.hidden)) return false;
+    ].includes(patch.verticalAlignment) || void 0 !== patch.wrapText && 'boolean' != typeof patch.wrapText || void 0 !== patch.rotation && (!Number.isInteger(patch.rotation) || patch.rotation < -90 || patch.rotation > 90) || void 0 !== patch.fontFamily && !validTrimmedString(patch.fontFamily, 128) || void 0 !== patch.fontSize && (!Number.isFinite(patch.fontSize) || patch.fontSize < 1 || patch.fontSize > 409) || void 0 !== patch.fontColor && !normalizeColor(patch.fontColor) || void 0 !== patch.fillColor && null !== patch.fillColor && !normalizeColor(patch.fillColor) || !validOptionalBoolean(patch.bold) || !validOptionalBoolean(patch.italic) || void 0 !== patch.underline && !isSpreadsheetUnderlineStyle(patch.underline) || !validOptionalBoolean(patch.strike) || !validOptionalBoolean(patch.locked) || !validOptionalBoolean(patch.hidden)) return false;
     if (void 0 !== patch.borders) {
         const normalized = patch.borders.map(normalizeSpreadsheetBorderFormat);
         if (normalized.some((format)=>!format || ![
@@ -4214,7 +4214,7 @@ function formatCell(source, patch) {
     if (void 0 !== patch.fontColor) next.fc = normalizeColor(patch.fontColor) ?? patch.fontColor;
     if (void 0 !== patch.bold) next.bl = patch.bold ? 1 : 0;
     if (void 0 !== patch.italic) next.it = patch.italic ? 1 : 0;
-    if (void 0 !== patch.underline) next.un = patch.underline ? 1 : 0;
+    if (void 0 !== patch.underline) next.un = spreadsheetUnderlineCellValue(patch.underline);
     if (void 0 !== patch.strike) next.cl = patch.strike ? 1 : 0;
     if (void 0 !== patch.fillColor) if (null === patch.fillColor) delete next.bg;
     else next.bg = normalizeColor(patch.fillColor) ?? patch.fillColor;
@@ -8166,7 +8166,8 @@ function isSpreadsheetAutoFilterTextTarget(target) {
 }
 function runSpreadsheetCellFormatShortcut(event, context, canExecute, execute, attribute) {
     if (event.repeat || isOfficeShortcutBlocked(event.target) || isSpreadsheetNativeTextUndoTarget(event.target)) return false;
-    const value = 1 === Number(context.toolbarCell?.[attribute]) ? 0 : 1;
+    const active = 'un' === attribute ? 'none' !== spreadsheetUnderlineStyle(context.toolbarCell?.un) : 1 === Number(context.toolbarCell?.[attribute]);
+    const value = active ? 0 : 1;
     return canExecute(attribute, value) && execute(attribute, value);
 }
 function runSpreadsheetNumberFormatShortcut(event, context, canExecute, execute, preset) {
@@ -9232,6 +9233,108 @@ function SpreadsheetBorderGlyph({ target }) {
         "aria-hidden": "true"
     });
 }
+const underlineOptions = [
+    {
+        value: 'none',
+        label: '无下划线'
+    },
+    {
+        value: 'single',
+        label: '单下划线'
+    },
+    {
+        value: 'double',
+        label: '双下划线'
+    },
+    {
+        value: 'singleAccounting',
+        label: '单会计用下划线'
+    },
+    {
+        value: 'doubleAccounting',
+        label: '双会计用下划线'
+    }
+];
+function SpreadsheetUnderlineRibbon({ can, commands, value }) {
+    const style = spreadsheetUnderlineStyle(value);
+    const active = 'none' !== style;
+    const toggleValue = active ? 0 : 1;
+    const definition = spreadsheetCommandCatalog.underline;
+    const currentLabel = underlineOptions.find((option)=>option.value === style)?.label ?? underlineOptions[0].label;
+    const menuDisabled = underlineOptions.every((option)=>!can.setCellFormat('un', spreadsheetUnderlineCellValue(option.value)));
+    return /*#__PURE__*/ jsx(Popover, {
+        label: "更多下划线",
+        panelLabel: "下划线样式",
+        panelRole: "menu",
+        portal: true,
+        placement: "bottom-end",
+        className: "work-spreadsheet-underline-split-root",
+        panelClassName: "work-office-context-menu work-spreadsheet-ribbon-menu work-spreadsheet-underline-menu",
+        disabled: menuDisabled,
+        focusFirstOnOpen: true,
+        onPanelKeyDown: moveOfficeMenuFocus,
+        trigger: (triggerProps, { open })=>/*#__PURE__*/ jsxs(Fragment, {
+                children: [
+                    /*#__PURE__*/ jsx("button", {
+                        type: "button",
+                        className: `work-spreadsheet-underline-primary${active ? ' active' : ''}`,
+                        "aria-label": definition.label,
+                        "aria-keyshortcuts": definition.shortcut.aria,
+                        "aria-pressed": active,
+                        title: `${definition.label}（${currentLabel}；${definition.shortcut.label}）`,
+                        disabled: !can.setCellFormat('un', toggleValue),
+                        onClick: ()=>commands.setCellFormat('un', toggleValue),
+                        children: /*#__PURE__*/ jsx(Underline, {
+                            size: 15,
+                            "aria-hidden": "true"
+                        })
+                    }),
+                    /*#__PURE__*/ jsx("button", {
+                        ...triggerProps,
+                        className: `work-spreadsheet-underline-disclosure${open ? ' active' : ''}`,
+                        title: "更多下划线",
+                        children: /*#__PURE__*/ jsx(ChevronDown, {
+                            size: 12,
+                            "aria-hidden": "true"
+                        })
+                    })
+                ]
+            }),
+        children: (close)=>underlineOptions.map((option)=>{
+                const cellValue = spreadsheetUnderlineCellValue(option.value);
+                return /*#__PURE__*/ jsxs("button", {
+                    type: "button",
+                    role: "menuitemradio",
+                    tabIndex: -1,
+                    "aria-checked": style === option.value,
+                    "aria-label": option.label,
+                    disabled: !can.setCellFormat('un', cellValue),
+                    onClick: ()=>{
+                        close();
+                        commands.setCellFormat('un', cellValue);
+                    },
+                    children: [
+                        /*#__PURE__*/ jsx(SpreadsheetUnderlineGlyph, {
+                            style: option.value
+                        }),
+                        /*#__PURE__*/ jsx("span", {
+                            children: option.label
+                        })
+                    ]
+                }, option.value);
+            })
+    });
+}
+function SpreadsheetUnderlineGlyph({ style }) {
+    return /*#__PURE__*/ jsx("span", {
+        className: "work-spreadsheet-underline-glyph",
+        "data-underline-style": style,
+        "aria-hidden": "true",
+        children: /*#__PURE__*/ jsx(Underline, {
+            size: 16
+        })
+    });
+}
 const spreadsheetNumberFormatOptions = [
     {
         value: 'general',
@@ -9302,7 +9405,6 @@ function SpreadsheetFontRibbonGroup({ can, commands, toolbarCell }) {
     const fontSize = Number(toolbarCell?.fs ?? 10);
     const bold = 1 === Number(toolbarCell?.bl);
     const italic = 1 === Number(toolbarCell?.it);
-    const underline = 1 === Number(toolbarCell?.un);
     const strike = 1 === Number(toolbarCell?.cl);
     const textColor = 'string' == typeof toolbarCell?.fc ? toolbarCell.fc : '#172033';
     const fillColor = 'string' == typeof toolbarCell?.bg ? toolbarCell.bg : '#ffffff';
@@ -9369,15 +9471,10 @@ function SpreadsheetFontRibbonGroup({ can, commands, toolbarCell }) {
                     size: 15
                 })
             }),
-            /*#__PURE__*/ jsx(SpreadsheetFontToggle, {
-                active: underline,
-                attribute: "un",
+            /*#__PURE__*/ jsx(SpreadsheetUnderlineRibbon, {
                 can: can,
                 commands: commands,
-                command: "underline",
-                icon: /*#__PURE__*/ jsx(Underline, {
-                    size: 15
-                })
+                value: toolbarCell?.un
             }),
             /*#__PURE__*/ jsx(SpreadsheetFontToggle, {
                 active: strike,
@@ -12070,6 +12167,28 @@ const verticalOptions = [
         label: '底端对齐'
     }
 ];
+const spreadsheet_format_cells_dialog_panels_underlineOptions = [
+    {
+        value: 'none',
+        label: '无'
+    },
+    {
+        value: 'single',
+        label: '单下划线'
+    },
+    {
+        value: 'double',
+        label: '双下划线'
+    },
+    {
+        value: 'singleAccounting',
+        label: '单会计用下划线'
+    },
+    {
+        value: 'doubleAccounting',
+        label: '双会计用下划线'
+    }
+];
 const borderStyleOptions = [
     {
         value: 'thin',
@@ -12302,6 +12421,7 @@ function AlignmentPanel({ source, draft, errors, touched, setDraft, touch }) {
 function FontPanel({ source, draft, errors, touched, setDraft, touch }) {
     const familyMixed = source.fields.fontFamily.mixed && !touched.fontFamily;
     const sizeMixed = source.fields.fontSize.mixed && !touched.fontSize;
+    const underlineMixed = source.fields.underline.mixed && !touched.underline;
     const toggle = (field, checked)=>{
         touch(field);
         setDraft((current)=>({
@@ -12363,10 +12483,6 @@ function FontPanel({ source, draft, errors, touched, setDraft, touch }) {
                             'italic',
                             '斜体'
                         ],
-                        [
-                            'underline',
-                            '下划线'
-                        ],
                         [
                             'strike',
                             '删除线'
@@ -12380,6 +12496,22 @@ function FontPanel({ source, draft, errors, touched, setDraft, touch }) {
                         }, field))
                 ]
             }),
+            /*#__PURE__*/ jsx(Field, {
+                label: "下划线",
+                children: /*#__PURE__*/ jsx(OfficeSelect, {
+                    ariaLabel: "下划线样式",
+                    value: underlineMixed ? MIXED_VALUE : draft.underline,
+                    options: withMixedOption(spreadsheet_format_cells_dialog_panels_underlineOptions, underlineMixed),
+                    onValueChange: (value)=>{
+                        if (value === MIXED_VALUE) return;
+                        touch('underline');
+                        setDraft((current)=>({
+                                ...current,
+                                underline: value
+                            }));
+                    }
+                })
+            }),
             /*#__PURE__*/ jsx(Field, {
                 label: "文字颜色",
                 children: /*#__PURE__*/ jsx(OfficeColorPicker, {
@@ -12402,10 +12534,12 @@ function FontPanel({ source, draft, errors, touched, setDraft, touch }) {
                     fontSize: `${Math.max(10, draft.fontSize)}px`,
                     fontStyle: draft.italic ? 'italic' : 'normal',
                     fontWeight: draft.bold ? 700 : 400,
-                    textDecoration: [
-                        draft.underline && 'underline',
+                    textDecorationLine: [
+                        'none' !== draft.underline && 'underline',
                         draft.strike && 'line-through'
-                    ].filter(Boolean).join(' ')
+                    ].filter(Boolean).join(' '),
+                    textDecorationStyle: 'double' === draft.underline || 'doubleAccounting' === draft.underline ? 'double' : 'solid',
+                    textUnderlineOffset: 'singleAccounting' === draft.underline || 'doubleAccounting' === draft.underline ? '0.24em' : '0.12em'
                 },
                 children: "A3S Office 字体预览"
             })
@@ -12722,7 +12856,7 @@ function createSpreadsheetFormatCellsDialogSource(content, sheetId, rangeInput,
             fontColor: values((cell)=>normalizedColor(cell?.fc, '#172033')),
             bold: values((cell)=>1 === Number(cell?.bl)),
             italic: values((cell)=>1 === Number(cell?.it)),
-            underline: values((cell)=>1 === Number(cell?.un)),
+            underline: values((cell)=>spreadsheetUnderlineStyle(cell?.un)),
             strike: values((cell)=>1 === Number(cell?.cl)),
             fillColor: values((cell)=>'string' == typeof cell?.bg && cell.bg.trim() ? normalizedColor(cell.bg, null) : null),
             borders: {

package/dist/0~work-office-diagnostics.js

@@ -5,7 +5,7 @@ import { markDocxParagraphShading, inspectDocxPageSize, docxCaptionBookmark, has
 import { normalizeDocumentHref } from "./0~work-document-links.js";
 import { xmlAttributeLocalName, parseDocxParagraphDefaultCollapsed, readDocxBibliography, DOCX_WORDPROCESSING_NAMESPACES, xmlAttributeNamespace, createDocxThemeResolver } from "./0~2805.js";
 import { updateSpreadsheetWorksheetCompatibilitySummary, inspectXlsxPivotTables, isSupportedXlsxChartLegend, isSupportedXlsxChartPlotLayout, xlsxChartNodeUsesStackedGrouping, isSupportedXlsxChartSeriesFormatting, readXlsxFormulaFeaturesFromPackage, inspectXlsxHeaderFooterText, emptySpreadsheetWorksheetCompatibilitySummary, xlsxChartSeriesFormattingShapeProperties, MAX_XLSX_WORKSHEET_IMAGE_BYTES, isSupportedXlsxWorksheetImageContentType, xlsxWorksheetCellEntries, diagnoseXlsxProtection, isEditableXlsxPaperSizeCode, isSupportedXlsxCombinationChartNodes } from "./4104.js";
-import { spreadsheetConditionalComparisonNeedsUpperValue, isSpreadsheetConditionalIconSetName, isSpreadsheetConditionalComparisonOperator, spreadsheetConditionalIconSetCount } from "./2180.js";
+import { spreadsheetConditionalComparisonNeedsUpperValue, isSpreadsheetConditionalIconSetName, isSpreadsheetConditionalComparisonOperator, spreadsheetConditionalIconSetCount } from "./1992.js";
 import { formulaHasStructuredReference, formulaHasExternalReference, parseSpreadsheetPrintTitles, volatileSpreadsheetFormulaFunctions, stripSpreadsheetSheetQualifier } from "./8715.js";
 import { unsupportedSpreadsheetFormulaFunctions } from "./0~work-spreadsheet-formula-support.js";
 var work_office_diagnostics_namespaceObject = {};

package/dist/{2180.js → 1992.js}

@@ -2092,6 +2092,64 @@ function isoDateFromTimestamp(timestamp) {
     if (!Number.isFinite(timestamp) || year < 1900 || year > 9999) return null;
     return `${String(year).padStart(4, '0')}-${String(date.getUTCMonth() + 1).padStart(2, '0')}-${String(date.getUTCDate()).padStart(2, '0')}`;
 }
+const spreadsheetUnderlineStyles = [
+    'none',
+    'single',
+    'double',
+    'singleAccounting',
+    'doubleAccounting'
+];
+const underlineCellValues = {
+    none: 0,
+    single: 1,
+    double: 2,
+    singleAccounting: 3,
+    doubleAccounting: 4
+};
+function isSpreadsheetUnderlineStyle(value) {
+    return 'string' == typeof value && spreadsheetUnderlineStyles.includes(value);
+}
+function spreadsheetUnderlineCellValue(style) {
+    return underlineCellValues[style];
+}
+function spreadsheetUnderlineStyle(value) {
+    switch(Number(value)){
+        case 1:
+            return 'single';
+        case 2:
+            return 'double';
+        case 3:
+        case 0x21:
+            return 'singleAccounting';
+        case 4:
+        case 0x22:
+            return 'doubleAccounting';
+        default:
+            return 'none';
+    }
+}
+function spreadsheetUnderlineCellValueFromXlsx(value) {
+    switch(value?.trim()){
+        case null:
+        case void 0:
+        case '':
+        case 'single':
+            return 1;
+        case 'double':
+            return 2;
+        case 'singleAccounting':
+            return 3;
+        case 'doubleAccounting':
+            return 4;
+        default:
+            return 0;
+    }
+}
+function spreadsheetUnderlineCellValueFromSheetJs(value) {
+    if (true === value) return 1;
+    if (isSpreadsheetUnderlineStyle(value)) return spreadsheetUnderlineCellValue(value);
+    return spreadsheetUnderlineCellValue(spreadsheetUnderlineStyle(value));
+}
 const SPREADSHEET_CONDITIONAL_COMPARISON_OPERATORS = [
     'greaterThan',
     'greaterThanOrEqual',
@@ -2585,4 +2643,4 @@ function boundedInteger(value, minimum, maximum, fallback) {
 function boundedNumber(value, minimum, maximum, fallback) {
     return 'number' == typeof value && Number.isFinite(value) && value >= minimum && value <= maximum ? value : fallback;
 }
-export { DEFAULT_PROTECTION_HINT, SPREADSHEET_CONDITIONAL_COMPARISON_OPERATORS, SPREADSHEET_CONDITIONAL_ICON_SETS, attachSpreadsheetShownCommentCells, createWorkOfficeSpreadsheetCollaborationBinding as createOfficeSpreadsheetCollaborationBinding, defaultSpreadsheetColorScaleThresholds, defaultSpreadsheetConditionalIconThresholds, defaultSpreadsheetDataBarOptions, drawSpreadsheetConditionalIcon, editableRangeCellCount, editableRangeRequiresCredentials, effectiveSpreadsheetPageSetup, freezeImportedSpreadsheetCell, importedSheetProtectionAuthority, initializeWorkOfficeSpreadsheetCollaboration as initializeOfficeSpreadsheetCollaboration, isSpreadsheetConditionalComparisonOperator, isSpreadsheetConditionalIconSetName, normalizeSheetProtectionAuthority, normalizeSpreadsheetConditionalIconSetFormat, normalizeSpreadsheetConditionalVisualOptions, normalizeSpreadsheetDateValidationBoundary, normalizeSpreadsheetPaperSize, protectedSheetCount, readWorkOfficeSpreadsheetCollaboration as readOfficeSpreadsheetCollaboration, registerDerivedSpreadsheetMatrix, registerImportedSpreadsheetMatrix, replaceWorkOfficeSpreadsheetCollaboration as replaceOfficeSpreadsheetCollaboration, sameSpreadsheetHistoryValue, sheetHasProtectionState, sheetProtectionAuthority, spreadsheetConditionalComparisonNeedsUpperValue, spreadsheetConditionalIconForValue, spreadsheetConditionalIconSetCount, spreadsheetConditionalThresholdValue, spreadsheetConditionalThresholdsEqual, spreadsheetDateValidationFormula, spreadsheetMatrixProfile, spreadsheetProtectionKey, unlockedCellCount, withEditableRange, withSheetProtection, withSheetSelectionPermissions, withoutEditableRange };
+export { DEFAULT_PROTECTION_HINT, SPREADSHEET_CONDITIONAL_COMPARISON_OPERATORS, SPREADSHEET_CONDITIONAL_ICON_SETS, attachSpreadsheetShownCommentCells, createWorkOfficeSpreadsheetCollaborationBinding as createOfficeSpreadsheetCollaborationBinding, defaultSpreadsheetColorScaleThresholds, defaultSpreadsheetConditionalIconThresholds, defaultSpreadsheetDataBarOptions, drawSpreadsheetConditionalIcon, editableRangeCellCount, editableRangeRequiresCredentials, effectiveSpreadsheetPageSetup, freezeImportedSpreadsheetCell, importedSheetProtectionAuthority, initializeWorkOfficeSpreadsheetCollaboration as initializeOfficeSpreadsheetCollaboration, isSpreadsheetConditionalComparisonOperator, isSpreadsheetConditionalIconSetName, isSpreadsheetUnderlineStyle, normalizeSheetProtectionAuthority, normalizeSpreadsheetConditionalIconSetFormat, normalizeSpreadsheetConditionalVisualOptions, normalizeSpreadsheetDateValidationBoundary, normalizeSpreadsheetPaperSize, protectedSheetCount, readWorkOfficeSpreadsheetCollaboration as readOfficeSpreadsheetCollaboration, registerDerivedSpreadsheetMatrix, registerImportedSpreadsheetMatrix, replaceWorkOfficeSpreadsheetCollaboration as replaceOfficeSpreadsheetCollaboration, sameSpreadsheetHistoryValue, sheetHasProtectionState, sheetProtectionAuthority, spreadsheetConditionalComparisonNeedsUpperValue, spreadsheetConditionalIconForValue, spreadsheetConditionalIconSetCount, spreadsheetConditionalThresholdValue, spreadsheetConditionalThresholdsEqual, spreadsheetDateValidationFormula, spreadsheetMatrixProfile, spreadsheetProtectionKey, spreadsheetUnderlineCellValue, spreadsheetUnderlineCellValueFromSheetJs, spreadsheetUnderlineCellValueFromXlsx, spreadsheetUnderlineStyle, unlockedCellCount, withEditableRange, withSheetProtection, withSheetSelectionPermissions, withoutEditableRange };

package/dist/4104.js

@@ -5,7 +5,7 @@ import { OFFICE_COLLABORATION_PROTOCOL as WORK_OFFICE_COLLABORATION_PROTOCOL, Of
 import { contentTypeForPart, directChildren, bytesToDataUrl, OoxmlPackage as work_ooxml_package_OoxmlPackage, parseXml, firstDescendant, xmlNamespacePrefix, descendants, directChild, createArtifact as createWorkArtifact, xmlContainsAnyElement, createOfficeId as createWorkId, attribute as work_ooxml_package_attribute } from "./5184.js";
 import { mountWorkLiveDocumentCapture, materializeWorkDocumentContent as work_document_model_codec_materializeWorkDocumentContent, documentPageSurfaceGeometryForElement, createWorkDocumentModel, documentContentLayoutProperties, documentModelForContent, createWorkDocumentExtensions, positionWorkLiveDocumentCapture } from "./6282.js";
 import { normalizeWorkSpreadsheetDataLabels, workSpreadsheetChartSupportsGrouping, normalizeSpreadsheetPrintArea, normalizeWorkSpreadsheetChartLegendPosition, formatSpreadsheetCellRanges, spreadsheetCellAddress, normalizeWorkSpreadsheetChartSmoothLines, spreadsheetFormulaRangeForCell, normalizeWorkSpreadsheetChartColor, readXlsxDrawingAnchor, sparseArrayEntries, qualifySpreadsheetRange, normalizeWorkSpreadsheetBubbleScale, normalizeWorkSpreadsheetChartSeriesStyle, normalizeSpreadsheetPrintTitleRows, normalizeSpreadsheetPrintTitleColumns, spreadsheetPivotFilterValueKey, normalizeWorkSpreadsheetErrorBars, normalizeWorkSpreadsheetBubbleSizeRepresents, workSpreadsheetChartSupportsTrendlines, stripSpreadsheetSheetQualifier, normalizeWorkSpreadsheetChartLegendOverlay, normalizeWorkSpreadsheetChartGapWidth, normalizeWorkSpreadsheetChartGrouping, workSpreadsheetChartSupportsBarSpacing, workSpreadsheetChartSupportsSmoothLines, workSpreadsheetChartGroupingIsStacked, xlsxDrawingAnchorToBounds, xlsxTwoCellAnchorMarkers, workSpreadsheetChartSupportsErrorBars, sparseMatrixColumnCount, refreshSpreadsheetPivotTables, normalizeWorkSpreadsheetChartAxisGroup, isValidSpreadsheetDefinedName, normalizeWorkSpreadsheetScatterStyle, workSpreadsheetChartAxisDefaultLabelPosition, spreadsheetPivotValidation, resolveSpreadsheetChart, parseSpreadsheetCellRanges, workSpreadsheetChartAxisIsCategoryAxis, spreadsheetPivotFields, normalizeWorkSpreadsheetDoughnutHoleSize, normalizeWorkSpreadsheetChartAxes, parseSpreadsheetPrintTitles, spreadsheetFormulaRangeConflict, spreadsheetFormulaForXlsx, editableSpreadsheetFormula, workSpreadsheetChartUsesNumericXAxis, normalizeWorkSpreadsheetChartOverlap, workSpreadsheetChartSupportsAxes, workSpreadsheetChartAxisShowsMajorGridlinesByDefault, normalizeWorkSpreadsheetCombinationSeriesType, effectiveSpreadsheetCalculationSettings, normalizeWorkSpreadsheetTrendline, normalizeWorkSpreadsheetRadarStyle } from "./8715.js";
-import { freezeImportedSpreadsheetCell, editableRangeRequiresCredentials, spreadsheetDateValidationFormula, normalizeSpreadsheetConditionalIconSetFormat, defaultSpreadsheetDataBarOptions, normalizeSpreadsheetConditionalVisualOptions, normalizeSpreadsheetPaperSize, normalizeSheetProtectionAuthority, importedSheetProtectionAuthority, defaultSpreadsheetColorScaleThresholds, sheetHasProtectionState, spreadsheetConditionalComparisonNeedsUpperValue, isSpreadsheetConditionalComparisonOperator, registerImportedSpreadsheetMatrix, defaultSpreadsheetConditionalIconThresholds, DEFAULT_PROTECTION_HINT, normalizeSpreadsheetDateValidationBoundary, isSpreadsheetConditionalIconSetName, spreadsheetConditionalThresholdsEqual, spreadsheetConditionalIconSetCount } from "./2180.js";
+import { freezeImportedSpreadsheetCell, editableRangeRequiresCredentials, spreadsheetDateValidationFormula, normalizeSpreadsheetConditionalIconSetFormat, defaultSpreadsheetDataBarOptions, normalizeSpreadsheetConditionalVisualOptions, normalizeSpreadsheetPaperSize, normalizeSheetProtectionAuthority, importedSheetProtectionAuthority, defaultSpreadsheetColorScaleThresholds, spreadsheetUnderlineCellValueFromXlsx, sheetHasProtectionState, spreadsheetConditionalComparisonNeedsUpperValue, isSpreadsheetConditionalComparisonOperator, registerImportedSpreadsheetMatrix, defaultSpreadsheetConditionalIconThresholds, spreadsheetUnderlineStyle, DEFAULT_PROTECTION_HINT, isSpreadsheetConditionalIconSetName, normalizeSpreadsheetDateValidationBoundary, spreadsheetConditionalThresholdsEqual, spreadsheetUnderlineCellValueFromSheetJs, spreadsheetConditionalIconSetCount } from "./1992.js";
 import { WorkFileImportController, materializeWorkFileSource } from "./9356.js";
 import "./2591.js";
 import "./3818.js";
@@ -3385,11 +3385,11 @@ function setXlsxToggleChild(document1, parent, name, enabled, order) {
     child.setAttribute('val', '1');
     insertXlsxOrderedChild(parent, child, order);
 }
-function setXlsxUnderlineChild(document1, parent, enabled, order) {
+function setXlsxUnderlineChild(document1, parent, style, order) {
     removeXlsxChildren(parent, 'u');
-    if (!enabled) return;
+    if ('none' === style) return;
     const child = document1.createElementNS(document1.documentElement.namespaceURI, 'u');
-    child.setAttribute('val', 'single');
+    child.setAttribute('val', style);
     insertXlsxOrderedChild(parent, child, order);
 }
 function xlsxRgbColor(value) {
@@ -3651,7 +3651,7 @@ function directFontStyle(cell) {
             strike: 1 === Number(cell.cl)
         } : {},
         ...void 0 !== cell.un ? {
-            underline: 1 === Number(cell.un)
+            underline: spreadsheetUnderlineStyle(cell.un)
         } : {}
     };
 }
@@ -3971,7 +3971,10 @@ function readDirectFontStyle(style, font, colors) {
     const strike = directChild(font, 'strike');
     if (strike && toggleEnabled(strike)) style.cl = 1;
     const underline = directChild(font, 'u');
-    if (underline && underlineEnabled(underline)) style.un = 1;
+    if (underline) {
+        const value = spreadsheetUnderlineCellValueFromXlsx(work_ooxml_package_attribute(underline, 'val'));
+        if (value) style.un = value;
+    }
     const name = work_ooxml_package_attribute(directChild(font, 'name') ?? font, 'val')?.trim();
     if (name) style.ff = name;
     const size = Number(work_ooxml_package_attribute(directChild(font, 'sz') ?? font, 'val'));
@@ -4027,10 +4030,6 @@ function toggleEnabled(element) {
     const value = work_ooxml_package_attribute(element, 'val')?.trim().toLowerCase();
     return '0' !== value && 'false' !== value && 'off' !== value;
 }
-function underlineEnabled(element) {
-    const value = work_ooxml_package_attribute(element, 'val')?.trim().toLowerCase();
-    return '0' !== value && 'false' !== value && 'none' !== value;
-}
 function work_xlsx_cell_styles_booleanAttribute(element, name) {
     const value = work_ooxml_package_attribute(element, name)?.trim().toLowerCase();
     return '1' === value || 'true' === value || 'on' === value;
@@ -8566,7 +8565,7 @@ function fortuneCellStyle(source) {
     if (font?.bold) target.bl = 1;
     if (font?.italic) target.it = 1;
     if (font?.strike) target.cl = 1;
-    if (font?.underline) target.un = 1;
+    if (font?.underline) target.un = spreadsheetUnderlineCellValueFromSheetJs(font.underline);
     if (font?.name) target.ff = font.name;
     if (font?.sz !== void 0) target.fs = font.sz;
     const fontColor = spreadsheetColor(font?.color?.rgb);

package/dist/core.js

@@ -7,6 +7,6 @@ export { createArtifact, createOfficeId, officeTemplates } from "./5184.js";
 export { createOfficeDocumentCollaborationBinding, initializeOfficeDocumentCollaboration, officeDocumentCollaborationFragment, readOfficeDocumentCollaboration } from "./6282.js";
 export { createOfficeMarkdownCollaborationBinding, initializeOfficeMarkdownCollaboration, readOfficeMarkdownCollaboration, replaceOfficeMarkdownCollaboration } from "./2591.js";
 export { createOfficePresentationCollaborationBinding, initializeOfficePresentationCollaboration, readOfficePresentationCollaboration, replaceOfficePresentationCollaboration } from "./4560.js";
-export { createOfficeSpreadsheetCollaborationBinding, initializeOfficeSpreadsheetCollaboration, readOfficeSpreadsheetCollaboration, replaceOfficeSpreadsheetCollaboration } from "./2180.js";
+export { createOfficeSpreadsheetCollaborationBinding, initializeOfficeSpreadsheetCollaboration, readOfficeSpreadsheetCollaboration, replaceOfficeSpreadsheetCollaboration } from "./1992.js";
 export { normalizeWorkSpreadsheetBubbleScale, normalizeWorkSpreadsheetBubbleSizeRepresents, normalizeWorkSpreadsheetChartAxisGroup, normalizeWorkSpreadsheetCombinationSeriesType, normalizeWorkSpreadsheetDataLabelPosition, normalizeWorkSpreadsheetDataLabels, normalizeWorkSpreadsheetDoughnutHoleSize, normalizeWorkSpreadsheetErrorBars, normalizeWorkSpreadsheetRadarStyle, normalizeWorkSpreadsheetScatterStyle, normalizeWorkSpreadsheetTrendline, normalizeWorkSpreadsheetTrendlineType, workSpreadsheetChartSupportsAxes, workSpreadsheetChartSupportsErrorBars, workSpreadsheetChartSupportsTrendlines, workSpreadsheetChartTypeLabel, workSpreadsheetChartUsesNumericXAxis, workSpreadsheetCombinationSeriesTypeLabel, workSpreadsheetDataLabelPositionLabel, workSpreadsheetErrorBarTypeLabel, workSpreadsheetErrorBarValueTypeLabel, workSpreadsheetTrendlineTypeLabel } from "./8715.js";
 export { core_OFFICE_COLLABORATION_VERSION as OFFICE_COLLABORATION_VERSION };

package/dist/index.js

@@ -10,6 +10,6 @@ export { createArtifact, createOfficeId, officeTemplates } from "./5184.js";
 export { createOfficeDocumentCollaborationBinding, initializeOfficeDocumentCollaboration, officeDocumentCollaborationFragment, readOfficeDocumentCollaboration } from "./6282.js";
 export { createOfficeMarkdownCollaborationBinding, initializeOfficeMarkdownCollaboration, readOfficeMarkdownCollaboration, replaceOfficeMarkdownCollaboration } from "./2591.js";
 export { createOfficePresentationCollaborationBinding, initializeOfficePresentationCollaboration, readOfficePresentationCollaboration, replaceOfficePresentationCollaboration } from "./4560.js";
-export { createOfficeSpreadsheetCollaborationBinding, initializeOfficeSpreadsheetCollaboration, readOfficeSpreadsheetCollaboration, replaceOfficeSpreadsheetCollaboration } from "./2180.js";
+export { createOfficeSpreadsheetCollaborationBinding, initializeOfficeSpreadsheetCollaboration, readOfficeSpreadsheetCollaboration, replaceOfficeSpreadsheetCollaboration } from "./1992.js";
 export { normalizeWorkSpreadsheetBubbleScale, normalizeWorkSpreadsheetBubbleSizeRepresents, normalizeWorkSpreadsheetChartAxisGroup, normalizeWorkSpreadsheetCombinationSeriesType, normalizeWorkSpreadsheetDataLabelPosition, normalizeWorkSpreadsheetDataLabels, normalizeWorkSpreadsheetDoughnutHoleSize, normalizeWorkSpreadsheetErrorBars, normalizeWorkSpreadsheetRadarStyle, normalizeWorkSpreadsheetScatterStyle, normalizeWorkSpreadsheetTrendline, normalizeWorkSpreadsheetTrendlineType, workSpreadsheetChartSupportsAxes, workSpreadsheetChartSupportsErrorBars, workSpreadsheetChartSupportsTrendlines, workSpreadsheetChartTypeLabel, workSpreadsheetChartUsesNumericXAxis, workSpreadsheetCombinationSeriesTypeLabel, workSpreadsheetDataLabelPositionLabel, workSpreadsheetErrorBarTypeLabel, workSpreadsheetErrorBarValueTypeLabel, workSpreadsheetTrendlineTypeLabel } from "./8715.js";
 export { src_DOCUMENT_SNAPSHOT_VERSION as DOCUMENT_SNAPSHOT_VERSION, src_DOCUMENT_SOURCE_VERSION as DOCUMENT_SOURCE_VERSION, src_OFFICE_COLLABORATION_VERSION as OFFICE_COLLABORATION_VERSION };

package/dist/internal/features/work/editors/spreadsheet-cell-format.d.ts

@@ -1,5 +1,6 @@
 import type { Cell } from '@fortune-sheet/core';
 import type { WorkSpreadsheetContent, WorkSpreadsheetSheet } from '../work-types';
+import { type SpreadsheetUnderlineStyle } from '../work-spreadsheet-underline';
 import { type SpreadsheetCellBorderFormat } from './spreadsheet-cell-border';
 import { type SpreadsheetCellRange } from './spreadsheet-cell-range';
 export declare const MAX_SPREADSHEET_CELL_FORMAT_CELLS = 10000;
@@ -16,7 +17,7 @@ export interface SpreadsheetCellFormatPatch {
     fontColor?: string;
     bold?: boolean;
     italic?: boolean;
-    underline?: boolean;
+    underline?: SpreadsheetUnderlineStyle;
     strike?: boolean;
     fillColor?: string | null;
     borders?: readonly SpreadsheetCellBorderFormat[];

package/dist/internal/features/work/editors/spreadsheet-format-cells-dialog-model.d.ts

@@ -1,5 +1,6 @@
 import type { Cell } from '@fortune-sheet/core';
 import type { WorkSpreadsheetContent } from '../work-types';
+import { type SpreadsheetUnderlineStyle } from '../work-spreadsheet-underline';
 import { type SpreadsheetCellBorderFormat, type SpreadsheetCellBorderStyle } from './spreadsheet-cell-border';
 import { type SpreadsheetCellFormatPatch, type SpreadsheetHorizontalAlignment, type SpreadsheetVerticalAlignment } from './spreadsheet-cell-format';
 import { type SpreadsheetCellRange } from './spreadsheet-cell-range';
@@ -38,7 +39,7 @@ export interface SpreadsheetFormatCellsFields {
     fontColor: SpreadsheetFormatCellsField<string>;
     bold: SpreadsheetFormatCellsField<boolean>;
     italic: SpreadsheetFormatCellsField<boolean>;
-    underline: SpreadsheetFormatCellsField<boolean>;
+    underline: SpreadsheetFormatCellsField<SpreadsheetUnderlineStyle>;
     strike: SpreadsheetFormatCellsField<boolean>;
     fillColor: SpreadsheetFormatCellsField<string | null>;
     borders: SpreadsheetFormatCellsField<readonly SpreadsheetCellBorderFormat[]>;
@@ -62,7 +63,7 @@ export interface SpreadsheetFormatCellsDraft {
     fontColor: string;
     bold: boolean;
     italic: boolean;
-    underline: boolean;
+    underline: SpreadsheetUnderlineStyle;
     strike: boolean;
     fillColor: string | null;
     borders: SpreadsheetCellBorderFormat[];

package/dist/internal/features/work/editors/spreadsheet-underline-ribbon.d.ts

@@ -0,0 +1,6 @@
+import type { SpreadsheetEditorCanCommands, SpreadsheetEditorCommands } from './spreadsheet-command-controller';
+export declare function SpreadsheetUnderlineRibbon({ can, commands, value, }: {
+    can: SpreadsheetEditorCanCommands;
+    commands: SpreadsheetEditorCommands;
+    value: unknown;
+}): import("react").JSX.Element;

package/dist/internal/features/work/work-spreadsheet-underline.d.ts

@@ -0,0 +1,8 @@
+export declare const spreadsheetUnderlineStyles: readonly ["none", "single", "double", "singleAccounting", "doubleAccounting"];
+export type SpreadsheetUnderlineStyle = (typeof spreadsheetUnderlineStyles)[number];
+export type SpreadsheetUnderlineCellValue = 0 | 1 | 2 | 3 | 4;
+export declare function isSpreadsheetUnderlineStyle(value: unknown): value is SpreadsheetUnderlineStyle;
+export declare function spreadsheetUnderlineCellValue(style: SpreadsheetUnderlineStyle): SpreadsheetUnderlineCellValue;
+export declare function spreadsheetUnderlineStyle(value: unknown): SpreadsheetUnderlineStyle;
+export declare function spreadsheetUnderlineCellValueFromXlsx(value: string | null): SpreadsheetUnderlineCellValue;
+export declare function spreadsheetUnderlineCellValueFromSheetJs(value: unknown): SpreadsheetUnderlineCellValue;

package/dist/internal/features/work/work-xlsx-cell-style-xml.d.ts

@@ -1,4 +1,5 @@
 import type { XlsxCellBorderLine } from './work-xlsx-cell-borders';
+import type { SpreadsheetUnderlineStyle } from './work-spreadsheet-underline';
 export interface XlsxDirectAlignmentStyle {
     horizontal?: 'center' | 'left' | 'right';
     textRotation?: number;
@@ -13,5 +14,5 @@ export declare function writeXlsxAlignment(document: Document, xf: Element, styl
 export declare function setXlsxValueChild(document: Document, parent: Element, name: string, value: string, order: readonly string[]): void;
 export declare function setXlsxColorChild(document: Document, parent: Element, color: string, order: readonly string[]): void;
 export declare function setXlsxToggleChild(document: Document, parent: Element, name: string, enabled: boolean, order: readonly string[]): void;
-export declare function setXlsxUnderlineChild(document: Document, parent: Element, enabled: boolean, order: readonly string[]): void;
+export declare function setXlsxUnderlineChild(document: Document, parent: Element, style: SpreadsheetUnderlineStyle, order: readonly string[]): void;
 export declare function xlsxRgbColor(value: unknown): string | null;

package/dist/styles.css

@@ -15138,7 +15138,7 @@ button.work-office-collaboration-participant:hover .work-office-collaboration-lo
   }
 }
 
-.work-spreadsheet-border-split-root {
+.work-spreadsheet-border-split-root, .work-spreadsheet-underline-split-root {
   border-radius: 6px;
   flex: none;
   align-items: stretch;
@@ -15146,6 +15146,118 @@ button.work-office-collaboration-participant:hover .work-office-collaboration-lo
   display: inline-flex;
 }
 
+.work-office-ribbon .work-office-toolbar .work-spreadsheet-underline-primary, .work-office-ribbon .work-office-toolbar .work-spreadsheet-underline-disclosure {
+  border-radius: 0;
+  height: 29px;
+  padding: 0;
+}
+
+.work-office-ribbon .work-office-toolbar .work-spreadsheet-underline-primary {
+  border-radius: 6px 0 0 6px;
+  width: 29px;
+  min-width: 29px;
+}
+
+.work-office-ribbon .work-office-toolbar .work-spreadsheet-underline-disclosure {
+  border-left: 1px solid color-mix(in srgb, var(--a3s-line) 72%, transparent);
+  border-radius: 0 6px 6px 0;
+  width: 16px;
+  min-width: 16px;
+}
+
+.work-spreadsheet-underline-disclosure svg {
+  transition: transform .12s;
+}
+
+.work-spreadsheet-underline-disclosure[aria-expanded="true"] svg {
+  transform: rotate(180deg);
+}
+
+.work-spreadsheet-underline-primary:focus-visible, .work-spreadsheet-underline-disclosure:focus-visible {
+  box-shadow: inset 0 0 0 1px var(--work-spreadsheet-accent);
+  outline: 0;
+}
+
+.work-spreadsheet-underline-menu {
+  width: min(252px, 100vw - 32px);
+}
+
+.work-spreadsheet-underline-menu > button {
+  grid-template-columns: 22px minmax(0, 1fr) 14px;
+}
+
+.work-spreadsheet-underline-menu > button[aria-checked="true"] {
+  background: color-mix(in srgb,
+    var(--work-office-menu-accent) 9%,
+    transparent);
+}
+
+.work-spreadsheet-underline-menu > button[aria-checked="true"]:after {
+  color: var(--work-office-menu-accent);
+  content: "✓";
+  text-align: center;
+  grid-column: 3;
+  font-size: 12px;
+  font-weight: 700;
+}
+
+.work-spreadsheet-underline-glyph {
+  width: 20px;
+  height: 20px;
+  color: var(--work-office-menu-accent);
+  place-items: center;
+  display: grid;
+  position: relative;
+}
+
+.work-spreadsheet-underline-glyph[data-underline-style="none"] {
+  opacity: .42;
+}
+
+.work-spreadsheet-underline-glyph[data-underline-style="none"]:after {
+  content: "";
+  background: currentColor;
+  width: 18px;
+  height: 1px;
+  position: absolute;
+  transform: rotate(-38deg);
+}
+
+.work-spreadsheet-underline-glyph[data-underline-style="double"]:before {
+  content: "";
+  background: currentColor;
+  height: 1px;
+  position: absolute;
+  bottom: 1px;
+  left: 2px;
+  right: 2px;
+}
+
+.work-spreadsheet-underline-glyph[data-underline-style="singleAccounting"] svg line, .work-spreadsheet-underline-glyph[data-underline-style="doubleAccounting"] svg line {
+  display: none;
+}
+
+.work-spreadsheet-underline-glyph[data-underline-style="singleAccounting"]:after, .work-spreadsheet-underline-glyph[data-underline-style="doubleAccounting"]:before, .work-spreadsheet-underline-glyph[data-underline-style="doubleAccounting"]:after {
+  content: "";
+  background: currentColor;
+  height: 1px;
+  position: absolute;
+  left: 0;
+  right: 0;
+}
+
+.work-spreadsheet-underline-glyph[data-underline-style="singleAccounting"]:after {
+  bottom: 1px;
+}
+
+.work-spreadsheet-underline-glyph[data-underline-style="doubleAccounting"]:before {
+  bottom: 3px;
+}
+
+.work-spreadsheet-underline-glyph[data-underline-style="doubleAccounting"]:after {
+  bottom: 0;
+}
+
 .work-office-ribbon .work-office-toolbar .work-spreadsheet-border-primary, .work-office-ribbon .work-office-toolbar .work-spreadsheet-border-disclosure {
   border-radius: 0;
   height: 29px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a3s-lab/office",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Open-source collaborative browser editors for documents, Markdown, spreadsheets, presentations, and PDFs.",
   "keywords": [
     "office",
@@ -90,6 +90,7 @@
     "playground:visual:spreadsheet-data-validation": "playwright test visual-tests/spreadsheet-data-validation.functional.spec.ts --config playwright.config.ts",
     "playground:visual:spreadsheet-hyperlink": "playwright test visual-tests/spreadsheet-hyperlink.functional.spec.ts --config playwright.config.ts",
     "playground:visual:spreadsheet-ribbon": "playwright test visual-tests/spreadsheet-ribbon.functional.spec.ts --config playwright.config.ts",
+    "playground:visual:spreadsheet-underline": "playwright test visual-tests/spreadsheet-underline.functional.spec.ts --config playwright.config.ts",
     "playground:visual:spreadsheet-table": "playwright test visual-tests/spreadsheet-table.functional.spec.ts --config playwright.config.ts",
     "playground:visual:update": "playwright test --config playwright.config.ts --update-snapshots",
     "performance:fixtures": "bun .a3s-test/performance/generate-fixtures.ts",
@@ -137,6 +138,8 @@
     "test:e2e:spreadsheet-cell-style:check": "a3s-test check tests/e2e/spreadsheet-cell-style.acl --json",
     "test:e2e:spreadsheet-font-size-border-shortcuts": "a3s-test run tests/e2e/spreadsheet-font-size-border-shortcuts.acl --json",
     "test:e2e:spreadsheet-font-size-border-shortcuts:check": "a3s-test check tests/e2e/spreadsheet-font-size-border-shortcuts.acl --json",
+    "test:e2e:spreadsheet-underline-styles": "a3s-test run tests/e2e/spreadsheet-underline-styles.acl --json",
+    "test:e2e:spreadsheet-underline-styles:check": "a3s-test check tests/e2e/spreadsheet-underline-styles.acl --json",
     "test:e2e:spreadsheet-table": "a3s-test run tests/e2e/spreadsheet-table.acl --json",
     "test:e2e:spreadsheet-table:check": "a3s-test check tests/e2e/spreadsheet-table.acl --json",
     "test:e2e:spreadsheet-cell-fill": "a3s-test run tests/e2e/spreadsheet-cell-fill.acl --json",