From c2c772cde3d72b6c4ccf1a758e8d19b534f20860 Mon Sep 17 00:00:00 2001 From: cx Date: Sat, 6 Jan 2018 18:42:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8mobx=20=E7=9B=91=E5=90=AC.=20?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E4=BA=86Color=E5=9C=A8=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=ACreact=E7=9A=84=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/UI/MaterialEditor/MaterialComponen.tsx | 30 +++++++++------------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/src/UI/MaterialEditor/MaterialComponen.tsx b/src/UI/MaterialEditor/MaterialComponen.tsx index bd6b03c28..56c24127c 100644 --- a/src/UI/MaterialEditor/MaterialComponen.tsx +++ b/src/UI/MaterialEditor/MaterialComponen.tsx @@ -1,12 +1,11 @@ import './Material.less'; -import { observable } from 'dob'; -import { Connect } from 'dob-react'; -import * as React from 'react'; +import { observer } from 'mobx-react'; import { ChangeEventHandler } from 'react'; +import * as React from 'react'; import { SketchPicker } from 'react-color'; -import { Material } from 'three'; import * as THREE from 'three'; +import { Material } from 'three'; import { FileSystem } from '../../Common/FileSystem'; import { KeyBoard } from '../../Common/KeyEnum'; @@ -27,7 +26,7 @@ interface InputData updataValueCallback?,//更新数据回调函数 } -@Connect +@observer export class Input extends React.Component{ render() { @@ -59,7 +58,7 @@ interface SliderData extends InputData step: number } -@Connect +@observer export class Slider extends React.Component{ input: HTMLInputElement; remove; @@ -130,7 +129,7 @@ export class Slider extends React.Component{ } } -@Connect +@observer export class Check extends React.Component{ render() { @@ -156,8 +155,7 @@ export class Check extends React.Component{ } } - -@Connect +@observer export class Select extends React.Component{ render() { @@ -196,13 +194,11 @@ export class Select extends React.Component{ } } } - - -@Connect +@observer export class Color extends React.Component{ - constructor() + constructor(p, s) { - super(null, { isFocus: false }); + super(p, s); this.state = { isFocus: false } } handleClose = () => @@ -287,10 +283,8 @@ export class Color extends React.Component{ } } - //Texu -@observable -@Connect +@observer export class TextureComponent extends React.Component{ repYEl: HTMLInputElement; repXEl: HTMLInputElement; @@ -499,7 +493,7 @@ export class TextureComponent extends React.Component{ } } -@Connect +@observer export class Config extends React.Component<{ editor: MaterialEditor }, {}>{ render() {