diff --git a/src/utils/webclient.js b/src/utils/webclient.js index 83c0a94..5fe411e 100644 --- a/src/utils/webclient.js +++ b/src/utils/webclient.js @@ -16,7 +16,7 @@ export const toWebClientLink = (row) => { } export async function getPeerSlat (id) { - const [addr, port] = app.setting.rustdeskConfig.value.id_server.split(':') + const [addr, port] = app.setting.rustdeskConfig.id_server.split(':') if (!addr) { return } @@ -69,7 +69,7 @@ export async function getPeerSlat (id) { await _ws.open() console.log(new Date() + ': Connected to relay server') const request_relay = rendezvous.RequestRelay.fromPartial({ - licence_key: app.setting.rustdeskConfig.value.key || undefined, + licence_key: app.setting.rustdeskConfig.key || undefined, uuid, }) _ws.sendRendezvous({ request_relay }) @@ -94,5 +94,5 @@ export async function getPeerSlat (id) { } export function getV2ShareUrl (token) { - return `${app.setting.rustdeskConfig.value.api_server}/webclient2/#/?share_token=${token}` + return `${app.setting.rustdeskConfig.api_server}/webclient2/#/?share_token=${token}` } diff --git a/src/views/my/peer/index.vue b/src/views/my/peer/index.vue index e7d61cb..e5298bf 100644 --- a/src/views/my/peer/index.vue +++ b/src/views/my/peer/index.vue @@ -51,6 +51,7 @@ + diff --git a/src/views/peer/index.vue b/src/views/peer/index.vue index 0f1f7fa..fd232ac 100644 --- a/src/views/peer/index.vue +++ b/src/views/peer/index.vue @@ -49,13 +49,11 @@
{{ T('You can reference export file') }} - - {{ T('Cancel') }} {{ T('BatchDelete') }} @@ -64,36 +62,44 @@ +
+ +
+ - - - - - - - - - - - - - - - - - - - + + @@ -211,7 +241,7 @@ import { loadAllUsers } from '@/global' import { useAppStore } from '@/store/app' import { connectByClient } from '@/utils/peer' - import { CopyDocument } from '@element-plus/icons' + import { ArrowDown, ArrowUp, CopyDocument, Setting } from '@element-plus/icons' import { handleClipboard } from '@/utils/clipboard' import { batchCreateFromPeers } from '@/api/address_book' import { useRepositories as useCollectionRepositories } from '@/views/address_book/collection' @@ -495,6 +525,47 @@ } // 批量添加到地址簿 end + const columnSettingVisible = ref(false) + const allColumns = ref([ + { name: 'id', visible: true, label: 'Id' }, + { name: 'cpu', visible: true, label: 'Cpu' }, + { name: 'hostname', visible: true, label: 'Hostname' }, + { name: 'memory', visible: true, label: 'Memory' }, + { name: 'os', visible: true, label: 'Os' }, + { name: 'last_online_time', visible: true, label: 'LastOnlineTime' }, + { name: 'last_online_ip', visible: true, label: 'LastOnlineIp' }, + { name: 'username', visible: true, label: 'Username' }, + { name: 'group_id', visible: true, label: 'Group' }, + { name: 'uuid', visible: true, label: 'Uuid' }, + { name: 'version', visible: true, label: 'Version' }, + { name: 'alias', visible: true, label: 'Alias' }, + { name: 'created_at', visible: true, label: 'CreatedAt' }, + { name: 'updated_at', visible: true, label: 'UpdatedAt' }, + ]) + const visibleColumns = ref(JSON.parse(localStorage.getItem('peer_visible_columns')) || allColumns.value) + const showColumnSetting = () => { + columnSettingVisible.value = true + } + const saveColumnSetting = () => { + localStorage.setItem('peer_visible_columns', JSON.stringify(visibleColumns.value)) + ElMessage.success(T('OperationSuccess')) + columnSettingVisible.value = false + } + + const upColumn = (index) => { + if (index === 0) return + const col = visibleColumns.value[index] + visibleColumns.value.splice(index, 1) + visibleColumns.value.splice(index - 1, 0, col) + + } + const downColumn = (index) => { + if (index === visibleColumns.value.length - 1) return + const col = visibleColumns.value[index] + visibleColumns.value.splice(index, 1) + visibleColumns.value.splice(index + 1, 0, col) + + }