From aa983a433cb0641a89cf84efdccf968a4fb6d57c Mon Sep 17 00:00:00 2001 From: tengge1 <930372551@qq.com> Date: Thu, 26 Dec 2019 21:06:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ShadowEditor.Web/src/ui/canvas/Canvas.jsx | 7 ++++--- ShadowEditor.Web/src/ui/icon/Icon.jsx | 7 ++++--- ShadowEditor.Web/src/ui/image/Image.jsx | 7 ++++--- ShadowEditor.Web/src/ui/image/ImageSelector.jsx | 10 ++++++---- ShadowEditor.Web/src/ui/image/ImageUploader.jsx | 13 ++++++++----- ShadowEditor.Web/src/ui/layout/AbsoluteLayout.jsx | 9 +++++---- ShadowEditor.Web/src/ui/layout/HBoxLayout.jsx | 7 ++++--- ShadowEditor.Web/src/ui/layout/VBoxLayout.jsx | 7 ++++--- 8 files changed, 39 insertions(+), 28 deletions(-) diff --git a/ShadowEditor.Web/src/ui/canvas/Canvas.jsx b/ShadowEditor.Web/src/ui/canvas/Canvas.jsx index 9438183f..c374bb20 100644 --- a/ShadowEditor.Web/src/ui/canvas/Canvas.jsx +++ b/ShadowEditor.Web/src/ui/canvas/Canvas.jsx @@ -19,18 +19,19 @@ class Canvas extends React.Component { className={classNames('Canvas', className)} style={style} ref={this.dom} - {...others}>; + {...others} + />; } } Canvas.propTypes = { className: PropTypes.string, - style: PropTypes.object, + style: PropTypes.object }; Canvas.defaultProps = { className: null, - style: null, + style: null }; export default Canvas; \ No newline at end of file diff --git a/ShadowEditor.Web/src/ui/icon/Icon.jsx b/ShadowEditor.Web/src/ui/icon/Icon.jsx index ae2185e8..3b233680 100644 --- a/ShadowEditor.Web/src/ui/icon/Icon.jsx +++ b/ShadowEditor.Web/src/ui/icon/Icon.jsx @@ -23,7 +23,8 @@ class Icon extends React.Component { name={name} value={value} title={title} - onClick={this.handleClick}>; + onClick={this.handleClick} + />; } handleClick(event) { @@ -41,7 +42,7 @@ Icon.propTypes = { value: PropTypes.string, icon: PropTypes.string, title: PropTypes.string, - onClick: PropTypes.func, + onClick: PropTypes.func }; Icon.defaultProps = { @@ -51,7 +52,7 @@ Icon.defaultProps = { value: null, icon: null, title: null, - onClick: null, + onClick: null }; export default Icon; \ No newline at end of file diff --git a/ShadowEditor.Web/src/ui/image/Image.jsx b/ShadowEditor.Web/src/ui/image/Image.jsx index 311baa40..e0040a78 100644 --- a/ShadowEditor.Web/src/ui/image/Image.jsx +++ b/ShadowEditor.Web/src/ui/image/Image.jsx @@ -21,7 +21,8 @@ class Image extends React.Component { style={style} src={src} title={title} - onError={this.handleError}>; + onError={this.handleError} + />; } handleError(event) { @@ -45,14 +46,14 @@ Image.propTypes = { className: PropTypes.string, style: PropTypes.object, src: PropTypes.string, - title: PropTypes.string, + title: PropTypes.string }; Image.defaultProps = { className: null, style: null, src: null, - title: null, + title: null }; export default Image; \ No newline at end of file diff --git a/ShadowEditor.Web/src/ui/image/ImageSelector.jsx b/ShadowEditor.Web/src/ui/image/ImageSelector.jsx index 586d0a72..49345451 100644 --- a/ShadowEditor.Web/src/ui/image/ImageSelector.jsx +++ b/ShadowEditor.Web/src/ui/image/ImageSelector.jsx @@ -22,12 +22,14 @@ class ImageSelector extends React.Component { className={classNames('ImageSelector', className)} style={style} src={value} - onClick={this.handleSelect} />; + onClick={this.handleSelect} + />; } else { return
+ onClick={this.handleSelect} + > {noImageText}
; } @@ -70,7 +72,7 @@ ImageSelector.propTypes = { name: PropTypes.string, value: PropTypes.any, noImageText: PropTypes.string, - onChange: PropTypes.func, + onChange: PropTypes.func }; ImageSelector.defaultProps = { @@ -79,7 +81,7 @@ ImageSelector.defaultProps = { name: null, value: null, noImageText: 'No Image', - onChange: null, + onChange: null }; export default ImageSelector; \ No newline at end of file diff --git a/ShadowEditor.Web/src/ui/image/ImageUploader.jsx b/ShadowEditor.Web/src/ui/image/ImageUploader.jsx index d94ed586..ff8392c9 100644 --- a/ShadowEditor.Web/src/ui/image/ImageUploader.jsx +++ b/ShadowEditor.Web/src/ui/image/ImageUploader.jsx @@ -17,15 +17,18 @@ class ImageUploader extends React.Component { render() { const { className, style, url, server, noImageText } = this.props; - if (url && url != 'null') { + if (url && url !== 'null') { return ; + onClick={this.handleSelect} + />; } else { return
+ onClick={this.handleSelect} + > {noImageText}
; } @@ -67,7 +70,7 @@ ImageUploader.propTypes = { url: PropTypes.string, server: PropTypes.string, noImageText: PropTypes.string, - onChange: PropTypes.func, + onChange: PropTypes.func }; ImageUploader.defaultProps = { @@ -76,7 +79,7 @@ ImageUploader.defaultProps = { url: null, server: '', noImageText: 'No Image', - onChange: null, + onChange: null }; export default ImageUploader; \ No newline at end of file diff --git a/ShadowEditor.Web/src/ui/layout/AbsoluteLayout.jsx b/ShadowEditor.Web/src/ui/layout/AbsoluteLayout.jsx index 201bfeb1..023d6ee4 100644 --- a/ShadowEditor.Web/src/ui/layout/AbsoluteLayout.jsx +++ b/ShadowEditor.Web/src/ui/layout/AbsoluteLayout.jsx @@ -12,13 +12,14 @@ class AbsoluteLayout extends React.Component { const position = { left: left || 0, - top: top || 0, + top: top || 0 }; return
{children}
; + {...others} + >{children}; } } @@ -27,7 +28,7 @@ AbsoluteLayout.propTypes = { style: PropTypes.object, children: PropTypes.node, left: PropTypes.string, - top: PropTypes.string, + top: PropTypes.string }; AbsoluteLayout.defaultProps = { @@ -35,7 +36,7 @@ AbsoluteLayout.defaultProps = { style: null, children: null, left: '0', - top: '0', + top: '0' }; export default AbsoluteLayout; \ No newline at end of file diff --git a/ShadowEditor.Web/src/ui/layout/HBoxLayout.jsx b/ShadowEditor.Web/src/ui/layout/HBoxLayout.jsx index 3fdbb0c5..a33713c9 100644 --- a/ShadowEditor.Web/src/ui/layout/HBoxLayout.jsx +++ b/ShadowEditor.Web/src/ui/layout/HBoxLayout.jsx @@ -13,20 +13,21 @@ class HBoxLayout extends React.Component { return
{children}
; + {...others} + >{children}; } } HBoxLayout.propTypes = { className: PropTypes.string, style: PropTypes.object, - children: PropTypes.node, + children: PropTypes.node }; HBoxLayout.defaultProps = { className: null, style: null, - children: null, + children: null }; export default HBoxLayout; \ No newline at end of file diff --git a/ShadowEditor.Web/src/ui/layout/VBoxLayout.jsx b/ShadowEditor.Web/src/ui/layout/VBoxLayout.jsx index fade0d3e..2ac07648 100644 --- a/ShadowEditor.Web/src/ui/layout/VBoxLayout.jsx +++ b/ShadowEditor.Web/src/ui/layout/VBoxLayout.jsx @@ -13,20 +13,21 @@ class VBoxLayout extends React.Component { return
{children}
; + {...others} + >{children}; } } VBoxLayout.propTypes = { className: PropTypes.string, style: PropTypes.object, - children: PropTypes.node, + children: PropTypes.node }; VBoxLayout.defaultProps = { className: null, style: null, - children: null, + children: null }; export default VBoxLayout; \ No newline at end of file