Merge pull request #788 from jumpserver/dev

v2.10.0 rc1

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 }
+              }
             }
           }
         },

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')
           }