From 2dcd0d7d69a8672444283a0c2243e1469739fa5f Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Thu, 12 Oct 2023 17:55:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=95=B0=E6=8D=AE=E6=BA=90=E5=8F=AF?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RightSetting/DataSetting.vue              | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
index 58cae785..bc473f20 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
@@ -23,6 +23,23 @@
           </div>
           <div class="lc-field-body">
             <el-form-item
+              v-if="config.option.displayOption.expression && config.option.displayOption.expression.enable"
+              label="数据来源"
+            >
+              <el-radio-group
+                v-model="dataSourceStyle"
+                class="bs-el-radio-group"
+              >
+                <el-radio label="dataset">
+                  数据集
+                </el-radio>
+                <el-radio label="expression">
+                  表达式
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item
+              v-if="dataSourceStyle === 'dataset'"
               label="数据集"
             >
               <data-set-select
@@ -38,6 +55,15 @@
                 </template>
               </data-set-select>
             </el-form-item>
+            <el-form-item
+              v-if="dataSourceStyle === 'expression' && config.option.displayOption.expression && config.option.displayOption.expression.enable"
+              label="表达式"
+            >
+              <i
+                class="el-icon-edit expression"
+                @click="openExpression"
+              />
+            </el-form-item>
             <el-form-item
               v-if="config.option.displayOption.text && config.option.displayOption.text.enable"
               label="文本内容"
@@ -48,15 +74,6 @@
                 clearable
               />
             </el-form-item>
-            <el-form-item
-              v-if="config.option.displayOption.expression && config.option.displayOption.expression.enable"
-              label="表达式"
-            >
-              <i
-                class="el-icon-edit expression"
-                @click="openExpression"
-              />
-            </el-form-item>
           </div>
         </div>
         <div
@@ -624,6 +641,7 @@ export default {
   },
   data () {
     return {
+      dataSourceStyle: 'dataset', // 数据来源方式
       fieldsList: [],
       params: [], // 参数配置
       datasetName: '',