Commit Graph

1606 Commits

Author SHA1 Message Date
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
rickcole
2eb5992a55 drawer的wizard中popoverContainer问题 2020-04-02 16:53:51 +08:00
2betop
ff60c5d821 Merge remote-tracking branch 'baidu/master' 2020-04-02 12:26:16 +08:00
2betop
86b60afdfc 修复定位位置检测问题 2020-04-02 12:25:15 +08:00
liaoxuezhi
436d6f700f Merge pull request #518 from RickCole21/master
Select 在有已选项时,autoComplete 不显示已选项
2020-04-02 10:25:25 +08:00
rickcole
4435fab39e Select 在有已选项时,autoComplete 不显示已选项 2020-04-01 18:07:48 +08:00
liaoxuezhi
1f11dc3003 Merge pull request #516 from RickCole21/master
修复 Select 多选+autoComplete 时,重新拉取的问题
2020-04-01 12:40:06 +08:00
rickcole
a6c2bea878 修复 Select 多选+autoComplete 时,重新拉取的问题 2020-04-01 12:26:23 +08:00
2betop
ce15f40524 Merge branch 'master' of https://github.com/2betop/amis 2020-04-01 10:54:27 +08:00
2betop
8887c582ad 样式优化 2020-04-01 10:54:21 +08:00
liaoxuezhi
a4cc7bdd9a Merge remote-tracking branch 'baidu/master' 2020-04-01 00:06:28 +08:00
liaoxuezhi
c111227783 修复 6595 转义问题 2020-04-01 00:05:49 +08:00
liaoxuezhi
79c540f130 Merge pull request #515 from RickCole21/master
switch disabled style
2020-03-31 17:55:20 +08:00
rickcole
5bede14f35 switch disabled style 2020-03-31 15:54:31 +08:00
liaoxuezhi
6dc04beb2d Merge pull request #514 from LiPinghai/master
修复placement判断错误
2020-03-30 15:19:39 +08:00
lipinghai1
58eb0316f7 修复placement判断错误 2020-03-30 15:18:24 +08:00
liaoxuezhi
40b57ab6ce 把原始sug隐藏 2020-03-29 22:13:43 +08:00