github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-25 06:19:51 +00:00
Code Issues Projects Releases Wiki Activity

perf: filter gateway using new params

Browse Source
This commit is contained in:
ibuler
2024-09-19 11:01:48 +08:00
committed by 老广
parent 8545fc6136
commit e26befabc3
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/assets/Asset/AssetList/HostList.vue
View File

@@ -61,7 +61,7 @@ export default {
row['auto_config'].ansible_enabled &&
row['auto_config'].ping_enabled,
callback: ({ row }) => {
if (row.platform.name === 'Gateway') {
if (row.platform.name.startsWith('Gateway')) {
this.GatewayVisible = true
const port = row.protocols.find(item => item.name === 'ssh').port
if (!port) {

2
src/views/assets/Asset/AssetList/components/BaseList.vue
View File

@@ -191,7 +191,7 @@ export default {
row?.auto_config?.ansible_enabled &&
row?.auto_config?.ping_enabled,
callback: ({ row }) => {
if (row.platform.name === 'Gateway') {
if (row.platform.name.startsWith('Gateway')) {
this.GatewayVisible = true
const port = row.protocols.find(item => item.name === 'ssh').port
if (!port) {

2
src/views/assets/Domain/DomainCreateUpdate.vue
View File

@@ -30,7 +30,7 @@ export default {
domain_enabled: true
},
canSelect: (row) => {
return row.platform?.name !== 'Gateway'
return !row.platform?.name.startsWith('Gateway')
}
}
},

2
src/views/assets/Domain/DomainDetail/AssetList.vue
View File

@@ -25,7 +25,7 @@ export default {
return {
tableConfig: {
category: 'all',
url: `/api/v1/assets/assets/?domain=${this.$route.params.id}&exclude_platform=Gateway`,
url: `/api/v1/assets/assets/?domain=${this.$route.params.id}&is_gateway=0`,
tableConfig: {
columnsMeta: {
actions: {

6
src/views/assets/Domain/DomainDetail/GatewayList.vue
View File

@@ -39,7 +39,7 @@ export default {
data() {
return {
tableConfig: {
url: `/api/v1/assets/gateways/?domain=${this.$route.params.id}&platform=Gateway`,
url: `/api/v1/assets/gateways/?domain=${this.$route.params.id}`,
columnsExclude: [
'info', 'spec_info', 'auto_config'
],
@@ -174,7 +174,7 @@ export default {
name: 'GatewayAdd',
title: this.$t('Add'),
callback: function() {
this.AddGatewaySetting.AddGatewayDialogVisible = true
this.AddGatewaySetting.addGatewayDialogVisible = true
}.bind(this)
}
]
@@ -183,7 +183,7 @@ export default {
cell: '',
visible: false,
AddGatewaySetting: {
AddGatewayDialogVisible: false
addGatewayDialogVisible: false
}
}
},

2
src/views/assets/Domain/components/AddAssetDialog.vue
View File

@@ -68,7 +68,7 @@ export default {
domain_enabled: true
},
canSelect: (row) => {
return row.platform?.name !== 'Gateway' && this.object.assets.map(item => item.id).indexOf(row.id) === -1
return !row.platform?.name.startsWith('Gateway') && this.object.assets.map(item => item.id).indexOf(row.id) === -1
}
}
}

10
src/views/assets/Domain/components/AddGatewayDialog.vue
View File

@@ -1,11 +1,11 @@
<template>
<Dialog
v-if="setting.AddGatewayDialogVisible"
v-if="setting.addGatewayDialogVisible"
:destroy-on-close="true"
:show-cancel="false"
:show-confirm="false"
:title="$tc('AddGatewayInDomain')"
:visible.sync="setting.AddGatewayDialogVisible"
:visible.sync="setting.addGatewayDialogVisible"
after
custom-class="asset-select-dialog"
top="15vh"
@@ -31,7 +31,7 @@ export default {
setting: {
type: Object,
default: () => {
return { AddGatewayDialogVisible: false }
return { addGatewayDialogVisible: false }
}
},
object: {
@@ -64,7 +64,7 @@ export default {
multiple: true,
clearable: true,
ajax: {
url: '/api/v1/assets/assets/?domain_enabled=true&platform=Gateway'
url: '/api/v1/assets/assets/?domain_enabled=true&is_gateway=1'
},
disabledValues: this.object.gateways.map(item => item.id)
}
@@ -83,7 +83,7 @@ export default {
},
methods: {
onSubmitSuccess(res) {
this.setting.AddGatewayDialogVisible = false
this.setting.addGatewayDialogVisible = false
this.$emit('close', res)
}
}