From d15abd7955ddd86b31a4a90046159ab820afe2fc Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 21 Jan 2025 11:02:00 +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

---
 .../components/visualization/ComponentEditBar.vue | 15 +++++++++++----
 .../components/editor/editor-style/ChartStyle.vue |  5 ++++-
 .../components/BasicStyleSelector.vue             |  6 +++---
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/core/core-frontend/src/components/visualization/ComponentEditBar.vue b/core/core-frontend/src/components/visualization/ComponentEditBar.vue
index 3ccaf5efba..7ce35ce3ec 100644
--- a/core/core-frontend/src/components/visualization/ComponentEditBar.vue
+++ b/core/core-frontend/src/components/visualization/ComponentEditBar.vue
@@ -101,7 +101,7 @@
         </el-tooltip>
       </el-icon>
       <template #dropdown>
-        <el-dropdown-menu style="width: 158px">
+        <el-dropdown-menu>
           <el-dropdown-item @click="copyComponent" v-if="barShowCheck('copy')">{{
             t('visualization.copy')
           }}</el-dropdown-item>
@@ -132,13 +132,20 @@
               <el-dropdown style="width: 100%" trigger="hover" placement="right-start">
                 <div
                   class="flex-align-center"
-                  style="width: 100%; padding: 5px 6px 5px 16px; line-height: 24px"
+                  style="
+                    position: relative;
+                    width: 100%;
+                    padding: 5px 32px 5px 16px;
+                    line-height: 24px;
+                  "
                 >
                   {{ t('visualization.export_as') }}
-                  <el-icon size="16px" style="margin-left: auto"><ArrowRight /></el-icon>
+                  <el-icon size="16px" style="position: absolute; right: 8px; margin-right: 0"
+                    ><ArrowRight
+                  /></el-icon>
                 </div>
                 <template #dropdown>
-                  <el-dropdown-menu style="width: 120px">
+                  <el-dropdown-menu>
                     <el-dropdown-item v-if="exportPermissions[1]" @click="exportAsExcel"
                       >Excel</el-dropdown-item
                     >
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
index 262423467a..5fc2a24bd2 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
@@ -27,7 +27,6 @@ import IndicatorNameSelector from '@/views/chart/components/editor/editor-style/
 import QuadrantSelector from '@/views/chart/components/editor/editor-style/components/QuadrantSelector.vue'
 import FlowMapLineSelector from '@/views/chart/components/editor/editor-style/components/FlowMapLineSelector.vue'
 import FlowMapPointSelector from '@/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue'
-import CommonEvent from '@/custom-component/common/CommonEvent.vue'
 import CommonBorderSetting from '@/custom-component/common/CommonBorderSetting.vue'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
 const snapshotStore = snapshotStoreWithOut()
@@ -670,4 +669,8 @@ span {
 .style-collapse:empty {
   border-bottom: none;
 }
+
+:deep(.ed-collapse-item__content) {
+  padding: 16px 8px 0 8px !important;
+}
 </style>
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
index dc35ba0e25..6cc1927064 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
@@ -17,7 +17,7 @@ import { ElFormItem, ElInputNumber, ElMessage, UploadProps } from 'element-plus-
 import { svgStrToUrl } from '../../../js/util'
 
 const dvMainStore = dvMainStoreWithOut()
-const { batchOptStatus } = storeToRefs(dvMainStore)
+const { batchOptStatus, mobileInPc } = storeToRefs(dvMainStore)
 const { t } = useI18n()
 const props = defineProps({
   chart: {
@@ -671,7 +671,7 @@ onMounted(() => {
             v-model="state.basicStyleForm.tableBorderColor"
             :effect="themes"
             is-custom
-            :trigger-width="108"
+            :trigger-width="mobileInPc ? 197 : 108"
             color-format="rgb"
             :predefine="predefineColors"
             show-alpha
@@ -692,7 +692,7 @@ onMounted(() => {
             :predefine="predefineColors"
             :effect="themes"
             is-custom
-            :trigger-width="108"
+            :trigger-width="mobileInPc ? 197 : 108"
             color-format="rgb"
             show-alpha
             @change="changeBasicStyle('tableScrollBarColor')"