From 7eccb2026972e0e2e38988ff563be52d02a21cd8 Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Mon, 22 Jun 2020 16:15:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[fix]=E6=9B=B4=E6=96=B0=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=9D=83=E9=99=90,=E6=9B=B4=E6=96=B0eslint=20Ignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintignore | 1 + src/router/sessions.js | 43 +++++++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/.eslintignore b/.eslintignore index 3085b90eb..ae66d5e2f 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,4 +2,5 @@ build/*.js src/assets public dist +lina node_modules diff --git a/src/router/sessions.js b/src/router/sessions.js index 30b81729e..07f276393 100644 --- a/src/router/sessions.js +++ b/src/router/sessions.js @@ -1,5 +1,6 @@ import i18n from '@/i18n/i18n' import rolec from '@/utils/role' +import empty from '@/layout/empty' export default [ { path: 'session', @@ -34,23 +35,31 @@ export default [ }, { path: 'terminal', - name: 'TerminalList', - component: () => import('@/views/sessions/TerminalList'), - meta: { title: i18n.t('route.Terminal'), permissions: [rolec.PERM_SUPER] } - }, - { - path: 'terminals/:id', - name: 'TerminalDetail', - component: () => import('@/views/sessions/TerminalDetail'), - meta: { title: i18n.t('route.Terminal'), activeMenu: '/terminal/terminal', permissions: [rolec.PERM_SUPER] }, - hidden: true - }, - { - path: 'terminals/:id/update', - name: 'TerminalUpdate', - component: () => import('@/views/sessions/TerminalUpdate'), - meta: { title: i18n.t('route.Terminal'), activeMenu: '/terminal/terminal', permissions: [rolec.PERM_SUPER] }, - hidden: true + component: empty, + redirect: '', + meta: { title: i18n.t('route.Terminal'), permissions: [rolec.PERM_SUPER] }, + children: [ + { + path: '', + name: 'TerminalList', + component: () => import('@/views/sessions/TerminalList'), + meta: { title: i18n.t('route.Terminal') } + }, + { + path: ':id', + name: 'TerminalDetail', + component: () => import('@/views/sessions/TerminalDetail'), + meta: { title: i18n.t('route.Terminal'), activeMenu: '/terminal/terminal' }, + hidden: true + }, + { + path: ':id/update', + name: 'TerminalUpdate', + component: () => import('@/views/sessions/TerminalUpdate'), + meta: { title: i18n.t('route.Terminal'), activeMenu: '/terminal/terminal' }, + hidden: true + } + ] }, { path: 'storages', From 4927c6520ac6a007c8b451173c4b21d675ed8db0 Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Mon, 22 Jun 2020 18:31:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[fix]=E6=8A=BD=E8=B1=A1=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/applications.js | 57 +++++++++++++++++++++---------------- src/router/perms.js | 58 ++++++++++++++++++++++---------------- 2 files changed, 67 insertions(+), 48 deletions(-) diff --git a/src/router/applications.js b/src/router/applications.js index 0468f6759..77c5b690f 100644 --- a/src/router/applications.js +++ b/src/router/applications.js @@ -1,32 +1,41 @@ import i18n from '@/i18n/i18n' +import empty from '@/layout/empty' export default [ { path: 'remote-apps', - name: 'RemoteAppList', - component: () => import('@/views/applications/RemoteApp/RemoteAppList'), - meta: { title: i18n.t('route.RemoteApp'), licenseRequired: true } - }, - { - path: 'remote-apps/create', - name: 'RemoteAppCreate', - component: () => import('@/views/applications/RemoteApp/RemoteAppCreateUpdate'), - meta: { title: i18n.t('route.RemoteApp'), activeMenu: '/applications/remote-apps', action: 'create', licenseRequired: true }, - hidden: true - }, - { - path: 'remote-apps/:id/update', - name: 'RemoteAppUpdate', - component: () => import('@/views/applications/RemoteApp/RemoteAppCreateUpdate'), - meta: { title: i18n.t('route.RemoteAppUpdate'), activeMenu: '/applications/remote-apps', action: 'update', licenseRequired: true }, - hidden: true - }, - { - path: 'remote-apps/:id', - name: 'RemoteAppDetail', - component: () => import('@/views/applications/RemoteApp/RemoteAppDetail/index'), - meta: { title: i18n.t('route.RemoteAppDetail'), activeMenu: '/applications/remote-apps', licenseRequired: true }, - hidden: true + redirect: '', + component: empty, + meta: { title: i18n.t('route.RemoteApp'), licenseRequired: true }, + children: [ + { + path: '', + name: 'RemoteAppList', + meta: { title: i18n.t('route.RemoteApp') }, + component: () => import('@/views/applications/RemoteApp/RemoteAppList') + }, + { + path: 'create', + name: 'RemoteAppCreate', + component: () => import('@/views/applications/RemoteApp/RemoteAppCreateUpdate'), + meta: { title: i18n.t('route.RemoteApp'), activeMenu: '/applications/remote-apps', action: 'create' }, + hidden: true + }, + { + path: ':id/update', + name: 'RemoteAppUpdate', + component: () => import('@/views/applications/RemoteApp/RemoteAppCreateUpdate'), + meta: { title: i18n.t('route.RemoteAppUpdate'), activeMenu: '/applications/remote-apps', action: 'update' }, + hidden: true + }, + { + path: ':id', + name: 'RemoteAppDetail', + component: () => import('@/views/applications/RemoteApp/RemoteAppDetail/index'), + meta: { title: i18n.t('route.RemoteAppDetail'), activeMenu: '/applications/remote-apps' }, + hidden: true + } + ] }, { path: 'database-apps', diff --git a/src/router/perms.js b/src/router/perms.js index 935d2e287..32d86c6d5 100644 --- a/src/router/perms.js +++ b/src/router/perms.js @@ -1,4 +1,5 @@ import i18n from '@/i18n/i18n' +import empty from '@/layout/empty' const assetPermissionRoutes = [ { @@ -33,31 +34,40 @@ const assetPermissionRoutes = [ const remoteAppPermissionRoutes = [ { path: 'remote-app-permissions', - name: 'RemoteAppPermissionList', - component: () => import('@/views/perms/RemoteAppPermission/RemoteAppPermissionList'), - meta: { title: i18n.t('route.RemoteAppPermission'), licenseRequired: true } - }, - { - path: 'remote-app-permissions/create', - component: () => import('@/views/perms/RemoteAppPermission/RemoteAppPermissionCreateUpdate'), - name: 'RemoteAppPermissionCreate', - hidden: true, - meta: { title: i18n.t('route.RemoteAppPermissionCreate'), activeMenu: '/perms/remote-app-permissions', action: 'create', licenseRequired: true } - }, - { - path: 'remote-app-permissions/update', - component: () => import('@/views/perms/RemoteAppPermission/RemoteAppPermissionCreateUpdate'), - name: 'RemoteAppPermissionUpdate', - hidden: true, - meta: { title: i18n.t('route.RemoteAppPermissionUpdate'), activeMenu: '/perms/remote-app-permissions', action: 'update', licenseRequired: true } - }, - { - path: 'remote-app-permissions/:id', - component: () => import('@/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/index'), - name: 'RemoteAppPermissionDetail', - hidden: true, - meta: { title: i18n.t('route.RemoteAppPermissionDetail'), activeMenu: '/perms/remote-app-permissions', licenseRequired: true } + component: empty, + meta: { title: i18n.t('route.RemoteAppPermission'), licenseRequired: true }, + redirect: '', + children: [ + { + path: '', + name: 'RemoteAppPermissionList', + component: () => import('@/views/perms/RemoteAppPermission/RemoteAppPermissionList'), + meta: { title: i18n.t('route.RemoteAppPermission') } + + }, + { + path: 'create', + component: () => import('@/views/perms/RemoteAppPermission/RemoteAppPermissionCreateUpdate'), + name: 'RemoteAppPermissionCreate', + hidden: true, + meta: { title: i18n.t('route.RemoteAppPermissionCreate'), activeMenu: '/perms/remote-app-permissions', action: 'create' } + }, + { + path: 'update', + component: () => import('@/views/perms/RemoteAppPermission/RemoteAppPermissionCreateUpdate'), + name: 'RemoteAppPermissionUpdate', + hidden: true, + meta: { title: i18n.t('route.RemoteAppPermissionUpdate'), activeMenu: '/perms/remote-app-permissions', action: 'update' } + }, + { + path: ':id', + component: () => import('@/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/index'), + name: 'RemoteAppPermissionDetail', + hidden: true, + meta: { title: i18n.t('route.RemoteAppPermissionDetail'), activeMenu: '/perms/remote-app-permissions' } + }] } + ] const databasePermissionRoutes = [ From 004c0e3f662e386d08ac787cf4efe37f65109be9 Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Mon, 22 Jun 2020 19:22:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Footer/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/components/Footer/index.vue b/src/layout/components/Footer/index.vue index d611ff6d6..63dd197a5 100644 --- a/src/layout/components/Footer/index.vue +++ b/src/layout/components/Footer/index.vue @@ -1,7 +1,7 @@