Skip to content

Commit

Permalink
fix: 修改了react node的变量类型
Browse files Browse the repository at this point in the history
  • Loading branch information
duan602728596 committed Feb 19, 2019
1 parent 39541f6 commit 9415392
Show file tree
Hide file tree
Showing 23 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion app/src/modules/Help/Index/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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="/">
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/Help/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } />
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/Index/Index/Navs.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 }>
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/Index/Index/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/Index/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } />
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/KouDai48/Index/LoginInformation.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions app/src/modules/KouDai48/Index/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } />
}
];
}
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/KouDai48/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } />
Expand Down
4 changes: 2 additions & 2 deletions app/src/modules/Login/Index/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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') }>
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/Login/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } />
Expand Down
6 changes: 3 additions & 3 deletions app/src/modules/Login/Login/Detail.js
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions app/src/modules/Login/Login/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/Option/Edit/Forms/BasicConfiguration.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } };
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/Option/Edit/Forms/ChoukaConfiguration.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } };
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/Option/Edit/Forms/Koudai48LiveListener.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } };
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/Option/Edit/Forms/ModianConfiguration.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } };
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/Option/Edit/Forms/NewGroupMember.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } };
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/Option/Edit/Forms/TimingMessagePush.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } };
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/Option/Edit/Forms/WeiboConfiguration.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } };
Expand Down
4 changes: 2 additions & 2 deletions app/src/modules/Option/Edit/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) }>
Expand Down Expand Up @@ -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;
Expand Down
22 changes: 11 additions & 11 deletions app/src/modules/Option/Edit/utils/shuoming.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ 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>
<p>modianid:摩点项目的ID</p>
</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>
Expand All @@ -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查找方法') }>
Expand All @@ -58,15 +58,15 @@ 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>
<p>userid:新加入成员的QQ号</p>
</div>
);

export const TimingMessagePushFormat: Function = (props: Object): React.Element => (
export const TimingMessagePushFormat: Function = (props: Object): React.Node => (
<div className={ style.shuoming }>
<p>
规则格式:
Expand All @@ -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>
);
4 changes: 2 additions & 2 deletions app/src/modules/Option/Index/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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') }>
Expand Down
2 changes: 1 addition & 1 deletion app/src/modules/Option/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } />
Expand Down

0 comments on commit 9415392

Please sign in to comment.