dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7737 from ulleo/dev

Browse Source 
fix: 表格单元格提示显示不完整
This commit is contained in:
ulleo 2024-01-22 15:31:26 +08:00 committed by GitHub
commit ac86ae39f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,20 +1,9 @@
import { TableSheet, BaseEvent, S2Event, PivotSheet, DataCell, EXTRA_FIELD, TOTAL_VALUE } from '@antv/s2' import { TableSheet, S2Event, PivotSheet, DataCell, EXTRA_FIELD, TOTAL_VALUE } from '@antv/s2'
import { getCustomTheme, getSize } from '@/views/chart/chart/common/common_table' import { getCustomTheme, getSize } from '@/views/chart/chart/common/common_table'
import { DEFAULT_COLOR_CASE, DEFAULT_TOTAL } from '@/views/chart/chart/chart' import { DEFAULT_COLOR_CASE, DEFAULT_TOTAL } from '@/views/chart/chart/chart'
import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter' import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
import { handleTableEmptyStrategy, hexColorToRGBA } from '@/views/chart/chart/util' import { handleTableEmptyStrategy, hexColorToRGBA } from '@/views/chart/chart/util'
import { maxBy, minBy } from 'lodash' import { maxBy, minBy, find } from 'lodash-es'
class RowHoverInteraction extends BaseEvent {
bindEvents() {
this.spreadsheet.on(S2Event.ROW_CELL_HOVER, (event) => {
this.spreadsheet.tooltip.show({
position: { x: 0, y: 0 },
content: '...'
})
})
}
}
export function baseTableInfo(s2, container, chart, action, tableData, pageInfo) { export function baseTableInfo(s2, container, chart, action, tableData, pageInfo) {
const containerDom = document.getElementById(container) const containerDom = document.getElementById(container)
@ -152,7 +141,7 @@ export function baseTableInfo(s2, container, chart, action, tableData, pageInfo)
s2.on(S2Event.COL_CELL_HOVER, event => showTooltip(s2, event)) s2.on(S2Event.COL_CELL_HOVER, event => showTooltip(s2, event))
} }
if (size.tableCellTooltip?.show) { if (size.tableCellTooltip?.show) {
s2.on(S2Event.DATA_CELL_HOVER, event => showTooltipValue(s2, event)) s2.on(S2Event.DATA_CELL_HOVER, event => showTooltipValue(s2, event, meta))
} }
// theme // theme
const customTheme = getCustomTheme(chart) const customTheme = getCustomTheme(chart)
@ -343,7 +332,7 @@ export function baseTableNormal(s2, container, chart, action, tableData) {
s2.on(S2Event.COL_CELL_HOVER, event => showTooltip(s2, event)) s2.on(S2Event.COL_CELL_HOVER, event => showTooltip(s2, event))
} }
if (size.tableCellTooltip?.show) { if (size.tableCellTooltip?.show) {
s2.on(S2Event.DATA_CELL_HOVER, event => showTooltipValue(s2, event)) s2.on(S2Event.DATA_CELL_HOVER, event => showTooltipValue(s2, event, meta))
} }
// theme // theme
const customTheme = getCustomTheme(chart) const customTheme = getCustomTheme(chart)
@ -562,7 +551,7 @@ export function baseTablePivot(s2, container, chart, action, headerAction, table
s2.on(S2Event.COL_CELL_HOVER, event => showTooltip(s2, event, fieldMap)) s2.on(S2Event.COL_CELL_HOVER, event => showTooltip(s2, event, fieldMap))
} }
if (size.tableCellTooltip?.show) { if (size.tableCellTooltip?.show) {
s2.on(S2Event.DATA_CELL_HOVER, event => showTooltipValue(s2, event)) s2.on(S2Event.DATA_CELL_HOVER, event => showTooltipValue(s2, event, meta))
} }
// theme // theme
const customTheme = getCustomTheme(chart) const customTheme = getCustomTheme(chart)
@ -821,9 +810,14 @@ function mappingColor(value, defaultColor, field, type, filedValueMap, rowData)
return color return color
} }
function showTooltipValue(s2Instance, event) { function showTooltipValue(s2Instance, event, meta) {
const cell = s2Instance.getCell(event.target) const cell = s2Instance.getCell(event.target)
const content = cell.actualText const valueField = cell.getMeta().valueField
const value = cell.getMeta().data[valueField]
const metaObj = find(meta, m =>
m.field === valueField
)
const content = metaObj.formatter(value)
s2Instance.showTooltip({ s2Instance.showTooltip({
position: { position: {
x: event.clientX, x: event.clientX,