From 7957ac5a40023dd0bd3a5eb0e82557c9347eb706 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Mon, 19 Jul 2021 15:47:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filter/DimensionFilterEditor.vue          | 40 +++++++++----------
 .../components/filter/QuotaFilterEditor.vue   | 20 +++++-----
 frontend/src/views/chart/view/ChartEdit.vue   | 12 +++---
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/frontend/src/views/chart/components/filter/DimensionFilterEditor.vue b/frontend/src/views/chart/components/filter/DimensionFilterEditor.vue
index a5dd51d769..1146c9cbdc 100644
--- a/frontend/src/views/chart/components/filter/DimensionFilterEditor.vue
+++ b/frontend/src/views/chart/components/filter/DimensionFilterEditor.vue
@@ -64,26 +64,26 @@ export default {
           label: this.$t('chart.filter_not_like')
         }]
       },
-      {
-        label: '',
-        options: [{
-          value: 'lt',
-          label: this.$t('chart.filter_lt')
-        }, {
-          value: 'gt',
-          label: this.$t('chart.filter_gt')
-        }]
-      },
-      {
-        label: '',
-        options: [{
-          value: 'le',
-          label: this.$t('chart.filter_le')
-        }, {
-          value: 'ge',
-          label: this.$t('chart.filter_ge')
-        }]
-      },
+      // {
+      //   label: '',
+      //   options: [{
+      //     value: 'lt',
+      //     label: this.$t('chart.filter_lt')
+      //   }, {
+      //     value: 'gt',
+      //     label: this.$t('chart.filter_gt')
+      //   }]
+      // },
+      // {
+      //   label: '',
+      //   options: [{
+      //     value: 'le',
+      //     label: this.$t('chart.filter_le')
+      //   }, {
+      //     value: 'ge',
+      //     label: this.$t('chart.filter_ge')
+      //   }]
+      // },
       {
         label: '',
         options: [{
diff --git a/frontend/src/views/chart/components/filter/QuotaFilterEditor.vue b/frontend/src/views/chart/components/filter/QuotaFilterEditor.vue
index 45df54cb13..018dabae43 100644
--- a/frontend/src/views/chart/components/filter/QuotaFilterEditor.vue
+++ b/frontend/src/views/chart/components/filter/QuotaFilterEditor.vue
@@ -54,16 +54,16 @@ export default {
           label: this.$t('chart.filter_not_eq')
         }]
       },
-      {
-        label: '',
-        options: [{
-          value: 'like',
-          label: this.$t('chart.filter_like')
-        }, {
-          value: 'not like',
-          label: this.$t('chart.filter_not_like')
-        }]
-      },
+      // {
+      //   label: '',
+      //   options: [{
+      //     value: 'like',
+      //     label: this.$t('chart.filter_like')
+      //   }, {
+      //     value: 'not like',
+      //     label: this.$t('chart.filter_not_like')
+      //   }]
+      // },
       {
         label: '',
         options: [{
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 9902748916..25f7003387 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -213,7 +213,7 @@
                 </el-row>
               </div>
               <div style="overflow:auto;border-top: 1px solid #e6e6e6" class="attr-style">
-                <el-row>
+                <el-row style="height: 100%;">
                   <el-row v-if="chart.type !=='text' && chart.type !== 'gauge'" class="padding-lr">
                     <span style="width: 80px;text-align: right;">{{ $t('chart.dimension') }}</span>
                     <draggable
@@ -222,7 +222,7 @@
                       group="dimension"
                       animation="300"
                       :move="onMove"
-                      style="padding:2px 0 0 0;width:100%;height: 100%;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;"
+                      style="padding:2px 0 0 0;width:100%;min-height: 32px;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;"
                       @end="end2"
                     >
                       <transition-group class="draggable-group">
@@ -230,7 +230,7 @@
                       </transition-group>
                     </draggable>
                   </el-row>
-                  <el-row class="padding-lr">
+                  <el-row class="padding-lr" style="margin-top: 6px;">
                     <span style="width: 80px;text-align: right;">{{ $t('chart.quota') }}</span>
                     <draggable
                       v-model="view.yaxis"
@@ -238,7 +238,7 @@
                       group="quota"
                       animation="300"
                       :move="onMove"
-                      style="padding:2px 0 0 0;width:100%;height: 100%;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;"
+                      style="padding:2px 0 0 0;width:100%;min-height: 32px;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;"
                       @end="end2"
                     >
                       <transition-group class="draggable-group">
@@ -246,7 +246,7 @@
                       </transition-group>
                     </draggable>
                   </el-row>
-                  <div class="padding-lr filter-class">
+                  <div class="padding-lr filter-class" style="margin-top: 6px;">
                     <span>{{ $t('chart.result_filter') }}</span>
                     <el-button :disabled="!hasDataPermission('manage',param.privileges)" size="mini" class="filter-btn-class" @click="showResultFilter">
                       {{ $t('chart.filter_condition') }}<i class="el-icon-setting el-icon--right" />
@@ -1233,7 +1233,7 @@ export default {
   }
 
   .attr-style{
-    height: calc(100vh - 56px - 25vh - 40px - 60px);
+    height: calc(100vh - 56px - 25vh - 40px - 40px);
   }
 
   .attr-selector{