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:
junjie 2021-08-13 12:42:59 +08:00
parent 866744ae75
commit f96e8a2a88
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) { if (customAttr.color && customAttr.color.colors) {
chart_option.visualMap.inRange.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++) { for (let i = 0; i < valueArr.length; i++) {
// const y = { // const y = {

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

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