Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
dd18f51
rm
PanJiaChen Apr 2, 2019
4107fa5
tweak
PanJiaChen Apr 2, 2019
7157c2a
refine
PanJiaChen Apr 2, 2019
3145f91
tweak
PanJiaChen Apr 2, 2019
3773a8a
rm
PanJiaChen Apr 2, 2019
8a2c4a9
tweak
PanJiaChen Apr 2, 2019
22b89a2
u+
PanJiaChen Apr 3, 2019
c58c764
u+
PanJiaChen Apr 3, 2019
f74659f
u+
PanJiaChen Apr 3, 2019
5135a64
u+
PanJiaChen Apr 3, 2019
8b28e5c
fix bug
PanJiaChen Apr 3, 2019
d0543a3
u+
PanJiaChen Apr 3, 2019
e148a57
u+
PanJiaChen Apr 3, 2019
938d764
merge master
PanJiaChen Apr 9, 2019
0efdf47
Merge branch 'master' into remove-i18n
PanJiaChen Apr 12, 2019
0727d0c
add
PanJiaChen Apr 12, 2019
f2d5567
merge master
PanJiaChen Apr 16, 2019
d025ea7
refine
PanJiaChen Apr 16, 2019
da850a1
Merge branch 'master' into remove-i18n
PanJiaChen Apr 16, 2019
7c7f74d
refine
PanJiaChen Apr 16, 2019
e0829be
merge master
PanJiaChen Apr 16, 2019
7c7eef3
rm
PanJiaChen Apr 16, 2019
0c21130
add
PanJiaChen Apr 16, 2019
c09fb7f
Merge branch 'master' into remove-i18n
PanJiaChen Apr 17, 2019
c47b3e5
perf: optimize some small details
PanJiaChen Apr 18, 2019
1b044c0
Merge branch 'master' into remove-i18n
PanJiaChen Apr 18, 2019
da5ce81
Merge branch 'master' into remove-i18n
PanJiaChen Apr 19, 2019
9091017
update
PanJiaChen Apr 19, 2019
08aceea
rm
PanJiaChen Apr 19, 2019
c303868
merge master
PanJiaChen Apr 25, 2019
6520d1b
tweak
PanJiaChen Apr 25, 2019
9beb54c
merge master
PanJiaChen Apr 28, 2019
5c45b21
fix[Mock]: add error handling
PanJiaChen Apr 28, 2019
6e0f61b
refine
PanJiaChen Apr 30, 2019
abbe03c
Merge branch 'master' into remove-i18n
PanJiaChen Apr 30, 2019
e36bc34
merge master
PanJiaChen Apr 30, 2019
3f16415
merge master
PanJiaChen May 3, 2019
48f0f88
refine
PanJiaChen May 3, 2019
9c0fb26
Merge branch 'master' into remove-i18n
PanJiaChen May 5, 2019
60340f4
docs
PanJiaChen May 5, 2019
363d0b9
doc
PanJiaChen May 5, 2019
da9e486
rm
PanJiaChen May 5, 2019
c28979b
update
PanJiaChen May 5, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tweak
  • Loading branch information
PanJiaChen committed Apr 2, 2019
commit 4107fa5366b63dd9d2e389f13de9c03934f67f94
69 changes: 28 additions & 41 deletions src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const constantRoutes = [
path: 'dashboard',
component: () => import('@/views/dashboard/index'),
name: 'Dashboard',
meta: { title: 'dashboard', icon: 'dashboard', noCache: true, affix: true }
meta: { title: 'Dashboard', icon: 'dashboard', noCache: true, affix: true }
}
]
},
Expand All @@ -91,7 +91,7 @@ export const constantRoutes = [
path: 'index',
component: () => import('@/views/documentation/index'),
name: 'Documentation',
meta: { title: 'documentation', icon: 'documentation', affix: true }
meta: { title: 'Documentation', icon: 'documentation', affix: true }
}
]
},
Expand All @@ -104,7 +104,7 @@ export const constantRoutes = [
path: 'index',
component: () => import('@/views/guide/index'),
name: 'Guide',
meta: { title: 'guide', icon: 'guide', noCache: true }
meta: { title: 'Guide', icon: 'guide', noCache: true }
}
]
}
Expand All @@ -121,7 +121,7 @@ export const asyncRoutes = [
redirect: '/permission/index',
alwaysShow: true, // will always show the root menu
meta: {
title: 'permission',
title: 'Permission',
icon: 'lock',
roles: ['admin', 'editor'] // you can set roles in root nav
},
Expand All @@ -131,7 +131,7 @@ export const asyncRoutes = [
component: () => import('@/views/permission/page'),
name: 'PagePermission',
meta: {
title: 'pagePermission',
title: 'Page Permission',
roles: ['admin'] // or you can only set roles in sub nav
}
},
Expand All @@ -140,7 +140,7 @@ export const asyncRoutes = [
component: () => import('@/views/permission/directive'),
name: 'DirectivePermission',
meta: {
title: 'directivePermission'
title: 'Directive Permission'
// if do not set roles, means: this page does not require permission
}
},
Expand All @@ -149,7 +149,7 @@ export const asyncRoutes = [
component: () => import('@/views/permission/role'),
name: 'RolePermission',
meta: {
title: 'rolePermission',
title: 'Role Permission',
roles: ['admin']
}
}
Expand All @@ -164,7 +164,7 @@ export const asyncRoutes = [
path: 'index',
component: () => import('@/views/svg-icons/index'),
name: 'Icons',
meta: { title: 'icons', icon: 'icon', noCache: true }
meta: { title: 'Icons', icon: 'icon', noCache: true }
}
]
},
Expand All @@ -181,28 +181,28 @@ export const asyncRoutes = [
redirect: '/example/list',
name: 'Example',
meta: {
title: 'example',
title: 'Example',
icon: 'example'
},
children: [
{
path: 'create',
component: () => import('@/views/example/create'),
name: 'CreateArticle',
meta: { title: 'createArticle', icon: 'edit' }
meta: { title: 'Create Article', icon: 'edit' }
},
{
path: 'edit/:id(\\d+)',
component: () => import('@/views/example/edit'),
name: 'EditArticle',
meta: { title: 'editArticle', noCache: true },
meta: { title: 'Edit Article', noCache: true },
hidden: true
},
{
path: 'list',
component: () => import('@/views/example/list'),
name: 'ArticleList',
meta: { title: 'articleList', icon: 'list' }
meta: { title: 'Article List', icon: 'list' }
}
]
},
Expand All @@ -215,7 +215,7 @@ export const asyncRoutes = [
path: 'index',
component: () => import('@/views/tab/index'),
name: 'Tab',
meta: { title: 'tab', icon: 'tab' }
meta: { title: 'Tab', icon: 'tab' }
}
]
},
Expand All @@ -226,21 +226,21 @@ export const asyncRoutes = [
redirect: 'noredirect',
name: 'ErrorPages',
meta: {
title: 'errorPages',
title: 'Error Pages',
icon: '404'
},
children: [
{
path: '401',
component: () => import('@/views/errorPage/401'),
name: 'Page401',
meta: { title: 'page401', noCache: true }
meta: { title: '401', noCache: true }
},
{
path: '404',
component: () => import('@/views/errorPage/404'),
name: 'Page404',
meta: { title: 'page404', noCache: true }
meta: { title: '404', noCache: true }
}
]
},
Expand All @@ -254,7 +254,7 @@ export const asyncRoutes = [
path: 'log',
component: () => import('@/views/errorLog/index'),
name: 'ErrorLog',
meta: { title: 'errorLog', icon: 'bug' }
meta: { title: 'Error Log', icon: 'bug' }
}
]
},
Expand All @@ -265,33 +265,33 @@ export const asyncRoutes = [
redirect: '/excel/export-excel',
name: 'Excel',
meta: {
title: 'excel',
title: 'Excel',
icon: 'excel'
},
children: [
{
path: 'export-excel',
component: () => import('@/views/excel/exportExcel'),
name: 'ExportExcel',
meta: { title: 'exportExcel' }
meta: { title: 'Export Excel' }
},
{
path: 'export-selected-excel',
component: () => import('@/views/excel/selectExcel'),
name: 'SelectExcel',
meta: { title: 'selectExcel' }
meta: { title: 'Export Selected' }
},
{
path: 'export-merge-header',
component: () => import('@/views/excel/mergeHeader'),
name: 'MergeHeader',
meta: { title: 'mergeHeader' }
meta: { title: 'Merge Header' }
},
{
path: 'upload-excel',
component: () => import('@/views/excel/uploadExcel'),
name: 'UploadExcel',
meta: { title: 'uploadExcel' }
meta: { title: 'Upload Excel' }
}
]
},
Expand All @@ -301,13 +301,13 @@ export const asyncRoutes = [
component: Layout,
redirect: '/zip/download',
alwaysShow: true,
meta: { title: 'zip', icon: 'zip' },
meta: { title: 'Zip', icon: 'zip' },
children: [
{
path: 'download',
component: () => import('@/views/zip/index'),
name: 'ExportZip',
meta: { title: 'exportZip' }
meta: { title: 'Export Zip' }
}
]
},
Expand All @@ -321,7 +321,7 @@ export const asyncRoutes = [
path: 'index',
component: () => import('@/views/pdf/index'),
name: 'PDF',
meta: { title: 'pdf', icon: 'pdf' }
meta: { title: 'PDF', icon: 'pdf' }
}
]
},
Expand All @@ -340,7 +340,7 @@ export const asyncRoutes = [
path: 'index',
component: () => import('@/views/theme/index'),
name: 'Theme',
meta: { title: 'theme', icon: 'theme' }
meta: { title: 'Theme', icon: 'theme' }
}
]
},
Expand All @@ -354,20 +354,7 @@ export const asyncRoutes = [
path: 'index',
component: () => import('@/views/clipboard/index'),
name: 'ClipboardDemo',
meta: { title: 'clipboardDemo', icon: 'clipboard' }
}
]
},

