From 3d50fa7d97fe9e732fd8d2fa8bb33d805f618318 Mon Sep 17 00:00:00 2001
From: tengge1 <930372551@qq.com>
Date: Tue, 23 Jul 2019 21:00:04 +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

---
 .../src/editor2/component/LMeshComponent.jsx        |  4 ++--
 .../src/editor2/component/LightComponent.jsx        |  2 +-
 .../src/editor2/sidebar/PropertyPanel.jsx           | 13 ++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ShadowEditor.Web/src/editor2/component/LMeshComponent.jsx b/ShadowEditor.Web/src/editor2/component/LMeshComponent.jsx
index ea9ee2c7..4491457e 100644
--- a/ShadowEditor.Web/src/editor2/component/LMeshComponent.jsx
+++ b/ShadowEditor.Web/src/editor2/component/LMeshComponent.jsx
@@ -35,7 +35,7 @@ class LMeshComponent extends React.Component {
         }
 
         return <PropertyGroup title={L_LMESH_COMPONENT} show={show} expanded={expanded} onExpand={this.handleExpand}>
-            <SelectProperty label={L_ANIMATION} options={options} value={animation} onChange={this.handleChange}></SelectProperty>
+            <SelectProperty label={L_ANIMATION} name={'animation'} options={options} value={animation} onChange={this.handleChange}></SelectProperty>
             <ButtonProperty text={previewText} onChange={this.handlePreview}></ButtonProperty>
         </PropertyGroup>;
     }
@@ -82,7 +82,7 @@ class LMeshComponent extends React.Component {
         });
     }
 
-    handleChange(value) {
+    handleChange(value, name) {
         const model = this.selected.userData.model;
 
         model.setAnimation(value);
diff --git a/ShadowEditor.Web/src/editor2/component/LightComponent.jsx b/ShadowEditor.Web/src/editor2/component/LightComponent.jsx
index c191a146..510d0200 100644
--- a/ShadowEditor.Web/src/editor2/component/LightComponent.jsx
+++ b/ShadowEditor.Web/src/editor2/component/LightComponent.jsx
@@ -170,7 +170,7 @@ class LightComponent extends React.Component {
             state.showHeight = false;
         }
 
-        this.setState({ state });
+        this.setState(state);
     }
 
     handleChangeColor(value, name) {
diff --git a/ShadowEditor.Web/src/editor2/sidebar/PropertyPanel.jsx b/ShadowEditor.Web/src/editor2/sidebar/PropertyPanel.jsx
index b0e27bac..9036aac8 100644
--- a/ShadowEditor.Web/src/editor2/sidebar/PropertyPanel.jsx
+++ b/ShadowEditor.Web/src/editor2/sidebar/PropertyPanel.jsx
@@ -37,12 +37,13 @@ class PropertyPanel extends React.Component {
         return <PropertyGrid>
             <BasicComponent></BasicComponent>
             <TransformComponent></TransformComponent>
-            <ShadowComponent></ShadowComponent>
-
-            <CameraComponent></CameraComponent>
-            <FireComponent></FireComponent>
-            <LightComponent></LightComponent>
             <SceneComponent></SceneComponent>
+            <LightComponent></LightComponent>
+            <ShadowComponent></ShadowComponent>
+            <CameraComponent></CameraComponent>
+
+            <FireComponent></FireComponent>
+            <SmokeComponent></SmokeComponent>
             <LMeshComponent></LMeshComponent>
 
             <BoxGeometryComponent></BoxGeometryComponent>
@@ -55,8 +56,6 @@ class PropertyPanel extends React.Component {
             <TeapotGeometryComponent></TeapotGeometryComponent>
             <TorusGeometryComponent></TorusGeometryComponent>
             <TorusKnotGeometryComponent></TorusKnotGeometryComponent>
-
-            <SmokeComponent></SmokeComponent>
         </PropertyGrid>;
     }
 }