合并

src/pages/staff/list/addRole.jsx

@@ -30,7 +30,7 @@ const Poster = props => {
   const [dataButtonId, setDataButtonId] = useState([])
 
   useEffect(() => {
-    // 新增和编辑用一个页面，判断新增是否为0和null
+    // 新增和编辑用一个页面
     if (props.location.query) {
       const { id } = props.location.query
       if (id) {
@@ -100,21 +100,15 @@ const Poster = props => {
   // const [menus, setMenus] = useState([]);
   // 判断menus是否有值
   const [menus, setMenus] = useState([]);
-  const addMenus = m => {
-    const newMenus = [...menus, 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([m.menuId])
       delMenus(m)
     }
-    console.log('dataMenuId', dataMenuId)
-    console.log('menus', menus)
   }
 
   const [but, setBut] = useState([]);
@@ -122,8 +116,8 @@ const Poster = props => {
   const addBut = m => setBut([...but, m]);
   const delBut = m => setBut(but.filter(x => x.menuId !== m.menuId));
   const handleButChange = m => e => {
-    console.log('e', m)
     if (e.target.checked) {
+      setDataButtonId(dataButtonId.concat(m.btnId))
       addBut(m)
     } else {
       delBut(m)
@@ -138,74 +132,45 @@ const Poster = props => {
     textAlign: 'left',
     height: '72px',
   };
-  // 添加菜单
-  function addMenuList() {
-    request({
-      url: '/api/admin/updateAuthMenu',
-      method: 'PUT',
-      data: { sysMenu: menus },
-      // eslint-disable-next-line no-shadow
-    }).then(data => {
-      console.log(data)
-    })
-  }
 
-  // 添加按钮
-  function addButt() {
-    request({
-      url: '/api/admin/updateAuthMenu',
-      method: 'PUT',
-      data: { sysMenu: but },
-      // eslint-disable-next-line no-shadow
-    }).then(data => {
-      console.log(data)
-    })
+  function toRoleList(roleId) {
+    router.push({
+      pathname: '/staff/RoleList',
+    });
   }
-
-  // 添加按钮
-  function editAndAddRole() {
+  function updateAuthMenu(params) {
     request({
-      url: '/admin/editAndAddRole/{id}',
-      method: 'PUT',
-      data: { sysMenu: but },
+      url: '/api/admin/updateAuthMenu',
+      method: 'POST',
+      data: { ...params },
       // eslint-disable-next-line no-shadow
     }).then(data => {
-      console.log(data)
+      toRoleList()
     })
   }
 
-  function toRoleList(roleId) {
-    router.push({
-      pathname: '/staff/RoleList',
-    });
-  }
 
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
-      console.log('values', values)
-      // 保存菜单
-      // addMenuList()
-      // setm
-      const sumitMenu = [...data.sysMenuList, ...menus]
-      request({
-        url: '/api/admin/updateAuthMenu',
-        method: 'POST',
-        data: { sysMenu: sumitMenu, name: values.roleName, id: props.location.query.id },
-        // eslint-disable-next-line no-shadow
-      }).then(data => {
-        toRoleList()
-      })
+      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 })
+      } else {
+        updateAuthMenu({ sysMenu: menus, name: values.roleName, id: props.location.query.id, sysButton: but })
+        }
     });
   }
   const { getFieldDecorator } = props.form;
   return (
     <>
+       { console.log('dataButtonId', dataButtonId) }
       <div >
         <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
           <Form.Item label="角色名称">
             {getFieldDecorator('roleName', {
-              rules: [{ required: true, message: '请输入渠道名称' }],
+              rules: [{ required: true, message: '请输入角色名称' }],
             })(<Input className={channels.inpuit} />)}
 
           </Form.Item>