diff --git a/src/lang/en.js b/src/lang/en.js index 22f5606a..fb8ad160 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -42,7 +42,8 @@ export default { exportExcel: 'Export Excel', selectExcel: 'Export Selected', uploadExcel: 'Upload Excel', - exportZip: 'Zip', + zip: 'Zip', + exportZip: 'Export Zip', theme: 'Theme', clipboardDemo: 'Clipboard', i18n: 'I18n' diff --git a/src/lang/zh.js b/src/lang/zh.js index 08741687..4c1e3ac2 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -24,10 +24,10 @@ export default { mixChart: '混合图表', example: '综合实例', Table: 'Table', - dynamicTable: '动态table', - dragTable: '拖拽table', - inlineEditTable: 'table内编辑', - complexTable: '综合table', + dynamicTable: '动态Table', + dragTable: '拖拽Table', + inlineEditTable: 'Table内编辑', + complexTable: '综合Table', treeTable: '树形表格', customTreeTable: '自定义树表', tab: 'Tab', @@ -38,13 +38,14 @@ export default { page401: '401', page404: '404', errorLog: '错误日志', - excel: 'excel', - exportExcel: 'export excel', - selectExcel: 'export selected', - uploadExcel: 'upload excel', - exportZip: 'zip', + excel: 'Excel', + exportExcel: 'Export Excel', + selectExcel: 'Export Selected', + uploadExcel: 'Upload Excel', + zip: 'Zip', + exportZip: 'Export Zip', theme: '换肤', - clipboardDemo: 'clipboard', + clipboardDemo: 'Clipboard', i18n: '国际化' }, navbar: { diff --git a/src/router/index.js b/src/router/index.js index d93f0fed..fe3a7349 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -15,6 +15,9 @@ import Layout from '../views/layout/Layout' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) +* alwaysShow: true if set true, will always show the root menu, whatever its child routes length +* if not set alwaysShow, only more than one route under the children +* it will becomes nested mode, otherwise not show the root menu * redirect: noredirect if `redirect:noredirect` will no redirct in the breadcrumb * name:'router-name' the name is used by (must set!!!) * meta : { @@ -217,7 +220,9 @@ export const asyncRouterMap = [ path: '/zip', component: Layout, redirect: '/zip/download', - children: [{ path: 'download', component: _import('zip/index'), name: 'exportZip', meta: { title: 'exportZip', icon: 'zip' }}] + alwaysShow: true, + meta: { title: 'zip', icon: 'zip' }, + children: [{ path: 'download', component: _import('zip/index'), name: 'exportZip', meta: { title: 'exportZip' }}] }, { diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue index 5cb12818..da07831b 100644 --- a/src/views/layout/components/Sidebar/SidebarItem.vue +++ b/src/views/layout/components/Sidebar/SidebarItem.vue @@ -2,7 +2,7 @@