Commit Graph

304 Commits

Author SHA1 Message Date
XiaoBingBy ba1a07e363
Update coustom-form.vue 2018-09-26 00:16:28 +08:00
XiaoBingBy e4d0ea5b20 Merge branch 'bing-cloud' of https://github.com/XiaoBingBy/iview-admin into bing-cloud 2018-09-24 23:30:42 +08:00
XiaoBingBy efdd714273
add organization.vue 2018-09-24 23:30:02 +08:00
XiaoBingBy 415cf88318 Merge branch 'bing-cloud' of https://github.com/XiaoBingBy/iview-admin into bing-cloud 2018-09-24 23:27:58 +08:00
XiaoBingBy da9fd34cb8
update role 2018-09-24 23:27:35 +08:00
XiaoBingBy b519bd1e15
update user 2018-09-24 23:27:02 +08:00
XiaoBingBy 76db24a5d6 Merge branch 'bing-cloud' of https://github.com/XiaoBingBy/iview-admin into bing-cloud 2018-09-24 23:20:52 +08:00
XiaoBingBy f902d0fdef
add baseForm
add baseForm
2018-09-24 23:17:53 +08:00
XiaoBingBy ec4e4bc778 update user 2018-09-24 23:02:55 +08:00
XiaoBingBy 4f9943268a update user.vue 2018-09-20 00:43:39 +08:00
XiaoBingBy 4742b80bad update role.vue 2018-09-20 00:43:27 +08:00
XiaoBingBy 973d656c40 add role.js 2018-09-20 00:43:08 +08:00
XiaoBingBy 2708654106 update user 2018-09-19 07:32:40 +08:00
XiaoBingBy 7861433b86 Merge branch 'master' into bing-cloud 2018-09-18 22:42:13 +08:00
XiaoBingBy 03c64ba32f
Merge pull request #1 from iview/master
Open a pull request
2018-09-18 22:30:44 +08:00
Lison fed915d718
Merge pull request #980 from iview/2.0
2.0
2018-09-18 15:02:19 +08:00
lison 82b733a8e9 修复收缩菜单bug 2018-09-18 15:01:15 +08:00
zhigang.li 912fa28659 修复收缩菜单收起后鼠标放到三级菜单上二级消失的bug 2018-09-17 21:57:08 +08:00
XiaoBingBy b4b09d1e72 update user 2018-09-14 00:15:06 +08:00
XiaoBingBy 5eb4bd957f update user 2018-09-10 01:13:51 +08:00
XiaoBingBy 35997ddbbe add vue view 2018-09-07 19:20:12 +08:00
XiaoBingBy bba12eda0c update routers.js 2018-09-07 19:19:38 +08:00
Lison c2b560e834
Update README.md 2018-08-31 15:04:24 +08:00
Lison 6e9068fb06
Merge pull request #932 from iview/2.0
替换axios.js封装,修改api基础路径在src/config/index.js里配置
2018-08-31 12:17:03 +08:00
zhigang.li 8710e73342 替换axios.js封装,修改api基础路径在src/config/index.js里配置 2018-08-31 12:15:27 +08:00
Lison dfb318ed81
Update README.md 2018-08-31 10:18:25 +08:00
Lison 7becc132c2
Merge pull request #930 from iview/2.0
2.0
2018-08-30 18:19:33 +08:00
zhigang.li c4ca29db71 update 2018-08-30 18:19:02 +08:00
zhigang.li 897a73ba9b 添加拖拽列表组件DropList 2018-08-30 18:16:28 +08:00
zhigang.li 7c58c94a42 添加设置代理解决跨域示例 2018-08-30 18:15:42 +08:00
zhigang.li 378ec060c1 update 2018-08-30 14:48:57 +08:00
zhigang.li 342d2002c8 Merge branch 'pr/925' into 2.0 2018-08-30 13:06:34 +08:00
zhigang.li edfbc0a0b7 Merge branch 'master' into 2.0 2018-08-30 13:06:04 +08:00
zhigang.li b23b11d116 update 2018-08-30 13:05:16 +08:00
Lison 8a17c78aa4
Merge pull request #925 from LZHD/master
标签页右键关闭菜单
2018-08-30 13:03:04 +08:00
Lison 671e757144
Update README.md 2018-08-29 18:35:18 +08:00
fanxingqiang cd0ce9b808 标签页右键关闭菜单 2018-08-29 12:36:57 +08:00
zhigang.li 42fd083f31 修改富文本编辑器绑定值方式,使用:value,手动修改内容时调用组件的setHtml方法 2018-08-27 14:32:11 +08:00
Lison 8bd76b4cc1
Merge pull request #908 from iview/2.0
update base_url
2018-08-22 14:30:38 +08:00
zhigang.li 260c0e3f7b update BASE_URL 2018-08-22 14:29:52 +08:00
zhigang.li 17230152c3 update base_url 2018-08-22 13:38:58 +08:00
Lison c2c3ffd220
Merge pull request #905 from iview/2.0
update
2018-08-22 12:03:25 +08:00
zhigang.li 08e7b69e3c update 2018-08-22 12:02:40 +08:00
zhigang.li 73cb524f65 Merge branch '2.0'
# Conflicts:
#	package-lock.json
2018-08-21 22:40:44 +08:00
zhigang.li 2aa203c0ba update 2018-08-21 22:38:38 +08:00
Lison 27ce3554a7
Delete package-lock.json 2018-08-21 22:33:02 +08:00
zhigang.li 26c9bb7add update 2018-08-21 22:28:08 +08:00
zhigang.li 31af75e9a8 更新依赖,解决热重载失效的问题 2018-08-21 22:26:59 +08:00
zhigang.li 777fbeda52 修复因缺少"@babel/plugin-syntax-dynamic-import"插件导致的编译出错的bug 2018-08-21 22:03:15 +08:00
Lison 597cf2d531
Merge pull request #890 from LZHD/master
修复点击关闭其他标签页报错
2018-08-19 14:18:57 +08:00