diff --git a/src/components/layout/bread.jsx b/src/components/layout/bread.jsx index cb3dbc2..513b290 100644 --- a/src/components/layout/bread.jsx +++ b/src/components/layout/bread.jsx @@ -11,6 +11,7 @@ const getPathSet = function (menuArray, parentPath) { path: parentPath + item.key, name: item.name, icon: item.icon || '', + clickable:item.clickable==undefined?true:false } if (!!item.child) { getPathSet(item.child, parentPath + item.key + '/') @@ -30,7 +31,7 @@ function Bread({ location }) { }) const breads = pathNames.map((item, key) => { return ( - + {pathSet[item].icon ? : ''} diff --git a/src/components/ui/ico.js b/src/components/ui/ico.js new file mode 100644 index 0000000..a0e43ec --- /dev/null +++ b/src/components/ui/ico.js @@ -0,0 +1,8 @@ +import React, { PropTypes } from 'react' +import styles form './ico.less' + +const Ico = (type) => + +export default Ico diff --git a/src/components/ui/ico.less b/src/components/ui/ico.less new file mode 100644 index 0000000..44aa4a0 --- /dev/null +++ b/src/components/ui/ico.less @@ -0,0 +1,7 @@ +.ico { + width: 1em; + height: 1em; + vertical-align: -0.15em; + fill: currentColor; + overflow: hidden; +} diff --git a/src/router.js b/src/router.js index e197301..69e1859 100644 --- a/src/router.js +++ b/src/router.js @@ -4,6 +4,7 @@ import App from './routes/app' import Error from './routes/error' import Dashboard from './routes/dashboard' import Users from './routes/users' +import Ico from './routes/ui/ico' export default function ({ history }) { return ( @@ -12,6 +13,7 @@ export default function ({ history }) { + diff --git a/src/routes/Users.less b/src/routes/Users.less deleted file mode 100644 index e69de29..0000000 diff --git a/src/routes/components/ico.js b/src/routes/components/ico.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/routes/ui/ico.js b/src/routes/ui/ico.js new file mode 100644 index 0000000..2bef51e --- /dev/null +++ b/src/routes/ui/ico.js @@ -0,0 +1,6 @@ +import React, { PropTypes } from 'react' + +const IcoPage = () =>
666
+ + +export default IcoPage diff --git a/src/routes/ui/ico.less b/src/routes/ui/ico.less new file mode 100644 index 0000000..44aa4a0 --- /dev/null +++ b/src/routes/ui/ico.less @@ -0,0 +1,7 @@ +.ico { + width: 1em; + height: 1em; + vertical-align: -0.15em; + fill: currentColor; + overflow: hidden; +} diff --git a/src/routes/users.js b/src/routes/users.js index 772b6d5..84e29a1 100644 --- a/src/routes/users.js +++ b/src/routes/users.js @@ -1,7 +1,6 @@ import React, { PropTypes } from 'react' import { routerRedux } from 'dva/router' import { connect } from 'dva' -import styles from './users.less' import UserList from '../components/users/list' import UserSearch from '../components/users/search' import UserModal from '../components/users/modal' diff --git a/src/utils/menu.js b/src/utils/menu.js index 05dfa6f..8bdda9f 100644 --- a/src/utils/menu.js +++ b/src/utils/menu.js @@ -10,9 +10,10 @@ module.exports = [ icon: 'user', }, { - key: 'components', + key: 'ui', name: 'UI组件', icon: 'laptop', + clickable:false, child:[ { key: 'ico',