forked from github/dataease
Merge pull request #2120 from dataease/pr@dev@fix_mobile_bubble_map_detail
fix: 移动端插件视图不能查看详情
This commit is contained in:
commit
05ea4148a9
@ -41,7 +41,6 @@ import { exportDetails } from '@/api/panel/panel'
|
|||||||
import html2canvas from 'html2canvasde'
|
import html2canvas from 'html2canvasde'
|
||||||
import { hexColorToRGBA } from '@/views/chart/chart/util'
|
import { hexColorToRGBA } from '@/views/chart/chart/util'
|
||||||
import { deepCopy } from '@/components/canvas/utils/utils'
|
import { deepCopy } from '@/components/canvas/utils/utils'
|
||||||
import { get } from '@/api/system/dynamic'
|
|
||||||
export default {
|
export default {
|
||||||
name: 'UserView',
|
name: 'UserView',
|
||||||
components: { LabelNormalText, ChartComponentS2, ChartComponentG2, DeMainContainer, DeContainer, DeAsideContainer, ChartComponent, TableNormal, LabelNormal, PluginCom },
|
components: { LabelNormalText, ChartComponentS2, ChartComponentG2, DeMainContainer, DeContainer, DeAsideContainer, ChartComponent, TableNormal, LabelNormal, PluginCom },
|
||||||
@ -62,13 +61,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
mapChart() {
|
|
||||||
if (this.chart.type && (this.chart.type === 'map' || this.chart.type === 'buddle-map')) {
|
|
||||||
const temp = JSON.parse(JSON.stringify(this.chart))
|
|
||||||
return { ...temp, ...{ DetailAreaCode: this.curComponent.DetailAreaCode }}
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
},
|
|
||||||
showChartCanvas() {
|
showChartCanvas() {
|
||||||
return !this.chart.type.includes('table')
|
return !this.chart.type.includes('table')
|
||||||
},
|
},
|
||||||
@ -117,7 +110,18 @@ export default {
|
|||||||
'curComponent',
|
'curComponent',
|
||||||
'componentData',
|
'componentData',
|
||||||
'canvasStyleData'
|
'canvasStyleData'
|
||||||
])
|
]),
|
||||||
|
mapChart() {
|
||||||
|
if (this.chart.type && (this.chart.type === 'map' || this.chart.type === 'buddle-map')) {
|
||||||
|
const temp = JSON.parse(JSON.stringify(this.chart))
|
||||||
|
let DetailAreaCode = null
|
||||||
|
if (this.curComponent && this.curComponent.DetailAreaCode && this.curComponent.DetailAreaCode.length) {
|
||||||
|
DetailAreaCode = this.curComponent.DetailAreaCode
|
||||||
|
}
|
||||||
|
return { ...temp, ...{ DetailAreaCode: DetailAreaCode }}
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.element = deepCopy(this.curComponent)
|
this.element = deepCopy(this.curComponent)
|
||||||
|
@ -30,10 +30,10 @@ import DeMainContainer from '@/components/dataease/DeMainContainer'
|
|||||||
import DeContainer from '@/components/dataease/DeContainer'
|
import DeContainer from '@/components/dataease/DeContainer'
|
||||||
import LabelNormalText from '@/views/chart/components/normal/LabelNormalText'
|
import LabelNormalText from '@/views/chart/components/normal/LabelNormalText'
|
||||||
import ChartComponentS2 from '@/views/chart/components/ChartComponentS2'
|
import ChartComponentS2 from '@/views/chart/components/ChartComponentS2'
|
||||||
|
import PluginCom from '@/views/system/plugin/PluginCom'
|
||||||
export default {
|
export default {
|
||||||
name: 'UserViewMobileDialog',
|
name: 'UserViewMobileDialog',
|
||||||
components: { ChartComponentS2, LabelNormalText, DeContainer, DeMainContainer, ChartComponentG2, ChartComponent, TableNormal, LabelNormal },
|
components: { ChartComponentS2, LabelNormalText, DeContainer, DeMainContainer, ChartComponentG2, ChartComponent, TableNormal, LabelNormal, PluginCom },
|
||||||
props: {
|
props: {
|
||||||
chart: {
|
chart: {
|
||||||
type: Object,
|
type: Object,
|
||||||
@ -50,13 +50,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
mapChart() {
|
|
||||||
if (this.chart.type && (this.chart.type === 'map' || this.chart.type === 'buddle-map')) {
|
|
||||||
const temp = JSON.parse(JSON.stringify(this.chart))
|
|
||||||
return { ...temp, ...{ DetailAreaCode: this.curComponent.DetailAreaCode }}
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
},
|
|
||||||
customStyle() {
|
customStyle() {
|
||||||
let style = {
|
let style = {
|
||||||
}
|
}
|
||||||
@ -83,7 +77,18 @@ export default {
|
|||||||
'curComponent',
|
'curComponent',
|
||||||
'componentData',
|
'componentData',
|
||||||
'canvasStyleData'
|
'canvasStyleData'
|
||||||
])
|
]),
|
||||||
|
mapChart() {
|
||||||
|
if (this.chart.type && (this.chart.type === 'map' || this.chart.type === 'buddle-map')) {
|
||||||
|
const temp = JSON.parse(JSON.stringify(this.chart))
|
||||||
|
let DetailAreaCode = null
|
||||||
|
if (this.curComponent && this.curComponent.DetailAreaCode && this.curComponent.DetailAreaCode.length) {
|
||||||
|
DetailAreaCode = this.curComponent.DetailAreaCode
|
||||||
|
}
|
||||||
|
return { ...temp, ...{ DetailAreaCode: DetailAreaCode }}
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user