外部url菜单，内部打开是，也支持通过 ${token}方式传递当前登录TOKEN

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;
+          //-----------------------------------------------------------------------------------------
-          /*update_begin author:wuxianquan date:20190908 for:判断打开方式，新窗口打开时this.$route.meta.internalOrExternal==true */
+          //url支持通过 ${token}方式传递当前登录TOKEN
-          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);
           }
+          //-----------------------------------------------------------------------------------------
+
+          /*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();
             window.open(this.url);
           }
           /*update_end author:wuxianquan date:20190908 for:判断打开方式，新窗口打开时this.$route.meta.internalOrExternal==true */