杭州
- 上海
+ 上海
北京
成都
diff --git a/components/radio/group.jsx b/components/radio/group.jsx
index 640ad73f95..bb29baeae5 100644
--- a/components/radio/group.jsx
+++ b/components/radio/group.jsx
@@ -42,7 +42,7 @@ export default React.createClass({
{...radio.props}
onChange={this.onRadioChange}
checked={this.state.value === radio.props.value}
- disabled={this.props.disabled}
+ disabled={radio.props.disabled || this.props.disabled}
/>;
}
return radio;
diff --git a/components/table/demo/ajax.md b/components/table/demo/ajax.md
index 341b026c0d..21d69d0eff 100644
--- a/components/table/demo/ajax.md
+++ b/components/table/demo/ajax.md
@@ -64,25 +64,36 @@ const dataSource = new Table.DataSource({
const Test = React.createClass({
getInitialState() {
return {
- dataSource: null
+ dataSource: null,
+ pagination: {
+ onChange: this.hanlePageChange
+ }
};
},
+ hanlePageChange(page) {
+ // 使用受控属性 current，方便外部设置页数
+ const pagination = this.state.pagination;
+ pagination.current = page;
+ this.setState({ pagination });
+ },
refresh() {
+ // 回到第一页
+ const pagination = this.state.pagination;
+ pagination.current = 1;
this.setState({
dataSource: dataSource.clone()
});
},
changeAndRefresh() {
+ // 回到第一页
+ const pagination = this.state.pagination;
+ pagination.current = 1;
// 可以修改原来的 dataSource 再发请求
this.setState({
dataSource: dataSource.clone({
- data: {
- city: 'hz'
- }
+ data: { city: 'hz' }
}),
- pagination: {
- current: 1
- }
+ pagination,
});
},
render() {
diff --git a/components/table/index.md b/components/table/index.md
index 3f1b67cad4..4bd8c64588 100644
--- a/components/table/index.md
+++ b/components/table/index.md
@@ -101,3 +101,19 @@ var dataSource = new Table.DataSource({
| resolve | 获得数据的解析函数，接收参数为远程数据返回的 result | Function | | |
| getPagination | 和后台接口返回的分页数据进行适配的函数，返回值会传给表格中的分页器 | Function | | |
| getParams | 和后台接口接收的参数进行适配，返回值会作为请求的参数发送 | Function | | 无 |
+
+## 注意
+
+按照 React 的[规范](http://facebook.github.io/react/docs/multiple-components.html#dynamic-children)，所有的组件数组必须绑定 key。在 Table 中，默认将每列数据的 `key` 属性作为唯一的标识。
+
+如果你的数据没有这个属性，务必使用 `rowKey` 来指定数据列的主键。若没有指定，控制台会出现以下的提示，表格组件也会出现各类奇怪的错误。
+
+
+
+```jsx
+const rowKey = function(record) {
+ return record.uid; // 比如你的数据主键是 uid
+};
+
+return
;
+```
diff --git a/components/timepicker/demo/basic.md b/components/timepicker/demo/basic.md
index b1b77d953e..dd1256f82c 100644
--- a/components/timepicker/demo/basic.md
+++ b/components/timepicker/demo/basic.md
@@ -10,9 +10,11 @@
import { Timepicker } from 'antd';
function onChange(time) {
- console.log(time.toLocaleTimeString('zh-CN', {
- hour12: false
- }));
+ if (time) {
+ console.log(time.toLocaleTimeString('zh-CN', {
+ hour12: false
+ }));
+ }
}
ReactDOM.render(
diff --git a/components/tree/demo/special.md b/components/tree/demo/special.md
index d6892c7b2b..d26ca19811 100644
--- a/components/tree/demo/special.md
+++ b/components/tree/demo/special.md
@@ -2,7 +2,7 @@
- order: 2
-受控组件，外部传入参数，控制树对象节点
+受控组件，外部传入参数，控制树对象节点。
---
@@ -50,7 +50,7 @@ class TreeDemo extends React.Component {
- test
+
sss}/>
@@ -64,5 +64,4 @@ class TreeDemo extends React.Component {
}
ReactDOM.render(, document.getElementById('components-tree-demo-special'));
-
````
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 5ba8ccaeb3..188bdb2da2 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -21,6 +21,8 @@ Ant Design React 致力于提供给程序员**愉悦**的开发体验。
### 1. 安装命令行工具
+> 使用 `antd-init` 前，务必确认 [Node.js](https://nodejs.org/en/) 已经升级到 v4.x 或以上。
+
```bash
$ npm install antd-init -g
```
@@ -116,7 +118,7 @@ Ant Design React 支持所有的现代浏览器和 IE8+。
-
+
diff --git a/package.json b/package.json
index 199af4d5c6..b702b326eb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "antd",
- "version": "0.10.2",
- "stableVersion": "0.10.2",
+ "version": "0.10.4",
+ "stableVersion": "0.10.4",
"title": "Ant Design",
"description": "一个 UI 设计语言",
"homepage": "http://ant.design/",
@@ -48,7 +48,7 @@
"rc-input-number": "~2.4.1",
"rc-menu": "~4.8.1",
"rc-notification": "~1.3.0",
- "rc-pagination": "~1.2.1",
+ "rc-pagination": "~1.3.5",
"rc-progress": "~1.0.4",
"rc-queue-anim": "~0.11.2",
"rc-radio": "~2.0.0",
@@ -56,7 +56,7 @@
"rc-slider": "~3.1.2",
"rc-steps": "~1.4.1",
"rc-switch": "~1.3.1",
- "rc-table": "~3.6.1",
+ "rc-table": "~3.6.2",
"rc-tabs": "~5.5.0",
"rc-time-picker": "~0.7.1",
"rc-tooltip": "~3.2.0",
@@ -84,6 +84,7 @@
"eslint": "^1.1.0",
"eslint-config-airbnb": "^1.0.0",
"eslint-plugin-babel": "^2.1.1",
+ "eslint-plugin-markdown": "git+https://github.com/ant-design/eslint-plugin-markdown.git",
"eslint-plugin-react": "^3.3.1",
"expect.js": "~0.3.1",
"extract-text-webpack-plugin": "^0.9.1",
@@ -93,6 +94,7 @@
"json-loader": "^0.5.1",
"less": "~2.5.3",
"less-loader": "^2.2.0",
+ "lesshint": "git+https://github.com/ant-design/lesshint.git",
"lodash": "^3.10.0",
"nico-jsx": "~0.6.0",
"pre-commit": "1.x",
@@ -100,7 +102,6 @@
"react-addons-test-utils": "~0.14.2",
"react-dom": "~0.14.2",
"react-router": "~1.0.0",
- "eslint-plugin-markdown": "git+https://github.com/ant-design/eslint-plugin-markdown.git",
"webpack": "^1.10.1",
"webpack-babel-jest": "^1.0.0",
"webpack-dev-middleware": "^1.2.0"
@@ -111,8 +112,9 @@
"clean": "rm -rf _site dist",
"deploy": "rm -rf node_modules && node scripts/install.js && npm run just-deploy",
"just-deploy": "npm run clean && webpack --config webpack.deploy.config.js && webpack --config webpack.antd.config.js && NODE_ENV=PRODUCTION nico build && node scripts/deploy.js",
- "lint": "eslint components test index.js --ext '.js,.jsx' && npm run mdlint",
+ "lint": "eslint components test index.js --ext '.js,.jsx' && npm run mdlint && npm run lesshint",
"mdlint": "eslint components/*/demo/*.md --ext '.md' --global 'React,ReactDOM' --rule 'no-console: 0'",
+ "lesshint": "lesshint style/ -e 'style/+(core|mixins)/+(base|iconfont|normalize|layouts|compatibility|grid).less'",
"test": "npm run lint && webpack && npm run jest",
"jest": "jest",
"pub": "sh ./scripts/publish.sh",
diff --git a/scripts/demo.js b/scripts/demo.js
index 998101eec5..d2a4d5d16a 100644
--- a/scripts/demo.js
+++ b/scripts/demo.js
@@ -1,6 +1,27 @@
+function capitalizeFirstLetter(string) {
+ return string.charAt(0).toUpperCase() + string.slice(1);
+}
+
+window.require = function (path) {
+ var result = window;
+ var namespaces = path.split('/');
+ namespaces.forEach(function (key, i) {
+ if (i === 2) {
+ key = capitalizeFirstLetter(key);
+ }
+ if (key !== 'lib') {
+ if (result[key]) {
+ result = result[key];
+ } else {
+ throw 'There should not have modules here: ' + path;
+ }
+ }
+ });
+ return result;
+};
+
window['css-animation'] = require('css-animation');
window['react-router'] = require('react-router');
-window.Clipboard = require('clipboard');
window.Clip = require('./clip');
var antd = require('../index');
var React = require('react');
@@ -95,7 +116,7 @@ InstantClickChangeFns.push(function () {
ReactDOM.render(
- , document.getElementById('versions-select'));
+ , document.getElementById('versions-select'));
});
window.BrowserDemo = React.createClass({
@@ -108,7 +129,7 @@ window.BrowserDemo = React.createClass({