From 738c87b81938055a0aae35a948f1c48772a6c7a0 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 25 Nov 2022 18:37:33 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=BB=84=E4=BB=B6=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/SettingMenu.vue  | 10 +--
 frontend/src/lang/en.js                       |  1 +
 frontend/src/lang/tw.js                       |  1 +
 frontend/src/lang/zh.js                       |  1 +
 frontend/src/views/chart/view/ChartEdit.vue   | 74 +++++++++++--------
 5 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/frontend/src/components/canvas/components/editor/SettingMenu.vue b/frontend/src/components/canvas/components/editor/SettingMenu.vue
index c1c1ac35bd..038d2ea8e9 100644
--- a/frontend/src/components/canvas/components/editor/SettingMenu.vue
+++ b/frontend/src/components/canvas/components/editor/SettingMenu.vue
@@ -5,7 +5,7 @@
         trigger="click"
         @mouseup="handleMouseUp"
       >
-        <slot name="icon" />
+        <slot name="icon"/>
         <el-dropdown-menu v-if="curComponent">
           <el-dropdown-item
             v-if="editFilter.includes(curComponent.type)"
@@ -33,7 +33,7 @@
           <el-dropdown-item v-if="!curComponent.auxiliaryMatrix">
             <el-dropdown placement="right-start">
               <span class="el-icon-copy-document">
-                {{ $t('panel.level') }} <i class="el-icon-arrow-right el-icon--right" />
+                {{ $t('panel.level') }} <i class="el-icon-arrow-right el-icon--right"/>
               </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item
@@ -87,14 +87,14 @@
             v-if="curComponent.type != 'custom-button'"
             @click.native="hyperlinksSet"
           >
-            <i class="icon iconfont icon-font icon-chaolianjie1" />
+            <i class="icon iconfont icon-font icon-chaolianjie1"/>
             {{ $t('panel.hyperlinks') }}
           </el-dropdown-item>
           <el-dropdown-item
-            v-if="curComponent.type !== 'user-view' && !curComponent.auxiliaryMatrix"
+            v-if="curComponent.type !== 'view' && !curComponent.auxiliaryMatrix"
             @click.native="positionAdjust"
           >
-            <i class="el-icon-map-location" />
+            <i class="el-icon-map-location"/>
             {{ $t('panel.position_adjust') }}
           </el-dropdown-item>
         </el-dropdown-menu>
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 76152bc1ab..ded6766bf5 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1883,6 +1883,7 @@ export default {
     back_parent: 'Back to previous'
   },
   panel: {
+    position_adjust_component: 'Position adjust',
     active_font_size: 'Active font size',
     carousel: 'Carousel',
     switch_time: 'Switch time',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 009ea1ba5d..f5c2cfac92 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1883,6 +1883,7 @@ export default {
     back_parent: '返回上一級'
   },
   panel: {
+    position_adjust_component: '位置調整',
     active_font_size: '激活字體大小',
     carousel: '輪播',
     switch_time: '切換時間',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 7acc7b7a0b..3e9f6fa760 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1883,6 +1883,7 @@ export default {
     back_parent: '返回上一级'
   },
   panel: {
+    position_adjust_component: '位置调整',
     active_font_size: '激活字体大小',
     carousel: '轮播',
     switch_time: '切换时间',
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 9b0b7ff39e..3ec4fe64b3 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -192,7 +192,7 @@
                               @command="chartFieldEdit"
                             >
                               <span class="el-dropdown-link">
-                                <i class="el-icon-s-tools" />
+                                <i class="el-icon-s-tools"/>
                               </span>
                               <el-dropdown-menu slot="dropdown">
                                 <el-dropdown-item
@@ -267,7 +267,7 @@
                               @command="chartFieldEdit"
                             >
                               <span class="el-dropdown-link">
-                                <i class="el-icon-s-tools" />
+                                <i class="el-icon-s-tools"/>
                               </span>
                               <el-dropdown-menu slot="dropdown">
                                 <el-dropdown-item
@@ -362,7 +362,7 @@
                           style="padding: 6px;"
                         >
                           {{ $t('chart.change_chart_type') }}
-                          <i class="el-icon-caret-bottom" />
+                          <i class="el-icon-caret-bottom"/>
                         </el-button>
                       </el-popover>
                     </span>
@@ -490,8 +490,8 @@
                     >
                       <span class="data-area-label">
                         <span v-if="view.type && view.type.includes('table')">{{
-                          $t('chart.drag_block_table_data_column')
-                        }}</span>
+                            $t('chart.drag_block_table_data_column')
+                          }}</span>
                         <span
                           v-else-if="view.type && (view.type.includes('bar') || view.type.includes('line') || view.type.includes('scatter') || view.type === 'chart-mix' || view.type === 'waterfall' || view.type === 'area')"
                         >{{ $t('chart.drag_block_type_axis') }}</span>
@@ -499,18 +499,18 @@
                           v-else-if="view.type && view.type.includes('pie')"
                         >{{ $t('chart.drag_block_pie_label') }}</span>
                         <span v-else-if="view.type && view.type.includes('funnel')">{{
-                          $t('chart.drag_block_funnel_split')
-                        }}</span>
+                            $t('chart.drag_block_funnel_split')
+                          }}</span>
                         <span v-else-if="view.type && view.type.includes('radar')">{{
-                          $t('chart.drag_block_radar_label')
-                        }}</span>
+                            $t('chart.drag_block_radar_label')
+                          }}</span>
                         <span v-else-if="view.type && view.type === 'map'">{{ $t('chart.area') }}</span>
                         <span v-else-if="view.type && view.type.includes('treemap')">{{
-                          $t('chart.drag_block_treemap_label')
-                        }}</span>
+                            $t('chart.drag_block_treemap_label')
+                          }}</span>
                         <span v-else-if="view.type && view.type === 'word-cloud'">{{
-                          $t('chart.drag_block_word_cloud_label')
-                        }}</span>
+                            $t('chart.drag_block_word_cloud_label')
+                          }}</span>
                         <span v-else-if="view.type && view.type === 'label'">{{ $t('chart.drag_block_label') }}</span>
                         <span v-show="view.type !== 'richTextView'"> / </span>
                         <span v-if="view.type && view.type !== 'table-info'">{{ $t('chart.dimension') }}</span>
