Pārlūkot izejas kodu

fix:修改图表默认配置

liu.shiyi 1 gadu atpakaļ
vecāks
revīzija
28f2973b23
22 mainītis faili ar 173 papildinājumiem un 166 dzēšanām
  1. 2 2
      data-room-ui/packages/G2Plots/折线图/基础曲线图.js
  2. 2 2
      data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js
  3. 1 1
      data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js
  4. 2 2
      data-room-ui/packages/G2Plots/折线图/迷你面积图.js
  5. 2 2
      data-room-ui/packages/G2Plots/柱状图/基础柱状图.js
  6. 6 6
      data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js
  7. 7 7
      data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js
  8. 6 6
      data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js
  9. 3 3
      data-room-ui/packages/G2Plots/玉珏图/基础玉珏图.js
  10. 1 1
      data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js
  11. 1 1
      data-room-ui/packages/G2Plots/词云图/词云图.js
  12. 18 18
      data-room-ui/packages/G2Plots/进度图/仪表盘.js
  13. 11 11
      data-room-ui/packages/G2Plots/进度图/水波图.js
  14. 11 11
      data-room-ui/packages/G2Plots/进度图/矩形水波图.js
  15. 14 14
      data-room-ui/packages/G2Plots/进度图/进度仪表盘.js
  16. 10 10
      data-room-ui/packages/G2Plots/进度图/进度环图.js
  17. 11 11
      data-room-ui/packages/G2Plots/进度图/钻石水波图.js
  18. 8 8
      data-room-ui/packages/G2Plots/面积图/基础面积图.js
  19. 6 6
      data-room-ui/packages/G2Plots/面积图/渐变色面积图.js
  20. 31 27
      data-room-ui/packages/G2Plots/饼图/基础环图.js
  21. 8 8
      data-room-ui/packages/G2Plots/饼图/基础饼图.js
  22. 12 9
      data-room-ui/packages/G2Plots/饼图/玫瑰图.js

+ 2 - 2
data-room-ui/packages/G2Plots/折线图/基础曲线图.js

