Merge branch 'master' of https://gitee.com/anji-plus/report

pom.xml

@@ -23,9 +23,9 @@
     <properties>
         <gaea.version>6.0.0-SNAPSHOT</gaea.version>
         <gaea.security.version>1.0.0-SNAPSHOT</gaea.security.version>
-        <gaea.export.version>1.0.0-SNAPSHOT</gaea.export.version>
+        <gaea.export.version>1.0.0.RELEASE</gaea.export.version>
         <gaea.generator.version>1.0.0-SNAPSHOT</gaea.generator.version>
-        <gaea.log.version>1.0.0-SNAPSHOT</gaea.log.version>
+        <gaea.log.version>1.0.0.RELEASE</gaea.log.version>
         <maven.test.skip>true</maven.test.skip>
     </properties>
 

report-ui/src/views/report/bigscreen/designer/form/colorPicker.vue

@@ -10,6 +10,7 @@
       <el-color-picker
         v-model="colorValue"
         :predefine="predefineColors"
+        show-alpha
         size="mini"
         @change="changeColor"
       />

report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue

@@ -439,8 +439,6 @@ export default {
 .echarts {
   width: 100%;
   height: 100%;
-  min-width: 200px;
-  min-height: 200px;
   overflow: hidden;
 }
 </style>

report-ui/src/views/report/bigscreen/designer/widget/widgetFunnel.vue

@@ -245,8 +245,6 @@ export default {
 .echarts {
   width: 100%;
   height: 100%;
-  min-width: 200px;
-  min-height: 200px;
   overflow: hidden;
 }
 </style>

report-ui/src/views/report/bigscreen/designer/widget/widgetGauge.vue

@@ -154,8 +154,6 @@ export default {
 .echarts {
   width: 100%;
   height: 100%;
-  min-width: 200px;
-  min-height: 200px;
   overflow: hidden;
 }
 </style>

report-ui/src/views/report/bigscreen/designer/widget/widgetHollowPiechart.vue

@@ -233,8 +233,6 @@ export default {
 .echarts {
   width: 100%;
   height: 100%;
-  min-width: 200px;
-  min-height: 200px;
   overflow: hidden;
 }
 </style>

report-ui/src/views/report/bigscreen/designer/widget/widgetLinechart.vue

@@ -348,8 +348,6 @@ export default {
 .echarts {
   width: 100%;
   height: 100%;
-  min-width: 200px;
-  min-height: 200px;
   overflow: hidden;
 }
 </style>

report-ui/src/views/report/bigscreen/designer/widget/widgetPiechart.vue

@@ -228,8 +228,6 @@ export default {
 .echarts {
   width: 100%;
   height: 100%;
-  min-width: 200px;
-  min-height: 200px;
   overflow: hidden;
 }
 </style>