Commit Graph

415 Commits

Author SHA1 Message Date
zhigang.li 7a75e24849 Merge branch '2.0' 2018-12-21 13:36:48 +08:00
zhigang.li 11209b0ada 增加可拖动抽屉组件drag-drawer 2018-12-21 13:32:47 +08:00
zhigang.li 96d4982c94 Merge branch '2.0' 2018-12-20 19:08:11 +08:00
zhigang.li e78f77fc76 新增组织结构树页面 2018-12-20 19:07:47 +08:00
zhigang.li aa52d9559b Update package.json 2018-12-17 20:08:46 +08:00
lison16 c2d3e0be50 commit 2018-12-17 20:07:31 +08:00
zhigang.li 1c5d33bdcd Update vue.config.js 2018-12-14 16:22:03 +08:00
zhigang.li ec949dace3 Merge branch '2.0' 2018-12-06 11:30:29 +08:00
zhigang.li 5e345e02f5 lint 2018-12-06 11:29:21 +08:00
zhigang.li fc8cf99e59 Merge branch '2.0' 2018-12-06 10:53:49 +08:00
zhigang.li 7c7fb7e73e update 2018-12-06 10:53:32 +08:00
zhigang.li c85574b795 Merge branch '2.0' 2018-11-28 11:34:23 +08:00
zhigang.li 42c153ff74 在动态路由匹配和带参路由匹配页面增加closeTag关闭页面示例 2018-11-28 11:33:44 +08:00
zhigang.li 17b9ef22aa Merge branch '2.0' 2018-11-21 18:37:23 +08:00
zhigang.li 3ec36b6b8e 更新tree-table-vue版本,更改了个别api命名 2018-11-21 18:36:48 +08:00
zhigang.li 0f6f038d49 修复三级菜单之间切换页面无法缓存的bug 2018-11-21 18:36:25 +08:00
zhigang.li 037c8e820d Merge branch '2.0' 2018-11-20 18:17:01 +08:00
zhigang.li 6106e500f4 优化api请求的错误收集 2018-11-20 18:16:47 +08:00
zhigang.li 2c08ea160f Merge branch '2.0' 2018-11-19 17:30:46 +08:00
zhigang.li 8552ce1267 增加clipboard指令 2018-11-19 17:30:29 +08:00
zhigang.li 37e29bc4f7 Merge branch '2.0' 2018-11-19 16:31:43 +08:00
zhigang.li 228cd68748 config/index.js添加配置浏览器标签显示的基本标题title的配置,会拼接为 '${title} - ${当前页标题}' 2018-11-19 16:31:19 +08:00
zhigang.li a1803b0995 Merge branch '2.0' 2018-11-19 12:05:23 +08:00
zhigang.li e15918c532 修复富文本编辑器由于内部z-index设置过高,遮住iview模态框的问题 2018-11-19 12:05:03 +08:00
zhigang.li a30a6e55a6 Merge branch '2.0' 2018-11-19 11:50:37 +08:00
zhigang.li 853f3d3fb8 增加ABackTop组件,支持在自定义滚动容器 2018-11-19 11:50:04 +08:00
Lison 590aa7677c
Merge pull request #1096 from iview/2.0
update baseUrl
2018-11-16 17:29:37 +08:00
zhigang.li 39e8fa75f6 update baseUrl 2018-11-16 16:55:09 +08:00
zhigang.li c9fb7f42ea Merge branch '2.0' 2018-11-16 16:46:02 +08:00
zhigang.li 387b0b354d 优化消息中心数据获取 2018-11-16 16:45:41 +08:00
zhigang.li 22ceb98ab4 udpate 2018-11-16 16:31:48 +08:00
zhigang.li bd4ffc49c8 Merge branch '2.0' 2018-11-16 16:30:23 +08:00
zhigang.li e33acdc8d2 新增树状表格组件 2018-11-16 16:29:45 +08:00
Lison cb88361a0d
Merge pull request #1092 from Baoyx007/patch-3
Update error-content.vue
2018-11-16 10:42:48 +08:00
Haven 855d0fe02a
fix(error-page): add missing event for back 2018-11-16 10:27:35 +08:00
Haven 12f29b7d16
Update error-content.vue 2018-11-15 17:32:05 +08:00
zhigang.li f4f4a82dcf Merge branch '2.0'
修复多语言路由配置,当title的回调函数返回一个不带{{}}的字符串时title被多语言配置的字符串覆盖的bug
2018-11-14 18:41:56 +08:00
zhigang.li 56742b707e 修复多语言路由配置bug 2018-11-14 18:40:53 +08:00
zhigang.li@tendcloud.com 59a72ae1c0 Merge branch '2.0'
去掉main.js里重复引入的iview样式文件
2018-11-13 14:51:14 +08:00
zhigang.li@tendcloud.com 21b2c15577 去掉main.js里重复引入的iview样式文件 2018-11-13 14:50:39 +08:00
zhigang.li@tendcloud.com ac71d28739 Merge branch '2.0'
新增消息中心
2018-11-08 15:15:53 +08:00
zhigang.li@tendcloud.com a72be82a9b 新增消息中心 2018-11-08 15:15:25 +08:00
zhigang.li@tendcloud.com 585c4028f5 Merge branch '2.0'
fix error word
2018-11-08 10:20:32 +08:00
zhigang.li@tendcloud.com e82724c16f fix error word 2018-11-08 10:19:24 +08:00
zhigang.li@tendcloud.com ae5edc07c5 Merge branch '2.0'
添加图片裁剪组件Cropper
2018-11-07 17:00:39 +08:00
zhigang.li@tendcloud.com afdbeacac2 新增图片裁剪组件Cropper 2018-11-07 17:00:09 +08:00
zhigang.li@tendcloud.com f1feef19ed commit 2018-11-07 10:29:24 +08:00
zhigang.li@tendcloud.com 70fe4ee16a Merge branch '2.0' 2018-11-06 17:55:01 +08:00
zhigang.li@tendcloud.com a7b7a20d33 修复多功能表格组件在未开启搜索功能时报错的bug 2018-11-06 17:53:38 +08:00
zhigang.li@tendcloud.com b5b0b0c123 Merge branch '2.0' 2018-11-05 14:33:57 +08:00