Commit Graph

1612 Commits

Author SHA1 Message Date
rickcole 41904464e0 fix 本周一时间问题 2020-04-09 19:47:42 +08:00
liaoxuezhi 519645f067
Merge pull request #540 from RickCole21/master
补一个弹框继续轮训的判断
2020-04-09 19:27:49 +08:00
rickcole 26f3851c91 补一个弹框继续轮训的判断 2020-04-09 19:08:03 +08:00
2betop f8e48b382e 调整一下,有可能 requestAdaptor 自己格式化了 2020-04-09 17:32:13 +08:00
2betop cf91460fd5 api 如果设置了 dataType 直接在 amis 就处理好了 2020-04-09 17:31:00 +08:00
2betop 5de6588092 api 如果设置了 dataType 直接在 amis 就处理好了 2020-04-09 17:23:25 +08:00
2betop a42d391875 Merge remote-tracking branch 'baidu/master' 2020-04-09 16:16:27 +08:00
2betop 2e6d5b08c9 Nav 支持 onSelect 事件 2020-04-09 16:16:03 +08:00
2betop 085ef85c6a Nav 支持 onSelect 事件 2020-04-09 15:58:29 +08:00
liaoxuezhi 151709cbf3
Merge pull request #539 from RickCole21/master
修复字符串形式配置正则时异常
2020-04-09 15:04:18 +08:00
rickcole 84b87990ac 修复字符串形式配置正则时异常 2020-04-09 14:51:54 +08:00
2betop 5557c4e226 多加几个 className 2020-04-09 12:08:38 +08:00
2betop 63adc76437 Merge remote-tracking branch 'baidu/master' 2020-04-09 11:42:14 +08:00
2betop cc05f44571 textarea 样式问题 2020-04-09 11:41:54 +08:00
liaoxuezhi 7bbef724eb
Merge pull request #537 from RickCole21/master
json-editor 中允许注释
2020-04-09 10:53:38 +08:00
rickcole c6e4ed7285 json-editor 中允许注释 2020-04-09 10:52:26 +08:00
2betop 62538c4392 修复 quickEdit inline 模式修改偶发重新渲染的问题 2020-04-08 16:45:10 +08:00
2betop 1538f77e3a Merge remote-tracking branch 'baidu/master' 2020-04-08 14:56:56 +08:00
liaoxuezhi dde2d7deca
Merge pull request #534 from RickCole21/master
扩充下datepicker的可选快捷键、样式fix
2020-04-08 11:58:06 +08:00
rickcole 7c092f5a2b 扩充下datepicker的可选快捷键、样式fix 2020-04-08 11:56:22 +08:00
liaoxuezhi 76d060702f
Merge pull request #533 from RickCole21/master
修复条件过滤器返回数字值异常
2020-04-08 11:06:03 +08:00
rickcole c4508798b1 配置正则优化、按钮组优化 2020-04-08 11:04:37 +08:00
2betop 807df12f38 样式优化 2020-04-08 11:02:00 +08:00
rickcole cb6b4e4399 Merge remote-tracking branch 'amis/master' 2020-04-08 10:40:12 +08:00
2betop a1e5351b99 样式调整 2020-04-08 10:34:16 +08:00
rickcole 7cae5ab61b Merge remote-tracking branch 'amis/master' 2020-04-07 17:41:31 +08:00
2betop 3da6c57f55 Merge remote-tracking branch 'baidu/master' 2020-04-07 17:28:17 +08:00
2betop 5f4444b464 combo 支持 placeholder 2020-04-07 17:27:51 +08:00
rickcole d371d93545 修复条件过滤器无法返回数字类型 2020-04-07 17:27:45 +08:00
liaoxuezhi 8de3fac68f
Merge pull request #530 from RickCole21/master
fix doc and style
2020-04-07 09:56:30 +08:00
rickcole 9158ec91be fix doc and style 2020-04-06 21:23:56 +08:00
2betop 54a9a4e368 调整样式 2020-04-03 16:44:43 +08:00
2betop 80c5692b37 优化 combo 一行展示的样式 2020-04-03 10:55:17 +08:00
2betop 7411a15f99 number 类型不能设置 size, 所以minWidth 无效,所以先多写点样式 2020-04-03 10:38:36 +08:00
2betop f0f9e1d96e 表单项的宽度改成 minWidth 设置 2020-04-03 10:24:54 +08:00
liaoxuezhi 26ed1a4b8c
Merge pull request #523 from RickCole21/master
完善文档
2020-04-02 17:54:00 +08:00
2betop be9d79cc11 Merge remote-tracking branch 'baidu/master' 2020-04-02 17:50:31 +08:00
2betop b09afe2473 文档导航自动生成 2020-04-02 17:48:53 +08:00
rickcole 2a2ebce4dd 完善文档 2020-04-02 17:37:26 +08:00
liaoxuezhi 6f0a6f1a84
Merge pull request #521 from RickCole21/master
drawer的wizard中popoverContainer问题
2020-04-02 17:00:43 +08:00
rickcole cd28135493 drawer的wizard中popoverContainer问题 2020-04-02 16:53:51 +08:00
2betop 0ad0223239 Merge remote-tracking branch 'baidu/master' 2020-04-02 12:26:16 +08:00
2betop a6735c19ed 修复定位位置检测问题 2020-04-02 12:25:15 +08:00
liaoxuezhi 5439bc6602
Merge pull request #518 from RickCole21/master
Select 在有已选项时,autoComplete 不显示已选项
2020-04-02 10:25:25 +08:00
rickcole 74cef48f13 Select 在有已选项时,autoComplete 不显示已选项 2020-04-01 18:07:48 +08:00
liaoxuezhi aa98610ed0
Merge pull request #516 from RickCole21/master
修复 Select 多选+autoComplete 时,重新拉取的问题
2020-04-01 12:40:06 +08:00
rickcole 8c82b80dd3 修复 Select 多选+autoComplete 时,重新拉取的问题 2020-04-01 12:26:23 +08:00
2betop d0f654792d Merge branch 'master' of https://github.com/2betop/amis 2020-04-01 10:54:27 +08:00
2betop b27525860b 样式优化 2020-04-01 10:54:21 +08:00
liaoxuezhi ce557d311e Merge remote-tracking branch 'baidu/master' 2020-04-01 00:06:28 +08:00