github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(图表): 修复明细表自动换行，当高度不够放下一行时内容的最后字符显示为省略的问题。
Some checks are pending
Typos Check / Spell Check with Typos (push) Waiting to run
Details

Browse Source
This commit is contained in:
jianneng-fit2cloud 2024-12-16 23:04:51 +08:00 committed by jianneng-fit2cloud
parent 7f5e2174f4
commit 217ef62912
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
View File

@ -1647,7 +1647,7 @@ const drawTextShape = (cell, isHeader) => {
// 宽度能放几个字符，就放几个，放不下就换行
let wrapText = getWrapText(formattedValue ? formattedValue?.toString() : emptyPlaceholder, textStyle, cell.meta.width, cell.spreadsheet)
const lines = wrapText.split(lineBreak)
let extraStyleFontSize = textStyle.fontSize
// 不是表头，处理文本高度和换行
if (!isHeader) {
const textHeight = getWrapTextHeight(wrapText.replaceAll(lineBreak, ''), textStyle, cell.spreadsheet, maxLines)
@ -1655,8 +1655,8 @@ const drawTextShape = (cell, isHeader) => {
const wrapTextArr = lines.slice(0, lineCountInCell)
// 根据行数调整换行后的文本内容
wrapText = lineCountInCell === 1
? lines[0].slice(0, -1) + ellipsis
wrapText = lineCountInCell < 1
? ellipsis
: wrapTextArr.join(lineBreak) || ellipsis
const resultWrapArr = wrapText.split(lineBreak)
// 控制最大行数
@ -1668,6 +1668,9 @@ const drawTextShape = (cell, isHeader) => {
temp[temp.length - 1] = temp[temp.length-1].slice(0,firstLineStrNumber - 1) + ellipsis
wrapText = temp.join(lineBreak)
}
if (wrapText === ellipsis) {
extraStyleFontSize = 12
}
} else {
const resultWrapArr = wrapText.split(lineBreak)
// 控制最大行数
@ -1687,7 +1690,7 @@ const drawTextShape = (cell, isHeader) => {
// 获取文本位置并渲染文本
const position = cell.getTextPosition()
// 绘制文本
cell.textShape = renderText(cell, [cell.textShape], position.x, position.y, wrapText, textStyle)
cell.textShape = renderText(cell, [cell.textShape], position.x, position.y, wrapText, textStyle, {fontSize:extraStyleFontSize})
// 将文本形状添加到形状数组
cell.textShapes.push(cell.textShape)