Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

Author: shizhong

src/store/modules/permission.js

@@ -58,23 +58,26 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
       icon: route.icon,
       noCache: !route.keepAlive,
     }
-    // 路由地址转首字母大写驼峰，作为路由名称，适配 keepAlive
-    route.name = toCamelCase(route.path, true)
-    // 处理三级及以上菜单路由缓存问题，将path名字赋值给name
-    if (route.path.indexOf("/") !== -1) {
-      const pathArr = route.path.split("/");
-      route.name = toCamelCase(pathArr[pathArr.length - 1], true)
-    }
     route.hidden = !route.visible
+    // 处理 name 属性
+    if (route.componentName && route.componentName.length > 0) {
+      route.name = route.componentName
+    } else {
+      // 路由地址转首字母大写驼峰，作为路由名称，适配 keepAlive
+      route.name = toCamelCase(route.path, true)
+      // 处理三级及以上菜单路由缓存问题，将 path 名字赋值给 name
+      if (route.path.indexOf("/") !== -1) {
+        const pathArr = route.path.split("/");
+        route.name = toCamelCase(pathArr[pathArr.length - 1], true)
+      }
+    }
     // 处理 component 属性
     if (route.children) { // 父节点
       if (route.parentId === 0) {
         route.component = Layout
       } else {
         route.component = ParentView
       }
-      // 解决只有一个菜单时无法显示目录
-      route.alwaysShow = true
     } else { // 根节点
       route.component = loadView(route.component)
     }
@@ -85,8 +88,10 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
     }
     if (route.children != null && route.children && route.children.length) {
       route.children = filterAsyncRouter(route.children, route, type)
+      route.alwaysShow = route.alwaysShow !== undefined ? route.alwaysShow  : true
     } else {
       delete route['children']
+      delete route['alwaysShow'] // 如果没有子菜单，就不需要考虑 alwaysShow 字段
     }
     return true
   })

src/views/infra/build/RightPanel.vue

@@ -554,7 +554,7 @@
               default-expand-all
               draggable
             >
-              <span>
+              <span slot-scope="{ node, data }">
                 <span class="node-label">
                   <svg-icon class="node-icon" :icon-class="data.__config__?data.__config__.tagIcon:data.tagIcon" />
                   {{ node.label }}

src/views/mp/account/index.vue

@@ -132,7 +132,7 @@ import {
 } from '@/api/mp/account'
 
 export default {
-  name: 'mpAccount',
+  name: 'MpAccount',
   components: {},
   data() {
     return {

src/views/mp/autoReply/index.vue

@@ -162,7 +162,7 @@ import { getSimpleAccounts } from "@/api/mp/account";
 import { createAutoReply, deleteAutoReply, getAutoReply, getAutoReplyPage, updateAutoReply } from "@/api/mp/autoReply";
 
 export default {
-  name: 'mpAutoReply',
+  name: 'MpAutoReply',
   components: {
     WxVideoPlayer,
     WxVoicePlayer,

src/views/mp/draft/index.vue

@@ -167,7 +167,7 @@ import { getSimpleAccounts } from "@/api/mp/account";
 import {deleteFreePublish, submitFreePublish} from "@/api/mp/freePublish";
 
 export default {
-  name: 'mpDraft',
+  name: 'MpDraft',
   components: {
     WxEditor,
     WxNews,

src/views/mp/freePublish/index.vue

@@ -64,7 +64,7 @@ import { getSimpleAccounts } from "@/api/mp/account";
 import WxNews from '@/views/mp/components/wx-news/main.vue';
 
 export default {
-  name: 'mpDraft',
+  name: 'MpFreePublish',
   components: {
     WxNews
   },

src/views/mp/material/index.vue

@@ -178,7 +178,7 @@ import { getMaterialPage, deletePermanentMaterial } from "@/api/mp/material";
 import { getAccessToken } from '@/utils/auth'
 
 export default {
-  name: 'mpMaterial',
+  name: 'MpMaterial',
   components: {
     WxVoicePlayer,
     WxVideoPlayer

src/views/mp/menu/index.vue

@@ -157,7 +157,7 @@ import { deleteMenu, getMenuList, saveMenu } from "@/api/mp/menu";
 import { getSimpleAccounts } from "@/api/mp/account";
 
 export default {
-  name: 'mpMenu',
+  name: 'MpMenu',
   components: {
       WxReplySelect,
       WxNews,

src/views/mp/mpuser/index.vue

@@ -95,7 +95,7 @@ import { getSimpleAccounts } from "@/api/mp/account";
 import { getSimpleTags } from "@/api/mp/tag";
 
 export default {
-  name: "WxAccountFans",
+  name: "MpUser",
   components: {
   },
   data() {

src/views/mp/statistics/index.vue

@@ -82,7 +82,7 @@ import {addTime, beginOfDay, betweenDay, endOfDay, formatDate} from "@/utils/dat
 import { getSimpleAccounts } from "@/api/mp/account";
 
 export default {
-  name: 'mpStatistics',
+  name: 'MpStatistics',
   data() {
     return {
       date : [beginOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)), // -7 天