From 61be05080f3b966408ebb9bb793ccebbe3f5e120 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Sat, 14 Oct 2023 14:54:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A1=A8=E7=9B=98=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/G2Plots/进度图/仪表盘.js   | 24 +++++++++++++----
 .../G2Plots/进度图/进度仪表盘.js      | 27 +++++++++++++++----
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/data-room-ui/packages/G2Plots/进度图/仪表盘.js b/data-room-ui/packages/G2Plots/进度图/仪表盘.js
index 9685e331..de84471b 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 = '2023101402'
+const version = '2023101403'
 // 分类
 const category = 'Gauge'
 // 标题
@@ -56,13 +56,25 @@ const setting = [
     // 设置组件类型
     type: 'gradual',
     // 字段
-    field: 'range_color',
+    field: 'color1',
     // 对应options中的字段
-    optionField: 'range.color',
+    optionField: 'color1',
     value: 'l(0) 0:#6b74e4 1:#4391f4',
     tabName: 'custom',
     groupName: 'graph'
   },
+  {
+    label: '表盘背景颜色',
+    // 设置组件类型
+    type: 'colorPicker',
+    // 字段
+    field: 'color2',
+    // 对应options中的字段
+    optionField: 'color2',
+    value: '#d0d0d0',
+    tabName: 'custom',
+    groupName: 'graph'
+  },
   {
     label: '指标颜色',
     // 设置组件类型
@@ -173,7 +185,7 @@ const data = [
   }
 ]
 // 配置处理脚本
-const optionHandler =''
+const optionHandler ='option.range.color = [option.color1, option.color2]'
 
 // 数据处理脚本
 const dataHandler = '// 取返回数据列表的第一项指标值\noption.percent = data[0][setting.filter(settingItem=>settingItem.field === \'percent\')[0].value]'
@@ -184,8 +196,10 @@ const option = {
   dataKey: 'percent',
   data,
   percent: 0.75,
+  color1: 'l(0) 0:#6b74e4 1:#4391f4',
+  color2: '#d0d0d0',
   range: {
-    color: 'l(0) 0:#6b74e4 1:#4391f4'
+    color: ['l(0) 0:#6b74e4 1:#4391f4','#d0d0d0']
   },
   indicator: {
     pointer: {
diff --git a/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js b/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js
index 22f8d09c..15ad569b 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 = '2023101402'
+const version = '2023101403'
 // 分类
 const category = 'Gauge'
 // 标题
@@ -32,13 +32,25 @@ const setting = [
     // 设置组件类型
     type: 'gradual',
     // 字段
-    field: 'range_color',
+    field: 'color1',
     // 对应options中的字段
-    optionField: 'range.color',
+    optionField: 'color1',
     value: 'l(0) 0:#6b74e4 1:#4391f4',
     tabName: 'custom',
     groupName: 'graph'
   },
+  {
+    label: '表盘背景颜色',
+    // 设置组件类型
+    type: 'colorPicker',
+    // 字段
+    field: 'color2',
+    // 对应options中的字段
+    optionField: 'color2',
+    value: '#d0d0d0',
+    tabName: 'custom',
+    groupName: 'graph'
+  },
   {
     label: '指标颜色',
     // 设置组件类型
@@ -147,6 +159,8 @@ const data = [
     percent: 0.75
   }
 ]
+// 配置处理脚本
+const optionHandler ='option.range.color = [option.color1, option.color2]'
 // 数据处理脚本
 const dataHandler = '// 取返回数据列表的第一项指标值\noption.percent = data[0][setting.filter(settingItem=>settingItem.field === \'percent\')[0].value]'
 
@@ -156,8 +170,10 @@ const option = {
   dataKey: 'percent',
   data,
   percent: 0.75,
+  color1: 'l(0) 0:#6b74e4 1:#4391f4',
+  color2: '#d0d0d0',
   range: {
-    color: 'l(0) 0:#6b74e4 1:#4391f4'
+    color: ['l(0) 0:#6b74e4 1:#4391f4','#d0d0d0']
   },
   startAngle: Math.PI,
   endAngle: 2 * Math.PI,
@@ -192,5 +208,6 @@ export default {
   name,
   option,
   setting,
-  dataHandler
+  dataHandler,
+  optionHandler
 }