Browse Source

fix:修复水波图组件的字体透明度较低问题

liu.shiyi 1 year ago
parent
commit
fd3ce6a8bd

+ 3 - 2
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'
       }
     }

+ 3 - 2
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'
       }
     }
   },

+ 6 - 11
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
     }
   }

+ 1 - 1
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'
 // 标题

+ 3 - 2
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'
       }
     }
   },