center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #9797 from dataease/pr@dev@fix_custom_width_table_drill

Browse Source 
fix(视图): 修复自定义列宽时明细表和汇总表下钻异常 #9727
This commit is contained in:
wisonic-s 2024-05-23 15:00:00 +08:00 committed by GitHub
commit 6824cbc332
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/frontend/src/views/chart/chart/common/common_table.js
View File

@ -261,6 +261,16 @@ export function getSize(chart) {
p[n.fieldId] = n p[n.fieldId] = n
return p return p
}, {}) || {} }, {}) || {}
// 下钻字段使用入口字段的宽度
if (chart.drill) {
const xAxis = JSON.parse(chart.xaxis)
const curDrillField = chart.drillFields[chart.drillFilters.length]
const drillEnterFieldIndex = xAxis.findIndex(item => item.id === chart.drillFilters[0].fieldId)
const drillEnterField = xAxis[drillEnterFieldIndex]
fieldMap[curDrillField.dataeaseName] = {
width: fieldMap[drillEnterField.dataeaseName]?.width
}
}
size.colCfg.width = node => { size.colCfg.width = node => {
const width = node.spreadsheet.container.cfg.el.offsetWidth const width = node.spreadsheet.container.cfg.el.offsetWidth
if (!s.tableFieldWidth?.length) { if (!s.tableFieldWidth?.length) {

1
core/frontend/src/views/chart/chart/table/table-info.js
View File

@ -116,6 +116,7 @@ export function baseTableInfo(container, chart, action, tableData, pageInfo, vue
// 移除所有下钻字段，调整当前下钻字段到下钻入口位置 // 移除所有下钻字段，调整当前下钻字段到下钻入口位置
fields = fields.filter(item => !drillFilters.includes(item.id)) fields = fields.filter(item => !drillFilters.includes(item.id))
fields.splice(drillEnterFieldIndex, 0, curDrillField) fields.splice(drillEnterFieldIndex, 0, curDrillField)
nameMap[curDrillField.dataeaseName] = curDrillField
} }
fields.forEach(ele => { fields.forEach(ele => {
const f = nameMap[ele.dataeaseName] const f = nameMap[ele.dataeaseName]