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 @@
+
+
+
+
+
@@ -31,6 +36,11 @@
+
+
+
+
+
{{ $t('chart.col_cfg') }}
@@ -47,6 +57,11 @@
+
+
+
+
+
@@ -62,6 +77,11 @@
+
+
+
+
+
@@ -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;
+}