gw-gis-standard-global-vue3 1.1.74 → 1.1.75
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.
- package/gw-gis-standard-global.js +30 -21
- package/package.json +1 -1
|
@@ -1011,12 +1011,12 @@ var gisGlobal = /*#__PURE__*/function () {
|
|
|
1011
1011
|
// getRouters.homePageMsg.meta.visible = false
|
|
1012
1012
|
}
|
|
1013
1013
|
if (this.isTypeInArray(routerList, 'string')) {
|
|
1014
|
-
//
|
|
1014
|
+
// 导航栏
|
|
1015
1015
|
if (getRouters.topMenuList.length > 0) {
|
|
1016
|
-
filterRolesRouterFn2(getRouters.topMenuList, routerList, menuFilterKey);
|
|
1016
|
+
filterRolesRouterFn2(getRouters.topMenuList, routerList, menuFilterKey, 'top');
|
|
1017
1017
|
}
|
|
1018
|
-
//
|
|
1019
|
-
filterRolesRouterFn2(getRouters.getRouters, routerList, menuFilterKey);
|
|
1018
|
+
// 侧边栏
|
|
1019
|
+
filterRolesRouterFn2(getRouters.getRouters, routerList, menuFilterKey, 'side');
|
|
1020
1020
|
}
|
|
1021
1021
|
if (homePathCode) {
|
|
1022
1022
|
// 去掉首页重定向方便自定义
|
|
@@ -2788,17 +2788,16 @@ var GisPermission = /*#__PURE__*/function () {
|
|
|
2788
2788
|
// const {getRouteTagsListFn, isHideNeedCache, removeIncludeListFn, routeTagsList} = gisRouteTags()
|
|
2789
2789
|
// window.gisRouteTags = gisRouteTags()
|
|
2790
2790
|
this.router.beforeEach(function (to, from, next) {
|
|
2791
|
-
var _window$top;
|
|
2792
2791
|
// 当前路由和跳转一样时则不跳转
|
|
2793
2792
|
// if (this.router?.currentRoute && to.path === this.router?.currentRoute?.value?.path) {
|
|
2794
2793
|
// return
|
|
2795
2794
|
// }
|
|
2796
2795
|
// console.log('【to-router-from】', from)
|
|
2797
2796
|
// 仅供测试
|
|
2798
|
-
if (
|
|
2799
|
-
|
|
2800
|
-
|
|
2801
|
-
}
|
|
2797
|
+
// if (window.top?._showRouteTo) {
|
|
2798
|
+
console.log('【router-from】', from);
|
|
2799
|
+
console.log('【router-to】', to);
|
|
2800
|
+
// }
|
|
2802
2801
|
// 缓存当前临时路由 - 会初次加载路由接口无需缓存
|
|
2803
2802
|
// cacheCurrentTempRouteFn(to)
|
|
2804
2803
|
// 这是判断路由变化后是否需要缓存
|
|
@@ -2903,6 +2902,7 @@ var GisPermission = /*#__PURE__*/function () {
|
|
|
2903
2902
|
// 注意：权限不足，直接跳转403
|
|
2904
2903
|
if (to.matched.length > 0) {
|
|
2905
2904
|
var lastRouteMsg = to.matched.at(-1);
|
|
2905
|
+
// console.log('lastRouteMsglastRouteMsg', lastRouteMsg)
|
|
2906
2906
|
if (lastRouteMsg.meta.GwRoleSet && !lastRouteMsg.meta.visible) {
|
|
2907
2907
|
// 找整个模块第一个显示的页面
|
|
2908
2908
|
if (to.path) {
|
|
@@ -2912,18 +2912,27 @@ var GisPermission = /*#__PURE__*/function () {
|
|
|
2912
2912
|
var findRoute = to.matched.find(function (item) {
|
|
2913
2913
|
return item.path === '/' + firstPath;
|
|
2914
2914
|
});
|
|
2915
|
+
if (!findRoute) {
|
|
2916
|
+
findRoute = lastRouteMsg;
|
|
2917
|
+
}
|
|
2915
2918
|
if (findRoute) {
|
|
2916
|
-
var findRouteMsg
|
|
2917
|
-
|
|
2919
|
+
var findRouteMsg;
|
|
2920
|
+
if (findRoute.children.length > 0) {
|
|
2921
|
+
findRouteMsg = recursionRouteFn(findRoute.children);
|
|
2922
|
+
} else {
|
|
2923
|
+
findRouteMsg = lastRouteMsg;
|
|
2924
|
+
}
|
|
2918
2925
|
if (findRouteMsg) {
|
|
2919
|
-
var _findRouteMsg
|
|
2920
|
-
if (
|
|
2926
|
+
var _findRouteMsg, _findRouteMsg2;
|
|
2927
|
+
if ((_findRouteMsg = findRouteMsg) !== null && _findRouteMsg !== void 0 && (_findRouteMsg = _findRouteMsg.meta) !== null && _findRouteMsg !== void 0 && _findRouteMsg.hasOwnProperty('visible') && !((_findRouteMsg2 = findRouteMsg) !== null && _findRouteMsg2 !== void 0 && (_findRouteMsg2 = _findRouteMsg2.meta) !== null && _findRouteMsg2 !== void 0 && _findRouteMsg2.visible)) {
|
|
2928
|
+
next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN);
|
|
2929
|
+
} else if (from.path === findRouteMsg.path) {
|
|
2921
2930
|
next(constType.NO_IN_LAYOUT_MSG.FORBIDDEN);
|
|
2922
2931
|
} else {
|
|
2923
|
-
var
|
|
2932
|
+
var _findRouteMsg3;
|
|
2924
2933
|
next({
|
|
2925
2934
|
path: findRouteMsg.path,
|
|
2926
|
-
query: findRouteMsg === null ||
|
|
2935
|
+
query: (_findRouteMsg3 = findRouteMsg) === null || _findRouteMsg3 === void 0 || (_findRouteMsg3 = _findRouteMsg3.meta) === null || _findRouteMsg3 === void 0 ? void 0 : _findRouteMsg3.query
|
|
2927
2936
|
});
|
|
2928
2937
|
}
|
|
2929
2938
|
} else {
|
|
@@ -2939,11 +2948,11 @@ var GisPermission = /*#__PURE__*/function () {
|
|
|
2939
2948
|
// 判断在子应用中是否有父级token，非动态菜单才有作用，动态菜单则失效
|
|
2940
2949
|
// console.log('路由-child')
|
|
2941
2950
|
if (window.self !== window.top) {
|
|
2942
|
-
var _window$
|
|
2943
|
-
if ((_window$
|
|
2944
|
-
var _window$
|
|
2951
|
+
var _window$top, _window$top2;
|
|
2952
|
+
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') {
|
|
2953
|
+
var _window$top3;
|
|
2945
2954
|
// 主应用是否有token
|
|
2946
|
-
if ((_window$
|
|
2955
|
+
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) {
|
|
2947
2956
|
var hasTopToken = getCache(constType.COOKIE).get(window.top.gisConfig.VITE_APP_SET_GIS_TOKEN);
|
|
2948
2957
|
if (hasTopToken) {
|
|
2949
2958
|
getCache(constType.COOKIE).set(window.gisConfig.VITE_APP_SET_GIS_TOKEN, hasTopToken);
|
|
@@ -3120,9 +3129,9 @@ function visibleIsCacheFn(to) {
|
|
|
3120
3129
|
|
|
3121
3130
|
// 进度条控制
|
|
3122
3131
|
var nProgressFn = function nProgressFn(NProgressConfigure) {
|
|
3123
|
-
var _window$
|
|
3132
|
+
var _window$top4;
|
|
3124
3133
|
// 嵌入的子应用不需要进度条
|
|
3125
|
-
if (!((_window$
|
|
3134
|
+
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') {
|
|
3126
3135
|
// 这是进度条的一些配置项
|
|
3127
3136
|
NProgress.configure(NProgressConfigure);
|
|
3128
3137
|
NProgress.start();
|