Commit Graph

268 Commits

Author SHA1 Message Date
Lison 446816103c
Merge pull request #856 from iview/2.0
修复收缩菜单不能滚动
2018-08-09 16:56:42 +08:00
zhigang.li 34991367ef 修复收缩菜单不能滚动 2018-08-09 16:56:09 +08:00
Lison 39dcc93d88
Merge pull request #855 from iview/2.0
修改收缩菜单超出滚动逻辑
2018-08-09 16:43:46 +08:00
Lison c01511cc54
Merge branch 'master' into 2.0 2018-08-09 16:43:35 +08:00
zhigang.li 171986dbcf 修改收缩菜单超出滚动逻辑 2018-08-09 16:04:42 +08:00
Lison f509a9c100
Merge pull request #854 from iview/2.0
2.0
2018-08-09 14:39:27 +08:00
zhigang.li 6df91b0ff5 更新收缩菜单,带有子级的右侧显示箭头 2018-08-09 14:38:53 +08:00
zhigang.li e3adfbcdf4 修复侧边栏收缩后菜单被超出隐藏的bug 2018-08-09 14:31:09 +08:00
Lison f4e7b933b3
Merge pull request #853 from iview/2.0
update
2018-08-09 13:39:40 +08:00
zhigang.li 1bcdad6f6d update 2018-08-09 13:39:11 +08:00
Lison f14b44cd9b
Merge pull request #852 from iview/2.0
2.0
2018-08-09 13:38:20 +08:00
zhigang.li 35f5974b29 修复Main组件右侧顶部导航随页面滚动的bug 2018-08-09 13:37:09 +08:00
zhigang.li 37870c63f0 update 2018-08-09 11:44:54 +08:00
zhigang.li 88af60cc20 update 2018-08-09 11:40:36 +08:00
zhigang.li 34102a6e37 修复左侧菜单超出后没有滚动条的bug 2018-08-08 14:55:06 +08:00
zhigang.li 3d547388ff 更新左侧菜单,修复submenu图标不显示的bug 2018-08-07 19:03:09 +08:00
zhigang.li 76c9d7e8b7 更新多级菜单路由图标 2018-08-07 18:32:36 +08:00
zhigang.li d28228c197 commit 2018-08-07 17:34:14 +08:00
madlight-du 956987dff5 Merge branch '2.0' 2018-08-04 11:16:34 +08:00
madlight-du 0b89666f95 调整样式 2018-08-04 09:14:40 +08:00
madlight-du b07d54b75d 修正代码错误
修正代码错误
2018-08-03 13:34:05 +08:00
zhigang.li 1f15cfeef5 update home name 2018-08-03 13:20:04 +08:00
madlight-du b89a6a207c 规范参数格式
规范参数格式
2018-08-03 10:32:20 +08:00
madlight-du 38acea8089 调整缩进格式 2018-08-02 23:11:28 +08:00
madlight-du a76241694c 增加EXCEL导入导出功能
增加EXCEL导入导出功能
2018-08-02 22:12:21 +08:00
Lison 46d23c33da
Merge pull request #829 from iview/2.0
修复markdown打开边写边看模式后其他元素覆盖在编辑器上方的bug
2018-08-02 16:35:07 +08:00
zhigang.li e7bc6676f6 修复markdown打开边写边看模式后其他元素覆盖在编辑器上方的bug 2018-08-02 16:32:22 +08:00
Lison 64dd7f7478
Merge pull request #828 from iview/2.0
修复更新后面包屑‘首页’无法点击的bug
2018-08-02 16:26:18 +08:00
zhigang.li 37117514f8 修复更新后面包屑‘首页’无法点击的bug 2018-08-02 16:25:02 +08:00
Lison 6e74f57845
Merge pull request #827 from iview/2.0
优化home在面包屑和标签栏的显示内容,根据路由配置显示
2018-08-02 15:55:02 +08:00
zhigang.li fbc650e5c6 优化home在面包屑和标签栏的显示内容,根据路由配置显示 2018-08-02 15:53:42 +08:00
Lison 82ae74cd97
Merge pull request #817 from iview/2.0
2.0
2018-08-01 16:09:18 +08:00
zhigang.li a38eb26b4f 修复登录keydown.enter问题 2018-08-01 14:46:13 +08:00
zhigang.li d89c7f4f28 update some icon-name 2018-07-31 17:17:51 +08:00
Lison c42fe91873
Merge pull request #812 from iview/2.0
2.0
2018-07-31 11:16:42 +08:00
Lison 286c1a1c7b
Merge pull request #802 from lizouzt/2.0
update route access judge function
2018-07-31 11:16:07 +08:00
zhigang.li fa13df6f9f update util.js getHasAccessRouteNames 2018-07-31 11:15:46 +08:00
Aresn a140ecd7d6
Update README.md 2018-07-31 10:09:07 +08:00
zhigang.li eb288c36c8 update iview to v3.0.0 2018-07-30 20:13:07 +08:00
tao.z 0d2711d27b Merge branch '2.0' of github.com:lizouzt/iview-admin into 2.0 2018-07-26 11:26:43 +08:00
tao.z 78106687bc update route access judge function 2018-07-26 11:20:59 +08:00
zhigang.li a70db92cfa remove development qq group image 2018-07-26 10:34:44 +08:00
Lison ed93eb060b
Merge pull request #799 from iview/2.0
2.0
2018-07-25 18:41:35 +08:00
zhigang.li 615c3bcf15 add eslint-plugin-cypress 2018-07-25 18:37:12 +08:00
zhigang.li 6161ca841c commit 2018-07-25 18:12:42 +08:00
zhigang.li 56b3b9d370 修复多级菜单示例错误bug 2018-07-23 16:25:35 +08:00
zhigang.li 154339289f 修复收缩菜单自定义图标不显示的bug 2018-07-23 15:53:04 +08:00
zhigang.li fddb9c1d63 remove cypress plugin 2018-07-23 12:03:46 +08:00
zhigang.li 00d9ca9bc3 commit 2018-07-16 14:47:44 +08:00
Lison 558fc711df
Merge pull request #756 from iview/2.0
2.0
2018-07-06 19:29:31 +08:00