选取职务名称出现全选 #1753

切换导航模式，导致菜单栏丢失 #1763

ant-design-vue-jeecg/src/components/jeecgbiz/JSelectBizComponent/JSelectBizComponentModal.vue

@@ -209,6 +209,11 @@
         immediate: true,
         immediate: true,
         deep: true,
         deep: true,
         handler(val) {
         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 => {
           this.selectedTable.dataSource = val.map(key => {
             for (let data of this.dataSource) {
             for (let data of this.dataSource) {
               if (data[this.rowKey] === key) {
               if (data[this.rowKey] === key) {
@@ -308,6 +313,8 @@
         //update--begin--autor:wangshuai-----date:20200722------for：JSelectBizComponent组件切换页数值问题------
         //update--begin--autor:wangshuai-----date:20200722------for：JSelectBizComponent组件切换页数值问题------
         this.selectedTable.dataSource.splice(this.selectedTable.dataSource.indexOf(record), 1)
         this.selectedTable.dataSource.splice(this.selectedTable.dataSource.indexOf(record), 1)
         this.innerValue.splice(this.innerValue.indexOf(record[this.valueKey]), 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组件切换页数值问题------
         //update--begin--autor:wangshuai-----date:20200722------for：JSelectBizComponent组件切换页数值问题------
       },
       },
 
 

ant-design-vue-jeecg/src/components/page/GlobalLayout.vue

@@ -3,7 +3,7 @@
 
 
     <template v-if="layoutMode === 'sidemenu'">
     <template v-if="layoutMode === 'sidemenu'">
       <a-drawer
       <a-drawer
-        v-show="device === 'mobile'"
+        v-if="device === 'mobile'"
         :wrapClassName="'drawer-sider ' + navTheme"
         :wrapClassName="'drawer-sider ' + navTheme"
         placement="left"
         placement="left"
         @close="() => this.collapsed = false"
         @close="() => this.collapsed = false"
@@ -13,7 +13,6 @@
       >
       >
         <side-menu
         <side-menu
           mode="inline"
           mode="inline"
-          v-if="device === 'mobile'"
           :menus="menus"
           :menus="menus"
           @menuSelect="menuSelect"
           @menuSelect="menuSelect"
           :theme="navTheme"
           :theme="navTheme"
@@ -22,7 +21,7 @@
       </a-drawer>
       </a-drawer>
 
 
       <side-menu
       <side-menu
-        v-if="device === 'desktop'"
+        v-else
         mode="inline"
         mode="inline"
         :menus="menus"
         :menus="menus"
         @menuSelect="myMenuSelect"
         @menuSelect="myMenuSelect"