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

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2021-08-19 14:10:10 +08:00
commit ff5bb57a43
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/views/chart/chart/chart.js
View File

@ -656,7 +656,8 @@ export const BASE_SCATTER = {
data: [] data: []
}, },
xAxis: { xAxis: {
data: [] data: [],
boundaryGap: false
}, },
yAxis: { yAxis: {
type: 'value' type: 'value'

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

@ -58,6 +58,9 @@ export function componentStyle(chart_option, chart) {
chart_option.xAxis.axisLabel = customStyle.xAxis.axisLabel chart_option.xAxis.axisLabel = customStyle.xAxis.axisLabel
chart_option.xAxis.splitLine = customStyle.xAxis.splitLine chart_option.xAxis.splitLine = customStyle.xAxis.splitLine
chart_option.xAxis.nameTextStyle = customStyle.xAxis.nameTextStyle chart_option.xAxis.nameTextStyle = customStyle.xAxis.nameTextStyle
chart_option.xAxis.axisLabel.showMaxLabel = true
chart_option.xAxis.axisLabel.showMinLabel = true
} }
if (customStyle.yAxis && (chart.type.includes('bar') || chart.type.includes('line') || chart.type.includes('scatter'))) { if (customStyle.yAxis && (chart.type.includes('bar') || chart.type.includes('line') || chart.type.includes('scatter'))) {
chart_option.yAxis.show = customStyle.yAxis.show chart_option.yAxis.show = customStyle.yAxis.show
@ -66,6 +69,9 @@ export function componentStyle(chart_option, chart) {
chart_option.yAxis.axisLabel = customStyle.yAxis.axisLabel chart_option.yAxis.axisLabel = customStyle.yAxis.axisLabel
chart_option.yAxis.splitLine = customStyle.yAxis.splitLine chart_option.yAxis.splitLine = customStyle.yAxis.splitLine
chart_option.yAxis.nameTextStyle = customStyle.yAxis.nameTextStyle chart_option.yAxis.nameTextStyle = customStyle.yAxis.nameTextStyle
chart_option.xAxis.axisLabel.showMaxLabel = true
chart_option.xAxis.axisLabel.showMinLabel = true
} }
if (customStyle.split && chart.type.includes('radar')) { if (customStyle.split && chart.type.includes('radar')) {
chart_option.radar.name = customStyle.split.name chart_option.radar.name = customStyle.split.name