Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support open external link #440

Merged
merged 1 commit into from
Nov 8, 2021
Merged

Support open external link #440

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions web/src/apps/workflows/view/workflow/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
</template>
</template>
<template v-else>
<!-- 其他应用流程 -->
<!-- 其他应用流程 -->
<iframe id="iframe" :src="srcUrl" frameborder="0" width="100%" height="100%"></iframe>
</template>
</WorkflowTabList>
<ProjectForm
Expand Down Expand Up @@ -85,6 +86,7 @@ import MakeUp from '@/apps/workflows/module/makeUp'
import ProjectForm from '@/components/projectForm/index.js'
import api from '@/common/service/api';
import mixin from '@/common/service/mixin';
import util from '@/common/util/index.js';
import commonModule from "@/apps/workflows/module/common";
import { DEVPROCESS, ORCHESTRATORMODES } from '@/common/config/const.js';
import { GetDicSecondList, GetAreaMap } from '@/common/service/apiCommonMethod.js';
Expand Down Expand Up @@ -154,6 +156,19 @@ export default {
}
}
},
computed: {
srcUrl() {
const url = ''
const found = this.selectDevprocess.find((item) => this.modeOfKey === item.dicValue)
if (found) {
const {projectName, projectId} = this.$route.query
const workspaceId = this.getCurrentWorkspaceId()
const workspaceName = this.getCurrentWorkspaceName()
url = util.replaceHolder(found.url, { workspaceId, workspaceName, projectId, projectName })
}
return url
}
},
created() {
this.getAreaMap();
this.getDicSecondList();
Expand All @@ -180,7 +195,7 @@ export default {
},
// 获取当前选择的开发流程
getSelectDevProcess() {
this.selectDevprocess = this.devProcessBase ? this.devProcessBase.filter((item) => this.currentProjectData.devProcessList.includes(item.dicValue)) : []
this.selectDevprocess = this.devProcessBase || []
},
// 获取编排列表
getSelectOrchestratorList() {
Expand Down