 zuiidea
|
8ffd68a4e2
|
Merge branch 'dkvirus-patch-1' into develop
|
2017-10-30 11:50:18 +08:00 |
|
|
zuiidea
|
766653ee7a
|
merge #640
|
2017-10-30 11:49:27 +08:00 |
|
|
zuiidea
|
9dedcc68c3
|
Merge branch 'the-wang-master' into develop
|
2017-10-30 11:28:23 +08:00 |
|
|
zuiidea
|
5ea2b3c9b8
|
extend chart
|
2017-10-30 11:25:53 +08:00 |
|
 汪亚辉
|
d2ac91839a
|
面包屑导航支持多级参数
例：
当前router为/:appkey/:packageId
父级router为/:appkey
当前pathname为/com.mock.ly/58
可以看出appkey=com.mock.ly, packageId=58
目前这种场景下，面包屑中父级连接直接展示为/:appkey，没有解析
本次commit支持根据当前多param去填充面包屑中父级页面连接
|
2017-10-24 18:55:06 +08:00 |
|
 the-wang
|
bfca2746d8
|
Merge pull request #1 from zuiidea/master
up
|
2017-10-24 18:54:10 +08:00 |
|
 dkvirus
|
b417065ac3
|
Update Menu.js
在 Slider.js 中调用 Menu 组件，并没有传入 handleClickNavMenu 属性的值，代码优化。
|
2017-10-12 16:27:52 +08:00 |
|
|
zuiidea
|
b8162060cd
|
Merge pull request #581 from zuiidea/develop
Develop
|
2017-09-11 10:27:01 +08:00 |
|
|
zuiidea
|
36fb5d293c
|
delete extra code
|
2017-09-11 10:19:43 +08:00 |
|
|
zuiidea
|
429280a97a
|
Merge branch 'DiroKate-master' into develop
|
2017-09-11 10:18:37 +08:00 |
|
|
zuiidea
|
7ac36c779e
|
merge #332
|
2017-09-11 10:18:20 +08:00 |
|
|
zuiidea
|
d2e7b464e3
|
megre #563
|
2017-09-11 10:00:25 +08:00 |
|
|
zuiidea
|
25839ea99f
|
Merge branch 'akliyiping-develop' into develop
|
2017-09-11 09:55:27 +08:00 |
|
|
zuiidea
|
9c99581aa6
|
Merge branch 'develop' of https://github.com/akliyiping/antd-admin into akliyiping-develop
|
2017-09-11 09:55:05 +08:00 |
|
|
zuiidea
|
e42c21f0eb
|
fix #574
|
2017-09-11 09:53:22 +08:00 |
|
|
zuiidea
|
782bf214e5
|
Merge branch 'dong894-master' into develop
|
2017-09-11 09:47:45 +08:00 |
|
|
zuiidea
|
a8a4496c7a
|
Merge branch 'master' of https://github.com/dong894/antd-admin into dong894-master
|
2017-09-11 09:47:29 +08:00 |
|
|
zuiidea
|
f5f013ff23
|
Merge branch 'develop'
4.3.6
|
2017-09-11 09:35:39 +08:00 |
|
|
zuiidea
|
8cff3af897
|
Merge branch 'master' of https://github.com/zuiidea/antd-admin
|
2017-09-11 09:35:32 +08:00 |
|
|
zuiidea
|
322d5a6d0e
|
merge #576
|
2017-09-11 09:35:09 +08:00 |
|
|
zuiidea
|
2ee26f51a7
|
Merge branch 'yangbin1994-bug575' into develop
|
2017-09-11 09:27:00 +08:00 |
|
|
zuiidea
|
e670ed2f96
|
Merge branch 'bug575' of https://github.com/yangbin1994/antd-admin into yangbin1994-bug575
|
2017-09-11 09:26:36 +08:00 |
|
 杨斌
|
601a03b5b4
|
fix bug#575
|
2017-09-10 02:26:27 +08:00 |
|
 dongyulei
