From 5d9ee9bee2f47c4cade403e59a789a98f8c5648e Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 13 Jan 2025 16:12:05 +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/components/dashboard/DbToolbar.vue    |  4 ++-
 .../custom-component/v-query/QueryCascade.vue |  2 +-
 .../v-query/QueryConditionConfiguration.vue   | 18 +++++++---
 .../editor/editor-style/VQueryChartStyle.vue  |  7 ++--
 .../core-frontend/src/views/copilot/index.vue |  6 ++--
 .../views/data-visualization/PreviewHead.vue  | 36 ++++++++++++-------
 .../src/views/workbranch/index.vue            |  3 +-
 7 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue
index f11063b23d..1bd61cf2dd 100644
--- a/core/core-frontend/src/components/dashboard/DbToolbar.vue
+++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue
@@ -764,7 +764,9 @@ const initOpenHandler = newWindow => {
   margin-left: 10px;
 }
 .drop-style {
-  width: 120px;
+  :deep(.ed-dropdown-menu__item) {
+    padding: 5px 12px !important;
+  }
   :deep(.ed-dropdown-menu__item:not(.is_disabled):focus) {
     color: inherit;
     background-color: rgba(31, 35, 41, 0.1);
diff --git a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
index 75b5078b43..d71cc277d8 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
@@ -208,7 +208,7 @@ defineExpose({
     <template #title>
       <div class="title">
         {{ t('v_query.condition_cascade_configuration')
-        }}<span class="tip">{{ t('v_query.not_reverse_cascade') }}</span>
+        }}<span style="margin-left: 8px" class="tip">{{ t('v_query.not_reverse_cascade') }}</span>
       </div>
     </template>
     <div class="content">
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 8da1f8e79a..1d7f059a8d 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -2718,7 +2718,9 @@ defineExpose({
               </div>
             </div>
             <div class="list-item" v-if="curComponent.displayType === '9'">
-              <div class="label">{{ t('v_query.of_option_values') }}</div>
+              <div :title="t('v_query.of_option_values')" class="label ellipsis">
+                {{ t('v_query.of_option_values') }}
+              </div>
               <div class="value">
                 <el-radio-group class="larger-radio" v-model="curComponent.resultMode">
                   <el-radio :label="0">{{ t('login.default_login') }}</el-radio>
@@ -2807,7 +2809,9 @@ defineExpose({
               class="list-item top-item"
               v-if="!['1', '7', '8', '9', '22'].includes(curComponent.displayType)"
             >
-              <div class="label">{{ t('v_query.option_value_source') }}</div>
+              <div :title="t('v_query.option_value_source')" class="label ellipsis">
+                {{ t('v_query.option_value_source') }}
+              </div>
               <div class="value">
                 <div class="value">
                   <el-radio-group
@@ -3125,7 +3129,11 @@ defineExpose({
                   </div>
                 </div>
               </div>
-              <div class="label" style="margin-top: 10.5px">
+              <div
+                class="label ellipsis"
+                :title="t('v_query.of_option_values')"
+                style="margin-top: 10.5px"
+              >
                 {{ t('v_query.of_option_values') }}
               </div>
               <div class="value" style="margin-top: 10.5px">
@@ -3136,7 +3144,9 @@ defineExpose({
               </div>
             </div>
             <div class="list-item top-item" v-if="curComponent.displayType === '8'">
-              <div class="label">{{ t('v_query.condition_type') }}</div>
+              <div :title="t('v_query.condition_type')" class="label ellipsis">
+                {{ t('v_query.condition_type') }}
+              </div>
               <div class="value">
                 <div class="value">
                   <el-radio-group class="larger-radio" v-model="curComponent.conditionType">
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 933715bb2d..c44bd5dece 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
@@ -588,11 +588,12 @@ initParams()
                     </el-icon>
                   </el-tooltip>
                 </el-checkbox>
-
-                <el-checkbox :effect="themes" size="small" label="clear">
+                <br />
+                <el-checkbox style="margin-top: 8px" :effect="themes" size="small" label="clear">
                   {{ t('commons.clear') }}
                 </el-checkbox>
-                <el-checkbox :effect="themes" size="small" label="reset">
+                <br />
+                <el-checkbox style="margin-top: 8px" :effect="themes" size="small" label="reset">
                   {{ t('commons.adv_search.reset') }}
                 </el-checkbox>
               </el-checkbox-group>
diff --git a/core/core-frontend/src/views/copilot/index.vue b/core/core-frontend/src/views/copilot/index.vue
index 49e6cf3294..8241342e49 100644
--- a/core/core-frontend/src/views/copilot/index.vue
+++ b/core/core-frontend/src/views/copilot/index.vue
@@ -312,9 +312,7 @@ const queryAnswer = (event?: KeyboardEvent) => {
             <div :class="['field-d', { open: expandedD }]">
               <div :class="['title', { expanded: expandedD }]" @click="expandedD = !expandedD">
                 <ElIcon class="expand">
-                  <Icon name="icon_expand-right_filled"
-                    ><icon_expandRight_filled class="svg-icon"
-                  /></Icon>
+                  <Icon><icon_expandRight_filled class="svg-icon" /></Icon>
                 </ElIcon>
                 &nbsp;{{ $t('chart.dimension') }}
               </div>
@@ -589,6 +587,7 @@ const queryAnswer = (event?: KeyboardEvent) => {
         .field-q {
           position: relative;
           height: 49px;
+          padding-left: 8px;
 
           &.open {
             max-height: 50%;
@@ -612,6 +611,7 @@ const queryAnswer = (event?: KeyboardEvent) => {
 
             .expand {
               font-size: 10px;
+              color: #646a73;
             }
 
             &.expanded {
diff --git a/core/core-frontend/src/views/data-visualization/PreviewHead.vue b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
index 3c8dd436ad..b19832fc76 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewHead.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewHead.vue
@@ -174,37 +174,34 @@ const initOpenHandler = newWindow => {
         </template>
         {{ t('visualization.edit') }}</el-button
       >
-      <el-dropdown trigger="click">
+      <el-dropdown popper-class="pad12" trigger="click">
         <el-icon class="head-more-icon">
           <Icon name="dv-head-more"><dvHeadMore class="svg-icon" /></Icon>
         </el-icon>
         <template #dropdown>
-          <el-dropdown-menu style="width: 130px">
+          <el-dropdown-menu>
             <el-dropdown-item icon="Refresh" @click="reload()"
               >{{ t('visualization.refresh_data') }}
             </el-dropdown-item>
             <el-dropdown
               style="width: 100%; overflow: hidden"
               trigger="hover"
+              popper-class="pad12"
               placement="left-start"
               v-if="exportPermissions[0]"
             >
               <div class="ed-dropdown-menu__item flex-align-center icon">
                 <el-icon><Download /></el-icon>
-                {{ t('visualization.export_as') }}&nbsp;&nbsp;&nbsp;&nbsp;
-                <el-icon><ArrowRight /></el-icon>
+                {{ t('visualization.export_as') }}
+                <el-icon class="arrow-right_icon"><ArrowRight /></el-icon>
               </div>
               <template #dropdown>
                 <el-dropdown-menu>
-                  <el-dropdown-item style="width: 118px" @click="download('pdf')"
-                    >PDF</el-dropdown-item
-                  >
-                  <el-dropdown-item
-                    style="width: 118px"
-                    @click="downloadAsAppTemplate('template')"
-                    >{{ t('visualization.style_template') }}</el-dropdown-item
-                  >
-                  <el-dropdown-item style="width: 118px" @click="downloadAsAppTemplate('app')">{{
+                  <el-dropdown-item @click="download('pdf')">PDF</el-dropdown-item>
+                  <el-dropdown-item @click="downloadAsAppTemplate('template')">{{
+                    t('visualization.style_template')
+                  }}</el-dropdown-item>
+                  <el-dropdown-item @click="downloadAsAppTemplate('app')">{{
                     t('visualization.apply_template')
                   }}</el-dropdown-item>
                   <el-dropdown-item @click="download('img')">{{
@@ -222,6 +219,19 @@ const initOpenHandler = newWindow => {
 </template>
 
 <style lang="less">
+.pad12 {
+  .ed-dropdown-menu__item {
+    padding: 5px 12px !important;
+    .arrow-right_icon {
+      position: absolute;
+      right: 3px;
+    }
+
+    &:has(.arrow-right_icon) {
+      width: 100%;
+    }
+  }
+}
 .preview-head {
   width: 100%;
   min-width: 300px;
diff --git a/core/core-frontend/src/views/workbranch/index.vue b/core/core-frontend/src/views/workbranch/index.vue
index 9e53376a28..ec78fff5ae 100644
--- a/core/core-frontend/src/views/workbranch/index.vue
+++ b/core/core-frontend/src/views/workbranch/index.vue
@@ -531,7 +531,8 @@ loadShareBase()
         .name {
           color: #646a73;
           font-weight: 400;
-          line-height: 22px;
+          line-height: 20px;
+          font-size: 14px;
         }
         .num {
           margin-top: 4px;