Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vue-admin #1218

Open
wants to merge 355 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
355 commits
Select commit Hold shift + click to select a range
de52967
solve the bug of breadcrumbNav
Oct 6, 2017
7a5398d
solve the bug that the tag of ownspace doesn't move to second place
Oct 6, 2017
77a8a67
add logo on Main.vue
Oct 6, 2017
f2afce6
solve a bug of animateinput.vue
Oct 7, 2017
6e18669
Simplify and optimize code
Oct 7, 2017
c9316b7
add badge on Main.vue to remind message
Oct 7, 2017
427887d
update
Oct 7, 2017
28e2ab0
update
Oct 7, 2017
8916eb7
update
Oct 7, 2017
3685ecf
add basic of message page
Oct 7, 2017
4b727b3
update message page
Oct 7, 2017
a40bfff
add message page
Oct 8, 2017
75cb076
update article-publish
Oct 8, 2017
82445bc
create a part of lock screen
Oct 8, 2017
74e91c6
add lock component
Oct 9, 2017
2d7678d
update lock component
Oct 9, 2017
0ea203b
update unlock component
Oct 9, 2017
d518c87
remove vue-baidu-map package
Oct 9, 2017
cfcba8e
update home page
Oct 9, 2017
9b5a422
Reconstruction editable table
Oct 9, 2017
6b66019
update editableTable
Oct 11, 2017
11b451b
update editable-table page icon
Oct 11, 2017
aec4375
update editableTable
Oct 11, 2017
9ac2163
update editable-page and it's router
Oct 11, 2017
4c5e7ee
change login page layout and style
Oct 11, 2017
924888c
remove animationInput component
Oct 11, 2017
2e9c659
set editableTable's btn style
Oct 11, 2017
b94baf6
set markdown editor toolbar
Oct 11, 2017
ec3b814
add greeting notice after logined
Oct 11, 2017
88255c0
change the icon of formEdit in sidebarmenu
Oct 11, 2017
d395447
update the processing method of map menulist
Oct 11, 2017
03151fe
create 4 pages about error page
Oct 11, 2017
fe91797
add 404 page
Oct 11, 2017
9075e64
add 500 error page
Oct 11, 2017
f085d60
update
Oct 11, 2017
2bdfb50
add 401 error page
Oct 12, 2017
c3ddd58
add error-page
Oct 12, 2017
f136c0d
update icons on error-page card title
Oct 12, 2017
dab0f25
update menulist and tagslist init type
Oct 12, 2017
d7818f5
add menulist filter by access
Oct 12, 2017
7ff6a69
update
Oct 12, 2017
8397974
add access page
Oct 12, 2017
e0aee96
update
Oct 12, 2017
1d61980
update access page introduction
Oct 12, 2017
a6a3bc8
perfect theme switching
Oct 12, 2017
1838c83
perfect localStorage
Oct 12, 2017
92c632e
remove access-test.vue
Oct 12, 2017
4aca0be
update function about set current pathArr
Oct 12, 2017
c3bbe9b
update sidebarMenu component
Oct 13, 2017
ce826f0
add sidebarMenuShrink component
Oct 13, 2017
8208d02
update sidebarMenuShrink component
Oct 13, 2017
3d709ff
update sidebarMenuShrink component
Oct 13, 2017
dbe076a
perfect code
Oct 13, 2017
8f663de
update menu btn in Main.vue
Oct 13, 2017
85d1925
update login out
Oct 13, 2017
f6cd071
update sidebar-menu-con overflow style
Oct 13, 2017
c0a3fb2
add icon to sidebarMenuShrink menuitem
Oct 13, 2017
aee532b
update
Oct 13, 2017
5127ef4
change message icon
Oct 13, 2017
66b4b56
update dependencies
icarusion Oct 16, 2017
a00bfc6
update
icarusion Oct 16, 2017
1bdd64f
update
Oct 16, 2017
8c1419a
Merge branch 'dev' of https:/iview/iview-admin into dev
Oct 16, 2017
75ff8fa
update logo
icarusion Oct 16, 2017
550dc7b
Merge branch 'dev' of https:/iview/iview-admin into dev
icarusion Oct 16, 2017
31eaa70
simplify city data
Oct 16, 2017
35b590f
Merge branch 'dev' of https:/iview/iview-admin into dev
Oct 16, 2017
077ab1f
change Main.vue 's layout
Oct 16, 2017
4247a8f
update
Oct 16, 2017
13e42ae
fixed error of tinymce after updated to tinymce 4.7.1
Oct 16, 2017
3113b3a
update router beforeeach handle
Oct 16, 2017
a2cfdc9
update sidebarMenuShrink component
Oct 16, 2017
63aca63
eidt theme switch dropdown icon
Oct 16, 2017
fd55276
update message page stylesheet and message content
Oct 16, 2017
495270a
Update README.md
icarusion Oct 16, 2017
183e810
fixed bug about breadcrumbNav
Oct 16, 2017
77d752c
Merge branch 'dev' of https:/iview/iview-admin into dev
Oct 16, 2017
893b3d8
update iview to 2.5.0-beta.1, and add icon
Oct 16, 2017
aab9631
edit avator img url
Oct 16, 2017
c518003
update
Oct 16, 2017
7987abb
update editable-table column data
Oct 16, 2017
5587f7a
update locking handle
Oct 16, 2017
d2307be
update readme
Oct 16, 2017
f8c7a07
update readme
Oct 16, 2017
f8521ae
update readme
Oct 16, 2017
48626b3
change init avator way
Oct 17, 2017
094869a
change avator path
Oct 17, 2017
5194bc4
create enter keydown event to unlock
Oct 17, 2017
b3a7e1f
Update READEME.md
Oct 17, 2017
915206d
test github-gif
Oct 17, 2017
c941402
add effect show gif
Oct 17, 2017
72aa174
Update README.md , add effect show
Oct 17, 2017
ecbb0e7
add file tree to readme.md
Oct 17, 2017
fcd2877
update readme.md file tree
Oct 17, 2017
a9a78de
prod
Oct 17, 2017
9e673f1
router config
Oct 17, 2017
2cc51d9
update index.ejs
Oct 17, 2017
215fa00
update
Oct 17, 2017
869cf55
update
Oct 17, 2017
cc6dd28
update
Oct 17, 2017
3895afe
update
Oct 17, 2017
9a5a131
update ejs template
Oct 17, 2017
fb9e48b
update
Oct 17, 2017
49f7edd
update readme
icarusion Oct 17, 2017
cae7f14
update
Oct 17, 2017
89b2638
update
Oct 17, 2017
0c71149
Merge branch 'dev' of https:/iview/iview-admin into dev
Oct 17, 2017
2c4a8a7
move theme style file
Oct 17, 2017
56e0ead
update
Oct 17, 2017
5fa14a3
fixed bug about fullscreen
Oct 17, 2017
0a59e25
update readme
icarusion Oct 17, 2017
5f9d7c3
Update README.md
Oct 17, 2017
ff65105
update
Oct 17, 2017
7a21b04
update .gitignore
Oct 17, 2017
019524c
update
Oct 17, 2017
e97245a
update
Oct 17, 2017
a1f3c40
update .gitignore
Oct 18, 2017
a0a5e42
fixed bug that always open new window when drag dragable list and table
Oct 18, 2017
a4a9bb4
add loading spin for texteditor when plugins are loading
Oct 18, 2017
1fecd8d
update
Oct 18, 2017
22eeaea
update
Oct 18, 2017
ae32855
fixed message bug when click left class btn don't show message list o…
Oct 18, 2017
7f52c93
fixed bug of tinymce run in safari when mouseover menu comeout a cover
Oct 18, 2017
c308e1e
tell you witch password you should input at locking page
Oct 18, 2017
63a5967
change message switch animation
Oct 19, 2017
859d6b3
fixed the bug of ivu-message was coverd in locking page
Oct 19, 2017
c1ef4b1
修复complie失败错误
onionch Oct 19, 2017
c10b8f5
add image cropper
Oct 19, 2017
c9738b1
Merge pull request #38 from onionch/dev
Oct 19, 2017
263b33e
fixed bug of editableTable that it won't update view after updating data
Oct 19, 2017
68a4e98
Update README.md
Oct 19, 2017
ca207cf
Update README.md
Oct 19, 2017
6543ee7
Update README.md
Oct 19, 2017
ab1a460
change image-editor page button layout
Oct 20, 2017
6650577
update
Oct 20, 2017
a691962
add image-editor gif
Oct 20, 2017
4799d26
Update README.md
Oct 20, 2017
b873f05
Update README.md
Oct 20, 2017
0b0d70a
update util.js remove util.openPage() and add openNewPage()
Oct 20, 2017
b18e520
add argument-page
Oct 20, 2017
0ad9165
update tagsPageOpened
Oct 20, 2017
b121f75
Update README.md
Oct 21, 2017
d75a867
Update package.json
Oct 21, 2017
2f533ad
update to v1.1.0
Oct 21, 2017
26df229
edit transition
Oct 21, 2017
82156b2
update tags gif
Oct 21, 2017
9a787e4
update
Oct 21, 2017
4d514c4
Update README.md
Oct 21, 2017
7eaee69
Update README.md
Oct 21, 2017
054da54
Update README.md
Oct 21, 2017
4610e23
perfect cache page state
Oct 21, 2017
1444d8b
perfect tagsPageOpened move to view
Oct 22, 2017
60dba87
fixed the bug of tags move to view when tag's left-hand at left of vi…
Oct 22, 2017
5a884ed
fixed scrollbar blinking bug when scroll tags
Oct 23, 2017
4d8f0be
Update README.md
Oct 23, 2017
9230745
Update README.md
Oct 23, 2017
f013ab9
Update README.md
Oct 23, 2017
b207ec9
update login page
Oct 23, 2017
b0b3403
Update README.md
Oct 23, 2017
44eedde
fixed bug that level 2 menu can't change display or not by access code
Oct 23, 2017
acef254
fixed bug that user can visit each page even though don't have access…
Oct 23, 2017
b4f7654
update
Oct 23, 2017
c614fec
'redirect' of level 1 router object is not necessary now!
Oct 23, 2017
219babd
update message page layout
Oct 23, 2017
eed09d6
Update README.md
Oct 23, 2017
763e7d1
delete argupage and add query-page and argument-page
Oct 24, 2017
6c2232b
update advanced-router child page icon
Oct 24, 2017
2095921
Update README.md
Oct 24, 2017
88e582a
update
Oct 24, 2017
baf1881
create animation to sidebarmenu
Oct 24, 2017
8735b8d
update to 1.1.2
Oct 24, 2017
2bcdafd
add international support and add international page
Oct 24, 2017
62aa168
fixed small bug
Oct 24, 2017
c315753
update
Oct 24, 2017
46375f2
Update README.md
Oct 24, 2017
ba9f5a8
fixed bug that it will not show tag when click back button to back a …
Oct 24, 2017
69edee8
add searchable-table
Oct 24, 2017
5263a3a
update to 1.1.3
Oct 24, 2017
de17580
change the way of editable table updating data of parent component
Oct 25, 2017
6439d0a
fixed bug of fullscreen
Oct 26, 2017
ad02912
fixed dug of todolist
Oct 27, 2017
86ac52a
Update README.md
Oct 30, 2017
ef4601f
update to v1.1.4
Oct 30, 2017
5b51454
Update README.md
Oct 30, 2017
abd11ef
fix bug for issues #110
Nov 1, 2017
8b30d90
fix bug for issues #110
Nov 1, 2017
5fe0434
Merge pull request #136 from RenShine/dev
Nov 1, 2017
bc12260
fixed the bug of closetag dropdown
Nov 1, 2017
b989646
move stylesheet from index.html to main.less
Nov 3, 2017
d1cb2ec
Update README.md
Nov 4, 2017
5324522
add area-linkage
Nov 7, 2017
5406b78
Merge branch 'dev' of https:/iview/iview-admin into dev
Nov 7, 2017
25401c5
update
Nov 8, 2017
b9ef1ac
update iview-area version
Nov 8, 2017
6418338
update
Nov 8, 2017
e2dfe5c
update
Nov 8, 2017
0515448
update
Nov 8, 2017
269008c
update
Nov 8, 2017
d7166d7
update
Nov 8, 2017
b53b783
Update README.md
Nov 9, 2017
37766e3
Update package.json
Nov 9, 2017
b1b8cfd
Update README.md
Nov 9, 2017
ea6c9f4
Update README.md
Nov 9, 2017
dedefa5
update to 1.2.0
Nov 15, 2017
2b0c51f
update to 1.2.0
Nov 15, 2017
ab2d4ff
edit version number
Nov 15, 2017
0b1d700
update
Nov 15, 2017
35fda9f
update
Nov 15, 2017
e8dc570
Update README.md
Nov 15, 2017
2eae744
Update README.md
Nov 15, 2017
362ae8f
readme.md
Nov 15, 2017
6669bdb
readme.md
Nov 15, 2017
5619c85
Update README.md
Nov 15, 2017
9ae8d91
change file name Involves the case
Nov 17, 2017
2db30d7
update
Nov 17, 2017
2161440
update
Nov 18, 2017
a5157ab
fixed asscess filter bug
Nov 20, 2017
4af568e
fixed the bug of own-space
Nov 20, 2017
7969f68
update
Nov 20, 2017
f949514
update
Nov 20, 2017
9a5a9b7
fixed the bug of message count show
Nov 20, 2017
11fb55d
update
Nov 20, 2017
e0eb93e
fixed bug of article publish
Nov 20, 2017
d07b959
update package.json
Nov 20, 2017
9816ca2
update
Nov 20, 2017
58e20ce
add english doc
Nov 20, 2017
ae49d0f
fixed bug of message and ownspace that can't cache state
Nov 21, 2017
d9fd828
update
Nov 21, 2017
f18bcb3
update
Nov 21, 2017
d38855c
util.openNewpage is not need
Nov 21, 2017
83be601
fixed bug of shrinkable-menu about icon color
Nov 21, 2017
ee8e70c
Update README_EN.md
Nov 21, 2017
2fe4023
updated
Nov 21, 2017
f672a7a
update to 1.2.1
Nov 21, 2017
741891e
fixed the bug that will throw error when turn to page just like login
Nov 21, 2017
06305fb
publish
Nov 21, 2017
ccef045
remove gif
Nov 21, 2017
77432ba
update
Nov 21, 2017
b558f79
add pic
Nov 21, 2017
8f65158
add readme
Nov 21, 2017
b14e85b
update to 2.0
May 18, 2018
cf5f885
Rename app.vue to App.vue
May 20, 2018
6e435a1
修复点击标签导航报错的bug
May 20, 2018
1e3a929
commit
May 20, 2018
17e5468
修复标签导航关闭单个标签报错bug
May 20, 2018
af49474
commit
May 20, 2018
96d89d3
update,优化标签导航关闭一个标签后的处理逻辑
Jun 4, 2018
e0a35d3
Merge branch '2.0' into template
Sep 25, 2018
dca0c13
Merge branch '2.0' into template
Nov 2, 2018
1d06fb3
更新简易模板,基于https:/iview/iview-admin/releases/tag/v2.0.0-beta9
Nov 2, 2018
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
1 change: 1 addition & 0 deletions config/env.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default 'development'
6 changes: 6 additions & 0 deletions config/url.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import env from './env'

