From c571aaa3abc74fdda930d4d26e1984a2d4248aaa Mon Sep 17 00:00:00 2001 From: lejianwen <84855512@qq.com> Date: Fri, 6 Dec 2024 10:59:55 +0800 Subject: [PATCH] fix create ab in my peer --- src/views/address_book/index.js | 19 +++++++++++ src/views/my/peer/index.vue | 56 ++++++++++----------------------- src/views/peer/index.vue | 16 ++-------- 3 files changed, 38 insertions(+), 53 deletions(-) diff --git a/src/views/address_book/index.js b/src/views/address_book/index.js index dd57562..c4da5e6 100644 --- a/src/views/address_book/index.js +++ b/src/views/address_book/index.js @@ -195,6 +195,23 @@ export function useRepositories (is_my = 0) { getTagList() } + const fromPeer = (peer) => { + formData.id = peer.id + formData.username = peer.username + formData.hostname = peer.hostname + //匹配os + if (peer.os.indexOf('windows') !== -1) { + formData.platform = platformList.find(item => item.label === 'Windows').value + } else if (peer.os.indexOf('linux') !== -1) { + formData.platform = platformList.find(item => item.label === 'Linux').value + } else if (peer.os.indexOf('android') !== -1) { + formData.platform = platformList.find(item => item.label === 'Android').value + } else if (peer.os.indexOf('mac') !== -1) { + formData.platform = platformList.find(item => item.label === 'Mac OS').value + } + formData.uuid = peer.uuid + } + return { listRes, listQuery, @@ -225,5 +242,7 @@ export function useRepositories (is_my = 0) { changeQueryUser, changeUser, changeCollection, + + fromPeer, } } diff --git a/src/views/my/peer/index.vue b/src/views/my/peer/index.vue index 7f0ffa2..a0636fa 100644 --- a/src/views/my/peer/index.vue +++ b/src/views/my/peer/index.vue @@ -19,7 +19,7 @@ > - + {{ T('Filter') }} {{ T('Export') }} {{ T('BatchDelete') }} @@ -71,9 +71,9 @@ :total="listRes.total"> - + - + @@ -102,14 +102,10 @@ - - - + + + + @@ -138,7 +134,7 @@ { let now = new Date().getTime() let after = new Date(time * 1000).getTime() @@ -284,33 +277,18 @@ platformList: ABPlatformList, formVisible: ABFormVisible, formData: ABFormData, + collectionListRes, + getCollectionList, + tagListRes, + changeCollection, + submit: ABSubmit, + fromPeer } = useABRepositories() + onMounted(getCollectionList) const toAddressBook = (peer) => { - ABFormData.id = peer.id - ABFormData.username = peer.username - ABFormData.hostname = peer.hostname - //匹配os - if (peer.os.indexOf('windows') !== -1) { - ABFormData.platform = ABPlatformList.find(item => item.label === 'Windows').value - } else if (peer.os.indexOf('linux') !== -1) { - ABFormData.platform = ABPlatformList.find(item => item.label === 'Linux').value - } else if (peer.os.indexOf('android') !== -1) { - ABFormData.platform = ABPlatformList.find(item => item.label === 'Android').value - } else if (peer.os.indexOf('mac') !== -1) { - ABFormData.platform = ABPlatformList.find(item => item.label === 'Mac OS').value - } - ABFormData.uuid = peer.uuid + fromPeer(peer) ABFormVisible.value = true - } - const ABSubmit = async () => { - const res = await batchCreate(ABFormData).catch(_ => false) - if (res) { - ElMessage.success(T('OperationSuccess')) - ABFormVisible.value = false - } - } - const multipleSelection = ref([]) const handleSelectionChange = (val) => { diff --git a/src/views/peer/index.vue b/src/views/peer/index.vue index 47341ba..66e4aa1 100644 --- a/src/views/peer/index.vue +++ b/src/views/peer/index.vue @@ -311,22 +311,10 @@ platformList: ABPlatformList, formVisible: ABFormVisible, formData: ABFormData, + fromPeer, } = useABRepositories() const toAddressBook = (peer) => { - ABFormData.id = peer.id - ABFormData.username = peer.username - ABFormData.hostname = peer.hostname - //匹配os - if (peer.os.indexOf('windows') !== -1) { - ABFormData.platform = ABPlatformList.find(item => item.label === 'Windows').value - } else if (peer.os.indexOf('linux') !== -1) { - ABFormData.platform = ABPlatformList.find(item => item.label === 'Linux').value - } else if (peer.os.indexOf('android') !== -1) { - ABFormData.platform = ABPlatformList.find(item => item.label === 'Android').value - } else if (peer.os.indexOf('mac') !== -1) { - ABFormData.platform = ABPlatformList.find(item => item.label === 'Mac OS').value - } - ABFormData.uuid = peer.uuid + fromPeer(peer) ABFormVisible.value = true }