From b76e3338bf51280e35d1c2cbb0c187ee603251ee Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Tue, 29 Sep 2020 11:27:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E5=8F=96=E8=81=8C=E5=8A=A1=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=87=BA=E7=8E=B0=E5=85=A8=E9=80=89=20#1753=20?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=AF=BC=E8=88=AA=E6=A8=A1=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=8F=9C=E5=8D=95=E6=A0=8F=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=20#1763?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JSelectBizComponent/JSelectBizComponentModal.vue       | 7 +++++++
 ant-design-vue-jeecg/src/components/page/GlobalLayout.vue  | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectBizComponent/JSelectBizComponentModal.vue b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectBizComponent/JSelectBizComponentModal.vue
index ac35f4e7..c88c8cee 100644
--- a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectBizComponent/JSelectBizComponentModal.vue
+++ b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectBizComponent/JSelectBizComponentModal.vue
@@ -209,6 +209,11 @@
         immediate: true,
         deep: true,
         handler(val) {
+          //update--begin--autor:scott-----date:20200927------for：选取职务名称出现全选 #1753-----
+          if(this.innerValue){
+            this.innerValue.length=0;
+          }
+          //update--end--autor:scott-----date:20200927------for：选取职务名称出现全选 #1753-----
           this.selectedTable.dataSource = val.map(key => {
             for (let data of this.dataSource) {
               if (data[this.rowKey] === key) {
@@ -308,6 +313,8 @@
         //update--begin--autor:wangshuai-----date:20200722------for：JSelectBizComponent组件切换页数值问题------
         this.selectedTable.dataSource.splice(this.selectedTable.dataSource.indexOf(record), 1)
         this.innerValue.splice(this.innerValue.indexOf(record[this.valueKey]), 1)
+        console.log("this.selectedRowKeys:",this.selectedRowKeys)
+        console.log("this.selectedTable.dataSource:",this.selectedTable.dataSource)
         //update--begin--autor:wangshuai-----date:20200722------for：JSelectBizComponent组件切换页数值问题------
       },
 
diff --git a/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue b/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
index a383fb55..f69b8ebe 100644
--- a/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
+++ b/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
@@ -13,7 +13,6 @@
       >
         <side-menu
           mode="inline"
-          v-if="device === 'mobile'"
           :menus="menus"
           @menuSelect="menuSelect"
           :theme="navTheme"
@@ -22,7 +21,7 @@
       </a-drawer>
 
       <side-menu
-        v-if="device === 'desktop'"
+        v-else
         mode="inline"
         :menus="menus"
         @menuSelect="myMenuSelect"