github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 20:42:55 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2022-05-04 20:39:46 +08:00
commit c6eb8b1621
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/components/canvas/custom-component/UserViewDialog.vue
View File

@ -123,10 +123,24 @@ export default {
if (!this.curComponent && this.lastMapChart) {
return this.lastMapChart
}
if (this.curComponent && this.curComponent.options && this.curComponent.options.tabList && this.curComponent.options.tabList.length) {
const tabList = JSON.parse(JSON.stringify(this.curComponent.options.tabList))
tabList.forEach(tab => {
if (tab.content &&
tab.content.propValue &&
tab.content.propValue.viewId &&
tab.content.propValue.viewId === this.chart.id &&
tab.content.DetailAreaCode &&
tab.content.DetailAreaCode.length) {
DetailAreaCode = tab.content.DetailAreaCode
}
})
}
const result = { ...temp, ...{ DetailAreaCode: DetailAreaCode }}
this.setLastMapChart(result)
return result
}
return null
}
},

1
mobile/public/index.html
View File

@ -3,7 +3,6 @@
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>
<%= htmlWebpackPlugin.options.title %>