Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -160,6 +160,7 @@ public class SysMenuServiceImpl implements ISysMenuService
             }
             else if (isMenuFrame(menu))
             {
+                router.setMeta(null);
                 List<RouterVo> childrenList = new ArrayList<RouterVo>();
                 RouterVo children = new RouterVo();
                 children.setPath(menu.getPath());

ruoyi-ui/src/components/TopNav/index.vue

@@ -73,8 +73,10 @@ export default {
             if(router.path === "/") {
               router.children[item].path = "/redirect/" + router.children[item].path;
             } else {
+			  if(!this.ishttp(router.children[item].path)) {
                 router.children[item].path = router.path + "/" + router.children[item].path;
 			  }
+            }
             router.children[item].parentPath = router.path;
           }
           childrenMenus.push(router.children[item]);
@@ -122,7 +124,7 @@ export default {
     // 菜单选择事件
     handleSelect(key, keyPath) {
       this.currentIndex = key;
-      if (key.indexOf("http://") !== -1 || key.indexOf("https://") !== -1) {
+      if (this.ishttp(key)) {
         // http(s):// 路径新窗口打开
         window.open(key, "_blank");
       } else if (key.indexOf("/redirect") !== -1) {
@@ -147,6 +149,9 @@ export default {
         this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
       }
       return routes;
+    },
+	ishttp(url) {
+      return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
     }
   },
 };