Merge pull request #12 from Cuiyansong/master

refactor: change color and gap
running-elephant · Oct 15, 2021 · 3e14c18 · 3e14c18
2 parents 5e05835 + 4a8d301
commit 3e14c18
Show file tree

Hide file tree

Showing 32 changed files with 132 additions and 37,823 deletions.
diff --git a/frontend/public/custom-chart-plugins/demo-custom-line-chart.js b/frontend/public/custom-chart-plugins/demo-custom-line-chart.js
@@ -482,7 +482,7 @@ function DemoCustomLineChart({ dHelper }) {
     meta: {
       id: 'demo-custom-line-chart',
       name: '[DEMO]用户自定义折线图',
-      icon: 'star',
+      icon: 'chart',
       requirements: [
         {
           group: 1,

diff --git a/...ge/components/ChartOperationPanel/components/ChartGraph/BasicAreaChart/BasicAreaChart.tsx b/...ge/components/ChartOperationPanel/components/ChartGraph/BasicAreaChart/BasicAreaChart.tsx
@@ -27,7 +27,6 @@ class BasicAreaChart extends Chart {
   option = {
     xAxis: {
       type: 'category',
-      boundaryGap: false,
       data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
     },
     yAxis: {

diff --git a/...Page/components/ChartOperationPanel/components/ChartGraph/BasicBarChart/BasicBarChart.tsx b/...Page/components/ChartOperationPanel/components/ChartGraph/BasicBarChart/BasicBarChart.tsx
@@ -125,7 +125,6 @@ class BasicBarChart extends Chart {
     const xAxisColumns = (groupConfigs || []).map(config => {
       return {
         type: 'category',
-        boundaryGap: false,
         tooltip: { show: true },
         data: UniqArray(dataColumns.map(dc => dc[getValueByColumnKey(config)])),
       };

diff --git a/...orkbenchPage/components/ChartOperationPanel/components/ChartGraph/BasicBarChart/config.ts b/...orkbenchPage/components/ChartOperationPanel/components/ChartGraph/BasicBarChart/config.ts
@@ -103,7 +103,7 @@ const config: ChartConfig = {
           label: 'common.fontColor',
           key: 'fontColor',
           comType: 'fontColor',
-          default: 'black',
+          default: '#495057',
           watcher: {
             deps: ['enableTotal'],
             action: props => {
@@ -133,7 +133,7 @@ const config: ChartConfig = {
           default: {
             type: 'solid',
             width: 0,
-            color: 'black',
+            color: '#ced4da',
           },
         },
         {
@@ -144,7 +144,7 @@ const config: ChartConfig = {
         {
           label: 'bar.width',
           key: 'width',
-          default: 10,
+          default: 0,
           comType: 'inputNumber',
         },
         {
@@ -197,7 +197,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
       ],
@@ -254,7 +254,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
       ],
@@ -282,7 +282,7 @@ const config: ChartConfig = {
           default: {
             type: 'solid',
             width: 1,
-            color: 'black',
+            color: '#ced4da',
           },
         },
         {
@@ -300,7 +300,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
         {
@@ -347,7 +347,7 @@ const config: ChartConfig = {
           default: {
             type: 'solid',
             width: 1,
-            color: 'black',
+            color: '#ced4da',
           },
         },
         {
@@ -365,7 +365,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
         {
@@ -383,7 +383,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
         {
@@ -441,7 +441,7 @@ const config: ChartConfig = {
           default: {
             type: 'dashed',
             width: 1,
-            color: 'grey',
+            color: '#ced4da',
           },
         },
         {
@@ -457,7 +457,7 @@ const config: ChartConfig = {
           default: {
             type: 'dashed',
             width: 1,
-            color: 'grey',
+            color: '#ced4da',
           },
         },
       ],

diff --git a/...ponents/ChartOperationPanel/components/ChartGraph/BasicDoubleYChart/BasicDoubleYChart.tsx b/...ponents/ChartOperationPanel/components/ChartGraph/BasicDoubleYChart/BasicDoubleYChart.tsx
@@ -266,7 +266,6 @@ class BasicDoubleYChart extends Chart {
 
     return {
       type: 'category',
-      boundaryGap: false,
       tooltip: { show: true },
       inverse,
       axisLabel: getAxisLabel(

diff --git a/...enchPage/components/ChartOperationPanel/components/ChartGraph/BasicDoubleYChart/config.ts b/...enchPage/components/ChartOperationPanel/components/ChartGraph/BasicDoubleYChart/config.ts
@@ -140,7 +140,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
       ],
@@ -168,8 +168,8 @@ const config: ChartConfig = {
           comType: 'line',
           default: {
             type: 'solid',
-            width: 1,
-            color: 'black',
+            width: 0,
+            color: null,
           },
         },
         {
@@ -188,7 +188,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
       ],
@@ -217,7 +217,7 @@ const config: ChartConfig = {
           default: {
             type: 'solid',
             width: 1,
-            color: 'black',
+            color: null,
           },
         },
         {
@@ -236,7 +236,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
       ],
@@ -264,7 +264,7 @@ const config: ChartConfig = {
           default: {
             type: 'dashed',
             width: 1,
-            color: 'grey',
+            color: '#ced4da',
           },
         },
         {
@@ -283,7 +283,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
         {
@@ -324,7 +324,7 @@ const config: ChartConfig = {
           default: {
             type: 'dashed',
             width: 1,
-            color: 'grey',
+            color: '#ced4da',
           },
         },
         {
@@ -340,7 +340,7 @@ const config: ChartConfig = {
           default: {
             type: 'dashed',
             width: 1,
-            color: 'grey',
+            color: '#ced4da',
           },
         },
       ],

diff --git a/...benchPage/components/ChartOperationPanel/components/ChartGraph/BasicFunnelChart/config.ts b/...benchPage/components/ChartOperationPanel/components/ChartGraph/BasicFunnelChart/config.ts
@@ -122,7 +122,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
         {
@@ -206,7 +206,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
       ],

diff --git a/...age/components/ChartOperationPanel/components/ChartGraph/BasicLineChart/BasicLineChart.ts b/...age/components/ChartOperationPanel/components/ChartGraph/BasicLineChart/BasicLineChart.ts
@@ -129,7 +129,6 @@ class BasicLineChart extends Chart {
     const xAxisColumns = groupConfigs.map(config => {
       return {
         type: 'category',
-        boundaryGap: false,
         tooltip: { show: true },
         data: dataColumns.map(dc => dc[getValueByColumnKey(config)]),
       };

diff --git a/...rkbenchPage/components/ChartOperationPanel/components/ChartGraph/BasicLineChart/config.ts b/...rkbenchPage/components/ChartOperationPanel/components/ChartGraph/BasicLineChart/config.ts
@@ -114,7 +114,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
       ],
@@ -171,7 +171,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
       ],
@@ -199,7 +199,7 @@ const config: ChartConfig = {
           default: {
             type: 'dashed',
             width: 1,
-            color: 'black',
+            color: '#ced4da',
           },
         },
         {
@@ -218,7 +218,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
         {
@@ -265,7 +265,7 @@ const config: ChartConfig = {
           default: {
             type: 'dashed',
             width: 1,
-            color: 'black',
+            color: '#ced4da',
           },
         },
         {
@@ -284,7 +284,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
         {
@@ -303,7 +303,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
         {
@@ -361,7 +361,7 @@ const config: ChartConfig = {
           default: {
             type: 'dashed',
             width: 1,
-            color: 'grey',
+            color: '#ced4da',
           },
         },
         {
@@ -377,7 +377,7 @@ const config: ChartConfig = {
           default: {
             type: 'dashed',
             width: 1,
-            color: 'grey',
+            color: '#ced4da',
           },
         },
       ],

diff --git a/...s/ChartOperationPanel/components/ChartGraph/BasicOutlineMapChart/BasicOutlineMapChart.tsx b/...s/ChartOperationPanel/components/ChartGraph/BasicOutlineMapChart/BasicOutlineMapChart.tsx
@@ -367,8 +367,8 @@ class BasicOutlineMapChart extends Chart {
 
     const inRange = {
       color: [
-        aggregateConfigs?.[0]?.color?.start || '#121122',
-        aggregateConfigs?.[0]?.color?.end || 'rgba(3,4,5,0.4)',
+        aggregateConfigs?.[0]?.color?.start || '#1B9AEE',
+        aggregateConfigs?.[0]?.color?.end || '#FA8C15',
       ],
     };
 

diff --git a/...hPage/components/ChartOperationPanel/components/ChartGraph/BasicOutlineMapChart/config.ts b/...hPage/components/ChartOperationPanel/components/ChartGraph/BasicOutlineMapChart/config.ts
@@ -77,7 +77,7 @@ const config: ChartConfig = {
         {
           label: 'map.areaColor',
           key: 'areaColor',
-          default: '#eee',
+          default: '#e9ecef',
           comType: 'fontColor',
         },
         {
@@ -89,7 +89,7 @@ const config: ChartConfig = {
         {
           label: 'map.areaEmphasisColor',
           key: 'areaEmphasisColor',
-          default: '#eee',
+          default: '#dee2e6',
           comType: 'fontColor',
         },
         {
@@ -99,7 +99,7 @@ const config: ChartConfig = {
           default: {
             type: 'dashed',
             width: 1,
-            color: '#000',
+            color: '#ced4da',
           },
         },
       ],
@@ -147,7 +147,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
       ],
@@ -211,7 +211,7 @@ const config: ChartConfig = {
             fontSize: '12',
             fontWeight: 'normal',
             fontStyle: 'normal',
-            color: 'black',
+            color: '#495057',
           },
         },
       ],

diff --git a/...Page/components/ChartOperationPanel/components/ChartGraph/BasicPieChart/BasicPieChart.tsx b/...Page/components/ChartOperationPanel/components/ChartGraph/BasicPieChart/BasicPieChart.tsx
@@ -107,7 +107,6 @@ class BasicPieChart extends Chart {
       return {
         name: getColumnRenderName(config),
         type: 'category',
-        boundaryGap: false,
         tooltip: { show: true },
         data: UniqArray(dataColumns.map(dc => dc[getValueByColumnKey(config)])),
       };