From 681b6469686ab08834f21f3eacd200a453205f8a Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 15 Jul 2024 17:08:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE=E9=9B=86=E6=8A=98=E5=8F=A0?=
 =?UTF-8?q?=E5=90=8E=E5=86=8D=E5=B1=95=E5=BC=80=EF=BC=8C=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=80=A7=E5=BC=B9=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/ComponentToolBar.vue   | 12 ++++++++++-
 .../editor/editor-style/VQueryChartStyle.vue  |  1 +
 .../src/views/copilot/DialogueChart.vue       | 19 +++++++++++++++--
 .../core-frontend/src/views/copilot/index.vue | 21 +++++++++++++++----
 .../visualized/data/dataset/form/AddSql.vue   |  5 +++++
 .../visualized/data/dataset/form/index.vue    |  5 +++++
 6 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue b/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue
index 3c2e1c1353..f0a405187a 100644
--- a/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue
+++ b/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue
@@ -138,7 +138,7 @@ onUnmounted(() => {
       <el-icon @click="scaleIncrease(1)" class="hover-icon-custom">
         <Icon name="dv-max"></Icon
       ></el-icon>
-      <el-divider direction="vertical" class="custom-divider" />
+      <el-divider direction="vertical" class="custom-divider_scale" />
       <el-tooltip effect="ndark" content="定位到中心点" placement="top">
         <el-icon @click="reposition" class="hover-icon-custom" style="margin-right: 12px">
           <Icon name="dv-reposition"></Icon
@@ -164,6 +164,16 @@ onUnmounted(() => {
     align-items: center;
   }
 }
+:deep(.ed-input--dark .ed-input__wrapper),
+:deep(.ed-input-number--dark:not(.is-disabled) .ed-input-number__decrease:not(.is-disabled)),
+:deep(.ed-input-number--dark:not(.is-disabled) .ed-input-number__increase:not(.is-disabled)) {
+  background-color: #1a1a1a;
+}
+
+.custom-divider_scale {
+  height: 18px;
+  border-color: #ffffff26;
+}
 
 .scale-input-number {
   height: 24px;
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
index e1f2d08b9d..de898d59a2 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
@@ -328,6 +328,7 @@ if (!chart.value.customStyle.component.hasOwnProperty('labelShow')) {
                 v-model="chart.customStyle.component.nameboxSpacing"
                 :min="0"
                 :max="50"
+                :effect="themes"
                 controls-position="right"
               />
             </el-form-item>
diff --git a/core/core-frontend/src/views/copilot/DialogueChart.vue b/core/core-frontend/src/views/copilot/DialogueChart.vue
index 7a29598d30..a0934bb987 100644
--- a/core/core-frontend/src/views/copilot/DialogueChart.vue
+++ b/core/core-frontend/src/views/copilot/DialogueChart.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { PropType, computed, onMounted, shallowRef, ref, nextTick } from 'vue'
+import { PropType, computed, onMounted, shallowRef, ref, nextTick, watch } from 'vue'
 import { Column, Line, Pie } from '@antv/g2plot'
 import { useElementSize } from '@vueuse/core'
 import { downloadCanvas } from '@/utils/imgUtils'
@@ -8,6 +8,7 @@ interface Copilot {
   msgType: string
   question: string
   chart: object
+  loading: boolean
   chartData: object
   msgStatus: number
   id: string
@@ -19,6 +20,7 @@ const props = defineProps({
       msgType: 'api',
       chart: {},
       id: '',
+      loading: false,
       question: '',
       chartData: {
         data: {},
@@ -192,6 +194,14 @@ const downloadChart = () => {
   }
   downloadCanvas('img', chartTypeRef.value, '图表')
 }
+watch(
+  () => props.copilotInfo.loading,
+  val => {
+    if (!val) {
+      switchChartType(renderTableLocal.value ? 'table' : activeCommand.value)
+    }
+  }
+)
 
 const renderTable = computed(() => {
   const { chart, msgType, msgStatus, chartData } = props.copilotInfo
@@ -265,7 +275,12 @@ const tips = computed(() => {
         class="chart-type"
         ref="chartTypeRef"
       >
-        <div ref="chartRef" class="column-plot_de" :id="`de-${copilotInfo.id}-ed`">
+        <div
+          v-if="!copilotInfo.loading"
+          ref="chartRef"
+          class="column-plot_de"
+          :id="`de-${copilotInfo.id}-ed`"
+        >
           <el-table-v2
             v-if="renderTable || renderTableLocal"
             :columns="columns"
diff --git a/core/core-frontend/src/views/copilot/index.vue b/core/core-frontend/src/views/copilot/index.vue
index 9743a0019d..2479922add 100644
--- a/core/core-frontend/src/views/copilot/index.vue
+++ b/core/core-frontend/src/views/copilot/index.vue
@@ -99,7 +99,7 @@ initDataset()
 let historyBack = []
 getListCopilot().then(res => {
   historyBack = (res as unknown as string[]) || []
-  historyArr.value = cloneDeep(historyBack)
+  historyArr.value = cloneDeep(historyBack).map(ele => ({ ...ele, loading: false }))
   if (!!historyBack.length) {
     datasetId.value = historyBack[0].datasetGroupId
     datasetId.value && getOptions(datasetId.value)
@@ -114,6 +114,19 @@ watch(
     overHeight.value = val > 48
   }
 )
+
+const handleShowLeft = val => {
+  showLeft.value = val
+  historyArr.value.forEach(ele => {
+    ele.loading = true
+  })
+
+  setTimeout(() => {
+    historyArr.value.forEach(ele => {
+      ele.loading = false
+    })
+  }, 300)
+}
 const copilotChatLoading = ref(false)
 const inputRef = ref()
 let time = null
@@ -143,7 +156,7 @@ const queryAnswer = () => {
     history: historyBack
   })
     .then(res => {
-      historyArr.value.push(res)
+      historyArr.value.push({ ...(res || {}), loading: false })
       historyBack = res.history || []
     })
     .finally(() => {
@@ -191,7 +204,7 @@ onBeforeUnmount(() => {
       </div>
       <div class="dataset-select" :style="{ width: showLeft ? 0 : '280px' }">
         <el-tooltip effect="dark" content="收起" placement="left">
-          <p v-show="!showLeft" class="arrow-right" @click="showLeft = true">
+          <p v-show="!showLeft" class="arrow-right" @click="handleShowLeft(true)">
             <el-icon>
               <Icon name="icon_right_outlined"></Icon>
             </el-icon>
@@ -199,7 +212,7 @@ onBeforeUnmount(() => {
         </el-tooltip>
 
         <el-tooltip effect="dark" content="展开" placement="left">
-          <p v-show="showLeft" class="left-outlined" @click="showLeft = false">
+          <p v-show="showLeft" class="left-outlined" @click="handleShowLeft(false)">
             <el-icon>
               <Icon name="icon_left_outlined"></Icon>
             </el-icon>
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
index 93845b7ac7..29b466a05c 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
@@ -943,6 +943,11 @@ const mousedownDrag = () => {
         background: #fff;
         box-shadow: 0px 5px 10px 0px #1f23291a;
         z-index: 10;
+        &:hover {
+          .ed-icon {
+            color: var(--ed-color-primary, #3370ff) !important;
+          }
+        }
       }
     }
 
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
index 3fc8dd0002..f208cb6293 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
@@ -2126,6 +2126,11 @@ const getDsIconName = data => {
           background: #fff;
           box-shadow: 0px 5px 10px 0px #1f23291a;
           z-index: 10;
+          &:hover {
+            .ed-icon {
+              color: var(--ed-color-primary, #3370ff) !important;
+            }
+          }
         }
       }