github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2026-01-15 14:24:39 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ibuler
2025-02-11 15:56:11 +08:00
parent 5abb8a867f c4bba7e74d
commit 768cae7abc
7 changed files with 27 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/Apps/AccountListTable/AccountList.vue
View File

@@ -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: {

13
src/views/accounts/Account/AccountList.vue
View File

@@ -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}'
}
}
}
},

1
src/views/assets/Platform/PlatformDetail/index.vue
View File

@@ -25,6 +25,7 @@ export default {
TaskDetail: {},
actions: {},
config: {
url: '/api/v1/assets/platforms',
title: this.$t('PlatformDetail'),
activeMenu: 'Detail',
submenu: [

10
src/views/assets/Platform/PlatformList.vue
View File

@@ -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: {

19
src/views/pam/Account/AccountList.vue
View File

@@ -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
})
}
}
}
}
}

19
src/views/pam/Integration/components/AccountList.vue
View File

@@ -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
})
}
}
}
}
}

2
src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue
View File

@@ -55,7 +55,7 @@ export default {
disabled: false,
username: ''
},
columns: ['name', 'username', 'secret', 'asset']
columns: ['name', 'username', 'secret', 'asset', 'connect']
}
},
computed: {