From 80e9cc8747cb9148726714f991421529bf0d9280 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 21 Jan 2025 16:34:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/svg/icon_download_outlined.svg |  4 +--
 .../visualization/ComponentEditBar.vue        |  2 +-
 .../visualization/UserViewEnlarge.vue         | 12 +++++---
 .../src/layout/components/DesktopSetting.vue  |  2 +-
 .../src/layout/components/Header.vue          |  2 +-
 .../views/data-visualization/PreviewHead.vue  | 18 ++++++++----
 .../component/MarketPreviewV2.vue             | 29 +++++++++++++++----
 .../visualized/data/dataset/ExportExcel.vue   |  2 +-
 8 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/core/core-frontend/src/assets/svg/icon_download_outlined.svg b/core/core-frontend/src/assets/svg/icon_download_outlined.svg
index 45092897ef..dca3c203e6 100644
--- a/core/core-frontend/src/assets/svg/icon_download_outlined.svg
+++ b/core/core-frontend/src/assets/svg/icon_download_outlined.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-<path d="M21 18.5V21C21 21.5523 20.5523 22 20 22H4C3.44772 22 3 21.5523 3 21V18.5C3 18.2239 3.22386 18 3.5 18H4.5C4.77614 18 5 18.2239 5 18.5V20H19V18.5C19 18.2239 19.2239 18 19.5 18H20.5C20.7761 18 21 18.2239 21 18.5ZM13 14.0357L16.0105 11.0252C16.2057 10.83 16.5223 10.83 16.7176 11.0252L17.4247 11.7324C17.6199 11.9276 17.6199 12.2442 17.4247 12.4395L12.4749 17.3892C12.3773 17.4868 12.2493 17.5357 12.1214 17.5357C11.9934 17.5357 11.8655 17.4868 11.7678 17.3892L6.81808 12.4395C6.62282 12.2442 6.62282 11.9276 6.81808 11.7324L7.52519 11.0252C7.72045 10.83 8.03703 10.83 8.2323 11.0252L11 13.793V3C11 2.72386 11.2239 2.5 11.5 2.5H12.5C12.7761 2.5 13 2.72386 13 3V14.0357Z"/>
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 12.3327V13.9993C14 14.3675 13.7015 14.666 13.3333 14.666H2.66667C2.29848 14.666 2 14.3675 2 13.9993V12.3327C2 12.1486 2.14924 11.9993 2.33333 11.9993H3C3.18409 11.9993 3.33333 12.1486 3.33333 12.3327V13.3327H12.6667V12.3327C12.6667 12.1486 12.8159 11.9993 13 11.9993H13.6667C13.8508 11.9993 14 12.1486 14 12.3327ZM8.66667 9.35649L10.6736 7.34951C10.8038 7.21934 11.0149 7.21934 11.1451 7.34951L11.6165 7.82092C11.7466 7.95109 11.7466 8.16215 11.6165 8.29232L8.31663 11.5922C8.25154 11.6572 8.16623 11.6898 8.08092 11.6898C7.99562 11.6898 7.91031 11.6572 7.84522 11.5922L4.54539 8.29232C4.41521 8.16215 4.41521 7.95109 4.54539 7.82092L5.01679 7.34951C5.14697 7.21934 5.35802 7.21934 5.4882 7.34951L7.33334 9.19465V1.99935C7.33334 1.81525 7.48257 1.66602 7.66667 1.66602H8.33334C8.51743 1.66602 8.66667 1.81525 8.66667 1.99935V9.35649Z" />
 </svg>
diff --git a/core/core-frontend/src/components/visualization/ComponentEditBar.vue b/core/core-frontend/src/components/visualization/ComponentEditBar.vue
index 7ce35ce3ec..9a935d6480 100644
--- a/core/core-frontend/src/components/visualization/ComponentEditBar.vue
+++ b/core/core-frontend/src/components/visualization/ComponentEditBar.vue
@@ -227,7 +227,7 @@ import icon_params_setting from '@/assets/svg/icon_params_setting.svg'
 import dvBarUnLinkage from '@/assets/svg/dv-bar-unLinkage.svg'
 import database from '@/assets/svg/database.svg'
 import icon_more_outlined from '@/assets/svg/icon_more_outlined.svg'
