From dc4482dcaa7ff21d85865ffdba818d35f60fd8b6 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 19 May 2021 15:20:48 +0800
Subject: [PATCH 1/2] feat(frontend):UI fix

---
 frontend/src/views/chart/view/ChartEdit.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 888759d941..b66928c81f 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -89,7 +89,7 @@
             </el-form-item>
           </el-form>
         </div>
-        <div style="height: 25%;overflow:auto" class="padding-lr">
+        <div style="height: 25vh;overflow:auto" class="padding-lr">
           <span>{{ $t('chart.chart_type') }}</span>
           <el-row>
             <div class="chart-type">
@@ -138,7 +138,7 @@
             </span>
           </span>
         </el-row>
-        <div style="height: 40%;overflow:hidden;border-top: 1px solid #e6e6e6">
+        <div style="overflow:auto;border-top: 1px solid #e6e6e6" class="attr-style">
           <el-row class="padding-lr">
             <span>{{ $t('chart.style_priority') }}</span>
             <el-row>
@@ -882,6 +882,10 @@ export default {
     padding-left: 0;
   }
 
+  .attr-style{
+    height: calc(100vh - 56px - 25vh - 40px - 62px - 10px);
+  }
+
   .attr-selector{
     width:100%;
     height: 32px;

From b176e4a14abd08636b11973121a8e54d211eaea7 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 19 May 2021 15:45:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20bug=20=E8=A7=86=E5=9B=BE=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=B7=9F=E9=9A=8F=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/service/chart/ChartViewService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index e82899b4f7..2597e4c996 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -59,7 +59,7 @@ public class ChartViewService {
             chartView.setCreateBy(AuthUtils.getUser().getUsername());
             chartView.setCreateTime(timestamp);
             chartView.setUpdateTime(timestamp);
-            chartViewMapper.insert(chartView);
+            chartViewMapper.insertSelective(chartView);
         }
         return chartView;
     }