agilebuilder-ui 1.1.38 → 1.1.39-sit2

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

@@ -8,6 +8,7 @@
           :class="{ 'submenu-title-noDropdown': !isNest }"
         >
           <item
+            :menu-layer="item.layer"
             :icon="item.iconName"
             :title="getI18nName(item)"
             :is-root="true"
@@ -19,6 +20,7 @@
     <el-sub-menu v-else :index="item.code + '~~' + item.i18nValue" class="smb-sidebar-menu-item">
       <template v-slot:title>
         <item
+          :menu-layer="item.layer"
           :icon="item.iconName"
           :title="getI18nName(item)"
           :has-children="item.children.length > 0 ? true : false"
@@ -35,7 +37,7 @@
         />
         <app-link :key="child.code" v-else :to="toPath(child)" @click="clickMenu(toPath(child))">
           <el-menu-item :index="child.code + '~~' + child.i18nValue" class="smb-sidebar-menu-item">
-            <item :backlog-total="backlogTotal" :code="child.code" :icon="child.iconName" :title="getI18nName(child)" />
+            <item :menu-layer="child.layer" :backlog-total="backlogTotal" :code="child.code" :icon="child.iconName" :title="getI18nName(child)" />
           </el-menu-item>
         </app-link>
       </template>
@@ -51,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",
@@ -155,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 = ''
@@ -215,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;
+          const url = toPathObj.path;
+          window.open(url, toPathObj.query._menuCode)
         }
-        if (toPathObj.query._menuCode) {
-          url += "_menuName=" + toPathObj.query._menuName;
-        }
-        window.open(url, toPathObj.query._menuCode);
       } else {
         // 刷新页签打开菜单
         this.addTabs(
@@ -275,6 +297,9 @@ export default {
     width: var(--admin-layout-left-menu-collapse, 54px);
     font-size: 16px;
   }
+  :deep(.smb-sidebar-menu-item-no-icon) {
+    width: 20px;
+  }
   :deep(.smb-sidebar-menu-item-title) {
     flex: 0 0 calc(100% - var(--admin-layout-left-menu-collapse, 54px) - 35px);
     overflow: hidden;
@@ -288,5 +313,8 @@ export default {
       text-overflow: ellipsis;
     }
   }
+  :deep(.smb-sidebar-menu-item-no-icon-title) {
+    flex: 0 0 calc(100% - 20px - 20px);
+  }
 }
 </style>

package/vite.config.js

@@ -12,8 +12,7 @@ export default defineConfig(({ mode }) => ({
     terser({
       compress: {
         drop_debugger: ['production'].includes(mode),
-        // drop_console: ['production'].includes(mode),
-        pure_funcs: ['production'].includes(mode) ? ['console.log', 'console.info', 'console.warn', 'console.debug'] : [],
+        // pure_funcs: ['production'].includes(mode) ? ['console.log', 'console.info', 'console.warn', 'console.debug'] : [],
       },
       output: {
         // 对于console.error，不做任何处理