Skip to content

GitLab

P
pro-blocks
Commit 0a386582 authored by jim's avatar jim Committed by 陈帅
Browse files
Options

chang to new context api

parent b3821d53
Show whitespace changes
Inline Side-by-side
Showing with 162 additions and 141 deletions
src/components/Login/LoginItem.js
View file @ 0a386582
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Form, Button, Row, Col } from 'antd';
import { Form, Input, Button, Row, Col } from 'antd';
import omit from 'omit.js';
import styles from './index.less';
import map from './map';
import ItemMap from './map';
import LoginContext from './loginContext';
const FormItem = Form.Item;
function generator({ defaultProps, defaultRules, type }) {
return WrappedComponent => {
return class BasicComponent extends Component {
static contextTypes = {
form: PropTypes.object,
updateActive: PropTypes.func,
};
class WarpFormItem extends Component {
constructor(props) {
super(props);
this.state = {
......@@ -21,8 +15,8 @@ function generator({ defaultProps, defaultRules, type }) {
};
}
componentDidMount() {
if (this.context.updateActive) {
this.context.updateActive(this.props.name);
if (this.props.updateActive) {
this.props.updateActive(this.props.name);
}
}
componentWillUnmount() {
......@@ -42,28 +36,46 @@ function generator({ defaultProps, defaultRules, type }) {
}
}, 1000);
};
render() {
const { getFieldDecorator } = this.context.form;
const options = {};
let otherProps = {};
const { onChange, defaultValue, rules, name, ...restProps } = this.props;
const { count } = this.state;
options.rules = rules || defaultRules;
getFormItemOptions = ({ onChange, defaultValue, rules }) => {
const options = {
rules: rules || this.customprops.rules,
};
if (onChange) {
options.onChange = onChange;
}
if (defaultValue) {
options.initialValue = defaultValue;
}
otherProps = restProps || otherProps;
if (type === 'Captcha') {
return options;
};
render() {
const { count } = this.state;
const { getFieldDecorator } = this.props.form;
// 这么写是为了防止restProps中 带入 onChange, defaultValue, rules props
const {
onChange,
customprops,
defaultValue,
rules,
name,
updateActive,
...restProps
} = this.props;
// get getFieldDecorator props
const options = this.getFormItemOptions(this.props);
const otherProps = restProps || {};
if (this.props.type === 'Captcha') {
const inputProps = omit(otherProps, ['onGetCaptcha']);
return (
<FormItem>
<Row gutter={8}>
<Col span={16}>
{getFieldDecorator(name, options)(
<WrappedComponent {...defaultProps} {...inputProps} />
<Input {...this.props.customprops} {...inputProps} />
)}
</Col>
<Col span={8}>
......@@ -82,23 +94,31 @@ function generator({ defaultProps, defaultRules, type }) {
}
return (
<FormItem>
{getFieldDecorator(name, options)(
<WrappedComponent {...defaultProps} {...otherProps} />
)}
{getFieldDecorator(name, options)(<Input {...this.props.customprops} {...otherProps} />)}
</FormItem>
);
}
};
};
}
const LoginItem = {};
Object.keys(map).forEach(item => {
LoginItem[item] = generator({
defaultProps: map[item].props,
defaultRules: map[item].rules,
type: item,
})(map[item].component);
Object.keys(ItemMap).forEach(key => {
const item = ItemMap[key];
LoginItem[key] = props => {
return (
<LoginContext.Consumer>
{context => (
<WarpFormItem
customprops={item.props}
{...props}
rules={item.rules}
type={key}
updateActive={context.updateActive}
form={context.form}
/>
)}
</LoginContext.Consumer>
);
};
});
export default LoginItem;
src/components/Login/LoginTab.js
View file @ 0a386582
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Tabs } from 'antd';
import LoginContext from './loginContext';
const { TabPane } = Tabs;
......@@ -12,21 +12,24 @@ const generateId = (() => {
};
})();
export default class LoginTab extends Component {
static __ANT_PRO_LOGIN_TAB = true;
static contextTypes = {
tabUtil: PropTypes.object,
};
class LoginTab extends Component {
constructor(props) {
super(props);
this.uniqueId = generateId('login-tab-');
}
componentWillMount() {
if (this.context.tabUtil) {
this.context.tabUtil.addTab(this.uniqueId);
}
componentDidMount() {
this.props.tabUtil.addTab(this.uniqueId);
}
render() {
return <TabPane {...this.props} />;
}
}
const warpContext = props => {
return (
<LoginContext.Consumer>
{value => <LoginTab tabUtil={value.tabUtil} {...props} />}
</LoginContext.Consumer>
);
};
export default warpContext;
src/components/Login/index.js
View file @ 0a386582
......@@ -6,6 +6,7 @@ import LoginItem from './LoginItem';
import LoginTab from './LoginTab';
import LoginSubmit from './LoginSubmit';
import styles from './index.less';
import LoginContext from './loginContext';
@Form.create()
class Login extends Component {
......@@ -21,17 +22,18 @@ class Login extends Component {
onTabChange: PropTypes.func,
onSubmit: PropTypes.func,
};
static childContextTypes = {
tabUtil: PropTypes.object,
form: PropTypes.object,
updateActive: PropTypes.func,
};
state = {
type: this.props.defaultActiveKey,
tabs: [],
active: {},
};
getChildContext() {
onSwitch = type => {
this.setState({
type,
});
this.props.onTabChange(type);
};
getContext = () => {
return {
tabUtil: {
addTab: id => {
......@@ -58,12 +60,6 @@ class Login extends Component {
});
},
};
}
onSwitch = type => {
this.setState({
type,
});
this.props.onTabChange(type);
};
handleSubmit = e => {
e.preventDefault();
......@@ -83,17 +79,18 @@ class Login extends Component {
return;
}
// eslint-disable-next-line
if (item.type.__ANT_PRO_LOGIN_TAB) {
if (item.type.name === 'warpContext') {
TabChildren.push(item);
} else {
otherChildren.push(item);
}
});
return (
<LoginContext.Provider value={this.getContext()}>
<div className={classNames(className, styles.login)}>
<Form onSubmit={this.handleSubmit}>
{tabs.length ? (
<div>
<>
<Tabs
animated={false}
className={styles.tabs}
......@@ -103,12 +100,13 @@ class Login extends Component {
{TabChildren}
</Tabs>
{otherChildren}
</div>
</>
) : (
[...children]
)}
</Form>
</div>
</LoginContext.Provider>
);
}
}
......
src/components/Login/loginContext.js 0 → 100644
View file @ 0a386582
import { createContext } from 'react';
const LoginContext = createContext();
export default LoginContext;
src/components/Login/map.js
View file @ 0a386582
import React from 'react';
import { Input, Icon } from 'antd';
import { Icon } from 'antd';
import styles from './index.less';
const map = {
export default {
UserName: {
component: Input,
props: {
size: 'large',
prefix: <Icon type="user" className={styles.prefixIcon} />,
......@@ -18,7 +17,6 @@ const map = {
],
},
Password: {
component: Input,
props: {
size: 'large',
prefix: <Icon type="lock" className={styles.prefixIcon} />,
......@@ -33,7 +31,6 @@ const map = {
],
},
Mobile: {
component: Input,
props: {
size: 'large',
prefix: <Icon type="mobile" className={styles.prefixIcon} />,
......@@ -51,7 +48,6 @@ const map = {
],
},
Captcha: {
component: Input,
props: {
size: 'large',
prefix: <Icon type="mail" className={styles.prefixIcon} />,
......@@ -65,5 +61,3 @@ const map = {
],
},
};
export default map;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment