From 94153927236078181eb3863e1b8c4e3d707957c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E6=98=8A=E8=BE=B0?= <duanhaochen@126.com>
Date: Tue, 19 Feb 2019 23:13:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BA=86react=20node?=
 =?UTF-8?q?=E7=9A=84=E5=8F=98=E9=87=8F=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/modules/Help/Index/index.js           |  2 +-
 app/src/modules/Help/Layout.js                |  2 +-
 app/src/modules/Index/Index/Navs.js           |  2 +-
 app/src/modules/Index/Index/index.js          |  2 +-
 app/src/modules/Index/Layout.js               |  2 +-
 .../KouDai48/Index/LoginInformation.js        |  2 +-
 app/src/modules/KouDai48/Index/index.js       |  4 ++--
 app/src/modules/KouDai48/Layout.js            |  2 +-
 app/src/modules/Login/Index/index.js          |  4 ++--
 app/src/modules/Login/Layout.js               |  2 +-
 app/src/modules/Login/Login/Detail.js         |  6 ++---
 app/src/modules/Login/Login/index.js          |  6 ++---
 .../Option/Edit/Forms/BasicConfiguration.js   |  2 +-
 .../Option/Edit/Forms/ChoukaConfiguration.js  |  2 +-
 .../Option/Edit/Forms/Koudai48LiveListener.js |  2 +-
 .../Option/Edit/Forms/ModianConfiguration.js  |  2 +-
 .../Option/Edit/Forms/NewGroupMember.js       |  2 +-
 .../Option/Edit/Forms/TimingMessagePush.js    |  2 +-
 .../Option/Edit/Forms/WeiboConfiguration.js   |  2 +-
 app/src/modules/Option/Edit/index.js          |  4 ++--
 app/src/modules/Option/Edit/utils/shuoming.js | 22 +++++++++----------
 app/src/modules/Option/Index/index.js         |  4 ++--
 app/src/modules/Option/Layout.js              |  2 +-
 23 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/app/src/modules/Help/Index/index.js b/app/src/modules/Help/Index/index.js
index 0b6ce3f2..c7b9681e 100644
--- a/app/src/modules/Help/Index/index.js
+++ b/app/src/modules/Help/Index/index.js
@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
 import { Button } from 'antd';
 import style from './style.sass';
 
