From ace1dcd0b82b2ebad73fb0527a02a763129d607a Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 16 Sep 2020 19:26:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=97=B6=E6=9D=83=E9=99=90=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes https://github.com/jumpserver/trello/issues/332
---
 src/utils/org.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/utils/org.js b/src/utils/org.js
index fcd0b0fba..d484506a7 100644
--- a/src/utils/org.js
+++ b/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)) {

From 5ae8a6c9e4984c2829b140634bfc405a7dfa62e2 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Thu, 17 Sep 2020 12:09:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=A6=81=E7=94=A8=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ListTable/TableAction/RightSide.vue | 4 ++--
 src/views/sessions/CommandList.vue                 | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/ListTable/TableAction/RightSide.vue b/src/components/ListTable/TableAction/RightSide.vue
index 85f59a692..dd81c40b7 100644
--- a/src/components/ListTable/TableAction/RightSide.vue
+++ b/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 {
diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index f1ace032a..2ad54b35a 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -87,6 +87,7 @@ export default {
         hasLeftActions: false,
         hasImport: false,
         hasDatePicker: true,
+        canExportSelected: false,
         datePicker: {
           dateStart: dateFrom,
           dateEnd: dateTo