gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CN-525 echarts图内文字动态调整大小,问题修复：折线图markline标签未显示完全

Browse Source
This commit is contained in:
hyx
2022-05-11 12:37:16 +08:00
parent d8e79b97f7
commit b3f6b5c7ea
2 changed files with 53 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/utils/tools.js
View File

@@ -668,20 +668,37 @@ export function handleEchartFontSize (option) {
const newSeries = [] const newSeries = []
const chartType = chartOption.series[0].type const chartType = chartOption.series[0].type
chartOption.series.forEach((series) => { chartOption.series.forEach((series) => {
const seriesNew = { if (series.markLine) {
...series, const seriesNew = {
label: { ...series,
...series.label,
fontSize: echartLabelFontSize
},
markLine: {
...series.markLine,
label: { label: {
...series.label,
fontSize: echartLabelFontSize fontSize: echartLabelFontSize
},
markLine: {
...series.markLine,
label: {
...series.markLine.label,
fontSize: echartLabelFontSize
}
} }
} }
newSeries.push(seriesNew)
} else {
const seriesNew = {
...series,
label: {
...series.label,
fontSize: echartLabelFontSize
},
markLine: {
label: {
fontSize: echartLabelFontSize
}
}
}
newSeries.push(seriesNew)
} }
newSeries.push(seriesNew)
}) })
if (chartType === 'pie') { if (chartType === 'pie') {

36
src/views/charts/charts/chart-echart-mixin.js
View File

@@ -114,20 +114,38 @@ export default {
const newSeries = [] const newSeries = []
const chartType = chartOption.series[0].type const chartType = chartOption.series[0].type
chartOption.series.forEach((series) => { chartOption.series.forEach((series) => {
const seriesNew = { if (series.markLine) {
...series, const seriesNew = {
label: { ...series,
...series.label,
fontSize: echartLabelFontSize
},
markLine: {
...series.markLine,
label: { label: {
...series.label,
fontSize: echartLabelFontSize fontSize: echartLabelFontSize
},
markLine: {
...series.markLine,
label: {
...series.markLine.label,
fontSize: echartLabelFontSize
}
} }
} }
newSeries.push(seriesNew)
} else {
const seriesNew = {
...series,
label: {
...series.label,
fontSize: echartLabelFontSize
},
markLine: {
...series.markLine,
label: {
fontSize: echartLabelFontSize
}
}
}
newSeries.push(seriesNew)
} }
newSeries.push(seriesNew)
}) })
if (chartType === 'pie') { if (chartType === 'pie') {