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

refactor(仪表板): 修改仪表板跳转设置拼接http逻辑，改为跳转时刻再进行检查拼接

Browse Source
This commit is contained in:
wangjiahao 2022-07-28 15:19:10 +08:00
parent 2f7eff48cb
commit 1a4a3f6898
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/components/canvas/custom-component/UserView.vue
View File

@ -128,6 +128,8 @@ import ChartComponentS2 from '@/views/chart/components/ChartComponentS2'
import PluginCom from '@/views/system/plugin/PluginCom' import PluginCom from '@/views/system/plugin/PluginCom'
import LabelNormalText from '@/views/chart/components/normal/LabelNormalText' import LabelNormalText from '@/views/chart/components/normal/LabelNormalText'
import { viewPropsSave } from '@/api/chart/chart' import { viewPropsSave } from '@/api/chart/chart'
import { checkAddHttp } from '@/utils/urlUtils'
export default { export default {
name: 'UserView', name: 'UserView',
components: { LabelNormalText, PluginCom, ChartComponentS2, EditBarView, ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 }, components: { LabelNormalText, PluginCom, ChartComponentS2, EditBarView, ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 },
@ -678,7 +680,8 @@ export default {
} }
} else { } else {
const colList = [...param.dimensionList, ...param.quotaList] const colList = [...param.dimensionList, ...param.quotaList]
const url = this.setIdValueTrans('id', 'value', jumpInfo.content, colList) let url = this.setIdValueTrans('id', 'value', jumpInfo.content, colList)
url = checkAddHttp(url)
window.open(url, jumpInfo.jumpType) window.open(url, jumpInfo.jumpType)
} }
} else { } else {

2
frontend/src/views/panel/LinkJumpSet/index.vue
View File

@ -236,7 +236,6 @@ import { queryPanelJumpInfo, queryWithViewId, updateJumpSet } from '@/api/panel/
import { groupTree } from '@/api/panel/panel' import { groupTree } from '@/api/panel/panel'
import { detailList } from '@/api/panel/panelView' import { detailList } from '@/api/panel/panelView'
import { mapState } from 'vuex' import { mapState } from 'vuex'
import { checkAddHttp } from '@/utils/urlUtils'
import draggable from 'vuedraggable' import draggable from 'vuedraggable'
import { codemirror } from 'vue-codemirror' import { codemirror } from 'vue-codemirror'
@ -397,7 +396,6 @@ export default {
}, },
save() { save() {
this.codemirrorShow = false this.codemirrorShow = false
this.linkJumpInfo.content = checkAddHttp(this.linkJumpInfo.content)
this.linkJumpInfoArray.forEach(jumpInfo => { this.linkJumpInfoArray.forEach(jumpInfo => {
jumpInfo.content = this.setNameIdTrans('sourceFieldName', 'sourceFieldId', jumpInfo.content) jumpInfo.content = this.setNameIdTrans('sourceFieldName', 'sourceFieldId', jumpInfo.content)
}) })