From c648196f1f23d2b6ad7c8c55f355030c05e8260c Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 16 Jun 2022 15:08:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=86=E5=9B=BE=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/components/drag-item/QuotaExtItem.vue | 8 ++++----
 .../src/views/chart/components/drag-item/QuotaItem.vue    | 8 ++++----
 .../views/chart/components/filter/QuotaFilterEditor.vue   | 7 ++++++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
index f6cca755eb..bc97a9ca1b 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
@@ -17,7 +17,7 @@
           </span>
           <span class="item-span-style" :title="item.name">{{ item.name }}</span>
           <field-error-tips v-if="tagType === 'danger'" />
-          <span v-if="chart.type !== 'table-info' && item.summary" class="summary-span">
+          <span v-if="chart.type !== 'table-info' && item.summary && !item.chartId" class="summary-span">
             {{ $t('chart.' + item.summary) }}<span v-if="false && item.compareCalc && item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
           </span>
           <i class="el-icon-arrow-down el-icon--right" style="position: absolute;top: 6px;right: 10px;" />
@@ -39,7 +39,7 @@
               </el-dropdown-menu>
             </el-dropdown>
           </el-dropdown-item>
-          <el-dropdown-item v-show="chart.type !== 'table-info'" :divided="chart.type === 'chart-mix'">
+          <el-dropdown-item v-show="!item.chartId && 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>
@@ -63,7 +63,7 @@
           </el-dropdown-item>
 
           <!--同比/环比-->
-          <el-dropdown-item v-show="chart.type !== 'table-info'">
+          <el-dropdown-item v-show="!item.chartId && chart.type !== 'table-info'">
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="quickCalc">
               <span class="el-dropdown-link inner-dropdown-menu">
                 <span>
@@ -80,7 +80,7 @@
             </el-dropdown>
           </el-dropdown-item>
 
-          <el-dropdown-item :divided="chart.type !== 'table-info'">
+          <el-dropdown-item :divided="!item.chartId && chart.type !== 'table-info'">
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="sort">
               <span class="el-dropdown-link inner-dropdown-menu">
                 <span>
diff --git a/frontend/src/views/chart/components/drag-item/QuotaItem.vue b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
index 257411e597..5d5d9cba24 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
@@ -17,7 +17,7 @@
           </span>
           <span class="item-span-style" :title="item.name">{{ item.name }}</span>
           <field-error-tips v-if="tagType === 'danger'" />
-          <span v-if="chart.type !== 'table-info' && item.summary" class="summary-span">
+          <span v-if="chart.type !== 'table-info' && item.summary && !item.chartId" class="summary-span">
             {{ $t('chart.' + item.summary) }}<span v-if="false && item.compareCalc && item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
           </span>
           <i class="el-icon-arrow-down el-icon--right" style="position: absolute;top: 6px;right: 10px;" />
@@ -39,7 +39,7 @@
               </el-dropdown-menu>
             </el-dropdown>
           </el-dropdown-item>
-          <el-dropdown-item v-show="chart.type !== 'table-info'" :divided="chart.type === 'chart-mix'">
+          <el-dropdown-item v-show="!item.chartId && 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>
@@ -63,7 +63,7 @@
           </el-dropdown-item>
 
           <!--同比/环比-->
-          <el-dropdown-item v-show="chart.type !== 'table-info'">
+          <el-dropdown-item v-show="!item.chartId && chart.type !== 'table-info'">
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="quickCalc">
               <span class="el-dropdown-link inner-dropdown-menu">
                 <span>
@@ -80,7 +80,7 @@
             </el-dropdown>
           </el-dropdown-item>
 
-          <el-dropdown-item :divided="chart.type !== 'table-info'">
+          <el-dropdown-item :divided="!item.chartId && chart.type !== 'table-info'">
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="sort">
               <span class="el-dropdown-link inner-dropdown-menu">
                 <span>
diff --git a/frontend/src/views/chart/components/filter/QuotaFilterEditor.vue b/frontend/src/views/chart/components/filter/QuotaFilterEditor.vue
index c3f81602d9..39c1a7f984 100644
--- a/frontend/src/views/chart/components/filter/QuotaFilterEditor.vue
+++ b/frontend/src/views/chart/components/filter/QuotaFilterEditor.vue
@@ -17,7 +17,12 @@
     <div style="max-height: 50vh;overflow-y: auto;">
       <el-row v-for="(f,index) in item.filter" :key="index" class="filter-item">
         <el-col :span="4">
-          <span>{{ item.name }} ({{ $t('chart.'+item.summary) }})</span>
+          <span>
+            {{ item.name }}
+            <span v-show="item.summary && item.summary !== ''">
+              ({{ $t('chart.'+item.summary) }})
+            </span>
+          </span>
         </el-col>
         <el-col :span="8">
           <el-select v-model="f.term" size="mini">