From 123cfec441ab6f24d08a4e489e91e2bb593d1a17 Mon Sep 17 00:00:00 2001
From: tengge1 <930372551@qq.com>
Date: Mon, 20 May 2019 20:38:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E5=92=8C=E7=A6=81=E7=94=A8=E6=95=88=E6=9E=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ShadowEditor.UI/src/editor/EWorkspace.jsx | 2 +-
 ShadowEditor.UI/src/form/Button.jsx       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ShadowEditor.UI/src/editor/EWorkspace.jsx b/ShadowEditor.UI/src/editor/EWorkspace.jsx
index 9fd99de3..2eb8cee7 100644
--- a/ShadowEditor.UI/src/editor/EWorkspace.jsx
+++ b/ShadowEditor.UI/src/editor/EWorkspace.jsx
@@ -31,7 +31,7 @@ class EWorkspace extends React.Component {
                     <FormControl>
                         <Label>Button</Label>
                         <Button onClick={() => { alert('Default!'); }}>Default</Button>
-                        <Button color={'primary1'}>Primary</Button>
+                        <Button color={'primary'}>Primary</Button>
                         <Button color={'success'}>Success</Button>
                         <Button color={'warn'}>Warn</Button>
                         <Button color={'danger'}>Danger</Button>
diff --git a/ShadowEditor.UI/src/form/Button.jsx b/ShadowEditor.UI/src/form/Button.jsx
index d4a3ad44..b816e4fd 100644
--- a/ShadowEditor.UI/src/form/Button.jsx
+++ b/ShadowEditor.UI/src/form/Button.jsx
@@ -18,7 +18,7 @@ class Button extends React.Component {
 Button.propTypes = {
     className: PropTypes.string,
     style: PropTypes.object,
-    children: PropTypes.element,
+    children: PropTypes.node,
     color: PropTypes.oneOf(['primary', 'success', 'warn', 'danger']),
     disabled: PropTypes.bool,
 };
@@ -27,6 +27,7 @@ Button.defaultProps = {
     className: null,
     style: null,
     children: null,
+    color: null,
     disabled: false,
 };