diff --git a/frontend/src/views/chart/chart/bar/bar_antv.js b/frontend/src/views/chart/chart/bar/bar_antv.js index e5fdeeddf6..3305a64e0e 100644 --- a/frontend/src/views/chart/chart/bar/bar_antv.js +++ b/frontend/src/views/chart/chart/bar/bar_antv.js @@ -9,7 +9,8 @@ import { getPadding, getSlider, getAnalyse, - setGradientColor + setGradientColor, + getMeta } from '@/views/chart/chart/common/common_antv' import { antVCustomColor, handleEmptyDataStrategy } from '@/views/chart/chart/util' import _ from 'lodash' @@ -319,6 +320,11 @@ export function baseBidirectionalBarOptionAntV(plot, container, chart, action, i handleEmptyDataStrategy(emptyDataStrategy, chart, data, options) } + // meta,处理类别轴数据类型为时间时排序失效 + const meta = getMeta(chart) + if (meta) { + options.meta = meta + } // 开始渲染 if (plot) { plot.destroy() diff --git a/frontend/src/views/chart/chart/common/common_antv.js b/frontend/src/views/chart/chart/common/common_antv.js index b8f34903dc..243971e98c 100644 --- a/frontend/src/views/chart/chart/common/common_antv.js +++ b/frontend/src/views/chart/chart/common/common_antv.js @@ -966,3 +966,20 @@ export function setGradientColor(rawColor, show = false, angle = 0) { item.splice(3, 1, '0.3)') return show ? `l(${angle}) 0:${item.join(',')} 1:${rawColor}` : rawColor } + +export function getMeta(chart) { + let meta + if (chart.type === 'bidirectional-bar') { + const xAxis = JSON.parse(chart.xaxis) + if (xAxis?.length === 1 && xAxis[0].deType === 1) { + const values = chart.data.data.map(item => item.field) + meta = { + field: { + type: 'cat', + values: values.reverse() + } + } + } + } + return meta +} diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index 08324858de..dfd14592a0 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -1582,7 +1582,6 @@ export const TYPE_CONFIGS = [ 'x-axis-selector-ant-v': [ 'show', 'position', - 'name', 'nameTextStyle', 'splitLine', 'axisForm', diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 96ce9b2d6c..fcc9ba3828 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -983,12 +983,7 @@ @@ -1990,6 +1985,13 @@ export default { equalsAny(this.view.type, 'text', 'label') || (this.view.render === 'antv' && this.view.type.includes('table')) }, + showDrill() { + return this.view.type && + !(this.view.type.includes('table') && this.view.render === 'echarts') && + !includesAny(this.view.type, 'text', 'gauge') && + !equalsAny(this.view.type, 'liquid', 'bidirectional-bar', + 'word-cloud', 'table-pivot', 'label', 'richTextView', 'flow-map') + }, ...mapState([ 'curComponent', 'panelViewEditInfo',