const DEV_URL = 'https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/'
const PRO_URL = 'https://produce.com'

export default env === 'development' ? DEV_URL : PRO_URL
10 changes: 5 additions & 5 deletions src/config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default {
* 如果不使用,则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'}
* 用来在菜单中显示文字
*/
useI18n: true,
useI18n: false,
/**
* @description api请求基础路径
*/
Expand All @@ -24,9 +24,9 @@ export default {
* @description 需要加载的插件
*/
plugin: {
'error-store': {
showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
developmentOff: false // 设为true后在开发环境不会收集错误信息,方便开发中排查错误
}
// 'error-store': {
// showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
// developmentOff: false // 设为true后在开发环境不会收集错误信息,方便开发中排查错误
// }
}
}
1 change: 0 additions & 1 deletion src/libs/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ export const getNextRoute = (list, route) => {
res = getHomeRoute(list)
} else {
const index = list.findIndex(item => routeEqual(item, route))
console.log(route, index, list.length)
if (index === list.length - 1) res = list[list.length - 2]
else res = list[index + 1]
}
Expand Down
1 change: 0 additions & 1 deletion src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ router.beforeEach((to, from, next) => {
name: homeName // 跳转到homeName页
})
} else {
console.log(store.state.user.hasGetInfo)
if (store.state.user.hasGetInfo) {
turnTo(to, store.state.user.access, next)
} else {
Expand Down
276 changes: 0 additions & 276 deletions src/router/routers.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,251 +58,6 @@ export default [
icon: 'ios-book'
}
},
{
path: '/join',
name: 'join',
component: Main,
children: [
{
path: 'join_page',
name: 'join_page',
meta: {
icon: '_qq',
title: 'QQ群'
},
component: () => import('@/view/join-page.vue')
}
]
},
{
path: '/components',
name: 'components',
meta: {
icon: 'logo-buffer',
title: '组件'
},
component: Main,
children: [
{
path: 'count_to_page',
name: 'count_to_page',
meta: {
icon: 'md-trending-up',
title: '数字渐变'
},
component: () => import('@/view/components/count-to/count-to.vue')
},
{
path: 'drag_list_page',
name: 'drag_list_page',
meta: {
icon: 'ios-infinite',
title: '拖拽列表'
},
component: () => import('@/view/components/drag-list/drag-list.vue')
},
{
path: 'tables_page',
name: 'tables_page',
meta: {
icon: 'md-grid',
title: '多功能表格'
},
component: () => import('@/view/components/tables/tables.vue')
},
{
path: 'split_pane_page',
name: 'split_pane_page',
meta: {
icon: 'md-pause',
title: '分割窗口'
},
component: () => import('@/view/components/split-pane/split-pane.vue')
},
{
path: 'markdown_page',
name: 'markdown_page',
meta: {
icon: 'logo-markdown',
title: 'Markdown编辑器'
},
component: () => import('@/view/components/markdown/markdown.vue')
},
{
path: 'editor_page',
name: 'editor_page',
meta: {
icon: 'ios-create',
title: '富文本编辑器'
},
component: () => import('@/view/components/editor/editor.vue')
},
{
path: 'icons_page',
name: 'icons_page',
meta: {
icon: '_bear',
title: '自定义图标'
},
component: () => import('@/view/components/icons/icons.vue')
}
]
},
{
path: '/update',
name: 'update',
meta: {
icon: 'md-cloud-upload',
title: '数据上传'
},
component: Main,
children: [
{
path: 'update_table_page',
name: 'update_table_page',
meta: {
icon: 'ios-document',
title: '上传Csv'
},
component: () => import('@/view/update/update-table.vue')
},
{
path: 'update_paste_page',
name: 'update_paste_page',
meta: {
icon: 'md-clipboard',
title: '粘贴表格数据'
},
component: () => import('@/view/update/update-paste.vue')
}
]
},
{
path: '/excel',
name: 'excel',
meta: {
icon: 'ios-stats',
title: 'EXCEL导入导出'
},
component: Main,
children: [
{
path: 'upload-excel',
name: 'upload-excel',
meta: {
icon: 'md-add',
title: '导入EXCEL'
},
component: () => import('@/view/excel/upload-excel.vue')
},
{
path: 'export-excel',
name: 'export-excel',
meta: {
icon: 'md-download',
title: '导出EXCEL'
},
component: () => import('@/view/excel/export-excel.vue')
}
]
},
{
path: '/tools_methods',
name: 'tools_methods',
meta: {
hide: true
},
component: Main,
children: [
{
path: 'tools_methods_page',
name: 'tools_methods_page',
meta: {
icon: 'ios-hammer',
title: '工具方法',
beforeCloseName: 'before_close_normal'
},
component: () => import('@/view/tools-methods/tools-methods.vue')
}
]
},
{
path: '/i18n',
name: 'i18n',
meta: {
hide: true
},
component: Main,
children: [
{
path: 'i18n_page',
name: 'i18n_page',
meta: {
icon: 'md-planet',
title: 'i18n - {{ i18n_page }}'
},
component: () => import('@/view/i18n/i18n-page.vue')
}
]
},
{
path: '/error_store',
name: 'error_store',
meta: {
hide: true
},
component: Main,
children: [
{
path: 'error_store_page',
name: 'error_store_page',
meta: {
icon: 'ios-bug',
title: '错误收集'
},
component: () => import('@/view/error-store/error-store.vue')
}
]
},
{
path: '/error_logger',
name: 'error_logger',
meta: {
hide: true,
hideInMenu: true
},
component: Main,
children: [
{
path: 'error_logger_page',
name: 'error_logger_page',
meta: {
icon: 'ios-bug',
title: '错误收集'
},
component: () => import('@/view/single-page/error-logger.vue')
}
]
},
{
path: '/directive',
name: 'directive',
meta: {
hide: true
},
component: Main,
children: [
{
path: 'directive_page',
name: 'directive_page',
meta: {
icon: 'ios-navigate',
title: '指令'
},
component: () => import('@/view/directive/directive.vue')
}
]
},
{
path: '/multilevel',
name: 'multilevel',
Expand Down Expand Up @@ -354,37 +109,6 @@ export default [
}
]
},
{
path: '/argu',
name: 'argu',
meta: {
hideInMenu: true
},
component: Main,
children: [
{
path: 'params/:id',
name: 'params',
meta: {
icon: 'md-flower',
title: route => `{{ params }}-${route.params.id}`,
notCache: true,
beforeCloseName: 'before_close_normal'
},
component: () => import('@/view/argu-page/params.vue')
},
{
path: 'query',
name: 'query',
meta: {
icon: 'md-flower',
title: route => `{{ query }}-${route.query.id}`,
notCache: true
},
component: () => import('@/view/argu-page/query.vue')
}
]
},
{
path: '/401',
name: 'error_401',
Expand Down
17 changes: 0 additions & 17 deletions src/view/argu-page/params.vue

This file was deleted.

17 changes: 0 additions & 17 deletions src/view/argu-page/query.vue

This file was deleted.

Loading