Commit Graph

1625 Commits

Author SHA1 Message Date
catchme
ef93bf7618
Merge branch 'master' into master 2020-01-15 10:19:04 +08:00
catchonme
24177ecdb7 修改命名方式 2020-01-15 10:15:22 +08:00
catchonme
4cda10d241 去除无效代码 2020-01-14 20:35:56 +08:00
catchonme
dcd345fa3c replaceData时拿到父级value 2020-01-14 20:30:36 +08:00
2betop
7670faceea 修复 modal 滚轮可滚,滚动条不可滚的问题 2020-01-14 19:13:52 +08:00
catchonme
776c473054 api增加replaceData 2020-01-14 19:11:01 +08:00
2betop
c580b8ae3c formItem 的 label 支持模板 2020-01-14 18:32:56 +08:00
2betop
36c10e0e16 Merge remote-tracking branch 'baidu/master' 2020-01-14 17:51:14 +08:00
2betop
077a592d31 修复table的quickEdit 模式值被重置的问题 2020-01-14 17:51:01 +08:00
2betop
10986bd3d6 reload 逻辑统一 2020-01-14 17:02:32 +08:00
liaoxuezhi
9ad893ec40
Merge pull request #440 from catchonme/master
service schemaApi返回data
2020-01-14 11:17:57 +08:00
catchonme
87d033b119 去除service无效代码 2020-01-14 11:09:18 +08:00
2betop
b9334ce2c6 Options extractValue 用法优化 2020-01-14 11:00:10 +08:00
catchonme
4183077db0 service schemaApi返回data 2020-01-14 10:58:10 +08:00
liaoxuezhi
c7a0fb68c2
Merge pull request #438 from catchonme/master
tabs增加顶部右侧工具栏
2020-01-14 09:54:49 +08:00
catchonme
7a8df2f643 去除tabs无效代码 2020-01-14 09:39:03 +08:00
catchonme
38efe50c9c 增加form下tabs文档 2020-01-13 20:45:40 +08:00
catchonme
b1b3c33ac7 tabs增加顶部右侧工具栏 2020-01-13 20:28:02 +08:00
2betop
3e433871c4 color 不允许自定义颜色时, 不禁用 input 2020-01-13 20:28:01 +08:00
2betop
27ca55e932 小调整 2020-01-13 20:28:00 +08:00
2betop
36400b191b color 不允许自定义颜色时, 不禁用 input 2020-01-10 16:00:24 +08:00
liaoxuezhi
8dd6d4c11f
Merge pull request #427 from catchonme/master
颜色值验证
2020-01-10 15:56:57 +08:00
catchonme
cd3fdfbabd 颜色值验证 2020-01-10 15:51:49 +08:00
liaoxuezhi
57e08829de
Merge pull request #426 from catchonme/master
增加自定义颜色选择
2020-01-10 15:10:52 +08:00
catchonme
13231ab042 颜色选择逻辑修复 2020-01-10 12:49:00 +08:00
2betop
2b9bfa8250 Merge remote-tracking branch 'baidu/master' 2020-01-10 12:13:05 +08:00
catchonme
3dabfd8d60 增加自定义颜色选择 2020-01-10 11:31:57 +08:00
2betop
7e699b1a5a 小调整 2020-01-10 10:40:41 +08:00
liaoxuezhi
087a0f4f4d
Merge pull request #424 from catchonme/master
导出theme注册入口
2020-01-10 09:28:33 +08:00
catchonme
e53af9044f 导出theme注册入口 2020-01-09 20:38:50 +08:00
2betop
0354be058a 还是用自己的 renderControl 2020-01-09 16:35:16 +08:00
2betop
d2d397dbbe group 改成 form 下面的 renderControl 2020-01-09 16:27:47 +08:00
2betop
6670b899b1 combo 样式优化 2020-01-09 16:25:41 +08:00
2betop
cdf5a77f7d 修复上传关闭自动上传后,表单提交数据丢失问题 2020-01-09 16:09:54 +08:00
2betop
4c5d0fccf5 disabled 了应该还是可以看大图的 2020-01-09 12:05:08 +08:00
2betop
309fcb3a91 修复 Table 图片放大,图片位置可能不对应的问题 2020-01-09 11:54:50 +08:00
2betop
263dc9c9ee Merge remote-tracking branch 'baidu/master' 2020-01-09 10:53:00 +08:00
2betop
b0a63d5a0a Merge branch 'master' of https://github.com/2betop/amis 2020-01-09 10:50:57 +08:00
2betop
c73a7bef99 delegate 时关于是否保存 action 对象逻辑调整 2020-01-09 10:50:43 +08:00
2betop
f259c42882 rebuild pages 2020-01-09 09:30:05 +08:00
2betop
515ce6ae94 更新 gh-pages 2020-01-09 09:29:30 +08:00
liaoxuezhi
63bf48a1c9 Merge remote-tracking branch 'baidu/master' 2020-01-08 22:33:14 +08:00
liaoxuezhi
719d497c32 图片上传样式修复 2020-01-08 22:31:26 +08:00
2betop
999450b492 rebuild pages 2020-01-08 17:16:37 +08:00
2betop
0737b624a2 更新 gh-pages 2020-01-08 17:16:04 +08:00
2betop
5a63c6752d Merge remote-tracking branch 'baidu/master' 2020-01-08 17:14:02 +08:00
liaoxuezhi
a301f05332
Merge pull request #421 from RickCole21/master
fix toast classnames
2020-01-08 17:13:40 +08:00
rickcole
9dc5267e5e fix toast classnames 2020-01-08 17:10:45 +08:00
2betop
e76917722e contextMenu 用index 做 key 2020-01-08 14:47:28 +08:00
2betop
05da324900 弹框中,blur 效果变成白班,先去掉。 2020-01-08 11:45:58 +08:00