合并

src/pages/staff/list/addRole.jsx

@@ -17,7 +17,6 @@ const { TextArea } = Input;
  * @returns
  */
 const Poster = props => {
-  console.log('props,props', props.user.currentUser)
   const userMenus = props.user.currentUser.menus;
   const userBtns = props.user.currentUser.buttons;
 
@@ -79,47 +78,53 @@ const Poster = props => {
       setData(data)
 
       // 获取所有的权限Id
-      setDataMenuId(data.sysMenuList.map(item => item.menuId))
-      setDataButtonId((data.sysMenuList.map(item => item.sysButtonInMenu.map(btn => btn.btnId).join(',')).filter(f => f !== '').join(',').split(',')).map(a => parseInt(a)))
-    })
-  }
-  // 添加角色
-  function addRole(params) {
-    request({
-      url: '/api/admin/taRole/',
-      method: 'GET',
-      params: { ...params },
-      // eslint-disable-next-line no-shadow
-    }).then(data => {
-      console.log(data)
-      setData(data)
+      if (data.sysMenuList) {
+        setDataMenuId(data.sysMenuList.map(item => item.menuId))
+        setDataButtonId((data.sysMenuList.map(item => item.sysButtonInMenu && item.sysButtonInMenu.map(btn => btn.btnId).join(',')).filter(f => f !== '').join(',').split(',')).map(a => parseInt(a)))
+      }
     })
   }
+  // // 添加角色
+  // function addRole(params) {
+  //   request({
+  //     url: '/api/admin/taRole/',
+  //     method: 'GET',
+  //     params: { ...params },
+  //     // eslint-disable-next-line no-shadow
+  //   }).then(data => {
+  //     console.log(data)
+  //     setData(data)
+  //   })
+  // }
 
 
   // const [menus, setMenus] = useState([]);
   // 判断menus是否有值
   const [menus, setMenus] = useState([]);
-  const addMenus = m => setMenus([...menus, m]);
+
+  const addMenus = m => setMenus([...menus, m])
   const delMenus = m => setMenus(menus.filter(x => x.menuId !== m.menuId));
+
   const handleMenuChange = m => e => {
     if (e.target.checked) {
       setDataMenuId(dataMenuId.concat(m.menuId))
       addMenus(m)
     } else {
+      setDataMenuId(dataMenuId.filter(item => item !== m.menuId));
       delMenus(m)
     }
   }
 
   const [but, setBut] = useState([]);
   // 判断menus是否有值
-  const addBut = m => setBut([...but, m]);
+  const addBut = m => setBut([...but, m])
   const delBut = m => setBut(but.filter(x => x.menuId !== m.menuId));
   const handleButChange = m => e => {
     if (e.target.checked) {
       setDataButtonId(dataButtonId.concat(m.btnId))
       addBut(m)
     } else {
+      setDataButtonId(dataButtonId.filter(item => item !== m.btnId));
       delBut(m)
     }
   }
@@ -133,7 +138,7 @@ const Poster = props => {
     height: '72px',
   };
 
-  function toRoleList(roleId) {
+  function toRoleList() {
     router.push({
       pathname: '/staff/RoleList',
     });
@@ -154,9 +159,13 @@ const Poster = props => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (props.location.query.id !== undefined) {
-        const sumitMenu = data.sysMenuList.concat(menus)
-        const sumitBut = data.sysMenuList[0].sysButtonInMenu.concat(but)  
-        updateAuthMenu({ sysMenu: sumitMenu, name: values.roleName, id: props.location.query.id, sysButton: sumitBut })
+        console.log('menus', menus)
+      
+        const sumitMenu = userMenus.filter(item => dataMenuId.includes(item.menuId))
+        const sumitBtn = userMenus.filter(item => dataButtonId.includes(item.btnId))
+        // console.log('sumitMenu', sumitMenu)
+        // const sumitBut = data.sysMenuList[0].sysButtonInMenu.concat(but)
+        updateAuthMenu({ sysMenu: sumitMenu, name: values.roleName, id: props.location.query.id, sysButton: sumitBtn })
       } else {
         updateAuthMenu({ sysMenu: menus, name: values.roleName, id: props.location.query.id, sysButton: but })
         }
@@ -165,7 +174,6 @@ const Poster = props => {
   const { getFieldDecorator } = props.form;
   return (
     <>
-       { console.log('dataButtonId', dataButtonId) }
       <div >
         <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
           <Form.Item label="角色名称">
@@ -214,7 +222,7 @@ const Poster = props => {
             <Button type="primary" htmlType="submit">
               保存
           </Button>
-            <Button className={channels.formButton} htmlType="submit">
+            <Button className={channels.formButton} htmlType="submit" onChange = {toRoleList}>
               取消
           </Button>
           </Form.Item>