gw-gis-standard-global-vue3 1.1.74 → 1.1.76

package/gw-gis-standard-global.js

@@ -1011,12 +1011,12 @@ var gisGlobal = /*#__PURE__*/function () {
           // getRouters.homePageMsg.meta.visible = false
         }
         if (this.isTypeInArray(routerList, 'string')) {
-          // 侧边栏
+          // 导航栏
           if (getRouters.topMenuList.length > 0) {
-            filterRolesRouterFn2(getRouters.topMenuList, routerList, menuFilterKey);
+            filterRolesRouterFn2(getRouters.topMenuList, routerList, menuFilterKey, 'top');
           }
-          // 导航栏
-          filterRolesRouterFn2(getRouters.getRouters, routerList, menuFilterKey);
+          // 侧边栏
+          filterRolesRouterFn2(getRouters.getRouters, routerList, menuFilterKey, 'side');
         }
         if (homePathCode) {
           // 去掉首页重定向方便自定义
@@ -2912,19 +2912,57 @@ var GisPermission = /*#__PURE__*/function () {
                   var findRoute = to.matched.find(function (item) {
                     return item.path === '/' + firstPath;
                   });
+                  if (!findRoute) {
+                    findRoute = lastRouteMsg;
+                  }
                   if (findRoute) {
-                    var findRouteMsg = recursionRouteFn(findRoute.children);
-                    // console.log('findRouteMsgfindRouteMsg', findRouteMsg)
+                    var findRouteMsg;
+                    if (findRoute.children.length > 0) {
+                      findRouteMsg = recursionRouteFn(findRoute.children);
+                    } else {
+                      findRouteMsg = lastRouteMsg;
+                    }
                     if (findRouteMsg) {
-                      var _findRouteMsg$meta;
-                      if (!(findRouteMsg !== null && findRouteMsg !== void 0 && (_findRouteMsg$meta = findRouteMsg.meta) !== null && _findRouteMsg$meta !== void 0 && _findRouteMsg$meta.visible)) {
+                      var _findRouteMsg, _findRouteMsg4, _findRouteMsg5;
+                      // 进入首页 如果配置的首页该用户无法访问，则跳转到第一个显示的页面
+                      if ((_findRouteMsg = findRouteMsg) !== null && _findRouteMsg !== void 0 && (_findRouteMsg = _findRouteMsg.meta) !== null && _findRouteMsg !== void 0 && _findRouteMsg.isHomePage || to.redirectedFrom && to.redirectedFrom.path === "/" || to.redirectedFrom && to.redirectedFrom.fullPath === "/" || to.path === "/") {
+                        var _to$meta, _to$meta2, _findRouteMsg2, _findRouteMsg3, _lastRouteMsg$meta, _lastRouteMsg$meta2;
+                        if (to !== null && to !== void 0 && (_to$meta = to.meta) !== null && _to$meta !== void 0 && _to$meta.hasOwnProperty('visible') && !(to !== null && to !== void 0 && (_to$meta2 = to.meta) !== null && _to$meta2 !== void 0 && _to$meta2.visible) || (_findRouteMsg2 = findRouteMsg) !== null && _findRouteMsg2 !== void 0 && (_findRouteMsg2 = _findRouteMsg2.meta) !== null && _findRouteMsg2 !== void 0 && _findRouteMsg2.hasOwnProperty('visible') && !((_findRouteMsg3 = findRouteMsg) !== null && _findRouteMsg3 !== void 0 && (_findRouteMsg3 = _findRouteMsg3.meta) !== null && _findRouteMsg3 !== void 0 && _findRouteMsg3.visible) || lastRouteMsg !== null && lastRouteMsg !== void 0 && (_lastRouteMsg$meta = lastRouteMsg.meta) !== null && _lastRouteMsg$meta !== void 0 && _lastRouteMsg$meta.hasOwnProperty('visible') && !(lastRouteMsg !== null && lastRouteMsg !== void 0 && (_lastRouteMsg$meta2 = lastRouteMsg.meta) !== null && _lastRouteMsg$meta2 !== void 0 && _lastRouteMsg$meta2.visible)) {
+                          var hasShowHomePage = undefined;
+                          for (var i = 0; i < to.matched[0].children.length; i++) {
+                            if (!to.matched[0].children[i].meta.hasOwnProperty('visible') || to.matched[0].children[i].meta.visible) {
+                              hasShowHomePage = recursionRouteFn(to.matched[0].children[i].children);
+                              if (hasShowHomePage) {
+                                break;
+                              }
+                            }
+                          }
+                          if (hasShowHomePage) {
+                            var _hasShowHomePage;
+                            getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU);
+                            next({
+                              path: hasShowHomePage.path,
+                              query: (_hasShowHomePage = hasShowHomePage) === null || _hasShowHomePage === void 0 || (_hasShowHomePage = _hasShowHomePage.meta) === null || _hasShowHomePage === void 0 ? void 0 : _hasShowHomePage.query
+                            });
+                          }
+                        }
+                      } else if ((_findRouteMsg4 = findRouteMsg) !== null && _findRouteMsg4 !== void 0 && (_findRouteMsg4 = _findRouteMsg4.meta) !== null && _findRouteMsg4 !== void 0 && _findRouteMsg4.hasOwnProperty('visible') && !((_findRouteMsg5 = findRouteMsg) !== null && _findRouteMsg5 !== void 0 && (_findRouteMsg5 = _findRouteMsg5.meta) !== null && _findRouteMsg5 !== void 0 && _findRouteMsg5.visible)) {
+                        getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU);
+                        next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN);
+                      } else if (from.path === findRouteMsg.path) {
+                        getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU);
                         next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN);
                       } else {
-                        var _findRouteMsg$meta2;
-                        next({
-                          path: findRouteMsg.path,
-                          query: findRouteMsg === null || findRouteMsg === void 0 || (_findRouteMsg$meta2 = findRouteMsg.meta) === null || _findRouteMsg$meta2 === void 0 ? void 0 : _findRouteMsg$meta2.query
-                        });
+                        var _to$meta3;
+                        if ((_to$meta3 = to.meta) !== null && _to$meta3 !== void 0 && _to$meta3.hasOwnProperty('visible') && !to.meta.visible) {
+                          next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN);
+                        } else {
+                          var _findRouteMsg6;
+                          next({
+                            path: findRouteMsg.path,
+                            query: (_findRouteMsg6 = findRouteMsg) === null || _findRouteMsg6 === void 0 || (_findRouteMsg6 = _findRouteMsg6.meta) === null || _findRouteMsg6 === void 0 ? void 0 : _findRouteMsg6.query
+                          });
+                        }
                       }
                     } else {
                       next(constType.NO_IN_LAYOUT_MSG.ERROR);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gw-gis-standard-global-vue3",
-  "version": "1.1.74",
+  "version": "1.1.76",
   "description": "gw js 库",
   "main": "gw-gis-standard-global.js",
   "scripts": {