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

Merge pull request #661 from dataease/pr@dev@feat_chart_refactor

Browse Source 
feat: 气泡图优化
This commit is contained in:
XiaJunjie2020 2021-08-18 16:34:20 +08:00 committed by GitHub
commit d92f08242a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ export function baseScatterOption(chart_option, chart) {
} }
const funcSize = function(data) { const funcSize = function(data) {
const k = 100 const k = 80
const max = Math.max(...bubbleArray) const max = Math.max(...bubbleArray)
return (data[2] / max) * k return (data[2] / max) * k
} }

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

@ -338,6 +338,12 @@
<span>{{ $t('chart.bubble_size') }}</span> <span>{{ $t('chart.bubble_size') }}</span>
/ /
<span>{{ $t('chart.quota') }}</span> <span>{{ $t('chart.quota') }}</span>
<el-tooltip class="item" effect="dark" placement="bottom">
<div slot="content">
该指标生效时，样式大小中的气泡大小属性将失效
</div>
<i class="el-icon-info" style="cursor: pointer;color: #606266;" />
</el-tooltip>
</span> </span>
<draggable <draggable
v-model="view.extBubble" v-model="view.extBubble"