Jeecg-Boot 2.1.2版本发布

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

@@ -1,6 +1,6 @@
 <template>
   <a-row class="j-select-biz-component-box" type="flex" :gutter="8">
-    <a-col class="left">
+    <a-col class="left" :class="{'full': !buttons}">
       <a-select
         mode="multiple"
         :placeholder="placeholder"
@@ -10,10 +10,11 @@
         :disabled="disabled"
         :open="false"
         style="width: 100%;"
+        @click.native="visible=(buttons?visible:true)"
       />
     </a-col>
 
-    <a-col class="right">
+    <a-col v-if="buttons" class="right">
       <a-button type="primary" icon="search" :disabled="disabled" @click="visible=true">{{selectButtonText}}</a-button>
     </a-col>
 
@@ -57,6 +58,11 @@
         type: Boolean,
         default: true
       },
+      // 是否显示按钮，默认 true
+      buttons: {
+        type: Boolean,
+        default: true
+      },
 
       /* 可复用属性 */
 
@@ -153,5 +159,9 @@
     .right {
       width: #{$width};
     }
+
+    .full {
+      width: 100%;
+    }
   }
 </style>

ant-design-vue-jeecg/src/components/jeecgbiz/JSelectDepart.vue

@@ -11,7 +11,7 @@
       :modal-width="modalWidth"
       :multi="multi"
       :rootOpened="rootOpened"
-      :depart-id="value"
+      :depart-id="departIds"
       @ok="handleOK"
       @initComp="initComp"/>
   </div>
@@ -48,6 +48,11 @@
         type: Boolean,
         required: false,
         default: false
+      },
+      // 自定义返回字段，默认返回 id
+      customReturnField: {
+        type: String,
+        default: 'id'
       }
     },
     data(){
@@ -63,7 +68,9 @@
     },
     watch:{
       value(val){
-        this.departIds = val
+        if (this.customReturnField === 'id') {
+          this.departIds = val
+        }
       }
     },
     methods:{
@@ -73,21 +80,17 @@
       openModal(){
         this.$refs.innerDepartSelectModal.show()
       },
-      handleOK(rows,idstr){
-        console.log("当前选中部门",rows)
-        console.log("当前选中部门ID",idstr)
-        if(!rows){
+      handleOK(rows, idstr) {
+        let value = ''
+        if (!rows && rows.length <= 0) {
           this.departNames = ''
-          this.departIds=''
-        }else{
-          let temp = ''
-          for(let item of rows){
-            temp+=','+item.departName
-          }
-          this.departNames = temp.substring(1)
-          this.departIds=idstr
+          this.departIds = ''
+        } else {
+          value = rows.map(row => row[this.customReturnField]).join(',')
+          this.departNames = rows.map(row => row['departName']).join(',')
+          this.departIds = idstr
         }
-        this.$emit("change",this.departIds)
+        this.$emit("change", value)
       },
       getDepartNames(){
         return this.departNames

ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiUser.vue

@@ -5,7 +5,6 @@
     name="用户"
     displayKey="realname"
 
-    :returnKeys="returnKeys"
     :listUrl="url.list"
     :columns="columns"
     queryParamText="账号"
@@ -24,7 +23,6 @@
     props: ['value'],
     data() {
       return {
-        returnKeys: ['id', 'username'],
         url: { list: '/sys/user/list' },
         columns: [
           { title: '姓名', align: 'center', width: 100, dataIndex: 'realname' },
@@ -33,6 +31,17 @@
           { title: '出生日期', align: 'center', width: 100, dataIndex: 'birthday' }
         ]
       }
+    },
+    watch: {
+      $attrs: {
+        deep: true,
+        immediate: true,
+        handler(val) {
+          if (!val.returnKeys) {
+            val.returnKeys = ['id', 'username']
+          }
+        }
+      }
     }
   }
 </script>

ant-design-vue-jeecg/src/components/jeecgbiz/modal/JSelectDepartModal.vue

@@ -63,7 +63,7 @@
         handler() {
           if (this.departId) {
             this.checkedKeys = this.departId.split(",");
-            console.log('this.departId', this.departId)
+            // console.log('this.departId', this.departId)
           } else {
             this.checkedKeys = [];
           }
@@ -75,7 +75,6 @@
         this.visible=true
         this.checkedRows=[]
         this.checkedKeys=[]
-        console.log("this.multi",this.multi)
       },
       loadDepart(){
         queryDepartTreeList().then(res=>{
@@ -133,39 +132,29 @@
       },
       onCheck (checkedKeys,info) {
         if(!this.multi){
-          let arr = checkedKeys.checked.filter(item=>{
-            return this.checkedKeys.indexOf(item)<0
-          })
+          let arr = checkedKeys.checked.filter(item => this.checkedKeys.indexOf(item) < 0)
           this.checkedKeys = [...arr]
-          this.checkedRows=[info.node.dataRef]
+          this.checkedRows = (this.checkedKeys.length === 0) ? [] : [info.node.dataRef]
         }else{
           this.checkedKeys = checkedKeys.checked
-          this.checkedRows.push(info.node.dataRef)
+          this.checkedRows = this.getCheckedRows(this.checkedKeys)
         }
-        //this.$emit("input",this.checkedKeys.join(","))
-        //console.log(this.checkedKeys.join(","))
       },
-      onSelect (selectedKeys,info) {
-        console.log(selectedKeys)
+      onSelect(selectedKeys,info) {
         let keys = []
         keys.push(selectedKeys[0])
-        if(!this.checkedKeys || this.checkedKeys.length==0 || !this.multi){
+        if(!this.checkedKeys || this.checkedKeys.length===0 || !this.multi){
           this.checkedKeys = [...keys]
           this.checkedRows=[info.node.dataRef]
         }else{
           let currKey = info.node.dataRef.key
           if(this.checkedKeys.indexOf(currKey)>=0){
-            this.checkedKeys = this.checkedKeys.filter(item=>{
-              return item !=currKey
-            })
-            this.checkedRows=this.checkedRows.filter(item=>{
-              return item.key !=currKey
-            })
+            this.checkedKeys = this.checkedKeys.filter(item=> item !==currKey)
           }else{
-            this.checkedRows.push(info.node.dataRef)
             this.checkedKeys.push(...keys)
           }
         }
+        this.checkedRows = this.getCheckedRows(this.checkedKeys)
       },
       onExpand (expandedKeys) {
         this.expandedKeys = expandedKeys
@@ -215,6 +204,32 @@
         })
 
 
+      },
+      // 根据 checkedKeys 获取 rows
+      getCheckedRows(checkedKeys) {
+        const forChildren = (list, key) => {
+          for (let item of list) {
+            if (item.id === key) {
+              return item
+            }
+            if (item.children instanceof Array) {
+              let value = forChildren(item.children, key)
+              if (value != null) {
+                return value
+              }
+            }
+          }
+          return null
+        }
+
+        let rows = []
+        for (let key of checkedKeys) {
+          let row = forChildren(this.treeData, key)
+          if (row != null) {
+            rows.push(row)
+          }
+        }
+        return rows
       }
     }
   }

ant-design-vue-jeecg/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue

@@ -157,8 +157,9 @@
         console.log("props userIds: ", this.userIds)
         if (this.userIds) {
           let currUserIds = this.userIds
+          let userIdsArr = currUserIds.split(',');
           for (let item of this.dataSource) {
-            if (currUserIds.indexOf(item.username) >= 0) {
+            if (userIdsArr.includes(item.username)) {
               names += "," + item.realname
             }
           }