From f14e8c870ff67885ea89388f6b0aa42d4f8233cb Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Thu, 16 Nov 2023 18:36:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BizComponent/config/defaultG2Config.js | 8 +- .../G2Plots/折线图/基础折线图.js | 35 +++--- .../G2Plots/折线图/基础折线点图.js | 36 +++--- .../G2Plots/折线图/基础曲线图.js | 14 +-- .../G2Plots/折线图/多折线动画图.js | 14 +-- .../G2Plots/折线图/多折线图.js | 37 ++---- .../G2Plots/折线图/多阶梯折线图.js | 14 +-- .../折线图/折线趋势填充图.js | 14 +-- .../G2Plots/条形图/分组条形图.js | 18 +-- .../G2Plots/条形图/基础条形图.js | 20 +-- .../G2Plots/条形图/堆叠条形图.js | 18 +-- .../G2Plots/柱状图/分组柱状图.js | 16 +-- .../G2Plots/柱状图/圆角柱状图.js | 16 +-- .../G2Plots/柱状图/基础柱状图.js | 12 +- .../G2Plots/柱状图/堆叠柱状图.js | 16 +-- .../G2Plots/漏斗图/分面漏斗图.js | 2 +- .../G2Plots/漏斗图/基础漏斗图.js | 12 ++ .../矩形树图/基础矩形树图.js | 4 +- data-room-ui/packages/G2Plots/配置说明.md | 2 +- .../G2Plots/雷达图/分组雷达图.js | 114 +++++++++++++++++- .../G2Plots/雷达图/基础雷达图.js | 41 ++++++- .../G2Plots/面积图/基础面积图.js | 30 ++--- .../G2Plots/面积图/堆叠面积图.js | 28 ++--- .../G2Plots/面积图/渐变色面积图.js | 36 +++--- .../packages/G2Plots/饼图/基础饼图.js | 2 +- 25 files changed, 338 insertions(+), 221 deletions(-) diff --git a/data-room-ui/packages/BizComponent/config/defaultG2Config.js b/data-room-ui/packages/BizComponent/config/defaultG2Config.js index cad91153..9869cf15 100644 --- a/data-room-ui/packages/BizComponent/config/defaultG2Config.js +++ b/data-room-ui/packages/BizComponent/config/defaultG2Config.js @@ -195,7 +195,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -255,7 +255,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -340,7 +340,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -471,7 +471,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/折线图/基础折线图.js b/data-room-ui/packages/G2Plots/折线图/基础折线图.js index fa459c34..87193eb5 100644 --- a/data-room-ui/packages/G2Plots/折线图/基础折线图.js +++ b/data-room-ui/packages/G2Plots/折线图/基础折线图.js @@ -55,10 +55,6 @@ const setting = [ value: '', tabName: 'custom', options: [ - { - label: '无', - value: false - }, { label: '空心圆', value: 'hollow-circle' @@ -111,7 +107,7 @@ const setting = [ type: 'inputNumber', field: 'point_size', optionField: 'point.size', - value: 2, + value: 3, tabName: 'custom', groupName: 'graph' }, @@ -122,7 +118,7 @@ const setting = [ optionField: 'point.style.fill', // 是否多选 multiple: false, - value: '#ffffff', + value: '#6B74E4', tabName: 'custom', groupName: 'graph' }, @@ -142,7 +138,7 @@ const setting = [ type: 'colorPicker', field: 'label_style_fill', optionField: 'label.style.fill', - value: '#fff', + value: '#e9e9e9', tabName: 'custom', groupName: 'graph' }, @@ -151,7 +147,7 @@ const setting = [ type: 'inputNumber', field: 'label_style_fontSize', optionField: 'label.style.fontSize', - value: 12, + value: 10, tabName: 'custom', groupName: 'graph' }, @@ -169,7 +165,7 @@ const setting = [ type: 'gradual', field: 'lineStyle_stroke', optionField: 'lineStyle.stroke', - value: 'l(0) 0:#6b74e4 1:#4391f4', + value: 'l(0) 0:#6b74e4 1:#6b74e4', tabName: 'custom', groupName: 'graph' }, @@ -203,7 +199,6 @@ const setting = [ tabName: 'custom', groupName: 'grid' }, - // 图例 legend // X轴 xAxis { label: '标题', @@ -252,7 +247,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -312,7 +307,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -417,7 +412,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -528,20 +523,20 @@ const option = { smooth: false, lineStyle: { lineWidth: 2, - stroke: 'l(0) 0:#6b74e4 1:#4391f4' + stroke: 'l(0) 0:#6b74e4 1:#6b74e4' }, label: { style: { fill: '#fff', opacity: 0, - fontSize: 12 + fontSize: 10 } }, point: { - size: 2, + size: 3, shape: 'diamond', style: { - fill: 'red', + fill: '#6B74E4', stroke: '#5B8FF9', lineWidth: 2 } @@ -561,7 +556,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -575,7 +570,7 @@ const option = { autoHideMinGap: 2, style: { fill: '#e9e9e9', - fontSize: 12 + fontSize: 10 } }, line: { @@ -586,7 +581,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/折线图/基础折线点图.js b/data-room-ui/packages/G2Plots/折线图/基础折线点图.js index cfa0ba07..be27e4fa 100644 --- a/data-room-ui/packages/G2Plots/折线图/基础折线点图.js +++ b/data-room-ui/packages/G2Plots/折线图/基础折线点图.js @@ -57,10 +57,6 @@ const setting = [ value: 'circle', tabName: 'custom', options: [ - { - label: '无', - value: false - }, { label: '空心圆', value: 'hollow-circle' @@ -113,7 +109,7 @@ const setting = [ type: 'inputNumber', field: 'point_size', optionField: 'point.size', - value: 2, + value: 3, tabName: 'custom', groupName: 'graph' }, @@ -124,16 +120,16 @@ const setting = [ optionField: 'point.style.fill', // 是否多选 multiple: false, - value: '#ffffff', + value: '#6B74E4', tabName: 'custom', groupName: 'graph' }, { - label: '数据标签字体大小', + label: '数据标签大小', type: 'inputNumber', field: 'label_style_fontSize', optionField: 'label.style.fontSize', - value: 12, + value: 10, tabName: 'custom', groupName: 'graph' }, @@ -142,7 +138,7 @@ const setting = [ type: 'colorPicker', field: 'label_style_fill', optionField: 'label.style.fill', - value: 'rgba(255,255,255,1)', + value: '#e9e9e9', tabName: 'custom', groupName: 'graph' }, @@ -160,7 +156,7 @@ const setting = [ type: 'gradual', field: 'lineStyle_stroke', optionField: 'lineStyle.stroke', - value: 'l(0) 0:#6b74e4 1:#4391f4', + value: 'l(0) 0:#6b74e4 1:#6b74e4', tabName: 'custom', groupName: 'graph' }, @@ -243,7 +239,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -303,7 +299,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -408,7 +404,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -517,15 +513,15 @@ const option = { yField: 'value', label: { style: { - fill: '#fff', - fontSize: 12 + fill: '#e9e9e9', + fontSize: 10 } }, point: { - size: 5, + size: 3, shape: 'circle', style: { - fill: 'white', + fill: '6B74E4', stroke: '#5B8FF9', lineWidth: 2 } @@ -542,14 +538,14 @@ const option = { }, lineStyle: { lineWidth: 2, - stroke: 'l(0) 0:#6b74e4 1:#4391f4' + stroke: 'l(0) 0:#6b74e4 1:#6b74e4' }, xAxis: { title: { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -572,7 +568,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/折线图/基础曲线图.js b/data-room-ui/packages/G2Plots/折线图/基础曲线图.js index cd82a303..521e7a25 100644 --- a/data-room-ui/packages/G2Plots/折线图/基础曲线图.js +++ b/data-room-ui/packages/G2Plots/折线图/基础曲线图.js @@ -60,7 +60,7 @@ const setting = [ type: 'gradual', field: 'lineStyle_stroke', optionField: 'lineStyle.stroke', - value: 'l(0) 0:#6B74E4 1:#4391F4', + value: 'l(0) 0:#4391F4 1:#4391F4', tabName: 'custom', groupName: 'graph' }, @@ -143,7 +143,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -203,7 +203,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -308,7 +308,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -419,14 +419,14 @@ const option = { smooth: true, lineStyle: { lineWidth: 2, - stroke: 'l(0) 0:#6B74E4 1:#4391F4' + stroke: 'l(0) 0:#4391F4 1:#4391F4' }, xAxis: { title: { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -449,7 +449,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/折线图/多折线动画图.js b/data-room-ui/packages/G2Plots/折线图/多折线动画图.js index 258f40bd..1be3b1cc 100644 --- a/data-room-ui/packages/G2Plots/折线图/多折线动画图.js +++ b/data-room-ui/packages/G2Plots/折线图/多折线动画图.js @@ -217,7 +217,7 @@ const setting = [ type: 'colorPicker', field: 'legendItemName_style_fill', optionField: 'legendItemName.style.fill', - value: '#595959', + value: '#e9e9e9', tabName: 'custom', groupName: 'legend' }, @@ -269,7 +269,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -329,7 +329,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -432,7 +432,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -559,7 +559,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -582,7 +582,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } @@ -635,7 +635,7 @@ const option = { legend: false, legendItemName: { style: { - fill: '#595959', + fill: '#e9e9e9', fontSize: 12, fontWeight: 400 } diff --git a/data-room-ui/packages/G2Plots/折线图/多折线图.js b/data-room-ui/packages/G2Plots/折线图/多折线图.js index 603e91d6..4ff80041 100644 --- a/data-room-ui/packages/G2Plots/折线图/多折线图.js +++ b/data-room-ui/packages/G2Plots/折线图/多折线图.js @@ -99,10 +99,6 @@ const setting = [ value: 'circle', tabName: 'custom', options: [ - { - label: '无', - value: false - }, { label: '空心圆', value: 'hollow-circle' @@ -160,18 +156,7 @@ const setting = [ groupName: 'graph' }, { - label: '折线点颜色', - type: 'colorPicker', - field: 'point_style_fill', - optionField: 'point.style.fill', - // 是否多选 - multiple: false, - value: '#ffffff', - tabName: 'custom', - groupName: 'graph' - }, - { - label: '数据标签字体大小', + label: '数据标签大小', type: 'inputNumber', field: 'label_style_fontSize', optionField: 'label.style.fontSize', @@ -280,7 +265,7 @@ const setting = [ type: 'colorPicker', field: 'legendItemName_style_fill', optionField: 'legendItemName.style.fill', - value: '#595959', + value: '#e9e9e9', tabName: 'custom', groupName: 'legend' }, @@ -332,7 +317,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -392,7 +377,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -495,7 +480,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -599,6 +584,7 @@ if(autoHide){ } else { option.xAxis.label.autoHide = false } +option.point.color = setting.find(settingItem=>settingItem.field === 'color')?.value ` // 数据处理脚本 @@ -622,17 +608,18 @@ const option = { legend: false, legendItemName: { style: { - fill: '#595959', + fill: '#e9e9e9', fontSize: 12, fontWeight: 400 } }, color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'], point: { - size: 5, + size: 3, shape: 'circle', + color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'], style: { - fill: 'white', + // fill: 'white', stroke: '#5B8FF9', lineWidth: 0 } @@ -648,7 +635,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -671,7 +658,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js b/data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js index 38486cdd..444fd840 100644 --- a/data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js +++ b/data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js @@ -168,7 +168,7 @@ const setting = [ type: 'colorPicker', field: 'legendItemName_style_fill', optionField: 'legendItemName.style.fill', - value: '#595959', + value: '#e9e9e9', tabName: 'custom', groupName: 'legend' }, @@ -220,7 +220,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -280,7 +280,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -383,7 +383,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -511,7 +511,7 @@ const option = { legend: false, legendItemName: { style: { - fill: '#595959', + fill: '#e9e9e9', fontSize: 12, fontWeight: 400 } @@ -523,7 +523,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -546,7 +546,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js b/data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js index 958f70a8..4286ad07 100644 --- a/data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js +++ b/data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js @@ -233,7 +233,7 @@ const setting = [ type: 'colorPicker', field: 'legendItemName_style_fill', optionField: 'legendItemName.style.fill', - value: '#595959', + value: '#e9e9e9', tabName: 'custom', groupName: 'legend' }, @@ -285,7 +285,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -345,7 +345,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -448,7 +448,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -575,7 +575,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -598,7 +598,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } @@ -652,7 +652,7 @@ const option = { legend: false, legendItemName: { style: { - fill: '#595959', + fill: '#e9e9e9', fontSize: 12, fontWeight: 400 } diff --git a/data-room-ui/packages/G2Plots/条形图/分组条形图.js b/data-room-ui/packages/G2Plots/条形图/分组条形图.js index 6ec27fb6..3adba1e1 100644 --- a/data-room-ui/packages/G2Plots/条形图/分组条形图.js +++ b/data-room-ui/packages/G2Plots/条形图/分组条形图.js @@ -128,7 +128,7 @@ const setting = [ field: 'label_style_fontSize', // 对应options中的字段 optionField: 'label.style.fontSize', - value: 12, + value: 10, tabName: 'custom', groupName: 'graph' }, @@ -236,7 +236,7 @@ const setting = [ type: 'colorPicker', field: 'legendItemName_style_fill', optionField: 'legendItemName.style.fill', - value: '#595959', + value: '#e9e9e9', tabName: 'custom', groupName: 'legend' }, @@ -288,7 +288,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -391,7 +391,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -462,7 +462,7 @@ const setting = [ optionField: 'yAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'yAxis' }, @@ -546,7 +546,7 @@ const option = { legendPosition: 'top', legendItemName: { style: { - fill: '#595959', + fill: '#e9e9e9', fontSize: 12, fontWeight: 400 } @@ -580,7 +580,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -598,7 +598,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 0 } } @@ -641,7 +641,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/条形图/基础条形图.js b/data-room-ui/packages/G2Plots/条形图/基础条形图.js index 4eac7691..b6f81fba 100644 --- a/data-room-ui/packages/G2Plots/条形图/基础条形图.js +++ b/data-room-ui/packages/G2Plots/条形图/基础条形图.js @@ -115,7 +115,7 @@ const setting = [ field: 'label_style_fontSize', // 对应options中的字段 optionField: 'label.style.fontSize', - value: 12, + value: 10, tabName: 'custom', groupName: 'graph' }, @@ -291,7 +291,7 @@ const setting = [ type: 'colorPicker', field: 'legendItemName_style_fill', optionField: 'legendItemName.style.fill', - value: '#595959', + value: '#e9e9e9', tabName: 'custom', groupName: 'legend' }, @@ -343,7 +343,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -446,7 +446,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -517,7 +517,7 @@ const setting = [ optionField: 'yAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'yAxis' }, @@ -605,7 +605,7 @@ const option = { legend: false, legendItemName: { style: { - fill: '#595959', + fill: '#e9e9e9', fontSize: 12, fontWeight: 400 } @@ -624,7 +624,7 @@ const option = { style: { fill: '#59F25F', opacity: 0, - fontSize: 12 + fontSize: 10 } }, radiusNum: 0, // 设置条形图的圆角的中间值 @@ -641,7 +641,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -659,7 +659,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 0 } } @@ -702,7 +702,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/条形图/堆叠条形图.js b/data-room-ui/packages/G2Plots/条形图/堆叠条形图.js index 444093e1..78fab859 100644 --- a/data-room-ui/packages/G2Plots/条形图/堆叠条形图.js +++ b/data-room-ui/packages/G2Plots/条形图/堆叠条形图.js @@ -107,7 +107,7 @@ const setting = [ field: 'label_style_fontSize', // 对应options中的字段 optionField: 'label.style.fontSize', - value: 12, + value: 10, tabName: 'custom', groupName: 'graph' }, @@ -239,7 +239,7 @@ const setting = [ type: 'colorPicker', field: 'legendItemName_style_fill', optionField: 'legendItemName.style.fill', - value: '#595959', + value: '#e9e9e9', tabName: 'custom', groupName: 'legend' }, @@ -291,7 +291,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -394,7 +394,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -465,7 +465,7 @@ const setting = [ optionField: 'yAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'yAxis' }, @@ -550,7 +550,7 @@ const option = { legendPosition: 'top', legendItemName: { style: { - fill: '#595959', + fill: '#e9e9e9', fontSize: 12, fontWeight: 400 } @@ -588,7 +588,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -606,7 +606,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 0 } } @@ -649,7 +649,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/柱状图/分组柱状图.js b/data-room-ui/packages/G2Plots/柱状图/分组柱状图.js index 0848608e..2f3f4472 100644 --- a/data-room-ui/packages/G2Plots/柱状图/分组柱状图.js +++ b/data-room-ui/packages/G2Plots/柱状图/分组柱状图.js @@ -102,7 +102,7 @@ const setting = [ field: 'label_style_fontSize', // 对应options中的字段 optionField: 'label.style.fontSize', - value: 12, + value: 10, tabName: 'custom', groupName: 'graph' }, @@ -210,7 +210,7 @@ const setting = [ type: 'colorPicker', field: 'legendItemName_style_fill', optionField: 'legendItemName.style.fill', - value: '#595959', + value: '#e9e9e9', tabName: 'custom', groupName: 'legend' }, @@ -262,7 +262,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -322,7 +322,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -425,7 +425,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -544,7 +544,7 @@ const option = { legendPosition: 'top', legendItemName: { style: { - fill: '#595959', + fill: '#e9e9e9', fontSize: 12, fontWeight: 400 } @@ -567,7 +567,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -590,7 +590,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js b/data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js index 39df84e3..42bf992d 100644 --- a/data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js +++ b/data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js @@ -102,7 +102,7 @@ const setting = [ field: 'label_style_fontSize', // 对应options中的字段 optionField: 'label.style.fontSize', - value: 12, + value: 10, tabName: 'custom', groupName: 'graph' }, @@ -210,7 +210,7 @@ const setting = [ type: 'colorPicker', field: 'legendItemName_style_fill', optionField: 'legendItemName.style.fill', - value: '#595959', + value: '#e9e9e9', tabName: 'custom', groupName: 'legend' }, @@ -262,7 +262,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -322,7 +322,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -425,7 +425,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -553,7 +553,7 @@ const option = { legend: false, legendItemName: { style: { - fill: '#595959', + fill: '#e9e9e9', fontSize: 12, fontWeight: 400 } @@ -577,7 +577,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -600,7 +600,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js b/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js index d1e0b17a..8086494e 100644 --- a/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js +++ b/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js @@ -101,7 +101,7 @@ const setting = [ field: 'label_style_fontSize', // 对应options中的字段 optionField: 'label.style.fontSize', - value: 12, + value: 10, tabName: 'custom', groupName: 'graph' }, @@ -216,7 +216,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -276,7 +276,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -379,7 +379,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -503,7 +503,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -526,7 +526,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js b/data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js index e09e9689..33f3b2b3 100644 --- a/data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js +++ b/data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js @@ -102,7 +102,7 @@ const setting = [ field: 'label_style_fontSize', // 对应options中的字段 optionField: 'label.style.fontSize', - value: 12, + value: 10, tabName: 'custom', groupName: 'graph' }, @@ -210,7 +210,7 @@ const setting = [ type: 'colorPicker', field: 'legendItemName_style_fill', optionField: 'legendItemName.style.fill', - value: '#595959', + value: '#e9e9e9', tabName: 'custom', groupName: 'legend' }, @@ -262,7 +262,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -322,7 +322,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -425,7 +425,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -546,7 +546,7 @@ const option = { legendEnable: false, legendItemName: { style: { - fill: '#595959', + fill: '#e9e9e9', fontSize: 12, fontWeight: 400 } @@ -573,7 +573,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -596,7 +596,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js b/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js index eec857db..53b3c920 100644 --- a/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js +++ b/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js @@ -138,7 +138,7 @@ const setting = [ field: 'label_style_fontSize', // 对应options中的字段 optionField: 'label.style.fontSize', - value: 12, + value: 10, tabName: 'custom', groupName: 'graph' }, diff --git a/data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js b/data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js index c0ee8968..06bfd253 100644 --- a/data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js +++ b/data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js @@ -114,6 +114,18 @@ const setting = [ tabName: 'custom', groupName: 'graph' }, + { + label: '数据标签大小', + // 设置组件类型 + type: 'inputNumber', + // 字段 + field: 'conversionTag_style_fontSize', + // 对应options中的字段 + optionField: 'conversionTag.style.fontSize', + value: 10, + tabName: 'custom', + groupName: 'graph' + }, { label: '颜色', // 设置组件类型 diff --git a/data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js b/data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js index ad5f33a0..bcbea080 100644 --- a/data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js +++ b/data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js @@ -139,7 +139,7 @@ const setting = [ type: 'colorPicker', field: 'legendItemName_style_fill', optionField: 'legendItemName.style.fill', - value: '#595959', + value: '#e9e9e9', tabName: 'custom', groupName: 'legend' }, @@ -216,7 +216,7 @@ const option = { legend: false, legendItemName: { style: { - fill: '#595959', + fill: '#e9e9e9', fontSize: 12, fontWeight: 400 } diff --git a/data-room-ui/packages/G2Plots/配置说明.md b/data-room-ui/packages/G2Plots/配置说明.md index 1a43c326..46a7a9d8 100644 --- a/data-room-ui/packages/G2Plots/配置说明.md +++ b/data-room-ui/packages/G2Plots/配置说明.md @@ -144,7 +144,7 @@ const option = { yField: 'value', label: {}, point: { - size: 5, + size: 3, shape: 'diamond', style: { fill: 'white', diff --git a/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js b/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js index e00d41ca..f2797450 100644 --- a/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js +++ b/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js @@ -165,6 +165,86 @@ const setting = [ tabName: 'custom', groupName: 'graph' }, + { + label: '数据标签', + type: 'switch', // 设置组件类型 + field: 'label_style_opacity', // 字段 + optionField: 'label.style.opacity', // 对应options中的字段 + value: 0, + active: 1, + inactive: 0, + tabName: 'custom', + groupName: 'graph' + }, + { + label: '数据标签颜色', + type: 'colorPicker', // 设置组件类型 + field: 'label_style_fill', // 字段 + optionField: 'label.style.fill', // 对应options中的字段 + value: '#ffffff', + tabName: 'custom', + groupName: 'graph' + }, + { + label: '数据标签大小', + // 设置组件类型 + type: 'inputNumber', + // 字段 + field: 'label_style_fontSize', + // 对应options中的字段 + optionField: 'label.style.fontSize', + value: 10, + tabName: 'custom', + groupName: 'graph' + }, + // 网格线 + { + label: '颜色', + type: 'colorPicker', + field: 'yAxis_grid_line_style_stroke', + optionField: 'yAxis.grid.line.style.stroke', + value: '#E5E6EB10', + tabName: 'custom', + groupName: 'grid' + }, + { + label: '奇数圈底色', + type: 'colorPicker', // 设置组件类型 + field: 'yAxis_grid_alternateColor1', // 字段 + optionField: 'yAxis.grid.alternateColor1', // 对应options中的字段 + value: 'rgba(0, 0, 0, 0.04)', + tabName: 'custom', + groupName: 'grid' + }, + { + label: '偶数圈底色', + type: 'colorPicker', // 设置组件类型 + field: 'yAxis_grid_alternateColor2', // 字段 + optionField: 'yAxis.grid.alternateColor2', // 对应options中的字段 + value: 'rgba(0, 0, 0, 0.04)', + tabName: 'custom', + groupName: 'grid' + }, + { + label: '标签大小', + type: 'inputNumber', + field: 'xAxis_label_style_fontSize', + optionField: 'xAxis.label.style.fontSize', + value: 12, + tabName: 'custom', + groupName: 'xAxis' + }, + { + label: '标签颜色', + type: 'colorPicker', + field: 'xAxis_label_style_fill', + optionField: 'xAxis.label.style.fill', + // 是否多选 + multiple: false, + value: '#e9e9e9', + tabName: 'custom', + groupName: 'xAxis' + }, // 图例 legend { label: '显示', @@ -227,7 +307,7 @@ const setting = [ type: 'colorPicker', field: 'legendItemName_style_fill', optionField: 'legendItemName.style.fill', - value: '#595959', + value: '#e9e9e9', tabName: 'custom', groupName: 'legend' }, @@ -269,7 +349,8 @@ const data = [ const optionHandler = 'option.legend = option.legendEnable ? {position: setting.find(settingItem=>settingItem.field === \'legendPosition\').value} : false;' + '\n if (option.legendEnable) {\n' + ' option.legend.itemName = option.legendItemName\n' + - ' }' + ' }' + + 'option.yAxis.grid.alternateColor = [option.yAxis.grid.alternateColor1, option.yAxis.grid.alternateColor2]' // 数据处理脚本 const dataHandler = '' @@ -292,7 +373,7 @@ const option = { legend: false, legendItemName: { style: { - fill: '#595959', + fill: '#e9e9e9', fontSize: 12, fontWeight: 400 } @@ -308,6 +389,12 @@ const option = { xAxis: { line: null, tickLine: null, + label: { + style: { + fill: '#e9e9e9', + fontSize: 12 + } + }, grid: { line: { style: { @@ -326,10 +413,27 @@ const option = { min: 0, label: false, grid: { - alternateColor: 'rgba(0, 0, 0, 0.04)' + line: { + type: 'line', + style: { + stroke: '#E5E6EB10', + lineDash: null + }, + }, + alternateColor1: 'rgba(0, 0, 0, 0.04)', + alternateColor2: 'rgba(0, 0, 0, 0.04)', + alternateColor: ['rgba(0, 0, 0, 0.04)', 'rgba(0, 0, 0, 0.04)'] } }, - area: 1 + area: 1, + label: { + autoRotate: false, + style: { + fill: '#ffffff', + opacity: 1, + fontSize: 12 + } + } } export default { diff --git a/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js b/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js index a3e85013..33f54ba9 100644 --- a/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js +++ b/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js @@ -179,12 +179,20 @@ const setting = [ field: 'label_style_fontSize', // 对应options中的字段 optionField: 'label.style.fontSize', - value: 12, + value: 10, tabName: 'custom', groupName: 'graph' }, - - // x轴 xAxis + // 网格线 + { + label: '颜色', + type: 'colorPicker', + field: 'yAxis_grid_line_style_stroke', + optionField: 'yAxis.grid.line.style.stroke', + value: '#E5E6EB10', + tabName: 'custom', + groupName: 'grid' + }, { label: '显示外层圆圈', type: 'switch', @@ -214,6 +222,26 @@ const setting = [ tabName: 'custom', groupName: 'grid' }, + { + label: '标签大小', + type: 'inputNumber', + field: 'xAxis_label_style_fontSize', + optionField: 'xAxis.label.style.fontSize', + value: 12, + tabName: 'custom', + groupName: 'xAxis' + }, + { + label: '标签颜色', + type: 'colorPicker', + field: 'xAxis_label_style_fill', + optionField: 'xAxis.label.style.fill', + // 是否多选 + multiple: false, + value: '#e9e9e9', + tabName: 'custom', + groupName: 'xAxis' + }, { label: 'y轴最小值', type: 'inputNumber', @@ -286,6 +314,12 @@ const option = { lineEnabled: false, line: {}, tickLine: null, + label: { + style: { + fill: '#e9e9e9', + fontSize: 12 + } + }, grid: { line: { style: { @@ -303,6 +337,7 @@ const option = { line: { type: 'line', style: { + stroke: '#E5E6EB10', lineDash: null, }, }, diff --git a/data-room-ui/packages/G2Plots/面积图/基础面积图.js b/data-room-ui/packages/G2Plots/面积图/基础面积图.js index cb8023d7..f7abbc23 100644 --- a/data-room-ui/packages/G2Plots/面积图/基础面积图.js +++ b/data-room-ui/packages/G2Plots/面积图/基础面积图.js @@ -124,7 +124,7 @@ const setting = [ type: 'colorPicker', // 设置组件类型 field: 'point_color', // 字段 optionField: 'point.color', // 对应options中的字段 - value: '', + value: '#6B74E4', tabName: 'custom', groupName: 'graph' }, @@ -133,13 +133,9 @@ const setting = [ type: 'select', // 设置组件类型 field: 'point_shape', // 字段 optionField: 'point.shape', // 对应options中的字段 - value: 'hollow-circle', + value: 'circle', tabName: 'custom', options: [ - { - label: '无', - value: false - }, { label: '空心圆', value: 'hollow-circle' @@ -188,11 +184,11 @@ const setting = [ groupName: 'graph' }, { - label: '数据标签字体大小', + label: '数据标签大小', type: 'inputNumber', field: 'label_style_fontSize', optionField: 'label.style.fontSize', - value: 0, + value: 10, tabName: 'custom', groupName: 'graph' }, @@ -201,7 +197,7 @@ const setting = [ type: 'colorPicker', field: 'label_style_fill', optionField: 'label.style.fill', - value: 'rgba(255,255,255,1)', + value: '#e9e9e9', tabName: 'custom', groupName: 'graph' }, @@ -284,7 +280,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -344,7 +340,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -447,7 +443,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -572,8 +568,8 @@ const option = { }, label: { style: { - fill: 'rgba(255,255,255,1)', - fontSize: 0 + fill: '#e9e9e9', + fontSize: 10 } }, line: { @@ -581,7 +577,7 @@ const option = { size: 2 }, point: { - color: '', + color: '#6B74E4', shape: 'hollow-circle', size: 0 }, @@ -590,7 +586,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -613,7 +609,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js b/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js index 30c205c4..389ea336 100644 --- a/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js +++ b/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js @@ -65,7 +65,7 @@ const setting = [ type: 'switch', // 设置组件类型 field: 'smooth', // 字段 optionField: 'smooth', // 对应options中的字段 - value: false, + value: true, active: true, inactive: false, tabName: 'custom', @@ -108,10 +108,6 @@ const setting = [ value: 'circle', tabName: 'custom', options: [ - { - label: '无', - value: false - }, { label: '空心圆', value: 'hollow-circle' @@ -169,11 +165,11 @@ const setting = [ groupName: 'graph' }, { - label: '数据标签字体大小', + label: '数据标签大小', type: 'inputNumber', field: 'label_style_fontSize', optionField: 'label.style.fontSize', - value: 0, + value: 10, tabName: 'custom', groupName: 'graph' }, @@ -278,7 +274,7 @@ const setting = [ type: 'colorPicker', field: 'legendItemName_style_fill', optionField: 'legendItemName.style.fill', - value: '#595959', + value: '#e9e9e9', tabName: 'custom', groupName: 'legend' }, @@ -330,7 +326,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -390,7 +386,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -493,7 +489,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -615,21 +611,21 @@ const option = { yField: 'value', color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'], seriesField: 'type', - smooth: false, + smooth: true, legendEnable: false, legendLayout: 'vertical', legendPosition: 'top', legend: false, legendItemName: { style: { - fill: '#595959', + fill: '#e9e9e9', fontSize: 12, fontWeight: 400 } }, startOnZero: true, point: { - size: 5, + size: 3, shape: 'circle', }, label: { @@ -643,7 +639,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -666,7 +662,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js b/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js index fa8d691c..b8db65e6 100644 --- a/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js +++ b/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js @@ -51,7 +51,7 @@ const setting = [ type: 'switch', // 设置组件类型 field: 'smooth', // 字段 optionField: 'smooth', // 对应options中的字段 - value: false, + value: true, active: true, inactive: false, tabName: 'custom', @@ -89,7 +89,7 @@ const setting = [ type: 'gradual', // 设置组件类型 field: 'areaStyle_fill', // 字段 optionField: 'areaStyle.fill', // 对应options中的字段 - value: 'l(270) 0:#6B74E4 1:#000000', + value: 'l(90) 0:#6B74E4 1:#000000', tabName: 'custom', groupName: 'graph' }, @@ -113,7 +113,7 @@ const setting = [ type: 'inputNumber', field: 'point_size', optionField: 'point.size', - value: 0, + value: 3, min: 0, tabName: 'custom', groupName: 'graph' @@ -135,10 +135,6 @@ const setting = [ value: 'hollow-circle', tabName: 'custom', options: [ - { - label: '无', - value: false - }, { label: '空心圆', value: 'hollow-circle' @@ -187,11 +183,11 @@ const setting = [ groupName: 'graph' }, { - label: '数据标签字体大小', + label: '数据标签大小', type: 'inputNumber', field: 'label_style_fontSize', optionField: 'label.style.fontSize', - value: 0, + value: 10, tabName: 'custom', groupName: 'graph' }, @@ -200,7 +196,7 @@ const setting = [ type: 'colorPicker', field: 'label_style_fill', optionField: 'label.style.fill', - value: 'rgba(255,255,255,1)', + value: '#e9e9e9', tabName: 'custom', groupName: 'graph' }, @@ -283,7 +279,7 @@ const setting = [ optionField: 'xAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'xAxis' }, @@ -343,7 +339,7 @@ const setting = [ optionField: 'xAxis.tickLine.style.stroke', // 是否多选 multiple: false, - value: '#d0d0d0', + value: '#C9CDD4', tabName: 'custom', groupName: 'xAxis' }, @@ -446,7 +442,7 @@ const setting = [ optionField: 'yAxis.title.style.fill', // 是否多选 multiple: false, - value: '#8C8C8C', + value: '#e9e9e9', tabName: 'custom', groupName: 'yAxis' }, @@ -550,12 +546,12 @@ const option = { data, xField: 'date', yField: 'value', - smooth: false, + smooth: true, startOnZero: true, isStack: false, areaStyle: { fillOpacity: 0.15, - fill: 'l(270) 0:#6B74E4 1:#000000' + fill: 'l(90) 0:#6B74E4 1:#000000' }, line: { color: '#6B74E4', @@ -564,12 +560,12 @@ const option = { point: { color: '', shape: 'hollow-circle', - size: 0 + size: 3 }, label: { style: { - fill: 'rgba(255,255,255,1)', - fontSize: 0 + fill: '#e9e9e9', + fontSize: 10 } }, xAxis: { @@ -577,7 +573,7 @@ const option = { text: '', position: 'end', style: { - fill: '#8C8C8C', + fill: '#e9e9e9', fontSize: 12 } }, @@ -600,7 +596,7 @@ const option = { }, tickLine: { style: { - stroke: '#d0d0d0', + stroke: '#C9CDD4', lineWidth: 1 } } diff --git a/data-room-ui/packages/G2Plots/饼图/基础饼图.js b/data-room-ui/packages/G2Plots/饼图/基础饼图.js index ccd8c9a6..53f4c4b1 100644 --- a/data-room-ui/packages/G2Plots/饼图/基础饼图.js +++ b/data-room-ui/packages/G2Plots/饼图/基础饼图.js @@ -277,7 +277,7 @@ const option = { label: { autoRotate: true, type: 'inner', - labelHeight: 50, + // offset: '-50%', labelLine: { style: { stroke: '#5B8FF9',