Merge pull request #435 from jumpserver/dev

chore: Merge Dev to Master

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) => {}

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>

src/router/userPage.js

@@ -72,6 +72,7 @@ export default [
   {
     path: '/tickets',
     component: Layout,
+    hidden: true,
     meta: {
       title: i18n.t('route.Tickets'),
       icon: 'history',

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

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',

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) => {