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

Merge pull request #7867 from dataease/pr@dev@fix_remove_table_series_number_sort

Browse Source 
fix(视图-表格): 明细表/汇总表序号列去除排序
This commit is contained in:
wisonic-s 2024-01-28 19:06:41 +08:00 committed by GitHub
commit 09c88680d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,16 @@
import { TableSheet, S2Event, PivotSheet, DataCell, EXTRA_FIELD, TOTAL_VALUE, BaseTooltip, getAutoAdjustPosition,
import {
TableSheet,
S2Event,
PivotSheet,
DataCell,
EXTRA_FIELD,
TOTAL_VALUE,
BaseTooltip,
getAutoAdjustPosition,
getTooltipDefaultOptions,
setTooltipContainerStyle } from '@antv/s2'
setTooltipContainerStyle,
SERIES_NUMBER_FIELD
} from '@antv/s2'
import { getCustomTheme, getSize } from '@/views/chart/chart/common/common_table'
import { DEFAULT_COLOR_CASE, DEFAULT_TOTAL } from '@/views/chart/chart/chart'
import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
@ -165,6 +175,9 @@ export function baseTableInfo(s2, container, chart, action, tableData, pageInfo,
iconNames: ['GroupAsc', 'SortUp', 'SortDown'],
belongsCell: 'colCell',
displayCondition: (meta, iconName) => {
if (meta.field === SERIES_NUMBER_FIELD) {
return false
}
const sortMethodMap = meta.spreadsheet.store.get('sortMethodMap')
const sortType = sortMethodMap?.[meta.field]
if (sortType) {
@ -391,6 +404,9 @@ export function baseTableNormal(s2, container, chart, action, tableData, vueCom)
iconNames: ['GroupAsc', 'SortUp', 'SortDown'],
belongsCell: 'colCell',
displayCondition: (meta, iconName) => {
if (meta.field === SERIES_NUMBER_FIELD) {
return false
}
const sortMethodMap = meta.spreadsheet.store.get('sortMethodMap')
const sortType = sortMethodMap?.[meta.field]
if (sortType) {