- {pathSet[item].icon
- ?
- : ''}
- {pathSet[item].name}
+
+ {((breadsArray.length - 1) !== key && pathSet[item].clickable)
+ ?
+ {content}
+
+ : content}
)
})
@@ -46,8 +52,11 @@ function Bread ({ location }) {
return (
-
- 主页
+
+
+
+ Home
+
{breads}
diff --git a/src/components/Layout/Menu.js b/src/components/Layout/Menu.js
index 378bfc2..8fea75a 100644
--- a/src/components/Layout/Menu.js
+++ b/src/components/Layout/Menu.js
@@ -16,7 +16,6 @@ const getMenus = function (menuArray, siderFold, parentPath = '/') {
}
return (
-
{item.icon ? : ''}
{siderFold && topMenus.indexOf(item.key) >= 0 ? '' : item.name}
@@ -48,7 +47,7 @@ function Menus ({ siderFold, darkTheme, location, handleClickNavMenu, navOpenKey
}
changeOpenKeys(nextOpenKeys)
}
- // 菜单栏收起时,不能操作openKeys
+
let menuProps = !siderFold ? {
onOpenChange,
openKeys: navOpenKeys,
diff --git a/src/models/app.js b/src/models/app.js
index 29e39f3..ecf2d3b 100644
--- a/src/models/app.js
+++ b/src/models/app.js
@@ -13,7 +13,7 @@ export default {
siderFold: localStorage.getItem('antdAdminSiderFold') === 'true',
darkTheme: localStorage.getItem('antdAdminDarkTheme') !== 'false',
isNavbar: document.body.clientWidth < 769,
- navOpenKeys: JSON.parse(localStorage.getItem('navOpenKeys') || '[]'),
+ navOpenKeys: [],
},
subscriptions: {
setup ({ dispatch }) {
diff --git a/src/routes/app.js b/src/routes/app.js
index dd94bb7..0efebbd 100644
--- a/src/routes/app.js
+++ b/src/routes/app.js
@@ -36,7 +36,6 @@ const App = ({ children, location, dispatch, app, loading }) => {
dispatch({ type: 'app/switchSider' })
},
changeOpenKeys (openKeys) {
- localStorage.setItem('navOpenKeys', JSON.stringify(openKeys))
dispatch({ type: 'app/handleNavOpenKeys', payload: { navOpenKeys: openKeys } })
},
}
diff --git a/src/utils/menu.js b/src/utils/menu.js
index 0b4e5eb..3f815c7 100644
--- a/src/utils/menu.js
+++ b/src/utils/menu.js
@@ -1,12 +1,12 @@
module.exports = [
{
key: 'dashboard',
- name: '仪表盘',
+ name: 'Dashboard',
icon: 'laptop',
},
{
key: 'users',
- name: '用户管理',
+ name: 'User Manage',
icon: 'user',
},
{
@@ -22,27 +22,33 @@ module.exports = [
child: [
{
key: 'iconfont',
- name: 'IconFont 字体图标',
+ name: 'IconFont',
+ icon: 'heart-o',
},
{
key: 'dataTable',
- name: 'DataTable 数据表格',
+ name: 'DataTable',
+ icon: 'database',
},
{
key: 'dropOption',
- name: 'DropOption 下拉操作',
+ name: 'DropOption',
+ icon: 'bars',
},
{
key: 'search',
- name: 'Search 搜索',
+ name: 'Search',
+ icon: 'search',
},
{
key: 'editor',
- name: 'Editor 编辑器',
+ name: 'Editor',
+ icon: 'edit',
},
{
key: 'layer',
- name: 'layer 弹层【方法】',
+ name: 'layer (Function)',
+ icon: 'credit-card',
},
],
},
@@ -54,37 +60,40 @@ module.exports = [
{
key: 'lineChart',
name: 'LineChart',
+ icon: 'line-chart',
},
{
key: 'barChart',
name: 'BarChart',
+ icon: 'bar-chart',
},
{
key: 'areaChart',
name: 'AreaChart',
+ icon: 'area-chart',
},
],
},
{
key: 'navigation',
- name: '测试导航',
+ name: 'Test Navigation',
icon: 'setting',
child: [
{
key: 'navigation1',
- name: '二级导航1',
+ name: 'Test Navigation1',
},
{
key: 'navigation2',
- name: '二级导航2',
+ name: 'Test Navigation2',
child: [
{
key: 'navigation21',
- name: '三级导航1',
+ name: 'Test Navigation21',
},
{
key: 'navigation22',
- name: '三级导航2',
+ name: 'Test Navigation22',
},
],
},