@a3s-lab/office 0.16.0 → 0.18.0

package/dist/0~spreadsheet-editor.js

@@ -1,10 +1,10 @@
 import { __webpack_require__ } from "./0~rslib-runtime.js";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Workbook } from "@fortune-sheet/react";
-import { 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 { 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) {
@@ -1357,6 +1357,28 @@ function isSpreadsheetCoordinate(value) {
 function positiveSpreadsheetDimension(value) {
     return 'number' == typeof value && Number.isFinite(value) && value > 0 ? Math.floor(value) : 0;
 }
+const spreadsheetFontSizes = [
+    9,
+    10,
+    11,
+    12,
+    14,
+    16,
+    18,
+    20,
+    22,
+    24,
+    28,
+    36,
+    48,
+    72
+];
+function nextSpreadsheetFontSize(current, direction) {
+    if (!Number.isFinite(current) || current < 1 || current > 409) return null;
+    return 'grow' === direction ? spreadsheetFontSizes.find((size)=>size > current) ?? null : [
+        ...spreadsheetFontSizes
+    ].reverse().find((size)=>size < current) ?? null;
+}
 function canApplySpreadsheetTableStructureChange(sheet, change) {
     if (!sheet || !validSpreadsheetTableStructureChange(change)) return false;
     for (const table of sheet.tables ?? []){
@@ -1700,22 +1722,6 @@ function sameSpreadsheetTableColumns(left, right) {
 function spreadsheet_table_reconciliation_isRecord(value) {
     return Boolean(value && 'object' == typeof value && !Array.isArray(value));
 }
-const spreadsheetFontSizes = [
-    9,
-    10,
-    11,
-    12,
-    14,
-    16,
-    18,
-    20,
-    22,
-    24,
-    28,
-    36,
-    48,
-    72
-];
 function spreadsheetSelectionReference(selection) {
     const rowStart = Math.min(selection.row[0] ?? 0, selection.row[1] ?? selection.row[0] ?? 0);
     const rowEnd = Math.max(selection.row[0] ?? 0, selection.row[1] ?? selection.row[0] ?? 0);
@@ -2805,6 +2811,40 @@ const spreadsheetCommandCatalog = {
             ]
         }
     },
+    growFont: {
+        id: 'font.grow',
+        label: '增大字号',
+        location: {
+            area: 'ribbon',
+            tab: 'home',
+            group: 'font'
+        },
+        shortcut: {
+            label: 'Cmd/Ctrl+Shift+. 或 Cmd/Ctrl+]',
+            aria: 'Control+Shift+. Meta+Shift+. Control+] Meta+]',
+            editor: [
+                'Mod-Shift-.',
+                'Mod-]'
+            ]
+        }
+    },
+    shrinkFont: {
+        id: 'font.shrink',
+        label: '减小字号',
+        location: {
+            area: 'ribbon',
+            tab: 'home',
+            group: 'font'
+        },
+        shortcut: {
+            label: 'Cmd/Ctrl+Shift+, 或 Cmd/Ctrl+[',
+            aria: 'Control+Shift+, Meta+Shift+, Control+[ Meta+[',
+            editor: [
+                'Mod-Shift-,',
+                'Mod-['
+            ]
+        }
+    },
     numberFormatGeneral: {
         id: 'number.general',
         label: spreadsheetNumberFormatPresetLabels.general,
@@ -3021,6 +3061,14 @@ const spreadsheetCommandCatalog = {
             area: 'ribbon',
             tab: 'home',
             group: 'font'
+        },
+        shortcut: {
+            label: 'Cmd/Ctrl+Shift+_',
+            aria: 'Control+Shift+_ Meta+Shift+_',
+            editor: [
+                'Mod-Shift-_',
+                'Mod-Shift-Minus'
+            ]
         }
     },
     borderAll: {
@@ -3039,6 +3087,14 @@ const spreadsheetCommandCatalog = {
             area: 'ribbon',
             tab: 'home',
             group: 'font'
+        },
+        shortcut: {
+            label: 'Cmd/Ctrl+Shift+&',
+            aria: 'Control+Shift+& Meta+Shift+&',
+            editor: [
+                'Mod-Shift-&',
+                'Mod-Shift-7'
+            ]
         }
     },
     borderInside: {
@@ -3842,6 +3898,8 @@ function spreadsheet_cell_clear_isRecord(value) {
     return Boolean(value && 'object' == typeof value && !Array.isArray(value));
 }
 function createSpreadsheetCellBorderExtension() {
+    const outsideShortcuts = spreadsheetCommandCatalog.borderOutside.shortcut.editor;
+    const noneShortcuts = spreadsheetCommandCatalog.borderNone.shortcut.editor;
     return createOfficeEditorExtension({
         name: 'spreadsheetCellBorders',
         addCommands: ()=>({
@@ -3849,6 +3907,28 @@ function createSpreadsheetCellBorderExtension() {
                     canExecute: canSetSelectedCellBorders,
                     execute: setSelectedCellBorders
                 }
+            }),
+        addKeyboardShortcuts: ()=>({
+                [outsideShortcuts[0]]: ({ can, commands }, event)=>runSpreadsheetBorderShortcut(event, can.setSelectedCellBorders, commands.setSelectedCellBorders, {
+                        target: 'outside',
+                        color: '#000000',
+                        style: 'thin'
+                    }),
+                [outsideShortcuts[1]]: ({ can, commands }, event)=>runSpreadsheetBorderShortcut(event, can.setSelectedCellBorders, commands.setSelectedCellBorders, {
+                        target: 'outside',
+                        color: '#000000',
+                        style: 'thin'
+                    }),
+                [noneShortcuts[0]]: ({ can, commands }, event)=>runSpreadsheetBorderShortcut(event, can.setSelectedCellBorders, commands.setSelectedCellBorders, {
+                        target: 'none',
+                        color: '#000000',
+                        style: 'thin'
+                    }),
+                [noneShortcuts[1]]: ({ can, commands }, event)=>runSpreadsheetBorderShortcut(event, can.setSelectedCellBorders, commands.setSelectedCellBorders, {
+                        target: 'none',
+                        color: '#000000',
+                        style: 'thin'
+                    })
             })
     });
 }
@@ -3856,15 +3936,22 @@ function canSetSelectedCellBorders(context, format) {
     return Boolean(context.editable && context.workbook && context.targetSheetId && canSetSpreadsheetCellBorders(context.content, context.targetSheetId, liveSpreadsheetBorderRange(context), format));
 }
 function setSelectedCellBorders(context, format) {
-    if (!canSetSelectedCellBorders(context, format)) return false;
-    const next = setSpreadsheetCellBorders(context.content, context.targetSheetId, liveSpreadsheetBorderRange(context), format);
+    if (!context.editable || !context.workbook || !context.targetSheetId) return false;
+    const selection = context.workbook.getSelection()?.at(-1) ?? context.fallbackRange;
+    const range = spreadsheetSingleRange(selection);
+    if (!canSetSpreadsheetCellBorders(context.content, context.targetSheetId, range, format)) return false;
+    const next = setSpreadsheetCellBorders(context.content, context.targetSheetId, range, format);
     if (!next) return false;
-    context.onChange(next);
+    context.onChange(spreadsheetContentWithSelection(next, context.targetSheetId, selection));
     return true;
 }
 function liveSpreadsheetBorderRange(context) {
     return spreadsheetSingleRange(context.workbook?.getSelection()?.at(-1) ?? context.fallbackRange);
 }
+function runSpreadsheetBorderShortcut(event, canExecute, execute, format) {
+    if (event.repeat || isOfficeShortcutBlocked(event.target) || isSpreadsheetNativeTextUndoTarget(event.target) || !canExecute(format)) return false;
+    return execute(format);
+}
 const MAX_SPREADSHEET_PER_CELL_BORDER_CELLS = 10000;
 function setSpreadsheetCellBordersPerCell(content, sheetId, range, formats) {
     const normalizedRange = spreadsheet_cell_range_normalizeSpreadsheetCellRange(range);
@@ -3962,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 || ![
@@ -4127,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;
@@ -4719,6 +4806,157 @@ function spreadsheetSelectedCellFillPlan(context, direction) {
     const sheet = context.content.sheets.find((candidate)=>candidate.id === context.targetSheetId);
     return canApplySpreadsheetCellFill(sheet, plan) ? plan : null;
 }
+const MAX_SPREADSHEET_FONT_SIZE_CELLS = 10000;
+function createSpreadsheetFontSizeExtension() {
+    const growShortcuts = spreadsheetCommandCatalog.growFont.shortcut.editor;
+    const shrinkShortcuts = spreadsheetCommandCatalog.shrinkFont.shortcut.editor;
+    return createOfficeEditorExtension({
+        name: 'spreadsheetFontSize',
+        addCommands: ()=>({
+                adjustFontSize: {
+                    canExecute: canAdjustSelectedFontSize,
+                    execute: adjustSelectedFontSize
+                }
+            }),
+        addKeyboardShortcuts: ()=>({
+                [growShortcuts[0]]: ({ can, commands }, event)=>runSpreadsheetFontSizeShortcut(event, can.adjustFontSize, commands.adjustFontSize, 'grow'),
+                [growShortcuts[1]]: ({ can, commands }, event)=>runSpreadsheetFontSizeShortcut(event, can.adjustFontSize, commands.adjustFontSize, 'grow'),
+                [shrinkShortcuts[0]]: ({ can, commands }, event)=>runSpreadsheetFontSizeShortcut(event, can.adjustFontSize, commands.adjustFontSize, 'shrink'),
+                [shrinkShortcuts[1]]: ({ can, commands }, event)=>runSpreadsheetFontSizeShortcut(event, can.adjustFontSize, commands.adjustFontSize, 'shrink')
+            })
+    });
+}
+function spreadsheetFontSizeApiCalls(cells, range, sheetId, direction) {
+    const normalizedRange = spreadsheet_cell_range_normalizeSpreadsheetCellRange(range);
+    if (!normalizedRange || !sheetId || !isSpreadsheetFontSizeDirection(direction) || spreadsheet_cell_range_spreadsheetCellRangeArea(normalizedRange) > MAX_SPREADSHEET_FONT_SIZE_CELLS) return [];
+    const rectangles = [];
+    let active = new Map();
+    const rowCount = normalizedRange.row[1] - normalizedRange.row[0] + 1;
+    const columnCount = normalizedRange.column[1] - normalizedRange.column[0] + 1;
+    for(let rowOffset = 0; rowOffset < rowCount; rowOffset += 1){
+        const row = normalizedRange.row[0] + rowOffset;
+        const runs = spreadsheetFontSizeRowRuns(cells[rowOffset], row, normalizedRange.column[0], columnCount, direction);
+        const nextActive = new Map();
+        for (const run of runs){
+            const signature = `${run.key}:${run.range.column[0]}:${run.range.column[1]}`;
+            const previous = active.get(signature);
+            if (previous && previous.range.row[1] === row - 1) {
+                previous.range.row[1] = row;
+                nextActive.set(signature, previous);
+            } else nextActive.set(signature, run);
+        }
+        for (const [signature, run] of active)if (!nextActive.has(signature)) rectangles.push(run);
+        active = nextActive;
+    }
+    rectangles.push(...active.values());
+    rectangles.sort((left, right)=>left.range.row[0] - right.range.row[0] || left.range.column[0] - right.range.column[0] || left.range.row[1] - right.range.row[1] || left.range.column[1] - right.range.column[1]);
+    return rectangles.map(({ range: targetRange, size })=>({
+            name: 'setCellFormatByRange',
+            args: [
+                'fs',
+                size,
+                targetRange,
+                {
+                    id: sheetId
+                }
+            ]
+        }));
+}
+function spreadsheetFontSizeRowRuns(cells, row, firstColumn, columnCount, direction) {
+    const runs = [];
+    let current = null;
+    for(let columnOffset = 0; columnOffset < columnCount; columnOffset += 1){
+        const column = firstColumn + columnOffset;
+        const size = adjustedSpreadsheetFontSize(cells?.[columnOffset], direction);
+        if (null === size) {
+            if (current) runs.push(current);
+            current = null;
+            continue;
+        }
+        const key = String(size);
+        if (current && current.key === key) {
+            current.range.column[1] = column;
+            continue;
+        }
+        if (current) runs.push(current);
+        current = {
+            key,
+            range: {
+                row: [
+                    row,
+                    row
+                ],
+                column: [
+                    column,
+                    column
+                ]
+            },
+            size
+        };
+    }
+    if (current) runs.push(current);
+    return runs;
+}
+function adjustedSpreadsheetFontSize(cell, direction) {
+    const size = cell?.fs === void 0 ? 10 : Number(cell.fs);
+    return nextSpreadsheetFontSize(size, direction);
+}
+function canAdjustSelectedFontSize(context, direction) {
+    const workbook = context.workbook;
+    const sheetId = context.targetSheetId;
+    if (!context.editable || !workbook || !sheetId || sheetId !== context.activeSheetId || !isSpreadsheetFontSizeDirection(direction)) return false;
+    const range = liveSpreadsheetFontSizeRange(context);
+    if (spreadsheet_cell_range_spreadsheetCellRangeArea(range) > MAX_SPREADSHEET_FONT_SIZE_CELLS) return false;
+    try {
+        const cells = workbook.getCellsByRange(range, {
+            id: sheetId
+        });
+        return canAdjustSpreadsheetFontSizeCells(range.row[1] - range.row[0] + 1, range.column[1] - range.column[0] + 1, (rowOffset, columnOffset)=>cells[rowOffset]?.[columnOffset] ?? null, direction);
+    } catch  {
+        return false;
+    }
+}
+function adjustSelectedFontSize(context, direction) {
+    const workbook = context.workbook;
+    const sheetId = context.targetSheetId;
+    if (!context.editable || !workbook || !sheetId || sheetId !== context.activeSheetId || !isSpreadsheetFontSizeDirection(direction)) return false;
+    const range = liveSpreadsheetFontSizeRange(context);
+    if (spreadsheet_cell_range_spreadsheetCellRangeArea(range) > MAX_SPREADSHEET_FONT_SIZE_CELLS) return false;
+    try {
+        const cells = workbook.getCellsByRange(range, {
+            id: sheetId
+        });
+        const calls = spreadsheetFontSizeApiCalls(cells, range, sheetId, direction);
+        if (!calls.length) return false;
+        workbook.batchCallApis(calls);
+        return true;
+    } catch  {
+        return false;
+    }
+}
+function canAdjustSpreadsheetFontSizeCells(rowCount, columnCount, cellAt, direction) {
+    for(let rowOffset = 0; rowOffset < rowCount; rowOffset += 1)for(let columnOffset = 0; columnOffset < columnCount; columnOffset += 1)if (null !== adjustedSpreadsheetFontSize(cellAt(rowOffset, columnOffset), direction)) return true;
+    return false;
+}
+function liveSpreadsheetFontSizeRange(context) {
+    return spreadsheet_cell_range_normalizeSpreadsheetCellRange(spreadsheetSingleRange(context.workbook?.getSelection()?.at(-1) ?? context.fallbackRange)) ?? {
+        row: [
+            0,
+            0
+        ],
+        column: [
+            0,
+            0
+        ]
+    };
+}
+function isSpreadsheetFontSizeDirection(value) {
+    return 'grow' === value || 'shrink' === value;
+}
+function runSpreadsheetFontSizeShortcut(event, canExecute, execute, direction) {
+    if (event.repeat || isOfficeShortcutBlocked(event.target) || isSpreadsheetNativeTextUndoTarget(event.target) || !canExecute(direction)) return false;
+    return execute(direction);
+}
 const spreadsheet_go_to_spreadsheetMaximumRows = 1048576;
 const spreadsheet_go_to_spreadsheetMaximumColumns = 16384;
 const spreadsheetGoToMaximumInputLength = 512;
@@ -7268,6 +7506,7 @@ function createSpreadsheetEditorExtensions() {
                 })
         }),
         createSpreadsheetCellFormatExtension(),
+        createSpreadsheetFontSizeExtension(),
         createSpreadsheetCellBorderExtension(),
         createSpreadsheetCellStyleExtension(),
         createSpreadsheetNumberFormatExtension(),
@@ -7927,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) {
@@ -8846,6 +9086,7 @@ function SpreadsheetBorderRibbon({ can, commands }) {
         color
     };
     const currentDefinition = spreadsheetBorderTargetOptions.find((option)=>option.target === target)?.definition;
+    const currentShortcut = currentDefinition && 'shortcut' in currentDefinition ? currentDefinition.shortcut : void 0;
     const currentLabel = currentDefinition?.label ?? '所有框线';
     const styleLabel = spreadsheetBorderStyleOptions.find((option)=>option.value === style)?.label;
     const menuDisabled = spreadsheetBorderTargetOptions.every((option)=>!can.setSelectedCellBorders({
@@ -8868,7 +9109,8 @@ function SpreadsheetBorderRibbon({ can, commands }) {
                         type: "button",
                         className: "work-spreadsheet-border-primary",
                         "aria-label": currentLabel,
-                        title: `${currentLabel}（${styleLabel}，${color.toUpperCase()}）`,
+                        "aria-keyshortcuts": currentShortcut?.aria,
+                        title: `${currentLabel}（${styleLabel}，${color.toUpperCase()}${currentShortcut ? `；${currentShortcut.label}` : ''}）`,
                         disabled: !can.setSelectedCellBorders(format),
                         onClick: ()=>commands.setSelectedCellBorders(format),
                         children: /*#__PURE__*/ jsx(SpreadsheetBorderGlyph, {
@@ -8902,11 +9144,14 @@ function SpreadsheetBorderRibbon({ can, commands }) {
                                 ...format,
                                 target: option
                             };
+                            const shortcut = 'shortcut' in definition ? definition.shortcut : void 0;
                             return /*#__PURE__*/ jsxs("button", {
                                 type: "button",
                                 role: "menuitemradio",
                                 tabIndex: 0 === index ? 0 : -1,
                                 "aria-checked": option === target,
+                                "aria-label": definition.label,
+                                "aria-keyshortcuts": shortcut?.aria,
                                 disabled: !can.setSelectedCellBorders(next),
                                 onClick: ()=>{
                                     setTarget(option);
@@ -8918,7 +9163,11 @@ function SpreadsheetBorderRibbon({ can, commands }) {
                                         target: option
                                     }),
                                     /*#__PURE__*/ jsx("span", {
+                                        className: "work-spreadsheet-border-target-label",
                                         children: definition.label
+                                    }),
+                                    shortcut && /*#__PURE__*/ jsx("kbd", {
+                                        children: shortcut.label
                                     })
                                 ]
                             }, definition.id);
@@ -8984,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',
@@ -9054,10 +9405,11 @@ 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';
+    const growFont = spreadsheetCommandCatalog.growFont;
+    const shrinkFont = spreadsheetCommandCatalog.shrinkFont;
     return /*#__PURE__*/ jsxs(WorkOfficeRibbonGroup, {
         label: "字体",
         priority: "high",
@@ -9077,6 +9429,28 @@ function SpreadsheetFontRibbonGroup({ can, commands, toolbarCell }) {
                 options: spreadsheetFontSizeOptions(toolbarCell?.fs),
                 onValueChange: (value)=>commands.setCellFormat('fs', Number(value))
             }),
+            /*#__PURE__*/ jsx(WorkOfficeRibbonButton, {
+                label: growFont.label,
+                title: `${growFont.label}（${growFont.shortcut.label}）`,
+                "aria-keyshortcuts": growFont.shortcut.aria,
+                displayLabel: false,
+                disabled: !can.adjustFontSize('grow'),
+                onClick: ()=>commands.adjustFontSize('grow'),
+                children: /*#__PURE__*/ jsx(AArrowUp, {
+                    size: 15
+                })
+            }),
+            /*#__PURE__*/ jsx(WorkOfficeRibbonButton, {
+                label: shrinkFont.label,
+                title: `${shrinkFont.label}（${shrinkFont.shortcut.label}）`,
+                "aria-keyshortcuts": shrinkFont.shortcut.aria,
+                displayLabel: false,
+                disabled: !can.adjustFontSize('shrink'),
+                onClick: ()=>commands.adjustFontSize('shrink'),
+                children: /*#__PURE__*/ jsx(AArrowDown, {
+                    size: 15
+                })
+            }),
             /*#__PURE__*/ jsx(SpreadsheetFontToggle, {
                 active: bold,
                 attribute: "bl",
@@ -9097,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,
@@ -11798,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',
@@ -12030,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)=>({
@@ -12091,10 +12483,6 @@ function FontPanel({ source, draft, errors, touched, setDraft, touch }) {
                             'italic',
                             '斜体'
                         ],
-                        [
-                            'underline',
-                            '下划线'
-                        ],
                         [
                             'strike',
                             '删除线'
@@ -12108,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, {
@@ -12130,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 字体预览"
             })
@@ -12450,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: {
@@ -22849,6 +23255,7 @@ function spreadsheetCommandsWithGridFocus(commands, restoreFocus) {
     return {
         ...commands,
         adjustDecimalPlaces: afterSuccessfulCommand(commands.adjustDecimalPlaces),
+        adjustFontSize: afterSuccessfulCommand(commands.adjustFontSize),
         applyAutoSum: afterSuccessfulCommand(commands.applyAutoSum),
         activateFormatPainter: afterSuccessfulCommand(commands.activateFormatPainter),
         cancelFormatPainter: afterSuccessfulCommand(commands.cancelFormatPainter),