Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
028db23f
Unverified
提交
028db23f
authored
4月 14, 2022
作者:
fit2cloud-chenyw
提交者:
GitHub
4月 14, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2118 from dataease/pr@dev@fix_map_drill_detail
fix: 地图钻取后查看详情范围没有切换
上级
8e97cc04
4bafec10
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
47 行增加
和
14 行删除
+47
-14
Toolbar.vue
frontend/src/components/canvas/components/Toolbar.vue
+1
-0
UserView.vue
frontend/src/components/canvas/custom-component/UserView.vue
+11
-6
UserViewDialog.vue
...src/components/canvas/custom-component/UserViewDialog.vue
+9
-2
UserViewMobileDialog.vue
...mponents/canvas/custom-component/UserViewMobileDialog.vue
+14
-1
ChartComponent.vue
frontend/src/views/chart/components/ChartComponent.vue
+1
-1
ChartEdit.vue
frontend/src/views/chart/view/ChartEdit.vue
+11
-4
没有找到文件。
frontend/src/components/canvas/components/Toolbar.vue
浏览文件 @
028db23f
...
@@ -273,6 +273,7 @@ export default {
...
@@ -273,6 +273,7 @@ export default {
}
}
const
components
=
deepCopy
(
this
.
componentData
)
const
components
=
deepCopy
(
this
.
componentData
)
components
.
forEach
(
view
=>
{
components
.
forEach
(
view
=>
{
if
(
view
.
DetailAreaCode
)
{
view
.
DetailAreaCode
=
null
}
if
(
view
.
filters
&&
view
.
filters
.
length
>
0
)
{
view
.
filters
=
[]
}
if
(
view
.
filters
&&
view
.
filters
.
length
>
0
)
{
view
.
filters
=
[]
}
if
(
view
.
type
===
'de-tabs'
)
{
if
(
view
.
type
===
'de-tabs'
)
{
view
.
options
.
tabList
&&
view
.
options
.
tabList
.
length
>
0
&&
view
.
options
.
tabList
.
forEach
(
tab
=>
{
view
.
options
.
tabList
&&
view
.
options
.
tabList
.
length
>
0
&&
view
.
options
.
tabList
.
forEach
(
tab
=>
{
...
...
frontend/src/components/canvas/custom-component/UserView.vue
浏览文件 @
028db23f
...
@@ -609,9 +609,9 @@ export default {
...
@@ -609,9 +609,9 @@ export default {
const
current
=
this
.
$refs
[
this
.
element
.
propValue
.
id
]
const
current
=
this
.
$refs
[
this
.
element
.
propValue
.
id
]
if
(
this
.
chart
.
isPlugin
)
{
if
(
this
.
chart
.
isPlugin
)
{
current
&&
current
.
callPluginInner
&&
current
.
callPluginInner
({
methodName
:
'registerDynamicMap'
,
methodParam
:
null
})
current
&&
current
.
callPluginInner
&&
this
.
setDetailMapCode
(
null
)
&&
current
.
callPluginInner
({
methodName
:
'registerDynamicMap'
,
methodParam
:
null
})
}
else
{
}
else
{
current
&&
current
.
registerDynamicMap
&&
current
.
registerDynamicMap
(
null
)
current
&&
current
.
registerDynamicMap
&&
this
.
setDetailMapCode
(
null
)
&&
current
.
registerDynamicMap
(
null
)
}
}
}
}
},
},
...
@@ -639,12 +639,17 @@ export default {
...
@@ -639,12 +639,17 @@ export default {
this
.
currentAcreaNode
=
tempNode
this
.
currentAcreaNode
=
tempNode
const
current
=
this
.
$refs
[
this
.
element
.
propValue
.
id
]
const
current
=
this
.
$refs
[
this
.
element
.
propValue
.
id
]
if
(
this
.
chart
.
isPlugin
)
{
if
(
this
.
chart
.
isPlugin
)
{
current
&&
current
.
callPluginInner
&&
current
.
callPluginInner
({
methodName
:
'registerDynamicMap'
,
methodParam
:
this
.
currentAcreaNode
.
code
})
current
&&
current
.
callPluginInner
&&
this
.
setDetailMapCode
(
this
.
currentAcreaNode
.
code
)
&&
current
.
callPluginInner
({
methodName
:
'registerDynamicMap'
,
methodParam
:
this
.
currentAcreaNode
.
code
})
}
else
{
}
else
{
current
&&
current
.
registerDynamicMap
&&
current
.
registerDynamicMap
(
this
.
currentAcreaNode
.
code
)
current
&&
current
.
registerDynamicMap
&&
this
.
setDetailMapCode
(
this
.
currentAcreaNode
.
code
)
&&
current
.
registerDynamicMap
(
this
.
currentAcreaNode
.
code
)
}
}
},
},
setDetailMapCode
(
code
)
{
this
.
element
.
DetailAreaCode
=
code
return
true
},
// 切换下一级地图
// 切换下一级地图
sendToChildren
(
param
)
{
sendToChildren
(
param
)
{
const
length
=
param
.
data
.
dimensionList
.
length
const
length
=
param
.
data
.
dimensionList
.
length
...
@@ -660,9 +665,9 @@ export default {
...
@@ -660,9 +665,9 @@ export default {
this
.
currentAcreaNode
=
nextNode
this
.
currentAcreaNode
=
nextNode
const
current
=
this
.
$refs
[
this
.
element
.
propValue
.
id
]
const
current
=
this
.
$refs
[
this
.
element
.
propValue
.
id
]
if
(
this
.
chart
.
isPlugin
)
{
if
(
this
.
chart
.
isPlugin
)
{
nextNode
&&
current
&&
current
.
callPluginInner
&&
current
.
callPluginInner
({
methodName
:
'registerDynamicMap'
,
methodParam
:
nextNode
.
code
})
nextNode
&&
current
&&
current
.
callPluginInner
&&
this
.
setDetailMapCode
(
nextNode
.
code
)
&&
current
.
callPluginInner
({
methodName
:
'registerDynamicMap'
,
methodParam
:
nextNode
.
code
})
}
else
{
}
else
{
nextNode
&&
current
&&
current
.
registerDynamicMap
&&
current
.
registerDynamicMap
(
nextNode
.
code
)
nextNode
&&
current
&&
current
.
registerDynamicMap
&&
this
.
setDetailMapCode
(
nextNode
.
code
)
&&
current
.
registerDynamicMap
(
nextNode
.
code
)
}
}
}
}
},
},
...
...
frontend/src/components/canvas/custom-component/UserViewDialog.vue
浏览文件 @
028db23f
...
@@ -6,10 +6,10 @@
...
@@ -6,10 +6,10 @@
<plugin-com
<plugin-com
v-if=
"chart.isPlugin"
v-if=
"chart.isPlugin"
:component-name=
"chart.type + '-view'"
:component-name=
"chart.type + '-view'"
:obj=
"
{chart}"
:obj=
"
{chart
: mapChart || chart
}"
class="chart-class"
class="chart-class"
/>
/>
<chart-component
v-else-if=
"!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'"
class=
"chart-class"
:chart=
"chart"
/>
<chart-component
v-else-if=
"!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'"
class=
"chart-class"
:chart=
"
mapChart ||
chart"
/>
<chart-component-g2
v-else-if=
"!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'antv'"
class=
"chart-class"
:chart=
"chart"
/>
<chart-component-g2
v-else-if=
"!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'antv'"
class=
"chart-class"
:chart=
"chart"
/>
<chart-component-s2
v-else-if=
"chart.type === 'table-pivot' && renderComponent() === 'antv'"
class=
"chart-class"
:chart=
"chart"
/>
<chart-component-s2
v-else-if=
"chart.type === 'table-pivot' && renderComponent() === 'antv'"
class=
"chart-class"
:chart=
"chart"
/>
<label-normal
v-else-if=
"chart.type.includes('text')"
:chart=
"chart"
class=
"table-class"
/>
<label-normal
v-else-if=
"chart.type.includes('text')"
:chart=
"chart"
class=
"table-class"
/>
...
@@ -62,6 +62,13 @@ export default {
...
@@ -62,6 +62,13 @@ 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'
)
},
},
...
...
frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue
浏览文件 @
028db23f
<
template
>
<
template
>
<de-container>
<de-container>
<de-main-container
v-if=
"chart.type !== 'table-normal' && chart.type !== 'table-info'"
:style=
"customStyle"
class=
"full-div"
>
<de-main-container
v-if=
"chart.type !== 'table-normal' && chart.type !== 'table-info'"
:style=
"customStyle"
class=
"full-div"
>
<chart-component
v-if=
"!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'"
class=
"chart-class"
:chart=
"chart"
/>
<plugin-com
v-if=
"chart.isPlugin"
:component-name=
"chart.type + '-view'"
:obj=
"
{chart: mapChart || chart}"
class="chart-class"
/>
<chart-component
v-else-if=
"!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'"
class=
"chart-class"
:chart=
"mapChart || chart"
/>
<chart-component-g2
v-else-if=
"!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'antv'"
class=
"chart-class"
:chart=
"chart"
/>
<chart-component-g2
v-else-if=
"!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'antv'"
class=
"chart-class"
:chart=
"chart"
/>
<chart-component-s2
v-else-if=
"chart.type === 'table-pivot' && renderComponent() === 'antv'"
class=
"chart-class"
:chart=
"chart"
/>
<chart-component-s2
v-else-if=
"chart.type === 'table-pivot' && renderComponent() === 'antv'"
class=
"chart-class"
:chart=
"chart"
/>
<label-normal
v-else-if=
"chart.type.includes('text')"
:chart=
"chart"
class=
"table-class"
/>
<label-normal
v-else-if=
"chart.type.includes('text')"
:chart=
"chart"
class=
"table-class"
/>
...
@@ -44,6 +50,13 @@ export default {
...
@@ -44,6 +50,13 @@ 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
=
{
}
}
...
...
frontend/src/views/chart/components/ChartComponent.vue
浏览文件 @
028db23f
...
@@ -229,7 +229,7 @@ export default {
...
@@ -229,7 +229,7 @@ export default {
this
.
myChart
.
clear
()
this
.
myChart
.
clear
()
return
return
}
}
const
cCode
=
this
.
dynamicAreaCode
||
customAttr
.
areaCode
const
cCode
=
this
.
chart
.
DetailAreaCode
||
this
.
dynamicAreaCode
||
customAttr
.
areaCode
if
(
this
.
$store
.
getters
.
geoMap
[
cCode
])
{
if
(
this
.
$store
.
getters
.
geoMap
[
cCode
])
{
const
json
=
this
.
$store
.
getters
.
geoMap
[
cCode
]
const
json
=
this
.
$store
.
getters
.
geoMap
[
cCode
]
this
.
initMapChart
(
json
,
chart
)
this
.
initMapChart
(
json
,
chart
)
...
...
frontend/src/views/chart/view/ChartEdit.vue
浏览文件 @
028db23f
...
@@ -1403,6 +1403,7 @@ export default {
...
@@ -1403,6 +1403,7 @@ export default {
return
this
.
$store
.
state
.
panel
.
panelInfo
return
this
.
$store
.
state
.
panel
.
panelInfo
},
},
...
mapState
([
...
mapState
([
'curComponent'
,
'panelViewEditInfo'
'panelViewEditInfo'
])
])
/* pluginRenderOptions() {
/* pluginRenderOptions() {
...
@@ -2469,6 +2470,7 @@ export default {
...
@@ -2469,6 +2470,7 @@ export default {
this
.
backToParent
(
0
,
length
)
this
.
backToParent
(
0
,
length
)
this
.
currentAcreaNode
=
null
this
.
currentAcreaNode
=
null
const
current
=
this
.
$refs
.
dynamicChart
const
current
=
this
.
$refs
.
dynamicChart
this
.
setDetailMapCode
(
null
)
if
(
this
.
view
.
isPlugin
)
{
if
(
this
.
view
.
isPlugin
)
{
current
&&
current
.
callPluginInner
&&
current
.
callPluginInner
({
methodName
:
'registerDynamicMap'
,
methodParam
:
null
})
current
&&
current
.
callPluginInner
&&
current
.
callPluginInner
({
methodName
:
'registerDynamicMap'
,
methodParam
:
null
})
}
else
{
}
else
{
...
@@ -2503,15 +2505,20 @@ export default {
...
@@ -2503,15 +2505,20 @@ export default {
// this.$refs.dynamicChart && this.$refs.dynamicChart.registerDynamicMap && this.$refs.dynamicChart.registerDynamicMap(this.currentAcreaNode.code)
// this.$refs.dynamicChart && this.$refs.dynamicChart.registerDynamicMap && this.$refs.dynamicChart.registerDynamicMap(this.currentAcreaNode.code)
const
current
=
this
.
$refs
.
dynamicChart
const
current
=
this
.
$refs
.
dynamicChart
if
(
this
.
view
.
isPlugin
)
{
if
(
this
.
view
.
isPlugin
)
{
current
&&
current
.
callPluginInner
&&
current
.
callPluginInner
({
current
&&
current
.
callPluginInner
&&
this
.
setDetailMapCode
(
this
.
currentAcreaNode
.
code
)
&&
current
.
callPluginInner
({
methodName
:
'registerDynamicMap'
,
methodName
:
'registerDynamicMap'
,
methodParam
:
this
.
currentAcreaNode
.
code
methodParam
:
this
.
currentAcreaNode
.
code
})
})
}
else
{
}
else
{
current
&&
current
.
registerDynamicMap
&&
current
.
registerDynamicMap
(
this
.
currentAcreaNode
.
code
)
current
&&
current
.
registerDynamicMap
&&
this
.
setDetailMapCode
(
this
.
currentAcreaNode
.
code
)
&&
current
.
registerDynamicMap
(
this
.
currentAcreaNode
.
code
)
}
}
},
},
setDetailMapCode
(
code
)
{
this
.
curComponent
.
DetailAreaCode
=
code
return
true
},
// 切换下一级地图
// 切换下一级地图
sendToChildren
(
param
)
{
sendToChildren
(
param
)
{
const
length
=
param
.
data
.
dimensionList
.
length
const
length
=
param
.
data
.
dimensionList
.
length
...
@@ -2530,12 +2537,12 @@ export default {
...
@@ -2530,12 +2537,12 @@ export default {
// this.$refs.dynamicChart && this.$refs.dynamicChart.registerDynamicMap && this.$refs.dynamicChart.registerDynamicMap(nextNode.code)
// this.$refs.dynamicChart && this.$refs.dynamicChart.registerDynamicMap && this.$refs.dynamicChart.registerDynamicMap(nextNode.code)
const
current
=
this
.
$refs
.
dynamicChart
const
current
=
this
.
$refs
.
dynamicChart
if
(
this
.
view
.
isPlugin
)
{
if
(
this
.
view
.
isPlugin
)
{
nextNode
&&
current
&&
current
.
callPluginInner
&&
current
.
callPluginInner
({
nextNode
&&
current
&&
current
.
callPluginInner
&&
this
.
setDetailMapCode
(
nextNode
.
code
)
&&
current
.
callPluginInner
({
methodName
:
'registerDynamicMap'
,
methodName
:
'registerDynamicMap'
,
methodParam
:
nextNode
.
code
methodParam
:
nextNode
.
code
})
})
}
else
{
}
else
{
nextNode
&&
current
&&
current
.
registerDynamicMap
&&
current
.
registerDynamicMap
(
nextNode
.
code
)
nextNode
&&
current
&&
current
.
registerDynamicMap
&&
this
.
setDetailMapCode
(
nextNode
.
code
)
&&
current
.
registerDynamicMap
(
nextNode
.
code
)
}
}
return
nextNode
return
nextNode
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论