Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gitboyzcf: Fixed 修复一级菜单问题 #399

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions arco-design-pro-vite/src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import NProgress from 'nprogress'; // progress bar
import 'nprogress/nprogress.css';

import { appRoutes } from './routes';
import { REDIRECT_MAIN, NOT_FOUND_ROUTE } from './routes/base';
import { REDIRECT_MAIN, NOT_FOUND_ROUTE, DEFAULT_LAYOUT } from './routes/base';
import createRouteGuard from './guard';

NProgress.configure({ showSpinner: false }); // NProgress Configuration
Expand All @@ -13,7 +13,9 @@ const router = createRouter({
routes: [
{
path: '/',
redirect: 'login',
component: DEFAULT_LAYOUT,
redirect: 'dashboard',
children: [...appRoutes],
},
{
path: '/login',
Expand All @@ -23,7 +25,6 @@ const router = createRouter({
requiresAuth: false,
},
},
...appRoutes,
REDIRECT_MAIN,
NOT_FOUND_ROUTE,
],
Expand Down
52 changes: 26 additions & 26 deletions arco-design-pro-vite/src/router/routes/modules/dashboard.ts
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';

const DASHBOARD: AppRouteRecordRaw = {
path: '/dashboard',
name: 'dashboard',
component: DEFAULT_LAYOUT,
component: () => import('@/views/dashboard/workplace/index.vue'),
meta: {
locale: 'menu.dashboard',
requiresAuth: true,
icon: 'icon-dashboard',
order: 0,
hideChildrenInMenu: true,
},
children: [
{
path: 'workplace',
name: 'Workplace',
component: () => import('@/views/dashboard/workplace/index.vue'),
meta: {
locale: 'menu.dashboard.workplace',
requiresAuth: true,
roles: ['*'],
},
},
/** simple */
{
path: 'monitor',
name: 'Monitor',
component: () => import('@/views/dashboard/monitor/index.vue'),
meta: {
locale: 'menu.dashboard.monitor',
requiresAuth: true,
roles: ['admin'],
},
},
/** simple end */
],
// children: [
// {
// path: 'workplace',
// name: 'Workplace',
// component: () => import('@/views/dashboard/workplace/index.vue'),
// meta: {
// locale: 'menu.dashboard.workplace',
// requiresAuth: true,
// roles: ['*'],
// },
// },
// /** simple */
// {
// path: 'monitor',
// name: 'Monitor',
// component: () => import('@/views/dashboard/monitor/index.vue'),
// meta: {
// locale: 'menu.dashboard.monitor',
// requiresAuth: true,
// roles: ['admin'],
// },
// },
// /** simple end */
// ],
};

export default DASHBOARD;
3 changes: 1 addition & 2 deletions arco-design-pro-vite/src/router/routes/modules/exception.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';

const EXCEPTION: AppRouteRecordRaw = {
path: '/exception',
name: 'exception',
component: DEFAULT_LAYOUT,
redirect: '/exception/403',
meta: {
locale: 'menu.exception',
requiresAuth: true,
Expand Down
3 changes: 1 addition & 2 deletions arco-design-pro-vite/src/router/routes/modules/form.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';

const FORM: AppRouteRecordRaw = {
path: '/form',
name: 'form',
component: DEFAULT_LAYOUT,
redirect: '/form/step',
meta: {
locale: 'menu.form',
icon: 'icon-settings',
Expand Down
3 changes: 1 addition & 2 deletions arco-design-pro-vite/src/router/routes/modules/list.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';

const LIST: AppRouteRecordRaw = {
path: '/list',
name: 'list',
component: DEFAULT_LAYOUT,
redirect: '/list/search-table',
meta: {
locale: 'menu.list',
requiresAuth: true,
Expand Down
16 changes: 16 additions & 0 deletions arco-design-pro-vite/src/router/routes/modules/monitor.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { AppRouteRecordRaw } from '../types';

const DASHBOARD: AppRouteRecordRaw = {
path: '/monitor',
name: 'monitor',
component: () => import('@/views/dashboard/monitor/index.vue'),
meta: {
locale: 'menu.dashboard.monitor',
requiresAuth: true,
roles: ['admin'],
icon: 'icon-dice',
order: 0,
},
};

export default DASHBOARD;
3 changes: 1 addition & 2 deletions arco-design-pro-vite/src/router/routes/modules/profile.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';

const PROFILE: AppRouteRecordRaw = {
path: '/profile',
name: 'profile',
component: DEFAULT_LAYOUT,
redirect: '/profile/basic',
meta: {
locale: 'menu.profile',
requiresAuth: true,
Expand Down
3 changes: 1 addition & 2 deletions arco-design-pro-vite/src/router/routes/modules/result.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';

const RESULT: AppRouteRecordRaw = {
path: '/result',
name: 'result',
component: DEFAULT_LAYOUT,
redirect: '/result/success',
meta: {
locale: 'menu.result',
icon: 'icon-check-circle',
Expand Down
3 changes: 1 addition & 2 deletions arco-design-pro-vite/src/router/routes/modules/user.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';

const USER: AppRouteRecordRaw = {
path: '/user',
name: 'user',
component: DEFAULT_LAYOUT,
redirect: '/user/info',
meta: {
locale: 'menu.user',
icon: 'icon-user',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { DEFAULT_LAYOUT } from '../base';
import { AppRouteRecordRaw } from '../types';

const VISUALIZATION: AppRouteRecordRaw = {
path: '/visualization',
name: 'visualization',
component: DEFAULT_LAYOUT,
redirect: '/visualization/data-analysis',
meta: {
locale: 'menu.visualization',
requiresAuth: true,
Expand Down
2 changes: 1 addition & 1 deletion arco-design-pro-vite/src/router/routes/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export interface AppRouteRecordRaw {
name?: string | symbol;
meta?: RouteMeta;
redirect?: string;
component: Component | string;
component?: Component | string;
children?: AppRouteRecordRaw[];
alias?: string | string[];
props?: Record<string, any>;
Expand Down