public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-19 18:38:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3412 from dataease/pr@dev@feat_chart_percent

Browse Source 
feat(视图): 快速计算支持占比
This commit is contained in:
fit2cloud-chenyw
2022-10-22 21:43:59 +08:00
committed by GitHub
parent 3a192dbaec a08ccdeed2
commit 86e2ed96d3
7 changed files with 101 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/lang/en.js
View File

@@ -1429,7 +1429,8 @@ export default {
reserve_one: '1',
reserve_two: '2',
proportion: 'Proportion',
label_content: 'Label Content'
label_content: 'Label Content',
percent: 'Percent'
},
dataset: {
parse_filed: 'Parse Field',

3
frontend/src/lang/tw.js
View File

@@ -1429,7 +1429,8 @@ export default {
reserve_one: '一位',
reserve_two: '两位',
proportion: '佔比',
label_content: '標籤展示'
label_content: '標籤展示',
percent: '占比'
},
dataset: {
parse_filed: '解析字段',

3
frontend/src/lang/zh.js
View File

@@ -1428,7 +1428,8 @@ export default {
reserve_one: '一位',
reserve_two: '两位',
proportion: '占比',
label_content: '标签展示'
label_content: '标签展示',
percent: '占比'
},
dataset: {
parse_filed: '解析字段',

7
frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
View File

@@ -153,7 +153,7 @@
</el-dropdown>
</el-dropdown-item>
<!--同比/环比-->
<!--同比/环比等快速计算-->
<el-dropdown-item v-show="!item.chartId && chart.type !== 'table-info'">
<el-dropdown
placement="right-start"
@@ -175,6 +175,7 @@
:disabled="disableEditCompare"
:command="beforeQuickCalc('setting')"
>{{ $t('chart.yoy_label') }}...</el-dropdown-item>
<el-dropdown-item :command="beforeQuickCalc('percent')">{{ $t('chart.percent') }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown-item>
@@ -383,6 +384,10 @@ export default {
case 'setting':
this.editCompare()
break
case 'percent':
this.item.compareCalc.type = 'percent'
this.$emit('onQuotaItemChange', this.item)
break
default:
break
}

7
frontend/src/views/chart/components/drag-item/QuotaItem.vue
View File

@@ -153,7 +153,7 @@
</el-dropdown>
</el-dropdown-item>
<!--同比/环比-->
<!--同比/环比等快速计算-->
<el-dropdown-item v-show="!item.chartId && chart.type !== 'table-info'">
<el-dropdown
placement="right-start"
@@ -175,6 +175,7 @@
:disabled="disableEditCompare"
:command="beforeQuickCalc('setting')"
>{{ $t('chart.yoy_label') }}...</el-dropdown-item>
<el-dropdown-item :command="beforeQuickCalc('percent')">{{ $t('chart.percent') }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown-item>
@@ -380,6 +381,10 @@ export default {
case 'setting':
this.editCompare()
break
case 'percent':
this.item.compareCalc.type = 'percent'
this.$emit('onQuotaItemChange', this.item)
break
default:
break
}