@@ -633,8 +633,8 @@
                     >
                       <span class="data-area-label">
                         <span v-if="view.type && view.type.includes('table')">{{
-                          $t('chart.drag_block_table_data_column')
-                        }}</span>
+                            $t('chart.drag_block_table_data_column')
+                          }}</span>
                         <span
                           v-else-if="view.type && (view.type.includes('bar') || view.type.includes('line') || view.type.includes('scatter') || view.type === 'waterfall' || view.type === 'area')"
                         >{{ $t('chart.drag_block_value_axis') }}</span>
@@ -642,30 +642,30 @@
                           v-else-if="view.type && view.type.includes('pie')"
                         >{{ $t('chart.drag_block_pie_angel') }}</span>
                         <span v-else-if="view.type && view.type.includes('funnel')">{{
-                          $t('chart.drag_block_funnel_width')
-                        }}</span>
+                            $t('chart.drag_block_funnel_width')
+                          }}</span>
                         <span v-else-if="view.type && view.type.includes('radar')">{{
-                          $t('chart.drag_block_radar_length')
-                        }}</span>
+                            $t('chart.drag_block_radar_length')
+                          }}</span>
                         <span v-else-if="view.type && view.type.includes('gauge')">{{
-                          $t('chart.drag_block_gauge_angel')
-                        }}</span>
+                            $t('chart.drag_block_gauge_angel')
+                          }}</span>
                         <span
                           v-else-if="view.type && view.type.includes('text')"
                         >{{ $t('chart.drag_block_label_value') }}</span>
                         <span v-else-if="view.type && view.type === 'map'">{{ $t('chart.chart_data') }}</span>
                         <span v-else-if="view.type && view.type.includes('tree')">{{
-                          $t('chart.drag_block_treemap_size')
-                        }}</span>
+                            $t('chart.drag_block_treemap_size')
+                          }}</span>
                         <span v-else-if="view.type && view.type === 'chart-mix'">{{
-                          $t('chart.drag_block_value_axis_main')
-                        }}</span>
+                            $t('chart.drag_block_value_axis_main')
+                          }}</span>
                         <span
                           v-else-if="view.type && view.type === 'liquid'"
                         >{{ $t('chart.drag_block_progress') }}</span>
                         <span v-else-if="view.type && view.type === 'word-cloud'">{{
-                          $t('chart.drag_block_word_cloud_size')
-                        }}</span>
+                            $t('chart.drag_block_word_cloud_size')
+                          }}</span>
                         <span v-show="view.type !== 'richTextView'"> / </span>
                         <span>{{ $t('chart.quota') }}</span>
                         <i
@@ -1116,7 +1116,20 @@
           class="padding-tab"
           style="width: 350px;"
         >
-          <position-adjust />
+          <div class="attr-style theme-border-class">
+            <el-collapse
+              v-model="positionActiveNames"
+              class="style-collapse"
+            >
+              <el-collapse-item
+                :title="$t('panel.position_adjust_component')"
+                :name="'positionAdjust'"
+              >
+                <position-adjust/>
+              </el-collapse-item>
+            </el-collapse>
+          </div>
+
         </el-tab-pane>
 
       </el-tabs>
@@ -1268,7 +1281,7 @@
       width="800px"
       class="dialog-css"
     >
-      <quota-filter-editor :item="quotaItem" />
+      <quota-filter-editor :item="quotaItem"/>
       <div
         slot="footer"
         class="dialog-footer"
@@ -1295,7 +1308,7 @@
       width="800px"
       class="dialog-css"
     >
-      <dimension-filter-editor :item="dimensionItem" />
+      <dimension-filter-editor :item="dimensionItem"/>
       <div
         slot="footer"
         class="dialog-footer"
@@ -1713,6 +1726,7 @@ export default {
   },
   data() {
     return {
+      positionActiveNames: 'positionAdjust',
       loading: false,
       table: {},
       dimension: [],