From d9bba9f0d103caad3ac7c0536a80e7fa8699418c Mon Sep 17 00:00:00 2001
From: cuizhirong <cuizhirong@unitedstack.com>
Date: Thu, 18 Apr 2019 11:25:40 +0800
Subject: [PATCH] tip style prop

Change-Id: Id1f7e0221ffa7404b279818a36ba06a8288a5c8e
---
 js/components/tip/index.jsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/components/tip/index.jsx b/js/components/tip/index.jsx
index 49d0ce6..7b192c6 100644
--- a/js/components/tip/index.jsx
+++ b/js/components/tip/index.jsx
@@ -80,6 +80,10 @@ class Tip extends React.Component {
     let contentStyle = (props.width && iconType) ?
       {width: parseInt(props.width, 10) - 70} : null;
 
+    if (props.style) {
+      style = Object.assign({}, style, props.style);
+    }
+
     return (
       <div className={className} style={style}>
         {