Merge remote-tracking branch 'origin/master'

_web/src/views/system/role/roleMenuForm.vue

@@ -19,15 +19,13 @@
             v-model="checkedKeys"
             multiple
             checkable
-            checkStrictly
             :auto-expand-parent="autoExpandParent"
             :expanded-keys="expandedKeys"
             :tree-data="menuTreeData"
             :selected-keys="selectedKeys"
             :replaceFields="replaceFields"
             @expand="onExpand"
-            @select="onSelect"
+            @check="onCheck"
-            @check="treeCheck"
           />
         </a-form-item>
 
@@ -66,10 +64,11 @@
       replaceFields: {
         key: 'id'
       },
-        form: this.$form.createForm(this)
+      form: this.$form.createForm(this),
+      commitKeys: [],
+      leastChilds: []
     }
   },
-
   methods: {
     // 初始化方法
     roleMenu(record) {
@@ -77,68 +76,99 @@
       this.roleEntity = record
       this.visible = true
       this.getMenuTree()
-        this.expandedMenuKeys(record)
     },
 
     /**
      * 获取菜单列表
      */
     getMenuTree() {
+      const _this = this
       SysMenuTreeForGrant().then((res) => {
         if (res.success) {
-             this.menuTreeData = res.data
+          _this.menuTreeData = res.data
+          _this.getLeastChilds(res.data)
           // 默认展开目录级
-             this.menuTreeData.forEach(item => {
+          _this.menuTreeData.forEach(item => {
-               this.expandedKeys.push(item.id)
+            _this.expandedKeys.push(item.id)
           })
+
+          _this.expandedMenuKeys(_this.roleEntity)
         }
       })
     },
 
+    getLeastChilds(data){
+      for (let i = 0; i < data.length; i++) {
+        this.pushLeastChilds(data[i])
+      }
+    },
+
+    pushLeastChilds(e) {
+      if (e.children.length > 0) {
+        this.getLeastChilds(e.children)
+        return
+      }
+      this.leastChilds.push(e.id)
+    },
+
     /**
      * 此角色已有菜单权限
      */
     expandedMenuKeys(record) {
+      const _this = this
       sysRoleOwnMenu({id: record.id}).then((res) => {
         if (res.success) {
-            this.checkedKeys = res.data
+          _this.pickCheckedKeys(res.data)
+          _this.commitKeys = res.data
         }
-          this.formLoading = false
+        _this.formLoading = false
       })
     },
 
-      treeCheck (checkKeys) {
+    pickCheckedKeys(data){
+      for (let i = 0; i < data.length; i++) {
+        if (this.leastChilds.includes(data[i])) {
+          this.checkedKeys.push(data[i])
+        }
+      }
     },
+
     onExpand(expandedKeys) {
       this.expandedKeys = expandedKeys
       this.autoExpandParent = false
     },
-      onCheck (checkedKeys) {
+
+    onCheck(checkedKeys, info) {
       this.checkedKeys = checkedKeys
+      this.commitKeys = checkedKeys.concat(info.halfCheckedKeys);
     },
+
     onSelect(selectedKeys, info) {
+      console.log(selectedKeys)
+      console.log(info)
       this.selectedKeys = selectedKeys
     },
 
     handleSubmit() {
+      const _this = this;
       const {form: {validateFields}} = this
       this.confirmLoading = true
       validateFields((errors, values) => {
         if (!errors) {
-            sysRoleGrantMenu({ id: this.roleEntity.id, grantMenuIdList: this.checkedKeys.checked }).then((res) => {
+          sysRoleGrantMenu({id: _this.roleEntity.id, grantMenuIdList: _this.commitKeys}).then((res) => {
             if (res.success) {
-                this.$message.success('授权成功')
+              _this.$message.success('授权成功')
-                this.confirmLoading = false
+              _this.confirmLoading = false
-                this.$emit('ok', values)
+              _this.$emit('ok', values)
-                this.handleCancel()
+              _this.handleCancel()
             } else {
-                this.$message.error('授权失败：' + res.message)
+              _this.$message.error('授权失败：' + res.message)
             }
           }).finally((res) => {
-              this.confirmLoading = false
+            _this.confirmLoading = false
           })
         } else {
-            this.confirmLoading = false
+          _this.confirmLoading = false
         }
       })
     },

_web/src/views/system/role/roleOrgForm.vue

@@ -28,14 +28,13 @@
             <a-tree
               v-model="checkedKeys"
               checkable
-              checkStrictly
               :auto-expand-parent="autoExpandParent"
               :expanded-keys="expandedKeys"
               :tree-data="orgTreeData"
               :selected-keys="selectedKeys"
               :replaceFields="replaceFields"
               @expand="onExpand"
-              @select="onSelect"
+              @check="onCheck"
             />
           </a-form-item>
         </div>
@@ -76,7 +75,9 @@
         replaceFields: {
           key: 'id'
         },
-        form: this.$form.createForm(this)
+        form: this.$form.createForm(this),
+        commitKeys: [],
+        leastChilds: []
       }
     },
 
@@ -110,8 +111,6 @@
           this.orgTreeShow = true
           // 获取机构树
           this.getOrgTree()
-          // 已关联数据
-          this.sysRoleOwnData(this.roleEntity)
         } else {
           this.orgTreeShow = false
           // 清理已选中机构
@@ -123,13 +122,19 @@
        * 获取机构树
        */
       getOrgTree () {
+        const _this = this
         getOrgTree().then((res) => {
            if (res.success) {
              this.orgTreeData = res.data
+
+             _this.getLeastChilds(res.data)
              // 默认展开
              this.orgTreeData.forEach(item => {
                this.expandedKeys.push(item.id)
              })
+
+             // 已关联数据
+             this.sysRoleOwnData(_this.roleEntity)
            }
         })
       },
@@ -138,34 +143,57 @@
        * 此角色已有数据列表
        */
       sysRoleOwnData (record) {
+        const _this = this
         sysRoleOwnData({ id: record.id }).then((res) => {
           if (res.success) {
-            console.log(JSON.stringify(res.data))
+            _this.pickCheckedKeys(res.data)
-            this.checkedKeys = res.data
+            _this.commitKeys = res.data
           }
           this.formLoading = false
         })
       },
 
+      getLeastChilds(data){
+        for (let i = 0; i < data.length; i++) {
+          this.pushLeastChilds(data[i])
+        }
+      },
+
+      pushLeastChilds(e) {
+        if (e.children.length > 0) {
+          this.getLeastChilds(e.children)
+          return
+        }
+        this.leastChilds.push(e.id)
+      },
+
+      pickCheckedKeys(data){
+        for (let i = 0; i < data.length; i++) {
+          if (this.leastChilds.includes(data[i])) {
+            this.checkedKeys.push(data[i])
+          }
+        }
+      },
+
       onExpand (expandedKeys) {
         this.expandedKeys = expandedKeys
         this.autoExpandParent = false
       },
-      onCheck (checkedKeys) {
+      onCheck (checkedKeys, info) {
-        console.log(JSON.stringify(checkedKeys))
         this.checkedKeys = checkedKeys
+        this.commitKeys = checkedKeys.concat(info.halfCheckedKeys);
       },
       onSelect (selectedKeys, info) {
         this.selectedKeys = selectedKeys
       },
 
       handleSubmit () {
+        const _this = this
         const { form: { validateFields } } = this
         this.confirmLoading = true
         validateFields((errors, values) => {
           if (!errors) {
-            const checkedKeys = this.checkedKeys.checked === undefined ? this.checkedKeys : this.checkedKeys.checked
+            sysRoleGrantData({ id: this.roleEntity.id, grantOrgIdList: _this.commitKeys, dataScopeType: values.dataScopeType }).then((res) => {
-            sysRoleGrantData({ id: this.roleEntity.id, grantOrgIdList: checkedKeys, dataScopeType: values.dataScopeType }).then((res) => {
               this.confirmLoading = false
               if (res.success) {
                 this.$message.success('授权成功')