-import dvPreviewDownload from '@/assets/svg/dv-preview-download.svg'
+import dvPreviewDownload from '@/assets/svg/icon_download_outlined.svg'
 import { computed, h, onBeforeUnmount, onMounted, reactive, ref, toRefs, watch } from 'vue'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia'
diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
index f02e54d5c9..9c54c2b4fb 100644
--- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
+++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
@@ -31,17 +31,16 @@
             class="m-button"
             v-if="optType === 'enlarge' && exportPermissions[0]"
             link
-            icon="Download"
             size="middle"
             @click="downloadViewImage"
           >
+            <el-icon color="#646A73" size="16"><icon_download_outlined /></el-icon>
             {{ t('chart.export_img') }}
           </el-button>
           <el-button
             class="m-button"
             v-if="optType === 'details' && exportPermissions[1]"
             link
-            icon="Download"
             size="middle"
             :loading="exportLoading"
             :disabled="
@@ -50,13 +49,14 @@
             "
             @click="downloadViewDetails('view')"
           >
+            <el-icon color="#646A73" size="16"><icon_download_outlined /></el-icon>
+
             {{ t('chart.export_excel') }}
           </el-button>
           <el-button
             class="m-button"
             v-if="optType === 'details' && exportPermissions[2]"
             link
-            icon="Download"
             size="middle"
             :loading="exportLoading"
             @click="downloadViewDetails('dataset')"
@@ -65,17 +65,20 @@
               state.dataFrom === 'template'
             "
           >
+            <el-icon color="#646A73" size="16"><icon_download_outlined /></el-icon>
+
             {{ t('chart.export_raw_details') }}
           </el-button>
           <el-button
             class="m-button"
             v-if="optType === 'details' && exportPermissions[2] && viewInfo.type === 'table-pivot'"
             link
-            icon="Download"
             size="middle"
             :loading="exportLoading"
             @click="exportAsFormattedExcel"
           >
+            <el-icon color="#646A73" size="16"><icon_download_outlined /></el-icon>
+
             <span>{{ t('chart.export_excel_formatter') }}</span>
           </el-button>
           <el-divider
@@ -150,6 +153,7 @@ import { computed, h, nextTick, reactive, ref } from 'vue'
 import { toPng } from 'html-to-image'
 import { useI18n } from '@/hooks/web/useI18n'
 import { deepCopy } from '@/utils/utils'
+import icon_download_outlined from '@/assets/svg/icon_download_outlined.svg'
 import ChartComponentS2 from '@/views/chart/components/views/components/ChartComponentS2.vue'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { exportExcelDownload } from '@/views/chart/components/js/util'
diff --git a/core/core-frontend/src/layout/components/DesktopSetting.vue b/core/core-frontend/src/layout/components/DesktopSetting.vue
index 564159ff2e..5382069e7a 100644
--- a/core/core-frontend/src/layout/components/DesktopSetting.vue
+++ b/core/core-frontend/src/layout/components/DesktopSetting.vue
@@ -7,7 +7,7 @@ import TopDesktopCard from './TopDesktopCard.vue'
 import icon_right_outlined from '@/assets/svg/icon_right_outlined.svg'
 import dvAi from '@/assets/svg/dv-ai.svg'
 import AiComponent from '@/layout/components/AiComponent.vue'
-import dvPreviewDownload from '@/assets/svg/dv-preview-download.svg'
+import dvPreviewDownload from '@/assets/svg/icon_download_outlined.svg'
 import ToolboxCfg from './ToolboxCfg.vue'
 import { findBaseParams } from '@/api/aiComponent'
 import icon_more_outlined from '@/assets/svg/icon_more_outlined.svg'
diff --git a/core/core-frontend/src/layout/components/Header.vue b/core/core-frontend/src/layout/components/Header.vue
index 689459069b..2bcde5f1f4 100644
--- a/core/core-frontend/src/layout/components/Header.vue
+++ b/core/core-frontend/src/layout/components/Header.vue
@@ -3,7 +3,7 @@ import logo from '@/assets/svg/logo.svg'
 import copilot from '@/assets/svg/copilot.svg'
 import msgNotice from '@/assets/svg/msg-notice.svg'
 import dvAi from '@/assets/svg/dv-ai.svg'
