Merge branch 'master' of github.com:ant-design/ant-design

This commit is contained in:
afc163 2016-06-15 17:57:08 +08:00
commit e91313efc1
7 changed files with 6 additions and 7 deletions

View File

@ -1,6 +1,6 @@
import React from 'react';
import Checkbox from './index';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import { PureRenderMixin } from 'rc-util';
export default class CheckboxGroup extends React.Component {
static defaultProps = {

View File

@ -2,7 +2,7 @@ import RcCheckbox from 'rc-checkbox';
import React from 'react';
import CheckboxGroup from './Group';
import classNames from 'classnames';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import { PureRenderMixin } from 'rc-util';
export default class Checkbox extends React.Component {
static Group = CheckboxGroup;

View File

@ -1,6 +1,6 @@
import React from 'react';
import classNames from 'classnames';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import { PureRenderMixin } from 'rc-util';
export default class Form extends React.Component {
static defaultProps = {

View File

@ -1,6 +1,6 @@
import React from 'react';
import classNames from 'classnames';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import { PureRenderMixin } from 'rc-util';
export default class FormItem extends React.Component {
static defaultProps = {

View File

@ -2,7 +2,7 @@ import React from 'react';
import classNames from 'classnames';
import Radio from './radio';
import RadioButton from './radioButton';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import { PureRenderMixin } from 'rc-util';
function getCheckedValue(children) {
let value = null;

View File

@ -1,7 +1,7 @@
import RcRadio from 'rc-radio';
import React from 'react';
import classNames from 'classnames';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import { PureRenderMixin } from 'rc-util';
export default class Radio extends React.Component {
static defaultProps = {

View File

@ -69,7 +69,6 @@
"rc-upload": "~1.13.0",
"rc-util": "~3.1.3",
"react-slick": "~0.12.0",
"react-addons-pure-render-mixin": "~15.1.0",
"warning": "~3.0.0"
},
"devDependencies": {