Commit Graph

1622 Commits

Author SHA1 Message Date
rickcole
0c8fdc4f40 combo拖拽交互优化 2020-04-10 15:53:40 +08:00
2betop
670769f275 Merge remote-tracking branch 'baidu/master' 2020-04-10 11:47:39 +08:00
2betop
ed88c3abe4 样式优化 2020-04-10 11:46:50 +08:00
liaoxuezhi
86d9c97d7f Merge pull request #543 from RickCole21/master
正则验证添加特殊判断
2020-04-10 10:05:42 +08:00
rickcole
3cab0bf0de fix 2020-04-10 10:04:21 +08:00
rickcole
388dac2b95 正则验证添加特殊判断 2020-04-10 10:00:15 +08:00
liaoxuezhi
db98737e62 Merge pull request #542 from RickCole21/master
补充nav文档
2020-04-09 20:25:44 +08:00
rickcole
21f40dd8ba Merge remote-tracking branch 'amis/master' 2020-04-09 20:23:50 +08:00
rickcole
69aeb3b218 补充nav source文档 2020-04-09 20:23:29 +08:00
liaoxuezhi
3b7a993b3f Merge pull request #541 from RickCole21/master
fix 本周一时间问题
2020-04-09 19:49:26 +08:00
rickcole
b93af8ea6b fix 本周一时间问题 2020-04-09 19:47:42 +08:00
liaoxuezhi
58ab03f0b8 Merge pull request #540 from RickCole21/master
补一个弹框继续轮训的判断
2020-04-09 19:27:49 +08:00
rickcole
40f42fc2fb 补一个弹框继续轮训的判断 2020-04-09 19:08:03 +08:00
2betop
555c6659c1 调整一下,有可能 requestAdaptor 自己格式化了 2020-04-09 17:32:13 +08:00
2betop
ddc1817d60 api 如果设置了 dataType 直接在 amis 就处理好了 2020-04-09 17:31:00 +08:00
2betop
8b40a5d754 api 如果设置了 dataType 直接在 amis 就处理好了 2020-04-09 17:23:25 +08:00
2betop
d9ad07d50a Merge remote-tracking branch 'baidu/master' 2020-04-09 16:16:27 +08:00
2betop
c82bc27820 Nav 支持 onSelect 事件 2020-04-09 16:16:03 +08:00
2betop
12e05f05d2 Nav 支持 onSelect 事件 2020-04-09 15:58:29 +08:00
liaoxuezhi
38024edbf8 Merge pull request #539 from RickCole21/master
修复字符串形式配置正则时异常
2020-04-09 15:04:18 +08:00
rickcole
dbdeb8f674 修复字符串形式配置正则时异常 2020-04-09 14:51:54 +08:00
2betop
15ec30d58e 多加几个 className 2020-04-09 12:08:38 +08:00
2betop
5882acc652 Merge remote-tracking branch 'baidu/master' 2020-04-09 11:42:14 +08:00
2betop
caa39509a9 textarea 样式问题 2020-04-09 11:41:54 +08:00
liaoxuezhi
ed10a4b35f Merge pull request #537 from RickCole21/master
json-editor 中允许注释
2020-04-09 10:53:38 +08:00
rickcole
c6ca763a03 json-editor 中允许注释 2020-04-09 10:52:26 +08:00
2betop
6af13cdb35 修复 quickEdit inline 模式修改偶发重新渲染的问题 2020-04-08 16:45:10 +08:00
2betop
c8adc597a9 Merge remote-tracking branch 'baidu/master' 2020-04-08 14:56:56 +08:00
liaoxuezhi
44a8f9f55a Merge pull request #534 from RickCole21/master
扩充下datepicker的可选快捷键、样式fix
2020-04-08 11:58:06 +08:00
rickcole
58849b22c7 扩充下datepicker的可选快捷键、样式fix 2020-04-08 11:56:22 +08:00
liaoxuezhi
b66ba7598d Merge pull request #533 from RickCole21/master
修复条件过滤器返回数字值异常
2020-04-08 11:06:03 +08:00
rickcole
d654b025c7 配置正则优化、按钮组优化 2020-04-08 11:04:37 +08:00
2betop
c6bb4b7fc7 样式优化 2020-04-08 11:02:00 +08:00
rickcole
0d355243a2 Merge remote-tracking branch 'amis/master' 2020-04-08 10:40:12 +08:00
2betop
b42e121780 样式调整 2020-04-08 10:34:16 +08:00
rickcole
5dbf31d758 Merge remote-tracking branch 'amis/master' 2020-04-07 17:41:31 +08:00
2betop
de53866721 Merge remote-tracking branch 'baidu/master' 2020-04-07 17:28:17 +08:00
2betop
377b308f19 combo 支持 placeholder 2020-04-07 17:27:51 +08:00
rickcole
5dfb8917b3 修复条件过滤器无法返回数字类型 2020-04-07 17:27:45 +08:00
liaoxuezhi
a88971c5d6 Merge pull request #530 from RickCole21/master
fix doc and style
2020-04-07 09:56:30 +08:00
rickcole
5c3347400e fix doc and style 2020-04-06 21:23:56 +08:00
2betop
53dace85f1 调整样式 2020-04-03 16:44:43 +08:00
2betop
e6c22d4a35 优化 combo 一行展示的样式 2020-04-03 10:55:17 +08:00
2betop
066d7a23c3 number 类型不能设置 size, 所以minWidth 无效,所以先多写点样式 2020-04-03 10:38:36 +08:00
2betop
207e286e37 表单项的宽度改成 minWidth 设置 2020-04-03 10:24:54 +08:00
liaoxuezhi
398a9d86a9 Merge pull request #523 from RickCole21/master
完善文档
2020-04-02 17:54:00 +08:00
2betop
ff90a34009 Merge remote-tracking branch 'baidu/master' 2020-04-02 17:50:31 +08:00
2betop
b4fff39a2a 文档导航自动生成 2020-04-02 17:48:53 +08:00
rickcole
84ea23a142 完善文档 2020-04-02 17:37:26 +08:00
liaoxuezhi
e46f7be53e Merge pull request #521 from RickCole21/master
drawer的wizard中popoverContainer问题
2020-04-02 17:00:43 +08:00