|
00582e70ff
|
修复 4.3.5 中用户画面翻页无效的问题
|
2017-09-10 00:02:10 +08:00 |
|
|
zuiidea
|
fa4385055b
|
Update README.md
4.3.5
|
2017-09-09 14:54:18 +08:00 |
|
|
zuiidea
|
01f4de55df
|
Merge pull request #571 from zuiidea/develop
Develop
|
2017-09-09 14:52:50 +08:00 |
|
|
zuiidea
|
dedd34e8e8
|
4.3.5
|
2017-09-09 14:50:47 +08:00 |
|
|
zuiidea
|
d1b373201e
|
fix some grammar and details
|
2017-09-09 14:20:51 +08:00 |
|
|
zuiidea
|
dbcc90e7ad
|
出去吃烧烤,回来接着看
|
2017-09-08 16:41:05 +08:00 |
|
|
zuiidea
|
87fce74d5b
|
Update app.js
fix mobile Header menu
|
2017-09-08 15:45:38 +08:00 |
|
|
zuiidea
|
5c51679ad7
|
Merge branch 'yangbin1994-dva2.0' into develop
|
2017-09-08 14:56:35 +08:00 |
|
|
zuiidea
|
6d17b5b876
|
Merge branch 'yangbin1994-dva2.0'
|
2017-09-08 14:51:51 +08:00 |
|
|
杨斌
|
1288853112
|
解决冲突
|
2017-09-08 14:19:40 +08:00 |
|
|
杨斌
|
d3e7e17789
|
query-string
|
2017-09-08 13:27:07 +08:00 |
|
 eric
|
6077d74f10
|
.gitignore 增加排除项
|
2017-09-07 11:00:00 +08:00 |
|
|
杨斌
|
7bf031699a
|
add LoadingComponent
|
2017-09-06 20:36:14 +08:00 |
|
|
杨斌
|
a6eb693636
|
dva@2.0
|
2017-09-06 11:13:26 +08:00 |
|
|
zuiidea
|
39c377e0e2
|
Merge pull request #552 from zuiidea/develop
add entry.ejs and add lte IE10 polyfill
|
2017-09-06 09:56:25 +08:00 |
|
|
zuiidea
|
67b90c4df0
|
add entry.ejs and add lte IE10 polyfill
|
2017-09-06 09:55:41 +08:00 |
|
|
zuiidea
|
0e2727f9c8
|
Merge pull request #542 from zuiidea/develop
4.3.4
|
2017-09-04 11:48:32 +08:00 |
|
|
zuiidea
|
0cf02e7324
|
4.3.4
push
|
2017-09-04 11:47:24 +08:00 |
|
|
zuiidea
|
68c9f2b65f
|
Merge pull request #540 from zuiidea/develop
fix login success redirect;fix css load delay
|
2017-09-04 11:03:13 +08:00 |
|
|
zuiidea
|
587b1f6b9d
|
fix login success redirect;fix css load delay
4.3.4
|
2017-09-04 11:01:31 +08:00 |
|
|
zuiidea
|
d94580a253
|
Merge pull request #302 from jackple/patch-1
Update app.js
|
2017-09-04 09:58:42 +08:00 |
|
|
zuiidea
|
531e3c0fcc
|
Merge pull request #532 from p2227/patch-1
fixes #529
|
2017-09-04 09:57:39 +08:00 |
|
|
zuiidea
|
d68de7a30c
|
Merge pull request #378 from chenkang084/remote
fixed:when click breadcrumb back to other page,the left menu displaye…
|
2017-09-04 09:57:24 +08:00 |
|
|
zuiidea
|
45cb70f006
|
Merge pull request #518 from quanpower/patch-1
Update roadhogrc.js
|
2017-09-04 09:56:18 +08:00 |
|
 kuang
|
af85384f11
|
fixes #529
|
2017-08-28 23:20:38 -05:00 |
|
 William Zhang
|
208539134f
|
Update roadhogrc.js
proxy加引号，我这报错了，去掉了正常运行
|
2017-08-19 18:06:16 +08:00 |
|
|
zuiidea
|
a3f41e3d64
|
Merge pull request #496 from zuiidea/develop
fix weather
|
2017-08-13 17:20:42 +08:00 |
|