合并

src/pages/staff/list/addRole.jsx

   const [dataMenuId, setDataMenuId] = useState([])
   const [dataButtonId, setDataButtonId] = useState([])
 
-  const [loading, setLoading] = useState(true);
+  const [loading, setLoading] = useState(false);
 
   useEffect(() => {
     // 新增和编辑用一个页面
 
   // 根据角色id查询当前的菜单及其按钮
   function buttonAndMenuList(params, ids) {
+    setLoading(true)
     request({ ...apis.role.buttonAndMenuList, urlData: { id: ids }, params: { ...params } }).then(data => {
       setLoading(false)
       props.form.setFieldsValue({ roleName: data.roleName })