Browse Source

always concat paths wether there's a breadcrumbName or not

pull/1274/merge
fanzheng.fz 9 years ago
committed by afc163
parent
commit
99a44e9b5e
  1. 16
      components/breadcrumb/index.jsx

16
components/breadcrumb/index.jsx

@ -52,14 +52,6 @@ const Breadcrumb = React.createClass({
if (routes && routes.length > 0) {
const paths = [];
crumbs = routes.map((route, i) => {
if (!route.breadcrumbName) {
return null;
}
const name = route.breadcrumbName.replace(/\:(.*)/g, (replacement, key) => {
return params[key] || replacement;
});
let link;
let path = route.path.replace(/^\//, '');
Object.keys(params).forEach(key => {
path = path.replace(`:${key}`, params[key]);
@ -68,6 +60,14 @@ const Breadcrumb = React.createClass({
paths.push(path);
}
if (!route.breadcrumbName) {
return null;
}
const name = route.breadcrumbName.replace(/\:(.*)/g, (replacement, key) => {
return params[key] || replacement;
});
let link;
if (i === routes.length - 1) {
link = <span>{name}</span>;
} else {

Loading…
Cancel
Save