From db47db40ebc144afe36c8ec0837b5120b8e14399 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Sun, 10 May 2020 16:31:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[update]=E4=BF=AE=E6=94=B9=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js             | 170 +-------------------------------
 src/views/applications/index.js |  13 ++-
 src/views/assets/index.js       |  12 ++-
 src/views/audits/index.js       |  12 ++-
 src/views/jobcenter/index.js    |  11 ++-
 src/views/perms/index.js        |  13 ++-
 src/views/sessions/index.js     |  12 ++-
 src/views/tickets/index.js      |  10 +-
 src/views/users/index.js        |  16 ++-
 9 files changed, 92 insertions(+), 177 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 983c2217a..754d7b4a0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,14 +24,7 @@ import Layout from '@/layout'
     activeMenu: '/example/list'  if set path, the sidebar will highlight the path you set
   }
  */
-import UsersRoute from '@/views/users'
-import AssetsRoute from '@/views/assets'
-import ApplicationsRoute from '@/views/applications'
-import PermsRoute from '@/views/perms'
-import SessionsRoute from '@/views/sessions'
-import OpsRoutes from '@/views/jobcenter'
-import TicketsRoutes from '@/views/tickets'
-import AuditsRoutes from '@/views/audits'
+const requireContext = require.context('@/views/', true, /\.js$/)
 
 /**
  * constantRoutes
@@ -59,71 +52,6 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/users',
-    component: Layout,
-    redirect: '/users/users/',
-    name: 'Users',
-    meta: {
-      title: 'Users',
-      icon: 'users'
-    },
-    children: UsersRoute
-  },
-  {
-    path: '/assets',
-    component: Layout,
-    redirect: '/assets/assets/',
-    name: 'assets',
-    meta: { title: 'Assets', icon: 'inbox' },
-    children: AssetsRoute
-  },
-  {
-    path: '/applications/',
-    component: Layout,
-    redirect: '/applications/remote-apps/',
-    name: 'applications',
-    meta: { title: 'Applications', icon: 'th' },
-    children: ApplicationsRoute
-  },
-  {
-    path: '/perms/',
-    component: Layout,
-    redirect: '/perms/asset-permissions/',
-    name: 'Perms',
-    meta: { title: 'Perms', icon: 'edit' },
-    children: PermsRoute
-  },
-  {
-    path: '/terminal/',
-    component: Layout,
-    redirect: '/terminal/session-online/',
-    name: 'Sessions',
-    meta: { title: 'Sessions', icon: 'rocket' },
-    children: SessionsRoute
-  },
-  {
-    path: '/ops/',
-    component: Layout,
-    redirect: '/ops/tasks/',
-    name: 'JobCenter',
-    meta: { title: 'JobCenter', icon: 'coffee' },
-    children: OpsRoutes
-  },
-  {
-    path: '/tickets/',
-    component: Layout,
-    redirect: '/tickets/tickets/',
-    children: TicketsRoutes
-  },
-  {
-    path: '/audits/',
-    component: Layout,
-    redirect: '/audits/login-log/',
-    name: 'Audits',
-    meta: { title: 'Audits', icon: 'history' },
-    children: AuditsRoutes
-  },
   {
     path: '/settings',
     component: Layout,
@@ -141,7 +69,8 @@ export const constantRoutes = [
     name: 'CeleryTaskLog',
     hidden: true,
     meta: { title: 'CeleryTaskLog' }
-  }
+  },
+  ...requireContext.keys().map(key => requireContext(key).default)
 ]
 
 /**
@@ -150,99 +79,6 @@ export const constantRoutes = [
  */
 // 权限路由
 export const asyncRoutes = [
-  // {
-  //   path: '/nested',
-  //   component: Layout,
-  //   redirect: '/nested/menu1',
-  //   name: 'Nested',
-  //   meta: {
-  //     title: 'Nested',
-  //     icon: 'nested'
-  //   },
-  //   children: [
-  //     {
-  //       path: 'menu1',
-  //       component: () => import('@/views/nested/menu1/index'), // Parent router-view
-  //       name: 'Menu1',
-  //       meta: { title: 'Menu1' },
-  //       children: [
-  //         {
-  //           path: 'menu1-1',
-  //           component: () => import('@/views/nested/menu1/menu1-1'),
-  //           name: 'Menu1-1',
-  //           meta: { title: 'Menu1-1' }
-  //         },
-  //         {
-  //           path: 'menu1-2',
-  //           component: () => import('@/views/nested/menu1/menu1-2'),
-  //           name: 'Menu1-2',
-  //           meta: { title: 'Menu1-2' },
-  //           children: [
-  //             {
-  //               path: 'menu1-2-1',
-  //               component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'),
-  //               name: 'Menu1-2-1',
-  //               meta: { title: 'Menu1-2-1' }
-  //             },
-  //             {
-  //               path: 'menu1-2-2',
-  //               component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'),
-  //               name: 'Menu1-2-2',
-  //               meta: { title: 'Menu1-2-2' }
-  //             }
-  //           ]
-  //         },
-  //         {
-  //           path: 'menu1-3',
-  //           component: () => import('@/views/nested/menu1/menu1-3'),
-  //           name: 'Menu1-3',
-  //           meta: { title: 'Menu1-3' }
-  //         }
-  //       ]
-  //     },
-  //     {
-  //       path: 'menu2',
-  //       component: () => import('@/views/nested/menu2/index'),
-  //       meta: { title: 'menu2' }
-  //     }
-  //   ]
-  // },
-  // {
-  //   path: '/users',
-  //   component: Layout,
-  //   redirect: '/users/list',
-  //   name: 'Users',
-  //   meta: {
-  //     title: 'Users',
-  //     icon: 'nested'
-  //   },
-  //   children: [
-  //     {
-  //       path: 'user/list',
-  //       component: () => import('@/views/users/UserList.vue'), // Parent router-view
-  //       name: 'UserList',
-  //       meta: { title: 'List' }
-  //     },
-  //     {
-  //       path: 'user/:id',
-  //       component: () => import('@/views/users/UserCreate.vue'), // Parent router-view
-  //       name: 'UserEdit',
-  //       meta: { title: 'Edit' },
-  //       hidden: true
-  //     }
-  //   ]
-  // },
-  // {
-  //   path: 'external-link',
-  //   component: Layout,
-  //   children: [
-  //     {
-  //       path: 'https://panjiachen.github.io/vue-element-admin-site/#/',
-  //       meta: { title: 'External Link', icon: 'link' }
-  //     }
-  //   ]
-  // },
-
   // 404 page must be placed at the end !!!
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/views/applications/index.js b/src/views/applications/index.js
index 593a5c2ea..1687beb50 100644
--- a/src/views/applications/index.js
+++ b/src/views/applications/index.js
@@ -1,4 +1,6 @@
-export default [
+import Layout from '@/layout'
+
+const ApplicationsRoute = [
   {
     path: 'remote-apps',
     name: 'RemoteAppList',
@@ -18,3 +20,12 @@ export default [
     meta: { title: 'DatabaseApp' }
   }
 ]
+
+export default {
+  path: '/applications/',
+  component: Layout,
+  redirect: '/applications/remote-apps/',
+  name: 'applications',
+  meta: { title: 'Applications', icon: 'th' },
+  children: ApplicationsRoute
+}
diff --git a/src/views/assets/index.js b/src/views/assets/index.js
index b7210b25c..b6b38f760 100644
--- a/src/views/assets/index.js
+++ b/src/views/assets/index.js
@@ -1,4 +1,6 @@
-export default [
+import Layout from '@/layout'
+
+const AssetsRoute = [
   {
     path: 'assets',
     name: 'AssetList',
@@ -167,3 +169,11 @@ export default [
     meta: { title: 'PlatformList' }
   }
 ]
+export default {
+  path: '/assets',
+  component: Layout,
+  redirect: '/assets/assets/',
+  name: 'assets',
+  meta: { title: 'Assets', icon: 'inbox' },
+  children: AssetsRoute
+}
diff --git a/src/views/audits/index.js b/src/views/audits/index.js
index 8617fdefd..f438b27cf 100644
--- a/src/views/audits/index.js
+++ b/src/views/audits/index.js
@@ -1,4 +1,5 @@
-export default [
+import Layout from '@/layout'
+const AuditsRoutes = [
   {
     path: 'login-log',
     name: 'LoginLog',
@@ -30,3 +31,12 @@ export default [
     meta: { title: 'BatchCommand' }
   }
 ]
+
+export default {
+  path: '/audits/',
+  component: Layout,
+  redirect: '/audits/login-log/',
+  name: 'Audits',
+  meta: { title: 'Audits', icon: 'history' },
+  children: AuditsRoutes
+}
diff --git a/src/views/jobcenter/index.js b/src/views/jobcenter/index.js
index 3a203b84c..e07d936f3 100644
--- a/src/views/jobcenter/index.js
+++ b/src/views/jobcenter/index.js
@@ -1,4 +1,5 @@
-export default [
+import Layout from '@/layout'
+const OpsRoutes = [
   {
     path: 'tasks',
     name: 'TaskList',
@@ -33,3 +34,11 @@ export default [
     meta: { title: 'BatchCommand' }
   }
 ]
+export default {
+  path: '/ops/',
+  component: Layout,
+  redirect: '/ops/tasks/',
+  name: 'JobCenter',
+  meta: { title: 'JobCenter', icon: 'coffee' },
+  children: OpsRoutes
+}
diff --git a/src/views/perms/index.js b/src/views/perms/index.js
index a9f4ae5b9..ff1913eb9 100644
--- a/src/views/perms/index.js
+++ b/src/views/perms/index.js
@@ -1,5 +1,5 @@
-
-export default [
+import Layout from '@/layout'
+const PermsRoute = [
   {
     path: 'asset-permissions',
     name: 'AssetPermissionList',
@@ -83,3 +83,12 @@ export default [
     meta: { title: 'DatabaseAppPermissionDetail', activeMenu: '/perms/database-app-permissions' }
   }
 ]
+export default {
+  path: '/perms/',
+  component: Layout,
+  redirect: '/perms/asset-permissions/',
+  name: 'Perms',
+  meta: { title: 'Perms', icon: 'edit' },
+  children: PermsRoute
+}
+
diff --git a/src/views/sessions/index.js b/src/views/sessions/index.js
index 3dd76daa2..bd09db530 100644
--- a/src/views/sessions/index.js
+++ b/src/views/sessions/index.js
@@ -1,5 +1,5 @@
-
-export default [
+import Layout from '@/layout'
+const SessionsRoute = [
   {
     path: 'session-online',
     name: 'SessionOnlineList',
@@ -92,3 +92,11 @@ export default [
     hidden: true
   }
 ]
+export default {
+  path: '/terminal/',
+  component: Layout,
+  redirect: '/terminal/session-online/',
+  name: 'Sessions',
+  meta: { title: 'Sessions', icon: 'rocket' },
+  children: SessionsRoute
+}
diff --git a/src/views/tickets/index.js b/src/views/tickets/index.js
index 973681377..7173e8e3a 100644
--- a/src/views/tickets/index.js
+++ b/src/views/tickets/index.js
@@ -1,4 +1,5 @@
-export default [
+import Layout from '@/layout'
+const TicketsRoutes = [
   {
     path: 'tickets',
     name: 'TicketsList',
@@ -6,3 +7,10 @@ export default [
     meta: { title: 'Tickets', icon: 'check-square-o' }
   }
 ]
+export default {
+  path: '/tickets/',
+  component: Layout,
+  redirect: '/tickets/tickets/',
+  children: TicketsRoutes
+}
+
diff --git a/src/views/users/index.js b/src/views/users/index.js
index 0088c7b93..a1c9de138 100644
--- a/src/views/users/index.js
+++ b/src/views/users/index.js
@@ -1,4 +1,5 @@
-export default [
+import Layout from '@/layout'
+const UsersRoute = [
   {
     path: 'users',
     component: () => import('./users/UserList.vue'), // Parent router-view
@@ -54,3 +55,16 @@ export default [
     meta: { title: 'UserGroupDetail', activeMenu: '/users/groups' }
   }
 ]
+
+export default {
+  path: '/users',
+  component: Layout,
+  redirect: '/users/users/',
+  name: 'Users',
+  meta: {
+    title: 'Users',
+    icon: 'users'
+  },
+  children: UsersRoute
+}
+

From 549a9b681cfcac01be1fe8ca6d8e739482fd2b51 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Mon, 11 May 2020 10:37:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20=E5=88=A0=E9=99=A4ActiveCard?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8QuickActions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ActiveCard/index.vue           | 63 ------------
 src/components/index.js                       |  1 -
 .../AssetPermissionCreateUpdate.vue           |  0
 .../AssetPermissionAsset.vue                  |  2 +-
 .../AssetPermissionDetail.vue                 | 34 ++++---
 .../AssetPermissionUser.vue                   |  0
 .../AssetRelationCard/index.vue               |  0
 .../AssetPermissionDetail/index.vue           |  0
 .../AssetPermissionList.vue                   |  0
 .../AssetPermissionTree.vue                   |  0
 .../AssetPermissionList/index.vue             |  0
 src/views/perms/AssetPermissionList.vue       | 98 -------------------
 .../DatabaseAppPermissionCreateUpdate.vue     |  0
 .../DatabaseAppPermissionDatabaseApp.vue      |  0
 .../DatabaseAppPermissionDetail.vue           | 34 ++++---
 .../DatabaseAppPermissionUser.vue             |  0
 .../DatabaseAppPermissionDetail/index.vue     |  0
 .../DatabaseAppPermissionList.vue             |  0
 .../RemoteAppPermissionCreateUpdate.vue       |  0
 .../RemoteAppPermissionDetail.vue             | 34 ++++---
 .../RemoteAppPermissionRemoteApp.vue          |  0
 .../RemoteAppPermissionUser.vue               |  0
 .../RemoteAppPermissionDetail/index.vue       |  0
 .../RemoteAppPermissionList.vue               |  0
 src/views/perms/index.js                      | 25 +++--
 25 files changed, 76 insertions(+), 215 deletions(-)
 delete mode 100644 src/components/ActiveCard/index.vue
 rename src/views/perms/{ => AssetPermission}/AssetPermissionCreateUpdate.vue (100%)
 rename src/views/perms/{ => AssetPermission}/AssetPermissionDetail/AssetPermissionAsset.vue (99%)
 rename src/views/perms/{ => AssetPermission}/AssetPermissionDetail/AssetPermissionDetail.vue (76%)
 rename src/views/perms/{ => AssetPermission}/AssetPermissionDetail/AssetPermissionUser.vue (100%)
 rename src/views/perms/{ => AssetPermission/AssetPermissionDetail}/AssetRelationCard/index.vue (100%)
 rename src/views/perms/{ => AssetPermission}/AssetPermissionDetail/index.vue (100%)
 rename src/views/perms/{ => AssetPermission}/AssetPermissionList/AssetPermissionList.vue (100%)
 rename src/views/perms/{ => AssetPermission}/AssetPermissionList/AssetPermissionTree.vue (100%)
 rename src/views/perms/{ => AssetPermission}/AssetPermissionList/index.vue (100%)
 delete mode 100644 src/views/perms/AssetPermissionList.vue
 rename src/views/perms/{ => DatabaseAppPermission}/DatabaseAppPermissionCreateUpdate.vue (100%)
 rename src/views/perms/{ => DatabaseAppPermission}/DatabaseAppPermissionDetail/DatabaseAppPermissionDatabaseApp.vue (100%)
 rename src/views/perms/{ => DatabaseAppPermission}/DatabaseAppPermissionDetail/DatabaseAppPermissionDetail.vue (75%)
 rename src/views/perms/{ => DatabaseAppPermission}/DatabaseAppPermissionDetail/DatabaseAppPermissionUser.vue (100%)
 rename src/views/perms/{ => DatabaseAppPermission}/DatabaseAppPermissionDetail/index.vue (100%)
 rename src/views/perms/{ => DatabaseAppPermission}/DatabaseAppPermissionList.vue (100%)
 rename src/views/perms/{ => RemoteAppPermission}/RemoteAppPermissionCreateUpdate.vue (100%)
 rename src/views/perms/{ => RemoteAppPermission}/RemoteAppPermissionDetail/RemoteAppPermissionDetail.vue (75%)
 rename src/views/perms/{ => RemoteAppPermission}/RemoteAppPermissionDetail/RemoteAppPermissionRemoteApp.vue (100%)
 rename src/views/perms/{ => RemoteAppPermission}/RemoteAppPermissionDetail/RemoteAppPermissionUser.vue (100%)
 rename src/views/perms/{ => RemoteAppPermission}/RemoteAppPermissionDetail/index.vue (100%)
 rename src/views/perms/{ => RemoteAppPermission}/RemoteAppPermissionList.vue (100%)

diff --git a/src/components/ActiveCard/index.vue b/src/components/ActiveCard/index.vue
deleted file mode 100644
index 78b37dcda..000000000
--- a/src/components/ActiveCard/index.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<template>
-  <IBox :fa="icon" :type="type" :title="title" v-bind="$attrs">
-    <el-table class="el-table" :data="content" :show-header="false">
-      <el-table-column prop="name" />
-      <el-table-column prop="is_active" align="right">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.is_active"
-            active-color="#1ab394"
-            inactive-color="#ff4949"
-            @change="HandleChangeAction(scope.$index, scope.row)"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-  </IBox>
-</template>
-
-<script>
-import IBox from '@/components/IBox'
-export default {
-  name: 'ActiveCard',
-  components: {
-    IBox
-  },
-  props: {
-    title: {
-      type: String,
-      default: ''
-    },
-    icon: {
-      type: String,
-      default: ''
-    },
-    content: {
-      type: Array,
-      default: () => []
-    },
-    url: {
-      type: String,
-      default: ''
-    },
-    type: {
-      type: String,
-      default: 'primary'
-    }
-  },
-  methods: {
-    HandleChangeAction(index, row) {
-      this.$axios.patch(this.url, { is_active: row.is_active }
-      ).then(res => {
-        this.$message.success(this.$ttc('updateSuccessMsg'))
-      }).catch(err => {
-        this.$message.error(this.$ttc('updateFailedMsg' + ' ' + err))
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/components/index.js b/src/components/index.js
index e13c9a51c..bbe16c10c 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -12,7 +12,6 @@ export { default as FormGroupHeader } from './FormGroupHeader'
 export { default as Hamburger } from './Hamburger'
 export { default as ListTable } from './ListTable'
 export { default as RelationCard } from './RelationCard'
-export { default as ActiveCard } from './ActiveCard'
 export { default as Select2 } from './Select2'
 export { default as AssetSelect } from './AssetSelect'
 export { default as SvgIcon } from './SvgIcon'
diff --git a/src/views/perms/AssetPermissionCreateUpdate.vue b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue
similarity index 100%
rename from src/views/perms/AssetPermissionCreateUpdate.vue
rename to src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue
diff --git a/src/views/perms/AssetPermissionDetail/AssetPermissionAsset.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue
similarity index 99%
rename from src/views/perms/AssetPermissionDetail/AssetPermissionAsset.vue
rename to src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue
index 0160646d2..a7a4df7a8 100644
--- a/src/views/perms/AssetPermissionDetail/AssetPermissionAsset.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue
@@ -15,7 +15,7 @@
 import ListTable from '@/components/ListTable'
 import { RelationCard } from '@/components'
 import { DeleteActionFormatter } from '@/components/ListTable/formatters/index'
-import AssetRelationCard from '../AssetRelationCard'
+import AssetRelationCard from './AssetRelationCard/index'
 
 export default {
   name: 'AssetPermissionAsset',
diff --git a/src/views/perms/AssetPermissionDetail/AssetPermissionDetail.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue
similarity index 76%
rename from src/views/perms/AssetPermissionDetail/AssetPermissionDetail.vue
rename to src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue
index 1afcf3572..4099bf85f 100644
--- a/src/views/perms/AssetPermissionDetail/AssetPermissionDetail.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue
@@ -4,20 +4,20 @@
       <DetailCard :title="cardTitle" :items="detailCardItems" />
     </el-col>
     <el-col :md="10" :sm="24">
-      <ActiveCard type="primary" v-bind="activeConfig" />
+      <QuickActions type="primary" :actions="quickActions" />
     </el-col>
   </el-row>
 </template>
 
 <script>
-import { DetailCard, ActiveCard } from '@/components'
+import { DetailCard, QuickActions } from '@/components'
 // import { toSafeLocalDateStr } from '@/utils/common'
 
 export default {
   name: 'AssetPermissionDetail',
   components: {
     DetailCard,
-    ActiveCard
+    QuickActions
   },
   props: {
     object: {
@@ -26,18 +26,26 @@ export default {
     }
   },
   data() {
+    const vm = this
     return {
-      activeConfig: {
-        icon: 'fa-edit',
-        title: this.$t('perms.QuickModify'),
-        content: [
-          {
-            name: this.$t('perms.Active'),
-            is_active: this.object.is_active
+      quickActions: [
+        {
+          title: this.$ttc('active'),
+          type: 'switcher',
+          attrs: {
+            model: this.object.is_active
+          },
+          callbacks: {
+            change: function(v, item) {
+              const url = `/api/v1/perms/asset-permissions/${vm.object.id}/`
+              const data = { is_active: v }
+              vm.$axios.patch(url, data).catch(() => {
+                item.attrs.model = !v
+              })
+            }
           }
-        ],
-        url: `/api/v1/perms/asset-permissions/${this.$route.params.id}/`
-      }
+        }
+      ]
     }
   },
   computed: {
diff --git a/src/views/perms/AssetPermissionDetail/AssetPermissionUser.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionUser.vue
similarity index 100%
rename from src/views/perms/AssetPermissionDetail/AssetPermissionUser.vue
rename to src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionUser.vue
diff --git a/src/views/perms/AssetRelationCard/index.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetRelationCard/index.vue
similarity index 100%
rename from src/views/perms/AssetRelationCard/index.vue
rename to src/views/perms/AssetPermission/AssetPermissionDetail/AssetRelationCard/index.vue
diff --git a/src/views/perms/AssetPermissionDetail/index.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue
similarity index 100%
rename from src/views/perms/AssetPermissionDetail/index.vue
rename to src/views/perms/AssetPermission/AssetPermissionDetail/index.vue
diff --git a/src/views/perms/AssetPermissionList/AssetPermissionList.vue b/src/views/perms/AssetPermission/AssetPermissionList/AssetPermissionList.vue
similarity index 100%
rename from src/views/perms/AssetPermissionList/AssetPermissionList.vue
rename to src/views/perms/AssetPermission/AssetPermissionList/AssetPermissionList.vue
diff --git a/src/views/perms/AssetPermissionList/AssetPermissionTree.vue b/src/views/perms/AssetPermission/AssetPermissionList/AssetPermissionTree.vue
similarity index 100%
rename from src/views/perms/AssetPermissionList/AssetPermissionTree.vue
rename to src/views/perms/AssetPermission/AssetPermissionList/AssetPermissionTree.vue
diff --git a/src/views/perms/AssetPermissionList/index.vue b/src/views/perms/AssetPermission/AssetPermissionList/index.vue
similarity index 100%
rename from src/views/perms/AssetPermissionList/index.vue
rename to src/views/perms/AssetPermission/AssetPermissionList/index.vue
diff --git a/src/views/perms/AssetPermissionList.vue b/src/views/perms/AssetPermissionList.vue
deleted file mode 100644
index f05f0e022..000000000
--- a/src/views/perms/AssetPermissionList.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<template>
-  <GenericTreeListPage :table-config="tableConfig" :header-actions="headerActions" :tree-setting="treeSetting" />
-</template>
-
-<script>
-import GenericTreeListPage from '@/layout/components/GenericTreeListPage'
-import { ExpandAssetPermissionFormatter } from '@/components/ListTable/formatters/index'
-
-export default {
-  components: {
-    GenericTreeListPage
-  },
-  data() {
-    return {
-      treeSetting: {
-        showMenu: false,
-        showRefresh: true,
-        showAssets: true,
-        url: '/api/v1/perms/asset-permissions/',
-        nodeUrl: '/api/v1/perms/asset-permissions/',
-        treeUrl: '/api/v1/assets/nodes/children/tree/?assets=1'
-      },
-      tableConfig: {
-        url: '/api/v1/perms/asset-permissions/',
-        hasSelection: false,
-        hasTree: true,
-        tagSearch: [
-          { label: this.$tco('Name'), key: 'name' },
-          { label: this.$t('perms.IsValid'), key: 'is_valid' },
-          { label: this.$tco('username'), key: 'username' },
-          { label: this.$t('perms.UserGroups'), key: 'user_group' },
-          { label: this.$t('perms.IP'), key: 'ip' },
-          { label: this.$t('perms.Hostname'), key: 'hostname' },
-          { label: this.$t('perms.Node'), key: 'node' },
-          { label: this.$t('perms.SystemUser'), key: 'system_user' },
-          { label: '继承(先占位)', key: 'all=0' }
-        ],
-        columns: ['expand', 'name', 'users_amount', 'user_groups_amount', 'assets_amount', 'nodes_amount', 'system_users_amount', 'is_active', 'actions'],
-        columnsMeta: {
-          expand: {
-            type: 'expand',
-            formatter: ExpandAssetPermissionFormatter
-          },
-          users_amount: {
-            label: this.$t('perms.User')
-          },
-          user_groups_amount: {
-            label: this.$t('perms.UserGroups')
-          },
-          assets_amount: {
-            label: this.$t('perms.Asset')
-          },
-          nodes_amount: {
-            label: this.$t('perms.Node')
-          },
-          system_users_amount: {
-            label: this.$t('perms.SystemUser')
-          }
-        },
-        actions: {
-          updateRoute: 'AssetPermissionUpdate',
-          detailRoute: 'AssetPermissionDetail'
-        }
-      },
-      headerActions: {
-        hasExport: false,
-        hasImport: false,
-        hasRefresh: false,
-        hasBulkDelete: false,
-        hasBulkUpdate: false,
-        extraMoreActions: [
-          {
-            name: 'RefreshPermissionCache',
-            title: this.$t('perms.RefreshPermissionCache'),
-            type: 'primary',
-            has: true,
-            callback: this.HandleRefreshPermissionCache
-          }
-        ]
-      }
-    }
-  },
-  methods: {
-    HandleRefreshPermissionCache() {
-      const url = '/api/v1/perms/asset-permissions/cache/refresh/'
-      this.$axios.get(url).then(res => {
-        this.$message.success(this.$t('perms.ReFreshSuccess'))
-      }).catch(err => {
-        this.$message.error(this.$t('perms.ReFreshFail') + ':' + err)
-      })
-    }
-  }
-}
-</script>
-
-<style>
-
-</style>
diff --git a/src/views/perms/DatabaseAppPermissionCreateUpdate.vue b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionCreateUpdate.vue
similarity index 100%
rename from src/views/perms/DatabaseAppPermissionCreateUpdate.vue
rename to src/views/perms/DatabaseAppPermission/DatabaseAppPermissionCreateUpdate.vue
diff --git a/src/views/perms/DatabaseAppPermissionDetail/DatabaseAppPermissionDatabaseApp.vue b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDatabaseApp.vue
similarity index 100%
rename from src/views/perms/DatabaseAppPermissionDetail/DatabaseAppPermissionDatabaseApp.vue
rename to src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDatabaseApp.vue
diff --git a/src/views/perms/DatabaseAppPermissionDetail/DatabaseAppPermissionDetail.vue b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDetail.vue
similarity index 75%
rename from src/views/perms/DatabaseAppPermissionDetail/DatabaseAppPermissionDetail.vue
rename to src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDetail.vue
index 08a5d3711..1859780e0 100644
--- a/src/views/perms/DatabaseAppPermissionDetail/DatabaseAppPermissionDetail.vue
+++ b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDetail.vue
@@ -4,20 +4,20 @@
       <DetailCard :title="cardTitle" :items="detailCardItems" />
     </el-col>
     <el-col :md="10" :sm="24">
-      <ActiveCard type="primary" v-bind="activeConfig" />
+      <QuickActions type="primary" :actions="quickActions" />
     </el-col>
   </el-row>
 </template>
 
 <script>
-import { DetailCard, ActiveCard } from '@/components'
+import { DetailCard, QuickActions } from '@/components'
 import { toSafeLocalDateStr } from '@/utils/common'
 
 export default {
   name: 'DatabaseAppPermissionDetail',
   components: {
     DetailCard,
-    ActiveCard
+    QuickActions
   },
   props: {
     object: {
@@ -26,18 +26,26 @@ export default {
     }
   },
   data() {
+    const vm = this
     return {
-      activeConfig: {
-        icon: 'fa-edit',
-        title: this.$t('perms.QuickModify'),
-        content: [
-          {
-            name: this.$t('perms.Active'),
-            is_active: this.object.is_active
+      quickActions: [
+        {
+          title: this.$ttc('active'),
+          type: 'switcher',
+          attrs: {
+            model: this.object.is_active
+          },
+          callbacks: {
+            change: function(v, item) {
+              const url = `/api/v1/perms/database-app-permissions/${vm.object.id}/`
+              const data = { is_active: v }
+              vm.$axios.patch(url, data).catch(() => {
+                item.attrs.model = !v
+              })
+            }
           }
-        ],
-        url: `/api/v1/perms/database-app-permissions/${this.object.id}/`
-      }
+        }
+      ]
     }
   },
   computed: {
diff --git a/src/views/perms/DatabaseAppPermissionDetail/DatabaseAppPermissionUser.vue b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionUser.vue
similarity index 100%
rename from src/views/perms/DatabaseAppPermissionDetail/DatabaseAppPermissionUser.vue
rename to src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionUser.vue
diff --git a/src/views/perms/DatabaseAppPermissionDetail/index.vue b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/index.vue
similarity index 100%
rename from src/views/perms/DatabaseAppPermissionDetail/index.vue
rename to src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/index.vue
diff --git a/src/views/perms/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermission/DatabaseAppPermissionList.vue
similarity index 100%
rename from src/views/perms/DatabaseAppPermissionList.vue
rename to src/views/perms/DatabaseAppPermission/DatabaseAppPermissionList.vue
diff --git a/src/views/perms/RemoteAppPermissionCreateUpdate.vue b/src/views/perms/RemoteAppPermission/RemoteAppPermissionCreateUpdate.vue
similarity index 100%
rename from src/views/perms/RemoteAppPermissionCreateUpdate.vue
rename to src/views/perms/RemoteAppPermission/RemoteAppPermissionCreateUpdate.vue
diff --git a/src/views/perms/RemoteAppPermissionDetail/RemoteAppPermissionDetail.vue b/src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/RemoteAppPermissionDetail.vue
similarity index 75%
rename from src/views/perms/RemoteAppPermissionDetail/RemoteAppPermissionDetail.vue
rename to src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/RemoteAppPermissionDetail.vue
index 486fb9e5d..47cf8db80 100644
--- a/src/views/perms/RemoteAppPermissionDetail/RemoteAppPermissionDetail.vue
+++ b/src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/RemoteAppPermissionDetail.vue
@@ -4,20 +4,20 @@
       <DetailCard :title="cardTitle" :items="detailCardItems" />
     </el-col>
     <el-col :span="10">
-      <ActiveCard type="primary" v-bind="activeConfig" />
+      <QuickActions type="primary" :actions="quickActions" />
     </el-col>
   </el-row>
 </template>
 
 <script>
-import { DetailCard, ActiveCard } from '@/components'
+import { DetailCard, QuickActions } from '@/components'
 import { toSafeLocalDateStr } from '@/utils/common'
 
 export default {
   name: 'RemoteAppPermissionDetail',
   components: {
     DetailCard,
-    ActiveCard
+    QuickActions
   },
   props: {
     object: {
@@ -26,18 +26,26 @@ export default {
     }
   },
   data() {
+    const vm = this
     return {
-      activeConfig: {
-        icon: 'fa-edit',
-        title: this.$t('perms.QuickModify'),
-        content: [
-          {
-            name: this.$t('perms.Active'),
-            is_active: this.object.is_active
+      quickActions: [
+        {
+          title: this.$ttc('active'),
+          type: 'switcher',
+          attrs: {
+            model: this.object.is_active
+          },
+          callbacks: {
+            change: function(v, item) {
+              const url = `/api/v1/perms/remote-app-permissions/${vm.object.id}/`
+              const data = { is_active: v }
+              vm.$axios.patch(url, data).catch(() => {
+                item.attrs.model = !v
+              })
+            }
           }
-        ],
-        url: `/api/v1/perms/remote-app-permissions/${this.object.id}/`
-      }
+        }
+      ]
     }
   },
   computed: {
diff --git a/src/views/perms/RemoteAppPermissionDetail/RemoteAppPermissionRemoteApp.vue b/src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/RemoteAppPermissionRemoteApp.vue
similarity index 100%
rename from src/views/perms/RemoteAppPermissionDetail/RemoteAppPermissionRemoteApp.vue
rename to src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/RemoteAppPermissionRemoteApp.vue
diff --git a/src/views/perms/RemoteAppPermissionDetail/RemoteAppPermissionUser.vue b/src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/RemoteAppPermissionUser.vue
similarity index 100%
rename from src/views/perms/RemoteAppPermissionDetail/RemoteAppPermissionUser.vue
rename to src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/RemoteAppPermissionUser.vue
diff --git a/src/views/perms/RemoteAppPermissionDetail/index.vue b/src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/index.vue
similarity index 100%
rename from src/views/perms/RemoteAppPermissionDetail/index.vue
rename to src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/index.vue
diff --git a/src/views/perms/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermission/RemoteAppPermissionList.vue
similarity index 100%
rename from src/views/perms/RemoteAppPermissionList.vue
rename to src/views/perms/RemoteAppPermission/RemoteAppPermissionList.vue
diff --git a/src/views/perms/index.js b/src/views/perms/index.js
index ff1913eb9..8ebb9dc6a 100644
--- a/src/views/perms/index.js
+++ b/src/views/perms/index.js
@@ -3,27 +3,26 @@ const PermsRoute = [
   {
     path: 'asset-permissions',
     name: 'AssetPermissionList',
-    // component: () => import('@/views/perms/AssetPermissionList'),
-    component: () => import('@/views/perms/AssetPermissionList/index'),
+    component: () => import('@/views/perms/AssetPermission/AssetPermissionList/index'),
     meta: { title: 'AssetPermission' }
   },
   {
     path: 'asset-permissions/create',
-    component: () => import('@/views/perms/AssetPermissionCreateUpdate'),
+    component: () => import('@/views/perms/AssetPermission/AssetPermissionCreateUpdate'),
     name: 'AssetPermissionCreate',
     hidden: true,
     meta: { title: 'AssetPermissionCreate', activeMenu: '/perms/asset-permissions', action: 'create' }
   },
   {
     path: 'users/:id/update',
-    component: () => import('@/views/perms/AssetPermissionCreateUpdate.vue'),
+    component: () => import('@/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue'),
     name: 'AssetPermissionUpdate',
     hidden: true,
     meta: { title: 'AssetPermissionUpdate', activeMenu: '/perms/asset-permissions', action: 'update' }
   },
   {
     path: 'asset-permissions/:id',
-    component: () => import('@/views/perms/AssetPermissionDetail/index'),
+    component: () => import('@/views/perms/AssetPermission/AssetPermissionDetail/index'),
     name: 'AssetPermissionDetail',
     hidden: true,
     meta: { title: 'AssetPermissionDetail', activeMenu: '/perms/asset-permissions' }
@@ -31,26 +30,26 @@ const PermsRoute = [
   {
     path: 'remote-app-permissions',
     name: 'RemoteAppPermissionList',
-    component: () => import('@/views/perms/RemoteAppPermissionList'),
+    component: () => import('@/views/perms/RemoteAppPermission/RemoteAppPermissionList'),
     meta: { title: 'RemoteAppPermission' }
   },
   {
     path: 'remote-app-permissions/create',
-    component: () => import('@/views/perms/RemoteAppPermissionCreateUpdate'),
+    component: () => import('@/views/perms/RemoteAppPermission/RemoteAppPermissionCreateUpdate'),
     name: 'RemoteAppPermissionCreate',
     hidden: true,
     meta: { title: 'RemoteAppPermissionCreate', activeMenu: '/perms/remote-app-permissions', action: 'create' }
   },
   {
     path: 'remote-app-permissions/update',
-    component: () => import('@/views/perms/RemoteAppPermissionCreateUpdate'),
+    component: () => import('@/views/perms/RemoteAppPermission/RemoteAppPermissionCreateUpdate'),
     name: 'RemoteAppPermissionUpdate',
     hidden: true,
     meta: { title: 'RemoteAppPermissionUpdate', activeMenu: '/perms/remote-app-permissions', action: 'update' }
   },
   {
     path: 'remote-app-permissions/:id',
-    component: () => import('@/views/perms/RemoteAppPermissionDetail/index'),
+    component: () => import('@/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/index'),
     name: 'RemoteAppPermissionDetail',
     hidden: true,
     meta: { title: 'RemoteAppPermissionDetail', activeMenu: '/perms/remote-app-permissions' }
@@ -58,26 +57,26 @@ const PermsRoute = [
   {
     path: 'database-app-permissions',
     name: 'DatabaseAppPermissionList',
-    component: () => import('@/views/perms/DatabaseAppPermissionList'),
+    component: () => import('@/views/perms/DatabaseAppPermission/DatabaseAppPermissionList'),
     meta: { title: 'DatabaseAppPermission' }
   },
   {
     path: 'database-app-permissions/create',
-    component: () => import('@/views/perms/DatabaseAppPermissionCreateUpdate'), // Parent router-view
+    component: () => import('@/views/perms/DatabaseAppPermission/DatabaseAppPermissionCreateUpdate'), // Parent router-view
     name: 'DatabaseAppPermissionCreate',
     hidden: true,
     meta: { title: 'DatabaseAppPermissionCreate', activeMenu: '/perms/database-app-permissions' }
   },
   {
     path: 'database-app-permissions/update',
-    component: () => import('@/views/perms/DatabaseAppPermissionCreateUpdate'), // Parent router-view
+    component: () => import('@/views/perms/DatabaseAppPermission/DatabaseAppPermissionCreateUpdate'), // Parent router-view
     name: 'DatabaseAppPermissionUpdate',
     hidden: true,
     meta: { title: 'DatabaseAppPermissionUpdate', activeMenu: '/perms/database-app-permissions', action: 'update' }
   },
   {
     path: 'database-app-permissions/:id',
-    component: () => import('@/views/perms/DatabaseAppPermissionDetail/index'),
+    component: () => import('@/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/index'),
     name: 'DatabaseAppPermissionDetail',
     hidden: true,
     meta: { title: 'DatabaseAppPermissionDetail', activeMenu: '/perms/database-app-permissions' }