Preserve QExcell text wrapping
This commit is contained in:
@@ -133,6 +133,28 @@ describe("excellOffice OOXML helpers", () => {
|
||||
expect(stylesXml).toContain('<name val="Arial"/>');
|
||||
});
|
||||
|
||||
it("записывает перенос текста ячейки XLSX в styles.xml", async () => {
|
||||
const blob = await exportXlsxBlob({
|
||||
id: "workbook",
|
||||
title: "Wrap.xlsx",
|
||||
updatedAt: "2026-06-01T00:00:00.000Z",
|
||||
activeSheet: "sheet-1",
|
||||
sheets: [
|
||||
{
|
||||
id: "sheet-1",
|
||||
name: "Sheet 1",
|
||||
cells: { A1: "Long text" },
|
||||
cellFormats: { A1: { wrapText: true } }
|
||||
}
|
||||
]
|
||||
});
|
||||
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('wrapText="1"');
|
||||
});
|
||||
|
||||
it("читает базовое форматирование ячеек XLSX из styles.xml и XML листа", () => {
|
||||
const styleTable = xlsxStylesXmlToCellFormatTable({
|
||||
styleSheet: {
|
||||
@@ -148,7 +170,7 @@ describe("excellOffice OOXML helpers", () => {
|
||||
cellXfs: {
|
||||
xf: [
|
||||
{ fontId: "0", fillId: "0" },
|
||||
{ fontId: "1", fillId: "2", numFmtId: "164", alignment: { horizontal: "center" } },
|
||||
{ fontId: "1", fillId: "2", numFmtId: "164", alignment: { horizontal: "center", wrapText: "1" } },
|
||||
{ fontId: "0", fillId: "0", numFmtId: "14" }
|
||||
]
|
||||
}
|
||||
@@ -165,6 +187,7 @@ describe("excellOffice OOXML helpers", () => {
|
||||
textColor: "0F5FAE",
|
||||
fillColor: "FFF2CC",
|
||||
horizontalAlign: "center",
|
||||
wrapText: true,
|
||||
numberFormat: "dd.mm.yyyy"
|
||||
});
|
||||
expect(styleTable[2]).toEqual({ numberFormat: "m/d/yy" });
|
||||
@@ -193,6 +216,7 @@ describe("excellOffice OOXML helpers", () => {
|
||||
textColor: "0F5FAE",
|
||||
fillColor: "FFF2CC",
|
||||
horizontalAlign: "center",
|
||||
wrapText: true,
|
||||
numberFormat: "dd.mm.yyyy"
|
||||
}
|
||||
});
|
||||
@@ -394,7 +418,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" },
|
||||
A1: { bold: true, strike: true, fontSize: 14, fontFamily: "Arial", textColor: "0F5FAE", fillColor: "FFF2CC", horizontalAlign: "center", wrapText: true },
|
||||
AC20: { underline: true },
|
||||
D20: { numberFormat: "dd.mm.yyyy" },
|
||||
E20: { numberFormat: "0%" }
|
||||
@@ -428,7 +452,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" },
|
||||
A1: { bold: true, strike: true, fontSize: 14, fontFamily: "Arial", textColor: "0F5FAE", fillColor: "FFF2CC", horizontalAlign: "center", wrapText: true },
|
||||
AC20: { underline: true },
|
||||
D20: { numberFormat: "dd.mm.yyyy" },
|
||||
E20: { numberFormat: "0%" }
|
||||
|
||||
+25
-5
@@ -850,8 +850,16 @@ export function xlsxStylesXmlToCellFormatTable(stylesXml?: unknown): Array<CellF
|
||||
const fontFormat = fonts[numberAttribute(record.fontId)];
|
||||
const fillFormat = fills[numberAttribute(record.fillId)];
|
||||
const numberFormat = normalizedNumberFormat(numberFormats[numberAttribute(record.numFmtId)]);
|
||||
const horizontalAlign = normalizedHorizontalAlign(String(childRecord(record, "alignment").horizontal || ""));
|
||||
return normalizedCellFormat({ ...fontFormat, ...fillFormat, ...(horizontalAlign ? { horizontalAlign } : {}), ...(numberFormat ? { numberFormat } : {}) }) ?? undefined;
|
||||
const alignment = childRecord(record, "alignment");
|
||||
const horizontalAlign = normalizedHorizontalAlign(String(alignment.horizontal || ""));
|
||||
const wrapText = booleanAttribute(alignment.wrapText);
|
||||
return normalizedCellFormat({
|
||||
...fontFormat,
|
||||
...fillFormat,
|
||||
...(horizontalAlign ? { horizontalAlign } : {}),
|
||||
...(wrapText ? { wrapText: true } : {}),
|
||||
...(numberFormat ? { numberFormat } : {})
|
||||
}) ?? undefined;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -894,9 +902,15 @@ function buildStylesXml(styleRegistry = createCellStyleRegistry([])) {
|
||||
|
||||
const applyFont = fontId > 0 ? ' applyFont="1"' : "";
|
||||
const applyFill = fillId > 0 ? ' applyFill="1"' : "";
|
||||
const applyAlignment = format.horizontalAlign ? ' applyAlignment="1"' : "";
|
||||
const applyAlignment = format.horizontalAlign || format.wrapText ? ' applyAlignment="1"' : "";
|
||||
const applyNumberFormat = numFmtId > 0 ? ' applyNumberFormat="1"' : "";
|
||||
const alignmentXml = format.horizontalAlign ? `<alignment horizontal="${format.horizontalAlign}"/>` : "";
|
||||
const alignmentAttributes = [
|
||||
format.horizontalAlign ? `horizontal="${format.horizontalAlign}"` : "",
|
||||
format.wrapText ? 'wrapText="1"' : ""
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(" ");
|
||||
const alignmentXml = alignmentAttributes ? `<alignment ${alignmentAttributes}/>` : "";
|
||||
return `<xf numFmtId="${numFmtId}" fontId="${fontId}" fillId="${fillId}" borderId="0" xfId="0"${applyFont}${applyFill}${applyAlignment}${applyNumberFormat}>${alignmentXml}</xf>`;
|
||||
});
|
||||
|
||||
@@ -936,7 +950,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.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.wrapText ? "1" : "0"}|${normalized.numberFormat ?? ""}`;
|
||||
}
|
||||
|
||||
function fontStyleKey(format: CellFormat) {
|
||||
@@ -962,6 +976,7 @@ function normalizedCellFormat(format: CellFormat | undefined): CellFormat | null
|
||||
...(textColor ? { textColor } : {}),
|
||||
...(fillColor ? { fillColor } : {}),
|
||||
...(horizontalAlign ? { horizontalAlign } : {}),
|
||||
...(format?.wrapText ? { wrapText: true } : {}),
|
||||
...(numberFormat ? { numberFormat } : {})
|
||||
};
|
||||
|
||||
@@ -1034,6 +1049,11 @@ function normalizedHorizontalAlign(value?: string) {
|
||||
return normalized === "left" || normalized === "center" || normalized === "right" ? normalized : "";
|
||||
}
|
||||
|
||||
function booleanAttribute(value: unknown) {
|
||||
const normalized = String(value ?? "").trim().toLowerCase();
|
||||
return normalized === "1" || normalized === "true";
|
||||
}
|
||||
|
||||
function normalizedNumberFormat(value?: string) {
|
||||
const raw = value?.trim() ?? "";
|
||||
if (!raw || raw.toLowerCase() === "general") {
|
||||
|
||||
Reference in New Issue
Block a user