bug fix

config/config.js

@@ -83,6 +83,7 @@ export default {
   },
   publicPath: './',
   history: 'hash',
+  treeShaking: true,
   devtool: isAntDesignProPreview ? 'source-map' : false,
   // umi routes: https://umijs.org/zh/guide/router.html
   routes,

src/components/XForm/ImageUpload.jsx

@@ -16,28 +16,39 @@ class ImageUpload extends React.Component {
       this.setState({ loading: true });
       return;
     }
+    
+    if (info.file.status === 'removed') {
+      this.props.onChange();
+    }
 
-    if (info.file.status === "done") {
-      this.setState({
-        loading: false,
-      })
+    // if (info.file.status === "done") {
+    //   this.setState({
+    //     loading: false,
+    //   })
 
-      if (info.file.response && info.file.response.url) {
-        this.setState({
-          imageUrl: info.file.response.thumbUrl,
-        });
+    //   if (info.file.response && info.file.response.url) {
+    //     this.setState({
+    //       imageUrl: info.file.response.thumbUrl,
+    //     });
 
-        if (typeof this.props.onChange === 'function') {
-          this.props.onChange(info.file.response.url);
-        }
-      }
-    }
+    //     if (typeof this.props.onChange === 'function') {
+    //       this.props.onChange(info.file.response.url);
+    //     }
+    //   }
+    // }
   };
 
-  render () {
+  handleUploadSucess = (url) => {
+    this.setState({ loading: false });
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(url);
+    }
+  }
+
+  render() {
     const uploadButton = (
       <div>
-        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"} />        
+        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"} />
       </div>
     );
 
@@ -50,14 +61,14 @@ class ImageUpload extends React.Component {
         showUploadList={false}
         beforeUpload={this.props.beforeUpload}
         onChange={this.handleChange}
-
         {...uploaderProps}
+        onSuccess={this.handleUploadSucess}
       >
         {(this.state.imageUrl || value) ? (
           <img src={this.state.imageUrl || value} alt="avatar" style={{ width: "100%" }} />
         ) : (
-          uploadButton
-        )}
+            uploadButton
+          )}
       </Upload>
     );
   }

src/layouts/BasicLayout.jsx

@@ -54,6 +54,15 @@ const footerRender = (_, defaultDom) => {
   )
 };
 
