From ef31389965d2942bfa1770c88aeaf471542edc2e Mon Sep 17 00:00:00 2001
From: wangxueliang <wangxueliang@yidian-inc.com>
Date: Wed, 31 Oct 2018 19:06:21 +0800
Subject: [PATCH] feat: update upload to 2.6.0

---
 components/vc-upload/demo/drag.jsx        | 4 ++++
 components/vc-upload/index.js             | 2 +-
 components/vc-upload/src/AjaxUploader.jsx | 7 ++++---
 components/vc-upload/src/Upload.jsx       | 2 ++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/components/vc-upload/demo/drag.jsx b/components/vc-upload/demo/drag.jsx
index 48c1f343d..a56434894 100644
--- a/components/vc-upload/demo/drag.jsx
+++ b/components/vc-upload/demo/drag.jsx
@@ -10,6 +10,7 @@ export default {
         beforeUpload (file) {
           console.log('beforeUpload', file.name)
         },
+        openFileDialogOnClick: false,
       },
       on: {
         start (file) {
@@ -24,6 +25,9 @@ export default {
         error (err) {
           console.log('error', err)
         },
+        click () {
+          alert('click')
+        },
       },
       style: { display: 'inline-block', width: '200px', height: '200px', background: '#eee' },
     }
diff --git a/components/vc-upload/index.js b/components/vc-upload/index.js
index 2a2f3e4d5..7b0871dec 100644
--- a/components/vc-upload/index.js
+++ b/components/vc-upload/index.js
@@ -1,4 +1,4 @@
-// rc-upload 2.5.1
+// rc-upload 2.6.0
 import upload from './src'
 
 export default upload
diff --git a/components/vc-upload/src/AjaxUploader.jsx b/components/vc-upload/src/AjaxUploader.jsx
index ad7f4c735..991df58d3 100644
--- a/components/vc-upload/src/AjaxUploader.jsx
+++ b/components/vc-upload/src/AjaxUploader.jsx
@@ -31,6 +31,7 @@ const upLoadPropTypes = {
   customRequest: PropTypes.func,
   // onProgress: PropTypes.func,
   withCredentials: PropTypes.bool,
+  openFileDialogOnClick: PropTypes.bool,
 }
 
 const AjaxUploader = {
@@ -184,22 +185,22 @@ const AjaxUploader = {
   },
   render () {
     const {
-      componentTag: Tag, prefixCls, disabled, multiple, accept, directory,
+      componentTag: Tag, prefixCls, disabled, multiple, accept, directory, openFileDialogOnClick,
     } = this.$props
     const cls = classNames({
       [prefixCls]: true,
       [`${prefixCls}-disabled`]: disabled,
     })
     const events = disabled ? {} : {
-      click: this.onClick,
+      click: openFileDialogOnClick ? this.onClick : () => {},
       keydown: this.onKeyDown,
       drop: this.onFileDrop,
       dragover: this.onFileDrop,
     }
     const tagProps = {
       on: {
-        ...events,
         ...this.$listeners,
+        ...events,
       },
       attrs: {
         role: 'button',
diff --git a/components/vc-upload/src/Upload.jsx b/components/vc-upload/src/Upload.jsx
index 5b7c2f8e2..2087d7511 100644
--- a/components/vc-upload/src/Upload.jsx
+++ b/components/vc-upload/src/Upload.jsx
@@ -34,6 +34,7 @@ const uploadProps = {
   // onReady: PropTypes.func,
   withCredentials: PropTypes.bool,
   supportServerRender: PropTypes.bool,
+  openFileDialogOnClick: PropTypes.bool,
 }
 export default {
   name: 'Upload',
@@ -53,6 +54,7 @@ export default {
     multiple: false,
     beforeUpload: empty,
     withCredentials: false,
+    openFileDialogOnClick: true,
   }),
   data () {
     return {