Merge branch 'v2.0' into jym_dev

2025-08-31 22:48:27 +00:00 · 2020-07-01 11:00:28 +08:00
parent c3d0367662 d3ebdb0d61
commit f862a39c03
5 changed files with 95 additions and 66 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,4 +2,5 @@ build/*.js
 src/assets
 public
 dist
+lina
 node_modules
--- a/src/layout/components/Footer/index.vue
+++ b/src/layout/components/Footer/index.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="footer" :style="style">
    <div class="pull-right">
-      Version <strong>2.0.0</strong> <span v-if="!publicSettings.XPACK_LICENSE_IS_VALID"> GPLv2. </span>
+      Version <strong>2.0.1</strong> <span v-if="!publicSettings.XPACK_LICENSE_IS_VALID"> GPLv2. </span>
    </div>
    <div v-if="!publicSettings.XPACK_LICENSE_IS_VALID" style="padding-left:20px;">
      <strong>Copyright</strong> FIT2CLOUD 飞致云 © 2014-2020
--- 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',
--- 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 = [
--- 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',