Commit 72bd3330 authored by zhanglw's avatar zhanglw

excel编辑器bug修复

parent 5d2990f5
...@@ -578,7 +578,7 @@ export default { ...@@ -578,7 +578,7 @@ export default {
const exceljsCell = exceljsRow.getCell(Number(k) + 1); const exceljsCell = exceljsRow.getCell(Number(k) + 1);
exceljsCell.value = row.cells[k].text; exceljsCell.value = row.cells[k].text;
// 对齐 // 对齐
if (xws.styles[row.cells[k].style]) { if (row.cells[k].style && xws.styles[row.cells[k].style]) {
// 垂直对齐方式 // 垂直对齐方式
if (xws.styles[row.cells[k].style].valign) { if (xws.styles[row.cells[k].style].valign) {
if (exceljsCell.alignment == undefined || exceljsCell.alignment == null) { if (exceljsCell.alignment == undefined || exceljsCell.alignment == null) {
...@@ -595,7 +595,7 @@ export default { ...@@ -595,7 +595,7 @@ export default {
} }
} }
// 边框 // 边框
if (JSON.stringify(xws.styles[row.cells[k].style]) !== "{}" && JSON.stringify(xws.styles[row.cells[k].style].border) !== "{}") { if (row.cells[k].style && JSON.stringify(xws.styles[row.cells[k].style]) !== "{}" && xws.styles[row.cells[k].style].border && JSON.stringify(xws.styles[row.cells[k].style].border) !== "{}") {
exceljsCell.border = {}; exceljsCell.border = {};
// bottom // bottom
if (xws.styles[row.cells[k].style].border.bottom && Array.isArray(xws.styles[row.cells[k].style].border.bottom) && xws.styles[row.cells[k].style].border.bottom.length === 2) { if (xws.styles[row.cells[k].style].border.bottom && Array.isArray(xws.styles[row.cells[k].style].border.bottom) && xws.styles[row.cells[k].style].border.bottom.length === 2) {
...@@ -627,7 +627,7 @@ export default { ...@@ -627,7 +627,7 @@ export default {
} }
} }
// 背景色 // 背景色
if (xws.styles[row.cells[k].style].bgcolor) { if (row.cells[k].style && xws.styles[row.cells[k].style].bgcolor) {
let rgb = tinycolor(xws.styles[row.cells[k].style].bgcolor).toRgb(); let rgb = tinycolor(xws.styles[row.cells[k].style].bgcolor).toRgb();
let rHex = parseInt(rgb.r).toString(16).padStart(2, "0"); let rHex = parseInt(rgb.r).toString(16).padStart(2, "0");
let gHex = parseInt(rgb.g).toString(16).padStart(2, "0"); let gHex = parseInt(rgb.g).toString(16).padStart(2, "0");
...@@ -642,9 +642,11 @@ export default { ...@@ -642,9 +642,11 @@ export default {
}; };
} }
// 字体 // 字体
exceljsCell.font = xws.styles[row.cells[k].style].font; if (row.cells[k].style) {
exceljsCell.font = xws.styles[row.cells[k].style].font || {};
}
// 字体颜色 // 字体颜色
if (xws.styles[row.cells[k].style].color) { if (row.cells[k].style && xws.styles[row.cells[k].style].color) {
let rgb = tinycolor(xws.styles[row.cells[k].style].color).toRgb(); let rgb = tinycolor(xws.styles[row.cells[k].style].color).toRgb();
let rHex = parseInt(rgb.r).toString(16).padStart(2, "0"); let rHex = parseInt(rgb.r).toString(16).padStart(2, "0");
let gHex = parseInt(rgb.g).toString(16).padStart(2, "0"); let gHex = parseInt(rgb.g).toString(16).padStart(2, "0");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment