Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

src/pages/staff/list/addRole.jsx

 import React, { useState, useEffect } from 'react';
-import { Checkbox, Input, Card } from 'antd';
+import { Checkbox, Input, Card, Form, Button } from 'antd';
 import { connect } from 'dva';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import request from '../../../utils/request';
 import channels from './channelList.less';
 import { resolve } from 'path';
-
 const { TextArea } = Input;
 
 
  * @param {*} props
  * @returns
  */
-const add = props => {
-  const Poster = propses => {
+  const Poster = props => {
     console.log('props,props', props.user.currentUser)
     const userMenus = props.user.currentUser.menus;
     const userBtns = props.user.currentUser.buttons;
-    const [data, setData] = useState({ data: [] })
+
    // 获取当前所有菜单
+   const [data, setData] = useState({ data: [] })
+   const [buutonDate, setBuutonDate] = useState({ })
     useEffect(() => {
       localStorage.removeItem('value');
       menuList({ pageNum: 1, pageSize: 100 })
+      buttonList({ pageNum: 1, pageSize: 100 })
+      // buttonAndMenuList()
     }, [])
-  
+
     function menuList(params) {
       request({
         url: '/api/admin/menuList',
         setData(data)
     })
     }
+    // 所有按钮
+    function buttonList(params) {
+      request({
+        url: '/api/admin/buttonList',
+        method: 'GET',
+        params: { ...params },
+    // eslint-disable-next-line no-shadow
+    }).then(data => {
+        console.log(data)
+        setBuutonDate(data)
+    })
+    }
 
+    // 根据角色id查询当前的菜单及其按钮
+    function buttonAndMenuList(params) {
+      request({
+        url: `/api/admin/taRole/details/${2}`,
+        method: 'GET',
+        params: { ...params },
+    // eslint-disable-next-line no-shadow
+    }).then(data => {
+        console.log(data)
+        setData(data)
+    })
+    }
 
     // const [menus, setMenus] = useState([]);
-// 判断menus是否有值
+    // 判断menus是否有值
     const [menus, setMenus] = useState([]);
-
-
     const addMenus = m => {
-      const newMenus = [...menus, m]
-      setMenus([...menus, m])
+    const newMenus = [...menus, m]
+          setMenus([...menus, m])
     };
     const delMenus = m => setMenus(menus.filter(x => x.menuId !== m.menuId));
     const handleMenuChange = m => e => {
       } else {
         delMenus(m)
       }
-      console.log('menus1111', menus)
     }
 
     const [but, setBut] = useState([]);
           } else {
             delBut(m)
           }
-          // console.log('menus', menus)
-
-          console.log('menus', menus)
-          console.log('but', but)
         }
-
-    const dataSource = [
-      {
-        name: '员工管理',
-        per: [
-          '111111',
-          '22222',
-          '33333',
-        ],
-      },
-      {
-        name: '角色管理',
-        per: [
-          '444',
-          '555',
-          '666',
-        ],
-      },
-    ];
-
-
     const gridStyle1 = {
       width: '20%',
       textAlign: 'left',
       height: '69px',
     };
 
+    function handleSubmit (e) {
+      e.preventDefault();
+      props.form.validateFields((err, values) => {
+        request({
+          url: '/api/admin/updateAuthMenu',
+          method: 'PUT',
+          data: { sysMenu: menus },
+      // eslint-disable-next-line no-shadow
+      }).then(data => {
+          console.log(data)
+          setData(data)
+      })
+      });
+    }
+    const { getFieldDecorator } = props.form;
     return (
     <>
       <div >
-        {/* { console.log('userMenus', userMenus) }
-        { console.log('userBtns', userBtns) } */}
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="渠道名称">
+          {getFieldDecorator('channelName', {
+            rules: [{ required: true, message: '请输入渠道名称' }],
+          })(<Input className={channels.inpuit} />)}
+
+        </Form.Item>
         {userMenus.map(item => (
           (item.parentCode === '-1') &&
           <Card title={<Checkbox onChange={handleMenuChange(item)}>{item.name}</Checkbox>} bordered style={{ width: '100%', alignItems: 'center' }} >
                           <Checkbox onChange={handleMenuChange(menu)}>{menu.name}</Checkbox>
                       </Card.Grid>
                       <Card.Grid style={gridStyle2}>
-                        {userBtns.map(btn => (
+                        {buutonDate.length > 0 && buutonDate.map(btn => (
                           <>
                             {
                               btn.menuId === menu.menuId &&
               }
           </Card>
         ))}
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <Button type="primary" htmlType="submit">
+            保存
+          </Button>
+          <Button className={channels.formButton} type="primary" htmlType="submit">
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
       </div>
     </>
     )
   }
-  
-  const fields = [
-    {
-      label: '角色名称',
-      name: 'roleName',
-      type: FieldTypes.Text,
-      // placeholder: '名称',
-      value: ''
-    },
-    {
-      label: '简介',
-      name: 'roleIntroduction',
-      render: <TextArea className={channels.inpuitTxt} ></TextArea>,
-      value: ''
-
-    },
-
-    {
-      label: '菜单权限',
-      name: 'rolePermission',
-      render:
-        <>
-          <div>
-            <Poster/>
-          </div>
-        </>,
-    },
-
-  ]
-  const handleSubmit = val => {
-    window.console.log('submit data --->', val)
-    request({
-      url: '/api/admin/menuList',
-      method: 'POST',
-      params: { ...params },
-  // eslint-disable-next-line no-shadow
-  }).then(data => {
-      console.log(data)
-  })
-  }
-  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
-}
-export default connect(({ user }) => ({ user }))(add);
+const WrappedNormalLoginForm = Form.create({ name: 'Poster' })(Poster);
+export default connect(({ user }) => ({ user }))(WrappedNormalLoginForm);

src/pages/staff/list/editRole.jsx

       render:
         <>
           <div>
-            <Poster value="111111" />
+            <Poster/>
           </div>
         </>,
     },