fix(theme): hides splitLine of category axis and axisLine of value axis

rsuite · Jun 14, 2022 · c8011b3 · c8011b3
1 parent 6f8135e
commit c8011b3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 20 deletions.
diff --git 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
@@ -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
@@ -199,7 +199,7 @@ const theme = {
       color: '#575757'
     },
     splitLine: {
-      show: true,
+      show: false,
       lineStyle: {
         color: ['#e5e5ea']
       }
@@ -213,15 +213,15 @@ const theme = {
   },
   valueAxis: {
     axisLine: {
-      show: true,
+      show: false,
       lineStyle: {
         color: '#e5e5ea'
       }
     },
     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
@@ -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,22 +258,23 @@ 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: {
             fontSize: 12,
             color: '#575757'
           }
         },
+        typeof splitLine !== 'undefined'
+          ? {
+              splitLine: _merge(
+                {
+                  show: !!splitLine
+                },
+                typeof splitLine !== 'boolean' && splitLine
+              )
+            }
+          : {},
         axisLabel
           ? {
               axisLabel: transformTextOption(axisLabel)