Merge pull request #392 from jumpserver/dev

Merge Dev

src/components/ListTable/TableAction/RightSide.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <ActionsGroup :is-fa="true" :actions="rightSideActions" class="right-side-actions right-side-item" />
-    <ImExportDialog :selected-rows="selectedRows" :url="tableUrl" />
+    <ImExportDialog :selected-rows="selectedRows" :url="tableUrl" v-bind="$attrs" />
   </div>
 </template>
 
@@ -119,7 +119,7 @@ export default {
   }
 
   .right-side-actions >>> .el-button:hover {
-    background-color: rgb(0, 0, 0, 0.05);
+    background-color: rgba(0, 0, 0, 0.05);
   }
 
   .action-search >>> .el-input__suffix i {

src/utils/org.js

@@ -36,13 +36,16 @@ function hasCurrentOrgPermission() {
   return orgInList
 }
 
-function changeOrg(orgId) {
+async function changeOrg(orgId) {
   const org = getOrgIdMapper()[orgId]
   if (!org) {
     console.debug('Error: org not found')
   } else {
     console.debug('Change to org: ', org)
   }
+  // 重置Role为空
+  await store.dispatch('users/setCurrentRole', null)
+
   store.dispatch('users/setCurrentOrg', org).then(() => {
     console.log('Set current org to: ', org)
     if (hasUUID(location.href)) {

src/views/sessions/CommandList.vue

@@ -87,6 +87,7 @@ export default {
         hasLeftActions: false,
         hasImport: false,
         hasDatePicker: true,
+        canExportSelected: false,
         datePicker: {
           dateStart: dateFrom,
           dateEnd: dateTo