From ad07ea00a1a5edff557f47a117c2faca8e5344f0 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Wed, 7 Sep 2022 16:09:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E9=80=8F=E8=A7=86?=
 =?UTF-8?q?=E8=A1=A8=E5=90=88=E8=AE=A1=E5=B0=8F=E8=AE=A1=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=A4=9A=E7=A7=8D=E8=81=9A=E5=90=88=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                       |  4 ++-
 frontend/src/lang/tw.js                       |  4 ++-
 frontend/src/lang/zh.js                       |  4 ++-
 .../src/views/chart/chart/table/table-info.js |  2 +-
 .../chart/components/shape-attr/TotalCfg.vue  | 32 ++++++++++++++++++-
 5 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index dfa08ce487..525f7fc76d 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1326,7 +1326,9 @@ export default {
     dynamic: 'Dynamic',
     gauge_size_field_delete: 'Dynamic field changed，please edit again',
     chart_group: 'Sub Type',
-    chart_bar_group: 'Bar Group'
+    chart_bar_group: 'Bar Group',
+    field_dynamic: 'Dynamic',
+    aggregation: 'Aggregation'
   },
   dataset: {
     parse_filed: 'Parse Field',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 12065f458b..679796403d 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1326,7 +1326,9 @@ export default {
     dynamic: '動態值',
     gauge_size_field_delete: '動態值中字段發生變更，請重新編輯',
     chart_group: '子類別',
-    chart_bar_group: '分組柱狀圖'
+    chart_bar_group: '分組柱狀圖',
+    field_dynamic: '動態值',
+    aggregation: '聚合方式'
   },
   dataset: {
     parse_filed: '解析字段',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 0a09f968bf..571df4bbf9 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1326,7 +1326,9 @@ export default {
     dynamic: '动态值',
     gauge_size_field_delete: '动态值中字段发生变更，请重新编辑',
     chart_group: '子类别',
-    chart_bar_group: '分组柱状图'
+    chart_bar_group: '分组柱状图',
+    field_dynamic: '动态值',
+    aggregation: '聚合方式'
   },
   dataset: {
     parse_filed: '解析字段',
diff --git a/frontend/src/views/chart/chart/table/table-info.js b/frontend/src/views/chart/chart/table/table-info.js
index 39fdc804fd..ffa5ac370b 100644
--- a/frontend/src/views/chart/chart/table/table-info.js
+++ b/frontend/src/views/chart/chart/table/table-info.js
@@ -145,7 +145,7 @@ export function baseTableInfo(s2, container, chart, action, tableData) {
 
 export function baseTableNormal(s2, container, chart, action, tableData) {
   const containerDom = document.getElementById(container)
-  if(!containerDom) return
+  if (!containerDom) return
 
   // fields
   const fields = chart.data.fields
diff --git a/frontend/src/views/chart/components/shape-attr/TotalCfg.vue b/frontend/src/views/chart/components/shape-attr/TotalCfg.vue
index 774111cc97..b29c7b8e2c 100644
--- a/frontend/src/views/chart/components/shape-attr/TotalCfg.vue
+++ b/frontend/src/views/chart/components/shape-attr/TotalCfg.vue
@@ -16,6 +16,11 @@
           <el-form-item :label="$t('chart.total_label')" class="form-item">
             <el-input v-model="totalForm.row.label" style="width: 160px;" :placeholder="$t('chart.total_label')" size="mini" clearable @change="changeTotalCfg('row')" />
           </el-form-item>
+          <el-form-item :label="$t('chart.aggregation')" class="form-item">
+            <el-select v-model="totalForm.row.calcTotals.aggregation" class="form-item-select" :placeholder="$t('chart.aggregation')" size="mini" @change="changeTotalCfg('row')">
+              <el-option v-for="option in aggregations" :key="option.value" :label="option.name" :value="option.value" />
+            </el-select>
+          </el-form-item>
         </div>
 
         <el-form-item v-show="showProperty('row')" :label="$t('chart.sub_total_show')" class="form-item">
@@ -31,6 +36,11 @@
           <el-form-item :label="$t('chart.total_label')" class="form-item">
             <el-input v-model="totalForm.row.subLabel" :disabled="rowNum < 2" style="width: 160px;" :placeholder="$t('chart.total_label')" size="mini" clearable @change="changeTotalCfg" />
           </el-form-item>
+          <el-form-item :label="$t('chart.aggregation')" class="form-item">
+            <el-select v-model="totalForm.row.calcSubTotals.aggregation" :disabled="rowNum < 2" class="form-item-select" :placeholder="$t('chart.aggregation')" size="mini" @change="changeTotalCfg('row')">
+              <el-option v-for="option in aggregations" :key="option.value" :label="option.name" :value="option.value" />
+            </el-select>
+          </el-form-item>
         </div>
 
         <el-divider v-if="showProperty('col')" content-position="center" class="divider-style">{{ $t('chart.col_cfg') }}</el-divider>
@@ -47,6 +57,11 @@
           <el-form-item :label="$t('chart.total_label')" class="form-item">
             <el-input v-model="totalForm.col.label" style="width: 160px;" :placeholder="$t('chart.total_label')" size="mini" clearable @change="changeTotalCfg('col')" />
           </el-form-item>
+          <el-form-item :label="$t('chart.aggregation')" class="form-item">
+            <el-select v-model="totalForm.col.calcTotals.aggregation" class="form-item-select" :placeholder="$t('chart.aggregation')" size="mini" @change="changeTotalCfg('col')">
+              <el-option v-for="option in aggregations" :key="option.value" :label="option.name" :value="option.value" />
+            </el-select>
+          </el-form-item>
         </div>
 
         <el-form-item v-show="showProperty('col')" :label="$t('chart.sub_total_show')" class="form-item">
@@ -62,6 +77,11 @@
           <el-form-item :label="$t('chart.total_label')" class="form-item">
             <el-input v-model="totalForm.col.subLabel" :disabled="colNum < 2" style="width: 160px;" :placeholder="$t('chart.total_label')" size="mini" clearable @change="changeTotalCfg('col')" />
           </el-form-item>
+          <el-form-item :label="$t('chart.aggregation')" class="form-item">
+            <el-select v-model="totalForm.col.calcSubTotals.aggregation" :disabled="colNum < 2" class="form-item-select" :placeholder="$t('chart.aggregation')" size="mini" @change="changeTotalCfg('col')">
+              <el-option v-for="option in aggregations" :key="option.value" :label="option.name" :value="option.value" />
+            </el-select>
+          </el-form-item>
         </div>
       </el-form>
     </el-col>
@@ -88,7 +108,13 @@ export default {
   },
   data() {
     return {
-      totalForm: JSON.parse(JSON.stringify(DEFAULT_TOTAL))
+      totalForm: JSON.parse(JSON.stringify(DEFAULT_TOTAL)),
+      aggregations: [
+        { name: this.$t('chart.sum'), value: 'SUM' },
+        { name: this.$t('chart.avg'), value: 'AVG' },
+        { name: this.$t('chart.max'), value: 'MAX' },
+        { name: this.$t('chart.min'), value: 'MIN' }
+      ]
     }
   },
   computed: {
@@ -190,4 +216,8 @@ span{font-size: 12px}
   font-weight: 400;
   padding: 0 10px;
 }
+
+.form-item-select{
+  width:160px!important;
+}
 </style>