From a50f2242272252bb8adea5522841b90cacbf5c71 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 14 Oct 2020 17:44:25 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B8=BA0=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8C=89=E9=92=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/NavHeader/Tickets.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/NavHeader/Tickets.vue b/src/layout/components/NavHeader/Tickets.vue
index aa9373fb1..7ec6cbd29 100644
--- a/src/layout/components/NavHeader/Tickets.vue
+++ b/src/layout/components/NavHeader/Tickets.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--    <el-link class="el-link" target="_blank" @click="goToTickets">{{ $t('route.Ticket') }}</el-link>-->
-    <el-badge v-if="getBadgeValue() !== 0" :value="getBadgeValue()" size="mini" type="primary">
+    <el-badge :value="getBadgeValue()" size="mini" type="primary">
       <el-link class="el-link" target="_blank" @click="goToTickets">{{ $t('route.Ticket') }}</el-link>
     </el-badge>
   </div>

From 23740cdce0a7c6dc96bfa234fdf7522fd8a02676 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 14 Oct 2020 17:57:59 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E9=9A=90=E8=97=8F=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/userPage.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/router/userPage.js b/src/router/userPage.js
index 13515adcb..188c230f7 100644
--- a/src/router/userPage.js
+++ b/src/router/userPage.js
@@ -72,6 +72,7 @@ export default [
   {
     path: '/tickets',
     component: Layout,
+    hidden: true,
     meta: {
       title: i18n.t('route.Tickets'),
       icon: 'history',

From fd6b0532baa6ef01e21bb0902375ffc55c5ba9d6 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Wed, 14 Oct 2020 18:42:26 +0800
Subject: [PATCH 3/5] =?UTF-8?q?perf(OrgMember):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E6=9C=89?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE=E5=87=BA=E7=8E=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/RelationCard/index.vue                       | 6 +++++-
 .../Org/OrganizationDetail/OrganizationMembershipList.vue   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/RelationCard/index.vue b/src/components/RelationCard/index.vue
index 2f78f83a7..8e93215a1 100644
--- a/src/components/RelationCard/index.vue
+++ b/src/components/RelationCard/index.vue
@@ -22,7 +22,7 @@
           </td>
         </tr>
       </template>
-      <tr v-if="params.hasMore" class="item">
+      <tr v-if="params.hasMore && showHasMore" class="item">
         <td colspan="2">
           <el-button :type="type" size="small" style="width: 100%" @click="loadMore">
             <i class="fa fa-arrow-down" />
@@ -83,6 +83,10 @@ export default {
       type: [Array, Number, String],
       default: () => []
     },
+    showHasMore: {
+      type: Boolean,
+      default: true
+    },
     performDelete: {
       type: Function,
       default: (obj, that) => {}
diff --git a/src/views/xpack/Org/OrganizationDetail/OrganizationMembershipList.vue b/src/views/xpack/Org/OrganizationDetail/OrganizationMembershipList.vue
index 5f1d0429c..c8c4475e7 100644
--- a/src/views/xpack/Org/OrganizationDetail/OrganizationMembershipList.vue
+++ b/src/views/xpack/Org/OrganizationDetail/OrganizationMembershipList.vue
@@ -86,6 +86,7 @@ export default {
       memberRelationConfig: {
         icon: 'fa-user',
         title: this.$t('xpack.Organization.AddOrgMembers'),
+        showHasMore: false,
         objectsAjax: {
           url: '/api/v1/users/users/?fields_size=mini&order=name&all=1',
           transformOption: (item) => {

From 65a71df10ef82ee96816e851c2d81453d999ee22 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 14 Oct 2020 18:06:39 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E5=9C=A8`Default`=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E4=B8=8B=E9=9A=90=E8=97=8F=E9=9A=90=E8=97=8F=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/User/UserList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue
index 13fd1efdb..1186d5193 100644
--- a/src/views/users/User/UserList.vue
+++ b/src/views/users/User/UserList.vue
@@ -88,7 +88,7 @@ export default {
           {
             name: this.$t('users.InviteUser'),
             title: this.$t('users.InviteUser'),
-            can:
+            has:
               (JSON.parse(this.$cookie.get('jms_current_org'))
                 ? JSON.parse(this.$cookie.get('jms_current_org')).id
                 : '') !== 'DEFAULT',

From f46a63cfcf4596dde8b2be4538f84b6649b3b1c9 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 14 Oct 2020 20:48:10 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E7=A6=81=E6=AD=A2=E6=9C=AA?=
 =?UTF-8?q?=E6=BF=80=E6=B4=BB=E8=B5=84=E4=BA=A7=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/userviews/assets/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/userviews/assets/index.vue b/src/userviews/assets/index.vue
index 7ce76350f..59577f414 100644
--- a/src/userviews/assets/index.vue
+++ b/src/userviews/assets/index.vue
@@ -107,6 +107,9 @@ export default {
                   name: 'connect',
                   fa: 'fa-terminal',
                   type: 'primary',
+                  can: (row, cellValue) => {
+                    return row.is_active
+                  },
                   callback: function({ row, col, cellValue, reload }) {
                     window.open(`/luna/?login_to=${cellValue}`, '_blank')
                   }