Commit Graph

5712 Commits

Author SHA1 Message Date
liaoxuezhi
39cfe0a1af Merge branch 'master' of https://github.com/baidu/amis 2019-05-18 00:50:45 +08:00
liaoxuezhi
6bdb28715e Merge branch 'master' of https://github.com/baidu/amis 2019-05-18 00:50:45 +08:00
liaoxuezhi
8d329c4c9a add custom loadRenderer 2019-05-18 00:50:23 +08:00
liaoxuezhi
573a3951b9 add custom loadRenderer 2019-05-18 00:50:23 +08:00
liaoxuezhi
a80d383e6b
Merge pull request #42 from catchonme/master
增加轮播组件
2019-05-17 12:56:27 +08:00
liaoxuezhi
1cc7481605 Merge pull request #42 from catchonme/master
增加轮播组件
2019-05-17 12:56:27 +08:00
catchonme
91e63a8994 轮播图增加图片标题,描述,优化控制主题样式 2019-05-17 12:49:03 +08:00
catchonme
e49d2ef971 轮播图增加图片标题,描述,优化控制主题样式 2019-05-17 12:49:03 +08:00
schumi
306ff14d14 fix(tpl-lodash): template typo 2019-05-17 12:49:03 +08:00
schumi
8223a163a2 fix(tpl-lodash): template typo 2019-05-17 12:49:03 +08:00
liaoxuezhi
d0472717a8
Merge pull request #44 from hyschumi/fix_template_typo
fix(tpl-lodash): template typo
2019-05-17 12:01:57 +08:00
liaoxuezhi
93e76171e0 Merge pull request #44 from hyschumi/fix_template_typo
fix(tpl-lodash): template typo
2019-05-17 12:01:57 +08:00
schumi
6635016f0b fix(tpl-lodash): template typo 2019-05-17 11:56:55 +08:00
schumi
7d6cbac3b2 fix(tpl-lodash): template typo 2019-05-17 11:56:55 +08:00
catchonme
7dfeda1bb6 代码修正 2019-05-16 16:54:36 +08:00
catchonme
9e2f080943 代码修正 2019-05-16 16:54:36 +08:00
catchonme
3392d4a77f 增加轮播图 2019-05-16 16:31:20 +08:00
catchonme
a03b6c737d 增加轮播图 2019-05-16 16:31:20 +08:00
catchonme
42ebbd2d50 carousel 初版 2019-05-16 11:08:52 +08:00
catchonme
4dbcbe3c43 carousel 初版 2019-05-16 11:08:52 +08:00
liaoxuezhi
c27a13e0af Merge branch 'master' of https://github.com/baidu/amis 2019-05-15 18:25:42 +08:00
liaoxuezhi
8ed3f9026d Merge branch 'master' of https://github.com/baidu/amis 2019-05-15 18:25:42 +08:00
liaoxuezhi
b09add4e08 需要等待一下 ui 更新 2019-05-15 18:25:27 +08:00
liaoxuezhi
f16652a395 需要等待一下 ui 更新 2019-05-15 18:25:27 +08:00
liaoxuezhi
e0b1f3bbe2
Merge pull request #34 from nwind/master
prettier 格式化了一下 scss
2019-05-15 16:34:48 +08:00
liaoxuezhi
35bea420e9 Merge pull request #34 from nwind/master
prettier 格式化了一下 scss
2019-05-15 16:34:48 +08:00
wuduoyi
7d8673e770 Merge remote-tracking branch 'upstream/master'
* upstream/master:
  rebuild pages
  更新 gh-pages 中 markdown 链接
2019-05-15 16:10:52 +08:00
wuduoyi
524a42644f Merge remote-tracking branch 'upstream/master'
* upstream/master:
  rebuild pages
  更新 gh-pages 中 markdown 链接
2019-05-15 16:10:52 +08:00
wuduoyi
40c5109fe0 增加 .editorconfig;使用 prettier 格式化 scss 2019-05-15 16:10:20 +08:00
wuduoyi
ed8717989d 增加 .editorconfig;使用 prettier 格式化 scss 2019-05-15 16:10:20 +08:00
liaoxuezhi
d34a53f7fc rebuild pages 2019-05-15 15:15:38 +08:00
liaoxuezhi
8404de5969 rebuild pages 2019-05-15 15:15:38 +08:00
liaoxuezhi
d22f933b47 更新 gh-pages 中 markdown 链接 2019-05-15 15:14:53 +08:00
liaoxuezhi
bf7ff039a9 更新 gh-pages 中 markdown 链接 2019-05-15 15:14:53 +08:00
liaoxuezhi
183e253a63 修复 autoCombineCount 配置比实际 columns 多时的报错 2019-05-14 16:29:03 +08:00
liaoxuezhi
59c09ca3c4 修复 autoCombineCount 配置比实际 columns 多时的报错 2019-05-14 16:29:03 +08:00
liaoxuezhi
1ee1d7556a rn AMis to amis 2019-05-14 13:23:16 +08:00
liaoxuezhi
f7b3c30259 rn AMis to amis 2019-05-14 13:23:16 +08:00
liaoxuezhi
acc2ed0d06 rebuild pages 2019-05-14 12:27:27 +08:00
liaoxuezhi
07865047b9 rebuild pages 2019-05-14 12:27:27 +08:00
liaoxuezhi
3ceb542987 gh-pages 2019-05-14 12:27:00 +08:00
liaoxuezhi
df596523ad gh-pages 2019-05-14 12:27:00 +08:00
liaoxuezhi
d1d45cb475
Merge pull request #32 from catchonme/master
修复combo未设置唯一值,修改单个item时无法验证的问题
2019-05-14 12:09:10 +08:00
liaoxuezhi
88c36bbadb Merge pull request #32 from catchonme/master
修复combo未设置唯一值,修改单个item时无法验证的问题
2019-05-14 12:09:10 +08:00
catchonme
c053ee9d1f 修正代码 2019-05-14 12:08:20 +08:00
catchonme
86baa93d6a 修正代码 2019-05-14 12:08:20 +08:00
catchonme
b692c67f24 修正代码 2019-05-14 11:51:08 +08:00
catchonme
92f8a37294 修正代码 2019-05-14 11:51:08 +08:00
catchonme
8810e4dfe5 修复combo未设置唯一值,修改单个item时无法验证的问题 2019-05-14 11:17:27 +08:00
catchonme
6c30ffe46a 修复combo未设置唯一值,修改单个item时无法验证的问题 2019-05-14 11:17:27 +08:00