Selaa lähdekoodia

fix:修改g2组件的默认配色

liu.shiyi 1 vuosi sitten
vanhempi
sitoutus
1f19c9d278

+ 2 - 2
data-room-ui/packages/G2Plots/折线图/多折线动画图.js

@@ -76,7 +76,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -586,7 +586,7 @@ const option = {
   dataKey: 'data',
   renderer: 'canvas',
   data,
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   xField: 'year',
   yField: 'gdp',
   seriesField: 'name',

+ 2 - 2
data-room-ui/packages/G2Plots/折线图/多折线图.js

@@ -76,7 +76,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -1291,7 +1291,7 @@ const option = {
       fontWeight: 400
     }
   },
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   seriesField: 'category',
   xAxis: {
     title: {

+ 2 - 2
data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js

@@ -72,7 +72,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -486,7 +486,7 @@ const option = {
       fontWeight: 400
     }
   },
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   seriesField: 'key',
   stepType: 'hvh',
   xAxis: {

+ 2 - 2
data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js

@@ -76,7 +76,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -600,7 +600,7 @@ const option = {
   dataKey: 'data',
   renderer: 'canvas',
   data,
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   xField: 'year',
   yField: 'gdp',
   seriesField: 'name',

+ 2 - 2
data-room-ui/packages/G2Plots/条形图/分组条形图.js

@@ -140,7 +140,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -581,7 +581,7 @@ const option = {
     }
   },
   /** 自定义颜色 */
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   seriesField: 'type',
   legend: false,
   barStyle: {

+ 2 - 2
data-room-ui/packages/G2Plots/条形图/基础条形图.js

@@ -127,7 +127,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -512,7 +512,7 @@ const option = {
   yField: 'year',
   // shape: 'default', // 条形图形状
   seriesField: 'year',
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   legendEnable: true,
   legendLayout: 'vertical',
   legendPosition: 'top',

+ 2 - 2
data-room-ui/packages/G2Plots/柱状图/分组柱状图.js

@@ -114,7 +114,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -517,7 +517,7 @@ const option = {
     }
   },
   legend: false,
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   isGroup: true,
   xField: '月份',
   yField: '月均降雨量',

+ 2 - 2
data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js

@@ -114,7 +114,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -529,7 +529,7 @@ const option = {
   columnStyle: {
     radius: [20, 20, 0, 0]
   },
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   legendEnable: false,
   legendLayout: 'vertical',
   legendPosition: 'top',

+ 2 - 2
data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js

@@ -114,7 +114,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -526,7 +526,7 @@ const option = {
   pattern: {
     type: ''
   },
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   label: {
     // 可手动配置 label 数据标签位置
     position: 'middle', // 'top', 'bottom', 'middle'

+ 2 - 2
data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js

@@ -117,7 +117,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -246,7 +246,7 @@ const option = {
   dataKey: 'data',
   renderer: 'canvas',
   data,
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   xField: 'stage',
   yField: 'number',
   seriesField: 'company',

+ 2 - 2
data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js

@@ -122,7 +122,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -244,7 +244,7 @@ const option = {
   dataKey: 'data',
   renderer: 'canvas',
   data,
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   xField: 'stage',
   yField: 'number',
   dynamicHeight: false,

+ 2 - 2
data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js

@@ -117,7 +117,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -246,7 +246,7 @@ const option = {
   dataKey: 'data',
   renderer: 'canvas',
   data,
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   xField: 'stage',
   yField: 'number',
   compareField: 'company',

+ 2 - 2
data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js

@@ -73,7 +73,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -195,7 +195,7 @@ const option = {
   dataKey: 'data',
   renderer: 'canvas',
   data,
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   colorField: 'name',
   valueField: 'value',
   legendEnable: false,

+ 1 - 1
data-room-ui/packages/G2Plots/组合图/柱线混合图.js

@@ -445,7 +445,7 @@ const option = {
   pattern: {
     type: ''
   },
-  // color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  // color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   label: {
     // 可手动配置 label 数据标签位置
     position: 'middle', // 'top', 'bottom', 'middle'

+ 2 - 2
data-room-ui/packages/G2Plots/词云图/词云图.js

@@ -49,7 +49,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -603,7 +603,7 @@ const option = {
   wordField: 'x',
   weightField: 'value',
   colorField: 'category',
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   wordStyle: {
     fontFamily: 'Verdana',
     fontSize: [24, 80]

+ 1 - 1
data-room-ui/packages/G2Plots/雷达图/分组雷达图.js

@@ -82,7 +82,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },

+ 6 - 0
data-room-ui/packages/G2Plots/雷达图/基础雷达图.js

@@ -205,6 +205,12 @@ const option = {
   yAxis: {
     label: false,
     grid: {
+      line: {
+        type: 'line',
+        style: {
+          lineDash: null,
+        },
+      },
       alternateColor: 'rgba(0, 0, 0, 0.04)'
     }
   },

+ 2 - 2
data-room-ui/packages/G2Plots/面积图/堆叠面积图.js

@@ -79,7 +79,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -607,7 +607,7 @@ const option = {
   data,
   xField: 'date',
   yField: 'value',
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   seriesField: 'country',
   smooth: false,
   legendEnable: false,

+ 2 - 2
data-room-ui/packages/G2Plots/饼图/基础环图.js

@@ -125,7 +125,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -347,7 +347,7 @@ const option = {
       fontWeight: 400
     }
   },
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   label: {
     type: 'inner',
     labelLine: {

+ 2 - 2
data-room-ui/packages/G2Plots/饼图/基础饼图.js

@@ -125,7 +125,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -237,7 +237,7 @@ const option = {
       fontWeight: 400
     }
   },
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   label: {
     type: 'inner',
     labelHeight: 50,

+ 1 - 1
data-room-ui/packages/G2Plots/饼图/玫瑰图.js

@@ -85,7 +85,7 @@ const setting = [
     field: 'color',
     // 对应options中的字段
     optionField: 'color',
-    value: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },