Commit 6604ddba authored by zhanglw's avatar zhanglw

excel双版本

parent 306bfa28
...@@ -287,13 +287,9 @@ export default { ...@@ -287,13 +287,9 @@ export default {
// 合并单元格终止地址 // 合并单元格终止地址
mergeAddress.endAddress = sheet._merges[mergeRange].br; mergeAddress.endAddress = sheet._merges[mergeRange].br;
// Y轴方向跨度 // Y轴方向跨度
mergeAddress.YRange = mergeAddress.YRange = sheet._merges[mergeRange].model.bottom - sheet._merges[mergeRange].model.top;
sheet._merges[mergeRange].model.bottom -
sheet._merges[mergeRange].model.top;
// X轴方向跨度 // X轴方向跨度
mergeAddress.XRange = mergeAddress.XRange = sheet._merges[mergeRange].model.right - sheet._merges[mergeRange].model.left;
sheet._merges[mergeRange].model.right -
sheet._merges[mergeRange].model.left;
mergeAddressData.push(mergeAddress); mergeAddressData.push(mergeAddress);
} }
// 设置列宽 // 设置列宽
...@@ -302,8 +298,7 @@ export default { ...@@ -302,8 +298,7 @@ export default {
sheetData.cols[i.toString()] = {}; sheetData.cols[i.toString()] = {};
if (sheet.columns[i].width) { if (sheet.columns[i].width) {
// 读取宽度 // 读取宽度
sheetData.cols[i.toString()].width = sheetData.cols[i.toString()].width = sheet.columns[i].width * 8;
sheet.columns[i].width * 8;
} else { } else {
// 默认列宽 // 默认列宽
sheetData.cols[i.toString()].width = 100; sheetData.cols[i.toString()].width = 100;
......
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