From 41bbd4a70b106d66fcbf150d665a65e98ee177ae Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 12 May 2021 15:08:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?perf(assets):=20=E4=BC=98=E5=8C=96=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E5=88=9B=E5=BB=BA=E6=9B=B4=E6=96=B0=E6=97=B6=E7=9A=84?= =?UTF-8?q?label?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/assets/Asset/AssetCreateUpdate.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/assets/Asset/AssetCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate.vue index 4291ba6d3..d005cadfc 100644 --- a/src/views/assets/Asset/AssetCreateUpdate.vue +++ b/src/views/assets/Asset/AssetCreateUpdate.vue @@ -86,7 +86,10 @@ export default { labels: { el: { ajax: { - url: '/api/v1/assets/labels/' + url: '/api/v1/assets/labels/', + transformOption: (item) => { + return { label: `${item.name}:${item.value}`, value: item.id } + } } } }, From f4f4b7ccc1aca498ea3e575240d80a5e88e99ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Thu, 13 May 2021 06:44:47 -0500 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20rdp=20vnc=20=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=20(#787)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Eric --- src/views/sessions/SessionList/OnlineList.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/sessions/SessionList/OnlineList.vue b/src/views/sessions/SessionList/OnlineList.vue index 5f73cbc9f..cd547a21d 100644 --- a/src/views/sessions/SessionList/OnlineList.vue +++ b/src/views/sessions/SessionList/OnlineList.vue @@ -40,10 +40,19 @@ export default { title: this.$t('sessions.Monitor'), type: 'primary', can: (row, cellValue) => { + if (row.protocol === 'rdp' || + row.protocol === 'vnc') { + return true + } return row.can_join }, callback: function({ row, tableData }) { // 跳转到luna页面 + if (row.protocol === 'rdp' || row.protocol === 'vnc') { + const rdpUrl = '/lion/monitor/?session=' + row.id + window.open(rdpUrl, '_blank', 'location=no') + return true + } const joinUrl = '/luna/join/?shareroom=' + row.id window.open(joinUrl, 'height=600, width=800, top=400, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no') }