{
path: '/i18n',
component: Layout,
children: [
{
path: 'index',
component: () => import('@/views/i18n-demo/index'),
name: 'I18n',
meta: { title: 'i18n', icon: 'international' }
meta: { title: 'Clipboard', icon: 'clipboard' }
}
]
},
Expand All @@ -378,7 +365,7 @@ export const asyncRoutes = [
children: [
{
path: 'https://github.com/PanJiaChen/vue-element-admin',
meta: { title: 'externalLink', icon: 'link' }
meta: { title: 'External Link', icon: 'link' }
}
]
},
Expand Down
8 changes: 4 additions & 4 deletions src/router/modules/charts.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,27 @@ const chartsRouter = {
redirect: 'noredirect',
name: 'Charts',
meta: {
title: 'charts',
title: 'Charts',
icon: 'chart'
},
children: [
{
path: 'keyboard',
component: () => import('@/views/charts/keyboard'),
name: 'KeyboardChart',
meta: { title: 'keyboardChart', noCache: true }
meta: { title: 'Keyboard Chart', noCache: true }
},
{
path: 'line',
component: () => import('@/views/charts/line'),
name: 'LineChart',
meta: { title: 'lineChart', noCache: true }
meta: { title: 'Line Chart', noCache: true }
},
{
path: 'mixchart',
component: () => import('@/views/charts/mixChart'),
name: 'MixChart',
meta: { title: 'mixChart', noCache: true }
meta: { title: 'Mix Chart', noCache: true }
}
]
}
Expand Down
30 changes: 15 additions & 15 deletions src/router/modules/components.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,93 +8,93 @@ const componentsRouter = {
redirect: 'noredirect',
name: 'ComponentDemo',
meta: {
title: 'components',
title: 'Components',
icon: 'component'
},
children: [
{
path: 'tinymce',
component: () => import('@/views/components-demo/tinymce'),
name: 'TinymceDemo',
meta: { title: 'tinymce' }
meta: { title: 'Tinymce' }
},
{
path: 'markdown',
component: () => import('@/views/components-demo/markdown'),
name: 'MarkdownDemo',
meta: { title: 'markdown' }
meta: { title: 'Markdown' }
},
{
path: 'json-editor',
component: () => import('@/views/components-demo/jsonEditor'),
name: 'JsonEditorDemo',
meta: { title: 'jsonEditor' }
meta: { title: 'JSON Editor' }
},
{
path: 'splitpane',
component: () => import('@/views/components-demo/splitpane'),
name: 'SplitpaneDemo',
meta: { title: 'splitPane' }
meta: { title: 'SplitPane' }
},
{
path: 'avatar-upload',
component: () => import('@/views/components-demo/avatarUpload'),
name: 'AvatarUploadDemo',
meta: { title: 'avatarUpload' }
meta: { title: 'Upload' }
},
{
path: 'dropzone',
component: () => import('@/views/components-demo/dropzone'),
name: 'DropzoneDemo',
meta: { title: 'dropzone' }
meta: { title: 'Dropzone' }
},
{
path: 'sticky',
component: () => import('@/views/components-demo/sticky'),
name: 'StickyDemo',
meta: { title: 'sticky' }
meta: { title: 'Sticky' }
},
{
path: 'count-to',
component: () => import('@/views/components-demo/countTo'),
name: 'CountToDemo',
meta: { title: 'countTo' }
meta: { title: 'Count To' }
},
{
path: 'mixin',
component: () => import('@/views/components-demo/mixin'),
name: 'ComponentMixinDemo',
meta: { title: 'componentMixin' }
meta: { title: 'Component Mixin' }
},
{
path: 'back-to-top',
component: () => import('@/views/components-demo/backToTop'),
name: 'BackToTopDemo',
meta: { title: 'backToTop' }
meta: { title: 'Back To Top' }
},
{
path: 'drag-dialog',
component: () => import('@/views/components-demo/dragDialog'),
name: 'DragDialogDemo',
meta: { title: 'dragDialog' }
meta: { title: 'Drag Dialog' }
},
{
path: 'drag-select',
component: () => import('@/views/components-demo/dragSelect'),
name: 'DragSelectDemo',
meta: { title: 'dragSelect' }
meta: { title: 'Drag Select' }
},
{
path: 'dnd-list',
component: () => import('@/views/components-demo/dndList'),
name: 'DndListDemo',
meta: { title: 'dndList' }
meta: { title: 'Dnd List' }
},
{
path: 'drag-kanban',
component: () => import('@/views/components-demo/dragKanban'),
name: 'DragKanbanDemo',
meta: { title: 'dragKanban' }
meta: { title: 'Drag Kanban' }
}
]
}
Expand Down
Loading