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

This commit is contained in:
ibuler
2024-06-11 19:40:32 +08:00
3 changed files with 20 additions and 6 deletions

View File

@@ -8,7 +8,7 @@
/>
<el-row :gutter="10" class="the-row">
<IBox v-if="totalData.length === 0">
<el-empty :description="$t('NoData')" class="no-data" style="padding: 20px" />
<el-empty :description="$t('NoData')" class="no-data" :image-size="200" style="padding: 20px" />
</IBox>
<el-col v-for="(d, index) in totalData" :key="index" :lg="8" :md="12" :sm="24" style="min-width: 335px;">
<el-card
@@ -378,8 +378,11 @@ export default {
}
.no-data {
width: 300px;
margin: 0 auto;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
height: 65vh;
width: 100%;
}
</style>

View File

@@ -121,9 +121,14 @@ export default {
this.checkAll = checkedCount === this.allRegions.length
this.isIndeterminate = checkedCount > 0 && checkedCount < this.allRegions.length
const checkedRegion = this.allRegions.filter(item => value.includes(item.id))
const region = this.allRegions
.filter(item => value.includes(item.id))
.reduce((acc, region) => {
acc[region.id] = region.name
return acc
}, {})
this.$emit('input', checkedRegion)
this.$emit('input', region)
this.refreshContent()
},
updateCheckedStatus() {

View File

@@ -36,16 +36,22 @@ export default {
}
},
asset: {
width: 240,
label: this.$t('Asset')
},
account: {
width: 180
},
command_amount: {
align: 'center',
label: this.$t('Command')
},
remote_addr: {
width: 180,
label: this.$t('RemoteAddr')
},
protocol: {
width: 120,
label: this.$t('Protocol'),
el: {
disabled: false