From 7df5736354cd90becbc3d2b1432286d689f50889 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Tue, 17 Nov 2020 18:07:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BB=A5=E5=8F=8A=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=94=E7=94=A8=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Footer/index.vue               |  2 +-
 .../ApplicationsPermission.vue                       | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/layout/components/Footer/index.vue b/src/layout/components/Footer/index.vue
index 890aaf7e1..0f4cd2399 100644
--- a/src/layout/components/Footer/index.vue
+++ b/src/layout/components/Footer/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="footer" :style="style">
     <div class="pull-right">
-      Version <strong>2.0.2</strong> <span v-if="!publicSettings.XPACK_LICENSE_IS_VALID"> GPLv2. </span>
+      Version <strong> dev </strong> <span v-if="!publicSettings.XPACK_LICENSE_IS_VALID"> GPLv2. </span>
     </div>
     <div v-if="!publicSettings.XPACK_LICENSE_IS_VALID" style="padding-left:20px;">
       <strong>Copyright</strong> FIT2CLOUD 飞致云 © 2014-2020
diff --git a/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationsPermission.vue b/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationsPermission.vue
index 22d331040..b4294affc 100644
--- a/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationsPermission.vue
+++ b/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationsPermission.vue
@@ -99,15 +99,9 @@ export default {
         icon: 'fa-edit',
         title: this.$t('perms.addSystemUserToThisPermission'),
         objectsAjax: {
-          url: '/api/v1/assets/system-users/',
-          processResults(data) {
-            let results = data.results
-            const protocol = vm.object.category === 'remote_app' ? `rdp` : vm.object.type
-            results = results.filter((item) => item.protocol === protocol).map((item) => {
-              return { label: item.name + '(' + item.username + ')', value: item.id }
-            })
-            const more = !!data.next
-            return { results: results, pagination: more, total: data.count }
+          url: `/api/v1/assets/system-users/?category=${vm.object.category}&type=${vm.object.type}`,
+          transformOption: (item) => {
+            return { label: item.name + ' (' + item.username + ')', value: item.id }
           }
         },
         hasObjectsId: this.object.system_users,