mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-11 11:32:52 +08:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

fit react router 2.x

Browse Source
This commit is contained in:
afc163 2016-02-17 16:42:26 +08:00
parent 9f6a211fde
commit 99fbd06ae5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/breadcrumb/demo/router.md
View File

@ -2,13 +2,13 @@
- order: 2 - order: 2
和 `react-router@1.x` 进行结合使用。 和 `react-router@2.x` 进行结合使用。
--- ---
````jsx ````jsx
const ReactRouter = require('react-router'); const ReactRouter = require('react-router');
let { Router, Route, Link } = ReactRouter; let { Router, Route, Link, hashHistory } = ReactRouter;
import { Breadcrumb } from 'antd'; import { Breadcrumb } from 'antd';
const Apps = React.createClass({ const Apps = React.createClass({
@ -50,7 +50,7 @@ const Home = React.createClass({
}); });
ReactDOM.render( ReactDOM.render(
<Router> <Router history={hashHistory}>
<Route name="home" breadcrumbName="首页" path="/" component={Home}> <Route name="home" breadcrumbName="首页" path="/" component={Home}>
<Route name="apps" breadcrumbName="应用列表" path="apps" component={Apps}> <Route name="apps" breadcrumbName="应用列表" path="apps" component={Apps}>
<Route name="app" breadcrumbName="应用:id" path=":id"> <Route name="app" breadcrumbName="应用:id" path=":id">

4
components/queue-anim/demo/router.md
View File

@ -8,7 +8,7 @@ router 组合的进场与出场动画。
````jsx ````jsx
const ReactRouter = require('react-router'); const ReactRouter = require('react-router');
let { Router, Route, Link } = ReactRouter; let { Router, Route, Link, hashHistory } = ReactRouter;
import { QueueAnim, Menu } from 'antd'; import { QueueAnim, Menu } from 'antd';
const App = React.createClass({ const App = React.createClass({
@ -121,7 +121,7 @@ const Page2 = React.createClass({
}); });
ReactDOM.render(( ReactDOM.render((
<Router> <Router history={hashHistory}>
<Route path="/" component={App} ignoreScrollBehavior> <Route path="/" component={App} ignoreScrollBehavior>
<Route path="page1" component={Page1} /> <Route path="page1" component={Page1} />
<Route path="page2" component={Page2} /> <Route path="page2" component={Page2} />

2
package.json
View File

@ -111,7 +111,7 @@
"react-addons-test-utils": "0.14.x", "react-addons-test-utils": "0.14.x",
"react-copy-to-clipboard": "^4.0.1", "react-copy-to-clipboard": "^4.0.1",
"react-dom": "0.14.x", "react-dom": "0.14.x",
"react-router": "~1.0.3", "react-router": "^2.0.0",
"react-stateless-wrapper": "~1.0.2", "react-stateless-wrapper": "~1.0.2",
"reqwest": "~2.0.5", "reqwest": "~2.0.5",
"semver": "^5.1.0", "semver": "^5.1.0",