diff --git a/ant-design-vue-jeecg/src/components/layouts/IframePageView.vue b/ant-design-vue-jeecg/src/components/layouts/IframePageView.vue index 504344232e12a202aa8362f6d47e60d7d369856a..dee1ddd9fb114038e163f30ae1a8cad1e637d563 100644 --- a/ant-design-vue-jeecg/src/components/layouts/IframePageView.vue +++ b/ant-design-vue-jeecg/src/components/layouts/IframePageView.vue @@ -38,16 +38,18 @@ //url = "http://www.baidu.com" console.log("------url------"+url) if (url !== null && url !== undefined) { - this.url = url; + //----------------------------------------------------------------------------------------- + //url支持通过 ${token}方式传递当前登录TOKEN + let tokenStr = "${token}"; + if(url.indexOf(tokenStr)!=-1) { + let token = Vue.ls.get(ACCESS_TOKEN); + this.url = url.replace(tokenStr, token); + } + //----------------------------------------------------------------------------------------- + /*update_begin author:wuxianquan date:20190908 for:判断打开方式,新窗口打开时this.$route.meta.internalOrExternal==true */ if(this.$route.meta.internalOrExternal != undefined && this.$route.meta.internalOrExternal==true){ this.closeCurrent(); - //外部url加入token - let tokenStr = "${token}"; - if(url.indexOf(tokenStr)!=-1){ - let token = Vue.ls.get(ACCESS_TOKEN); - this.url = url.replace(tokenStr,token); - } window.open(this.url); } /*update_end author:wuxianquan date:20190908 for:判断打开方式,新窗口打开时this.$route.meta.internalOrExternal==true */