Merge branch 'master' of https://github.com/vueComponent/ant-design

Author: tangjinzhou

components/vc-upload/src/Upload.jsx

@@ -4,8 +4,8 @@ import BaseMixin from '../../_util/BaseMixin'
 import AjaxUpload from './AjaxUploader'
 import IframeUpload from './IframeUploader'
 
-// function empty () {
-// }
+function empty () {
+}
 
 const uploadProps = {
   componentTag: PropTypes.string,
@@ -47,8 +47,8 @@ export default {
     // onSuccess: empty,
     supportServerRender: false,
     multiple: false,
-    beforeUpload: null,
-    customRequest: null,
+    beforeUpload: empty,
+    customRequest: empty,
     withCredentials: false,
   }),
   data () {

site/routes.js

@@ -3,7 +3,7 @@ import Layout from './components/layout.vue'
 const AsyncTestComp = () => {
   const d = window.location.hash.replace('#', '')
   return {
-    component: import(`../components/tree/demo/${d}`),
+    component: import(`../components/vc-upload/demo/${d}`),
   }
 }