Browse Source
Merge pull request #678 from flowerField/master
fix bug#671 换行后内容显示缺失
master
文顶顶
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
10 deletions
-
src/global/getRowlen.js
|
|
@ -377,7 +377,6 @@ function getCellTextInfo(cell , ctx, option){ |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
similarIndex++; |
|
|
similarIndex++; |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
isInline = true; |
|
|
isInline = true; |
|
|
} |
|
|
} |
|
|
@ -404,14 +403,6 @@ function getCellTextInfo(cell , ctx, option){ |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// let measureText = getMeasureText(value, ctx);
|
|
|
|
|
|
// //luckysheetTableContent.measureText(value);
|
|
|
|
|
|
// let textWidth = measureText.width;
|
|
|
|
|
|
// let textHeight = measureText.actualBoundingBoxDescent + measureText.actualBoundingBoxAscent;
|
|
|
|
|
|
|
|
|
|
|
|
if(tr=="3"){//vertical text
|
|
|
if(tr=="3"){//vertical text
|
|
|
ctx.textBaseline = 'top'; |
|
|
ctx.textBaseline = 'top'; |
|
|
|
|
|
|
|
|
@ -920,7 +911,7 @@ function getCellTextInfo(cell , ctx, option){ |
|
|
if(preMeasureText!=null){ |
|
|
if(preMeasureText!=null){ |
|
|
spaceOrTwoByte = { |
|
|
spaceOrTwoByte = { |
|
|
index:i, |
|
|
index:i, |
|
|
str:preStr, |
|
|
str:preStr + lastWord, |
|
|
width:preTextWidth, |
|
|
width:preTextWidth, |
|
|
height:preTextHeight, |
|
|
height:preTextHeight, |
|
|
asc:preMeasureText.actualBoundingBoxAscent, |
|
|
asc:preMeasureText.actualBoundingBoxAscent, |
|
|
|
