bug fix

src/components/GlobalHeader/AvatarDropdown.jsx

@@ -18,6 +18,7 @@ class AvatarDropdown extends React.Component {
     const { key } = event;
 
     if (key === 'logout') {
+      console.log(this.props)
       const { dispatch } = this.props;
 
       if (dispatch) {
@@ -40,6 +41,18 @@ class AvatarDropdown extends React.Component {
   onCancel = (e) => {
     this.setState({ visible: false })
   }
+
+  onReset = (e) => {
+    const { dispatch } = this.props;
+
+      if (dispatch) {
+        dispatch({
+          type: 'login/logout',
+        });
+      }
+
+      return;
+  }
   
   render() {
     const {
@@ -82,7 +95,7 @@ class AvatarDropdown extends React.Component {
             <span className={styles.name}>{currentUser.userName}</span>
           </span>
         </HeaderDropdown>
-        <ShowPassword visible={this.state.visible} onCancel={(e) => this.onCancel(e)} />
+        <ShowPassword visible={this.state.visible} onCancel={(e) => this.onCancel(e)} onReset={(e => this.onReset(e))} />
       </>  
     ) : (
       <Spin

src/components/GlobalHeader/ShowPassword.jsx

@@ -26,11 +26,6 @@ function passwodForm(props) {
       if (!err) {
         request({ ...apis.user.changePassword, params: { ...values } }).then(() => {
           openNotificationWithIcon('success', '操作成功!')
-          window.localStorage.removeItem('test-foobar-center')      
-          router.push({
-            pathname: '/user/login',
-          });
-          props.form.resetFields()
           props.onSuccess()
         }).catch(error => {
           // openNotificationWithIcon('error', error.message)
@@ -41,7 +36,7 @@ function passwodForm(props) {
 
   // 弹框取消按钮
   function handlePopCancel(e) {
-    props.onSuccess()
+    props.onCancel()
   }
 
   const { getFieldDecorator } = props.form
@@ -111,8 +106,8 @@ export default class ShowPassword extends Component {
   }
 
   handleOk = e => {
-    console.log('关闭了')
-    this.props.onCancel()
+    console.log('修改密码成功')
+    this.props.onReset()
   };
 
   handleCancel = e => {
@@ -128,7 +123,7 @@ export default class ShowPassword extends Component {
           visible={this.state.visible}
           onCancel={this.handleCancel}
           footer={null}>
-          <WrappedShowPasswordForm onSuccess={(e) => this.handleCancel(e)} />
+          <WrappedShowPasswordForm onSuccess={(e) => this.handleOk(e)} onCancel={(e) => this.handleCancel(e)}/>
         </Modal>
       </>
     );

src/pages/UserManage/Editor/User.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Button, notification, Tree, message } from 'antd';
+import { Button, notification, Tree, message, Spin } from 'antd';
 import md5 from 'md5';
 import moment from 'moment';
 import router from 'umi/router';
@@ -177,6 +177,7 @@ export default props => {
       message.error('维护项目数量必须大于0')
       return
     }
+    
     setSubmitting(true)
     if (user && user.userId) {
       updateUser({ urlData: { id: user.userId }, data }).then((user) => {
@@ -203,5 +204,6 @@ export default props => {
     }
   }
 
-  return (<XForm onSubmit={handleSubmit} onCancel={handleCancel} fields={fields} submitting={submitting}></XForm>)
+  return (
+  <><Spin spinning={ submitting } size="large"><XForm onSubmit={handleSubmit} onCancel={handleCancel} fields={fields} submitting={submitting}></XForm></Spin></>)
 }

src/utils/request.js

@@ -92,7 +92,7 @@ request.interceptors.response.use(async (response, options) => {
           throw new Error('请登录系统');
         } else {
           notification.error({
-            message: `请登录系统`,
+            message: message,
             // description: message,
           });
           throw new Error(message);