This commit is contained in:
lejianwen
2025-04-24 11:51:53 +08:00
parent 0967e78ab7
commit 0dfab9edfb
3 changed files with 24 additions and 10 deletions
+8 -2
View File
@@ -29,8 +29,12 @@ export function useRepositories (api_type = 'my') {
const res = await apis[api_type].list(listQuery).catch(_ => false) const res = await apis[api_type].list(listQuery).catch(_ => false)
listRes.loading = false listRes.loading = false
if (res) { if (res) {
const uuids = res.data.list.filter(item => item.uuid).map(item => item.uuid) //通过uuid补全peer信息
const peers = await apis[api_type].fetchPeers({ uuids }).catch(_ => false) const uuids = res.data.list.filter(item => item.uuid&&item.client==='client'&&!item.device_id).map(item => item.uuid)
if(uuids.length > 0){
//uuids去重
const uniqueUuids = [...new Set(uuids)]
const peers = await apis[api_type].fetchPeers({ uuids: uniqueUuids }).catch(_ => false)
if (peers?.data?.list) { if (peers?.data?.list) {
res.data.list.forEach(item => { res.data.list.forEach(item => {
if (item.uuid) { if (item.uuid) {
@@ -38,6 +42,8 @@ export function useRepositories (api_type = 'my') {
} }
}) })
} }
}
listRes.list = res.data.list listRes.list = res.data.list
listRes.total = res.data.total listRes.total = res.data.total
} }
+5 -1
View File
@@ -28,7 +28,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="client" label="client" align="center" width="120"/> <el-table-column prop="client" label="client" align="center" width="120"/>
<el-table-column prop="peer.id" :label="T('Peer')" align="center"/> <el-table-column prop="peer.id" :label="T('Peer')" align="center">
<template #default="{row}">
{{ row.device_id ? row.device_id : peer?.id }}
</template>
</el-table-column>
<el-table-column prop="uuid" label="uuid" align="center"/> <el-table-column prop="uuid" label="uuid" align="center"/>
<el-table-column prop="ip" label="ip" align="center" width="150"/> <el-table-column prop="ip" label="ip" align="center" width="150"/>
<el-table-column prop="type" label="type" align="center" width="100"/> <el-table-column prop="type" label="type" align="center" width="100"/>
+5 -1
View File
@@ -12,7 +12,11 @@
<el-table :data="listRes.list" v-loading="listRes.loading" border @selection-change="handleSelectionChange"> <el-table :data="listRes.list" v-loading="listRes.loading" border @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50"/> <el-table-column type="selection" align="center" width="50"/>
<el-table-column prop="client" label="client" align="center" width="120"/> <el-table-column prop="client" label="client" align="center" width="120"/>
<el-table-column prop="peer.id" :label="T('Peer')" align="center"/> <el-table-column prop="peer.id" :label="T('Peer')" align="center">
<template #default="{row}">
{{ row.device_id ? row.device_id : peer?.id }}
</template>
</el-table-column>
<el-table-column prop="uuid" label="uuid" align="center"/> <el-table-column prop="uuid" label="uuid" align="center"/>
<el-table-column prop="ip" label="ip" align="center" width="150"/> <el-table-column prop="ip" label="ip" align="center" width="150"/>
<el-table-column prop="type" label="type" align="center" width="100"/> <el-table-column prop="type" label="type" align="center" width="100"/>