From 335eb0c246f3a31e4ed0e1da0e8bc174b7a8a785 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 13 Apr 2017 17:33:08 +0800
Subject: [PATCH] Fix style prop of Upload.Dragger

---
 components/upload/Dragger.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/upload/Dragger.tsx b/components/upload/Dragger.tsx
index 6bfe50df73..1151c206bf 100644
--- a/components/upload/Dragger.tsx
+++ b/components/upload/Dragger.tsx
@@ -7,6 +7,6 @@ export type DraggerProps = UploadProps & { height?: number };
 export default class Dragger extends React.Component<DraggerProps, any> {
   render() {
     const { props } = this;
-    return <Upload {...props} type="drag" style={{ height: props.height }}/>;
+    return <Upload {...props} type="drag" style={{ ...props.style, height: props.height }}/>;
   }
 }