@@ -60,7 +60,7 @@ const setting = [
     type: 'gradual',
     field: 'lineStyle_stroke',
     optionField: 'lineStyle.stroke',
-    value: 'l(0) 0:#5F92F9 1:#62FF00',
+    value: 'l(0) 0:#6B74E4 1:#4391F4',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -419,7 +419,7 @@ const option = {
   smooth: true,
   lineStyle: {
     lineWidth: 2,
-    stroke: 'l(0) 0:#6b74e4 1:#4391f4'
+    stroke: 'l(0) 0:#6B74E4 1:#4391F4'
   },
   xAxis: {
     title: {

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

@@ -135,7 +135,7 @@ const setting = [
     field: 'animation_appear_duration',
     // 对应options中的字段
     optionField: 'animation.appear.duration',
-    value: 5000,
+    value: 2000,
     max:10000,
     tabName: 'custom',
     groupName: 'graph',
@@ -667,7 +667,7 @@ const option = {
   animation: {
     appear: {
       animation: 'wave-in',
-      duration: 5000
+      duration: 2000
     }
   },
   lineStyle: {

+ 1 - 1
data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js

@@ -96,7 +96,7 @@ const option = {
   xField:'',
   yField:'',
   data: [100, 200, 300, 200, 100, 200, 300, 400],
-  height: 60,
+  height: 150,
   autoFit: true,
   smooth: true,
   lineStyle: {

+ 2 - 2
data-room-ui/packages/G2Plots/折线图/迷你面积图.js

@@ -119,12 +119,12 @@ const option = {
   appendPadding: [0, 0, 0, 0],
   xField: '',
   yField: '',
-  height: 60,
+  height: 150,
   autoFit: true,
   smooth: true,
   areaStyle: {
     fill: 'l(0) 0:#648ff7 1:#62FF00',
-    fillOpacity: 0.3
+    fillOpacity: 0.15
   },
   line: {
     color: 'l(0) 0:#648ff7 1:#62FF00',

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

@@ -44,7 +44,7 @@ const setting = [
     type: 'gradual', // 设置组件类型
     field: 'columnStyle_fill', // 字段
     optionField: 'columnStyle.fill', // 对应options中的字段
-    value: 'l(90) 0:#5AA6AB 1:#217AB1',
+    value: 'l(90) 0:#6B74E4 1:#4391F4',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -485,7 +485,7 @@ const option = {
   yField: 'value',
   color: '',
   columnStyle: { // 设置柱子渐变色
-    fill: 'l(90) 0:#5AA6AB 1:#217AB1'
+    fill: 'l(90) 0:#6B74E4 1:#4391F4'
   },
   label: {
     offsetY: 13,

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

@@ -93,7 +93,7 @@ const setting = [
     // 对应options中的字段
     optionField: 'conversionTag.style.fill',
     // 绑定的值
-    value: '#8c8c8c',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -105,7 +105,7 @@ const setting = [
     field: 'conversionTag_style_fontSize',
     // 对应options中的字段
     optionField: 'conversionTag.style.fontSize',
-    value: 12,
+    value: 10,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -204,7 +204,7 @@ const setting = [
     type: 'colorPicker',
     field: 'legendItemName_style_fill',
     optionField: 'legendItemName.style.fill',
-    value: '#595959',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -268,7 +268,7 @@ const option = {
   legend: false,
   legendItemName: {
     style: {
-      fill: '#595959',
+      fill: '#e9e9e9',
       fontSize: 12,
       fontWeight: 400
     }
@@ -279,14 +279,14 @@ const option = {
     style: {
       fill: '#ffffff',
       opacity: 1,
-      fontSize: 12
+      fontSize: 10
     }
   },
   conversionTag: {
     offsetX: 10,
     offsetY: 0,
     style: {
-      fill: '#8c8c8c',
+      fill: '#e9e9e9',
       fontSize: 12
     },
     formatter: (datum) => {

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

@@ -110,7 +110,7 @@ const setting = [
     // 对应options中的字段
     optionField: 'conversionTag.style.fill',
     // 绑定的值
-    value: '#8c8c8c',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -143,7 +143,7 @@ const setting = [
     field: 'label_style_fontSize',
     // 对应options中的字段
     optionField: 'label.style.fontSize',
-    value: 12,
+    value: 10,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -209,7 +209,7 @@ const setting = [
     type: 'colorPicker',
     field: 'legendItemName_style_fill',
     optionField: 'legendItemName.style.fill',
-    value: '#595959',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -266,7 +266,7 @@ const option = {
   legend: false,
   legendItemName: {
     style: {
-      fill: '#595959',
+      fill: '#e9e9e9',
       fontSize: 12,
       fontWeight: 400
     }
@@ -276,16 +276,16 @@ const option = {
   label: { // 图表内的数据标签
     // 配置样式
     style: {
-      fill: '#ffffff',
+      fill: '#FFFFFF',
       opacity: 1,
-      fontSize: 12
+      fontSize: 10
     }
   },
   conversionTag: {
     offsetX: 10,
     offsetY: 0,
     style: {
-      fill: '#8c8c8c',
+      fill: '#e9e9e9',
       fontSize: 12
     },
     formatter: (datum) => {

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

@@ -93,7 +93,7 @@ const setting = [
     // 对应options中的字段
     optionField: 'conversionTag.style.fill',
     // 绑定的值
-    value: '#8c8c8c',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -138,7 +138,7 @@ const setting = [
     field: 'label_style_fontSize',
     // 对应options中的字段
     optionField: 'label.style.fontSize',
-    value: 12,
+    value: 10,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -204,7 +204,7 @@ const setting = [
     type: 'colorPicker',
     field: 'legendItemName_style_fill',
     optionField: 'legendItemName.style.fill',
-    value: '#595959',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -268,7 +268,7 @@ const option = {
   legend: false,
   legendItemName: {
     style: {
-      fill: '#595959',
+      fill: '#e9e9e9',
       fontSize: 12,
       fontWeight: 400
     }
@@ -279,14 +279,14 @@ const option = {
     style: {
       fill: '#ffffff',
       opacity: 1,
-      fontSize: 12
+      fontSize: 10
     }
   },
   conversionTag: {
     offsetX: 10,
     offsetY: 0,
     style: {
-      fill: '#8c8c8c',
+      fill: '#e9e9e9',
       fontSize: 12
     },
     formatter: (datum) => {

+ 3 - 3
data-room-ui/packages/G2Plots/玉珏图/基础玉珏图.js

@@ -60,7 +60,7 @@ const setting = [
     optionField: 'color',
     // 是否多选
     multiple: false,
-    value: ["#5B8FF9", "#5AD8A6", "#5D7092", "#F6BD16", "#E8684A", "#6DC8EC", "#9270CA", "#FF9D4D", "#269A99", "#FF99C3"],
+    value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -123,7 +123,7 @@ const setting = [
     type: 'colorPicker',
     field: 'xAxis_labelStyle_fill',
     optionField: 'xAxis.label.style.fill',
-    value: '#595959',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'xAxis'
   },
@@ -209,7 +209,7 @@ const option = {
   xAxis: {
     label: {
       style: {
-        fill: '#ffffff',
+        fill: '#e9e9e9',
         fontSize: 12,
         fontWeight: 600,
       }

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

@@ -49,7 +49,7 @@ const setting = [
     field: 'lable_style_fontSize',
     // 对应options中的字段
     optionField: 'label.style.fontSize',
-    value: '14',
+    value: '10',
     tabName: 'custom',
     groupName: 'graph'
   },

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

@@ -153,7 +153,7 @@ const option = {
   color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   wordStyle: {
     fontFamily: 'Verdana',
-    fontSize: [12, 60]
+    fontSize: [10, 60]
   },
   fontSizeMin: 24,
   fontSizeMax: 80,

+ 18 - 18
data-room-ui/packages/G2Plots/进度图/仪表盘.js

@@ -59,7 +59,7 @@ const setting = [
     field: 'color1',
     // 对应options中的字段
     optionField: 'color1',
-    value: 'l(0) 0:#6b74e4 1:#4391f4',
+    value: 'l(0) 0:#BEE8FF 1:#1DAEFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -71,7 +71,7 @@ const setting = [
     field: 'color2',
     // 对应options中的字段
     optionField: 'color2',
-    value: '#d0d0d0',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -83,7 +83,7 @@ const setting = [
     field: 'statistic_title_style_color',
     // 对应options中的字段
     optionField: 'statistic.title.style.color',
-    value: '#d0d0d0',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -95,7 +95,7 @@ const setting = [
     field: 'statistic_title_style_fontSize',
     // 对应options中的字段
     optionField: 'statistic.title.style.fontSize',
-    value: 20,
+    value: 40,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -121,7 +121,7 @@ const setting = [
     optionField: 'statistic.title.style.fontFamily',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'ds-digitalbold',
     tabName: 'custom',
     options: fontList,
     groupName: 'graph'
@@ -134,7 +134,7 @@ const setting = [
     field: 'statistic_content_content',
     // 对应options中的字段
     optionField: 'statistic.content.content',
-    value: '占比',
+    value: '',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -146,7 +146,7 @@ const setting = [
     field: 'statistic_content_style_color',
     // 对应options中的字段
     optionField: 'statistic.content.style.color',
-    value: '#d0d0d0',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -170,7 +170,7 @@ const setting = [
     field: 'statistic_content_offsetY',
     // 对应options中的字段
     optionField: 'statistic.content.offsetY',
-    value: -30,
+    value: -45,
     min: -100,
     tabName: 'custom',
     groupName: 'graph'
@@ -183,7 +183,7 @@ const setting = [
     field: 'statistic_title_offsetY',
     // 对应options中的字段
     optionField: 'statistic.title.offsetY',
-    value: 0,
+    value: -10,
     min: -100,
     tabName: 'custom',
     groupName: 'graph'
@@ -221,8 +221,8 @@ const option = {
   appendPadding: [0, 0, 0, 0],
   data,
   percent: 0.75,
-  color1: 'l(0) 0:#6b74e4 1:#4391f4',
-  color2: '#d0d0d0',
+  color1: 'l(0) 0:#BEE8FF 1:#1DAEFF',
+  color2: '#FFFFFF',
   range: {
     color: ['l(0) 0:#6b74e4 1:#4391f4', '#d0d0d0']
   },
@@ -254,22 +254,22 @@ const option = {
   statisticFixed: 0,
   statistic: {
     title: {
-      offsetY: 0,
+      offsetY: -10,
       style: {
-        fontSize: 20,
+        fontSize: 40,
         lineHeight: 2,
-        fontFamily: '',
-        color: '#d0d0d0'
+        fontFamily: 'ds-digitalbold',
+        color: '#FFFFFF'
       },
       formatter: ({ percent }) => `${(percent * 100).toFixed(0)}%`
     },
     content: {
-      offsetY: -30,
-      content: '占比',
+      offsetY: -45,
+      content: '',
       style: {
         fontSize: 20,
         lineHeight: 2,
-        color: '#d0d0d0'
+        color: '#FFFFFF'
       }
     }
   }

+ 11 - 11
data-room-ui/packages/G2Plots/进度图/水波图.js

@@ -76,7 +76,7 @@ const setting = [
     field: 'statistic_content_style_fill',
     // 对应options中的字段
     optionField: 'statistic.content.style.fill',
-    value: '#d0d0d0',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -88,7 +88,7 @@ const setting = [
     field: 'statistic_content_style_fontSize',
     // 对应options中的字段
     optionField: 'statistic.content.style.fontSize',
-    value: 20,
+    value: 30,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -102,7 +102,7 @@ const setting = [
     optionField: 'statistic.content.style.fontFamily',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'ds-digitalbold',
     tabName: 'custom',
     options: fontList,
     groupName: 'graph'
@@ -115,7 +115,7 @@ const setting = [
     field: 'outline_border',
     // 对应options中的字段
     optionField: 'outline.border',
-    value: 1,
+    value: 2,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -139,7 +139,7 @@ const setting = [
     field: 'outline_style_stroke',
     // 对应options中的字段
     optionField: 'outline.style.stroke',
-    value: '#6291ef',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -148,7 +148,7 @@ const setting = [
     type: 'colorPicker', // 设置组件类型
     field: 'color', // 字段
     optionField: 'color', // 对应options中的字段
-    value: '#598BF2',
+    value: '#1DAEFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -180,14 +180,14 @@ const option = {
   // 图表内边距
   appendPadding: [0, 0, 0, 0],
   data,
-  color: '#598BF2',
+  color: '#1DAEFF',
   renderer: 'canvas',
   percent: 0.25,
   outline: {
-    border: 1, // 边框宽度
+    border: 2, // 边框宽度
     distance: 1, // 边框距离
     style: {
-      stroke: '#6291ef' // 边框颜色
+      stroke: '#FFFFFF' // 边框颜色
     }
   },
   liquidStyle: {
@@ -212,10 +212,10 @@ const option = {
   statistic: {
     content: {
       style: {
-        fontSize: 20,
+        fontSize: 30,
         lineHeight: 1,
         fill: '#d0d0d0',
-        fontFamily: ''
+        fontFamily: 'ds-digitalbold'
       }
     }
   }

+ 11 - 11
data-room-ui/packages/G2Plots/进度图/矩形水波图.js

@@ -76,7 +76,7 @@ const setting = [
     field: 'statistic_content_style_fill',
     // 对应options中的字段
     optionField: 'statistic.content.style.fill',
-    value: '#d0d0d0',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -88,7 +88,7 @@ const setting = [
     field: 'statistic_content_style_fontSize',
     // 对应options中的字段
     optionField: 'statistic.content.style.fontSize',
-    value: 20,
+    value: 30,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -102,7 +102,7 @@ const setting = [
     optionField: 'statistic.content.style.fontFamily',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'ds-digitalbold',
     tabName: 'custom',
     options: fontList,
     groupName: 'graph'
@@ -115,7 +115,7 @@ const setting = [
     field: 'outline_border',
     // 对应options中的字段
     optionField: 'outline.border',
-    value: 1,
+    value: 2,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -139,7 +139,7 @@ const setting = [
     field: 'outline_style_stroke',
     // 对应options中的字段
     optionField: 'outline.style.stroke',
-    value: '#6291ef',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -148,7 +148,7 @@ const setting = [
     type: 'colorPicker', // 设置组件类型
     field: 'color', // 字段
     optionField: 'color', // 对应options中的字段
-    value: '#598BF2',
+    value: '#1DAEFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -179,14 +179,14 @@ const option = {
   appendPadding: [0, 0, 0, 0],
   data,
   renderer: 'canvas',
-  color: '#598BF2',
+  color: '#1DAEFF',
   percent: 0.25,
   shape: 'rect',
   outline: {
-    border: 1, // 边框宽度
+    border: 2, // 边框宽度
     distance: 1, // 边框距离
     style: {
-      stroke: '#6291ef' // 边框颜色
+      stroke: '#FFFFFF' // 边框颜色
     }
   },
   liquidStyle: {
@@ -197,9 +197,9 @@ const option = {
   statistic: {
     content: {
       style: {
-        fontSize: 20,
+        fontSize: 30,
         lineHeight: 1,
-        fontFamily: '',
+        fontFamily: 'ds-digitalbold',
         fill: '#d0d0d0'
       }
     }

+ 14 - 14
data-room-ui/packages/G2Plots/进度图/进度仪表盘.js

@@ -47,7 +47,7 @@ const setting = [
     field: 'color2',
     // 对应options中的字段
     optionField: 'color2',
-    value: '#d0d0d0',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -59,7 +59,7 @@ const setting = [
     field: 'statistic_title_style_color',
     // 对应options中的字段
     optionField: 'statistic.title.style.color',
-    value: '#d0d0d0',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -71,7 +71,7 @@ const setting = [
     field: 'statistic_title_style_fontSize',
     // 对应options中的字段
     optionField: 'statistic.title.style.fontSize',
-    value: 20,
+    value: 40,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -97,7 +97,7 @@ const setting = [
     optionField: 'statistic.title.style.fontFamily',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'ds-digitalbold',
     tabName: 'custom',
     options: fontList,
     groupName: 'graph'
@@ -122,7 +122,7 @@ const setting = [
     field: 'statistic_content_style_color',
     // 对应options中的字段
     optionField: 'statistic.content.style.color',
-    value: '#d0d0d0',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -146,7 +146,7 @@ const setting = [
     field: 'statistic_content_offsetY',
     // 对应options中的字段
     optionField: 'statistic.content.offsetY',
-    value: -30,
+    value: -60,
     min:-100,
     tabName: 'custom',
     groupName: 'graph'
@@ -159,7 +159,7 @@ const setting = [
     field: 'statistic_title_offsetY',
     // 对应options中的字段
     optionField: 'statistic.title.offsetY',
-    value: 0,
+    value: -10,
     min:-100,
     tabName: 'custom',
     groupName: 'graph'
@@ -196,7 +196,7 @@ const option = {
   data,
   percent: 0.75,
   color1: 'l(0) 0:#6b74e4 1:#4391f4',
-  color2: '#d0d0d0',
+  color2: '#FFFFFF',
   range: {
     color: ['l(0) 0:#6b74e4 1:#4391f4','#d0d0d0']
   },
@@ -206,22 +206,22 @@ const option = {
   indicator: null,
   statistic: {
     title: {
-      offsetY: 0,
+      offsetY: -60,
       style: {
-        fontSize: 20,
+        fontSize: 40,
         lineHeight: 2,
-        fontFamily: '',
-        color: '#d0d0d0'
+        fontFamily: 'ds-digitalbold',
+        color: '#FFFFFF'
       },
       formatter: ({ percent }) => `${(percent * 100).toFixed(0)}%`
     },
     content: {
-      offsetY: -30,
+      offsetY: -10,
       content: '占比',
       style: {
         fontSize: 20,
         lineHeight: 2,
-        color: '#d0d0d0'
+        color: '#FFFFFF'
       }
     }
   }

+ 10 - 10
data-room-ui/packages/G2Plots/进度图/进度环图.js

@@ -35,7 +35,7 @@ const setting = [
     field: 'color2',
     // 对应options中的字段
     optionField: 'color2',
-    value: 'rgba(238, 238, 238, 1)',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -71,7 +71,7 @@ const setting = [
     field: 'statistic_title_style_fill',
     // 对应options中的字段
     optionField: 'statistic.title.style.fill',
-    value: 'rgba(133, 133, 133, 1)',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -108,7 +108,7 @@ const setting = [
     field: 'statistic_content_style_fill',
     // 对应options中的字段
     optionField: 'statistic.content.style.fill',
-    value: 'rgba(133, 133, 133, 1)',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -120,7 +120,7 @@ const setting = [
     field: 'statistic_content_style_fontSize',
     // 对应options中的字段
     optionField: 'statistic.content.style.fontSize',
-    value: 24,
+    value: 40,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -134,7 +134,7 @@ const setting = [
     optionField: 'statistic.content.style.fontFamily',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'ds-digitalbold',
     tabName: 'custom',
     options: fontList,
     groupName: 'graph'
@@ -160,7 +160,7 @@ const setting = [
     field: 'statistic_content_offsetY',
     // 对应options中的字段
     optionField: 'statistic.content.offsetY',
-    value: 0,
+    value: -10,
     min:-100,
     tabName: 'custom',
     groupName: 'graph'
@@ -197,7 +197,7 @@ const option = {
   appendPadding: [0, 0, 0, 0],
   data,
   color1: 'l(0) 0:#6B74E3 1:#38BBE5',
-  color2: '#d0d0d0',
+  color2: '#FFFFFF',
   autoFit: true,
   percent: 0.6,
   color: ['l(0) 0:#6B74E3 1:#38BBE5', '#d0d0d0'],
@@ -205,13 +205,13 @@ const option = {
   radius: 0.98,
   statistic: {
     title: {
-      style: { fill: '#fafafa', fontSize: 28, lineHeight: 2 },
+      style: { fill: '#FFFFFF', fontSize: 28, lineHeight: 2 },
       content: '进度',
       offsetY: 0
     },
     content: {
-      style: { fill: '#fafafa', fontSize: 28, fontFamily: '', lineHeight: 2 },
-      offsetY: 0
+      style: { fill: '#FFFFFF', fontSize: 40, fontFamily: 'ds-digitalbold', lineHeight: 2 },
+      offsetY: -10
     }
   }
 }

+ 11 - 11
data-room-ui/packages/G2Plots/进度图/钻石水波图.js

@@ -76,7 +76,7 @@ const setting = [
     field: 'statistic_content_style_fill',
     // 对应options中的字段
     optionField: 'statistic.content.style.fill',
-    value: '#d0d0d0',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -88,7 +88,7 @@ const setting = [
     field: 'statistic_content_style_fontSize',
     // 对应options中的字段
     optionField: 'statistic.content.style.fontSize',
-    value: 20,
+    value: 30,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -102,7 +102,7 @@ const setting = [
     optionField: 'statistic.content.style.fontFamily',
     // 是否多选
     multiple: false,
-    value: '',
+    value: 'ds-digitalbold',
     tabName: 'custom',
     options: fontList,
     groupName: 'graph'
@@ -115,7 +115,7 @@ const setting = [
     field: 'outline_border',
     // 对应options中的字段
     optionField: 'outline.border',
-    value: 1,
+    value: 2,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -139,7 +139,7 @@ const setting = [
     field: 'outline_style_stroke',
     // 对应options中的字段
     optionField: 'outline.style.stroke',
-    value: '#6291ef',
+    value: '#FFFFFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -148,7 +148,7 @@ const setting = [
     type: 'colorPicker', // 设置组件类型
     field: 'color', // 字段
     optionField: 'color', // 对应options中的字段
-    value: '#598BF2',
+    value: '#1DAEFF',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -176,15 +176,15 @@ const option = {
   renderer: 'canvas',
   // 图表内边距
   appendPadding: [0, 0, 0, 0],
-  color: '#598BF2',
+  color: '#1DAEFF',
   percent: 0.25,
   data,
   shape: 'diamond',
   outline: {
-    border: 1, // 边框宽度
+    border: 2, // 边框宽度
     distance: 1, // 边框距离
     style: {
-      stroke: '#6291ef' // 边框颜色
+      stroke: '#FFFFFF' // 边框颜色
     }
   },
   liquidStyle: {
@@ -195,9 +195,9 @@ const option = {
   statistic: {
     content: {
       style: {
-        fontSize: 20,
+        fontSize: 30,
         lineHeight: 1,
-        fontFamily: '',
+        fontFamily: 'ds-digitalbold',
         fill: '#d0d0d0'
       }
     }

+ 8 - 8
data-room-ui/packages/G2Plots/面积图/基础面积图.js

@@ -62,7 +62,7 @@ const setting = [
     type: 'switch', // 设置组件类型
     field: 'smooth', // 字段
     optionField: 'smooth', // 对应options中的字段
-    value: false,
+    value: true,
     active: true,
     inactive: false,
     tabName: 'custom',
@@ -82,7 +82,7 @@ const setting = [
     type: 'gradual', // 设置组件类型
     field: 'line_color', // 字段
     optionField: 'line.color', // 对应options中的字段
-    value: 'l(0) 0:#3e5bdb 1:#3e5bdb',
+    value: 'l(0) 0:#6B74E4 1:#6B74E4',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -91,7 +91,7 @@ const setting = [
     type: 'inputNumber', // 设置组件类型
     field: 'line_size', // 字段
     optionField: 'line.size', // 对应options中的字段
-    value: 1,
+    value: 2,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -100,7 +100,7 @@ const setting = [
     type: 'gradual', // 设置组件类型
     field: 'areaStyle_fill', // 字段
     optionField: 'areaStyle.fill', // 对应options中的字段
-    value: 'l(0) 0:#3e5bdb 1:#3e5bdb',
+    value: 'l(0) 0:#6B74E4 1:#6B74E4',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -563,12 +563,12 @@ const option = {
   data,
   xField: 'date',
   yField: 'value',
-  smooth: false,
+  smooth: true,
   startOnZero: true,
   isStack: false,
   areaStyle: {
     fillOpacity: 0.15,
-    fill: 'l(0) 0:#3e5bdb 1:#3e5bdb'
+    fill: 'l(0) 0:#6B74E4 1:#6B74E4'
   },
   label: {
     style: {
@@ -577,8 +577,8 @@ const option = {
     }
   },
   line: {
-    color: '',
-    size: 1
+    color: 'l(0) 0:#6B74E4 1:#6B74E4',
+    size: 2
   },
   point: {
     color: '',

+ 6 - 6
data-room-ui/packages/G2Plots/面积图/渐变色面积图.js

@@ -71,7 +71,7 @@ const setting = [
     type: 'colorPicker', // 设置组件类型
     field: 'line_color', // 字段
     optionField: 'line.color', // 对应options中的字段
-    value: '#1890ff',
+    value: '#6B74E4',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -80,7 +80,7 @@ const setting = [
     type: 'inputNumber', // 设置组件类型
     field: 'line_size', // 字段
     optionField: 'line.size', // 对应options中的字段
-    value: 1,
+    value: 2,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -89,7 +89,7 @@ const setting = [
     type: 'gradual', // 设置组件类型
     field: 'areaStyle_fill', // 字段
     optionField: 'areaStyle.fill', // 对应options中的字段
-    value: 'l(270) 0:#ffffff 1:#1890ff',
+    value: 'l(270) 0:#6B74E4 1:#000000',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -555,11 +555,11 @@ const option = {
   isStack: false,
   areaStyle: {
     fillOpacity: 0.15,
-    fill: 'l(270) 0:#ffffff 1:#1890ff'
+    fill: 'l(270) 0:#6B74E4 1:#000000'
   },
   line: {
-    color: '#1890ff',
-    size: 1
+    color: '#6B74E4',
+    size: 2
   },
   point: {
     color: '',

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

@@ -55,7 +55,7 @@ const setting = [
     options: [
       { label: '维度', value: '{name}' },
       { label: '指标', value: '{value}' },
-      { label: '百分比', value: '{percentage}' },
+      { label: '百分比', value: '{percentage}' }
     ],
     step: 0.1,
     max: 1,
@@ -97,19 +97,19 @@ const setting = [
     field: 'label_style_fill',
     // 对应options中的字段
     optionField: 'label.style.fill',
-    value: '#ffffff',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'graph'
   },
   {
-    label: '标签大小',
+    label: '标签字体大小',
     // 设置组件类型
     type: 'inputNumber',
     // 字段
     field: 'label_style_fontSize',
     // 对应options中的字段
     optionField: 'label.style.fontSize',
-    value: 12,
+    value: 14,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -121,7 +121,7 @@ const setting = [
     field: 'label_labelLine_style_stroke',
     // 对应options中的字段
     optionField: 'label.labelLine.style.stroke',
-    value: '#5B8FF9',
+    value: '#C9CDD4',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -191,7 +191,7 @@ const setting = [
     field: 'statistic_title_style_color',
     // 对应options中的字段
     optionField: 'statistic.title.style.color',
-    value: '#d0d0d0',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -215,7 +215,7 @@ const setting = [
     field: 'statistic_content_style_color',
     // 对应options中的字段
     optionField: 'statistic.content.style.color',
-    value: '#d0d0d0',
+    value: '#ffffff',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -255,7 +255,7 @@ const setting = [
     // 对应options中的字段
     optionField: 'statistic.title.offsetY',
     value: 0,
-    min:-100,
+    min: -100,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -268,31 +268,37 @@ const setting = [
     // 对应options中的字段
     optionField: 'statistic.content.offsetY',
     value: 0,
-    min:-100,
+    min: -100,
     tabName: 'custom',
     groupName: 'graph'
   },
   {
     label: '外环半径',
     // 设置组件类型
-    type: 'slider',
+    type: 'inputNumber',
     // 字段
     field: 'radius',
     // 对应options中的字段
     optionField: 'radius',
-    value: 1,
+    value: 0.9,
+    min: 0,
+    max: 1,
+    step: 0.01,
     tabName: 'custom',
     groupName: 'graph'
   },
   {
     label: '内环半径',
     // 设置组件类型
-    type: 'slider',
+    type: 'inputNumber',
     // 字段
     field: 'innerRadius',
     // 对应options中的字段
     optionField: 'innerRadius',
-    value: 0.6,
+    value: 0.65,
+    min: 0,
+    max: 1,
+    step: 0.01,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -302,7 +308,7 @@ const setting = [
     type: 'switch', // 设置组件类型
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
-    value: false,
+    value: true,
     active: true,
     inactive: false,
     tabName: 'custom',
@@ -315,7 +321,7 @@ const setting = [
     optionField: 'legendPosition', // 对应options中的字段
     // 是否多选
     multiple: false,
-    value: 'top',
+    value: 'right',
     tabName: 'custom',
     options: [
       { label: '顶部', value: 'top' },
@@ -358,10 +364,10 @@ const setting = [
     type: 'colorPicker',
     field: 'legendItemName_style_fill',
     optionField: 'legendItemName.style.fill',
-    value: '#595959',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'legend'
-  },
+  }
 ]
 
 // 模拟数据
@@ -396,8 +402,6 @@ const optionHandler = 'option.legend = option.legendEnable ? {position: setting.
   option.label.content = content
 }`
 
-
-
 // 数据处理脚本
 const dataHandler = ''
 
@@ -413,13 +417,13 @@ const option = {
   colorField: 'type',
   radius: 1,
   innerRadius: 0.6,
-  legendEnable: false,
+  legendEnable: true,
   legendLayout: 'vertical',
-  legendPosition: 'top',
+  legendPosition: 'right',
   legend: false,
   legendItemName: {
     style: {
-      fill: '#595959',
+      fill: '#e9e9e9',
       fontSize: 12,
       fontWeight: 400
     }
@@ -438,33 +442,33 @@ const option = {
     contentList: [],
     content: '{value}',
     style: {
-      fill: '#ffffff',
+      fill: '#e9e9e9',
       fontSize: 14,
       textAlign: 'center'
     }
   },
   statistic: {
     title: {
-      offsetY:0,//垂直方向的偏移量
+      offsetY: 0, // 垂直方向的偏移量
       style: {
         whiteSpace: 'pre-wrap',
         lineHeight: 2,
         overflow: 'hidden',
         textOverflow: 'ellipsis',
-        color: '#d0d0d0',
+        color: '#e9e9e9',
         fontSize: 20
       },
       content: '总计'
     },
     content: {
-      offsetY:0,//垂直方向的偏移量
+      offsetY: 0, // 垂直方向的偏移量
       style: {
         whiteSpace: 'pre-wrap',
         lineHeight: 2,
         overflow: 'hidden',
         textOverflow: 'ellipsis',
         fontFamily: '',
-        color: '#d0d0d0',
+        color: '#ffffff',
         fontSize: 30
       }
       // content: '100'

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

@@ -96,7 +96,7 @@ const setting = [
     field: 'label_style_fill',
     // 对应options中的字段
     optionField: 'label.style.fill',
-    value: '#ffffff',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -165,7 +165,7 @@ const setting = [
     type: 'switch', // 设置组件类型
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
-    value: false,
+    value: true,
     active: true,
     inactive: false,
     tabName: 'custom',
@@ -178,7 +178,7 @@ const setting = [
     optionField: 'legendPosition', // 对应options中的字段
     // 是否多选
     multiple: false,
-    value: 'top',
+    value: 'right',
     tabName: 'custom',
     options: [
       { label: '顶部', value: 'top' },
@@ -221,7 +221,7 @@ const setting = [
     type: 'colorPicker',
     field: 'legendItemName_style_fill',
     optionField: 'legendItemName.style.fill',
-    value: '#595959',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'legend'
   }
@@ -254,9 +254,9 @@ const option = {
   appendPadding: [0, 0, 0, 0],
   renderer: 'canvas',
   data,
-  legendEnable: false,
+  legendEnable: true,
   legendLayout: 'vertical',
-  legendPosition: 'top',
+  legendPosition: 'right',
   angle: 0.5,
   angleField: 'value',
   colorField: 'type',
@@ -264,7 +264,7 @@ const option = {
   legend: false,
   legendItemName: {
     style: {
-      fill: '#595959',
+      fill: '#e9e9e9',
       fontSize: 12,
       fontWeight: 400
     }
@@ -286,7 +286,7 @@ const option = {
       }
     },
     style: {
-      fill: '#ffffff',
+      fill: '#e9e9e9',
       fontSize: 14,
       textAlign: 'center'
     }

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

@@ -44,12 +44,15 @@ const setting = [
   {
     label: '玫瑰半径',
     // 设置组件类型
-    type: 'slider',
+    type: 'inputNumber',
     // 字段
     field: 'radius',
     // 对应options中的字段
     optionField: 'radius',
-    value: 1,
+    value: 0.9,
+    min: 0,
+    max: 1,
+    step: 0.01,
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -61,7 +64,7 @@ const setting = [
     field: 'label_style_fill',
     // 对应options中的字段
     optionField: 'label.style.fill',
-    value: '#ffffff',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -95,7 +98,7 @@ const setting = [
     type: 'switch', // 设置组件类型
     field: 'legendEnable', // 字段
     optionField: 'legendEnable', // 对应options中的字段
-    value: false,
+    value: true,
     active: true,
     inactive: false,
     tabName: 'custom',
@@ -108,7 +111,7 @@ const setting = [
     optionField: 'legendPosition', // 对应options中的字段
     // 是否多选
     multiple: false,
-    value: 'top',
+    value: 'right',
     tabName: 'custom',
     options: [
       { label: '顶部', value: 'top' },
@@ -151,7 +154,7 @@ const setting = [
     type: 'colorPicker',
     field: 'legendItemName_style_fill',
     optionField: 'legendItemName.style.fill',
-    value: '#595959',
+    value: '#e9e9e9',
     tabName: 'custom',
     groupName: 'legend'
   },
@@ -203,18 +206,18 @@ const option = {
   label: {
     offset: -15,
     style: {
-      fill: '#ffffff',
+      fill: '#e9e9e9',
       fontSize: 14,
       textAlign: 'center'
     }
   },
   legendEnable: true,
   legendLayout: 'vertical',
-  legendPosition: 'top',
+  legendPosition: 'right',
   legend: false,
   legendItemName: {
     style: {
-      fill: '#595959',
+      fill: '#e9e9e9',
       fontSize: 12,
       fontWeight: 400
     }