gw-gis-standard-global-vue3 1.1.78 → 1.1.80

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/gw-gis-standard-global.js +211 -101
  2. package/package.json +1 -1
package/gw-gis-standard-global.js CHANGED
@@ -1418,32 +1418,42 @@ function filterRolesRouterFn2(routerList) {
1418
1418
  for (var i = 0; i < routerList.length; i++) {
1419
1419
  if (routerList[i].path && routerList[i].meta) {
1420
1420
  if (list.length > 0) {
1421
- if (!list.includes(routerList[i].meta[menuFilterKey]) && !routerList[i].meta.notInLayout) {
1422
- // 是为了记录角色隐藏了哪些菜单
1423
- if (routerList[i].meta.hasOwnProperty('visible')) {
1424
- if (routerList[i].meta.visible) {
1425
- routerList[i].meta.GwRoleSet = true;
1426
- routerList[i].meta.visible = false;
1427
- } else {
1428
- routerList[i].meta.GwRoleSet = false;
1429
- }
1421
+ // if (!routerList[i].meta.notInLayout && !list.includes(routerList[i].meta[menuFilterKey])) {
1422
+ if (!routerList[i].meta.notInLayout) {
1423
+ if (list.includes(routerList[i].meta[menuFilterKey])) {
1424
+ routerList[i].meta.gisInfoSetShowRole = true;
1430
1425
  } else {
1426
+ routerList[i].meta.gisInfoSetHideRole = true;
1431
1427
  routerList[i].meta.visible = false;
1432
- routerList[i].meta.GwRoleSet = true;
1433
1428
  }
1429
+
1430
+ // 是为了记录角色隐藏了哪些菜单
1431
+ // if (routerList[i].meta.hasOwnProperty('visible')) {
1432
+ // if (routerList[i].meta.visible) {
1433
+ // routerList[i].meta.gisInfoSetHideRole = true
1434
+ // routerList[i].meta.visible = false
1435
+ // } else {
1436
+ // routerList[i].meta.gisInfoSetHideRole = false
1437
+ // }
1438
+ // } else {
1439
+ // routerList[i].meta.visible = false
1440
+ // routerList[i].meta.gisInfoSetHideRole = true
1441
+ // }
1434
1442
  }
1435
1443
  } else {
1444
+ // 为空则全部隐藏
1436
1445
  if (!routerList[i].meta.notInLayout) {
1437
- routerList[i].meta.GwRoleSet = true;
1438
- if (routerList[i].meta.hasOwnProperty('visible')) {
1439
- // 是为了记录角色隐藏了哪些菜单
1440
- if (!routerList[i].meta.visible) {
1441
- routerList[i].meta.GwRoleSet = false;
1442
- }
1443
- routerList[i].meta.visible = false;
1444
- } else {
1445
- routerList[i].meta.visible = false;
1446
- }
1446
+ routerList[i].meta.gisInfoSetHideRole = true;
1447
+ routerList[i].meta.visible = false;
1448
+ // if (routerList[i].meta.hasOwnProperty('visible')) {
1449
+ // // 是为了记录角色隐藏了哪些菜单
1450
+ // if (!routerList[i].meta.visible) {
1451
+ // routerList[i].meta.gisInfoSetHideRole = false
1452
+ // }
1453
+ // routerList[i].meta.visible = false
1454
+ // } else {
1455
+ // routerList[i].meta.visible = false
1456
+ // }
1447
1457
  // 清空文件
1448
1458
  }
1449
1459
  }
@@ -1456,9 +1466,9 @@ function filterRolesRouterFn2(routerList) {
1456
1466
  function _resetRouterListFn(routerList, list) {
1457
1467
  for (var i = 0; i < routerList.length; i++) {
1458
1468
  if (routerList[i].path) {
1459
- if (routerList[i].meta.GwRoleSet) {
1469
+ if (routerList[i].meta.gisInfoSetHideRole) {
1460
1470
  routerList[i].meta.visible = true;
1461
- delete routerList[i].meta.GwRoleSet;
1471
+ delete routerList[i].meta.gisInfoSetHideRole;
1462
1472
  }
1463
1473
  }
1464
1474
  if (routerList[i].children && routerList[i].children.length > 0) {
@@ -2788,17 +2798,16 @@ var GisPermission = /*#__PURE__*/function () {
2788
2798
  // const {getRouteTagsListFn, isHideNeedCache, removeIncludeListFn, routeTagsList} = gisRouteTags()
2789
2799
  // window.gisRouteTags = gisRouteTags()
2790
2800
  this.router.beforeEach(function (to, from, next) {
2791
- var _window$top;
2792
2801
  // 当前路由和跳转一样时则不跳转
2793
2802
  // if (this.router?.currentRoute && to.path === this.router?.currentRoute?.value?.path) {
2794
2803
  // return
2795
2804
  // }
2796
2805
  // console.log('【to-router-from】', from)
2797
2806
  // 仅供测试
2798
- if ((_window$top = window.top) !== null && _window$top !== void 0 && _window$top._showRouteTo) {
2799
- console.log('【router-from】', from);
2800
- console.log('【router-to】', to);
2801
- }
2807
+ // if (window.top?._showRouteTo) {
2808
+ console.log('【router-from】', from);
2809
+ console.log('【router-to】', to);
2810
+ // }
2802
2811
  // 缓存当前临时路由 - 会初次加载路由接口无需缓存
2803
2812
  // cacheCurrentTempRouteFn(to)
2804
2813
  // 这是判断路由变化后是否需要缓存
@@ -2901,88 +2910,189 @@ var GisPermission = /*#__PURE__*/function () {
2901
2910
 
2902
2911
  // 判断如果导航栏重定向的子菜单是，根据权限而隐藏的 ，则将菜单在该菜单数组中找到能显示的第一个页面 并跳转（找不到，不跳转）,
2903
2912
  // 注意：权限不足，直接跳转403
2913
+ // if (to.matched.length > 0) {
2914
+ // // const lastRouteMsg = to.matched.at(-1)
2915
+ // const lastRouteMsg = to
2916
+ // if (lastRouteMsg.meta.gisInfoSetHideRole && !lastRouteMsg.meta.visible) {
2917
+ // // 找整个模块第一个显示的页面
2918
+ // if (to.path) {
2919
+ // const firstPath = (to.path.split('/').length > 0 && to.path.split('/')[1]) || undefined
2920
+ // if (firstPath) {
2921
+ // if (to.matched && to.matched.length > 0) {
2922
+ // let findRoute = to.matched.find(item => item.path === ('/' + firstPath))
2923
+ // if (!findRoute) {
2924
+ // findRoute = lastRouteMsg
2925
+ // }
2926
+ // if (findRoute) {
2927
+ // let findRouteMsg
2928
+ // if (findRoute?.children?.length > 0) {
2929
+ // findRouteMsg = recursionRouteFn(findRoute.children)
2930
+ // } else {
2931
+ // findRouteMsg = lastRouteMsg
2932
+ // }
2933
+ // if (findRouteMsg) {
2934
+ // // 进入首页 如果配置的首页该用户无法访问，则跳转到第一个显示的页面
2935
+ // if ((findRouteMsg?.meta?.isHomePage && (findRouteMsg.meta.visible || !findRouteMsg.meta.hasOwnProperty('visible')))
2936
+ // || (to.redirectedFrom && to.redirectedFrom.path === "/")
2937
+ // || (to.redirectedFrom && to.redirectedFrom.fullPath === "/") || to.path === "/") {
2938
+ // if ((to?.meta?.hasOwnProperty('visible') && !to?.meta?.visible)
2939
+ // || (findRouteMsg?.meta?.hasOwnProperty('visible') && !findRouteMsg?.meta?.visible)
2940
+ // || (lastRouteMsg?.meta?.hasOwnProperty('visible') && !lastRouteMsg?.meta?.visible)) {
2941
+ // let hasShowHomePage = undefined
2942
+ // for (let i = 0; i < to.matched[0].children.length; i++) {
2943
+ // if (!to.matched[0].children[i].meta.hasOwnProperty('visible') || to.matched[0].children[i].meta.visible) {
2944
+ // hasShowHomePage = recursionRouteFn(to.matched[0].children[i].children)
2945
+ // if (hasShowHomePage) {
2946
+ // break;
2947
+ // }
2948
+ // }
2949
+ // }
2950
+ // if (hasShowHomePage) {
2951
+ // getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU)
2952
+ // next({
2953
+ // path: hasShowHomePage.path,
2954
+ // query: hasShowHomePage?.meta?.query
2955
+ // })
2956
+ // }
2957
+ // }
2958
+ // } else if (findRouteMsg?.meta?.hasOwnProperty('visible') && !findRouteMsg?.meta?.visible) {
2959
+ // getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU)
2960
+ // next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN)
2961
+ // } else if (from.path === findRouteMsg.path) {
2962
+ // getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU)
2963
+ // next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN)
2964
+ // } else {
2965
+ // if (to.meta?.hasOwnProperty('visible') && !to.meta.visible) {
2966
+ // next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN)
2967
+ // } else {
2968
+ // next({
2969
+ // path: findRouteMsg.path,
2970
+ // query: findRouteMsg?.meta?.query
2971
+ // })
2972
+ // }
2973
+ // }
2974
+ // } else {
2975
+ // next(constType.NO_IN_LAYOUT_MSG.ERROR)
2976
+ // }
2977
+ // }
2978
+ // }
2979
+ // }
2980
+ // }
2981
+ // }
2982
+ // }
2983
+ // -----------------------------
2904
2984
  if (to.matched.length > 0) {
2985
+ var _to$meta, _to$redirectedFrom, _to$meta2, _lastRouteMsg$meta;
2905
2986
  var lastRouteMsg = to.matched.at(-1);
2906
- lastRouteMsg.meta = _objectSpread2(_objectSpread2({}, to.meta), lastRouteMsg.meta);
2907
- if (lastRouteMsg.meta.GwRoleSet && !lastRouteMsg.meta.visible) {
2908
- // 找整个模块第一个显示的页面
2909
- if (to.path) {
2910
- var firstPath = to.path.split('/').length > 0 && to.path.split('/')[1] || undefined;
2911
- if (firstPath) {
2912
- if (to.matched && to.matched.length > 0) {
2913
- var findRoute = to.matched.find(function (item) {
2914
- return item.path === '/' + firstPath;
2915
- });
2916
- if (!findRoute) {
2917
- findRoute = lastRouteMsg;
2918
- }
2919
- if (findRoute) {
2920
- var findRouteMsg;
2921
- if (findRoute.children.length > 0) {
2922
- findRouteMsg = recursionRouteFn(findRoute.children);
2923
- } else {
2924
- findRouteMsg = lastRouteMsg;
2925
- }
2926
- if (findRouteMsg) {
2927
- var _findRouteMsg, _findRouteMsg4, _findRouteMsg5;
2928
- // 进入首页 如果配置的首页该用户无法访问，则跳转到第一个显示的页面
2929
- if ((_findRouteMsg = findRouteMsg) !== null && _findRouteMsg !== void 0 && (_findRouteMsg = _findRouteMsg.meta) !== null && _findRouteMsg !== void 0 && _findRouteMsg.isHomePage && (findRouteMsg.meta.visible || !findRouteMsg.meta.hasOwnProperty('visible')) || to.redirectedFrom && to.redirectedFrom.path === "/" || to.redirectedFrom && to.redirectedFrom.fullPath === "/" || to.path === "/") {
2930
- var _to$meta, _to$meta2, _findRouteMsg2, _findRouteMsg3, _lastRouteMsg$meta, _lastRouteMsg$meta2;
2931
- 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)) {
2932
- var hasShowHomePage = undefined;
2933
- for (var i = 0; i < to.matched[0].children.length; i++) {
2934
- if (!to.matched[0].children[i].meta.hasOwnProperty('visible') || to.matched[0].children[i].meta.visible) {
2935
- hasShowHomePage = recursionRouteFn(to.matched[0].children[i].children);
2936
- if (hasShowHomePage) {
2937
- break;
2938
- }
2939
- }
2940
- }
2941
- if (hasShowHomePage) {
2942
- var _hasShowHomePage;
2943
- getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU);
2944
- next({
2945
- path: hasShowHomePage.path,
2946
- query: (_hasShowHomePage = hasShowHomePage) === null || _hasShowHomePage === void 0 || (_hasShowHomePage = _hasShowHomePage.meta) === null || _hasShowHomePage === void 0 ? void 0 : _hasShowHomePage.query
2947
- });
2948
- }
2949
- }
2950
- } 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)) {
2951
- getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU);
2952
- next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN);
2953
- } else if (from.path === findRouteMsg.path) {
2954
- getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU);
2955
- next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN);
2956
- } else {
2957
- var _to$meta3;
2958
- if ((_to$meta3 = to.meta) !== null && _to$meta3 !== void 0 && _to$meta3.hasOwnProperty('visible') && !to.meta.visible) {
2959
- next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN);
2960
- } else {
2961
- var _findRouteMsg6;
2962
- next({
2963
- path: findRouteMsg.path,
2964
- query: (_findRouteMsg6 = findRouteMsg) === null || _findRouteMsg6 === void 0 || (_findRouteMsg6 = _findRouteMsg6.meta) === null || _findRouteMsg6 === void 0 ? void 0 : _findRouteMsg6.query
2965
- });
2966
- }
2967
- }
2968
- } else {
2969
- next(constType.NO_IN_LAYOUT_MSG.ERROR);
2970
- }
2971
- }
2987
+ // const lastRouteMsg = to
2988
+ console.log('lastRouteMsglastRouteMsg', lastRouteMsg);
2989
+ // 进入主页，主页如果已被隐藏则进去第一个显示的页面
2990
+ if ((_to$meta = to.meta) !== null && _to$meta !== void 0 && _to$meta.isHomePage && (to === null || to === void 0 || (_to$redirectedFrom = to.redirectedFrom) === null || _to$redirectedFrom === void 0 ? void 0 : _to$redirectedFrom.path) === '/') {
2991
+ var hasShowHomePage = undefined;
2992
+ for (var i = 0; i < to.matched[0].children.length; i++) {
2993
+ if (!to.matched[0].children[i].meta.hasOwnProperty('visible') || to.matched[0].children[i].meta.visible) {
2994
+ hasShowHomePage = recursionRouteFn(to.matched[0].children[i].children);
2995
+ if (hasShowHomePage) {
2996
+ break;
2972
2997
  }
2973
2998
  }
2974
2999
  }
3000
+ console.log('hasShowHomePage', hasShowHomePage);
3001
+ if (hasShowHomePage) {
3002
+ var _hasShowHomePage;
3003
+ getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU);
3004
+ next({
3005
+ path: hasShowHomePage.path,
3006
+ query: (_hasShowHomePage = hasShowHomePage) === null || _hasShowHomePage === void 0 || (_hasShowHomePage = _hasShowHomePage.meta) === null || _hasShowHomePage === void 0 ? void 0 : _hasShowHomePage.query
3007
+ });
3008
+ }
3009
+ } else if ((_to$meta2 = to.meta) !== null && _to$meta2 !== void 0 && _to$meta2.gisInfoSetHideRole && to.meta.hasOwnProperty('visible') && !to.meta.visible) {
3010
+ // if (lastRouteMsg?.meta?.gisInfoSetHideRole && lastRouteMsg?.meta.hasOwnProperty('visible') && !lastRouteMsg.meta.visible) {
3011
+ getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU);
3012
+ next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN);
3013
+ // }
3014
+ } else if ((_lastRouteMsg$meta = lastRouteMsg.meta) !== null && _lastRouteMsg$meta !== void 0 && _lastRouteMsg$meta.gisInfoSetHideRole && lastRouteMsg.meta.hasOwnProperty('visible') && !lastRouteMsg.meta.visible) {
3015
+ getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU);
3016
+ next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN);
2975
3017
  }
3018
+
3019
+ // if (lastRouteMsg.meta.gisInfoSetHideRole && !lastRouteMsg.meta.visible) {
3020
+ // // 找整个模块第一个显示的页面
3021
+ // if (to.path) {
3022
+ // const firstPath = (to.path.split('/').length > 0 && to.path.split('/')[1]) || undefined
3023
+ // if (firstPath) {
3024
+ // if (to.matched && to.matched.length > 0) {
3025
+ // let findRoute = to.matched.find(item => item.path === ('/' + firstPath))
3026
+ // if (!findRoute) {
3027
+ // findRoute = lastRouteMsg
3028
+ // }
3029
+ // if (findRoute) {
3030
+ // let findRouteMsg
3031
+ // if (findRoute?.children?.length > 0) {
3032
+ // findRouteMsg = recursionRouteFn(findRoute.children)
3033
+ // } else {
3034
+ // findRouteMsg = lastRouteMsg
3035
+ // }
3036
+ // if (findRouteMsg) {
3037
+ // // 进入首页 如果配置的首页该用户无法访问，则跳转到第一个显示的页面
3038
+ // if ((findRouteMsg?.meta?.isHomePage && (findRouteMsg.meta.visible || !findRouteMsg.meta.hasOwnProperty('visible')))
3039
+ // || (to.redirectedFrom && to.redirectedFrom.path === "/")
3040
+ // || (to.redirectedFrom && to.redirectedFrom.fullPath === "/") || to.path === "/") {
3041
+ // if ((to?.meta?.hasOwnProperty('visible') && !to?.meta?.visible)
3042
+ // || (findRouteMsg?.meta?.hasOwnProperty('visible') && !findRouteMsg?.meta?.visible)
3043
+ // || (lastRouteMsg?.meta?.hasOwnProperty('visible') && !lastRouteMsg?.meta?.visible)) {
3044
+ // let hasShowHomePage = undefined
3045
+ // for (let i = 0; i < to.matched[0].children.length; i++) {
3046
+ // if (!to.matched[0].children[i].meta.hasOwnProperty('visible') || to.matched[0].children[i].meta.visible) {
3047
+ // hasShowHomePage = recursionRouteFn(to.matched[0].children[i].children)
3048
+ // if (hasShowHomePage) {
3049
+ // break;
3050
+ // }
3051
+ // }
3052
+ // }
3053
+ // if (hasShowHomePage) {
3054
+ // getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU)
3055
+ // next({
3056
+ // path: hasShowHomePage.path,
3057
+ // query: hasShowHomePage?.meta?.query
3058
+ // })
3059
+ // }
3060
+ // }
3061
+ // } else if (findRouteMsg?.meta?.hasOwnProperty('visible') && !findRouteMsg?.meta?.visible) {
3062
+ // getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU)
3063
+ // next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN)
3064
+ // } else if (from.path === findRouteMsg.path) {
3065
+ // getCache(constType.SESSION_STORAGE).remove(constType.TOP_MENU)
3066
+ // next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN)
3067
+ // } else {
3068
+ // if (to.meta?.hasOwnProperty('visible') && !to.meta.visible) {
3069
+ // next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN)
3070
+ // } else {
3071
+ // next({
3072
+ // path: findRouteMsg.path,
3073
+ // query: findRouteMsg?.meta?.query
3074
+ // })
3075
+ // }
3076
+ // }
3077
+ // } else {
3078
+ // next(constType.NO_IN_LAYOUT_MSG.ERROR)
3079
+ // }
3080
+ // }
3081
+ // }
3082
+ // }
3083
+ // }
3084
+ // }
2976
3085
  }
3086
+
2977
3087
  // ----end----
2978
3088
  // 判断在子应用中是否有父级token，非动态菜单才有作用，动态菜单则失效
2979
3089
  // console.log('路由-child')
2980
3090
  if (window.self !== window.top) {
2981
- var _window$top2, _window$top3;
2982
- if ((_window$top2 = window.top) !== null && _window$top2 !== void 0 && _window$top2.__MICRO_APP_BASE_APPLICATION__ && ((_window$top3 = window.top) === null || _window$top3 === void 0 || (_window$top3 = _window$top3.gisConfig) === null || _window$top3 === void 0 ? void 0 : _window$top3.VITE_APP_IS_MAIN_MICRO_APP) === 'true') {
2983
- var _window$top4;
3091
+ var _window$top, _window$top2;
3092
+ if ((_window$top = window.top) !== null && _window$top !== void 0 && _window$top.__MICRO_APP_BASE_APPLICATION__ && ((_window$top2 = window.top) === null || _window$top2 === void 0 || (_window$top2 = _window$top2.gisConfig) === null || _window$top2 === void 0 ? void 0 : _window$top2.VITE_APP_IS_MAIN_MICRO_APP) === 'true') {
3093
+ var _window$top3;
2984
3094
  // 主应用是否有token
2985
- if ((_window$top4 = window.top) !== null && _window$top4 !== void 0 && (_window$top4 = _window$top4.gisConfig) !== null && _window$top4 !== void 0 && _window$top4.VITE_APP_SET_GIS_TOKEN) {
3095
+ if ((_window$top3 = window.top) !== null && _window$top3 !== void 0 && (_window$top3 = _window$top3.gisConfig) !== null && _window$top3 !== void 0 && _window$top3.VITE_APP_SET_GIS_TOKEN) {
2986
3096
  var hasTopToken = getCache(constType.COOKIE).get(window.top.gisConfig.VITE_APP_SET_GIS_TOKEN);
2987
3097
  if (hasTopToken) {
2988
3098
  getCache(constType.COOKIE).set(window.gisConfig.VITE_APP_SET_GIS_TOKEN, hasTopToken);
@@ -3016,8 +3126,8 @@ var GisPermission = /*#__PURE__*/function () {
3016
3126
  return;
3017
3127
  }
3018
3128
  } else {
3019
- var _to$redirectedFrom;
3020
- if ((to === null || to === void 0 || (_to$redirectedFrom = to.redirectedFrom) === null || _to$redirectedFrom === void 0 ? void 0 : _to$redirectedFrom.path) === "/") {
3129
+ var _to$redirectedFrom2;
3130
+ if ((to === null || to === void 0 || (_to$redirectedFrom2 = to.redirectedFrom) === null || _to$redirectedFrom2 === void 0 ? void 0 : _to$redirectedFrom2.path) === "/") {
3021
3131
  next(constType.NO_IN_LAYOUT_MSG.LOGIN);
3022
3132
  NProgress.done();
3023
3133
  return;
@@ -3159,9 +3269,9 @@ function visibleIsCacheFn(to) {
3159
3269
 
3160
3270
  // 进度条控制
3161
3271
  var nProgressFn = function nProgressFn(NProgressConfigure) {
3162
- var _window$top5;
3272
+ var _window$top4;
3163
3273
  // 嵌入的子应用不需要进度条
3164
- if (!((_window$top5 = window.top) !== null && _window$top5 !== void 0 && _window$top5.__MICRO_APP_BASE_APPLICATION__) || window.gisConfig.VITE_APP_IS_MAIN_MICRO_APP === 'true') {
3274
+ if (!((_window$top4 = window.top) !== null && _window$top4 !== void 0 && _window$top4.__MICRO_APP_BASE_APPLICATION__) || window.gisConfig.VITE_APP_IS_MAIN_MICRO_APP === 'true') {
3165
3275
  // 这是进度条的一些配置项
3166
3276
  NProgress.configure(NProgressConfigure);
3167
3277
  NProgress.start();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gw-gis-standard-global-vue3",
3
- "version": "1.1.78",
3
+ "version": "1.1.80",
4
4
  "description": "gw js 库",
5
5
  "main": "gw-gis-standard-global.js",
6
6
  "scripts": {