diff --git a/ui/src/components/view/BulkActionProgress.vue b/ui/src/components/view/BulkActionProgress.vue index 085c458f4301..ce99d23354cf 100644 --- a/ui/src/components/view/BulkActionProgress.vue +++ b/ui/src/components/view/BulkActionProgress.vue @@ -80,6 +80,9 @@ {{ record.virtualmachinename }} ({{ record.vmguestip }}) + + {{ record.cidrlist.replaceAll(" ", "\n") }} + diff --git a/ui/src/components/view/BulkActionView.vue b/ui/src/components/view/BulkActionView.vue index 38e3c62465f4..e30a8676d6ee 100644 --- a/ui/src/components/view/BulkActionView.vue +++ b/ui/src/components/view/BulkActionView.vue @@ -82,6 +82,9 @@ {{ record.icmpcode || record.endport >= 0 ? record.icmpcode || record.endport : $t('label.all') }} + + {{ record.cidrlist.replaceAll(" ", "\n") }} + @@ -149,12 +152,6 @@ export default { default: () => {} } }, - filters: { - capitalise: val => { - if (val === 'all') return 'All' - return val.toUpperCase() - } - }, inject: ['parentFetchData'], data () { return { @@ -164,6 +161,10 @@ export default { } }, methods: { + capitalise (val) { + if (val === 'all') return 'All' + return val.toUpperCase() + }, handleCancel () { this.$emit('handle-cancel') }, diff --git a/ui/src/components/widgets/TooltipLabel.vue b/ui/src/components/widgets/TooltipLabel.vue index 634aed697712..2874b1e7aa9a 100644 --- a/ui/src/components/widgets/TooltipLabel.vue +++ b/ui/src/components/widgets/TooltipLabel.vue @@ -17,7 +17,12 @@ - {{ title }} + + {{ title }} + + + {{ title }} + @@ -40,7 +45,8 @@ export default { tooltipPlacement: { type: String, default: 'top' - } + }, + bold: Boolean } } diff --git a/ui/src/views/network/LoadBalancing.vue b/ui/src/views/network/LoadBalancing.vue index 089e2aca784d..ace092ee8c92 100644 --- a/ui/src/views/network/LoadBalancing.vue +++ b/ui/src/views/network/LoadBalancing.vue @@ -36,6 +36,10 @@ + + + + {{ $t('label.algorithm') }} + + {{ record.cidrlist.replaceAll(" ", "\n") }} + {{ returnAlgorithmName(record.algorithm) }} @@ -532,6 +539,7 @@ import Status from '@/components/widgets/Status' import TooltipButton from '@/components/widgets/TooltipButton' import BulkActionView from '@/components/view/BulkActionView' import eventBus from '@/config/eventBus' +import TooltipLabel from '@/components/widgets/TooltipLabel' export default { name: 'LoadBalancing', @@ -539,7 +547,8 @@ export default { components: { Status, TooltipButton, - BulkActionView + BulkActionView, + TooltipLabel }, props: { resource: { @@ -586,7 +595,8 @@ export default { publicport: '', protocol: 'tcp', virtualmachineid: [], - vmguestip: [] + vmguestip: [], + cidrlist: '' }, addVmModalVisible: false, addVmModalLoading: false, @@ -609,6 +619,10 @@ export default { title: this.$t('label.privateport'), dataIndex: 'privateport' }, + { + title: this.$t('label.cidrlist'), + slots: { customRender: 'cidrlist' } + }, { title: this.$t('label.algorithm'), slots: { customRender: 'algorithm' } @@ -684,6 +698,9 @@ export default { return this.selectedRowKeys.length > 0 } }, + beforeCreate () { + this.createLoadBalancerRuleParams = this.$getApiParams('createLoadBalancerRule') + }, created () { this.initForm() this.fetchData() @@ -1403,7 +1420,8 @@ export default { name: this.newRule.name, privateport: this.newRule.privateport, protocol: this.newRule.protocol, - publicport: this.newRule.publicport + publicport: this.newRule.publicport, + cidrlist: this.newRule.cidrlist }).then(response => { this.addVmModalVisible = false this.handleAssignToLBRule(response.createloadbalancerruleresponse.id)