wms / wms4_xiangtancongde · Commits

Commit b76e3338bf51280e35d1c2cbb0c187ee603251ee

Authored by zhangdaiscott
1 parent af928f1f

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

切换导航模式，导致菜单栏丢失 #1763
Inline Side-by-side
Showing 2 changed files with 8 additions and 2 deletions
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectBizComponent/JSelectBizComponentModal.vue
  View file @b76e333
... ... @@ -209,6 +209,11 @@
209 209 immediate: true,
210 210 deep: true,
211 211 handler(val) {
  212 + //update--begin--autor:scott-----date:20200927------for：选取职务名称出现全选 #1753-----
  213 + if(this.innerValue){
  214 + this.innerValue.length=0;
  215 + }
  216 + //update--end--autor:scott-----date:20200927------for：选取职务名称出现全选 #1753-----
212 217 this.selectedTable.dataSource = val.map(key => {
213 218 for (let data of this.dataSource) {
214 219 if (data[this.rowKey] === key) {
... ... @@ -308,6 +313,8 @@
308 313 //update--begin--autor:wangshuai-----date:20200722------for：JSelectBizComponent组件切换页数值问题------
309 314 this.selectedTable.dataSource.splice(this.selectedTable.dataSource.indexOf(record), 1)
310 315 this.innerValue.splice(this.innerValue.indexOf(record[this.valueKey]), 1)
  316 + console.log("this.selectedRowKeys:",this.selectedRowKeys)
  317 + console.log("this.selectedTable.dataSource:",this.selectedTable.dataSource)
311 318 //update--begin--autor:wangshuai-----date:20200722------for：JSelectBizComponent组件切换页数值问题------
312 319 },
313 320  
... ...
ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
  View file @b76e333
... ... @@ -13,7 +13,6 @@
13 13 >
14 14 <side-menu
15 15 mode="inline"
16   - v-if="device === 'mobile'"
17 16 :menus="menus"
18 17 @menuSelect="menuSelect"
19 18 :theme="navTheme"
... ... @@ -22,7 +21,7 @@
22 21 </a-drawer>
23 22  
24 23 <side-menu
25   - v-if="device === 'desktop'"
  24 + v-else
26 25 mode="inline"
27 26 :menus="menus"
28 27 @menuSelect="myMenuSelect"
... ...