diff --git a/lib/component/table/table.vue b/lib/component/table/table.vue index c909dcd..057ce0a 100644 --- a/lib/component/table/table.vue +++ b/lib/component/table/table.vue @@ -423,7 +423,6 @@ () => getTableBindValues.value.api, () => { // console.log(getTableBindValues.value.api); - fetch(); //路由切换导致api切换 导致发送请求 }, { diff --git a/lib/saas/router/guard/permission-guard.ts b/lib/saas/router/guard/permission-guard.ts index 5400f4b..912755f 100644 --- a/lib/saas/router/guard/permission-guard.ts +++ b/lib/saas/router/guard/permission-guard.ts @@ -8,7 +8,6 @@ export function createPermissionGuard(router: Router, whiteNameList: string[]) { const authorizationStore = authorizationService(); const appConfig = appConfigStore(); router.beforeEach(async (to, from, next) => { - next(); if (!appConfig.userCustomRouterGuard) { setRouteChange(to); if (to?.query?.nervsid) { diff --git a/lib/saas/router/routes/index.ts b/lib/saas/router/routes/index.ts index 3a74593..d930068 100644 --- a/lib/saas/router/routes/index.ts +++ b/lib/saas/router/routes/index.ts @@ -1,9 +1,8 @@ - - import { log } from '/nerv-lib/util'; import { appConfigStore } from '/nerv-lib/saas/store/modules/app-config'; let modules = import.meta.globEager('/src/router/**/*.ts'); const modulesOP = import.meta.globEager('/src/router-op/**/*.ts'); +console.log(modules); const modulesCloud = import.meta.globEager('/src/router-cloud/**/*.ts'); import { appConfig } from '/@/config/app.config.ts'; diff --git a/lib/saas/theme/global.less b/lib/saas/theme/global.less index c6eb9b9..bcc2e8b 100644 --- a/lib/saas/theme/global.less +++ b/lib/saas/theme/global.less @@ -72,7 +72,7 @@ */ * { - scrollbar-width: thin; + // scrollbar-width: thin; } ::-webkit-scrollbar { diff --git a/lib/saas/view/system/application.vue b/lib/saas/view/system/application.vue index 09bbf32..868c650 100644 --- a/lib/saas/view/system/application.vue +++ b/lib/saas/view/system/application.vue @@ -13,8 +13,8 @@ :initSiderKey="selectedSiderKeys" :initSiderOpenKey="selectedSiderOpenKeys" /> - - + + @@ -73,6 +73,7 @@ authorizationStore.setProjectId(Cookies.get('projectUuid')); } const { route: routeModules, routeModuleObject, routeModule } = storeToRefs(useRouteStore()); + console.log(routeModules, 'routeModules'); const headers = computed(() => { const module = cloneDeep(routeModules.value); diff --git a/lib/saas/view/system/layout/tag/index.vue b/lib/saas/view/system/layout/tag/index.vue index 456175a..1f2ccec 100644 --- a/lib/saas/view/system/layout/tag/index.vue +++ b/lib/saas/view/system/layout/tag/index.vue @@ -22,7 +22,7 @@