Commit Graph

1780 Commits

Author SHA1 Message Date
rickcole e6df000e0a tabs禁用样式优化 2020-05-12 20:03:23 +08:00
liaoxuezhi ca091bfb68
Merge pull request #589 from RickCole21/master
form中容器组件中配置form时,修改内层的form会自动触发上层form的提交操作
2020-05-12 15:03:11 +08:00
rickcole a39a4aba46 form中容器组件中配置form时,修改内层的form会自动触发上层form的提交操作 2020-05-12 14:41:00 +08:00
liaoxuezhi 6f706349a6
Merge pull request #588 from baidu/dependabot/npm_and_yarn/tinymce-5.2.2
Bump tinymce from 5.2.1 to 5.2.2
2020-05-12 09:42:30 +08:00
dependabot[bot] e9a1599b5e
Bump tinymce from 5.2.1 to 5.2.2
Bumps [tinymce](https://github.com/tinymce/tinymce-dist) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/tinymce/tinymce-dist/releases)
- [Changelog](https://github.com/tinymce/tinymce-dist/blob/master/changelog.txt)
- [Commits](https://github.com/tinymce/tinymce-dist/compare/5.2.1...5.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
2020-05-11 20:32:44 +00:00
2betop 6c9cd9a929 优化 repeat 组合方式 2020-05-11 20:27:33 +08:00
2betop a6a64f4ec2 目前看来 Repeat 组件有点多余 2020-05-11 20:20:10 +08:00
2betop 5cb489fac8 expand 改成 findTree 2020-05-11 19:44:23 +08:00
2betop 531fbc94e3 checkboxes component 中的用法与 select 统一 2020-05-11 19:23:50 +08:00
2betop 3967971f3c 修 top lest 值可能为 NaN 的情况 2020-05-11 17:21:12 +08:00
2betop 1bd1b43ef5 更新 snapshot 2020-05-11 16:55:54 +08:00
2betop 2a988428ff 更新 snapshot 2020-05-11 16:55:18 +08:00
2betop 1ed3ce2612 去掉多余的代码 2020-05-11 15:28:44 +08:00
2betop d77bb35a74 复用 select 里面的 value2array 2020-05-11 15:22:32 +08:00
2betop 9d2c702944 combo 的tabs 模式,样式调整 2020-05-11 14:16:54 +08:00
2betop 29ad54e2ab Merge remote-tracking branch 'baidu/master' 2020-05-11 14:14:01 +08:00
2betop 6d3052b176 Merge branch 'master' of https://github.com/2betop/amis 2020-05-11 14:04:39 +08:00
2betop a7c9f50d48 contextmenu 小调整 2020-05-11 14:04:29 +08:00
2betop c03f195d0f contextmenu 小调整 2020-05-11 14:02:25 +08:00
2betop 73f02985ed placeholder 样式优化 2020-05-11 13:43:06 +08:00
liaoxuezhi c180c7940a
Merge pull request #586 from RickCole21/master
有disableTip时,表单下按钮样式微调
2020-05-11 13:32:14 +08:00
rickcole 615cfbc1e0 有disableTip时,表单下按钮样式微调 2020-05-11 11:54:01 +08:00
liaoxuezhi 2262ad899f
Merge pull request #585 from RickCole21/master
CRUD propList add columns
2020-05-09 18:10:36 +08:00
rickcole 9e4a5efb4b CRUD propList add columns 2020-05-09 18:08:22 +08:00
liaoxuezhi 103d9d12fe
Merge pull request #584 from RickCole21/master
修复Table传columns属性问题
2020-05-09 16:56:31 +08:00
rickcole 337f7fd116 Merge remote-tracking branch 'amis/master' 2020-05-09 16:53:19 +08:00
rickcole cea5749617 修复Table传columns属性问题 2020-05-09 16:53:05 +08:00
2betop 69071616f3 tooltip 位置改成左边 2020-05-09 15:14:10 +08:00
liaoxuezhi 83c5de4a37
Merge pull request #581 from RickCole21/master
部分fix
2020-05-09 14:19:35 +08:00
rickcole 79ca800035 部分fix 2020-05-09 14:18:05 +08:00
2betop 987d818bf2 Drawer 的 overlay false 的 closeOnOutside 整理 2020-05-09 14:01:30 +08:00
2betop c89994e64a 如果事件阻止了,不关闭 2020-05-09 09:54:04 +08:00
2betop 3fb4114461 改成捕获时期 2020-05-09 09:43:30 +08:00
2betop aa6d38600b 没有显示的时候不要调用 onHide 2020-05-09 09:30:48 +08:00
liaoxuezhi 7bacf2df39
Merge pull request #579 from RickCole21/master
drawer overlay逻辑优化
2020-05-08 20:45:50 +08:00
rickcole 45819b22f2 fix 2020-05-08 20:45:15 +08:00
rickcole ee2351d212 fix 2020-05-08 20:08:06 +08:00
rickcole cfa99abde6 drawer overlay逻辑优化 2020-05-08 20:05:36 +08:00
2betop 5ced9c0b72 Merge remote-tracking branch 'baidu/master' 2020-05-08 19:43:07 +08:00
2betop 477083a719 优化 list 中的数据修改逻辑 2020-05-08 19:42:51 +08:00
liaoxuezhi 8cf2e8db2d
Merge pull request #576 from RickCole21/master
修复form中crud弹框crud无限循环问题
2020-05-08 19:42:06 +08:00
2betop 99a436b53b 取错了 2020-05-08 18:00:10 +08:00
2betop 96e42c4169 修复一个已销毁调用 setState 的case 2020-05-08 17:56:41 +08:00
2betop 7fa8adec80 如果没有变化,不要去更新store,避免没必要的重绘 2020-05-08 17:50:39 +08:00
2betop fe2b931e7c 修复 form 的 initApi 轮询静默刷新配置无效问题 2020-05-07 16:24:52 +08:00
rickcole d2a91d30a1 修复form中crud弹框crud无限循环问题 2020-05-07 15:25:40 +08:00
liaoxuezhi 82ac17d59d
Merge pull request #572 from RickCole21/master
修复form中的service轮训问题
2020-05-06 18:43:33 +08:00
rickcole ae1deb9165 修复form中的service轮训问题 2020-05-06 18:28:06 +08:00
liaoxuezhi b35d656d2c
Merge pull request #571 from RickCole21/master
调整下样式
2020-05-06 15:07:17 +08:00
rickcole 122afbfd1c 调整下样式 2020-05-06 15:05:30 +08:00