agilebuilder-ui 1.1.39 → 1.1.40-sit1

package/src/views/layout/components/Menubar/SidebarItem.vue

@@ -53,6 +53,7 @@ import { getI18nName } from "../../../../utils/menu";
 import tabJs from "../../../../api/tab";
 import { getSystemCode } from "../../../../utils/permissionAuth";
 import authApi from "../../../../utils/auth-api";
+import { getSystemFrontendUrl } from '../../../../utils/common-util';
 
 export default {
   name: "SidebarItem",
@@ -157,7 +158,22 @@ export default {
         toPathObj.query.customSystem = getSystemCode();
         toPathObj.query._menuCode = menu.code;
         toPathObj.query._menuName = getI18nName(menu);
-      } else {
+      } else if(menu.openWay && menu.openWay === 'NEW_PAGE_OPEN'){
+        // 新页签打开菜单时
+        routePath = menu.fullPath
+        if(routePath.indexOf('http:') < 0 && routePath.indexOf('https:') < 0){
+          // 表示不是全路径
+          let frontUrl = getSystemFrontendUrl(window.$vueApp.config.globalProperties.frontUrl)
+          if(frontUrl.lastIndexOf("/") < frontUrl.length -1 ){
+            // 表示最后不是斜线结尾的，需要添加斜线结尾
+            frontUrl = frontUrl + '/'
+          }
+          routePath = frontUrl + "#" + routePath
+        }
+        toPathObj.query = {}
+        toPathObj.query._menuCode = menu.code;
+        toPathObj.path=routePath
+      }else{
         routePath = menu.fullPath;
         if(!routePath) {
           routePath = ''
@@ -217,26 +233,30 @@ export default {
     clickMenu(toPathObj) {
       if (
         toPathObj.openWay &&
-        toPathObj.openWay === "NEW_PAGE_OPEN" &&
-        toPathObj.query
+        toPathObj.openWay === "NEW_PAGE_OPEN"
       ) {
         // 新页签打开菜单
-        let url = toPathObj.query.src;
-        if (url && url.indexOf("?") > 0) {
-          url += "&";
+        if(toPathObj.query && toPathObj.query.src){
+          let url = toPathObj.query.src;
+          if (url && url.indexOf("?") > 0) {
+            url += "&";
+          } else {
+            url += "?";
+          }
+          if (toPathObj.query.customSystem) {
+            url += "customSystem=" + toPathObj.query.customSystem;
+          }
+          if (toPathObj.query._menuCode) {
+            url += "_menuCode=" + toPathObj.query._menuCode;
+          }
+          if (toPathObj.query._menuCode) {
+            url += "_menuName=" + toPathObj.query._menuName;
+          }
+          window.open(url, toPathObj.query._menuCode)
         } else {
-          url += "?";
-        }
-        if (toPathObj.query.customSystem) {
-          url += "customSystem=" + toPathObj.query.customSystem;
-        }
-        if (toPathObj.query._menuCode) {
-          url += "_menuCode=" + toPathObj.query._menuCode;
-        }
-        if (toPathObj.query._menuCode) {
-          url += "_menuName=" + toPathObj.query._menuName;
+          const url = toPathObj.path;
+          window.open(url, toPathObj.query._menuCode)
         }
-        window.open(url, toPathObj.query._menuCode);
       } else {
         // 刷新页签打开菜单
         this.addTabs(