public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-17 21:08:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(图表): 修复表格自适应模式出现横向滚动条

Browse Source
This commit is contained in:
wisonic-s
2025-09-03 16:21:47 +08:00
committed by wisonic-s
parent edb995bd1c
commit 8eda251154
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts
View File

@@ -181,7 +181,7 @@ export class TableInfo extends S2ChartView<TableSheet> {
// options
const s2Options: S2Options = {
width: containerDom.offsetWidth,
width: containerDom.getBoundingClientRect().width,
height: containerDom.offsetHeight,
seriesNumber: {
enable: tableHeader.showIndex,
@@ -297,7 +297,7 @@ export class TableInfo extends S2ChartView<TableSheet> {
const totalWidthWithImg = ev.colLeafNodes.reduce((p, n) => {
return p + (urlFields.includes(n.field) ? 120 : n.width)
}, 0)
const containerWidth = containerDom.offsetWidth
const containerWidth = containerDom.getBoundingClientRect().width - 1
if (containerWidth <= totalWidthWithImg) {
// 图库计算的布局宽度已经大于等于容器宽度，不需要再扩大，但是需要处理非整数宽度值，不然会出现透明细线
ev.colLeafNodes.reduce((p, n) => {
@@ -325,11 +325,11 @@ export class TableInfo extends S2ChartView<TableSheet> {
n.x = getStartPosition(n)
}
})
const lastNode = ev.colLeafNodes[ev.colLeafNodes.length - 1]
if (totalWidth > containerWidth) {
const lastNode = ev.colLeafNodes[ev.colLeafNodes.length - 1]
lastNode.width = Math.floor(lastNode.width - (totalWidth - containerWidth))
}
ev.colsHierarchy.width = containerWidth - 2
ev.colsHierarchy.width = lastNode.x + lastNode.width
})
}
// 空数据时表格样式

10
core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts
View File

@@ -140,7 +140,7 @@ export class TableNormal extends S2ChartView<TableSheet> {
const { basicStyle, tableCell, tableHeader, tooltip } = parseJson(chart.customAttr)
// options
const s2Options: S2Options = {
width: containerDom.offsetWidth,
width: containerDom.getBoundingClientRect().width,
height: containerDom.offsetHeight,
seriesNumber: {
enable: tableHeader.showIndex,
@@ -216,7 +216,7 @@ export class TableNormal extends S2ChartView<TableSheet> {
newChart.store.set('lastLayoutResult', undefined)
return
}
const containerWidth = containerDom.offsetWidth
const containerWidth = containerDom.getBoundingClientRect().width - 1
const scale = containerWidth / ev.colsHierarchy.width
if (scale <= 1) {
// 图库计算的布局宽度已经大于等于容器宽度，不需要再扩大，但是需要处理非整数宽度值，不然会出现透明细线
@@ -232,12 +232,12 @@ export class TableNormal extends S2ChartView<TableSheet> {
n.x = p
return p + n.width
}, 0)
// 从最后一列减掉
const lastNode = ev.colLeafNodes[ev.colLeafNodes.length - 1]
if (totalWidth > containerWidth) {
// 从最后一列减掉
const lastNode = ev.colLeafNodes[ev.colLeafNodes.length - 1]
lastNode.width = Math.floor(lastNode.width - (totalWidth - containerWidth))
}
ev.colsHierarchy.width = containerWidth - 1
ev.colsHierarchy.width = lastNode.x + lastNode.width
})
}
configEmptyDataStyle(newChart, basicStyle, newData, container)