fix: ts props error

sky · sky · commit 919ded60c84f · 2019-08-05T17:17:37.000+08:00
diff --git a/app/web/framework/layout.tsx b/app/web/framework/layout.tsx
@@ -1,11 +1,10 @@
 import React, { Component } from 'react';
 import { inject } from 'mobx-react';
 
-@inject('config')
+@inject('configStore')
 export default class Layout extends Component<any> {
   render() {
-    const { config } = this.props;
-    console.log('>>themeStyle', config.themeStyle);
+    const { configStore } = this.props;
     return <html>
       <head>
         <title>{this.props.title}</title>
@@ -15,7 +14,7 @@ export default class Layout extends Component<any> {
         <meta name="description" content={this.props.description}></meta>
         <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"></link>
       </head>
-      <body style={{...config.themeStyle}}><div id="app">{this.props.children}</div></body>
+      <body style={{...configStore.themeStyle}}><div id="app">{this.props.children}</div></body>
     </html>;
   }
 }
diff --git a/app/web/page/home/component/mobx/index.tsx b/app/web/page/home/component/mobx/index.tsx
@@ -2,6 +2,7 @@ import React, { Component, CSSProperties } from 'react';
 import { observable } from 'mobx';
 import { Observer, observer, inject } from 'mobx-react';
 import AppStore from './store';
+import { StoreProps } from '../../../../typings/type';
 
 
 const info = observable({ text: "Mobx Observer Local Test" });
@@ -26,19 +27,19 @@ class LocalReactive extends Component {
   } 
 }
 
-@inject('config')
+@inject('configStore')
 @observer
-class MobXApp extends Component {
+class MobXApp extends Component<StoreProps> {
   store: AppStore;
   constructor(props) {
     super(props);
     this.store = new AppStore();
   }
 
   render() {
-    const { config } = this.props;
+    const { configStore } = this.props;
     // [mobx] Dynamic observable objects cannot be frozen https://github.com/mobxjs/mobx/blob/master/CHANGELOG.md
-    return <div style={{...config.themeStyle}}>
+    return <div style={{...configStore!.themeStyle}}>
         <div style={{...this.store.style}} onClick={() => { this.store.plus()}}>点我:{this.store.number}</div>
         <LocalReactive></LocalReactive>
     </div>
diff --git a/app/web/page/home/component/tab/index.tsx b/app/web/page/home/component/tab/index.tsx
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Tabs } from 'antd';
 import Header from '../../../../component/header/header';
-import { TabProps } from '../../../../framework/type';
+import { TabProps } from '../../../../typings/type';
 import './index.css';
 
 import MobXApp from '../mobx';
@@ -20,7 +20,7 @@ export class Tab extends Component<TabProps, any> {
       <div className="tab">
         <h1>{this.props.message.text}</h1>
         <Tabs defaultActiveKey="1" onChange={tabItemClick}>
-          <TabPane tab="MobX" key="1"><MobXApp/></TabPane>
+          <TabPane tab="MobX" key="1"><MobXApp /></TabPane>
           <TabPane tab="Tab 2" key="2">Content of Tab Pane 2</TabPane>
           <TabPane tab="Tab 3" key="3">Content of Tab Pane 3</TabPane>
         </Tabs>
diff --git a/app/web/page/home/index.tsx b/app/web/page/home/index.tsx
@@ -7,12 +7,12 @@ import ConfigStore from './store/config';
 import Layout from '../../framework/layout';
 // https://github.com/gaearon/react-hot-loader/issues/525
 import { Tab } from './component/tab';
-import { TabProps } from '../../framework/type';
+import { TabProps } from '../../typings/type';
 
 class App extends Component<TabProps, any> {
   render() {
     const stores = {
-      config: new ConfigStore()
+      configStore: new ConfigStore()
     };
     return <Provider {...stores}><Layout {...this.props}><Tab {...this.props} /></Layout></Provider>;
   }
@@ -24,7 +24,7 @@ function bootstrap() {
     return App;
   }
   const stores = window.stores = window.stores || {
-    config: new ConfigStore()
+    configStore: new ConfigStore()
   };
   const state = window.__INITIAL_STATE__;
   const root = document.getElementById('app');
diff --git a/app/web/typings/type.ts b/app/web/typings/type.ts
@@ -1,8 +1,14 @@
+import ConfigStore from '../page/home/store/config';
+
 export interface TabProps {
   title: string;
   keywords: string;
   description: string;
   message: {
     text: string
   };
+}
+
+export interface StoreProps {
+  configStore?: ConfigStore
 }
