Merge branch 'pam' of github.com:jumpserver/lina into pam

src/router/pam/security.js

@@ -6,6 +6,9 @@ export default [
     path: 'check',
     name: 'AccountCheck',
     component: empty,
+    redirect: {
+      name: 'AccountCheckList'
+    },
     meta: {
       app: 'accounts',
       name: 'BaseAccountRisk',
@@ -18,7 +21,8 @@ export default [
         component: () => import('@/views/pam/RiskDetect/index.vue'),
         name: 'AccountCheckList',
         meta: {
-          title: i18n.t('RiskDetection')
+          title: i18n.t('RiskDetection'),
+          permissions: ['accounts.view_accountrisk']
         }
       },
       {
@@ -27,7 +31,8 @@ export default [
         name: 'AccountCheckCreate',
         hidden: true,
         meta: {
-          title: i18n.t('AccountCheckCreate')
+          title: i18n.t('AccountCheckCreate'),
+          permissions: ['accounts.view_accountrisk']
         }
       },
       {
@@ -36,7 +41,8 @@ export default [
         name: 'AccountCheckUpdate',
         hidden: true,
         meta: {
-          title: i18n.t('AccountCheckUpdate')
+          title: i18n.t('AccountCheckUpdate'),
+          permissions: ['accounts.view_accountrisk']
         }
       }
     ]

src/views/pam/RiskDetect/AccountRiskList.vue

@@ -17,6 +17,7 @@ import AssetTreeTable from '@/components/Apps/AssetTreeTable/index.vue'
 import RiskHandleFormatter from './RiskHandlerFormatter/index.vue'
 import BatchResolveDialog from '@/views/pam/RiskDetect/RiskHandlerFormatter/BatchResolveDialog.vue'
 import RiskScanDialog from './RiskScanDialog.vue'
+import { DetailFormatter } from '@/components/Table/TableFormatters'
 
 export default {
   components: {
@@ -89,16 +90,17 @@ export default {
         ],
         columnsMeta: {
           asset: {
-            formatter: function(row) {
-              const to = {
-                name: 'AssetDetail',
-                params: { id: row.asset.id }
-              }
-              if (vm.$hasPerm('assets.view_asset')) {
-                return vm.$createElement('router-link', { props: { to }}, row.asset.name)
-              } else {
-                return vm.$createElement('span', row.asset.name)
-              }
+            formatter: DetailFormatter,
+            formatterArgs: {
+              can: vm.$hasPerm('assets.view_asset'),
+              getTitle: ({ row }) => row.asset.name,
+              getRoute({ row }) {
+                return {
+                  name: 'AssetDetail',
+                  params: { id: row.asset.id }
+                }
+              },
+              drawer: true
             }
           },
           username: {