From ae37c84f3ee2959b7ee63dfa5bc37672cb983eee Mon Sep 17 00:00:00 2001
From: liteng <930372551@qq.com>
Date: Wed, 31 Jul 2019 07:33:46 +0800
Subject: [PATCH] TextureProperty

---
 ShadowEditor.Web/src/ui/form/Input.jsx             |  6 ++++--
 ShadowEditor.Web/src/ui/form/css/Input.css         |  4 ++++
 .../src/ui/property/TextureProperty.jsx            | 14 ++++++++------
 .../src/ui/property/css/TextureProperty.css        |  3 +++
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ShadowEditor.Web/src/ui/form/Input.jsx b/ShadowEditor.Web/src/ui/form/Input.jsx
index 6cb4f514..c906013f 100644
--- a/ShadowEditor.Web/src/ui/form/Input.jsx
+++ b/ShadowEditor.Web/src/ui/form/Input.jsx
@@ -15,12 +15,12 @@ class Input extends React.Component {
     }
 
     render() {
-        const { className, style, name, type, value, min, max, step, disabled } = this.props;
+        const { className, style, name, type, value, min, max, step, show, disabled } = this.props;
 
         let val = value === undefined || value === null ? '' : value;
 
         return <input
-            className={classNames('Input', className)}
+            className={classNames('Input', !show && 'hidden', className)}
             style={style}
             type={type}
             value={val}
@@ -77,6 +77,7 @@ Input.propTypes = {
     step: PropTypes.number,
     precision: PropTypes.number,
     disabled: PropTypes.bool,
+    show: PropTypes.bool,
     onChange: PropTypes.func,
     onInput: PropTypes.func,
 };
@@ -92,6 +93,7 @@ Input.defaultProps = {
     step: null,
     precision: 3,
     disabled: false,
+    show: true,
     onChange: null,
     onInput: null,
 };
diff --git a/ShadowEditor.Web/src/ui/form/css/Input.css b/ShadowEditor.Web/src/ui/form/css/Input.css
index 8b378228..fcc69735 100644
--- a/ShadowEditor.Web/src/ui/form/css/Input.css
+++ b/ShadowEditor.Web/src/ui/form/css/Input.css
@@ -6,4 +6,8 @@
     border: 1px solid rgb(217, 217, 217);
     box-sizing: border-box;
     vertical-align: top;
+}
+
+.Input.hidden {
+    display: none;
 }
\ No newline at end of file
diff --git a/ShadowEditor.Web/src/ui/property/TextureProperty.jsx b/ShadowEditor.Web/src/ui/property/TextureProperty.jsx
index eb927e69..7e56d632 100644
--- a/ShadowEditor.Web/src/ui/property/TextureProperty.jsx
+++ b/ShadowEditor.Web/src/ui/property/TextureProperty.jsx
@@ -2,6 +2,7 @@ import './css/TextureProperty.css';
 import classNames from 'classnames/bind';
 import PropTypes from 'prop-types';
 
+import CheckBox from '../form/CheckBox.jsx';
 import Input from '../form/Input.jsx';
 
 /**
@@ -21,12 +22,13 @@ class TextureProperty extends React.Component {
     render() {
         const { className, style, value, enabled, showScale, scale } = this.props;
 
-        return <canvas
-            className={classNames('texture', className)}
-            style={style}
-            title={value ? value.sourceFile : ''}
-            ref={this.canvasRef}
-            onClick={this.handleSelect}></canvas>;
+        return <div className={classNames('texture', className)} style={style}>
+            <CheckBox checked={enabled}></CheckBox>
+            <canvas title={value ? value.sourceFile : ''}
+                ref={this.canvasRef}
+                onClick={this.handleSelect}></canvas>;
+            <Input type={'number'} value={scale} show={showScale}></Input>
+        </div>;
     }
 
     componentDidMount() {
diff --git a/ShadowEditor.Web/src/ui/property/css/TextureProperty.css b/ShadowEditor.Web/src/ui/property/css/TextureProperty.css
index 175daa6d..70b64812 100644
--- a/ShadowEditor.Web/src/ui/property/css/TextureProperty.css
+++ b/ShadowEditor.Web/src/ui/property/css/TextureProperty.css
@@ -6,6 +6,9 @@
     position: absolute;
     width: 100%;
     height: 48px;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
     box-sizing: border-box;
     cursor: pointer;
 }
\ No newline at end of file