Merge pull request #441 from jumpserver/dev

chore: dev to master

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 :value="getBadgeValue()" size="mini" type="primary">
+    <el-badge :value="assignedTicketCount" :hidden="assignedTicketCount===0" size="mini" type="primary">
       <el-link class="el-link" target="_blank" @click="goToTickets">{{ $t('route.Ticket') }}</el-link>
     </el-badge>
   </div>
@@ -12,19 +12,17 @@ import { getTicketOpenCount } from '@/api/ticket'
 
 export default {
   name: 'WebTerminal',
-  data: function() {
+  data() {
     return {
       assignedTicketCount: 0
     }
   },
   created() {
-    this.getTicketsOpenCount()
+    this.ticketsOpenedCount()
   },
   methods: {
-    getBadgeValue() {
-      return this.assignedTicketCount
-    },
-    getTicketsOpenCount() {
+
+    ticketsOpenedCount() {
       getTicketOpenCount(1).then(data => {
         this.assignedTicketCount = data.count
       })

src/userviews/assets/index.vue

@@ -59,6 +59,10 @@ export default {
                     key: this.$t('assets.Platform'),
                     value: row.platform
                   },
+                  {
+                    key: this.$t('common.Activate'),
+                    value: row.is_active
+                  },
                   {
                     key: this.$t('assets.Comment'),
                     value: row.comment
@@ -130,7 +134,12 @@ export default {
               ]
             }
           }
-        ]
+        ],
+        tableAttrs: {
+          rowClassName({ row }) {
+            return !row.is_active ? 'row_disabled' : ''
+          }
+        }
       },
       headerActions: {
         hasExport: false,
@@ -184,4 +193,8 @@ export default {
   .el-card {
     border: 0 !important;
   }
+  .row_disabled,.row_disabled:hover,.row_disabled:hover > td{
+    cursor: not-allowed;
+    background-color:rgba(192,196,204,0.28) !important;
+  }
 </style>

src/views/ops/CommandExecution.vue

@@ -93,10 +93,10 @@ export default {
         },
         callback: {
           onCheck: this.onCheck.bind(this),
-          onClick: this.onClick.bind(this)
+          onClick: this.onClick.bind(this),
+          onSelected: this.onSelected.bind(this)
         },
         async: {
-
           enable: false
         }
       },
@@ -147,6 +147,9 @@ export default {
       //     // Don't Support SSH
       //   }
       // }
+    },
+    onSelected(event, treeNode) {
+
     },
     handleSystemUserChange(id) {
       this.treeSetting.treeUrl = `${this.basicUrl}&system_user=${id}`