@a3s-lab/office 0.20.0 → 0.21.0

package/README.md

@@ -571,8 +571,10 @@ interaction model.
   angles, stacked vertical, rotate-up, and rotate-down choices, exact Fortune
   `rt` / `tr='3'` and OOXML 0–180 / 255 round trips, a 10,000-cell guard, and
   one-batch Undo, 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,
+  outside, inside, horizontal, vertical, clear, independent diagonal-down and
+  diagonal-up targets, crossed-border composition, ten native line styles,
+  exact color selection, compact overlapping range writes, exact OOXML
+  direction preservation through Paste Special, Yjs, XLSX export, and reopen,
   `Cmd/Ctrl+Shift+&` Outside Borders and `Cmd/Ctrl+Shift+_` Clear Borders,
   single-update undo, and grid-focus restoration, Conditional Formatting under
   Home and Styles, executable
@@ -1533,6 +1535,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.21.0 documentation](https://a3s-lab.github.io/Office/docs/0.21.0/)
 - [A3S Office 0.20.0 documentation](https://a3s-lab.github.io/Office/docs/0.20.0/)
 - [A3S Office 0.19.0 documentation](https://a3s-lab.github.io/Office/docs/0.19.0/)
 - [A3S Office 0.18.0 documentation](https://a3s-lab.github.io/Office/docs/0.18.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, spreadsheetTextOrientationFromChoice, spreadsheetMatrixProfile, withoutEditableRange, spreadsheetTextOrientationFromAngle, isSpreadsheetTextOrientationId, normalizeSpreadsheetConditionalVisualOptions, spreadsheetUnderlineCellValue, effectiveSpreadsheetPageSetup, attachSpreadsheetShownCommentCells, withEditableRange, sameSpreadsheetHistoryValue, createOfficeSpreadsheetCollaborationBinding as createWorkOfficeSpreadsheetCollaborationBinding, isSpreadsheetConditionalComparisonOperator, spreadsheetConditionalIconForValue, defaultSpreadsheetConditionalIconThresholds, spreadsheetUnderlineStyle, normalizeSpreadsheetDateValidationBoundary, sheetProtectionAuthority, editableRangeCellCount, unlockedCellCount, registerDerivedSpreadsheetMatrix, editableRangeRequiresCredentials, spreadsheetTextOrientationCellStyle, normalizeSpreadsheetConditionalIconSetFormat, defaultSpreadsheetDataBarOptions, spreadsheetConditionalThresholdValue, spreadsheetTextOrientationChoiceFromCell, normalizeSheetProtectionAuthority, withSheetProtection, defaultSpreadsheetColorScaleThresholds, spreadsheetProtectionKey, protectedSheetCount, SPREADSHEET_CONDITIONAL_ICON_SETS, SPREADSHEET_CONDITIONAL_COMPARISON_OPERATORS, withSheetSelectionPermissions, spreadsheetConditionalComparisonNeedsUpperValue, drawSpreadsheetConditionalIcon, spreadsheetTextOrientationFromCell, replaceOfficeSpreadsheetCollaboration as replaceWorkOfficeSpreadsheetCollaboration, readOfficeSpreadsheetCollaboration as readWorkOfficeSpreadsheetCollaboration, spreadsheetConditionalThresholdsEqual, isSpreadsheetUnderlineStyle, spreadsheetVisibleTextRotationFromCell } from "./6164.js";
+import { freezeImportedSpreadsheetCell, spreadsheetTextOrientationFromChoice, spreadsheetMatrixProfile, withoutEditableRange, spreadsheetTextOrientationFromAngle, isSpreadsheetTextOrientationId, normalizeSpreadsheetConditionalVisualOptions, spreadsheetCellValueWithDiagonalBorder, spreadsheetUnderlineCellValue, effectiveSpreadsheetPageSetup, attachSpreadsheetShownCommentCells, withEditableRange, sameSpreadsheetHistoryValue, createOfficeSpreadsheetCollaborationBinding as createWorkOfficeSpreadsheetCollaborationBinding, isSpreadsheetConditionalComparisonOperator, spreadsheetConditionalIconForValue, defaultSpreadsheetConditionalIconThresholds, spreadsheetUnderlineStyle, normalizeSpreadsheetDateValidationBoundary, sheetProtectionAuthority, editableRangeCellCount, unlockedCellCount, registerDerivedSpreadsheetMatrix, editableRangeRequiresCredentials, spreadsheetTextOrientationCellStyle, normalizeSpreadsheetConditionalIconSetFormat, defaultSpreadsheetDataBarOptions, spreadsheetConditionalThresholdValue, spreadsheetTextOrientationChoiceFromCell, normalizeSheetProtectionAuthority, withSheetProtection, defaultSpreadsheetColorScaleThresholds, spreadsheetProtectionKey, spreadsheetDiagonalBorderFromCellValue, SPREADSHEET_CONDITIONAL_ICON_SETS, protectedSheetCount, withSheetSelectionPermissions, SPREADSHEET_CONDITIONAL_COMPARISON_OPERATORS, spreadsheetConditionalComparisonNeedsUpperValue, drawSpreadsheetConditionalIcon, spreadsheetTextOrientationFromCell, replaceOfficeSpreadsheetCollaboration as replaceWorkOfficeSpreadsheetCollaboration, readOfficeSpreadsheetCollaboration as readWorkOfficeSpreadsheetCollaboration, spreadsheetConditionalThresholdsEqual, isSpreadsheetUnderlineStyle, spreadsheetVisibleTextRotationFromCell } from "./5045.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";
@@ -86,6 +86,74 @@ function drawCellValue(context, bounds, cell, conditionalTextColor) {
         context.fillText(String(value), bounds.startX + 4, bounds.startY + height / 2, bounds.endX - bounds.startX - 8);
     }
 }
+function drawSpreadsheetDiagonalDownBorder(context, bounds, line) {
+    drawSpreadsheetDiagonalBorder(context, bounds, line, 'down');
+}
+function drawSpreadsheetDiagonalUpBorder(context, bounds, line) {
+    drawSpreadsheetDiagonalBorder(context, bounds, line, 'up');
+}
+function drawSpreadsheetDiagonalBorder(context, bounds, line, direction) {
+    const left = Math.round(bounds.startX) + 0.5;
+    const top = Math.round(bounds.startY) + 0.5;
+    const right = Math.round(bounds.endX) - 1.5;
+    const bottom = Math.round(bounds.endY) - 1.5;
+    if (right <= left || bottom <= top) return;
+    context.save();
+    context.strokeStyle = line.color;
+    context.lineCap = 'butt';
+    context.lineWidth = spreadsheetDiagonalLineWidth(line.style);
+    context.setLineDash(spreadsheetDiagonalLineDash(line.style));
+    const startY = 'down' === direction ? top : bottom;
+    const endY = 'down' === direction ? bottom : top;
+    if ('7' === line.style) {
+        drawLine(context, left, startY - 1, right, endY - 1);
+        drawLine(context, left, startY + 1, right, endY + 1);
+    } else drawLine(context, left, startY, right, endY);
+    context.restore();
+}
+function drawLine(context, startX, startY, endX, endY) {
+    context.beginPath();
+    context.moveTo(startX, startY);
+    context.lineTo(endX, endY);
+    context.stroke();
+}
+function spreadsheetDiagonalLineWidth(style) {
+    if ('2' === style) return 0.5;
+    if ([
+        '8',
+        '9',
+        '10',
+        '11',
+        '12'
+    ].includes(style)) return 2;
+    if ('13' === style) return 3;
+    return 1;
+}
+function spreadsheetDiagonalLineDash(style) {
+    if ('3' === style) return [
+        1,
+        2
+    ];
+    if ('4' === style || '9' === style) return [
+        5,
+        3
+    ];
+    if ('5' === style || '10' === style || '12' === style) return [
+        6,
+        3,
+        1,
+        3
+    ];
+    if ('6' === style || '11' === style) return [
+        6,
+        3,
+        1,
+        3,
+        1,
+        3
+    ];
+    return [];
+}
 function parseSpreadsheetConditionalColor(value) {
     const hexadecimal = /^#?([0-9a-f]{6})$/i.exec(value.trim());
     if (hexadecimal) return {
@@ -577,7 +645,8 @@ const spreadsheetCellBorderTargets = [
     'inside',
     'horizontal',
     'vertical',
-    'diagonal'
+    'diagonalDown',
+    'diagonalUp'
 ];
 const spreadsheetCellBorderStyles = [
     'thin',
@@ -615,8 +684,7 @@ const spreadsheetNativeBorderTypeByTarget = {
     outside: 'border-outside',
     inside: 'border-inside',
     horizontal: 'border-horizontal',
-    vertical: 'border-vertical',
-    diagonal: 'border-slash'
+    vertical: 'border-vertical'
 };
 const spreadsheetNativeBorderStyleByName = {
     thin: '1',
@@ -635,36 +703,29 @@ function spreadsheetNativeBorderStyle(style) {
 }
 function canSetSpreadsheetCellBorders(content, sheetId, range, format) {
     const normalizedRange = spreadsheet_cell_range_normalizeSpreadsheetCellRange(range);
-    return Boolean(content.sheets.some((sheet)=>sheet.id === sheetId) && normalizedRange && normalizeSpreadsheetBorderFormat(format) && ('diagonal' !== format.target || spreadsheet_cell_range_spreadsheetCellRangeArea(normalizedRange) <= MAX_SPREADSHEET_DIAGONAL_BORDER_CELLS) && spreadsheetBorderInfoIsWritable(content.sheets.find((sheet)=>sheet.id === sheetId)));
+    return Boolean(content.sheets.some((sheet)=>sheet.id === sheetId) && normalizedRange && normalizeSpreadsheetBorderFormat(format) && (!isSpreadsheetDiagonalBorderTarget(format.target) || spreadsheet_cell_range_spreadsheetCellRangeArea(normalizedRange) <= MAX_SPREADSHEET_DIAGONAL_BORDER_CELLS) && spreadsheetBorderInfoIsWritable(content.sheets.find((sheet)=>sheet.id === sheetId)));
 }
 function setSpreadsheetCellBorders(content, sheetId, range, format) {
     const sheetIndex = content.sheets.findIndex((sheet)=>sheet.id === sheetId);
     const sheet = content.sheets[sheetIndex];
     const normalizedRange = spreadsheet_cell_range_normalizeSpreadsheetCellRange(range);
     const normalizedFormat = normalizeSpreadsheetBorderFormat(format);
-    if (!sheet || !normalizedRange || !normalizedFormat || !spreadsheetBorderInfoIsWritable(sheet) || 'diagonal' === normalizedFormat.target && spreadsheet_cell_range_spreadsheetCellRangeArea(normalizedRange) > MAX_SPREADSHEET_DIAGONAL_BORDER_CELLS) return null;
-    const borderType = spreadsheetNativeBorderTypeByTarget[normalizedFormat.target];
+    if (!sheet || !normalizedRange || !normalizedFormat || !spreadsheetBorderInfoIsWritable(sheet) || isSpreadsheetDiagonalBorderTarget(normalizedFormat.target) && spreadsheet_cell_range_spreadsheetCellRangeArea(normalizedRange) > MAX_SPREADSHEET_DIAGONAL_BORDER_CELLS) return null;
     const source = Array.isArray(sheet.config?.borderInfo) ? sheet.config.borderInfo : [];
+    if (isSpreadsheetDiagonalBorderTarget(normalizedFormat.target)) {
+        const borderInfo = [
+            ...compactSpreadsheetBorderInfo(source, normalizedRange, 'border-slash'),
+            ...spreadsheetDiagonalBorderRecords(sheet, normalizedRange, normalizedFormat.target, normalizedFormat.color, spreadsheetNativeBorderStyleByName[normalizedFormat.style])
+        ];
+        return contentWithSpreadsheetBorderInfo(content, sheetIndex, sheet, borderInfo);
+    }
+    const borderType = spreadsheetNativeBorderTypeByTarget[normalizedFormat.target];
     const compacted = compactSpreadsheetBorderInfo(source, normalizedRange, borderType);
     const borderInfo = [
         ...compacted,
         ...spreadsheetNativeBorderRecords(normalizedRange, borderType, normalizedFormat.color, spreadsheetNativeBorderStyleByName[normalizedFormat.style])
     ];
-    const nextSheet = {
-        ...sheet,
-        config: {
-            ...sheet.config,
-            borderInfo: borderInfo
-        }
-    };
-    const sheets = [
-        ...content.sheets
-    ];
-    sheets[sheetIndex] = nextSheet;
-    return {
-        ...content,
-        sheets
-    };
+    return contentWithSpreadsheetBorderInfo(content, sheetIndex, sheet, borderInfo);
 }
 function spreadsheetCellBordersAt(sheet, row, column) {
     const borders = {};
@@ -678,7 +739,7 @@ function spreadsheetCellBordersAt(sheet, row, column) {
             applyResolvedCellBorderLine(borders, 'right', candidate.value.r);
             applyResolvedCellBorderLine(borders, 'top', candidate.value.t);
             applyResolvedCellBorderLine(borders, 'bottom', candidate.value.b);
-            applyResolvedCellBorderLine(borders, 'diagonal', candidate.value.s);
+            applyResolvedCellDiagonalBorders(borders, candidate.value);
             continue;
         }
         if ('range' !== candidate.rangeType || !isSpreadsheetNativeBorderType(candidate.borderType) || !Array.isArray(candidate.range)) continue;
@@ -690,6 +751,69 @@ function spreadsheetCellBordersAt(sheet, row, column) {
     }
     return borders;
 }
+function spreadsheetRenderableDiagonalBorders(sheet) {
+    const borders = new Map();
+    const source = Array.isArray(sheet.config?.borderInfo) ? sheet.config.borderInfo : [];
+    for (const candidate of source){
+        if (!spreadsheet_cell_border_isRecord(candidate)) continue;
+        if ('cell' === candidate.rangeType) {
+            if (!spreadsheet_cell_border_isRecord(candidate.value)) continue;
+            const row = finiteSpreadsheetBorderIndex(candidate.value.row_index);
+            const column = finiteSpreadsheetBorderIndex(candidate.value.col_index);
+            if (null === row || null === column) continue;
+            const key = `${row}_${column}`;
+            const diagonal = spreadsheetDiagonalBorderFromCellValue(candidate.value);
+            if (void 0 === diagonal) continue;
+            if (!diagonal) {
+                borders.delete(key);
+                continue;
+            }
+            const line = resolvedCellBorderLine(diagonal.line);
+            if (!line) {
+                borders.delete(key);
+                continue;
+            }
+            borders.set(key, {
+                border: {
+                    ...diagonal.down ? {
+                        down: line
+                    } : {},
+                    ...diagonal.up ? {
+                        up: line
+                    } : {}
+                },
+                column,
+                row
+            });
+            continue;
+        }
+        if ('range' !== candidate.rangeType || 'border-none' !== candidate.borderType && 'border-slash' !== candidate.borderType || !Array.isArray(candidate.range)) continue;
+        const line = resolvedRangeBorderLine(candidate);
+        for (const rangeCandidate of candidate.range){
+            const range = parseSpreadsheetCellRange(rangeCandidate);
+            if (range) {
+                for (const [key, entry] of borders)if (spreadsheetCellRangeContains(range, entry.row, entry.column)) {
+                    if ('border-none' === candidate.borderType || !entry.border.up) {
+                        borders.delete(key);
+                        continue;
+                    }
+                    borders.set(key, {
+                        ...entry,
+                        border: {
+                            up: line ?? entry.border.up
+                        }
+                    });
+                }
+            }
+        }
+    }
+    return new Map([
+        ...borders
+    ].map(([key, entry])=>[
+            key,
+            entry.border
+        ]));
+}
 function normalizeSpreadsheetBorderFormat(format) {
     if (!spreadsheetCellBorderTargets.includes(format.target) || !spreadsheetCellBorderStyles.includes(format.style)) return null;
     const color = normalizeSpreadsheetBorderColor(format.color);
@@ -716,14 +840,26 @@ function compactSpreadsheetBorderInfo(formats, range, appliedType) {
             format
         ];
         if ('cell' === format.rangeType) {
-            if (!supersedesAll || !spreadsheet_cell_border_isRecord(format.value)) return [
+            if (!spreadsheet_cell_border_isRecord(format.value)) return [
                 format
             ];
             const row = finiteSpreadsheetBorderIndex(format.value.row_index);
             const column = finiteSpreadsheetBorderIndex(format.value.col_index);
-            return null !== row && null !== column && spreadsheetCellRangeContains(range, row, column) ? [] : [
+            const selected = null !== row && null !== column && spreadsheetCellRangeContains(range, row, column);
+            if (!selected) return [
                 format
             ];
+            if (supersedesAll) return [];
+            if ('border-slash' !== appliedType) return [
+                format
+            ];
+            const value = spreadsheetCellValueWithDiagonalBorder(format.value, null);
+            return Object.keys(value).some((key)=>'row_index' !== key && 'col_index' !== key) ? [
+                {
+                    ...format,
+                    value
+                }
+            ] : [];
         }
         if ('range' !== format.rangeType || !isSpreadsheetNativeBorderType(format.borderType) || !Array.isArray(format.range) || !supersedesAll && format.borderType !== appliedType) return [
             format
@@ -733,9 +869,14 @@ function compactSpreadsheetBorderInfo(formats, range, appliedType) {
             if (!parsed) return [
                 candidate
             ];
-            if ('border-slash' === format.borderType) return spreadsheetCellRangesIntersect(parsed, range) ? [] : [
-                candidate
-            ];
+            if ('border-slash' === format.borderType) {
+                if (!spreadsheetCellRangesIntersect(parsed, range)) return [
+                    candidate
+                ];
+                return 1 === spreadsheet_cell_range_spreadsheetCellRangeArea(parsed) ? [] : [
+                    candidate
+                ];
+            }
             return subtractSpreadsheetCellRange(parsed, range);
         });
         return remaining.length ? [
@@ -747,7 +888,7 @@ function compactSpreadsheetBorderInfo(formats, range, appliedType) {
     });
 }
 function spreadsheetNativeBorderRecords(range, borderType, color, style) {
-    if ('border-slash' !== borderType) return [
+    return [
         {
             rangeType: 'range',
             borderType,
@@ -758,28 +899,91 @@ function spreadsheetNativeBorderRecords(range, borderType, color, style) {
             ]
         }
     ];
+}
+function spreadsheetDiagonalBorderRecords(sheet, range, target, color, style) {
     const records = [];
-    for(let row = range.row[0]; row <= range.row[1]; row += 1)for(let column = range.column[0]; column <= range.column[1]; column += 1)records.push({
-        rangeType: 'range',
-        borderType,
-        color,
-        style,
-        range: [
-            {
-                row: [
-                    row,
-                    row
-                ],
-                column: [
-                    column,
-                    column
-                ],
-                row_focus: row,
-                column_focus: column
+    const existing = spreadsheetDiagonalBorderDirectionsInRange(sheet, range);
+    for(let row = range.row[0]; row <= range.row[1]; row += 1)for(let column = range.column[0]; column <= range.column[1]; column += 1){
+        const current = existing.get(`${row}_${column}`);
+        const border = {
+            down: 'diagonalDown' === target || Boolean(current?.down),
+            line: {
+                color,
+                style
+            },
+            up: 'diagonalUp' === target || Boolean(current?.up)
+        };
+        records.push({
+            rangeType: 'cell',
+            value: spreadsheetCellValueWithDiagonalBorder({
+                col_index: column,
+                row_index: row
+            }, border)
+        });
+    }
+    return records;
+}
+function spreadsheetDiagonalBorderDirectionsInRange(sheet, selection) {
+    const directions = new Map();
+    const source = Array.isArray(sheet.config?.borderInfo) ? sheet.config.borderInfo : [];
+    for (const candidate of source){
+        if (!spreadsheet_cell_border_isRecord(candidate)) continue;
+        if ('cell' === candidate.rangeType) {
+            if (!spreadsheet_cell_border_isRecord(candidate.value)) continue;
+            const row = finiteSpreadsheetBorderIndex(candidate.value.row_index);
+            const column = finiteSpreadsheetBorderIndex(candidate.value.col_index);
+            if (null === row || null === column || !spreadsheetCellRangeContains(selection, row, column)) continue;
+            const diagonal = spreadsheetDiagonalBorderFromCellValue(candidate.value);
+            if (void 0 === diagonal) continue;
+            const line = diagonal && resolvedCellBorderLine(diagonal.line);
+            setSpreadsheetDiagonalDirections(directions, row, column, Boolean(line && diagonal?.down), Boolean(line && diagonal?.up));
+            continue;
+        }
+        if ('range' !== candidate.rangeType || 'border-none' !== candidate.borderType && 'border-slash' !== candidate.borderType || !Array.isArray(candidate.range)) continue;
+        const line = resolvedRangeBorderLine(candidate);
+        for (const rangeCandidate of candidate.range){
+            const range = parseSpreadsheetCellRange(rangeCandidate);
+            if (!range || !spreadsheetCellRangesIntersect(range, selection)) continue;
+            const startRow = Math.max(range.row[0], selection.row[0]);
+            const endRow = Math.min(range.row[1], selection.row[1]);
+            const startColumn = Math.max(range.column[0], selection.column[0]);
+            const endColumn = Math.min(range.column[1], selection.column[1]);
+            for(let row = startRow; row <= endRow; row += 1)for(let column = startColumn; column <= endColumn; column += 1){
+                if ('border-none' === candidate.borderType) {
+                    directions.delete(`${row}_${column}`);
+                    continue;
+                }
+                const current = directions.get(`${row}_${column}`);
+                setSpreadsheetDiagonalDirections(directions, row, column, Boolean(line), Boolean(current?.up));
             }
-        ]
+        }
+    }
+    return directions;
+}
+function setSpreadsheetDiagonalDirections(directions, row, column, down, up) {
+    const key = `${row}_${column}`;
+    if (!down && !up) return void directions.delete(key);
+    directions.set(key, {
+        down,
+        up
     });
-    return records;
+}
+function contentWithSpreadsheetBorderInfo(content, sheetIndex, sheet, borderInfo) {
+    const nextSheet = {
+        ...sheet,
+        config: {
+            ...sheet.config,
+            borderInfo: borderInfo
+        }
+    };
+    const sheets = [
+        ...content.sheets
+    ];
+    sheets[sheetIndex] = nextSheet;
+    return {
+        ...content,
+        sheets
+    };
 }
 function applyResolvedCellBorderLine(borders, side, value) {
     if (null === value) return void delete borders[side];
@@ -791,6 +995,26 @@ function applyResolvedCellBorderLine(borders, side, value) {
         style
     };
 }
+function applyResolvedCellDiagonalBorders(borders, value) {
+    const diagonal = spreadsheetDiagonalBorderFromCellValue(value);
+    if (void 0 === diagonal) return;
+    delete borders.diagonalDown;
+    delete borders.diagonalUp;
+    if (!diagonal) return;
+    const line = resolvedCellBorderLine(diagonal.line);
+    if (!line) return;
+    if (diagonal.down) borders.diagonalDown = line;
+    if (diagonal.up) borders.diagonalUp = line;
+}
+function resolvedCellBorderLine(value) {
+    if (!spreadsheet_cell_border_isRecord(value)) return null;
+    const color = 'string' == typeof value.color ? normalizeSpreadsheetBorderColor(value.color) : null;
+    const style = 'string' == typeof value.style ? value.style : null;
+    return color && style ? {
+        color,
+        style
+    } : null;
+}
 function resolvedRangeBorderLine(value) {
     const color = 'string' == typeof value.color ? normalizeSpreadsheetBorderColor(value.color) : null;
     const style = 'string' == typeof value.style ? value.style : null;
@@ -826,7 +1050,8 @@ function applyResolvedRangeBorder(borders, range, row, column, type, line) {
             delete borders.bottom;
             delete borders.left;
             delete borders.right;
-            delete borders.diagonal;
+            delete borders.diagonalDown;
+            delete borders.diagonalUp;
             break;
         case 'border-all':
             set('top');
@@ -855,10 +1080,16 @@ function applyResolvedRangeBorder(borders, range, row, column, type, line) {
             if (!onRight) set('right');
             break;
         case 'border-slash':
-            set('diagonal');
+            if (line) {
+                borders.diagonalDown = line;
+                if (borders.diagonalUp) borders.diagonalUp = line;
+            } else delete borders.diagonalDown;
             break;
     }
 }
+function isSpreadsheetDiagonalBorderTarget(target) {
+    return 'diagonalDown' === target || 'diagonalUp' === target;
+}
 function isSpreadsheetNativeBorderType(value) {
     return 'string' == typeof value && spreadsheetNativeBorderTypes.has(value);
 }
@@ -3127,9 +3358,18 @@ const spreadsheetCommandCatalog = {
             group: 'font'
         }
     },
-    borderDiagonal: {
-        id: 'font.borderDiagonal',
-        label: '斜线框线',
+    borderDiagonalDown: {
+        id: 'font.borderDiagonalDown',
+        label: '斜下框线',
+        location: {
+            area: 'ribbon',
+            tab: 'home',
+            group: 'font'
+        }
+    },
+    borderDiagonalUp: {
+        id: 'font.borderDiagonalUp',
+        label: '斜上框线',
         location: {
             area: 'ribbon',
             tab: 'home',
@@ -4077,14 +4317,16 @@ const MAX_SPREADSHEET_PER_CELL_BORDER_CELLS = 10000;
 function setSpreadsheetCellBordersPerCell(content, sheetId, range, formats) {
     const normalizedRange = spreadsheet_cell_range_normalizeSpreadsheetCellRange(range);
     const normalizedFormats = formats.map(normalizeSpreadsheetBorderFormat);
-    if (!normalizedRange || spreadsheet_cell_range_spreadsheetCellRangeArea(normalizedRange) > MAX_SPREADSHEET_PER_CELL_BORDER_CELLS || normalizedFormats.some((format)=>!format || ![
+    const area = normalizedRange ? spreadsheet_cell_range_spreadsheetCellRangeArea(normalizedRange) : 1 / 0;
+    if (!normalizedRange || area > MAX_SPREADSHEET_PER_CELL_BORDER_CELLS || normalizedFormats.some((format)=>!format || ![
             'top',
             'bottom',
             'left',
             'right',
             'all',
-            'diagonal'
-        ].includes(format.target))) return null;
+            'diagonalDown',
+            'diagonalUp'
+        ].includes(format.target)) || area > 4096 && normalizedFormats.some((format)=>format?.target === 'diagonalDown' || format?.target === 'diagonalUp')) return null;
     const next = setSpreadsheetCellBorders(content, sheetId, normalizedRange, {
         target: 'none',
         color: '#000000',
@@ -4100,6 +4342,9 @@ function setSpreadsheetCellBordersPerCell(content, sheetId, range, formats) {
             row_index: row,
             col_index: column
         };
+        let diagonalDown = false;
+        let diagonalUp = false;
+        let diagonalLine = null;
         for (const format of normalizedFormats){
             if (!format) continue;
             const line = {
@@ -4110,11 +4355,22 @@ function setSpreadsheetCellBordersPerCell(content, sheetId, range, formats) {
             if ('all' === format.target || 'right' === format.target) value.r = line;
             if ('all' === format.target || 'top' === format.target) value.t = line;
             if ('all' === format.target || 'bottom' === format.target) value.b = line;
-            if ('diagonal' === format.target) value.s = line;
+            if ('diagonalDown' === format.target) {
+                diagonalDown = true;
+                diagonalLine = line;
+            }
+            if ('diagonalUp' === format.target) {
+                diagonalUp = true;
+                diagonalLine = line;
+            }
         }
         records.push({
             rangeType: 'cell',
-            value
+            value: diagonalLine && (diagonalDown || diagonalUp) ? spreadsheetCellValueWithDiagonalBorder(value, {
+                down: diagonalDown,
+                line: diagonalLine,
+                up: diagonalUp
+            }) : value
         });
     }
     const borderInfo = [
@@ -4180,8 +4436,9 @@ function canApplySpreadsheetCellFormat(content, request) {
                 'left',
                 'right',
                 'all',
-                'diagonal'
-            ].includes(format.target)) || normalized.some((format)=>format?.target === 'diagonal') && spreadsheet_cell_range_spreadsheetCellRangeArea(range) > 4096) return false;
+                'diagonalDown',
+                'diagonalUp'
+            ].includes(format.target)) || normalized.some((format)=>format?.target === 'diagonalDown' || format?.target === 'diagonalUp') && spreadsheet_cell_range_spreadsheetCellRangeArea(range) > 4096) return false;
     }
     return true;
 }
@@ -4699,14 +4956,16 @@ function sameCellStyleBorders(actual, formats) {
         if ('all' === format.target || 'right' === format.target) expected.right = line;
         if ('all' === format.target || 'top' === format.target) expected.top = line;
         if ('all' === format.target || 'bottom' === format.target) expected.bottom = line;
-        if ('diagonal' === format.target) expected.diagonal = line;
+        if ('diagonalDown' === format.target) expected.diagonalDown = line;
+        if ('diagonalUp' === format.target) expected.diagonalUp = line;
     }
     return [
         'top',
         'bottom',
         'left',
         'right',
-        'diagonal'
+        'diagonalDown',
+        'diagonalUp'
     ].every((side)=>actual[side]?.color === expected[side]?.color && actual[side]?.style === expected[side]?.style);
 }
 function createSpreadsheetCellStyleExtension() {
@@ -10195,8 +10454,12 @@ const spreadsheetBorderTargetOptions = [
         definition: spreadsheetCommandCatalog.borderVertical
     },
     {
-        target: 'diagonal',
-        definition: spreadsheetCommandCatalog.borderDiagonal
+        target: 'diagonalDown',
+        definition: spreadsheetCommandCatalog.borderDiagonalDown
+    },
+    {
+        target: 'diagonalUp',
+        definition: spreadsheetCommandCatalog.borderDiagonalUp
     }
 ];
 function SpreadsheetBorderRibbon({ can, commands }) {
@@ -12680,8 +12943,12 @@ const borderTargets = [
         label: '右框线'
     },
     {
-        target: 'diagonal',
-        label: '对角线'
+        target: 'diagonalDown',
+        label: '斜下框线'
+    },
+    {
+        target: 'diagonalUp',
+        label: '斜上框线'
     }
 ];
 function SpreadsheetFormatCellsPanel(props) {
@@ -13114,10 +13381,16 @@ function BorderPreview({ draft }) {
                     borderRight: line('right')
                 }
             }),
-            line('diagonal') && /*#__PURE__*/ jsx("span", {
-                className: "diagonal",
+            line('diagonalDown') && /*#__PURE__*/ jsx("span", {
+                className: "diagonal-down",
+                style: {
+                    borderTop: line('diagonalDown')
+                }
+            }),
+            line('diagonalUp') && /*#__PURE__*/ jsx("span", {
+                className: "diagonal-up",
                 style: {
-                    borderTop: line('diagonal')
+                    borderTop: line('diagonalUp')
                 }
             }),
             /*#__PURE__*/ jsx("strong", {
@@ -13388,7 +13661,8 @@ function borderFormatsAt(sheet, row, column) {
         'bottom',
         'left',
         'right',
-        'diagonal'
+        'diagonalDown',
+        'diagonalUp'
     ].flatMap((target)=>{
         const line = resolved[target];
         if (!line) return [];
@@ -20326,20 +20600,22 @@ function applySpreadsheetPasteBorders(content, sheetId, snapshot, plan, processe
             [
                 'bottom',
                 'b'
-            ],
-            [
-                'diagonal',
-                's'
             ]
         ];
         for (const [side, key] of sides){
             const line = source.borders[side];
             if (line) value[key] = structuredClone(line);
         }
-        return Object.keys(value).length > 2 ? [
+        const diagonal = source.borders.diagonalUp ?? source.borders.diagonalDown ?? null;
+        const withDiagonal = diagonal ? spreadsheetCellValueWithDiagonalBorder(value, {
+            down: Boolean(source.borders.diagonalDown),
+            line: structuredClone(diagonal),
+            up: Boolean(source.borders.diagonalUp)
+        }) : value;
+        return Object.keys(withDiagonal).length > 2 ? [
             {
                 rangeType: 'cell',
-                value
+                value: withDiagonal
             }
         ] : [];
     });
@@ -22627,6 +22903,16 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
     ]);
     const tableStylesBySheetRef = useRef(tableStylesBySheet);
     tableStylesBySheetRef.current = tableStylesBySheet;
+    const diagonalBordersBySheet = useMemo(()=>new Map(materializedContent.sheets.flatMap((sheet)=>sheet.id ? [
+                [
+                    sheet.id,
+                    spreadsheetRenderableDiagonalBorders(sheet)
+                ]
+            ] : [])), [
+        materializedContent.sheets
+    ]);
+    const diagonalBordersBySheetRef = useRef(diagonalBordersBySheet);
+    diagonalBordersBySheetRef.current = diagonalBordersBySheet;
     useEffect(()=>{
         setPreviewActiveSheetId(preview ? contentActiveSheetId : null);
     }, [
@@ -22758,6 +23044,9 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
                     }
                 } finally{
                     finishSpreadsheetTableCellRender(cell, cellInfo, tableStyle, context);
+                    const diagonal = diagonalBordersBySheetRef.current.get(activeSheetIdRef.current)?.get(`${cellInfo.row}_${cellInfo.column}`);
+                    if (diagonal?.down) drawSpreadsheetDiagonalDownBorder(context, cellInfo, diagonal.down);
+                    if (diagonal?.up) drawSpreadsheetDiagonalUpBorder(context, cellInfo, diagonal.up);
                 }
             }
         }), [

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 "./6164.js";
+import { spreadsheetConditionalComparisonNeedsUpperValue, isSpreadsheetConditionalIconSetName, isSpreadsheetConditionalComparisonOperator, spreadsheetConditionalIconSetCount } from "./5045.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/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 { normalizeSpreadsheetDateValidationBoundary, freezeImportedSpreadsheetCell, editableRangeRequiresCredentials, spreadsheetTextOrientationCellStyle, normalizeSpreadsheetConditionalIconSetFormat, defaultSpreadsheetDataBarOptions, normalizeSpreadsheetConditionalVisualOptions, normalizeSpreadsheetPaperSize, spreadsheetTextOrientationXlsxValueFromCell, normalizeSheetProtectionAuthority, defaultSpreadsheetColorScaleThresholds, importedSheetProtectionAuthority, spreadsheetDateValidationFormula, spreadsheetUnderlineCellValueFromXlsx, sheetHasProtectionState, spreadsheetTextOrientationFromXlsx, spreadsheetConditionalComparisonNeedsUpperValue, isSpreadsheetConditionalComparisonOperator, registerImportedSpreadsheetMatrix, spreadsheetExplicitTextOrientationFromCell, spreadsheetUnderlineStyle, defaultSpreadsheetConditionalIconThresholds, isSpreadsheetConditionalIconSetName, DEFAULT_PROTECTION_HINT, spreadsheetConditionalThresholdsEqual, spreadsheetUnderlineCellValueFromSheetJs, spreadsheetConditionalIconSetCount } from "./6164.js";
+import { freezeImportedSpreadsheetCell, normalizeSpreadsheetPaperSize, spreadsheetCellValueWithDiagonalBorder, normalizeSpreadsheetConditionalVisualOptions, spreadsheetTextOrientationXlsxValueFromCell, spreadsheetTextOrientationFromXlsx, isSpreadsheetConditionalComparisonOperator, registerImportedSpreadsheetMatrix, spreadsheetExplicitTextOrientationFromCell, normalizeSpreadsheetDateValidationBoundary, spreadsheetUnderlineStyle, defaultSpreadsheetConditionalIconThresholds, DEFAULT_PROTECTION_HINT, editableRangeRequiresCredentials, spreadsheetTextOrientationCellStyle, normalizeSpreadsheetConditionalIconSetFormat, defaultSpreadsheetDataBarOptions, normalizeSheetProtectionAuthority, importedSheetProtectionAuthority, spreadsheetDateValidationFormula, defaultSpreadsheetColorScaleThresholds, spreadsheetDiagonalBorderFromCellValue, spreadsheetUnderlineCellValueFromXlsx, sheetHasProtectionState, spreadsheetConditionalComparisonNeedsUpperValue, isSpreadsheetConditionalIconSetName, spreadsheetConditionalThresholdsEqual, spreadsheetUnderlineCellValueFromSheetJs, spreadsheetConditionalIconSetCount } from "./5045.js";
 import { WorkFileImportController, materializeWorkFileSource } from "./9356.js";
 import "./2591.js";
 import "./3818.js";
@@ -3112,7 +3112,19 @@ function fortuneBorderInfoFromXlsxCells(entries) {
         setFortuneBorderLine(value, 'r', border.right);
         setFortuneBorderLine(value, 't', border.top);
         setFortuneBorderLine(value, 'b', border.bottom);
-        if (border.diagonal) setFortuneBorderLine(value, 's', border.diagonal);
+        if (border.diagonal && (true === border.diagonalDown || true === border.diagonalUp)) {
+            const line = fortuneBorderLine(border.diagonal);
+            if (line) return [
+                {
+                    rangeType: 'cell',
+                    value: spreadsheetCellValueWithDiagonalBorder(value, {
+                        down: true === border.diagonalDown,
+                        line,
+                        up: true === border.diagonalUp
+                    })
+                }
+            ];
+        }
         return Object.keys(value).length > 2 ? [
             {
                 rangeType: 'cell',
@@ -3170,11 +3182,18 @@ function applySpreadsheetCellBorderRecord(record, targets, borders) {
     applyCellLine(border, 'right', record.value.r);
     applyCellLine(border, 'top', record.value.t);
     applyCellLine(border, 'bottom', record.value.b);
-    const diagonal = xlsxCellBorderLineFromFortune(record.value.s);
-    if (void 0 !== diagonal) {
-        border.diagonal = diagonal;
-        border.diagonalUp = null !== diagonal;
+    const diagonal = spreadsheetDiagonalBorderFromCellValue(record.value);
+    if (void 0 !== diagonal) if (diagonal) {
+        const line = xlsxCellBorderLineFromFortune(diagonal.line);
+        if (void 0 !== line) {
+            border.diagonal = line;
+            border.diagonalDown = null !== line && diagonal.down;
+            border.diagonalUp = null !== line && diagonal.up;
+        }
+    } else {
+        border.diagonal = null;
         border.diagonalDown = false;
+        border.diagonalUp = false;
     }
     borders.set(key, border);
 }
@@ -3240,9 +3259,10 @@ function applySpreadsheetRangeBorder(borders, target, range, borderType, line) {
             if (!onRight) border.right = line;
             break;
         case 'border-slash':
-            border.diagonal = line;
-            border.diagonalUp = null !== line;
-            border.diagonalDown = false;
+            border.diagonalDown = null !== line;
+            border.diagonalUp = true === border.diagonalUp;
+            if (line) border.diagonal = line;
+            else if (!border.diagonalUp) border.diagonal = null;
             break;
         default:
             return;
@@ -3285,6 +3305,13 @@ function setFortuneBorderLine(target, name, line) {
         style: fortuneBorderStyle(line.style)
     };
 }
+function fortuneBorderLine(line) {
+    const color = normalizeRgbColor(line.color);
+    return color ? {
+        color,
+        style: fortuneBorderStyle(line.style)
+    } : null;
+}
 function normalizeRgbColor(value) {
     if ('string' != typeof value) return null;
     const color = value.trim().toLowerCase();

package/dist/{6164.js → 5045.js}

@@ -2092,6 +2092,59 @@ 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 A3S_DIAGONAL_BORDER_KEY = 'a3sDiagonal';
+function spreadsheetDiagonalBorderFromCellValue(value) {
+    if (!isRecord(value)) return;
+    const metadata = value[A3S_DIAGONAL_BORDER_KEY];
+    if (isRecord(metadata)) {
+        const up = metadata.up;
+        const down = metadata.down;
+        const line = spreadsheetDiagonalBorderLine(metadata.line);
+        if ('boolean' == typeof up && 'boolean' == typeof down) {
+            if (!up && !down) return null;
+            if (line) return {
+                down,
+                line,
+                up
+            };
+        }
+    }
+    if (null === value.s) return null;
+    const legacyLine = spreadsheetDiagonalBorderLine(value.s);
+    return legacyLine ? {
+        down: true,
+        line: legacyLine,
+        up: false
+    } : void 0;
+}
+function spreadsheetCellValueWithDiagonalBorder(value, border) {
+    const next = {
+        ...value
+    };
+    delete next.s;
+    delete next[A3S_DIAGONAL_BORDER_KEY];
+    if (!border) return next;
+    const line = {
+        ...border.line
+    };
+    next[A3S_DIAGONAL_BORDER_KEY] = {
+        down: border.down,
+        line,
+        up: border.up
+    };
+    if (border.down) next.s = line;
+    return next;
+}
+function spreadsheetDiagonalBorderLine(value) {
+    if (!isRecord(value)) return null;
+    return 'string' == typeof value.color && 'string' == typeof value.style ? {
+        color: value.color,
+        style: value.style
+    } : null;
+}
+function isRecord(value) {
+    return Boolean(value && 'object' == typeof value && !Array.isArray(value));
+}
 const spreadsheetTextOrientationIds = [
     'horizontal',
     'angleCounterclockwise',
@@ -2749,4 +2802,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, isSpreadsheetTextOrientationId, isSpreadsheetUnderlineStyle, normalizeSheetProtectionAuthority, normalizeSpreadsheetConditionalIconSetFormat, normalizeSpreadsheetConditionalVisualOptions, normalizeSpreadsheetDateValidationBoundary, normalizeSpreadsheetPaperSize, protectedSheetCount, readWorkOfficeSpreadsheetCollaboration as readOfficeSpreadsheetCollaboration, registerDerivedSpreadsheetMatrix, registerImportedSpreadsheetMatrix, replaceWorkOfficeSpreadsheetCollaboration as replaceOfficeSpreadsheetCollaboration, sameSpreadsheetHistoryValue, sheetHasProtectionState, sheetProtectionAuthority, spreadsheetConditionalComparisonNeedsUpperValue, spreadsheetConditionalIconForValue, spreadsheetConditionalIconSetCount, spreadsheetConditionalThresholdValue, spreadsheetConditionalThresholdsEqual, spreadsheetDateValidationFormula, spreadsheetExplicitTextOrientationFromCell, spreadsheetMatrixProfile, spreadsheetProtectionKey, spreadsheetTextOrientationCellStyle, spreadsheetTextOrientationChoiceFromCell, spreadsheetTextOrientationFromAngle, spreadsheetTextOrientationFromCell, spreadsheetTextOrientationFromChoice, spreadsheetTextOrientationFromXlsx, spreadsheetTextOrientationXlsxValueFromCell, spreadsheetUnderlineCellValue, spreadsheetUnderlineCellValueFromSheetJs, spreadsheetUnderlineCellValueFromXlsx, spreadsheetUnderlineStyle, spreadsheetVisibleTextRotationFromCell, 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, isSpreadsheetTextOrientationId, isSpreadsheetUnderlineStyle, normalizeSheetProtectionAuthority, normalizeSpreadsheetConditionalIconSetFormat, normalizeSpreadsheetConditionalVisualOptions, normalizeSpreadsheetDateValidationBoundary, normalizeSpreadsheetPaperSize, protectedSheetCount, readWorkOfficeSpreadsheetCollaboration as readOfficeSpreadsheetCollaboration, registerDerivedSpreadsheetMatrix, registerImportedSpreadsheetMatrix, replaceWorkOfficeSpreadsheetCollaboration as replaceOfficeSpreadsheetCollaboration, sameSpreadsheetHistoryValue, sheetHasProtectionState, sheetProtectionAuthority, spreadsheetCellValueWithDiagonalBorder, spreadsheetConditionalComparisonNeedsUpperValue, spreadsheetConditionalIconForValue, spreadsheetConditionalIconSetCount, spreadsheetConditionalThresholdValue, spreadsheetConditionalThresholdsEqual, spreadsheetDateValidationFormula, spreadsheetDiagonalBorderFromCellValue, spreadsheetExplicitTextOrientationFromCell, spreadsheetMatrixProfile, spreadsheetProtectionKey, spreadsheetTextOrientationCellStyle, spreadsheetTextOrientationChoiceFromCell, spreadsheetTextOrientationFromAngle, spreadsheetTextOrientationFromCell, spreadsheetTextOrientationFromChoice, spreadsheetTextOrientationFromXlsx, spreadsheetTextOrientationXlsxValueFromCell, spreadsheetUnderlineCellValue, spreadsheetUnderlineCellValueFromSheetJs, spreadsheetUnderlineCellValueFromXlsx, spreadsheetUnderlineStyle, spreadsheetVisibleTextRotationFromCell, unlockedCellCount, withEditableRange, withSheetProtection, withSheetSelectionPermissions, withoutEditableRange };

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 "./6164.js";
+export { createOfficeSpreadsheetCollaborationBinding, initializeOfficeSpreadsheetCollaboration, readOfficeSpreadsheetCollaboration, replaceOfficeSpreadsheetCollaboration } from "./5045.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 "./6164.js";
+export { createOfficeSpreadsheetCollaborationBinding, initializeOfficeSpreadsheetCollaboration, readOfficeSpreadsheetCollaboration, replaceOfficeSpreadsheetCollaboration } from "./5045.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-border.d.ts

@@ -1,6 +1,6 @@
 import type { WorkSpreadsheetContent, WorkSpreadsheetSheet } from '../work-types';
 import { type SpreadsheetCellRangeInput } from './spreadsheet-cell-range';
-export declare const spreadsheetCellBorderTargets: readonly ["top", "bottom", "left", "right", "none", "all", "outside", "inside", "horizontal", "vertical", "diagonal"];
+export declare const spreadsheetCellBorderTargets: readonly ["top", "bottom", "left", "right", "none", "all", "outside", "inside", "horizontal", "vertical", "diagonalDown", "diagonalUp"];
 export type SpreadsheetCellBorderTarget = (typeof spreadsheetCellBorderTargets)[number];
 export declare const spreadsheetCellBorderStyles: readonly ["thin", "dotted", "dashed", "dash-dot", "dash-dot-dot", "medium", "medium-dashed", "medium-dash-dot", "medium-dash-dot-dot", "thick"];
 export type SpreadsheetCellBorderStyle = (typeof spreadsheetCellBorderStyles)[number];
@@ -15,14 +15,20 @@ export interface SpreadsheetResolvedCellBorderLine {
 }
 export interface SpreadsheetResolvedCellBorders {
     bottom?: SpreadsheetResolvedCellBorderLine;
-    diagonal?: SpreadsheetResolvedCellBorderLine;
+    diagonalDown?: SpreadsheetResolvedCellBorderLine;
+    diagonalUp?: SpreadsheetResolvedCellBorderLine;
     left?: SpreadsheetResolvedCellBorderLine;
     right?: SpreadsheetResolvedCellBorderLine;
     top?: SpreadsheetResolvedCellBorderLine;
 }
+export interface SpreadsheetRenderableDiagonalBorders {
+    down?: SpreadsheetResolvedCellBorderLine;
+    up?: SpreadsheetResolvedCellBorderLine;
+}
 export declare const MAX_SPREADSHEET_DIAGONAL_BORDER_CELLS = 4096;
 export declare function spreadsheetNativeBorderStyle(style: SpreadsheetCellBorderStyle): string;
 export declare function canSetSpreadsheetCellBorders(content: WorkSpreadsheetContent, sheetId: string, range: SpreadsheetCellRangeInput, format: SpreadsheetCellBorderFormat): boolean;
 export declare function setSpreadsheetCellBorders(content: WorkSpreadsheetContent, sheetId: string, range: SpreadsheetCellRangeInput, format: SpreadsheetCellBorderFormat): WorkSpreadsheetContent | null;
 export declare function spreadsheetCellBordersAt(sheet: WorkSpreadsheetSheet | undefined, row: number, column: number): SpreadsheetResolvedCellBorders;
+export declare function spreadsheetRenderableDiagonalBorders(sheet: WorkSpreadsheetSheet): ReadonlyMap<string, SpreadsheetRenderableDiagonalBorders>;
 export declare function normalizeSpreadsheetBorderFormat(format: SpreadsheetCellBorderFormat): SpreadsheetCellBorderFormat | null;

package/dist/internal/features/work/editors/spreadsheet-command-catalog.d.ts

@@ -478,9 +478,18 @@ export declare const spreadsheetCommandCatalog: {
             readonly group: "font";
         };
     };
-    readonly borderDiagonal: {
-        readonly id: "font.borderDiagonal";
-        readonly label: "斜线框线";
+    readonly borderDiagonalDown: {
+        readonly id: "font.borderDiagonalDown";
+        readonly label: "斜下框线";
+        readonly location: {
+            readonly area: "ribbon";
+            readonly tab: "home";
+            readonly group: "font";
+        };
+    };
+    readonly borderDiagonalUp: {
+        readonly id: "font.borderDiagonalUp";
+        readonly label: "斜上框线";
         readonly location: {
             readonly area: "ribbon";
             readonly tab: "home";

package/dist/internal/features/work/work-spreadsheet-diagonal-border-canvas.d.ts

@@ -0,0 +1,12 @@
+export interface SpreadsheetDiagonalBorderBounds {
+    endX: number;
+    endY: number;
+    startX: number;
+    startY: number;
+}
+export interface SpreadsheetDiagonalCanvasLine {
+    color: string;
+    style: string;
+}
+export declare function drawSpreadsheetDiagonalDownBorder(context: CanvasRenderingContext2D, bounds: SpreadsheetDiagonalBorderBounds, line: SpreadsheetDiagonalCanvasLine): void;
+export declare function drawSpreadsheetDiagonalUpBorder(context: CanvasRenderingContext2D, bounds: SpreadsheetDiagonalBorderBounds, line: SpreadsheetDiagonalCanvasLine): void;

package/dist/internal/features/work/work-spreadsheet-diagonal-borders.d.ts

@@ -0,0 +1,13 @@
+export interface WorkSpreadsheetDiagonalBorderLine {
+    color: string;
+    style: string;
+}
+export interface WorkSpreadsheetDiagonalBorder {
+    down: boolean;
+    line: WorkSpreadsheetDiagonalBorderLine;
+    up: boolean;
+}
+type UnknownRecord = Record<string, unknown>;
+export declare function spreadsheetDiagonalBorderFromCellValue(value: unknown): WorkSpreadsheetDiagonalBorder | null | undefined;
+export declare function spreadsheetCellValueWithDiagonalBorder(value: UnknownRecord, border: WorkSpreadsheetDiagonalBorder | null): UnknownRecord;
+export {};

package/dist/styles.css

@@ -15513,7 +15513,7 @@ button.work-office-collaboration-participant:hover .work-office-collaboration-lo
   border-style: dashed;
 }
 
-.work-spreadsheet-border-glyph[data-border-target="none"]:before, .work-spreadsheet-border-glyph[data-border-target="diagonal"]:before {
+.work-spreadsheet-border-glyph[data-border-target="none"]:before, .work-spreadsheet-border-glyph[data-border-target="diagonal-up"]:before, .work-spreadsheet-border-glyph[data-border-target="diagonalUp"]:before {
   border-top: 1px solid;
   top: 7px;
   left: -1px;
@@ -15521,7 +15521,7 @@ button.work-office-collaboration-participant:hover .work-office-collaboration-lo
   transform: rotate(-45deg);
 }
 
-.work-spreadsheet-border-glyph[data-border-target="none"]:after {
+.work-spreadsheet-border-glyph[data-border-target="diagonal-down"]:before, .work-spreadsheet-border-glyph[data-border-target="diagonalDown"]:before, .work-spreadsheet-border-glyph[data-border-target="none"]:after {
   border-top: 1px solid;
   top: 7px;
   left: -1px;
@@ -16041,13 +16041,20 @@ button.work-office-collaboration-participant:hover .work-office-collaboration-lo
   border-right: 2px solid;
 }
 
-.work-spreadsheet-border-edge.diagonal > span:after {
+.work-spreadsheet-border-edge.diagonalDown > span:after, .work-spreadsheet-border-edge.diagonalUp > span:after {
   content: "";
   border-top: 2px solid;
   width: 20px;
   position: absolute;
   top: 8px;
   left: -2px;
+}
+
+.work-spreadsheet-border-edge.diagonalDown > span:after {
+  transform: rotate(45deg);
+}
+
+.work-spreadsheet-border-edge.diagonalUp > span:after {
   transform: rotate(-45deg);
 }
 
@@ -16068,8 +16075,15 @@ button.work-office-collaboration-participant:hover .work-office-collaboration-lo
   inset: 10px;
 }
 
-.work-spreadsheet-format-cells-border-preview > .diagonal {
+.work-spreadsheet-format-cells-border-preview > .diagonal-down, .work-spreadsheet-format-cells-border-preview > .diagonal-up {
   inset: 50% 5%;
+}
+
+.work-spreadsheet-format-cells-border-preview > .diagonal-down {
+  transform: rotate(26deg);
+}
+
+.work-spreadsheet-format-cells-border-preview > .diagonal-up {
   transform: rotate(-26deg);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a3s-lab/office",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Open-source collaborative browser editors for documents, Markdown, spreadsheets, presentations, and PDFs.",
   "keywords": [
     "office",
@@ -88,6 +88,7 @@
     "playground:typecheck": "tsc --noEmit -p playground/tsconfig.json",
     "playground:visual": "playwright test --config playwright.config.ts",
     "playground:visual:spreadsheet-data-validation": "playwright test visual-tests/spreadsheet-data-validation.functional.spec.ts --config playwright.config.ts",
+    "playground:visual:spreadsheet-diagonal-borders": "playwright test visual-tests/spreadsheet-diagonal-borders.functional.spec.ts --config playwright.config.ts",
     "playground:visual:spreadsheet-font-colors-shortcuts": "playwright test visual-tests/spreadsheet-font-colors-shortcuts.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",
@@ -157,6 +158,8 @@
     "test:e2e:spreadsheet-go-to:check": "a3s-test check tests/e2e/spreadsheet-go-to.acl --json",
     "test:e2e:spreadsheet-data-validation": "a3s-test run tests/e2e/spreadsheet-data-validation.acl --json",
     "test:e2e:spreadsheet-data-validation:check": "a3s-test check tests/e2e/spreadsheet-data-validation.acl --json",
+    "test:e2e:spreadsheet-diagonal-borders": "a3s-test run tests/e2e/spreadsheet-diagonal-borders.acl --json",
+    "test:e2e:spreadsheet-diagonal-borders:check": "a3s-test check tests/e2e/spreadsheet-diagonal-borders.acl --json",
     "test:e2e:spreadsheet-hyperlink": "a3s-test run tests/e2e/spreadsheet-hyperlink.acl --json",
     "test:e2e:spreadsheet-hyperlink:check": "a3s-test check tests/e2e/spreadsheet-hyperlink.acl --json",
     "test:e2e:spreadsheet-maximum-sparse": "a3s-test run tests/e2e/spreadsheet-maximum-sparse.acl --json",