t Merge branch 'feat-3.10.3' of https://github.com/vueComponent/ant-design-vue into feat-3.10.3

components/vc-switch/PropTypes.js

@@ -12,4 +12,5 @@ export const switchPropTypes = {
   checked: PropTypes.bool.def(false),
   defaultChecked: PropTypes.bool.def(false),
   autoFocus: PropTypes.bool.def(false),
+  loadingIcon: PropTypes.any,
 }

components/vc-switch/Switch.jsx

@@ -62,8 +62,6 @@ export default {
         this.setChecked(false)
       } else if (e.keyCode === 39) { // Right
         this.setChecked(true)
-      } else if (e.keyCode === 32 || e.keyCode === 13) { // Space, Enter
-        this.toggle()
       }
     },
     handleMouseUp (e) {
@@ -80,9 +78,8 @@ export default {
     },
   },
   render () {
-    const { prefixCls, disabled, tabIndex, ...restProps } = getOptionProps(this)
+    const { prefixCls, disabled, loadingIcon, ...restProps } = getOptionProps(this)
     const checked = this.stateChecked
-    const switchTabIndex = disabled ? -1 : (tabIndex || 0)
     const switchClassName = {
       [prefixCls]: true,
       [`${prefixCls}-checked`]: checked,
@@ -97,17 +94,21 @@ export default {
         mouseup: this.handleMouseUp,
       },
       attrs: {
-        tabIndex: switchTabIndex,
+        type: 'button',
+        role: 'switch',
+        'aria-checked': checked,
+        disabled,
       },
       class: switchClassName,
       ref: 'refSwitchNode',
     }
     return (
-      <span {...spanProps}>
+      <button {...spanProps}>
+        {loadingIcon}
         <span class={`${prefixCls}-inner`}>
           {checked ? getComponentFromProp(this, 'checkedChildren') : getComponentFromProp(this, 'unCheckedChildren')}
         </span>
-      </span>
+      </button>
     )
   },
 }

components/vc-switch/assets/index.less

@@ -9,6 +9,7 @@
   width: 44px;
   height: 22px;
   line-height: 20px;
+  padding: 0;
   vertical-align: middle;
   border-radius: 20px 20px;
   border: 1px solid #ccc;
@@ -21,6 +22,7 @@
     font-size: 12px;
     position: absolute;
     left: 24px;
+    top: 0;
   }
 
   &:after {

components/vc-switch/index.js

@@ -1,4 +1,4 @@
-// base rc-switch 1.6.0
+// base rc-switch 1.8.0
 import Switch from './Switch'
 
 export default Switch

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' },
     }

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

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',

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 {