+const menuHeaderRender = (logo, title) => {
+  return (
+    <Link to="/">
+      {logo}
+      {title}
+    </Link>
+  );
+}
+
 const BasicLayout = props => {
   const { dispatch, children, settings } = props;
   /**
@@ -114,6 +123,7 @@ const BasicLayout = props => {
       }}
       footerRender={footerRender}
       menuDataRender={menuDataRender}
+      menuHeaderRender={menuHeaderRender}
       // formatMessage={formatMessage}
       rightContentRender={rightProps => <RightContent {...rightProps} />}
       {...props}

src/pages/UserManage/Editor/User.jsx

@@ -80,9 +80,9 @@ export default (props) => {
       loginPassword: md5(defaultPass),
     }
 
+    const data = { ...user, ...dt }
     setSubmitting(true)
     if (user && user.userId) {
-      const data = { ...user, ...dt }
       updateUser({ urlData: { id: user.userId }, data }).then((user) => {
         setSubmitting(false)
         notification.success({message: '编辑信息成功'})

src/pages/UserManage/index.jsx

@@ -45,6 +45,12 @@ export default (props) => {
     }).catch()
   }, []);
 
+  const changeMemberStatus = (member, status) => {
+    setMembers(members.map((mem) => {
+      return mem.userId === member.userId ? { ...member, status } : mem
+    }))
+  }
+
   const CardBody = (cbProps) => {
     const handleSwitch = (on) => () => {
       if (!on) {
@@ -52,13 +58,17 @@ export default (props) => {
           title: '确定禁用当前用户?',
           onOk() {
             turnMember({ urlData: { type: 'off', id: cbProps.userId } }).then(() => {
-              notification.success({ message: '禁用成功'})
+              notification.success({ message: '禁用成功'});
+              // window.location.reload();
+              changeMemberStatus(cbProps, 9)
             }).catch()
           },
         });
       } else {
         turnMember({ urlData: { type: 'on', id: cbProps.userId } }).then(() => {
-          notification.success({ message: '开启成功'})
+          notification.success({ message: '开启成功'});
+          // window.location.reload();
+          changeMemberStatus(cbProps, 1)
         }).catch()
       }
     }

src/services/apis.js

@@ -75,11 +75,16 @@ const apis = {
     },
   },
   image: {
-    upload: {
+    uploadForAnt: {
       url: `${prefix}/antd/image`,
       method: 'POST',
       action: 'center',
-    }
+    },
+    upload: {
+      url: `${prefix}/image`,
+      method: 'POST',
+      action: 'center',
+    },
   },
 }
 

src/utils/request.js

@@ -26,43 +26,46 @@ const codeMessage = {
 };
 
 const replaceURLParams = (url, params = {}) => {
-  return Object.keys(params).reduce((acc, k) => {
-    // 此方法对每个元素进行处理
-    const re = new RegExp(`:${k}(?!w)`, 'i');
-    return acc.replace(re, params[k]);
-  }, url);
-};
+  return Object.keys(params).reduce((acc, k) => { // 此方法对每个元素进行处理
+    const re = new RegExp(`:${k}(?!w)`, 'i')
+    return acc.replace(re, params[k])
+  }, url)
+}
 
 request.interceptors.request.use((url, options) => {
-  const { urlData, headers = {}, logout = false, login = false, action, data, ...opts } = options;
-  const apiURL = urlData ? replaceURLParams(url, urlData) : url;
-  const token = mixStr(window.localStorage.getItem('test-foobar'));
+  const { urlData, headers = {}, logout = false, login = false, action, data, ...opts } = options
+  const apiURL = urlData ? replaceURLParams(url, urlData) : url
+  const token = mixStr(window.localStorage.getItem('test-foobar'))
 
   if (login || logout) {
-    window.localStorage.removeItem('test-foobar');
+    window.localStorage.removeItem('test-foobar')
   }
 
-  const authHeader = !login ? { Authorization: `Bearer ${token}` } : {};
-  const actionHeader = action ? { 'X-ACTION': action } : {};
+  const authHeader = !login ? { Authorization: `Bearer ${token}` } : {}
+  const actionHeader = action ? { 'X-ACTION': action  }: {}
 
-  return {
-    url: apiURL,
-    options: {
-      ...opts,
-      headers: {
-        ...authHeader,
-        ...actionHeader,
-        ...headers,
+  return (
+    {
+      url: apiURL,
+      options: {
+        ...opts,
+        headers: {
+          ...authHeader,
+          ...actionHeader,
+          ...headers,
+        },
+        data,
+        requestType: data instanceof FormData ? 'form' : 'json',
+        credentials: 'include', // 带 cookie
+        interceptors: true,
+        getResponse: true,
       },
-      data,
-      requestType: data instanceof FormData ? 'form' : 'json',
-      credentials: 'include', // 带 cookie
-      interceptors: true,
-    },
-  };
+    }
+  );
 });
 
 request.interceptors.response.use(async (response, options) => {
+
   if (response && response.status) {
     if (response.status != 200) {
       const errorText = codeMessage[response.status] || response.statusText;
@@ -73,6 +76,12 @@ request.interceptors.response.use(async (response, options) => {
       });
       throw new Error(response.statusText);
     } else {
+      console.log('response.headers: ', response.headers)
+      console.log('response.headers.Content-Type: ', response.headers.get('Content-Type'))
+      if (response.headers.get('Content-Type') === 'application/octet-stream;charset=utf-8') {
+        return await response.clone().blob();
+      }
+
       const { code, data, message } = await response.clone().json();
       if (code != 1000) {
         if (code === 1001) {
@@ -91,7 +100,7 @@ request.interceptors.response.use(async (response, options) => {
       }
 
       if (data && data.token) {
-        window.localStorage.setItem('test-foobar', mixStr(data.token));
+        window.localStorage.setItem('test-foobar', mixStr(data.token))
       }
 
       return data;
@@ -104,15 +113,16 @@ request.interceptors.response.use(async (response, options) => {
   }
 });
 
-const fetch = api => options => request(api.url, { ...api, ...(options || {}) });
+
+const fetch = api => options => request(api.url, {...api, ...options || {}})
 
 export default config => {
   if (typeof config === 'string') {
     return request(config);
   } else {
-    const { url, ...options } = config;
+    const {url, ...options} = config;
     return request(url, options);
   }
 };
 
-export { fetch, apis };
+export { fetch, apis }

src/utils/upload.js

@@ -1,11 +1,39 @@
-import apis from '../services/apis';
+import { fetch, apis } from './request';
+import mixStr from './mixStr';
+
+const getToken = () => mixStr(window.localStorage.getItem('test-foobar'))
+
+const uploadImage = fetch(apis.image.upload)
 
 const uploaderProps = {
   name: 'file',
-  action: apis.image.upload.url,
-  headers: {
-    Authorization: `Bearer ${window.localStorage.getItem('x-token')}`
-  }
+  // action: apis.image.uploadForAnt.url,
+  accept: '.png, .jpg, .jpeg, .gif',
+  // headers: {
+  //   Authorization: `Bearer ${getToken()}`
+  // },
+  customRequest({
+    action,
+    file,
+    headers,
+    onError,
+    onProgress,
+    onSuccess,
+    withCredentials,
+  }) {
+    const data = new FormData()
+    data.append('file', file)
+
+    uploadImage({ data }).then((img) => {
+      onSuccess(img, file);
+    }).catch(onError);
+
+    return {
+      abort() {
+        console.log('upload progress is aborted.');
+      },
+    };
+  },
 }
 
 export { uploaderProps }