|
|
@ -64,6 +64,8 @@ export function getCellValue(row, column, options = {}) { |
|
|
|
let cellData = targetSheetData[row][column]; |
|
|
|
let return_v; |
|
|
|
|
|
|
|
debugger |
|
|
|
|
|
|
|
if(getObjType(cellData) == "object"){ |
|
|
|
return_v = cellData[type]; |
|
|
|
|
|
|
@ -76,9 +78,17 @@ export function getCellValue(row, column, options = {}) { |
|
|
|
else if(cellData && cellData.ct && cellData.ct.fa == 'yyyy-MM-dd') { |
|
|
|
return_v = cellData.m; |
|
|
|
} |
|
|
|
// 修复当单元格内有换行获取不到值的问题
|
|
|
|
else if (cellData && 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) { |
|
|
|