From c8011b385b1458256c7ae79652d97a6180e8ed63 Mon Sep 17 00:00:00 2001 From: Doma Date: Tue, 14 Jun 2022 20:01:28 +0800 Subject: [PATCH] fix(theme): hides splitLine of category axis and axisLine of value axis --- src/components/YAxis.ts | 3 +-- src/theme/rsuite_light.project.json | 2 +- src/theme/rsuite_light.ts | 10 +++++----- src/utils.ts | 22 ++++++++++------------ 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/components/YAxis.ts b/src/components/YAxis.ts index 01a0bbc..fe160c6 100644 --- a/src/components/YAxis.ts +++ b/src/components/YAxis.ts @@ -16,8 +16,7 @@ function YAxis(_: YAxisProps) { YAxis.defaultProps = { show: true, - type: 'value', - splitLine: true + type: 'value' }; YAxis[symbols.typeKey] = symbols.yAxis; diff --git a/src/theme/rsuite_light.project.json b/src/theme/rsuite_light.project.json index e00ad86..8af634a 100644 --- a/src/theme/rsuite_light.project.json +++ b/src/theme/rsuite_light.project.json @@ -117,7 +117,7 @@ "splitAreaColor": ["rgba(250,250,250,0.3)", "rgba(200,200,200,0.3)"] } ], - "axisSeperateSetting": false, + "axisSeperateSetting": true, "toolboxColor": "#999999", "toolboxEmpasisColor": "#666666", "tooltipAxisColor": "#cccccc", diff --git a/src/theme/rsuite_light.ts b/src/theme/rsuite_light.ts index 4332ad5..eda2931 100644 --- a/src/theme/rsuite_light.ts +++ b/src/theme/rsuite_light.ts @@ -199,7 +199,7 @@ const theme = { color: '#575757' }, splitLine: { - show: true, + show: false, lineStyle: { color: ['#e5e5ea'] } @@ -213,7 +213,7 @@ const theme = { }, valueAxis: { axisLine: { - show: true, + show: false, lineStyle: { color: '#e5e5ea' } @@ -221,7 +221,7 @@ const theme = { axisTick: { show: false, lineStyle: { - color: '#333' + color: '#8e8e93' } }, axisLabel: { @@ -249,7 +249,7 @@ const theme = { } }, axisTick: { - show: false, + show: true, lineStyle: { color: '#333' } @@ -279,7 +279,7 @@ const theme = { } }, axisTick: { - show: false, + show: true, lineStyle: { color: '#333' } diff --git a/src/utils.ts b/src/utils.ts index 3e184ff..32500b5 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -228,9 +228,6 @@ const createOptions = { return _merge( { boundaryGap: !!series.find((comp: any) => comp.type[symbols.typeKey] === symbols.bars), - splitLine: { - show: false - }, nameTextStyle: { fontSize: 12, color: '#575757' @@ -261,15 +258,6 @@ const createOptions = { return _merge( { - axisLine: { - show: false - }, - splitLine: _merge( - { - show: !!splitLine - }, - typeof splitLine !== 'boolean' && splitLine - ), nameRotate: 0, name: name && rest.nameLocation === 'middle' ? name.split('').join('\n') : name, nameTextStyle: { @@ -277,6 +265,16 @@ const createOptions = { color: '#575757' } }, + typeof splitLine !== 'undefined' + ? { + splitLine: _merge( + { + show: !!splitLine + }, + typeof splitLine !== 'boolean' && splitLine + ) + } + : {}, axisLabel ? { axisLabel: transformTextOption(axisLabel)