From 0ade71cc0e287635e3b0c941e97674900aff5ef0 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Thu, 28 Mar 2024 16:01:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE=E5=A4=8DAn?=
 =?UTF-8?q?tV=E7=BB=84=E5=90=88=E5=9B=BE=E6=8F=92=E4=BB=B6=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6/=E6=8C=87=E6=A0=87=E4=B8=8B=E6=8B=89=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=B2=A1=E6=9C=89=E5=AF=B9=E9=BD=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/views/DimensionExtItem.vue       | 11 ++++++++---
 .../src/components/views/DimensionItem.vue          | 11 ++++++++---
 .../src/components/views/QuotaExtItem.vue           | 13 +++++++++----
 .../src/components/views/QuotaItem.vue              | 13 +++++++++----
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionExtItem.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionExtItem.vue
index 9a94cce8f1..b1a94c8fc0 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionExtItem.vue
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionExtItem.vue
@@ -23,7 +23,7 @@
           <el-dropdown-item>
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="sort">
               <span class="el-dropdown-link inner-dropdown-menu">
-                <span>
+                <span class="inline-menu-text">
                   <i class="el-icon-sort" />
                   <span>{{ $t('chart.sort') }}</span>
                   <span class="summary-span-item">({{ $t('chart.'+item.sort) }})</span>
@@ -41,7 +41,7 @@
           <el-dropdown-item v-show="item.deType === 1" divided>
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="dateStyle">
               <span class="el-dropdown-link inner-dropdown-menu">
-                <span>
+                <span class="inline-menu-text">
                   <i class="el-icon-c-scale-to-original" />
                   <span>{{ $t('chart.dateStyle') }}</span>
                   <span class="summary-span-item">({{ $t('chart.'+item.dateStyle) }})</span>
@@ -61,7 +61,7 @@
           <el-dropdown-item v-show="item.deType === 1">
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="datePattern">
               <span class="el-dropdown-link inner-dropdown-menu">
-                <span>
+                <span class="inline-menu-text">
                   <i class="el-icon-timer" />
                   <span>{{ $t('chart.datePattern') }}</span>
                   <span class="summary-span-item">({{ $t('chart.'+item.datePattern) }})</span>
@@ -251,4 +251,9 @@ export default {
     margin-left: 4px;
     color: #878d9f;
   }
+  .inline-menu-text {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
 </style>
diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionItem.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionItem.vue
index c4f86d1b6c..0e08956a32 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionItem.vue
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionItem.vue
@@ -78,7 +78,7 @@
               @command="sort"
             >
               <span class="el-dropdown-link inner-dropdown-menu">
-                <span>
+                <span class="inline-menu-text">
                   <i class="el-icon-sort"/>
                   <span>{{ $t('chart.sort') }}</span>
                   <span class="summary-span-item">({{ $t('chart.' + item.sort) }})</span>
@@ -107,7 +107,7 @@
                         @command="dateStyle"
                       >
                         <span class="el-dropdown-link inner-dropdown-menu">
-                          <span>
+                          <span  class="inline-menu-text">
                             <i class="el-icon-c-scale-to-original"/>
                             <span>{{ $t('chart.dateStyle') }}</span>
                             <span class="summary-span-item">({{ $t('chart.' + item.dateStyle) }})</span>
@@ -149,7 +149,7 @@
                         @command="datePattern"
                       >
                         <span class="el-dropdown-link inner-dropdown-menu">
-                          <span>
+                          <span class="inline-menu-text">
                             <i class="el-icon-timer"/>
                             <span>{{ $t('chart.datePattern') }}</span>
                             <span class="summary-span-item">({{ $t('chart.' + item.datePattern) }})</span>
@@ -420,4 +420,9 @@ span {
   margin-left: 4px;
   color: #878d9f;
 }
+.inline-menu-text {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
 </style>
diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaExtItem.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaExtItem.vue
index c1456a2dfd..fafa7b6a8f 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaExtItem.vue
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaExtItem.vue
@@ -33,7 +33,7 @@
           <el-dropdown-item v-show="chart.type ==='chart-mix'">
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="switchChartType">
               <span class="el-dropdown-link inner-dropdown-menu">
-                <span>
+                <span class="inline-menu-text">
                   <i class="el-icon-s-data"/>
                   <span>{{ $t('chart.chart_type') }}</span>
                 </span>
@@ -49,7 +49,7 @@
           <el-dropdown-item v-show="chart.type !== 'table-info'" :divided="chart.type === 'chart-mix'">
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="summary">
               <span class="el-dropdown-link inner-dropdown-menu">
-                <span>
+                <span class="inline-menu-text">
                   <i class="el-icon-notebook-2"/>
                   <span>{{ $t('chart.summary') }}</span>
                   <span class="summary-span-item">({{ $t('chart.' + item.summary) }})</span>
@@ -83,7 +83,7 @@
               @command="quickCalc"
             >
               <span class="el-dropdown-link inner-dropdown-menu">
-                <span>
+                <span class="inline-menu-text">
                   <i class="el-icon-s-grid"/>
                   <span>{{ $t('chart.quick_calc') }}</span>
                   <span class="summary-span-item">({{
@@ -114,7 +114,7 @@
               @command="sort"
             >
               <span class="el-dropdown-link inner-dropdown-menu">
-                <span>
+                <span class="inline-menu-text">
                   <i class="el-icon-sort"/>
                   <span>{{ $t('chart.sort') }}</span>
                   <span class="summary-span-item">({{ $t('chart.' + item.sort) }})</span>
@@ -391,6 +391,11 @@ span {
   margin-left: 4px;
   color: #878d9f;
 }
+.inline-menu-text {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
 
 .summary-span {
   margin-left: 4px;
diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaItem.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaItem.vue
index 9c1ff33158..69a3fb2c07 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaItem.vue
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaItem.vue
@@ -33,7 +33,7 @@
           <el-dropdown-item v-show="chart.type ==='chart-mix'">
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="switchChartType">
               <span class="el-dropdown-link inner-dropdown-menu">
-                <span>
+                <span class="inline-menu-text">
                   <i class="el-icon-s-data"/>
                   <span>{{ $t('chart.chart_type') }}</span>
                 </span>
@@ -49,7 +49,7 @@
           <el-dropdown-item :divided="chart.type === 'chart-mix'">
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="summary">
               <span class="el-dropdown-link inner-dropdown-menu">
-                <span>
+                <span class="inline-menu-text">
                   <i class="el-icon-notebook-2"/>
                   <span>{{ $t('chart.summary') }}</span>
                   <span class="summary-span-item">({{ $t('chart.' + item.summary) }})</span>
@@ -83,7 +83,7 @@
               @command="quickCalc"
             >
               <span class="el-dropdown-link inner-dropdown-menu">
-                <span>
+                <span class="inline-menu-text">
                   <i class="el-icon-s-grid"/>
                   <span>{{ $t('chart.quick_calc') }}</span>
                   <span class="summary-span-item">({{
@@ -114,7 +114,7 @@
               @command="sort"
             >
               <span class="el-dropdown-link inner-dropdown-menu">
-                <span>
+                <span class="inline-menu-text">
                   <i class="el-icon-sort"/>
                   <span>{{ $t('chart.sort') }}</span>
                   <span class="summary-span-item">({{ $t('chart.' + item.sort) }})</span>
@@ -391,6 +391,11 @@ span {
   margin-left: 4px;
   color: #878d9f;
 }
+.inline-menu-text {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
 
 .summary-span {
   margin-left: 4px;