center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat(视图): 快速计算支持占比

Browse Source
This commit is contained in:
junjun 2022-10-26 22:42:52 +08:00
parent 8e09e6efe9
commit 0bc8a5a777
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/views/chart/chart/util.js
View File

@ -3218,3 +3218,5 @@ export function getRemark(chart) {
} }
return remark return remark
} }
export const quotaViews = ['label', 'richTextView', 'text', 'gauge', 'liquid']

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

@ -175,7 +175,10 @@
:disabled="disableEditCompare" :disabled="disableEditCompare"
:command="beforeQuickCalc('setting')" :command="beforeQuickCalc('setting')"
>{{ $t('chart.yoy_label') }}...</el-dropdown-item> >{{ $t('chart.yoy_label') }}...</el-dropdown-item>
<el-dropdown-item :command="beforeQuickCalc('percent')">{{ $t('chart.percent') }}</el-dropdown-item> <el-dropdown-item
:disabled="quotaViews.indexOf(chart.type) > -1"
:command="beforeQuickCalc('percent')"
>{{ $t('chart.percent') }}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</el-dropdown-item> </el-dropdown-item>
@ -242,6 +245,7 @@ import { getItemType, getOriginFieldName } from '@/views/chart/components/drag-i
import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips' import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
import bus from '@/utils/bus' import bus from '@/utils/bus'
import { formatterItem } from '@/views/chart/chart/formatter' import { formatterItem } from '@/views/chart/chart/formatter'
import { quotaViews } from '@/views/chart/chart/util'
export default { export default {
name: 'QuotaExtItem', name: 'QuotaExtItem',
@ -277,7 +281,8 @@ export default {
compareItem: compareItem, compareItem: compareItem,
disableEditCompare: false, disableEditCompare: false,
tagType: 'success', tagType: 'success',
formatterItem: formatterItem formatterItem: formatterItem,
quotaViews: quotaViews
} }
}, },
watch: { watch: {

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

@ -175,7 +175,10 @@
:disabled="disableEditCompare" :disabled="disableEditCompare"
:command="beforeQuickCalc('setting')" :command="beforeQuickCalc('setting')"
>{{ $t('chart.yoy_label') }}...</el-dropdown-item> >{{ $t('chart.yoy_label') }}...</el-dropdown-item>
<el-dropdown-item :command="beforeQuickCalc('percent')">{{ $t('chart.percent') }}</el-dropdown-item> <el-dropdown-item
:disabled="quotaViews.indexOf(chart.type) > -1"
:command="beforeQuickCalc('percent')"
>{{ $t('chart.percent') }}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</el-dropdown-item> </el-dropdown-item>
@ -242,6 +245,7 @@ import { getItemType, getOriginFieldName } from '@/views/chart/components/drag-i
import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips' import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
import bus from '@/utils/bus' import bus from '@/utils/bus'
import { formatterItem } from '@/views/chart/chart/formatter' import { formatterItem } from '@/views/chart/chart/formatter'
import { quotaViews } from '@/views/chart/chart/util'
export default { export default {
name: 'QuotaItem', name: 'QuotaItem',
@ -277,7 +281,8 @@ export default {
compareItem: compareItem, compareItem: compareItem,
disableEditCompare: false, disableEditCompare: false,
tagType: 'success', tagType: 'success',
formatterItem: formatterItem formatterItem: formatterItem,
quotaViews: quotaViews
} }
}, },
watch: { watch: {

10
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -1589,6 +1589,7 @@ import ScrollCfg from '@/views/chart/components/senior/ScrollCfg'
import ChartFieldEdit from '@/views/chart/view/ChartFieldEdit' import ChartFieldEdit from '@/views/chart/view/ChartFieldEdit'
import CalcChartFieldEdit from '@/views/chart/view/CalcChartFieldEdit' import CalcChartFieldEdit from '@/views/chart/view/CalcChartFieldEdit'
import { equalsAny } from '@/utils/StringUtils' import { equalsAny } from '@/utils/StringUtils'
import { quotaViews } from '@/views/chart/chart/util'
export default { export default {
name: 'ChartEdit', name: 'ChartEdit',
@ -1748,7 +1749,6 @@ export default {
tabActive: 'data', tabActive: 'data',
currentAreaCode: '', currentAreaCode: '',
showStackCustomSort: false showStackCustomSort: false
} }
}, },
computed: { computed: {
@ -2094,6 +2094,10 @@ export default {
if (!ele.compareCalc) { if (!ele.compareCalc) {
ele.compareCalc = compareItem ele.compareCalc = compareItem
} }
if (quotaViews.indexOf(view.type) > -1) {
ele.compareCalc = compareItem
ele.formatterCfg.type = 'auto'
}
}) })
if (view.type === 'chart-mix') { if (view.type === 'chart-mix') {
view.yaxisExt.forEach(function(ele) { view.yaxisExt.forEach(function(ele) {
@ -2121,6 +2125,10 @@ export default {
if (!ele.compareCalc) { if (!ele.compareCalc) {
ele.compareCalc = compareItem ele.compareCalc = compareItem
} }
if (quotaViews.indexOf(view.type) > -1) {
ele.compareCalc = compareItem
ele.formatterCfg.type = 'auto'
}
}) })
} }
view.extStack.forEach(function(ele) { view.extStack.forEach(function(ele) {