Preserve QExcell vertical alignment
This commit is contained in:
@@ -155,6 +155,28 @@ describe("excellOffice OOXML helpers", () => {
|
||||
expect(stylesXml).toContain('wrapText="1"');
|
||||
});
|
||||
|
||||
it("записывает вертикальное выравнивание ячейки XLSX в styles.xml", async () => {
|
||||
const blob = await exportXlsxBlob({
|
||||
id: "workbook",
|
||||
title: "VerticalAlign.xlsx",
|
||||
updatedAt: "2026-06-01T00:00:00.000Z",
|
||||
activeSheet: "sheet-1",
|
||||
sheets: [
|
||||
{
|
||||
id: "sheet-1",
|
||||
name: "Sheet 1",
|
||||
cells: { A1: "Centered" },
|
||||
cellFormats: { A1: { verticalAlign: "middle" } }
|
||||
}
|
||||
]
|
||||
});
|
||||
const zip = await JSZip.loadAsync(await blob.arrayBuffer());
|
||||
const stylesXml = await zip.file("xl/styles.xml")?.async("string");
|
||||
|
||||
expect(stylesXml).toContain('applyAlignment="1"');
|
||||
expect(stylesXml).toContain('vertical="center"');
|
||||
});
|
||||
|
||||
it("читает базовое форматирование ячеек XLSX из styles.xml и XML листа", () => {
|
||||
const styleTable = xlsxStylesXmlToCellFormatTable({
|
||||
styleSheet: {
|
||||
@@ -170,7 +192,7 @@ describe("excellOffice OOXML helpers", () => {
|
||||
cellXfs: {
|
||||
xf: [
|
||||
{ fontId: "0", fillId: "0" },
|
||||
{ fontId: "1", fillId: "2", numFmtId: "164", alignment: { horizontal: "center", wrapText: "1" } },
|
||||
{ fontId: "1", fillId: "2", numFmtId: "164", alignment: { horizontal: "center", vertical: "center", wrapText: "1" } },
|
||||
{ fontId: "0", fillId: "0", numFmtId: "14" }
|
||||
]
|
||||
}
|
||||
@@ -187,6 +209,7 @@ describe("excellOffice OOXML helpers", () => {
|
||||
textColor: "0F5FAE",
|
||||
fillColor: "FFF2CC",
|
||||
horizontalAlign: "center",
|
||||
verticalAlign: "middle",
|
||||
wrapText: true,
|
||||
numberFormat: "dd.mm.yyyy"
|
||||
});
|
||||
@@ -216,6 +239,7 @@ describe("excellOffice OOXML helpers", () => {
|
||||
textColor: "0F5FAE",
|
||||
fillColor: "FFF2CC",
|
||||
horizontalAlign: "center",
|
||||
verticalAlign: "middle",
|
||||
wrapText: true,
|
||||
numberFormat: "dd.mm.yyyy"
|
||||
}
|
||||
@@ -418,7 +442,7 @@ describe("excellOffice OOXML helpers", () => {
|
||||
mergedCells: [{ start: "A1", end: "C1" }],
|
||||
hyperlinks: { A1: "https://example.com/budget" },
|
||||
cellFormats: {
|
||||
A1: { bold: true, strike: true, fontSize: 14, fontFamily: "Arial", textColor: "0F5FAE", fillColor: "FFF2CC", horizontalAlign: "center", wrapText: true },
|
||||
A1: { bold: true, strike: true, fontSize: 14, fontFamily: "Arial", textColor: "0F5FAE", fillColor: "FFF2CC", horizontalAlign: "center", verticalAlign: "middle", wrapText: true },
|
||||
AC20: { underline: true },
|
||||
D20: { numberFormat: "dd.mm.yyyy" },
|
||||
E20: { numberFormat: "0%" }
|
||||
@@ -452,7 +476,7 @@ describe("excellOffice OOXML helpers", () => {
|
||||
expect(imported.sheets[0].mergedCells).toEqual([{ start: "A1", end: "C1" }]);
|
||||
expect(imported.sheets[0].hyperlinks).toEqual({ A1: "https://example.com/budget" });
|
||||
expect(imported.sheets[0].cellFormats).toEqual({
|
||||
A1: { bold: true, strike: true, fontSize: 14, fontFamily: "Arial", textColor: "0F5FAE", fillColor: "FFF2CC", horizontalAlign: "center", wrapText: true },
|
||||
A1: { bold: true, strike: true, fontSize: 14, fontFamily: "Arial", textColor: "0F5FAE", fillColor: "FFF2CC", horizontalAlign: "center", verticalAlign: "middle", wrapText: true },
|
||||
AC20: { underline: true },
|
||||
D20: { numberFormat: "dd.mm.yyyy" },
|
||||
E20: { numberFormat: "0%" }
|
||||
|
||||
+20
-2
@@ -852,11 +852,13 @@ export function xlsxStylesXmlToCellFormatTable(stylesXml?: unknown): Array<CellF
|
||||
const numberFormat = normalizedNumberFormat(numberFormats[numberAttribute(record.numFmtId)]);
|
||||
const alignment = childRecord(record, "alignment");
|
||||
const horizontalAlign = normalizedHorizontalAlign(String(alignment.horizontal || ""));
|
||||
const verticalAlign = normalizedVerticalAlign(String(alignment.vertical || ""));
|
||||
const wrapText = booleanAttribute(alignment.wrapText);
|
||||
return normalizedCellFormat({
|
||||
...fontFormat,
|
||||
...fillFormat,
|
||||
...(horizontalAlign ? { horizontalAlign } : {}),
|
||||
...(verticalAlign ? { verticalAlign } : {}),
|
||||
...(wrapText ? { wrapText: true } : {}),
|
||||
...(numberFormat ? { numberFormat } : {})
|
||||
}) ?? undefined;
|
||||
@@ -902,10 +904,11 @@ function buildStylesXml(styleRegistry = createCellStyleRegistry([])) {
|
||||
|
||||
const applyFont = fontId > 0 ? ' applyFont="1"' : "";
|
||||
const applyFill = fillId > 0 ? ' applyFill="1"' : "";
|
||||
const applyAlignment = format.horizontalAlign || format.wrapText ? ' applyAlignment="1"' : "";
|
||||
const applyAlignment = format.horizontalAlign || format.verticalAlign || format.wrapText ? ' applyAlignment="1"' : "";
|
||||
const applyNumberFormat = numFmtId > 0 ? ' applyNumberFormat="1"' : "";
|
||||
const alignmentAttributes = [
|
||||
format.horizontalAlign ? `horizontal="${format.horizontalAlign}"` : "",
|
||||
format.verticalAlign ? `vertical="${xlsxVerticalAlignValue(format.verticalAlign)}"` : "",
|
||||
format.wrapText ? 'wrapText="1"' : ""
|
||||
]
|
||||
.filter(Boolean)
|
||||
@@ -950,7 +953,7 @@ function cellFormatKey(format: CellFormat | undefined) {
|
||||
return "";
|
||||
}
|
||||
|
||||
return `${normalized.bold ? "1" : "0"}|${normalized.italics ? "1" : "0"}|${normalized.underline ? "1" : "0"}|${normalized.strike ? "1" : "0"}|${normalized.fontSize ?? ""}|${normalized.fontFamily ?? ""}|${normalized.textColor ?? ""}|${normalized.fillColor ?? ""}|${normalized.horizontalAlign ?? ""}|${normalized.wrapText ? "1" : "0"}|${normalized.numberFormat ?? ""}`;
|
||||
return `${normalized.bold ? "1" : "0"}|${normalized.italics ? "1" : "0"}|${normalized.underline ? "1" : "0"}|${normalized.strike ? "1" : "0"}|${normalized.fontSize ?? ""}|${normalized.fontFamily ?? ""}|${normalized.textColor ?? ""}|${normalized.fillColor ?? ""}|${normalized.horizontalAlign ?? ""}|${normalized.verticalAlign ?? ""}|${normalized.wrapText ? "1" : "0"}|${normalized.numberFormat ?? ""}`;
|
||||
}
|
||||
|
||||
function fontStyleKey(format: CellFormat) {
|
||||
@@ -963,6 +966,7 @@ function normalizedCellFormat(format: CellFormat | undefined): CellFormat | null
|
||||
const textColor = normalizeFillColor(format?.textColor);
|
||||
const fillColor = normalizeFillColor(format?.fillColor);
|
||||
const horizontalAlign = normalizedHorizontalAlign(format?.horizontalAlign);
|
||||
const verticalAlign = normalizedVerticalAlign(format?.verticalAlign);
|
||||
const numberFormat = normalizedNumberFormat(format?.numberFormat);
|
||||
const fontSize = normalizedFontSize(format?.fontSize);
|
||||
const fontFamily = normalizedFontFamily(format?.fontFamily);
|
||||
@@ -976,6 +980,7 @@ function normalizedCellFormat(format: CellFormat | undefined): CellFormat | null
|
||||
...(textColor ? { textColor } : {}),
|
||||
...(fillColor ? { fillColor } : {}),
|
||||
...(horizontalAlign ? { horizontalAlign } : {}),
|
||||
...(verticalAlign ? { verticalAlign } : {}),
|
||||
...(format?.wrapText ? { wrapText: true } : {}),
|
||||
...(numberFormat ? { numberFormat } : {})
|
||||
};
|
||||
@@ -1049,6 +1054,19 @@ function normalizedHorizontalAlign(value?: string) {
|
||||
return normalized === "left" || normalized === "center" || normalized === "right" ? normalized : "";
|
||||
}
|
||||
|
||||
function normalizedVerticalAlign(value?: string) {
|
||||
const normalized = value?.trim().toLowerCase() ?? "";
|
||||
if (normalized === "center" || normalized === "middle") {
|
||||
return "middle";
|
||||
}
|
||||
|
||||
return normalized === "top" || normalized === "bottom" ? normalized : "";
|
||||
}
|
||||
|
||||
function xlsxVerticalAlignValue(value: CellFormat["verticalAlign"]) {
|
||||
return value === "middle" ? "center" : value;
|
||||
}
|
||||
|
||||
function booleanAttribute(value: unknown) {
|
||||
const normalized = String(value ?? "").trim().toLowerCase();
|
||||
return normalized === "1" || normalized === "true";
|
||||
|
||||
Reference in New Issue
Block a user