-import dvPreviewDownload from '@/assets/svg/dv-preview-download.svg'
+import dvPreviewDownload from '@/assets/svg/icon_download_outlined.svg'
 import { computed, onMounted, ref } from 'vue'
 import { usePermissionStore } from '@/store/modules/permission'
 import { isExternal } from '@/utils/validate'
diff --git a/core/core-frontend/src/views/data-visualization/PreviewHead.vue b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
index b19832fc76..c437454081 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewHead.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
@@ -5,6 +5,8 @@ import dvInfoSvg from '@/assets/svg/dv-info.svg'
 import dvHeadMore from '@/assets/svg/dv-head-more.svg'
 import icon_pc_fullscreen from '@/assets/svg/icon_pc_fullscreen.svg'
 import icon_pc_outlined from '@/assets/svg/icon_pc_outlined.svg'
+import icon_download_outlined from '@/assets/svg/icon_download_outlined.svg'
+import icon_replace_outlined from '@/assets/svg/icon_replace_outlined.svg'
 import icon_edit_outlined from '@/assets/svg/icon_edit_outlined.svg'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia'
@@ -180,7 +182,8 @@ const initOpenHandler = newWindow => {
         </el-icon>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item icon="Refresh" @click="reload()"
+            <el-dropdown-item @click="reload()"
+              ><el-icon color="#646A73" size="16"><icon_replace_outlined /></el-icon
               >{{ t('visualization.refresh_data') }}
             </el-dropdown-item>
             <el-dropdown
@@ -191,9 +194,9 @@ const initOpenHandler = newWindow => {
               v-if="exportPermissions[0]"
             >
               <div class="ed-dropdown-menu__item flex-align-center icon">
-                <el-icon><Download /></el-icon>
+                <el-icon color="#646A73" size="16"><icon_download_outlined /></el-icon>
                 {{ t('visualization.export_as') }}
-                <el-icon class="arrow-right_icon"><ArrowRight /></el-icon>
+                <el-icon color="#646A73" size="16" class="arrow-right_icon"><ArrowRight /></el-icon>
               </div>
               <template #dropdown>
                 <el-dropdown-menu>
@@ -221,10 +224,15 @@ const initOpenHandler = newWindow => {
 <style lang="less">
 .pad12 {
   .ed-dropdown-menu__item {
-    padding: 5px 12px !important;
+    padding: 5px 36px 5px 12px !important;
+
+    .ed-icon {
+      margin-right: 8px;
+    }
     .arrow-right_icon {
       position: absolute;
-      right: 3px;
+      right: 12px;
+      margin-right: 0;
     }
 
     &:has(.arrow-right_icon) {
diff --git a/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue b/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue
index c49716f18e..70178b7c4e 100644
--- a/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue
+++ b/core/core-frontend/src/views/template-market/component/MarketPreviewV2.vue
@@ -658,21 +658,40 @@ onMounted(() => {
   cursor: pointer;
   font-weight: 400;
   color: #646a73;
-  width: 64px;
+  min-width: 64px;
   height: 22px;
-  padding: 0 4px 0 4px;
-  border-radius: 4px 0 0 0;
   display: flex;
   align-items: center;
+  white-space: nowrap;
+  position: relative;
+  margin-right: 4px;
+
+  &::after {
+    content: '';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: calc(100% + 8px);
+    height: 100%;
+    transform: translate(-50%, -50%);
+    display: none;
+    border-radius: 4px 0 0 0;
+  }
 
   &:hover {
     color: #3370ff;
-    background: #3370ff1a;
+    &::after {
+      background: #3370ff1a;
+      display: block;
+    }
   }
 
   &:active {
     color: #245bdb;
-    background: #3370ff33;
+    &::after {
+      background: #3370ff33;
+      display: block;
+    }
   }
 }
 
diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
index 2df29165bc..013c7559e9 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import dvPreviewDownload from '@/assets/svg/dv-preview-download.svg'
+import dvPreviewDownload from '@/assets/svg/icon_download_outlined.svg'
 import deDelete from '@/assets/svg/de-delete.svg'
 import icon_fileExcel_colorful from '@/assets/svg/icon_file-excel_colorful.svg'
 import icon_refresh_outlined from '@/assets/svg/icon_refresh_outlined.svg'