diff --git a/src/global/api.js b/src/global/api.js index 49580e6..a8691ee 100644 --- a/src/global/api.js +++ b/src/global/api.js @@ -73,12 +73,22 @@ export function getCellValue(row, column, options = {}) { else if(type == "f") { return_v = cellData["v"]; } - else if(cellData && cellData.ct && cellData.ct.fa == 'yyyy-MM-dd') { - return_v = cellData.m; + else if(cellData && cellData.ct ) { + if (cellData.ct.fa == 'yyyy-MM-dd') { + return_v = cellData.m; + } + // 修复当单元格内有换行获取不到值的问题 + else if (cellData.ct.hasOwnProperty("t") && cellData.ct.t === 'inlineStr') { + let inlineStrValueArr = cellData.ct.s; + if (inlineStrValueArr) { + return_v = inlineStrValueArr.map(i => i.v).join("") + } + } } + } - if(return_v == undefined){ + if(return_v == undefined ){ return_v = null; } @@ -636,7 +646,7 @@ export function frozenFirstRow(order) { top ]; } - + luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null); if (luckysheetFreezen.freezenverticaldata != null) {