-const Index: Function = (props: Object): React.ChildrenArray<React.Element> => {
+const Index: Function = (props: Object): Array<React.Node> => {
   return [
     /* 返回 */
     <Link key="0" className={ style.back } to="/">
diff --git a/app/src/modules/Help/Layout.js b/app/src/modules/Help/Layout.js
index dfd010ee..2e0b6cb1 100644
--- a/app/src/modules/Help/Layout.js
+++ b/app/src/modules/Help/Layout.js
@@ -3,7 +3,7 @@ import { Route, Switch } from 'react-router-dom';
 import Index from './Index/index';
 
 class ModuleLayout extends Component {
-  render(): React.Element {
+  render(): React.Node {
     return (
       <Switch>
         <Route path="/Help" component={ Index } exact={ true } />
diff --git a/app/src/modules/Index/Index/Navs.js b/app/src/modules/Index/Index/Navs.js
index bd447686..93f82b2a 100644
--- a/app/src/modules/Index/Index/Navs.js
+++ b/app/src/modules/Index/Index/Navs.js
@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
 import { Row, Col } from 'antd';
 import style from './style.sass';
 
-function Navs(props: Object): React.Element {
+function Navs(props: Object): React.Node {
   return (
     <Row type="flex" align="top" justify="start">
       <Col xl={ 4 } lg={ 4 } md={ 6 } sm={ 8 } xs={ 12 }>
diff --git a/app/src/modules/Index/Index/index.js b/app/src/modules/Index/Index/index.js
index 8deceb9b..d2289e3a 100644
--- a/app/src/modules/Index/Index/index.js
+++ b/app/src/modules/Index/Index/index.js
@@ -6,7 +6,7 @@ import '../../../components/indexedDB/indexedDB-init';
 import { handleOpenBrowser } from '../../../utils';
 import Navs from './Navs';
 
-function Index(props: Object): React.Element {
+function Index(props: Object): React.Node {
   const upgradeReminder: string = localStorage.getItem('upgradeReminder');
   const [isUpgradeReminder, setUpgradeReminder]: [boolean, Function] = useState(
     upgradeReminder === 'true' || !upgradeReminder
diff --git a/app/src/modules/Index/Layout.js b/app/src/modules/Index/Layout.js
index eccf6711..f0bcea4a 100644
--- a/app/src/modules/Index/Layout.js
+++ b/app/src/modules/Index/Layout.js
@@ -3,7 +3,7 @@ import { Route, Switch } from 'react-router-dom';
 import Index from './Index/index';
 
 class ModuleLayout extends Component {
-  render(): React.Element {
+  render(): React.Node {
     return (
       <Switch>
         <Route path="/" component={ Index } exact={ true } />
diff --git a/app/src/modules/KouDai48/Index/LoginInformation.js b/app/src/modules/KouDai48/Index/LoginInformation.js
index ef7da5bd..c55304ed 100644
--- a/app/src/modules/KouDai48/Index/LoginInformation.js
+++ b/app/src/modules/KouDai48/Index/LoginInformation.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { Card } from 'antd';
 import style from './style.sass';
 
-function LoginInformation(props: Object): React.ChildrenArray<React.Element> | React.Element {
+function LoginInformation(props: Object): Array<React.Node> | React.Node {
   const item: ?Object = props.loginInformation;
 
   return (
diff --git a/app/src/modules/KouDai48/Index/index.js b/app/src/modules/KouDai48/Index/index.js
index 1586e25b..1d9c211a 100644
--- a/app/src/modules/KouDai48/Index/index.js
+++ b/app/src/modules/KouDai48/Index/index.js
@@ -95,7 +95,7 @@ class KouDai48 extends Component {
         title: 'information',
         key: 'information',
         width: '80%',
-        render: (value: any, item: Object, index: number): React.Element => <MemberInformation item={ item } />
+        render: (value: any, item: Object, index: number): React.Node => <MemberInformation item={ item } />
       }
     ];
   }
@@ -163,7 +163,7 @@ class KouDai48 extends Component {
       console.error(err);
     }
   }
-  render(): React.Element {
+  render(): React.Node {
     const { getFieldDecorator }: { getFieldDecorator: Function } = this.props.form;
     const loginInformation: ?Object = this.props.loginInformation;
 
diff --git a/app/src/modules/KouDai48/Layout.js b/app/src/modules/KouDai48/Layout.js
index 979d98c1..d4c83d3e 100644
--- a/app/src/modules/KouDai48/Layout.js
+++ b/app/src/modules/KouDai48/Layout.js
@@ -6,7 +6,7 @@ import Index from './Index/index';
 
 @loadReducer(reducer)
 class ModuleLayout extends Component {
-  render(): React.Element {
+  render(): React.Node {
     return (
       <Switch>
         <Route path="/KouDai48" component={ Index } exact={ true } />
diff --git a/app/src/modules/Login/Index/index.js b/app/src/modules/Login/Index/index.js
index 47f80bf2..06eb83d3 100644
--- a/app/src/modules/Login/Index/index.js
+++ b/app/src/modules/Login/Index/index.js
@@ -64,7 +64,7 @@ class Index extends Component {
         title: '操作',
         key: 'handle',
         width: '25%',
-        render: (value: any, item: CoolQ): React.Element => {
+        render: (value: any, item: CoolQ): React.Node => {
           return (
             <Popconfirm title="确认要退出吗？" onConfirm={ this.handleLogOutClick.bind(this, item) }>
               <Button type="danger" size="small" icon="logout">退出</Button>
@@ -105,7 +105,7 @@ class Index extends Component {
       }
     }
   }
-  render(): React.ChildrenArray<React.Element> {
+  render(): Array<React.Node> {
     return [
       <Affix key="affix" className={ publicStyle.affix }>
         <div className={ classNames(publicStyle.toolsBox, 'clearfix') }>
diff --git a/app/src/modules/Login/Layout.js b/app/src/modules/Login/Layout.js
index 16c07617..66a1d0e8 100644
--- a/app/src/modules/Login/Layout.js
+++ b/app/src/modules/Login/Layout.js
@@ -7,7 +7,7 @@ import Login from './Login/index';
 
 @loadReducer(reducer)
 class ModuleLayout extends Component {
-  render(): React.Element {
+  render(): React.Node {
     return (
       <Switch>
         <Route path="/Login" component={ Index } exact={ true } />
diff --git a/app/src/modules/Login/Login/Detail.js b/app/src/modules/Login/Login/Detail.js
index 5c21a03f..2d030774 100644
--- a/app/src/modules/Login/Login/Detail.js
+++ b/app/src/modules/Login/Login/Detail.js
@@ -21,7 +21,7 @@ function customProfiles(customProfiles: Object): Array {
       </tr>
     );
   } else {
-    return custom.map((item: Object, index: number): React.Element => {
+    return custom.map((item: Object, index: number): React.Node => {
       return (
         <tr key={ item.command }>
           <td>{ item.command }</td>
@@ -34,11 +34,11 @@ function customProfiles(customProfiles: Object): Array {
   }
 }
 
-function isOpen(data: boolean): React.Element {
+function isOpen(data: boolean): React.Node {
   return data ? <span className={ style.on }>开启</span> : <span className={ style.off }>未开启</span>;
 }
 
-function Detail(props: ?Object): ?React.Element {
+function Detail(props: ?Object): ?React.Node {
   if (!props.detail) return null;
 
   const { detail }: { detail: Object } = props;
diff --git a/app/src/modules/Login/Login/index.js b/app/src/modules/Login/Login/index.js
index afc87620..04b9a3fd 100644
--- a/app/src/modules/Login/Login/index.js
+++ b/app/src/modules/Login/Login/index.js
@@ -87,8 +87,8 @@ class Login extends Component {
     });
   }
   // select
-  selectOptionView(): React.ChildrenArray<React.Element> {
-    return this.props.optionList.map((item: Object, index: number): React.Element => {
+  selectOptionView(): Array<React.Node> {
+    return this.props.optionList.map((item: Object, index: number): React.Node => {
       const index1: string = `${ index }`;
 
       return (
@@ -270,7 +270,7 @@ class Login extends Component {
       this.qq = null;
     }
   }
-  render(): React.Element {
+  render(): React.Node {
     const index: ?number = this.state.optionItemIndex ? Number(this.state.optionItemIndex) : null;
 
     return (
diff --git a/app/src/modules/Option/Edit/Forms/BasicConfiguration.js b/app/src/modules/Option/Edit/Forms/BasicConfiguration.js
index 44f4ef1e..fde1d5e5 100644
--- a/app/src/modules/Option/Edit/Forms/BasicConfiguration.js
+++ b/app/src/modules/Option/Edit/Forms/BasicConfiguration.js
@@ -10,7 +10,7 @@ class BasicConfiguration extends Component {
     detail: PropTypes.object
   };
 
-  render(): React.Element {
+  render(): React.Node {
     const { detail, form }: { detail: ?Object, form: Object } = this.props;
     const { getFieldDecorator }: { getFieldDecorator: Function } = form;
     const colsArea1: Object = { labelCol: { span: 4 }, wrapperCol: { span: 20 } };
diff --git a/app/src/modules/Option/Edit/Forms/ChoukaConfiguration.js b/app/src/modules/Option/Edit/Forms/ChoukaConfiguration.js
index 38be0f44..1be1cb54 100644
--- a/app/src/modules/Option/Edit/Forms/ChoukaConfiguration.js
+++ b/app/src/modules/Option/Edit/Forms/ChoukaConfiguration.js
@@ -31,7 +31,7 @@ class ChoukaConfiguration extends Component {
       });
     }
   };
-  render(): React.Element {
+  render(): React.Node {
     const { detail, form }: { detail: ?Object, form: Object } = this.props;
     const { getFieldDecorator }: { getFieldDecorator: Function } = form;
     const colsArea3: Object = { labelCol: { span: 6 }, wrapperCol: { span: 18 } };
diff --git a/app/src/modules/Option/Edit/Forms/Koudai48LiveListener.js b/app/src/modules/Option/Edit/Forms/Koudai48LiveListener.js
index a479cde9..42489942 100644
--- a/app/src/modules/Option/Edit/Forms/Koudai48LiveListener.js
+++ b/app/src/modules/Option/Edit/Forms/Koudai48LiveListener.js
@@ -11,7 +11,7 @@ class Koudai48LiveListener extends Component {
     detail: PropTypes.object
   };
 
-  render(): React.Element {
+  render(): React.Node {
     const { detail, form }: { detail: ?Object, form: Object } = this.props;
     const { getFieldDecorator }: { getFieldDecorator: Function } = form;
     const colsArea2: Object = { labelCol: { span: 6 }, wrapperCol: { span: 18 } };
diff --git a/app/src/modules/Option/Edit/Forms/ModianConfiguration.js b/app/src/modules/Option/Edit/Forms/ModianConfiguration.js
index d4950800..dca27f30 100644
--- a/app/src/modules/Option/Edit/Forms/ModianConfiguration.js
+++ b/app/src/modules/Option/Edit/Forms/ModianConfiguration.js
@@ -12,7 +12,7 @@ class ModianConfiguration extends Component {
     detail: PropTypes.object
   };
 
-  render(): React.Element {
+  render(): React.Node {
     const { detail, form }: { detail: ?Object, form: Object } = this.props;
     const { getFieldDecorator }: { getFieldDecorator: Function } = form;
     const colsArea1: Object = { labelCol: { span: 4 }, wrapperCol: { span: 20 } };
diff --git a/app/src/modules/Option/Edit/Forms/NewGroupMember.js b/app/src/modules/Option/Edit/Forms/NewGroupMember.js
index 7dfbe1ea..fc308222 100644
--- a/app/src/modules/Option/Edit/Forms/NewGroupMember.js
+++ b/app/src/modules/Option/Edit/Forms/NewGroupMember.js
@@ -12,7 +12,7 @@ class NewGroupMember extends Component {
     detail: PropTypes.object
   };
 
-  render(): React.Element {
+  render(): React.Node {
     const { detail, form }: { detail: ?Object, form: Object } = this.props;
     const { getFieldDecorator }: { getFieldDecorator: Function } = form;
     const colsArea2: Object = { labelCol: { span: 6 }, wrapperCol: { span: 18 } };
diff --git a/app/src/modules/Option/Edit/Forms/TimingMessagePush.js b/app/src/modules/Option/Edit/Forms/TimingMessagePush.js
index 61c67df6..a767006c 100644
--- a/app/src/modules/Option/Edit/Forms/TimingMessagePush.js
+++ b/app/src/modules/Option/Edit/Forms/TimingMessagePush.js
@@ -11,7 +11,7 @@ class TimingMessagePush extends Component {
     detail: PropTypes.object
   };
 
-  render(): React.Element {
+  render(): React.Node {
     const { detail, form }: { detail: ?Object, form: Object } = this.props;
     const { getFieldDecorator }: { getFieldDecorator: Function } = form;
     const colsArea2: Object = { labelCol: { span: 6 }, wrapperCol: { span: 18 } };
diff --git a/app/src/modules/Option/Edit/Forms/WeiboConfiguration.js b/app/src/modules/Option/Edit/Forms/WeiboConfiguration.js
index 92a52abb..2f2cc888 100644
--- a/app/src/modules/Option/Edit/Forms/WeiboConfiguration.js
+++ b/app/src/modules/Option/Edit/Forms/WeiboConfiguration.js
@@ -11,7 +11,7 @@ class WeiboConfiguration extends Component {
     detail: PropTypes.object
   };
 
-  render(): React.Element {
+  render(): React.Node {
     const { detail, form }: { detail: ?Object, form: Object } = this.props;
     const { getFieldDecorator }: { getFieldDecorator: Function } = form;
     const colsArea2: Object = { labelCol: { span: 6 }, wrapperCol: { span: 18 } };
diff --git a/app/src/modules/Option/Edit/index.js b/app/src/modules/Option/Edit/index.js
index f6980dd1..a6daad1f 100644
--- a/app/src/modules/Option/Edit/index.js
+++ b/app/src/modules/Option/Edit/index.js
@@ -110,7 +110,7 @@ class Add extends Component {
         title: '操作',
         key: 'handle',
         width: '20%',
-        render: (value: any, item: Object, index: number): React.ChildrenArray<React.Element> => {
+        render: (value: any, item: Object, index: number): Array<React.Node> => {
           return [
             <Button key="edit" size="small" onClick={ this.handleEditClick.bind(this, item) }>修改</Button>,
             <Popconfirm key="delete" title="确认要删除吗？" onConfirm={ this.handleDeleteClick.bind(this, item) }>
@@ -212,7 +212,7 @@ class Add extends Component {
       }
     });
   }
-  render(): React.ChildrenArray<React.Element> {
+  render(): Array<React.Node> {
     const { props }: { props: Object } = this;
     const detail: ?Object = 'query' in props.location ? props.location.query.detail : null;
     const { form }: { form: Object } = props;
diff --git a/app/src/modules/Option/Edit/utils/shuoming.js b/app/src/modules/Option/Edit/utils/shuoming.js
index 7ecfbdb4..b14d2295 100644
--- a/app/src/modules/Option/Edit/utils/shuoming.js
+++ b/app/src/modules/Option/Edit/utils/shuoming.js
@@ -4,11 +4,11 @@ import classNames from 'classnames';
 import style from '../style.sass';
 import { handleOpenBrowser } from '../../../../utils';
 
-export const IsModianLeaderboard: Function = (props: Object): React.Element => (
+export const IsModianLeaderboard: Function = (props: Object): React.Node => (
   <span className={ style.ml10 }>可以在群内查询摩点项目的相关信息、聚聚榜、打卡榜、订单。</span>
 );
 
-export const ModianUrlTemplate: Function = (props: Object): React.Element => (
+export const ModianUrlTemplate: Function = (props: Object): React.Node => (
   <div className={ style.shuoming }>
     <h6>模板关键字：</h6>
     <p>modianname：摩点项目的名称</p>
@@ -16,7 +16,7 @@ export const ModianUrlTemplate: Function = (props: Object): React.Element => (
   </div>
 );
 
-export const ModianTemplate: Function = (props: Object): React.Element => (
+export const ModianTemplate: Function = (props: Object): React.Node => (
   <div className={ style.shuoming }>
     <h6>模板关键字：</h6>
     <p>id：打赏人的ID</p>
@@ -33,23 +33,23 @@ export const ModianTemplate: Function = (props: Object): React.Element => (
   </div>
 );
 
-export const IsChoukaSendImage: Function = (props: Object): React.Element => (
+export const IsChoukaSendImage: Function = (props: Object): React.Node => (
   <span className={ style.ml10 }>该功能只限于酷QPro版本，在抽卡时发送卡牌图片。</span>
 );
 
-export const Kd48LiveListenerMembers: Function = (props: Object): React.Element => (
+export const Kd48LiveListenerMembers: Function = (props: Object): React.Node => (
   <div className={ style.shuoming }>多个成员名字或成员ID之间用","（半角逗号）分隔。</div>
 );
 
-export const IsRoomSendImage: Function = (props: Object): React.Element => (
+export const IsRoomSendImage: Function = (props: Object): React.Node => (
   <span className={ style.ml10 }>该功能只限于酷QPro版本。</span>
 );
 
-export const BukaQQNumber: Function = (props: Object): React.Element => (
+export const BukaQQNumber: Function = (props: Object): React.Node => (
   <div className={ style.shuoming }>多个QQ号之间用","（半角逗号）分隔。</div>
 );
 
-export const WeiBo: Function = (props: Object): React.Element => (
+export const WeiBo: Function = (props: Object): React.Node => (
   <div className={ classNames(style.shuoming, style.url) }>
     微博lfid配置方法：
     <a onClick={ handleOpenBrowser.bind(this, 'https://github.com/duan602728596/qqtools/tree/master#微博的lfid查找方法') }>
@@ -58,7 +58,7 @@ export const WeiBo: Function = (props: Object): React.Element => (
   </div>
 );
 
-export const WelcomeNewGroupMember: Function = (props: Object): React.Element => (
+export const WelcomeNewGroupMember: Function = (props: Object): React.Node => (
   <div className={ style.shuoming }>
     <h6>模板关键字：</h6>
     <p>nickname：新加入成员的昵称</p>
@@ -66,7 +66,7 @@ export const WelcomeNewGroupMember: Function = (props: Object): React.Element =>
   </div>
 );
 
-export const TimingMessagePushFormat: Function = (props: Object): React.Element => (
+export const TimingMessagePushFormat: Function = (props: Object): React.Node => (
   <div className={ style.shuoming }>
     <p>
       规则格式：
@@ -92,6 +92,6 @@ export const TimingMessagePushFormat: Function = (props: Object): React.Element
   </div>
 );
 
-export const IsHelpCommend: Function = (props: Object): React.Element => (
+export const IsHelpCommend: Function = (props: Object): React.Node => (
   <span className={ style.ml10 }>允许群内使用帮助命令查看功能。</span>
 );
\ No newline at end of file
diff --git a/app/src/modules/Option/Index/index.js b/app/src/modules/Option/Index/index.js
index fa585a05..c33fe7c0 100644
--- a/app/src/modules/Option/Index/index.js
+++ b/app/src/modules/Option/Index/index.js
@@ -75,7 +75,7 @@ class Index extends Component {
         title: '操作',
         key: 'handle',
         width: '25%',
-        render: (value: any, item: Object, index: number): React.ChildrenArray<React.Element> => {
+        render: (value: any, item: Object, index: number): Array<React.Node> => {
           return [
             <Link key="link" to={{
               pathname: '/Option/Edit',
@@ -197,7 +197,7 @@ class Index extends Component {
     });
 
   }
-  render(): React.ChildrenArray<React.Element> {
+  render(): Array<React.Node> {
     return [
       <Affix key="affix" className={ publicStyle.affix }>
         <div className={ classNames(publicStyle.toolsBox, 'clearfix') }>
diff --git a/app/src/modules/Option/Layout.js b/app/src/modules/Option/Layout.js
index 8aff49e8..1d8ef13c 100644
--- a/app/src/modules/Option/Layout.js
+++ b/app/src/modules/Option/Layout.js
@@ -7,7 +7,7 @@ import Edit from './Edit/index';
 
 @loadReducer(reducer)
 class ModuleLayout extends Component {
-  render(): React.Element {
+  render(): React.Node {
     return (
       <Switch>
         <Route path="/Option" component={ Index } exact={ true } />