From fd3ce6a8bd838df52ec75b00dd588a4df4061430 Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Thu, 16 Nov 2023 11:27:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=B0=B4=E6=B3=A2?= =?UTF-8?q?=E5=9B=BE=E7=BB=84=E4=BB=B6=E7=9A=84=E5=AD=97=E4=BD=93=E9=80=8F?= =?UTF-8?q?=E6=98=8E=E5=BA=A6=E8=BE=83=E4=BD=8E=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/G2Plots/进度图/水波图.js | 5 +++-- .../G2Plots/进度图/矩形水波图.js | 5 +++-- .../G2Plots/进度图/进度指标环图.js | 17 ++++++----------- .../packages/G2Plots/进度图/进度环图.js | 2 +- .../G2Plots/进度图/钻石水波图.js | 5 +++-- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/data-room-ui/packages/G2Plots/进度图/水波图.js b/data-room-ui/packages/G2Plots/进度图/水波图.js index c3f9f812..117cca48 100644 --- a/data-room-ui/packages/G2Plots/进度图/水波图.js +++ b/data-room-ui/packages/G2Plots/进度图/水波图.js @@ -1,6 +1,6 @@ import fontList from 'data-room-ui/js/utils/fontList' // 配置版本号 -const version = '2023111401' +const version = '2023111601' // 分类 const category = 'Liquid' // 标题 @@ -212,9 +212,10 @@ const option = { statistic: { content: { style: { + opacity: 1, fontSize: 30, lineHeight: 1, - fill: '#d0d0d0', + fill: '#FFFFFF', fontFamily: 'ds-digitalbold' } } diff --git a/data-room-ui/packages/G2Plots/进度图/矩形水波图.js b/data-room-ui/packages/G2Plots/进度图/矩形水波图.js index f75caf8f..8f97d65d 100644 --- a/data-room-ui/packages/G2Plots/进度图/矩形水波图.js +++ b/data-room-ui/packages/G2Plots/进度图/矩形水波图.js @@ -1,6 +1,6 @@ import fontList from 'data-room-ui/js/utils/fontList' // 配置版本号 -const version = '2023111401' +const version = '2023111601' // 分类 const category = 'Liquid' // 标题 @@ -197,10 +197,11 @@ const option = { statistic: { content: { style: { + opacity: 1, fontSize: 30, lineHeight: 1, fontFamily: 'ds-digitalbold', - fill: '#d0d0d0' + fill: '#FFFFFF' } } }, diff --git a/data-room-ui/packages/G2Plots/进度图/进度指标环图.js b/data-room-ui/packages/G2Plots/进度图/进度指标环图.js index 74eb5690..475f13ba 100644 --- a/data-room-ui/packages/G2Plots/进度图/进度指标环图.js +++ b/data-room-ui/packages/G2Plots/进度图/进度指标环图.js @@ -35,7 +35,7 @@ const setting = [ field: 'color2', // 对应options中的字段 optionField: 'color2', - value: 'rgba(238, 238, 238, 1)', + value: '#FFFFFF', tabName: 'custom', groupName: 'graph' }, @@ -108,7 +108,7 @@ const setting = [ field: 'statistic_content_style_fill', // 对应options中的字段 optionField: 'statistic.content.style.fill', - value: 'rgba(133, 133, 133, 1)', + value: '#FFFFFF', tabName: 'custom', groupName: 'graph' }, @@ -120,7 +120,7 @@ const setting = [ field: 'statistic_content_style_fontSize', // 对应options中的字段 optionField: 'statistic.content.style.fontSize', - value: 24, + value: 40, tabName: 'custom', groupName: 'graph' }, @@ -134,7 +134,7 @@ const setting = [ optionField: 'statistic.content.style.fontFamily', // 是否多选 multiple: false, - value: '', + value: 'ds-digitalbold', tabName: 'custom', options: fontList, groupName: 'graph' @@ -183,20 +183,15 @@ const option = { appendPadding: [0, 0, 0, 0], data, color1: 'l(0) 0:#6B74E3 1:#38BBE5', - color2: '#d0d0d0', + color2: '#FFFFFF', autoFit: true, percent: 0.6, color: ['l(0) 0:#6B74E3 1:#38BBE5', '#d0d0d0'], innerRadius: 0.85, radius: 0.98, statistic: { - // title: { - // style: { fill: '#fafafa', fontSize: 28, lineHeight: 2 }, - // content: '进度', - // offsetY: 0 - // }, content: { - style: { fill: '#fafafa', fontSize: 28, fontFamily: '', lineHeight: 2 }, + style: { fill: '#FFFFFF', fontSize: 40, fontFamily: 'ds-digitalbold', lineHeight: 2 }, offsetY: 0 } } diff --git a/data-room-ui/packages/G2Plots/进度图/进度环图.js b/data-room-ui/packages/G2Plots/进度图/进度环图.js index 5681e79e..410ba58c 100644 --- a/data-room-ui/packages/G2Plots/进度图/进度环图.js +++ b/data-room-ui/packages/G2Plots/进度图/进度环图.js @@ -1,6 +1,6 @@ import fontList from 'data-room-ui/js/utils/fontList' // 配置版本号 -const version = '2023111401' +const version = '2023111601' // 分类 const category = 'RingProgress' // 标题 diff --git a/data-room-ui/packages/G2Plots/进度图/钻石水波图.js b/data-room-ui/packages/G2Plots/进度图/钻石水波图.js index 69fe9e4b..f5ff73e6 100644 --- a/data-room-ui/packages/G2Plots/进度图/钻石水波图.js +++ b/data-room-ui/packages/G2Plots/进度图/钻石水波图.js @@ -1,6 +1,6 @@ import fontList from 'data-room-ui/js/utils/fontList' // 配置版本号 -const version = '2023111401' +const version = '2023111601' // 分类 const category = 'Liquid' // 标题 @@ -197,10 +197,11 @@ const option = { statistic: { content: { style: { + opacity: 1, fontSize: 30, lineHeight: 1, fontFamily: 'ds-digitalbold', - fill: '#d0d0d0' + fill: '#FFFFFF' } } },