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

jumpserver · Feb 11, 2025 · 768cae7 · 768cae7
2 parents 5abb8a8 + c4bba7e
commit 768cae7
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 59 deletions.
diff --git a/src/components/Apps/AccountListTable/AccountList.vue b/src/components/Apps/AccountListTable/AccountList.vue
@@ -52,7 +52,7 @@
 <script>
 import { accountOtherActions, accountQuickFilters, connectivityMeta } from './const'
 import { openTaskPage } from '@/utils/jms'
-import { ActionsFormatter, PlatformFormatter, SecretViewerFormatter } from '@/components/Table/TableFormatters'
+import { ActionsFormatter, PlatformFormatter, SecretViewerFormatter, AccountConnectFormatter } from '@/components/Table/TableFormatters'
 import ViewSecret from './ViewSecret.vue'
 import UpdateSecretInfo from './UpdateSecretInfo.vue'
 import ResultDialog from './BulkCreateResultDialog.vue'
@@ -191,14 +191,18 @@ export default {
           connect: {
             label: this.$t('Connect'),
             width: '80px',
-            formatter: () => {
-              return (
-                <span className='connect'>
-                  <el-button type='primary' size='mini' plain>
-                    <i className='fa fa-desktop'/>
-                  </el-button>
-                </span>
-              )
+            formatter: AccountConnectFormatter,
+            formatterArgs: {
+              buttonIcon: 'fa fa-desktop',
+              titleText: '可选协议',
+              url: '/api/v1/assets/assets/{id}',
+              connectUrlTemplate: (row) => `/luna/pam_connect/${row.id}/${row.username}/${row.asset.id}/${row.asset.name}/`,
+              setMapItem: (id, protocol) => {
+                this.$store.commit('table/SET_PROTOCOL_MAP_ITEM', {
+                  key: id,
+                  value: protocol
+                })
+              }
             }
           },
           platform: {

diff --git a/src/views/accounts/Account/AccountList.vue b/src/views/accounts/Account/AccountList.vue
@@ -9,7 +9,7 @@
 <script>
 import AssetTreeTable from '@/components/Apps/AssetTreeTable/index.vue'
 import AccountListTable from '@/components/Apps/AccountListTable/AccountList.vue'
-import { AccountConnectFormatter, DetailFormatter } from '@/components/Table/TableFormatters'
+import { DetailFormatter } from '@/components/Table/TableFormatters'
 
 export default {
   name: 'AssetAccountList',
@@ -39,17 +39,6 @@ export default {
                 query: { tab: 'Basic' }
               })
             }
-          },
-          connect: {
-            label: this.$t('Connect'),
-            width: '80px',
-            formatter: AccountConnectFormatter,
-            formatterArgs: {
-              buttonIcon: 'fa fa-desktop',
-              titleText: '可选协议',
-              url: '/api/v1/assets/assets/{id}',
-              connectUrlTemplate: '/luna/pam_connect/{id}/{username}/{assetId}/{assetName}/{protocol}'
-            }
           }
         }
       },

diff --git a/src/views/assets/Platform/PlatformDetail/index.vue b/src/views/assets/Platform/PlatformDetail/index.vue
@@ -25,6 +25,7 @@ export default {
       TaskDetail: {},
       actions: {},
       config: {
+        url: '/api/v1/assets/platforms',
         title: this.$t('PlatformDetail'),
         activeMenu: 'Detail',
         submenu: [

diff --git a/src/views/assets/Platform/PlatformList.vue b/src/views/assets/Platform/PlatformList.vue
@@ -7,7 +7,13 @@
     @tab-click="changeMoreCreates"
   >
     <keep-alive>
-      <GenericListTable ref="genericListTable" :header-actions="headerActions" :table-config="tableConfig" />
+      <GenericListTable
+        ref="genericListTable"
+        :create-drawer="createDrawer"
+        :detail-drawer="detailDrawer"
+        :header-actions="headerActions"
+        :table-config="tableConfig"
+      />
     </keep-alive>
   </TabPage>
 </template>
@@ -26,6 +32,8 @@ export default {
   data() {
     const vm = this
     return {
+      createDrawer: () => import('@/views/assets/Platform/PlatformCreateUpdate.vue'),
+      detailDrawer: () => import('@/views/assets/Platform/PlatformDetail/index.vue'),
       loading: true,
       platformPageHelpMsg: this.$t('PlatformPageHelpMsg'),
       tab: {

diff --git a/src/views/pam/Account/AccountList.vue b/src/views/pam/Account/AccountList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import AccountListTable from '@/components/Apps/AccountListTable/AccountList.vue'
-import { DetailFormatter, AccountConnectFormatter } from '@/components/Table/TableFormatters'
+import { DetailFormatter } from '@/components/Table/TableFormatters'
 
 export default {
   name: 'AssetAccountList',
@@ -30,23 +30,6 @@ export default {
                 query: { tab: 'Basic' }
               })
             }
-          },
-          connect: {
-            label: this.$t('Connect'),
-            width: '80px',
-            formatter: AccountConnectFormatter,
-            formatterArgs: {
-              buttonIcon: 'fa fa-desktop',
-              titleText: '可选协议',
-              url: '/api/v1/assets/assets/{id}',
-              connectUrlTemplate: (row) => `/luna/pam_connect/${row.id}/${row.username}/${row.asset.id}/${row.asset.name}/`,
-              setMapItem: (id, protocol) => {
-                this.$store.commit('table/SET_PROTOCOL_MAP_ITEM', {
-                  key: id,
-                  value: protocol
-                })
-              }
-            }
           }
         }
       }

diff --git a/src/views/pam/Integration/components/AccountList.vue b/src/views/pam/Integration/components/AccountList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import AccountListTable from '@/components/Apps/AccountListTable/AccountList.vue'
-import { DetailFormatter, AccountConnectFormatter } from '@/components/Table/TableFormatters'
+import { DetailFormatter } from '@/components/Table/TableFormatters'
 
 export default {
   name: 'AssetAccountList',
@@ -37,23 +37,6 @@ export default {
                 query: { tab: 'Basic' }
               })
             }
-          },
-          connect: {
-            label: this.$t('Connect'),
-            width: '80px',
-            formatter: AccountConnectFormatter,
-            formatterArgs: {
-              buttonIcon: 'fa fa-desktop',
-              titleText: '可选协议',
-              url: '/api/v1/assets/assets/{id}',
-              connectUrlTemplate: (row) => `/luna/pam_connect/${row.id}/${row.username}/${row.asset.id}/${row.asset.name}/`,
-              setMapItem: (id, protocol) => {
-                this.$store.commit('table/SET_PROTOCOL_MAP_ITEM', {
-                  key: id,
-                  value: protocol
-                })
-              }
-            }
           }
         }
       }

diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue
@@ -55,7 +55,7 @@ export default {
         disabled: false,
         username: ''
       },
-      columns: ['name', 'username', 'secret', 'asset']
+      columns: ['name', 'username', 'secret', 'asset', 'connect']
     }
   },
   computed: {