From 268f72e3f35bde5f58bc30e9ea4a4fca68c7b444 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Tue, 17 Oct 2023 13:38:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=84=E4=BB=B6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E9=80=89=E9=A1=B9=E4=BF=9D=E5=AD=98=E5=88=B0=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RightSetting/DataSetting.vue              | 20 +++++++++----------
 .../packages/js/config/commonConfig.js        |  1 +
 data-room-ui/packages/js/store/actions.js     |  4 ++++
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
index d297967e..21eac27a 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
@@ -27,7 +27,7 @@
               label="数据来源"
             >
               <el-radio-group
-                v-model="dataSourceStyle"
+                v-model="config.dataSource.source "
                 class="bs-el-radio-group"
               >
                 <el-radio label="dataset">
@@ -39,7 +39,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item
-              v-if="dataSourceStyle === 'dataset'"
+              v-if="config.dataSource.source === 'dataset'"
               label="数据集"
             >
               <data-set-select
@@ -56,7 +56,7 @@
               </data-set-select>
             </el-form-item>
             <el-form-item
-              v-if="dataSourceStyle === 'expression' && config.option.displayOption.expression && config.option.displayOption.expression.enable"
+              v-if="config.dataSource.source === 'expression' && config.option.displayOption.expression && config.option.displayOption.expression.enable"
               label="表达式"
             >
               <i
@@ -102,7 +102,7 @@ data.forEach(item => {
           </div>
         </div>
         <div
-          v-if="!['tree','multipleNumberChart','carousel'].includes(config.type) && config.option.displayOption.dataSourceType.enable && dataSourceStyle !== 'expression'"
+          v-if="!['tree','multipleNumberChart','carousel'].includes(config.type) && config.option.displayOption.dataSourceType.enable && config.dataSource.source !== 'expression'"
           class="data-setting-data-box"
         >
           <div class="lc-field-head">
@@ -300,7 +300,7 @@ data.forEach(item => {
               <el-table-column
                 prop="width"
                 label="列宽"
-                width='90'
+                width="90"
                 align="center"
               >
                 <template slot-scope="scope">
@@ -470,7 +470,7 @@ data.forEach(item => {
           </div>
         </div>
         <div
-          v-if="config.option.displayOption.params.enable && dataSourceStyle !== 'expression'"
+          v-if="config.option.displayOption.params.enable && config.dataSource.source !== 'expression'"
           class="data-setting-data-box"
         >
           <div class="lc-field-head">
@@ -642,7 +642,6 @@ export default {
   },
   data () {
     return {
-      dataSourceStyle: 'dataset', // 数据来源方式
       fieldsList: [],
       params: [], // 参数配置
       datasetName: '',
@@ -764,11 +763,10 @@ export default {
     }
   },
   methods: {
-    changeDsid(dsId){
-       this.clearVerify()
-      this.config.customize.columnConfig=[]
+    changeDsid (dsId) {
+      this.clearVerify()
+      this.config.customize.columnConfig = []
       this.getDataSetDetailsById(dsId, 'treeTable')
-
     },
     // 打开表达式弹窗
     openExpression () {
diff --git a/data-room-ui/packages/js/config/commonConfig.js b/data-room-ui/packages/js/config/commonConfig.js
index 597a1a04..2213f743 100644
--- a/data-room-ui/packages/js/config/commonConfig.js
+++ b/data-room-ui/packages/js/config/commonConfig.js
@@ -67,6 +67,7 @@ export default function (customConfig) {
       className:
         'com.gccloud.dataroom.core.module.chart.components.datasource.DataSetDataSource',
       dataSourceKey: '', // 数据源，选择不同数据库
+      source: 'dataset',
       businessKey: '', // 数据集标识
       dimensionField: '', // 维度
       metricField: '', // 指标
diff --git a/data-room-ui/packages/js/store/actions.js b/data-room-ui/packages/js/store/actions.js
index 3da88517..f2df60f8 100644
--- a/data-room-ui/packages/js/store/actions.js
+++ b/data-room-ui/packages/js/store/actions.js
@@ -18,6 +18,10 @@ export default {
         const pageInfo = handleResData(data)
         // 兼容边框配置
         pageInfo.chartList.forEach((item) => {
+          if (item.dataSource) {
+            item.dataSource.source = item.dataSource?.source || 'dataset'
+          }
+
           if (!item.border) {
             item.border = { type: '', titleHeight: 60, fontSize: 16, isTitle: true, padding: [0, 0, 0, 0] }
           }