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

backend/src/main/java/io/dataease/service/chart/ChartViewService.java

@@ -153,7 +153,7 @@ public class ChartViewService {
 
     public String transMysqlSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis) {
         // TODO 字段汇总 排序等
-        String[] field = yAxis.stream().map(y -> "CAST(" + y.getSummary() + "(" + y.getOriginName() + ") AS DECIMAL(10,2))").toArray(String[]::new);
+        String[] field = yAxis.stream().map(y -> "CAST(" + y.getSummary() + "(" + y.getOriginName() + ") AS DECIMAL(20,2))").toArray(String[]::new);
         String[] group = xAxis.stream().map(ChartViewFieldDTO::getOriginName).toArray(String[]::new);
         return MessageFormat.format("SELECT {0},{1} FROM {2} GROUP BY {3}", StringUtils.join(group, ","), StringUtils.join(field, ","), table, StringUtils.join(group, ","));
     }

frontend/src/views/chart/components/DimensionItem.vue

@@ -2,11 +2,9 @@
   <span>
     <el-dropdown trigger="click" size="small">
       <span class="el-dropdown-link">
-        <span
-          class="item-axis"
-        >
+        <el-tag size="small" class="item-axis">
           {{ item.name }}<i class="el-icon-arrow-down el-icon--right" />
-          <span />
+        </el-tag>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item icon="el-icon-edit-outline">
             item1
@@ -16,7 +14,6 @@
           </el-dropdown-item>
         </el-dropdown-menu>
       </span>
-      </span>
     </el-dropdown>
   </span>
 </template>
@@ -43,13 +40,10 @@ export default {
   .item-axis {
     padding: 1px 6px;
     margin: 0 3px 2px 3px;
-    border: solid 1px #eee;
-    background-color: #f1f1f1;
     text-align: left;
     height: 24px;
     line-height: 22px;
     display: inline-block;
-    color: #1890ff;
     border-radius: 4px;
     box-sizing: border-box;
     white-space: nowrap;

frontend/src/views/chart/components/QuotaItem.vue

@@ -2,11 +2,9 @@
   <span>
     <el-dropdown trigger="click" size="small">
       <span class="el-dropdown-link">
-        <span
-          class="item-axis"
-        >
+        <el-tag size="small" class="item-axis">
           {{ item.name }}<span class="summary-span">{{ $t('chart.'+item.summary) }}</span><i class="el-icon-arrow-down el-icon--right" />
-          <span />
+        </el-tag>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item icon="el-icon-notebook-2">
             <el-dropdown placement="right-start" size="small" @command="summary">
@@ -28,7 +26,6 @@
           </el-dropdown-item>
         </el-dropdown-menu>
       </span>
-      </span>
     </el-dropdown>
   </span>
 </template>
@@ -67,13 +64,10 @@ export default {
   .item-axis {
     padding: 1px 6px;
     margin: 0 3px 2px 3px;
-    border: solid 1px #eee;
-    background-color: #f1f1f1;
     text-align: left;
     height: 24px;
     line-height: 22px;
     display: inline-block;
-    color: #1890ff;
     border-radius: 4px;
     box-sizing: border-box;
     white-space: nowrap;