From e00635e0c54f7075da9c0392c8481c2edacaffa6 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Fri, 22 Sep 2023 16:44:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E5=9B=BE=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BigScreenDesign/OverallSetting/index.vue        | 2 +-
 data-room-ui/packages/G2Plots/面积图/基础面积图.js   | 5 +++--
 .../packages/G2Plots/面积图/渐变色面积图.js         | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue b/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue
index 34eafae4..1610b0c3 100644
--- a/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue
@@ -321,7 +321,7 @@ export default {
       return this.form.customTheme === 'light' ? 'lightBgColor' : 'bgColor'
     },
     currentBg () {
-      return this.form.customTheme === 'light' ? 'lightBgColor' : 'bg'
+      return this.form.customTheme === 'light' ? 'lightBg' : 'bg'
     },
     dsValue () {
       return this.form.cacheDataSets?.map(dSet => ({
diff --git a/data-room-ui/packages/G2Plots/面积图/基础面积图.js b/data-room-ui/packages/G2Plots/面积图/基础面积图.js
index b1084d47..8b9a83e8 100644
--- a/data-room-ui/packages/G2Plots/面积图/基础面积图.js
+++ b/data-room-ui/packages/G2Plots/面积图/基础面积图.js
@@ -475,7 +475,7 @@ const setting = [
     value: '#d0d0d0',
     tabName: 'custom',
     groupName: 'yAxis'
-  },
+  }
   // 边距 padding
 ]
 
@@ -501,7 +501,7 @@ const optionHandler = '  let pointEnable = setting.find(settingItem=>settingItem
   '    option.point = {shape: pointEnable}\n' +
   '    let pointColor = setting.find(settingItem=>settingItem.field === \'point_color\').value\n' +
   '    option.point.color = pointColor\n' +
-  '  option.point.size =  setting.find(settingItem=>settingItem.field === \'point_size\').value\n'  +
+  '  option.point.size =  setting.find(settingItem=>settingItem.field === \'point_size\').value\n' +
   '};' +
   'option.yAxis.grid.line.style.lineDash = [4,setting.find(settingItem=>settingItem.field === \'yAxis_grid_line_style_lineDash\').value]'
 
@@ -517,6 +517,7 @@ const option = {
   yField: 'scales',
   smooth: false,
   startOnZero: true,
+  isStack: false,
   areaStyle: {
     fill: 'l(0) 0:#3e5bdb 1:#3e5bdb'
   },
diff --git a/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js b/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js
index 52840d54..bcd3fc68 100644
--- a/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js
+++ b/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js
@@ -484,6 +484,7 @@ const option = {
   yField: 'scales',
   smooth: false,
   startOnZero: true,
+  isStack: false,
   areaStyle: {
     fill: 'l(270) 0:#ffffff 1:#1890ff'
   },