fix: bug#10954

This commit is contained in:
JiangQiming 2023-03-30 11:27:09 +08:00
parent d7790f203f
commit ceec8a65e3
3 changed files with 51 additions and 2 deletions

View File

@ -13,7 +13,7 @@ export const delApply_api = (id: string) => server.remove(`/application/${id}`)
// 获取组织列表 // 获取组织列表
export const getDepartmentList_api = (params: any) => server.get(`/organization/_all/tree`, params); export const getDepartmentList_api = (params: any) => server.get(`/organization/_all/tree`, params);
// 获取应用详情 // 获取应用详情
export const getAppInfo_api = (id: string) => server.get(`/application/${id}`); export const getAppInfo_api = (id: string) => server.get<any>(`/application/${id}`);
// 新增应用 // 新增应用
export const addApp_api = (data: object) => server.post(`/application`, data); export const addApp_api = (data: object) => server.post(`/application`, data);
// 更新应用 // 更新应用

View File

@ -265,7 +265,7 @@ const unBind = (id: string) => {
}; };
const clickBind = (id: string) => { const clickBind = (id: string) => {
window.open( window.open(
`${location.host}${BASE_API_PATH}/application/sso/${id}/login?autoCreateUser=false`, `${BASE_API_PATH}/application/sso/${id}/login?autoCreateUser=false`,
); );
localStorage.setItem('onBind', 'false'); localStorage.setItem('onBind', 'false');
localStorage.setItem('onLogin', 'yes'); localStorage.setItem('onLogin', 'yes');

View File

@ -0,0 +1,49 @@
<template>
<page-container>
<iframe
:src="iframeUrl"
frameBorder="0"
style="width: 100%; height: calc(100vh - 140px)"
></iframe>
</page-container>
</template>
<script setup lang="ts">
import { TOKEN_KEY } from '@/utils/variable';
import { LocalStore } from '@/utils/comm';
import { getAppInfo_api } from '@/api/system/apply';
const iframeUrl = ref<string>('');
const handle = async (appId: string, url: string) => {
const res = await getAppInfo_api(appId);
let menuUrl: any = url;
if (res.status === 200) {
// console.log(res.result);
if (res.result.page.routeType === 'hash') {
menuUrl = `${url}`;
}
if (res.result.provider === 'internal-standalone') {
//{baseUrl}/api/application/sso/{appId}/login?redirect={menuUrl}
const urlStandalone = `${res.result.page.baseUrl}/api/application/sso/${appId}/login?redirect=${menuUrl}?layout=false`;
iframeUrl.value = urlStandalone;
// console.log(urlStandalone);
} else if (res.result.provider === 'internal-integrated') {
const tokenUrl = `${
res.result.page.baseUrl
}?X-Access-Token=${LocalStore.get(TOKEN_KEY)}`;
iframeUrl.value = tokenUrl;
} else {
const urlOther = `${res.result.page.baseUrl}/${menuUrl}`;
iframeUrl.value = urlOther;
}
}
};
watchEffect(() => {
const params = location.pathname.split('/')?.[1];
const url = location.pathname.split('/').slice(2).join('/');
// console.log(params, url);
handle(params, url);
});
</script>