Merge branch 'main' of github.com:dataease/dataease into main

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;
     }

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;