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

Merge pull request #616 from dataease/pr@dev@feat_map_style

Browse Source 
feat: 地图样式
This commit is contained in:
XiaJunjie2020 2021-08-13 12:43:50 +08:00 committed by GitHub
commit 248cb81172
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/views/chart/chart/map/map.js
View File

@ -45,6 +45,7 @@ export function baseMapOption(chart_option, chart) {
if (customAttr.color && customAttr.color.colors) {
chart_option.visualMap.inRange.color = customAttr.color.colors
chart_option.visualMap.inRange.colorAlpha = customAttr.color.alpha / 100
}
for (let i = 0; i < valueArr.length; i++) {
// const y = {

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

@ -821,6 +821,9 @@ export default {
return
}
view.tableId = this.view.tableId
if (view.type === 'map' && view.xaxis.length > 1) {
view.xaxis = [view.xaxis[0]]
}
view.xaxis.forEach(function(ele) {
// if (!ele.summary || ele.summary === '') {
// ele.summary = 'sum'
@ -838,6 +841,9 @@ export default {
ele.filter = []
}
})
if (view.type === 'map' && view.yaxis.length > 1) {
view.yaxis = [view.yaxis[0]]
}
view.yaxis.forEach(function(ele) {
if (!ele.summary || ele.summary === '') {
if (ele.id === 'count' || ele.deType === 0 || ele.deType === 1) {
@ -1282,11 +1288,17 @@ export default {
}
},
addXaxis(e) {
if (this.view.type === 'map' && this.view.xaxis.length > 1) {
this.view.xaxis = [this.view.xaxis[0]]
}
this.dragCheckType(this.view.xaxis, 'd')
this.dragMoveDuplicate(this.view.xaxis, e)
this.save(true)
},
addYaxis(e) {
if (this.view.type === 'map' && this.view.yaxis.length > 1) {
this.view.yaxis = [this.view.yaxis[0]]
}
this.dragCheckType(this.view.yaxis, 'q')
this.dragMoveDuplicate(this.view.yaxis, e)
this.save(true)