github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat: 轴值格式化

Browse Source
This commit is contained in:
junjun 2022-06-08 12:03:52 +08:00
parent da6a29fe04
commit c68da406df
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
frontend/src/views/chart/chart/common/common.js
View File

@ -1,5 +1,10 @@
import { hexColorToRGBA } from '@/views/chart/chart/util'
import { DEFAULT_YAXIS_EXT_STYLE } from '@/views/chart/chart/chart'
import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
let xAxisLabelFormatter = null
let yAxisLabelFormatter = null
let yExtAxisLabelFormatter = null
export function componentStyle(chart_option, chart) {
const padding = '8px'
@ -80,6 +85,8 @@ export function componentStyle(chart_option, chart) {
customStyle.xAxis.axisValue.max && (chart_option.xAxis.max = parseFloat(customStyle.xAxis.axisValue.max))
customStyle.xAxis.axisValue.split && (chart_option.xAxis.interval = parseFloat(customStyle.xAxis.axisValue.split))
}
xAxisLabelFormatter = customStyle.xAxis.axisLabelFormatter
chart_option.xAxis.axisLabel.formatter = xFormatter
}
}
if (customStyle.yAxis && (chart.type.includes('bar') || chart.type.includes('line') || chart.type.includes('scatter'))) {
@ -107,6 +114,8 @@ export function componentStyle(chart_option, chart) {
customStyle.yAxis.axisValue.max && (chart_option.yAxis.max = parseFloat(customStyle.yAxis.axisValue.max))
customStyle.yAxis.axisValue.split && (chart_option.yAxis.interval = parseFloat(customStyle.yAxis.axisValue.split))
}
yAxisLabelFormatter = customStyle.yAxis.axisLabelFormatter
chart_option.yAxis.axisLabel.formatter = yFormatter
}
}
if (customStyle.yAxis && chart.type === 'chart-mix') {
@ -134,6 +143,8 @@ export function componentStyle(chart_option, chart) {
customStyle.yAxis.axisValue.max && (chart_option.yAxis[0].max = parseFloat(customStyle.yAxis.axisValue.max))
customStyle.yAxis.axisValue.split && (chart_option.yAxis[0].interval = parseFloat(customStyle.yAxis.axisValue.split))
}
yAxisLabelFormatter = customStyle.yAxis.axisLabelFormatter
chart_option.yAxis[0].axisLabel.formatter = yFormatter
}
// axis ext
@ -162,6 +173,8 @@ export function componentStyle(chart_option, chart) {
customStyle.yAxisExt.axisValue.max && (chart_option.yAxis[1].max = parseFloat(customStyle.yAxisExt.axisValue.max))
customStyle.yAxisExt.axisValue.split && (chart_option.yAxis[1].interval = parseFloat(customStyle.yAxisExt.axisValue.split))
}
yExtAxisLabelFormatter = customStyle.yAxisExt.axisLabelFormatter
chart_option.yAxis[1].axisLabel.formatter = yExtFormatter
}
}
if (customStyle.split && chart.type.includes('radar')) {
@ -268,3 +281,27 @@ export function seniorCfg(chart_option, chart) {
}
}
}
const xFormatter = function(value) {
if (!xAxisLabelFormatter) {
return valueFormatter(value, formatterItem)
} else {
return valueFormatter(value, xAxisLabelFormatter)
}
}
const yFormatter = function(value) {
if (!yAxisLabelFormatter) {
return valueFormatter(value, formatterItem)
} else {
return valueFormatter(value, yAxisLabelFormatter)
}
}
const yExtFormatter = function(value) {
if (!yExtAxisLabelFormatter) {
return valueFormatter(value, formatterItem)
} else {
return valueFormatter(value, yExtAxisLabelFormatter)
}
}

23
frontend/src/views/chart/chart/common/common_antv.js
View File

@ -1,4 +1,5 @@
import { hexColorToRGBA } from '@/views/chart/chart/util'
import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
export function getPadding(chart) {
if (chart.drill) {
@ -267,6 +268,17 @@ export function getXAxis(chart) {
style: {
fill: a.axisLabel.color,
fontSize: parseInt(a.axisLabel.fontSize)
},
formatter: function(value) {
if (chart.type.includes('horizontal')) {
if (!a.axisLabelFormatter) {
return valueFormatter(value, formatterItem)
} else {
return valueFormatter(value, a.axisLabelFormatter)
}
} else {
return value
}
}
} : null
@ -327,6 +339,17 @@ export function getYAxis(chart) {
style: {
fill: a.axisLabel.color,
fontSize: parseInt(a.axisLabel.fontSize)
},
formatter: function(value) {
if (!chart.type.includes('horizontal')) {
if (!a.axisLabelFormatter) {
return valueFormatter(value, formatterItem)
} else {
return valueFormatter(value, a.axisLabelFormatter)
}
} else {
return value
}
}
} : null