From 7fd8b2ee4af29c6dfb86b1baac2936b91671a295 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 24 Jul 2024 16:51:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E6=95=B0=E6=8D=AE=E6=BA=90=EF=BC=8C=E5=9C=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF=E9=A1=B5=E7=82=B9=E5=87=BB=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E6=AD=A5=E8=BF=94=E5=9B=9E=E5=88=B0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=EF=BC=8C=E6=B2=A1=E6=9C=89=E8=AE=B0?=
 =?UTF-8?q?=E4=BD=8F=E6=95=B0=E6=8D=AE=E6=BA=90=E7=B1=BB=E5=9E=8B=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=8A=B6=E6=80=81=EF=BC=8C=E8=BF=9B=E5=85=A5=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=80=E6=AD=A5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue       |  4 ++--
 .../src/views/copilot/DialogueChart.vue           |  2 +-
 .../visualized/data/datasource/form/index.vue     | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index d043b5777a..293359c46b 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -1866,8 +1866,8 @@ defineExpose({
                 </div>
               </div>
             </div>
-            <div class="label">选项值数量</div>
-            <div class="value">
+            <div class="label" style="margin-top: 10.5px">选项值数量</div>
+            <div class="value" style="margin-top: 10.5px">
               <el-radio-group v-model="curComponent.resultMode">
                 <el-radio :label="0">默认</el-radio>
                 <el-radio :label="1">全部</el-radio>
diff --git a/core/core-frontend/src/views/copilot/DialogueChart.vue b/core/core-frontend/src/views/copilot/DialogueChart.vue
index 456ecc03be..38a5e85fac 100644
--- a/core/core-frontend/src/views/copilot/DialogueChart.vue
+++ b/core/core-frontend/src/views/copilot/DialogueChart.vue
@@ -269,7 +269,7 @@ const tips = computed(() => {
       <div v-else class="question-or-title">
         {{ tips }}
       </div>
-      <div v-if="isWelcome" class="is-welcome">这是一句 Copilot 的功能描述</div>
+      <div v-if="isWelcome" class="is-welcome">您可以问我: 2020年各个销售部门销售额占比的饼图</div>
       <div
         v-else-if="copilotInfo.msgType === 'api' && copilotInfo.msgStatus === 1"
         class="chart-type"
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
index d4e41de825..d20ea02da7 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
@@ -279,6 +279,21 @@ const handleShowFinishPage = ({ id, name, pid }) => {
 emitter.on('showFinishPage', handleShowFinishPage)
 
 const prev = () => {
+  if ((currentDsType.value === 'API' && activeApiStep.value === 1) || activeStep.value === 1) {
+    ElMessageBox.confirm('填写的信息将会清空，确定返回上一步吗？', {
+      confirmButtonType: 'primary',
+      type: 'warning',
+      autofocus: false,
+      showClose: false
+    }).then(() => {
+      prevConfirm()
+    })
+  } else {
+    prevConfirm()
+  }
+}
+
+const prevConfirm = () => {
   if (currentDsType.value === 'API' && activeApiStep.value === 2) {
     activeApiStep.value = 1
     activeStep.value = 1