refactor: 代码合并

data-room-ui/packages/BasicComponents/Button/index.vue

@@ -30,6 +30,7 @@
 import commonMixins from 'data-room-ui/js/mixins/commonMixins'
 import linkageMixins from 'data-room-ui/js/mixins/linkageMixins'
 import { mapState } from 'vuex'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BasicComponentButton',
   mixins: [commonMixins, linkageMixins],
@@ -44,21 +45,9 @@ export default {
       type: Object,
       default: () => ({})
     },
-    predefineThemeColors: {
+     predefineThemeColors: {
       type: Array,
-      default: () => {
-        return [
-          '#007aff',
-          '#1aa97b',
-          '#ff4d53',
-          '#1890FF',
-          '#DF0E1B',
-          '#0086CC',
-          '#2B74CF',
-          '#00BC9D',
-          '#ED7D32'
-        ]
-      }
+      default: () => predefineColors
     }
   },
   mounted () {

data-room-ui/packages/BasicComponents/Button/setting.vue

@@ -151,21 +151,9 @@ export default {
       type: Object,
       required: true
     },
-    predefineThemeColors: {
+     predefineThemeColors: {
       type: Array,
-      default: () => {
-        return [
-          '#007aff',
-          '#1aa97b',
-          '#ff4d53',
-          '#1890FF',
-          '#DF0E1B',
-          '#0086CC',
-          '#2B74CF',
-          '#00BC9D',
-          '#ED7D32'
-        ]
-      }
+      default: () => predefineColors
     }
   },
   data () {

data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue

@@ -244,21 +244,9 @@ export default {
       type: Object,
       required: true
     },
-    predefineThemeColors: {
+     predefineThemeColors: {
       type: Array,
-      default: () => {
-        return [
-          '#007aff',
-          '#1aa97b',
-          '#ff4d53',
-          '#1890FF',
-          '#DF0E1B',
-          '#0086CC',
-          '#2B74CF',
-          '#00BC9D',
-          '#ED7D32'
-        ]
-      }
+      default: () => predefineColors
     }
   },
 

data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue

@@ -177,17 +177,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/BasicComponents/FlyMap/setting.vue

@@ -369,17 +369,7 @@ export default {
       mapTree: [],
       mapList: [],
       currentMap: {},
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ],
+      predefineThemeColors: predefineColors,
       symbolList:[
         {
           name:'箭头',

data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue

@@ -109,21 +109,9 @@ export default {
       type: Object,
       required: true
     },
-    predefineThemeColors: {
+     predefineThemeColors: {
       type: Array,
-      default: () => {
-        return [
-          '#007aff',
-          '#1aa97b',
-          '#ff4d53',
-          '#1890FF',
-          '#DF0E1B',
-          '#0086CC',
-          '#2B74CF',
-          '#00BC9D',
-          '#ED7D32'
-        ]
-      }
+      default: () => predefineColors
     }
   },
   data () {

data-room-ui/packages/BasicComponents/IndexCard/setting.vue

@@ -265,17 +265,7 @@ export default {
       }
     ],
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/BasicComponents/IndexCard2/setting.vue

@@ -265,17 +265,7 @@ export default {
       }
     ],
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue

@@ -238,17 +238,7 @@ export default {
       }
     ],
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue

@@ -238,17 +238,7 @@ export default {
       }
     ],
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/BasicComponents/Input/setting.vue

@@ -207,21 +207,9 @@ export default {
       type: Object,
       required: true
     },
-    predefineThemeColors: {
+     predefineThemeColors: {
       type: Array,
-      default: () => {
-        return [
-          '#007aff',
-          '#1aa97b',
-          '#ff4d53',
-          '#1890FF',
-          '#DF0E1B',
-          '#0086CC',
-          '#2B74CF',
-          '#00BC9D',
-          '#ED7D32'
-        ]
-      }
+      default: () => predefineColors
     }
   },
   data () {

data-room-ui/packages/BasicComponents/Map/setting.vue

@@ -343,17 +343,7 @@ export default {
   data () {
     return {
       mapList: [],
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ],
+      predefineThemeColors: predefineColors,
       mapTree: [],
       currentMap: {},
       levelList: [

data-room-ui/packages/BasicComponents/Marquee/setting.vue

@@ -342,17 +342,7 @@ export default {
   },
   data () {
     return {
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ],
+      predefineThemeColors: predefineColors,
       directionList: [
         {
           value: 'right',

data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue

@@ -141,17 +141,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/BasicComponents/ScreenScrollRanking/setting.vue

@@ -88,6 +88,7 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -99,17 +100,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/BasicComponents/Select/setting.vue

@@ -108,21 +108,9 @@ export default {
       type: Object,
       required: true
     },
-    predefineThemeColors: {
+     predefineThemeColors: {
       type: Array,
-      default: () => {
-        return [
-          '#007aff',
-          '#1aa97b',
-          '#ff4d53',
-          '#1890FF',
-          '#DF0E1B',
-          '#0086CC',
-          '#2B74CF',
-          '#00BC9D',
-          '#ED7D32'
-        ]
-      }
+      default: () => predefineColors
     }
   },
   data () {

data-room-ui/packages/BasicComponents/Tables/setting.vue

@@ -126,17 +126,7 @@ export default {
   mixins: [chartSettingMixins],
   data () {
     return {
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/BasicComponents/TimePicker/setting.vue

@@ -200,21 +200,9 @@ export default {
       type: Object,
       required: true
     },
-    predefineThemeColors: {
+     predefineThemeColors: {
       type: Array,
-      default: () => {
-        return [
-          '#007aff',
-          '#1aa97b',
-          '#ff4d53',
-          '#1890FF',
-          '#DF0E1B',
-          '#0086CC',
-          '#2B74CF',
-          '#00BC9D',
-          '#ED7D32'
-        ]
-      }
+      default: () => predefineColors
     }
   },
   watch: {},

data-room-ui/packages/BasicComponents/VerticalLine/setting.vue

@@ -107,21 +107,9 @@ export default {
       type: Object,
       required: true
     },
-    predefineThemeColors: {
+     predefineThemeColors: {
       type: Array,
-      default: () => {
-        return [
-          '#007aff',
-          '#1aa97b',
-          '#ff4d53',
-          '#1890FF',
-          '#DF0E1B',
-          '#0086CC',
-          '#2B74CF',
-          '#00BC9D',
-          '#ED7D32'
-        ]
-      }
+      default: () => predefineColors
     }
   },
   data () {

data-room-ui/packages/BasicComponents/Video/setting.vue

@@ -81,6 +81,7 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border14Setting',
   components: {
@@ -94,21 +95,9 @@ export default {
       type: Object,
       required: true
     },
-    predefineThemeColors: {
+     predefineThemeColors: {
       type: Array,
-      default: () => {
-        return [
-          '#007aff',
-          '#1aa97b',
-          '#ff4d53',
-          '#1890FF',
-          '#DF0E1B',
-          '#0086CC',
-          '#2B74CF',
-          '#00BC9D',
-          '#ED7D32'
-        ]
-      }
+      default: () => predefineColors
     }
   },
   data () {

data-room-ui/packages/BigScreenDesign/BorderSetting.vue

@@ -147,21 +147,9 @@ export default {
       type: Object,
       required: true
     },
-    predefineThemeColors: {
+     predefineThemeColors: {
       type: Array,
-      default: () => {
-        return [
-          '#007aff',
-          '#1aa97b',
-          '#ff4d53',
-          '#1890FF',
-          '#DF0E1B',
-          '#0086CC',
-          '#2B74CF',
-          '#00BC9D',
-          '#ED7D32'
-        ]
-      }
+      default: () => predefineColors
     }
   },
   data () {

data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue

@@ -189,6 +189,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import BgImg from './BgImgDialog.vue'
 import { mapState, mapMutations } from 'vuex'
 import { themeToSetting } from 'data-room-ui/js/utils/themeFormatting'
+import {predefineColors} from 'data-room-ui/js/utils/colorList'
 export default {
   name: 'OverallSetting',
   components: {
@@ -293,17 +294,7 @@ export default {
         fitMode: 'none'
       },
       // 预设主题色
-      predefineColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ],
+      predefineColors,
       // 图表列表
       chartOptions: []
     }

data-room-ui/packages/BizComponent/config/defaultG2Config.js

@@ -432,7 +432,7 @@ const option = {
   smooth: true,
   lineStyle: {
     lineWidth: 2,
-    stroke: 'l(0) 0:#5F92F9 1:#62FF00'
+    stroke: 'l(0) 0:#6b74e4 1:#4391f4'
   },
   xAxis: {
     title: {

data-room-ui/packages/Borders/Border1/setting.vue

@@ -12,6 +12,7 @@
 </template>
 <script>
 import BorderSetting from 'data-room-ui/BigScreenDesign/BorderSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border1Setting',
   components: {
@@ -20,17 +21,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Borders/Border10/setting.vue

@@ -9,6 +9,7 @@
 </template>
 <script>
 import BorderSetting from 'data-room-ui/BigScreenDesign/BorderSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border10Setting',
   components: {
@@ -17,17 +18,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Borders/Border11/setting.vue

@@ -28,6 +28,7 @@
 </template>
 <script>
 import BorderSetting from 'data-room-ui/BigScreenDesign/BorderSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border11Setting',
   components: {
@@ -36,17 +37,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Borders/Border12/setting.vue

@@ -9,6 +9,7 @@
 </template>
 <script>
 import BorderSetting from 'data-room-ui/BigScreenDesign/BorderSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border12Setting',
   components: {
@@ -17,17 +18,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Borders/Border13/setting.vue

@@ -9,6 +9,7 @@
 </template>
 <script>
 import BorderSetting from 'data-room-ui/BigScreenDesign/BorderSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border13Setting',
   components: {
@@ -17,17 +18,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Borders/Border14/setting.vue

@@ -107,6 +107,7 @@
 <script>
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
+import {predefineColors} from 'data-room-ui/js/utils/colorList'
 export default {
   name: 'Border14Setting',
   components: {
@@ -120,19 +121,7 @@ export default {
     },
     predefineThemeColors: {
       type: Array,
-      default: () => {
-        return [
-          '#007aff',
-          '#1aa97b',
-          '#ff4d53',
-          '#1890FF',
-          '#DF0E1B',
-          '#0086CC',
-          '#2B74CF',
-          '#00BC9D',
-          '#ED7D32'
-        ]
-      }
+      default: () => predefineColors
     }
   },
   data () {

data-room-ui/packages/Borders/Border15/setting.vue

@@ -109,6 +109,7 @@
 <script>
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border14Setting',
   components: {
@@ -120,21 +121,9 @@ export default {
       type: Object,
       required: true
     },
-    predefineThemeColors: {
+     predefineThemeColors: {
       type: Array,
-      default: () => {
-        return [
-          '#007aff',
-          '#1aa97b',
-          '#ff4d53',
-          '#1890FF',
-          '#DF0E1B',
-          '#0086CC',
-          '#2B74CF',
-          '#00BC9D',
-          '#ED7D32'
-        ]
-      }
+      default: () => predefineColors
     }
   },
   data () {

data-room-ui/packages/Borders/Border2/setting.vue

@@ -9,6 +9,7 @@
 </template>
 <script>
 import BorderSetting from 'data-room-ui/BigScreenDesign/BorderSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border2Setting',
   components: {
@@ -17,17 +18,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Borders/Border3/setting.vue

@@ -9,6 +9,7 @@
 </template>
 <script>
 import BorderSetting from 'data-room-ui/BigScreenDesign/BorderSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border3Setting',
   components: {
@@ -17,17 +18,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Borders/Border4/setting.vue

@@ -19,6 +19,7 @@
 </template>
 <script>
 import BorderSetting from 'data-room-ui/BigScreenDesign/BorderSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border4Setting',
   components: {
@@ -27,17 +28,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Borders/Border5/setting.vue

@@ -19,6 +19,7 @@
 </template>
 <script>
 import BorderSetting from 'data-room-ui/BigScreenDesign/BorderSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border5Setting',
   components: {
@@ -27,17 +28,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Borders/Border6/setting.vue

@@ -9,6 +9,7 @@
 </template>
 <script>
 import BorderSetting from 'data-room-ui/BigScreenDesign/BorderSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border6Setting',
   components: {
@@ -17,17 +18,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Borders/Border7/setting.vue

@@ -9,6 +9,7 @@
 </template>
 <script>
 import BorderSetting from 'data-room-ui/BigScreenDesign/BorderSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border7Setting',
   components: {
@@ -17,17 +18,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Borders/Border8/setting.vue

@@ -28,6 +28,7 @@
 </template>
 <script>
 import BorderSetting from 'data-room-ui/BigScreenDesign/BorderSetting.vue'
+import {predefineColors} from 'data-room-ui/js/utils/colorList'
 export default {
   name: 'Border8Setting',
   components: {
@@ -36,17 +37,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors:predefineColors
     }
   },
   computed: {

data-room-ui/packages/Borders/Border9/setting.vue

@@ -9,6 +9,7 @@
 </template>
 <script>
 import BorderSetting from 'data-room-ui/BigScreenDesign/BorderSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border9Setting',
   components: {
@@ -17,17 +18,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/ColorMultipleSelect/index.vue

@@ -53,19 +53,19 @@ export default {
       colorList: [
         {
           label: '配色1',
-          value: JSON.stringify(['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'])
+          value: JSON.stringify(['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'])
         },
         {
           label: '配色2',
-          value: JSON.stringify(['#FF6B3B', '#626681', '#FFC100', '#9FB40F', '#76523B', '#DAD5B5', '#0E8E89', '#E19348', '#F383A2', '#247FEA'])
+          value: JSON.stringify(['#FF6B3B', '#626681', '#FFC100', '#9FB40F', '#76523B'])
         },
         {
           label: '配色3',
-          value: JSON.stringify(['#025DF4', '#DB6BCF', '#2498D1', '#BBBDE6', '#4045B2', '#21A97A', '#FF745A', '#007E99', '#FFA8A8', '#2391FF'])
+          value: JSON.stringify(['#025DF4', '#DB6BCF', '#2498D1', '#BBBDE6', '#4045B2'])
         },
         {
           label: '配色4',
-          value: JSON.stringify(['#FF4500', '#1AAF8B', '#406C85', '#F6BD16', '#B40F0F', '#2FB8FC', '#4435FF', '#FF5CA2', '#BBE800', '#FE8A26'])
+          value: JSON.stringify(['#FF4500', '#1AAF8B', '#406C85', '#F6BD16', '#B40F0F'])
         }
       ],
       colorValue: []

data-room-ui/packages/ColorPicker/index.vue

@@ -18,6 +18,7 @@
 </template>
 
 <script>
+import {predefineColors} from 'data-room-ui/js/utils/colorList'
 export default {
   name: 'ColorPicker',
   props: {
@@ -31,17 +32,7 @@ export default {
     }, // 输入框的占位文本
     predefineColors: { // 预定义的主题颜色
       type: Array,
-      default: () => [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      default: () => predefineColors
     }
   },
   data () {

data-room-ui/packages/Decorations/Decoration1/setting.vue

@@ -57,6 +57,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -68,17 +69,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Decorations/Decoration10/setting.vue

@@ -57,6 +57,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -68,17 +69,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Decorations/Decoration11/setting.vue

@@ -57,6 +57,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -68,17 +69,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Decorations/Decoration12/setting.vue

@@ -68,6 +68,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -79,17 +80,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Decorations/Decoration2/setting.vue

@@ -62,6 +62,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -73,17 +74,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Decorations/Decoration2Reverse/setting.vue

@@ -62,6 +62,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -73,17 +74,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Decorations/Decoration3/setting.vue

@@ -54,6 +54,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -65,17 +66,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Decorations/Decoration4/setting.vue

@@ -62,6 +62,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -73,17 +74,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Decorations/Decoration4Reverse/setting.vue

@@ -62,6 +62,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -73,17 +74,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Decorations/Decoration5/setting.vue

@@ -65,6 +65,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -76,17 +77,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Decorations/Decoration6/setting.vue

@@ -57,6 +57,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -68,17 +69,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Decorations/Decoration8/setting.vue

@@ -57,6 +57,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -68,17 +69,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Decorations/Decoration8Reverse/setting.vue

@@ -57,6 +57,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -68,17 +69,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

data-room-ui/packages/Decorations/Decoration9/setting.vue

@@ -65,6 +65,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {
@@ -76,17 +77,7 @@ export default {
   data () {
     return {
       // 预设主题色
-      predefineThemeColors: [
-        '#007aff',
-        '#1aa97b',
-        '#ff4d53',
-        '#1890FF',
-        '#DF0E1B',
-        '#0086CC',
-        '#2B74CF',
-        '#00BC9D',
-        '#ED7D32'
-      ]
+      predefineThemeColors: predefineColors
     }
   },
   computed: {

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

@@ -169,7 +169,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'
   },
@@ -497,7 +497,7 @@ const option = {
   smooth: false,
   lineStyle: {
     lineWidth: 2,
-    stroke: 'l(0) 0:#5F92F9 1:#62FF00'
+    stroke: 'l(0) 0:#6b74e4 1:#4391f4'
   },
   label: {
     style: {

data-room-ui/packages/G2Plots/折线图/基础折线点图.js

@@ -160,7 +160,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'
   },
@@ -509,7 +509,7 @@ const option = {
   },
   lineStyle: {
     lineWidth: 2,
-    stroke: 'l(0) 0:#5F92F9 1:#62FF00'
+    stroke: 'l(0) 0:#6b74e4 1:#4391f4'
   },
   xAxis: {
     title: {

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

@@ -387,7 +387,7 @@ const option = {
   smooth: true,
   lineStyle: {
     lineWidth: 2,
-    stroke: 'l(0) 0:#5F92F9 1:#62FF00'
+    stroke: 'l(0) 0:#6b74e4 1:#4391f4'
   },
   xAxis: {
     title: {

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'
   },
@@ -473,101 +473,86 @@ const setting = [
 
 // 模拟数据
 const data = [
-  { name: 'China', year: '2000', gdp: 1211346869605.24 },
-  { name: 'China', year: '2001', gdp: 1339395718865.3 },
-  { name: 'China', year: '2002', gdp: 1470550015081.55 },
-  { name: 'China', year: '2003', gdp: 1660287965662.68 },
-  { name: 'China', year: '2004', gdp: 1955347004963.27 },
-  { name: 'China', year: '2005', gdp: 2285965892360.54 },
-  { name: 'China', year: '2006', gdp: 2752131773355.16 },
-  { name: 'China', year: '2007', gdp: 3550342425238.25 },
-  { name: 'China', year: '2008', gdp: 4594306848763.08 },
-  { name: 'China', year: '2009', gdp: 5101702432883.45 },
-  { name: 'China', year: '2010', gdp: 6087164527421.24 },
-  { name: 'China', year: '2011', gdp: 7551500425597.77 },
-  { name: 'China', year: '2012', gdp: 8532230724141.76 },
-  { name: 'China', year: '2013', gdp: 9570405758739.79 },
-  { name: 'China', year: '2014', gdp: 10438529153237.6 },
-  { name: 'China', year: '2015', gdp: 11015542352468.9 },
-  { name: 'China', year: '2016', gdp: 11137945669350.6 },
-  { name: 'China', year: '2017', gdp: 12143491448186.1 },
-  { name: 'China', year: '2018', gdp: 13608151864637.9 },
-  { name: 'United States', year: '2000', gdp: 10252345464000 },
-  { name: 'United States', year: '2001', gdp: 10581821399000 },
-  { name: 'United States', year: '2002', gdp: 10936419054000 },
-  { name: 'United States', year: '2003', gdp: 11458243878000 },
-  { name: 'United States', year: '2004', gdp: 12213729147000 },
-  { name: 'United States', year: '2005', gdp: 13036640229000 },
-  { name: 'United States', year: '2006', gdp: 13814611414000 },
-  { name: 'United States', year: '2007', gdp: 14451858650000 },
-  { name: 'United States', year: '2008', gdp: 14712844084000 },
-  { name: 'United States', year: '2009', gdp: 14448933025000 },
-  { name: 'United States', year: '2010', gdp: 14992052727000 },
-  { name: 'United States', year: '2011', gdp: 15542581104000 },
-  { name: 'United States', year: '2012', gdp: 16197007349000 },
-  { name: 'United States', year: '2013', gdp: 16784849190000 },
-  { name: 'United States', year: '2014', gdp: 17521746534000 },
-  { name: 'United States', year: '2015', gdp: 18219297584000 },
-  { name: 'United States', year: '2016', gdp: 18707188235000 },
-  { name: 'United States', year: '2017', gdp: 19485393853000 },
-  { name: 'United States', year: '2018', gdp: 20544343456936.5 },
-  { name: 'United Kingdom', year: '2000', gdp: 1657816613708.58 },
-  { name: 'United Kingdom', year: '2001', gdp: 1640246149417.01 },
-  { name: 'United Kingdom', year: '2002', gdp: 1784473920863.31 },
-  { name: 'United Kingdom', year: '2003', gdp: 2053018775510.2 },
-  { name: 'United Kingdom', year: '2004', gdp: 2416931526913.22 },
-  { name: 'United Kingdom', year: '2005', gdp: 2538680000000 },
-  { name: 'United Kingdom', year: '2006', gdp: 2713749770009.2 },
-  { name: 'United Kingdom', year: '2007', gdp: 3100882352941.18 },
-  { name: 'United Kingdom', year: '2008', gdp: 2922667279411.76 },
-  { name: 'United Kingdom', year: '2009', gdp: 2410909799034.12 },
-  { name: 'United Kingdom', year: '2010', gdp: 2475244321361.11 },
-  { name: 'United Kingdom', year: '2011', gdp: 2659310054646.23 },
-  { name: 'United Kingdom', year: '2012', gdp: 2704887678386.72 },
-  { name: 'United Kingdom', year: '2013', gdp: 2786022872706.81 },
-  { name: 'United Kingdom', year: '2014', gdp: 3063803240208.01 },
-  { name: 'United Kingdom', year: '2015', gdp: 2928591002002.51 },
-  { name: 'United Kingdom', year: '2016', gdp: 2694283209613.29 },
-  { name: 'United Kingdom', year: '2017', gdp: 2666229179958.01 },
-  { name: 'United Kingdom', year: '2018', gdp: 2855296731521.96 },
-  { name: 'Russian', year: '2000', gdp: 259710142196.94 },
-  { name: 'Russian', year: '2001', gdp: 306602070620.5 },
-  { name: 'Russian', year: '2002', gdp: 345470494417.86 },
-  { name: 'Russian', year: '2003', gdp: 430347770731.79 },
-  { name: 'Russian', year: '2004', gdp: 591016690742.8 },
-  { name: 'Russian', year: '2005', gdp: 764017107992.39 },
-  { name: 'Russian', year: '2006', gdp: 989930542278.7 },
-  { name: 'Russian', year: '2007', gdp: 1299705764823.62 },
-  { name: 'Russian', year: '2008', gdp: 1660846387624.78 },
-  { name: 'Russian', year: '2009', gdp: 1222644282201.86 },
-  { name: 'Russian', year: '2010', gdp: 1524917468442.01 },
-  { name: 'Russian', year: '2011', gdp: 2051661732059.78 },
-  { name: 'Russian', year: '2012', gdp: 2210256976945.38 },
-  { name: 'Russian', year: '2013', gdp: 2297128039058.21 },
-  { name: 'Russian', year: '2014', gdp: 2059984158438.46 },
-  { name: 'Russian', year: '2015', gdp: 1363594369577.82 },
-  { name: 'Russian', year: '2016', gdp: 1282723881134.01 },
-  { name: 'Russian', year: '2017', gdp: 1578624060588.26 },
-  { name: 'Russian', year: '2018', gdp: 1657554647149.87 },
-  { name: 'Japan', year: '2000', gdp: 4887519660744.86 },
-  { name: 'Japan', year: '2001', gdp: 4303544259842.72 },
-  { name: 'Japan', year: '2002', gdp: 4115116279069.77 },
-  { name: 'Japan', year: '2003', gdp: 4445658071221.86 },
-  { name: 'Japan', year: '2004', gdp: 4815148854362.11 },
-  { name: 'Japan', year: '2005', gdp: 4755410630912.14 },
-  { name: 'Japan', year: '2006', gdp: 4530377224970.4 },
-  { name: 'Japan', year: '2007', gdp: 4515264514430.57 },
-  { name: 'Japan', year: '2008', gdp: 5037908465114.48 },
-  { name: 'Japan', year: '2009', gdp: 5231382674593.7 },
-  { name: 'Japan', year: '2010', gdp: 5700098114744.41 },
-  { name: 'Japan', year: '2011', gdp: 6157459594823.72 },
-  { name: 'Japan', year: '2012', gdp: 6203213121334.12 },
-  { name: 'Japan', year: '2013', gdp: 5155717056270.83 },
-  { name: 'Japan', year: '2014', gdp: 4850413536037.84 },
-  { name: 'Japan', year: '2015', gdp: 4389475622588.97 },
-  { name: 'Japan', year: '2016', gdp: 4926667087367.51 },
-  { name: 'Japan', year: '2017', gdp: 4859950558538.97 },
-  { name: 'Japan', year: '2018', gdp: 4971323079771.87 }
+  {
+    year:'1',
+    value:100,
+    type:'今年'
+  },
+  {
+    year:'2',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'3',
+    value:300,
+    type:'今年'
+  },
+  {
+    year:'4',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'5',
+    value:100,
+    type:'今年'
+  },
+  {
+    year:'6',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'7',
+    value:300,
+    type:'今年'
+  },
+  {
+    year:'8',
+    value:400,
+    type:'今年'
+  },
+  {
+    year:'1',
+    value:400,
+    type:'去年'
+  },
+  {
+    year:'2',
+    value:100,
+    type:'去年'
+  },
+  {
+    year:'3',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'4',
+    value:300,
+    type:'去年'
+  },
+  {
+    year:'5',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'6',
+    value:100,
+    type:'去年'
+  },
+  {
+    year:'7',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'8',
+    value:300,
+    type:'去年'
+  }
 ]
 
 // 配置处理脚本
@@ -586,10 +571,10 @@ 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',
+  yField: 'value',
+  seriesField: 'type',
   xAxis: {
     title: {
       text: '',

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'
   },
@@ -435,831 +435,86 @@ const setting = [
 
 // 模拟数据
 const data = [
-  { year: '1850', value: 0, category: 'Liquid fuel' },
-  { year: '1850', value: 54, category: 'Solid fuel' },
-  { year: '1850', value: 0, category: 'Gas fuel' },
-  { year: '1850', value: 0, category: 'Cement production' },
-  { year: '1850', value: 0, category: 'Gas flarinl' },
-  { year: '1851', value: 0, category: 'Liquid fuel' },
-  { year: '1851', value: 54, category: 'Solid fuel' },
-  { year: '1851', value: 0, category: 'Gas fuel' },
-  { year: '1851', value: 0, category: 'Cement production' },
-  { year: '1851', value: 0, category: 'Gas flarinl' },
-  { year: '1852', value: 0, category: 'Liquid fuel' },
-  { year: '1852', value: 57, category: 'Solid fuel' },
-  { year: '1852', value: 0, category: 'Gas fuel' },
-  { year: '1852', value: 0, category: 'Cement production' },
-  { year: '1852', value: 0, category: 'Gas flarinl' },
-  { year: '1853', value: 0, category: 'Liquid fuel' },
-  { year: '1853', value: 59, category: 'Solid fuel' },
-  { year: '1853', value: 0, category: 'Gas fuel' },
-  { year: '1853', value: 0, category: 'Cement production' },
-  { year: '1853', value: 0, category: 'Gas flarinl' },
-  { year: '1854', value: 0, category: 'Liquid fuel' },
-  { year: '1854', value: 69, category: 'Solid fuel' },
-  { year: '1854', value: 0, category: 'Gas fuel' },
-  { year: '1854', value: 0, category: 'Cement production' },
-  { year: '1854', value: 0, category: 'Gas flarinl' },
-  { year: '1855', value: 0, category: 'Liquid fuel' },
-  { year: '1855', value: 71, category: 'Solid fuel' },
-  { year: '1855', value: 0, category: 'Gas fuel' },
-  { year: '1855', value: 0, category: 'Cement production' },
-  { year: '1855', value: 0, category: 'Gas flarinl' },
-  { year: '1856', value: 0, category: 'Liquid fuel' },
-  { year: '1856', value: 76, category: 'Solid fuel' },
-  { year: '1856', value: 0, category: 'Gas fuel' },
-  { year: '1856', value: 0, category: 'Cement production' },
-  { year: '1856', value: 0, category: 'Gas flarinl' },
-  { year: '1857', value: 0, category: 'Liquid fuel' },
-  { year: '1857', value: 77, category: 'Solid fuel' },
-  { year: '1857', value: 0, category: 'Gas fuel' },
-  { year: '1857', value: 0, category: 'Cement production' },
-  { year: '1857', value: 0, category: 'Gas flarinl' },
-  { year: '1858', value: 0, category: 'Liquid fuel' },
-  { year: '1858', value: 78, category: 'Solid fuel' },
-  { year: '1858', value: 0, category: 'Gas fuel' },
-  { year: '1858', value: 0, category: 'Cement production' },
-  { year: '1858', value: 0, category: 'Gas flarinl' },
-  { year: '1859', value: 0, category: 'Liquid fuel' },
-  { year: '1859', value: 83, category: 'Solid fuel' },
-  { year: '1859', value: 0, category: 'Gas fuel' },
-  { year: '1859', value: 0, category: 'Cement production' },
-  { year: '1859', value: 0, category: 'Gas flarinl' },
-  { year: '1860', value: 0, category: 'Liquid fuel' },
-  { year: '1860', value: 91, category: 'Solid fuel' },
-  { year: '1860', value: 0, category: 'Gas fuel' },
-  { year: '1860', value: 0, category: 'Cement production' },
-  { year: '1860', value: 0, category: 'Gas flarinl' },
-  { year: '1861', value: 0, category: 'Liquid fuel' },
-  { year: '1861', value: 95, category: 'Solid fuel' },
-  { year: '1861', value: 0, category: 'Gas fuel' },
-  { year: '1861', value: 0, category: 'Cement production' },
-  { year: '1861', value: 0, category: 'Gas flarinl' },
-  { year: '1862', value: 0, category: 'Liquid fuel' },
-  { year: '1862', value: 96, category: 'Solid fuel' },
-  { year: '1862', value: 0, category: 'Gas fuel' },
-  { year: '1862', value: 0, category: 'Cement production' },
-  { year: '1862', value: 0, category: 'Gas flarinl' },
-  { year: '1863', value: 0, category: 'Liquid fuel' },
-  { year: '1863', value: 103, category: 'Solid fuel' },
-  { year: '1863', value: 0, category: 'Gas fuel' },
-  { year: '1863', value: 0, category: 'Cement production' },
-  { year: '1863', value: 0, category: 'Gas flarinl' },
-  { year: '1864', value: 0, category: 'Liquid fuel' },
-  { year: '1864', value: 112, category: 'Solid fuel' },
-  { year: '1864', value: 0, category: 'Gas fuel' },
-  { year: '1864', value: 0, category: 'Cement production' },
-  { year: '1864', value: 0, category: 'Gas flarinl' },
-  { year: '1865', value: 0, category: 'Liquid fuel' },
-  { year: '1865', value: 119, category: 'Solid fuel' },
-  { year: '1865', value: 0, category: 'Gas fuel' },
-  { year: '1865', value: 0, category: 'Cement production' },
-  { year: '1865', value: 0, category: 'Gas flarinl' },
-  { year: '1866', value: 0, category: 'Liquid fuel' },
-  { year: '1866', value: 122, category: 'Solid fuel' },
-  { year: '1866', value: 0, category: 'Gas fuel' },
-  { year: '1866', value: 0, category: 'Cement production' },
-  { year: '1866', value: 0, category: 'Gas flarinl' },
-  { year: '1867', value: 0, category: 'Liquid fuel' },
-  { year: '1867', value: 130, category: 'Solid fuel' },
-  { year: '1867', value: 0, category: 'Gas fuel' },
-  { year: '1867', value: 0, category: 'Cement production' },
-  { year: '1867', value: 0, category: 'Gas flarinl' },
-  { year: '1868', value: 0, category: 'Liquid fuel' },
-  { year: '1868', value: 134, category: 'Solid fuel' },
-  { year: '1868', value: 0, category: 'Gas fuel' },
-  { year: '1868', value: 0, category: 'Cement production' },
-  { year: '1868', value: 0, category: 'Gas flarinl' },
-  { year: '1869', value: 0, category: 'Liquid fuel' },
-  { year: '1869', value: 142, category: 'Solid fuel' },
-  { year: '1869', value: 0, category: 'Gas fuel' },
-  { year: '1869', value: 0, category: 'Cement production' },
-  { year: '1869', value: 0, category: 'Gas flarinl' },
-  { year: '1870', value: 1, category: 'Liquid fuel' },
-  { year: '1870', value: 146, category: 'Solid fuel' },
-  { year: '1870', value: 0, category: 'Gas fuel' },
-  { year: '1870', value: 0, category: 'Cement production' },
-  { year: '1870', value: 0, category: 'Gas flarinl' },
-  { year: '1871', value: 1, category: 'Liquid fuel' },
-  { year: '1871', value: 156, category: 'Solid fuel' },
-  { year: '1871', value: 0, category: 'Gas fuel' },
-  { year: '1871', value: 0, category: 'Cement production' },
-  { year: '1871', value: 0, category: 'Gas flarinl' },
-  { year: '1872', value: 1, category: 'Liquid fuel' },
-  { year: '1872', value: 173, category: 'Solid fuel' },
-  { year: '1872', value: 0, category: 'Gas fuel' },
-  { year: '1872', value: 0, category: 'Cement production' },
-  { year: '1872', value: 0, category: 'Gas flarinl' },
-  { year: '1873', value: 1, category: 'Liquid fuel' },
-  { year: '1873', value: 183, category: 'Solid fuel' },
-  { year: '1873', value: 0, category: 'Gas fuel' },
-  { year: '1873', value: 0, category: 'Cement production' },
-  { year: '1873', value: 0, category: 'Gas flarinl' },
-  { year: '1874', value: 1, category: 'Liquid fuel' },
-  { year: '1874', value: 173, category: 'Solid fuel' },
-  { year: '1874', value: 0, category: 'Gas fuel' },
-  { year: '1874', value: 0, category: 'Cement production' },
-  { year: '1874', value: 0, category: 'Gas flarinl' },
-  { year: '1875', value: 1, category: 'Liquid fuel' },
-  { year: '1875', value: 187, category: 'Solid fuel' },
-  { year: '1875', value: 0, category: 'Gas fuel' },
-  { year: '1875', value: 0, category: 'Cement production' },
-  { year: '1875', value: 0, category: 'Gas flarinl' },
-  { year: '1876', value: 1, category: 'Liquid fuel' },
-  { year: '1876', value: 190, category: 'Solid fuel' },
-  { year: '1876', value: 0, category: 'Gas fuel' },
-  { year: '1876', value: 0, category: 'Cement production' },
-  { year: '1876', value: 0, category: 'Gas flarinl' },
-  { year: '1877', value: 2, category: 'Liquid fuel' },
-  { year: '1877', value: 192, category: 'Solid fuel' },
-  { year: '1877', value: 0, category: 'Gas fuel' },
-  { year: '1877', value: 0, category: 'Cement production' },
-  { year: '1877', value: 0, category: 'Gas flarinl' },
-  { year: '1878', value: 2, category: 'Liquid fuel' },
-  { year: '1878', value: 194, category: 'Solid fuel' },
-  { year: '1878', value: 0, category: 'Gas fuel' },
-  { year: '1878', value: 0, category: 'Cement production' },
-  { year: '1878', value: 0, category: 'Gas flarinl' },
-  { year: '1879', value: 3, category: 'Liquid fuel' },
-  { year: '1879', value: 207, category: 'Solid fuel' },
-  { year: '1879', value: 0, category: 'Gas fuel' },
-  { year: '1879', value: 0, category: 'Cement production' },
-  { year: '1879', value: 0, category: 'Gas flarinl' },
-  { year: '1880', value: 3, category: 'Liquid fuel' },
-  { year: '1880', value: 233, category: 'Solid fuel' },
-  { year: '1880', value: 0, category: 'Gas fuel' },
-  { year: '1880', value: 0, category: 'Cement production' },
-  { year: '1880', value: 0, category: 'Gas flarinl' },
-  { year: '1881', value: 4, category: 'Liquid fuel' },
-  { year: '1881', value: 239, category: 'Solid fuel' },
-  { year: '1881', value: 0, category: 'Gas fuel' },
-  { year: '1881', value: 0, category: 'Cement production' },
-  { year: '1881', value: 0, category: 'Gas flarinl' },
-  { year: '1882', value: 4, category: 'Liquid fuel' },
-  { year: '1882', value: 252, category: 'Solid fuel' },
-  { year: '1882', value: 0, category: 'Gas fuel' },
-  { year: '1882', value: 0, category: 'Cement production' },
-  { year: '1882', value: 0, category: 'Gas flarinl' },
-  { year: '1883', value: 3, category: 'Liquid fuel' },
-  { year: '1883', value: 269, category: 'Solid fuel' },
-  { year: '1883', value: 0, category: 'Gas fuel' },
-  { year: '1883', value: 0, category: 'Cement production' },
-  { year: '1883', value: 0, category: 'Gas flarinl' },
-  { year: '1884', value: 4, category: 'Liquid fuel' },
-  { year: '1884', value: 271, category: 'Solid fuel' },
-  { year: '1884', value: 0, category: 'Gas fuel' },
-  { year: '1884', value: 0, category: 'Cement production' },
-  { year: '1884', value: 0, category: 'Gas flarinl' },
-  { year: '1885', value: 4, category: 'Liquid fuel' },
-  { year: '1885', value: 273, category: 'Solid fuel' },
-  { year: '1885', value: 1, category: 'Gas fuel' },
-  { year: '1885', value: 0, category: 'Cement production' },
-  { year: '1885', value: 0, category: 'Gas flarinl' },
-  { year: '1886', value: 5, category: 'Liquid fuel' },
-  { year: '1886', value: 275, category: 'Solid fuel' },
-  { year: '1886', value: 2, category: 'Gas fuel' },
-  { year: '1886', value: 0, category: 'Cement production' },
-  { year: '1886', value: 0, category: 'Gas flarinl' },
-  { year: '1887', value: 5, category: 'Liquid fuel' },
-  { year: '1887', value: 287, category: 'Solid fuel' },
-  { year: '1887', value: 3, category: 'Gas fuel' },
-  { year: '1887', value: 0, category: 'Cement production' },
-  { year: '1887', value: 0, category: 'Gas flarinl' },
-  { year: '1888', value: 5, category: 'Liquid fuel' },
-  { year: '1888', value: 317, category: 'Solid fuel' },
-  { year: '1888', value: 5, category: 'Gas fuel' },
-  { year: '1888', value: 0, category: 'Cement production' },
-  { year: '1888', value: 0, category: 'Gas flarinl' },
-  { year: '1889', value: 6, category: 'Liquid fuel' },
-  { year: '1889', value: 318, category: 'Solid fuel' },
-  { year: '1889', value: 3, category: 'Gas fuel' },
-  { year: '1889', value: 0, category: 'Cement production' },
-  { year: '1889', value: 0, category: 'Gas flarinl' },
-  { year: '1890', value: 8, category: 'Liquid fuel' },
-  { year: '1890', value: 345, category: 'Solid fuel' },
-  { year: '1890', value: 3, category: 'Gas fuel' },
-  { year: '1890', value: 0, category: 'Cement production' },
-  { year: '1890', value: 0, category: 'Gas flarinl' },
-  { year: '1891', value: 9, category: 'Liquid fuel' },
-  { year: '1891', value: 360, category: 'Solid fuel' },
-  { year: '1891', value: 2, category: 'Gas fuel' },
-  { year: '1891', value: 0, category: 'Cement production' },
-  { year: '1891', value: 0, category: 'Gas flarinl' },
-  { year: '1892', value: 9, category: 'Liquid fuel' },
-  { year: '1892', value: 363, category: 'Solid fuel' },
-  { year: '1892', value: 2, category: 'Gas fuel' },
-  { year: '1892', value: 0, category: 'Cement production' },
-  { year: '1892', value: 0, category: 'Gas flarinl' },
-  { year: '1893', value: 10, category: 'Liquid fuel' },
-  { year: '1893', value: 358, category: 'Solid fuel' },
-  { year: '1893', value: 2, category: 'Gas fuel' },
-  { year: '1893', value: 0, category: 'Cement production' },
-  { year: '1893', value: 0, category: 'Gas flarinl' },
-  { year: '1894', value: 9, category: 'Liquid fuel' },
-  { year: '1894', value: 372, category: 'Solid fuel' },
-  { year: '1894', value: 2, category: 'Gas fuel' },
-  { year: '1894', value: 0, category: 'Cement production' },
-  { year: '1894', value: 0, category: 'Gas flarinl' },
-  { year: '1895', value: 11, category: 'Liquid fuel' },
-  { year: '1895', value: 393, category: 'Solid fuel' },
-  { year: '1895', value: 2, category: 'Gas fuel' },
-  { year: '1895', value: 0, category: 'Cement production' },
-  { year: '1895', value: 0, category: 'Gas flarinl' },
-  { year: '1896', value: 12, category: 'Liquid fuel' },
-  { year: '1896', value: 405, category: 'Solid fuel' },
-  { year: '1896', value: 2, category: 'Gas fuel' },
-  { year: '1896', value: 0, category: 'Cement production' },
-  { year: '1896', value: 0, category: 'Gas flarinl' },
-  { year: '1897', value: 13, category: 'Liquid fuel' },
-  { year: '1897', value: 425, category: 'Solid fuel' },
-  { year: '1897', value: 2, category: 'Gas fuel' },
-  { year: '1897', value: 0, category: 'Cement production' },
-  { year: '1897', value: 0, category: 'Gas flarinl' },
-  { year: '1898', value: 13, category: 'Liquid fuel' },
-  { year: '1898', value: 449, category: 'Solid fuel' },
-  { year: '1898', value: 2, category: 'Gas fuel' },
-  { year: '1898', value: 0, category: 'Cement production' },
-  { year: '1898', value: 0, category: 'Gas flarinl' },
-  { year: '1899', value: 14, category: 'Liquid fuel' },
-  { year: '1899', value: 491, category: 'Solid fuel' },
-  { year: '1899', value: 3, category: 'Gas fuel' },
-  { year: '1899', value: 0, category: 'Cement production' },
-  { year: '1899', value: 0, category: 'Gas flarinl' },
-  { year: '1900', value: 16, category: 'Liquid fuel' },
-  { year: '1900', value: 515, category: 'Solid fuel' },
-  { year: '1900', value: 3, category: 'Gas fuel' },
-  { year: '1900', value: 0, category: 'Cement production' },
-  { year: '1900', value: 0, category: 'Gas flarinl' },
-  { year: '1901', value: 18, category: 'Liquid fuel' },
-  { year: '1901', value: 531, category: 'Solid fuel' },
-  { year: '1901', value: 4, category: 'Gas fuel' },
-  { year: '1901', value: 0, category: 'Cement production' },
-  { year: '1901', value: 0, category: 'Gas flarinl' },
-  { year: '1902', value: 19, category: 'Liquid fuel' },
-  { year: '1902', value: 543, category: 'Solid fuel' },
-  { year: '1902', value: 4, category: 'Gas fuel' },
-  { year: '1902', value: 0, category: 'Cement production' },
-  { year: '1902', value: 0, category: 'Gas flarinl' },
-  { year: '1903', value: 20, category: 'Liquid fuel' },
-  { year: '1903', value: 593, category: 'Solid fuel' },
-  { year: '1903', value: 4, category: 'Gas fuel' },
-  { year: '1903', value: 0, category: 'Cement production' },
-  { year: '1903', value: 0, category: 'Gas flarinl' },
-  { year: '1904', value: 23, category: 'Liquid fuel' },
-  { year: '1904', value: 597, category: 'Solid fuel' },
-  { year: '1904', value: 4, category: 'Gas fuel' },
-  { year: '1904', value: 0, category: 'Cement production' },
-  { year: '1904', value: 0, category: 'Gas flarinl' },
-  { year: '1905', value: 23, category: 'Liquid fuel' },
-  { year: '1905', value: 636, category: 'Solid fuel' },
-  { year: '1905', value: 5, category: 'Gas fuel' },
-  { year: '1905', value: 0, category: 'Cement production' },
-  { year: '1905', value: 0, category: 'Gas flarinl' },
-  { year: '1906', value: 23, category: 'Liquid fuel' },
-  { year: '1906', value: 680, category: 'Solid fuel' },
-  { year: '1906', value: 5, category: 'Gas fuel' },
-  { year: '1906', value: 0, category: 'Cement production' },
-  { year: '1906', value: 0, category: 'Gas flarinl' },
-  { year: '1907', value: 28, category: 'Liquid fuel' },
-  { year: '1907', value: 750, category: 'Solid fuel' },
-  { year: '1907', value: 5, category: 'Gas fuel' },
-  { year: '1907', value: 0, category: 'Cement production' },
-  { year: '1907', value: 0, category: 'Gas flarinl' },
-  { year: '1908', value: 30, category: 'Liquid fuel' },
-  { year: '1908', value: 714, category: 'Solid fuel' },
-  { year: '1908', value: 5, category: 'Gas fuel' },
-  { year: '1908', value: 0, category: 'Cement production' },
-  { year: '1908', value: 0, category: 'Gas flarinl' },
-  { year: '1909', value: 32, category: 'Liquid fuel' },
-  { year: '1909', value: 747, category: 'Solid fuel' },
-  { year: '1909', value: 6, category: 'Gas fuel' },
-  { year: '1909', value: 0, category: 'Cement production' },
-  { year: '1909', value: 0, category: 'Gas flarinl' },
-  { year: '1910', value: 34, category: 'Liquid fuel' },
-  { year: '1910', value: 778, category: 'Solid fuel' },
-  { year: '1910', value: 7, category: 'Gas fuel' },
-  { year: '1910', value: 0, category: 'Cement production' },
-  { year: '1910', value: 0, category: 'Gas flarinl' },
-  { year: '1911', value: 36, category: 'Liquid fuel' },
-  { year: '1911', value: 792, category: 'Solid fuel' },
-  { year: '1911', value: 7, category: 'Gas fuel' },
-  { year: '1911', value: 0, category: 'Cement production' },
-  { year: '1911', value: 0, category: 'Gas flarinl' },
-  { year: '1912', value: 37, category: 'Liquid fuel' },
-  { year: '1912', value: 834, category: 'Solid fuel' },
-  { year: '1912', value: 8, category: 'Gas fuel' },
-  { year: '1912', value: 0, category: 'Cement production' },
-  { year: '1912', value: 0, category: 'Gas flarinl' },
-  { year: '1913', value: 41, category: 'Liquid fuel' },
-  { year: '1913', value: 895, category: 'Solid fuel' },
-  { year: '1913', value: 8, category: 'Gas fuel' },
-  { year: '1913', value: 0, category: 'Cement production' },
-  { year: '1913', value: 0, category: 'Gas flarinl' },
-  { year: '1914', value: 42, category: 'Liquid fuel' },
-  { year: '1914', value: 800, category: 'Solid fuel' },
-  { year: '1914', value: 8, category: 'Gas fuel' },
-  { year: '1914', value: 0, category: 'Cement production' },
-  { year: '1914', value: 0, category: 'Gas flarinl' },
-  { year: '1915', value: 45, category: 'Liquid fuel' },
-  { year: '1915', value: 784, category: 'Solid fuel' },
-  { year: '1915', value: 9, category: 'Gas fuel' },
-  { year: '1915', value: 0, category: 'Cement production' },
-  { year: '1915', value: 0, category: 'Gas flarinl' },
-  { year: '1916', value: 48, category: 'Liquid fuel' },
-  { year: '1916', value: 842, category: 'Solid fuel' },
-  { year: '1916', value: 10, category: 'Gas fuel' },
-  { year: '1916', value: 0, category: 'Cement production' },
-  { year: '1916', value: 0, category: 'Gas flarinl' },
-  { year: '1917', value: 54, category: 'Liquid fuel' },
-  { year: '1917', value: 891, category: 'Solid fuel' },
-  { year: '1917', value: 11, category: 'Gas fuel' },
-  { year: '1917', value: 0, category: 'Cement production' },
-  { year: '1917', value: 0, category: 'Gas flarinl' },
-  { year: '1918', value: 53, category: 'Liquid fuel' },
-  { year: '1918', value: 873, category: 'Solid fuel' },
-  { year: '1918', value: 10, category: 'Gas fuel' },
-  { year: '1918', value: 0, category: 'Cement production' },
-  { year: '1918', value: 0, category: 'Gas flarinl' },
-  { year: '1919', value: 61, category: 'Liquid fuel' },
-  { year: '1919', value: 735, category: 'Solid fuel' },
-  { year: '1919', value: 10, category: 'Gas fuel' },
-  { year: '1919', value: 0, category: 'Cement production' },
-  { year: '1919', value: 0, category: 'Gas flarinl' },
-  { year: '1920', value: 78, category: 'Liquid fuel' },
-  { year: '1920', value: 843, category: 'Solid fuel' },
-  { year: '1920', value: 11, category: 'Gas fuel' },
-  { year: '1920', value: 0, category: 'Cement production' },
-  { year: '1920', value: 0, category: 'Gas flarinl' },
-  { year: '1921', value: 84, category: 'Liquid fuel' },
-  { year: '1921', value: 709, category: 'Solid fuel' },
-  { year: '1921', value: 10, category: 'Gas fuel' },
-  { year: '1921', value: 0, category: 'Cement production' },
-  { year: '1921', value: 0, category: 'Gas flarinl' },
-  { year: '1922', value: 94, category: 'Liquid fuel' },
-  { year: '1922', value: 740, category: 'Solid fuel' },
-  { year: '1922', value: 11, category: 'Gas fuel' },
-  { year: '1922', value: 0, category: 'Cement production' },
-  { year: '1922', value: 0, category: 'Gas flarinl' },
-  { year: '1923', value: 111, category: 'Liquid fuel' },
-  { year: '1923', value: 845, category: 'Solid fuel' },
-  { year: '1923', value: 14, category: 'Gas fuel' },
-  { year: '1923', value: 0, category: 'Cement production' },
-  { year: '1923', value: 0, category: 'Gas flarinl' },
-  { year: '1924', value: 110, category: 'Liquid fuel' },
-  { year: '1924', value: 836, category: 'Solid fuel' },
-  { year: '1924', value: 16, category: 'Gas fuel' },
-  { year: '1924', value: 0, category: 'Cement production' },
-  { year: '1924', value: 0, category: 'Gas flarinl' },
-  { year: '1925', value: 116, category: 'Liquid fuel' },
-  { year: '1925', value: 842, category: 'Solid fuel' },
-  { year: '1925', value: 17, category: 'Gas fuel' },
-  { year: '1925', value: 0, category: 'Cement production' },
-  { year: '1925', value: 0, category: 'Gas flarinl' },
-  { year: '1926', value: 119, category: 'Liquid fuel' },
-  { year: '1926', value: 846, category: 'Solid fuel' },
-  { year: '1926', value: 19, category: 'Gas fuel' },
-  { year: '1926', value: 0, category: 'Cement production' },
-  { year: '1926', value: 0, category: 'Gas flarinl' },
-  { year: '1927', value: 136, category: 'Liquid fuel' },
-  { year: '1927', value: 905, category: 'Solid fuel' },
-  { year: '1927', value: 21, category: 'Gas fuel' },
-  { year: '1927', value: 0, category: 'Cement production' },
-  { year: '1927', value: 0, category: 'Gas flarinl' },
-  { year: '1928', value: 143, category: 'Liquid fuel' },
-  { year: '1928', value: 890, category: 'Solid fuel' },
-  { year: '1928', value: 23, category: 'Gas fuel' },
-  { year: '1928', value: 10, category: 'Cement production' },
-  { year: '1928', value: 0, category: 'Gas flarinl' },
-  { year: '1929', value: 160, category: 'Liquid fuel' },
-  { year: '1929', value: 947, category: 'Solid fuel' },
-  { year: '1929', value: 28, category: 'Gas fuel' },
-  { year: '1929', value: 10, category: 'Cement production' },
-  { year: '1929', value: 0, category: 'Gas flarinl' },
-  { year: '1930', value: 152, category: 'Liquid fuel' },
-  { year: '1930', value: 862, category: 'Solid fuel' },
-  { year: '1930', value: 28, category: 'Gas fuel' },
-  { year: '1930', value: 10, category: 'Cement production' },
-  { year: '1930', value: 0, category: 'Gas flarinl' },
-  { year: '1931', value: 147, category: 'Liquid fuel' },
-  { year: '1931', value: 759, category: 'Solid fuel' },
-  { year: '1931', value: 25, category: 'Gas fuel' },
-  { year: '1931', value: 8, category: 'Cement production' },
-  { year: '1931', value: 0, category: 'Gas flarinl' },
-  { year: '1932', value: 141, category: 'Liquid fuel' },
-  { year: '1932', value: 675, category: 'Solid fuel' },
-  { year: '1932', value: 24, category: 'Gas fuel' },
-  { year: '1932', value: 7, category: 'Cement production' },
-  { year: '1932', value: 0, category: 'Gas flarinl' },
-  { year: '1933', value: 154, category: 'Liquid fuel' },
-  { year: '1933', value: 708, category: 'Solid fuel' },
-  { year: '1933', value: 25, category: 'Gas fuel' },
-  { year: '1933', value: 7, category: 'Cement production' },
-  { year: '1933', value: 0, category: 'Gas flarinl' },
-  { year: '1934', value: 162, category: 'Liquid fuel' },
-  { year: '1934', value: 775, category: 'Solid fuel' },
-  { year: '1934', value: 28, category: 'Gas fuel' },
-  { year: '1934', value: 8, category: 'Cement production' },
-  { year: '1934', value: 0, category: 'Gas flarinl' },
-  { year: '1935', value: 176, category: 'Liquid fuel' },
-  { year: '1935', value: 811, category: 'Solid fuel' },
-  { year: '1935', value: 30, category: 'Gas fuel' },
-  { year: '1935', value: 9, category: 'Cement production' },
-  { year: '1935', value: 0, category: 'Gas flarinl' },
-  { year: '1936', value: 192, category: 'Liquid fuel' },
-  { year: '1936', value: 893, category: 'Solid fuel' },
-  { year: '1936', value: 34, category: 'Gas fuel' },
-  { year: '1936', value: 11, category: 'Cement production' },
-  { year: '1936', value: 0, category: 'Gas flarinl' },
-  { year: '1937', value: 219, category: 'Liquid fuel' },
-  { year: '1937', value: 941, category: 'Solid fuel' },
-  { year: '1937', value: 38, category: 'Gas fuel' },
-  { year: '1937', value: 11, category: 'Cement production' },
-  { year: '1937', value: 0, category: 'Gas flarinl' },
-  { year: '1938', value: 214, category: 'Liquid fuel' },
-  { year: '1938', value: 880, category: 'Solid fuel' },
-  { year: '1938', value: 37, category: 'Gas fuel' },
-  { year: '1938', value: 12, category: 'Cement production' },
-  { year: '1938', value: 0, category: 'Gas flarinl' },
-  { year: '1939', value: 222, category: 'Liquid fuel' },
-  { year: '1939', value: 918, category: 'Solid fuel' },
-  { year: '1939', value: 38, category: 'Gas fuel' },
-  { year: '1939', value: 13, category: 'Cement production' },
-  { year: '1939', value: 0, category: 'Gas flarinl' },
-  { year: '1940', value: 229, category: 'Liquid fuel' },
-  { year: '1940', value: 1017, category: 'Solid fuel' },
-  { year: '1940', value: 42, category: 'Gas fuel' },
-  { year: '1940', value: 11, category: 'Cement production' },
-  { year: '1940', value: 0, category: 'Gas flarinl' },
-  { year: '1941', value: 236, category: 'Liquid fuel' },
-  { year: '1941', value: 1043, category: 'Solid fuel' },
-  { year: '1941', value: 42, category: 'Gas fuel' },
-  { year: '1941', value: 12, category: 'Cement production' },
-  { year: '1941', value: 0, category: 'Gas flarinl' },
-  { year: '1942', value: 222, category: 'Liquid fuel' },
-  { year: '1942', value: 1063, category: 'Solid fuel' },
-  { year: '1942', value: 45, category: 'Gas fuel' },
-  { year: '1942', value: 11, category: 'Cement production' },
-  { year: '1942', value: 0, category: 'Gas flarinl' },
-  { year: '1943', value: 239, category: 'Liquid fuel' },
-  { year: '1943', value: 1092, category: 'Solid fuel' },
-  { year: '1943', value: 50, category: 'Gas fuel' },
-  { year: '1943', value: 10, category: 'Cement production' },
-  { year: '1943', value: 0, category: 'Gas flarinl' },
-  { year: '1944', value: 275, category: 'Liquid fuel' },
-  { year: '1944', value: 1047, category: 'Solid fuel' },
-  { year: '1944', value: 54, category: 'Gas fuel' },
-  { year: '1944', value: 7, category: 'Cement production' },
-  { year: '1944', value: 0, category: 'Gas flarinl' },
-  { year: '1945', value: 275, category: 'Liquid fuel' },
-  { year: '1945', value: 820, category: 'Solid fuel' },
-  { year: '1945', value: 59, category: 'Gas fuel' },
-  { year: '1945', value: 7, category: 'Cement production' },
-  { year: '1945', value: 0, category: 'Gas flarinl' },
-  { year: '1946', value: 292, category: 'Liquid fuel' },
-  { year: '1946', value: 875, category: 'Solid fuel' },
-  { year: '1946', value: 61, category: 'Gas fuel' },
-  { year: '1946', value: 10, category: 'Cement production' },
-  { year: '1946', value: 0, category: 'Gas flarinl' },
-  { year: '1947', value: 322, category: 'Liquid fuel' },
-  { year: '1947', value: 992, category: 'Solid fuel' },
-  { year: '1947', value: 67, category: 'Gas fuel' },
-  { year: '1947', value: 12, category: 'Cement production' },
-  { year: '1947', value: 0, category: 'Gas flarinl' },
-  { year: '1948', value: 364, category: 'Liquid fuel' },
-  { year: '1948', value: 1015, category: 'Solid fuel' },
-  { year: '1948', value: 76, category: 'Gas fuel' },
-  { year: '1948', value: 14, category: 'Cement production' },
-  { year: '1948', value: 0, category: 'Gas flarinl' },
-  { year: '1949', value: 362, category: 'Liquid fuel' },
-  { year: '1949', value: 960, category: 'Solid fuel' },
-  { year: '1949', value: 81, category: 'Gas fuel' },
-  { year: '1949', value: 16, category: 'Cement production' },
-  { year: '1949', value: 0, category: 'Gas flarinl' },
-  { year: '1950', value: 423, category: 'Liquid fuel' },
-  { year: '1950', value: 1070, category: 'Solid fuel' },
-  { year: '1950', value: 97, category: 'Gas fuel' },
-  { year: '1950', value: 18, category: 'Cement production' },
-  { year: '1950', value: 23, category: 'Gas flarinl' },
-  { year: '1951', value: 479, category: 'Liquid fuel' },
-  { year: '1951', value: 1129, category: 'Solid fuel' },
-  { year: '1951', value: 115, category: 'Gas fuel' },
-  { year: '1951', value: 20, category: 'Cement production' },
-  { year: '1951', value: 24, category: 'Gas flarinl' },
-  { year: '1952', value: 504, category: 'Liquid fuel' },
-  { year: '1952', value: 1119, category: 'Solid fuel' },
-  { year: '1952', value: 124, category: 'Gas fuel' },
-  { year: '1952', value: 22, category: 'Cement production' },
-  { year: '1952', value: 26, category: 'Gas flarinl' },
-  { year: '1953', value: 533, category: 'Liquid fuel' },
-  { year: '1953', value: 1125, category: 'Solid fuel' },
-  { year: '1953', value: 131, category: 'Gas fuel' },
-  { year: '1953', value: 24, category: 'Cement production' },
-  { year: '1953', value: 27, category: 'Gas flarinl' },
-  { year: '1954', value: 557, category: 'Liquid fuel' },
-  { year: '1954', value: 1116, category: 'Solid fuel' },
-  { year: '1954', value: 138, category: 'Gas fuel' },
-  { year: '1954', value: 27, category: 'Cement production' },
-  { year: '1954', value: 27, category: 'Gas flarinl' },
-  { year: '1955', value: 625, category: 'Liquid fuel' },
-  { year: '1955', value: 1208, category: 'Solid fuel' },
-  { year: '1955', value: 150, category: 'Gas fuel' },
-  { year: '1955', value: 30, category: 'Cement production' },
-  { year: '1955', value: 31, category: 'Gas flarinl' },
-  { year: '1956', value: 679, category: 'Liquid fuel' },
-  { year: '1956', value: 1273, category: 'Solid fuel' },
-  { year: '1956', value: 161, category: 'Gas fuel' },
-  { year: '1956', value: 32, category: 'Cement production' },
-  { year: '1956', value: 32, category: 'Gas flarinl' },
-  { year: '1957', value: 714, category: 'Liquid fuel' },
-  { year: '1957', value: 1309, category: 'Solid fuel' },
-  { year: '1957', value: 178, category: 'Gas fuel' },
-  { year: '1957', value: 34, category: 'Cement production' },
-  { year: '1957', value: 35, category: 'Gas flarinl' },
-  { year: '1958', value: 731, category: 'Liquid fuel' },
-  { year: '1958', value: 1336, category: 'Solid fuel' },
-  { year: '1958', value: 192, category: 'Gas fuel' },
-  { year: '1958', value: 36, category: 'Cement production' },
-  { year: '1958', value: 35, category: 'Gas flarinl' },
-  { year: '1959', value: 789, category: 'Liquid fuel' },
-  { year: '1959', value: 1382, category: 'Solid fuel' },
-  { year: '1959', value: 206, category: 'Gas fuel' },
-  { year: '1959', value: 40, category: 'Cement production' },
-  { year: '1959', value: 36, category: 'Gas flarinl' },
-  { year: '1960', value: 849, category: 'Liquid fuel' },
-  { year: '1960', value: 1410, category: 'Solid fuel' },
-  { year: '1960', value: 227, category: 'Gas fuel' },
-  { year: '1960', value: 43, category: 'Cement production' },
-  { year: '1960', value: 39, category: 'Gas flarinl' },
-  { year: '1961', value: 904, category: 'Liquid fuel' },
-  { year: '1961', value: 1349, category: 'Solid fuel' },
-  { year: '1961', value: 240, category: 'Gas fuel' },
-  { year: '1961', value: 45, category: 'Cement production' },
-  { year: '1961', value: 42, category: 'Gas flarinl' },
-  { year: '1962', value: 980, category: 'Liquid fuel' },
-  { year: '1962', value: 1351, category: 'Solid fuel' },
-  { year: '1962', value: 263, category: 'Gas fuel' },
-  { year: '1962', value: 49, category: 'Cement production' },
-  { year: '1962', value: 44, category: 'Gas flarinl' },
-  { year: '1963', value: 1052, category: 'Liquid fuel' },
-  { year: '1963', value: 1396, category: 'Solid fuel' },
-  { year: '1963', value: 286, category: 'Gas fuel' },
-  { year: '1963', value: 51, category: 'Cement production' },
-  { year: '1963', value: 47, category: 'Gas flarinl' },
-  { year: '1964', value: 1137, category: 'Liquid fuel' },
-  { year: '1964', value: 1435, category: 'Solid fuel' },
-  { year: '1964', value: 316, category: 'Gas fuel' },
-  { year: '1964', value: 57, category: 'Cement production' },
-  { year: '1964', value: 51, category: 'Gas flarinl' },
-  { year: '1965', value: 1219, category: 'Liquid fuel' },
-  { year: '1965', value: 1460, category: 'Solid fuel' },
-  { year: '1965', value: 337, category: 'Gas fuel' },
-  { year: '1965', value: 59, category: 'Cement production' },
-  { year: '1965', value: 55, category: 'Gas flarinl' },
-  { year: '1966', value: 1323, category: 'Liquid fuel' },
-  { year: '1966', value: 1478, category: 'Solid fuel' },
-  { year: '1966', value: 364, category: 'Gas fuel' },
-  { year: '1966', value: 63, category: 'Cement production' },
-  { year: '1966', value: 60, category: 'Gas flarinl' },
-  { year: '1967', value: 1423, category: 'Liquid fuel' },
-  { year: '1967', value: 1448, category: 'Solid fuel' },
-  { year: '1967', value: 392, category: 'Gas fuel' },
-  { year: '1967', value: 65, category: 'Cement production' },
-  { year: '1967', value: 66, category: 'Gas flarinl' },
-  { year: '1968', value: 1551, category: 'Liquid fuel' },
-  { year: '1968', value: 1448, category: 'Solid fuel' },
-  { year: '1968', value: 424, category: 'Gas fuel' },
-  { year: '1968', value: 70, category: 'Cement production' },
-  { year: '1968', value: 73, category: 'Gas flarinl' },
-  { year: '1969', value: 1673, category: 'Liquid fuel' },
-  { year: '1969', value: 1486, category: 'Solid fuel' },
-  { year: '1969', value: 467, category: 'Gas fuel' },
-  { year: '1969', value: 74, category: 'Cement production' },
-  { year: '1969', value: 80, category: 'Gas flarinl' },
-  { year: '1970', value: 1839, category: 'Liquid fuel' },
-  { year: '1970', value: 1556, category: 'Solid fuel' },
-  { year: '1970', value: 493, category: 'Gas fuel' },
-  { year: '1970', value: 78, category: 'Cement production' },
-  { year: '1970', value: 87, category: 'Gas flarinl' },
-  { year: '1971', value: 1947, category: 'Liquid fuel' },
-  { year: '1971', value: 1559, category: 'Solid fuel' },
-  { year: '1971', value: 530, category: 'Gas fuel' },
-  { year: '1971', value: 84, category: 'Cement production' },
-  { year: '1971', value: 88, category: 'Gas flarinl' },
-  { year: '1972', value: 2057, category: 'Liquid fuel' },
-  { year: '1972', value: 1576, category: 'Solid fuel' },
-  { year: '1972', value: 560, category: 'Gas fuel' },
-  { year: '1972', value: 89, category: 'Cement production' },
-  { year: '1972', value: 95, category: 'Gas flarinl' },
-  { year: '1973', value: 2241, category: 'Liquid fuel' },
-  { year: '1973', value: 1581, category: 'Solid fuel' },
-  { year: '1973', value: 588, category: 'Gas fuel' },
-  { year: '1973', value: 95, category: 'Cement production' },
-  { year: '1973', value: 110, category: 'Gas flarinl' },
-  { year: '1974', value: 2245, category: 'Liquid fuel' },
-  { year: '1974', value: 1579, category: 'Solid fuel' },
-  { year: '1974', value: 597, category: 'Gas fuel' },
-  { year: '1974', value: 96, category: 'Cement production' },
-  { year: '1974', value: 107, category: 'Gas flarinl' },
-  { year: '1975', value: 2132, category: 'Liquid fuel' },
-  { year: '1975', value: 1673, category: 'Solid fuel' },
-  { year: '1975', value: 604, category: 'Gas fuel' },
-  { year: '1975', value: 95, category: 'Cement production' },
-  { year: '1975', value: 92, category: 'Gas flarinl' },
-  { year: '1976', value: 2314, category: 'Liquid fuel' },
-  { year: '1976', value: 1710, category: 'Solid fuel' },
-  { year: '1976', value: 630, category: 'Gas fuel' },
-  { year: '1976', value: 103, category: 'Cement production' },
-  { year: '1976', value: 108, category: 'Gas flarinl' },
-  { year: '1977', value: 2398, category: 'Liquid fuel' },
-  { year: '1977', value: 1756, category: 'Solid fuel' },
-  { year: '1977', value: 650, category: 'Gas fuel' },
-  { year: '1977', value: 108, category: 'Cement production' },
-  { year: '1977', value: 104, category: 'Gas flarinl' },
-  { year: '1978', value: 2392, category: 'Liquid fuel' },
-  { year: '1978', value: 1780, category: 'Solid fuel' },
-  { year: '1978', value: 680, category: 'Gas fuel' },
-  { year: '1978', value: 116, category: 'Cement production' },
-  { year: '1978', value: 106, category: 'Gas flarinl' },
-  { year: '1979', value: 2544, category: 'Liquid fuel' },
-  { year: '1979', value: 1875, category: 'Solid fuel' },
-  { year: '1979', value: 721, category: 'Gas fuel' },
-  { year: '1979', value: 119, category: 'Cement production' },
-  { year: '1979', value: 98, category: 'Gas flarinl' },
-  { year: '1980', value: 2422, category: 'Liquid fuel' },
-  { year: '1980', value: 1935, category: 'Solid fuel' },
-  { year: '1980', value: 737, category: 'Gas fuel' },
-  { year: '1980', value: 120, category: 'Cement production' },
-  { year: '1980', value: 86, category: 'Gas flarinl' },
-  { year: '1981', value: 2289, category: 'Liquid fuel' },
-  { year: '1981', value: 1908, category: 'Solid fuel' },
-  { year: '1981', value: 755, category: 'Gas fuel' },
-  { year: '1981', value: 121, category: 'Cement production' },
-  { year: '1981', value: 65, category: 'Gas flarinl' },
-  { year: '1982', value: 2196, category: 'Liquid fuel' },
-  { year: '1982', value: 1976, category: 'Solid fuel' },
-  { year: '1982', value: 738, category: 'Gas fuel' },
-  { year: '1982', value: 121, category: 'Cement production' },
-  { year: '1982', value: 64, category: 'Gas flarinl' },
-  { year: '1983', value: 2176, category: 'Liquid fuel' },
-  { year: '1983', value: 1977, category: 'Solid fuel' },
-  { year: '1983', value: 739, category: 'Gas fuel' },
-  { year: '1983', value: 125, category: 'Cement production' },
-  { year: '1983', value: 58, category: 'Gas flarinl' },
-  { year: '1984', value: 2199, category: 'Liquid fuel' },
-  { year: '1984', value: 2074, category: 'Solid fuel' },
-  { year: '1984', value: 807, category: 'Gas fuel' },
-  { year: '1984', value: 128, category: 'Cement production' },
-  { year: '1984', value: 51, category: 'Gas flarinl' },
-  { year: '1985', value: 2186, category: 'Liquid fuel' },
-  { year: '1985', value: 2216, category: 'Solid fuel' },
-  { year: '1985', value: 835, category: 'Gas fuel' },
-  { year: '1985', value: 131, category: 'Cement production' },
-  { year: '1985', value: 49, category: 'Gas flarinl' },
-  { year: '1986', value: 2293, category: 'Liquid fuel' },
-  { year: '1986', value: 2277, category: 'Solid fuel' },
-  { year: '1986', value: 830, category: 'Gas fuel' },
-  { year: '1986', value: 137, category: 'Cement production' },
-  { year: '1986', value: 46, category: 'Gas flarinl' },
-  { year: '1987', value: 2306, category: 'Liquid fuel' },
-  { year: '1987', value: 2339, category: 'Solid fuel' },
-  { year: '1987', value: 892, category: 'Gas fuel' },
-  { year: '1987', value: 143, category: 'Cement production' },
-  { year: '1987', value: 44, category: 'Gas flarinl' },
-  { year: '1988', value: 2412, category: 'Liquid fuel' },
-  { year: '1988', value: 2387, category: 'Solid fuel' },
-  { year: '1988', value: 935, category: 'Gas fuel' },
-  { year: '1988', value: 152, category: 'Cement production' },
-  { year: '1988', value: 50, category: 'Gas flarinl' },
-  { year: '1989', value: 2459, category: 'Liquid fuel' },
-  { year: '1989', value: 2428, category: 'Solid fuel' },
-  { year: '1989', value: 982, category: 'Gas fuel' },
-  { year: '1989', value: 156, category: 'Cement production' },
-  { year: '1989', value: 41, category: 'Gas flarinl' },
-  { year: '1990', value: 2492, category: 'Liquid fuel' },
-  { year: '1990', value: 2359, category: 'Solid fuel' },
-  { year: '1990', value: 1026, category: 'Gas fuel' },
-  { year: '1990', value: 157, category: 'Cement production' },
-  { year: '1990', value: 40, category: 'Gas flarinl' },
-  { year: '1991', value: 2601, category: 'Liquid fuel' },
-  { year: '1991', value: 2284, category: 'Solid fuel' },
-  { year: '1991', value: 1051, category: 'Gas fuel' },
-  { year: '1991', value: 161, category: 'Cement production' },
-  { year: '1991', value: 45, category: 'Gas flarinl' },
-  { year: '1992', value: 2499, category: 'Liquid fuel' },
-  { year: '1992', value: 2290, category: 'Solid fuel' },
-  { year: '1992', value: 1085, category: 'Gas fuel' },
-  { year: '1992', value: 167, category: 'Cement production' },
-  { year: '1992', value: 36, category: 'Gas flarinl' },
-  { year: '1993', value: 2515, category: 'Liquid fuel' },
-  { year: '1993', value: 2225, category: 'Solid fuel' },
-  { year: '1993', value: 1117, category: 'Gas fuel' },
-  { year: '1993', value: 176, category: 'Cement production' },
-  { year: '1993', value: 37, category: 'Gas flarinl' },
-  { year: '1994', value: 2539, category: 'Liquid fuel' },
-  { year: '1994', value: 2278, category: 'Solid fuel' },
-  { year: '1994', value: 1133, category: 'Gas fuel' },
-  { year: '1994', value: 186, category: 'Cement production' },
-  { year: '1994', value: 39, category: 'Gas flarinl' },
-  { year: '1995', value: 2560, category: 'Liquid fuel' },
-  { year: '1995', value: 2359, category: 'Solid fuel' },
-  { year: '1995', value: 1151, category: 'Gas fuel' },
-  { year: '1995', value: 197, category: 'Cement production' },
-  { year: '1995', value: 39, category: 'Gas flarinl' },
-  { year: '1996', value: 2626, category: 'Liquid fuel' },
-  { year: '1996', value: 2382, category: 'Solid fuel' },
-  { year: '1996', value: 1198, category: 'Gas fuel' },
-  { year: '1996', value: 203, category: 'Cement production' },
-  { year: '1996', value: 40, category: 'Gas flarinl' },
-  { year: '1997', value: 2701, category: 'Liquid fuel' },
-  { year: '1997', value: 2409, category: 'Solid fuel' },
-  { year: '1997', value: 1197, category: 'Gas fuel' },
-  { year: '1997', value: 209, category: 'Cement production' },
-  { year: '1997', value: 40, category: 'Gas flarinl' },
-  { year: '1998', value: 2763, category: 'Liquid fuel' },
-  { year: '1998', value: 2343, category: 'Solid fuel' },
-  { year: '1998', value: 1224, category: 'Gas fuel' },
-  { year: '1998', value: 209, category: 'Cement production' },
-  { year: '1998', value: 36, category: 'Gas flarinl' },
-  { year: '1999', value: 2741, category: 'Liquid fuel' },
-  { year: '1999', value: 2310, category: 'Solid fuel' },
-  { year: '1999', value: 1258, category: 'Gas fuel' },
-  { year: '1999', value: 217, category: 'Cement production' },
-  { year: '1999', value: 35, category: 'Gas flarinl' },
-  { year: '2000', value: 2845, category: 'Liquid fuel' },
-  { year: '2000', value: 2327, category: 'Solid fuel' },
-  { year: '2000', value: 1289, category: 'Gas fuel' },
-  { year: '2000', value: 226, category: 'Cement production' },
-  { year: '2000', value: 46, category: 'Gas flarinl' },
-  { year: '2001', value: 2848, category: 'Liquid fuel' },
-  { year: '2001', value: 2445, category: 'Solid fuel' },
-  { year: '2001', value: 1316, category: 'Gas fuel' },
-  { year: '2001', value: 237, category: 'Cement production' },
-  { year: '2001', value: 47, category: 'Gas flarinl' },
-  { year: '2002', value: 2832, category: 'Liquid fuel' },
-  { year: '2002', value: 2518, category: 'Solid fuel' },
-  { year: '2002', value: 1342, category: 'Gas fuel' },
-  { year: '2002', value: 252, category: 'Cement production' },
-  { year: '2002', value: 49, category: 'Gas flarinl' },
-  { year: '2003', value: 2958, category: 'Liquid fuel' },
-  { year: '2003', value: 2695, category: 'Solid fuel' },
-  { year: '2003', value: 1397, category: 'Gas fuel' },
-  { year: '2003', value: 276, category: 'Cement production' },
-  { year: '2003', value: 48, category: 'Gas flarinl' },
-  { year: '2004', value: 3043, category: 'Liquid fuel' },
-  { year: '2004', value: 2906, category: 'Solid fuel' },
-  { year: '2004', value: 1443, category: 'Gas fuel' },
-  { year: '2004', value: 298, category: 'Cement production' },
-  { year: '2004', value: 54, category: 'Gas flarinl' },
-  { year: '2005', value: 3068, category: 'Liquid fuel' },
-  { year: '2005', value: 3108, category: 'Solid fuel' },
-  { year: '2005', value: 1485, category: 'Gas fuel' },
-  { year: '2005', value: 320, category: 'Cement production' },
-  { year: '2005', value: 60, category: 'Gas flarinl' },
-  { year: '2006', value: 3091, category: 'Liquid fuel' },
-  { year: '2006', value: 3293, category: 'Solid fuel' },
-  { year: '2006', value: 1534, category: 'Gas fuel' },
-  { year: '2006', value: 356, category: 'Cement production' },
-  { year: '2006', value: 62, category: 'Gas flarinl' },
-  { year: '2007', value: 3071, category: 'Liquid fuel' },
-  { year: '2007', value: 3422, category: 'Solid fuel' },
-  { year: '2007', value: 1562, category: 'Gas fuel' },
-  { year: '2007', value: 382, category: 'Cement production' },
-  { year: '2007', value: 66, category: 'Gas flarinl' },
-  { year: '2008', value: 3103, category: 'Liquid fuel' },
-  { year: '2008', value: 3587, category: 'Solid fuel' },
-  { year: '2008', value: 1630, category: 'Gas fuel' },
-  { year: '2008', value: 388, category: 'Cement production' },
-  { year: '2008', value: 69, category: 'Gas flarinl' },
-  { year: '2009', value: 3042, category: 'Liquid fuel' },
-  { year: '2009', value: 3590, category: 'Solid fuel' },
-  { year: '2009', value: 1584, category: 'Gas fuel' },
-  { year: '2009', value: 415, category: 'Cement production' },
-  { year: '2009', value: 66, category: 'Gas flarinl' },
-  { year: '2010', value: 3107, category: 'Liquid fuel' },
-  { year: '2010', value: 3812, category: 'Solid fuel' },
-  { year: '2010', value: 1696, category: 'Gas fuel' },
-  { year: '2010', value: 446, category: 'Cement production' },
-  { year: '2010', value: 67, category: 'Gas flarinl' },
-  { year: '2011', value: 3134, category: 'Liquid fuel' },
-  { year: '2011', value: 4055, category: 'Solid fuel' },
-  { year: '2011', value: 1756, category: 'Gas fuel' },
-  { year: '2011', value: 494, category: 'Cement production' },
-  { year: '2011', value: 64, category: 'Gas flarinl' },
-  { year: '2012', value: 3200, category: 'Liquid fuel' },
-  { year: '2012', value: 4106, category: 'Solid fuel' },
-  { year: '2012', value: 1783, category: 'Gas fuel' },
-  { year: '2012', value: 519, category: 'Cement production' },
-  { year: '2012', value: 65, category: 'Gas flarinl' },
-  { year: '2013', value: 3220, category: 'Liquid fuel' },
-  { year: '2013', value: 4126, category: 'Solid fuel' },
-  { year: '2013', value: 1806, category: 'Gas fuel' },
-  { year: '2013', value: 554, category: 'Cement production' },
-  { year: '2013', value: 68, category: 'Gas flarinl' },
-  { year: '2014', value: 3280, category: 'Liquid fuel' },
-  { year: '2014', value: 4117, category: 'Solid fuel' },
-  { year: '2014', value: 1823, category: 'Gas fuel' },
-  { year: '2014', value: 568, category: 'Cement production' },
-  { year: '2014', value: 68, category: 'Gas flarinl' }
+  {
+    year:'1',
+    value:100,
+    type:'今年'
+  },
+  {
+    year:'2',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'3',
+    value:300,
+    type:'今年'
+  },
+  {
+    year:'4',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'5',
+    value:100,
+    type:'今年'
+  },
+  {
+    year:'6',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'7',
+    value:300,
+    type:'今年'
+  },
+  {
+    year:'8',
+    value:400,
+    type:'今年'
+  },
+  {
+    year:'1',
+    value:400,
+    type:'去年'
+  },
+  {
+    year:'2',
+    value:100,
+    type:'去年'
+  },
+  {
+    year:'3',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'4',
+    value:300,
+    type:'去年'
+  },
+  {
+    year:'5',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'6',
+    value:100,
+    type:'去年'
+  },
+  {
+    year:'7',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'8',
+    value:300,
+    type:'去年'
+  }
 ]
 
 // 配置处理脚本
@@ -1277,9 +532,11 @@ const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
   renderer: 'canvas',
+  smooth: true,
   data,
   xField: 'year',
   yField: 'value',
+  seriesField: 'type',
   legendEnable: false,
   legendLayout: 'vertical',
   legendPosition: 'top',
@@ -1291,8 +548,7 @@ const option = {
       fontWeight: 400
     }
   },
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
-  seriesField: 'category',
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   xAxis: {
     title: {
       text: '',

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'
   },
@@ -431,30 +431,86 @@ const setting = [
 
 // 模拟数据
 const data = [
-  { month: 'Jan', key: 'series1', value: 125 },
-  { month: 'Jan', key: 'series2', value: 51 },
-  { month: 'Feb', key: 'series1', value: 132 },
-  { month: 'Feb', key: 'series2', value: 91 },
-  { month: 'Mar', key: 'series1', value: 141 },
-  { month: 'Mar', key: 'series2', value: 34 },
-  { month: 'Apr', key: 'series1', value: 158 },
-  { month: 'Apr', key: 'series2', value: 47 },
-  { month: 'May', key: 'series1', value: 133 },
-  { month: 'May', key: 'series2', value: 63 },
-  { month: 'June', key: 'series1', value: 143 },
-  { month: 'June', key: 'series2', value: 58 },
-  { month: 'July', key: 'series1', value: 176 },
-  { month: 'July', key: 'series2', value: 56 },
-  { month: 'Aug', key: 'series1', value: 194 },
-  { month: 'Aug', key: 'series2', value: 77 },
-  { month: 'Sep', key: 'series1', value: 115 },
-  { month: 'Sep', key: 'series2', value: 99 },
-  { month: 'Oct', key: 'series1', value: 134 },
-  { month: 'Oct', key: 'series2', value: 106 },
-  { month: 'Nov', key: 'series1', value: 110 },
-  { month: 'Nov', key: 'series2', value: 88 },
-  { month: 'Dec', key: 'series1', value: 91 },
-  { month: 'Dec', key: 'series2', value: 56 }
+  {
+    year:'1',
+    value:100,
+    type:'今年'
+  },
+  {
+    year:'2',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'3',
+    value:300,
+    type:'今年'
+  },
+  {
+    year:'4',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'5',
+    value:100,
+    type:'今年'
+  },
+  {
+    year:'6',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'7',
+    value:300,
+    type:'今年'
+  },
+  {
+    year:'8',
+    value:400,
+    type:'今年'
+  },
+  {
+    year:'1',
+    value:400,
+    type:'去年'
+  },
+  {
+    year:'2',
+    value:100,
+    type:'去年'
+  },
+  {
+    year:'3',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'4',
+    value:300,
+    type:'去年'
+  },
+  {
+    year:'5',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'6',
+    value:100,
+    type:'去年'
+  },
+  {
+    year:'7',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'8',
+    value:300,
+    type:'去年'
+  }
 ]
 
 // 配置处理脚本
@@ -473,8 +529,9 @@ const option = {
   dataKey: 'data',
   renderer: 'canvas',
   data,
-  xField: 'month',
+  xField: 'year',
   yField: 'value',
+  seriesField: 'type',
   legendEnable: false,
   legendLayout: 'vertical',
   legendPosition: 'top',
@@ -486,8 +543,7 @@ const option = {
       fontWeight: 400
     }
   },
-  color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
-  seriesField: 'key',
+  color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
   stepType: 'hvh',
   xAxis: {
     title: {

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'
   },
@@ -487,101 +487,86 @@ const setting = [
 
 // 模拟数据
 const data = [
-  { name: 'China', year: '2000', gdp: 1211346869605.24 },
-  { name: 'China', year: '2001', gdp: 1339395718865.3 },
-  { name: 'China', year: '2002', gdp: 1470550015081.55 },
-  { name: 'China', year: '2003', gdp: 1660287965662.68 },
-  { name: 'China', year: '2004', gdp: 1955347004963.27 },
-  { name: 'China', year: '2005', gdp: 2285965892360.54 },
-  { name: 'China', year: '2006', gdp: 2752131773355.16 },
-  { name: 'China', year: '2007', gdp: 3550342425238.25 },
-  { name: 'China', year: '2008', gdp: 4594306848763.08 },
-  { name: 'China', year: '2009', gdp: 5101702432883.45 },
-  { name: 'China', year: '2010', gdp: 6087164527421.24 },
-  { name: 'China', year: '2011', gdp: 7551500425597.77 },
-  { name: 'China', year: '2012', gdp: 8532230724141.76 },
-  { name: 'China', year: '2013', gdp: 9570405758739.79 },
-  { name: 'China', year: '2014', gdp: 10438529153237.6 },
-  { name: 'China', year: '2015', gdp: 11015542352468.9 },
-  { name: 'China', year: '2016', gdp: 11137945669350.6 },
-  { name: 'China', year: '2017', gdp: 12143491448186.1 },
-  { name: 'China', year: '2018', gdp: 13608151864637.9 },
-  { name: 'United States', year: '2000', gdp: 10252345464000 },
-  { name: 'United States', year: '2001', gdp: 10581821399000 },
-  { name: 'United States', year: '2002', gdp: 10936419054000 },
-  { name: 'United States', year: '2003', gdp: 11458243878000 },
-  { name: 'United States', year: '2004', gdp: 12213729147000 },
-  { name: 'United States', year: '2005', gdp: 13036640229000 },
-  { name: 'United States', year: '2006', gdp: 13814611414000 },
-  { name: 'United States', year: '2007', gdp: 14451858650000 },
-  { name: 'United States', year: '2008', gdp: 14712844084000 },
-  { name: 'United States', year: '2009', gdp: 14448933025000 },
-  { name: 'United States', year: '2010', gdp: 14992052727000 },
-  { name: 'United States', year: '2011', gdp: 15542581104000 },
-  { name: 'United States', year: '2012', gdp: 16197007349000 },
-  { name: 'United States', year: '2013', gdp: 16784849190000 },
-  { name: 'United States', year: '2014', gdp: 17521746534000 },
-  { name: 'United States', year: '2015', gdp: 18219297584000 },
-  { name: 'United States', year: '2016', gdp: 18707188235000 },
-  { name: 'United States', year: '2017', gdp: 19485393853000 },
-  { name: 'United States', year: '2018', gdp: 20544343456936.5 },
-  { name: 'United Kingdom', year: '2000', gdp: 1657816613708.58 },
-  { name: 'United Kingdom', year: '2001', gdp: 1640246149417.01 },
-  { name: 'United Kingdom', year: '2002', gdp: 1784473920863.31 },
-  { name: 'United Kingdom', year: '2003', gdp: 2053018775510.2 },
-  { name: 'United Kingdom', year: '2004', gdp: 2416931526913.22 },
-  { name: 'United Kingdom', year: '2005', gdp: 2538680000000 },
-  { name: 'United Kingdom', year: '2006', gdp: 2713749770009.2 },
-  { name: 'United Kingdom', year: '2007', gdp: 3100882352941.18 },
-  { name: 'United Kingdom', year: '2008', gdp: 2922667279411.76 },
-  { name: 'United Kingdom', year: '2009', gdp: 2410909799034.12 },
-  { name: 'United Kingdom', year: '2010', gdp: 2475244321361.11 },
-  { name: 'United Kingdom', year: '2011', gdp: 2659310054646.23 },
-  { name: 'United Kingdom', year: '2012', gdp: 2704887678386.72 },
-  { name: 'United Kingdom', year: '2013', gdp: 2786022872706.81 },
-  { name: 'United Kingdom', year: '2014', gdp: 3063803240208.01 },
-  { name: 'United Kingdom', year: '2015', gdp: 2928591002002.51 },
-  { name: 'United Kingdom', year: '2016', gdp: 2694283209613.29 },
-  { name: 'United Kingdom', year: '2017', gdp: 2666229179958.01 },
-  { name: 'United Kingdom', year: '2018', gdp: 2855296731521.96 },
-  { name: 'Russian', year: '2000', gdp: 259710142196.94 },
-  { name: 'Russian', year: '2001', gdp: 306602070620.5 },
-  { name: 'Russian', year: '2002', gdp: 345470494417.86 },
-  { name: 'Russian', year: '2003', gdp: 430347770731.79 },
-  { name: 'Russian', year: '2004', gdp: 591016690742.8 },
-  { name: 'Russian', year: '2005', gdp: 764017107992.39 },
-  { name: 'Russian', year: '2006', gdp: 989930542278.7 },
-  { name: 'Russian', year: '2007', gdp: 1299705764823.62 },
-  { name: 'Russian', year: '2008', gdp: 1660846387624.78 },
-  { name: 'Russian', year: '2009', gdp: 1222644282201.86 },
-  { name: 'Russian', year: '2010', gdp: 1524917468442.01 },
-  { name: 'Russian', year: '2011', gdp: 2051661732059.78 },
-  { name: 'Russian', year: '2012', gdp: 2210256976945.38 },
-  { name: 'Russian', year: '2013', gdp: 2297128039058.21 },
-  { name: 'Russian', year: '2014', gdp: 2059984158438.46 },
-  { name: 'Russian', year: '2015', gdp: 1363594369577.82 },
-  { name: 'Russian', year: '2016', gdp: 1282723881134.01 },
-  { name: 'Russian', year: '2017', gdp: 1578624060588.26 },
-  { name: 'Russian', year: '2018', gdp: 1657554647149.87 },
-  { name: 'Japan', year: '2000', gdp: 4887519660744.86 },
-  { name: 'Japan', year: '2001', gdp: 4303544259842.72 },
-  { name: 'Japan', year: '2002', gdp: 4115116279069.77 },
-  { name: 'Japan', year: '2003', gdp: 4445658071221.86 },
-  { name: 'Japan', year: '2004', gdp: 4815148854362.11 },
-  { name: 'Japan', year: '2005', gdp: 4755410630912.14 },
-  { name: 'Japan', year: '2006', gdp: 4530377224970.4 },
-  { name: 'Japan', year: '2007', gdp: 4515264514430.57 },
-  { name: 'Japan', year: '2008', gdp: 5037908465114.48 },
-  { name: 'Japan', year: '2009', gdp: 5231382674593.7 },
-  { name: 'Japan', year: '2010', gdp: 5700098114744.41 },
-  { name: 'Japan', year: '2011', gdp: 6157459594823.72 },
-  { name: 'Japan', year: '2012', gdp: 6203213121334.12 },
-  { name: 'Japan', year: '2013', gdp: 5155717056270.83 },
-  { name: 'Japan', year: '2014', gdp: 4850413536037.84 },
-  { name: 'Japan', year: '2015', gdp: 4389475622588.97 },
-  { name: 'Japan', year: '2016', gdp: 4926667087367.51 },
-  { name: 'Japan', year: '2017', gdp: 4859950558538.97 },
-  { name: 'Japan', year: '2018', gdp: 4971323079771.87 }
+  {
+    year:'1',
+    value:100,
+    type:'今年'
+  },
+  {
+    year:'2',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'3',
+    value:300,
+    type:'今年'
+  },
+  {
+    year:'4',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'5',
+    value:100,
+    type:'今年'
+  },
+  {
+    year:'6',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'7',
+    value:300,
+    type:'今年'
+  },
+  {
+    year:'8',
+    value:400,
+    type:'今年'
+  },
+  {
+    year:'1',
+    value:400,
+    type:'去年'
+  },
+  {
+    year:'2',
+    value:100,
+    type:'去年'
+  },
+  {
+    year:'3',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'4',
+    value:300,
+    type:'去年'
+  },
+  {
+    year:'5',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'6',
+    value:100,
+    type:'去年'
+  },
+  {
+    year:'7',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'8',
+    value:300,
+    type:'去年'
+  }
 ]
 
 // 配置处理脚本
@@ -600,10 +585,10 @@ 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',
+  yField: 'value',
+  seriesField: 'type',
   xAxis: {
     title: {
       text: '',

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: {

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',

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'
   },
@@ -473,22 +473,86 @@ const setting = [
 
 // 模拟数据
 const data = [
-  { name: 'London', 月份: 'Jan.', 月均降雨量: 18.9 },
-  { name: 'London', 月份: 'Feb.', 月均降雨量: 28.8 },
-  { name: 'London', 月份: 'Mar.', 月均降雨量: 39.3 },
-  { name: 'London', 月份: 'Apr.', 月均降雨量: 81.4 },
-  { name: 'London', 月份: 'May', 月均降雨量: 47 },
-  { name: 'London', 月份: 'Jun.', 月均降雨量: 20.3 },
-  { name: 'London', 月份: 'Jul.', 月均降雨量: 24 },
-  { name: 'London', 月份: 'Aug.', 月均降雨量: 35.6 },
-  { name: 'Berlin', 月份: 'Jan.', 月均降雨量: 12.4 },
-  { name: 'Berlin', 月份: 'Feb.', 月均降雨量: 23.2 },
-  { name: 'Berlin', 月份: 'Mar.', 月均降雨量: 34.5 },
-  { name: 'Berlin', 月份: 'Apr.', 月均降雨量: 99.7 },
-  { name: 'Berlin', 月份: 'May', 月均降雨量: 52.6 },
-  { name: 'Berlin', 月份: 'Jun.', 月均降雨量: 35.5 },
-  { name: 'Berlin', 月份: 'Jul.', 月均降雨量: 37.4 },
-  { name: 'Berlin', 月份: 'Aug.', 月均降雨量: 42.4 }
+  {
+    year:'1',
+    value:100,
+    type:'今年'
+  },
+  {
+    year:'2',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'3',
+    value:300,
+    type:'今年'
+  },
+  {
+    year:'4',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'5',
+    value:100,
+    type:'今年'
+  },
+  {
+    year:'6',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'7',
+    value:300,
+    type:'今年'
+  },
+  {
+    year:'8',
+    value:400,
+    type:'今年'
+  },
+  {
+    year:'1',
+    value:400,
+    type:'去年'
+  },
+  {
+    year:'2',
+    value:100,
+    type:'去年'
+  },
+  {
+    year:'3',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'4',
+    value:300,
+    type:'去年'
+  },
+  {
+    year:'5',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'6',
+    value:100,
+    type:'去年'
+  },
+  {
+    year:'7',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'8',
+    value:300,
+    type:'去年'
+  }
 ]
 
 // 配置处理脚本
@@ -517,11 +581,11 @@ 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: '月均降雨量',
-  seriesField: 'name',
+  xField: 'year',
+  yField: 'value',
+  seriesField: 'type',
   /** 设置颜色 */
   // color: ['#1ca9e6', '#f88c24'],
   /** 设置间距 */

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'
   },
@@ -473,38 +473,86 @@ const setting = [
 
 // 模拟数据
 const data = [
-  { city: '石家庄', type: '水果', value: 14500 },
-  { city: '石家庄', type: '米面', value: 8500 },
-  { city: '石家庄', type: '特产零食', value: 10000 },
-  { city: '石家庄', type: '茶叶', value: 7000 },
-  { city: '深圳', type: '水果', value: 9000 },
-  { city: '深圳', type: '米面', value: 8500 },
-  { city: '深圳', type: '特产零食', value: 11000 },
-  { city: '深圳', type: '茶叶', value: 6000 },
-  { city: '温州', type: '水果', value: 16000 },
-  { city: '温州', type: '米面', value: 5000 },
-  { city: '温州', type: '特产零食', value: 6000 },
-  { city: '温州', type: '茶叶', value: 10000 },
-  { city: '宁波', type: '水果', value: 14000 },
-  { city: '宁波', type: '米面', value: 9000 },
-  { city: '宁波', type: '特产零食', value: 10000 },
-  { city: '宁波', type: '茶叶', value: 9000 },
-  { city: '无锡', type: '水果', value: 14000 },
-  { city: '无锡', type: '米面', value: 9000 },
-  { city: '无锡', type: '特产零食', value: 10000 },
-  { city: '无锡', type: '茶叶', value: 6000 },
-  { city: '杭州', type: '水果', value: 9000 },
-  { city: '杭州', type: '米面', value: 8500 },
-  { city: '杭州', type: '特产零食', value: 10000 },
-  { city: '杭州', type: '茶叶', value: 6000 },
-  { city: '北京', type: '水果', value: 17000 },
-  { city: '北京', type: '米面', value: 6000 },
-  { city: '北京', type: '特产零食', value: 7000 },
-  { city: '北京', type: '茶叶', value: 10000 },
-  { city: '上海', type: '水果', value: 18000 },
-  { city: '上海', type: '米面', value: 11000 },
-  { city: '上海', type: '特产零食', value: 15000 },
-  { city: '上海', type: '茶叶', value: 14000 }
+  {
+    year:'1',
+    value:100,
+    type:'今年'
+  },
+  {
+    year:'2',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'3',
+    value:300,
+    type:'今年'
+  },
+  {
+    year:'4',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'5',
+    value:100,
+    type:'今年'
+  },
+  {
+    year:'6',
+    value:200,
+    type:'今年'
+  },
+  {
+    year:'7',
+    value:300,
+    type:'今年'
+  },
+  {
+    year:'8',
+    value:400,
+    type:'今年'
+  },
+  {
+    year:'1',
+    value:400,
+    type:'去年'
+  },
+  {
+    year:'2',
+    value:100,
+    type:'去年'
+  },
+  {
+    year:'3',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'4',
+    value:300,
+    type:'去年'
+  },
+  {
+    year:'5',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'6',
+    value:100,
+    type:'去年'
+  },
+  {
+    year:'7',
+    value:200,
+    type:'去年'
+  },
+  {
+    year:'8',
+    value:300,
+    type:'去年'
+  }
 ]
 
 // 配置处理脚本
@@ -522,14 +570,14 @@ const option = {
   // 数据将要放入到哪个字段中
   dataKey: 'data',
   data,
-  xField: 'city',
+  xField: 'year',
   yField: 'value',
   seriesField: 'type',
   isGroup: 'true',
   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',

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'

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',

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,

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',

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,

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'

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]

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

@@ -59,7 +59,7 @@ const setting = [
     field: 'range_color',
     // 对应options中的字段
     optionField: 'range.color',
-    value: 'l(0) 0:#6B74E3 1:#38BBE5',
+    value: 'l(0) 0:#6b74e4 1:#4391f4',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -156,7 +156,7 @@ const option = {
   data,
   percent: 0.75,
   range: {
-    color: 'l(0) 0:#6B74E3 1:#38BBE5'
+    color: 'l(0) 0:#6b74e4 1:#4391f4'
   },
   indicator: {
     pointer: {

data-room-ui/packages/G2Plots/进度图/圆角进度条.js

@@ -35,7 +35,7 @@ const setting = [
     field: 'frontColor',
     // 对应options中的字段
     optionField: 'frontColor',
-    value: 'l(0) 0:#6B74E3 1:#38BBE5',
+    value: 'l(0) 0:#6b74e4 1:#4391f4',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -89,7 +89,7 @@ const option = {
   percent: 0.8,
   barWidthRatio: 0.3,
   backColor: 'rgba(255, 255, 255, 0)',
-  frontColor: 'l(0) 0:#6B74E3 1:#38BBE5',
+  frontcolor: 'l(0) 0:#6b74e4 1:#4391f4',
   color: ['l(0) 0:#6B74E3 1:#38BBE5', 'rgba(255, 255, 255, 0)'],
   progressStyle: {
     r: 10,

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

@@ -35,7 +35,7 @@ const setting = [
     field: 'range_color',
     // 对应options中的字段
     optionField: 'range.color',
-    value: 'l(0) 0:#6B74E3 1:#38BBE5',
+    value: 'l(0) 0:#6b74e4 1:#4391f4',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -144,7 +144,7 @@ const option = {
   data,
   percent: 0.75,
   range: {
-    color: 'l(0) 0:#6B74E3 1:#38BBE5'
+    color: 'l(0) 0:#6b74e4 1:#4391f4'
   },
   startAngle: Math.PI,
   endAngle: 2 * Math.PI,

data-room-ui/packages/G2Plots/进度图/进度指标环图.js

@@ -47,7 +47,7 @@ const setting = [
     field: 'color1',
     // 对应options中的字段
     optionField: 'color1',
-    value: 'l(0) 0:#6B74E3 1:#38BBE5',
+    value: 'l(0) 0:#6b74e4 1:#4391f4',
     tabName: 'custom',
     groupName: 'graph'
   },

data-room-ui/packages/G2Plots/进度图/进度条.js

@@ -47,7 +47,7 @@ const setting = [
     field: 'frontColor',
     // 对应options中的字段
     optionField: 'frontColor',
-    value: 'l(0) 0:#6B74E3 1:#38BBE5',
+    value: 'l(0) 0:#6b74e4 1:#4391f4',
     tabName: 'custom',
     groupName: 'graph'
   },
@@ -87,7 +87,7 @@ const option = {
   percent: 0.8,
   barWidthRatio: 0.3,
   backColor: '#EEEEEE',
-  frontColor: 'l(0) 0:#6B74E3 1:#38BBE5',
+  frontcolor: 'l(0) 0:#6b74e4 1:#4391f4',
   color: ['l(0) 0:#6B74E3 1:#38BBE5', '#fff'],
   progressStyle: {
     current: {

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

@@ -47,7 +47,7 @@ const setting = [
     field: 'color1',
     // 对应options中的字段
     optionField: 'color1',
-    value: 'l(0) 0:#6B74E3 1:#38BBE5',
+    value: 'l(0) 0:#6b74e4 1:#4391f4',
     tabName: 'custom',
     groupName: 'graph'
   },

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'
   },

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)'
     }
   },

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,

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: {

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,

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'
   },

data-room-ui/packages/js/utils/colorList.js

@@ -0,0 +1,11 @@
+//颜色选择器的预设颜色
+export const predefineColors =[
+  '#6b74e4',
+  '#4391f4',
+  '#38bbe5',
+  '#69d6fd',
+  '#36c6a0',
+  '#007aff',
+  '#ffffff',
+  '#0b1833'
+]