Commit Graph

1893 Commits

Author SHA1 Message Date
2betop
1ea2b78880 Merge remote-tracking branch 'baidu/master' 2020-04-23 14:02:15 +08:00
2betop
4f5bcefcf1 ctx 优化 2020-04-23 14:01:45 +08:00
liaoxuezhi
d8ddb470b3
Merge pull request #562 from RickCole21/master
修复Options正则
2020-04-22 20:18:34 +08:00
rickcole
b2c275b388 修复drawer cancel行为无效 2020-04-22 20:17:44 +08:00
rickcole
d4c75e8a37 Merge remote-tracking branch 'amis/master' 2020-04-22 20:16:52 +08:00
2betop
7be7d22cc5 Merge remote-tracking branch 'baidu/master' 2020-04-22 19:32:14 +08:00
2betop
cc1ea74e83 优化 formItem 的 required 逻辑 2020-04-22 19:31:15 +08:00
rickcole
d3d16b086b 修复Options正则 2020-04-22 14:37:19 +08:00
liaoxuezhi
3d4a058fd8
Merge pull request #561 from RickCole21/master
修复弹框中feedback,confirm关闭弹框逻辑
2020-04-22 13:55:51 +08:00
rickcole
692e0559ac fix 2020-04-22 13:50:14 +08:00
2betop
126fe66aa4 export resolveVariableAndFilter 2020-04-22 13:28:10 +08:00
2betop
4449c74620 Merge remote-tracking branch 'baidu/master' 2020-04-21 19:46:56 +08:00
2betop
001b0dee1f 修复 filter 报错问题 2020-04-21 19:45:20 +08:00
liaoxuezhi
750bed1e68
Merge pull request #560 from RickCole21/master
chart clickAction ctx数据修复
2020-04-21 15:06:43 +08:00
rickcole
e7fd953eff chart clickAction ctx数据修复 2020-04-21 15:03:11 +08:00
2betop
239e14f7ec Merge remote-tracking branch 'baidu/master' 2020-04-21 14:53:23 +08:00
2betop
c931b70786 ts 类型优化 2020-04-21 14:47:55 +08:00
liaoxuezhi
c5831acfff
Merge pull request #558 from RickCole21/master
fix combo style
2020-04-21 12:44:05 +08:00
rickcole
becdfb581d fix combo style 2020-04-21 11:43:50 +08:00
liaoxuezhi
9ccd9e62dc
Merge pull request #557 from RickCole21/master
修复nested-select样式
2020-04-20 21:40:21 +08:00
rickcole
6d252d23a8 fix 2020-04-20 20:58:00 +08:00
rickcole
300d4257d8 fix nested-select style 2020-04-20 20:55:11 +08:00
2betop
de2689ba6b Merge remote-tracking branch 'baidu/master' 2020-04-20 17:31:39 +08:00
2betop
d52873ae6e 修复弹出框里面的 rich-text 默认宽度不正确的问题 2020-04-20 17:31:07 +08:00
RickCole
0e2e8979b2
Merge pull request #556 from 2betop/master
feedback 添加 skipRestOnCancel 配置
2020-04-20 17:22:26 +08:00
liaoxuezhi
e8cc5a5071
Merge pull request #555 from RickCole21/master
nested-select支持搜索,并优化展示
2020-04-20 17:21:34 +08:00
rickcole
79b9e37539 filterTree 扩充深度优先 2020-04-20 17:19:26 +08:00
rickcole
a1618cabde fix nested-select iter 2020-04-20 16:27:51 +08:00
2betop
c0d3f74f3a crud 文档补充 2020-04-20 15:47:01 +08:00
2betop
70f09bfc6a 添加 feedback.skipRestOnCancel 配置 2020-04-20 14:46:19 +08:00
rickcole
fa9bb7d60c bugfix 2020-04-20 14:12:32 +08:00
rickcole
57427f0c47 fix type 2020-04-20 14:10:40 +08:00
rickcole
b29b54cb1a 先把文档autoflll删了 2020-04-20 13:35:08 +08:00
rickcole
89c0f87daa fix filterMapWithChildren 2020-04-20 13:27:03 +08:00
rickcole
db21de1c54 nested-select支持搜索,并优化展示 2020-04-20 11:33:06 +08:00
2betop
aaeb8e1c82 接口返回可能没有 data, 免得报错 2020-04-17 17:40:32 +08:00
liaoxuezhi
f53d02fd08
Merge pull request #554 from nwind/master
增加 gitee 镜像的说明
2020-04-17 16:42:31 +08:00
wuduoyi
48bdfcd4b2 增加 gitee 镜像的说明 2020-04-17 16:39:40 +08:00
RickCole
dc83d291b0
Merge pull request #553 from 2betop/master
扩充 filter 规则
2020-04-17 15:52:13 +08:00
2betop
c94c6d8f7d 扩充 filter 规则 2020-04-17 15:46:31 +08:00
2betop
0a23330511 rebuild pages 2020-04-16 11:01:04 +08:00
2betop
474eca0e68 更新 gh-pages 2020-04-16 11:00:21 +08:00
2betop
f054430d9b Merge remote-tracking branch 'baidu/master' 2020-04-16 10:57:59 +08:00
2betop
a440c98ea1 修复gh-pages 文档丢失的问题 2020-04-16 10:56:33 +08:00
2betop
bdb1e7bf22 修复combo 中 unique 用法, 删除重复内容依然不能提交成功的问题 2020-04-16 10:37:54 +08:00
2betop
48da3e99f4 tinymce 编译配置相关 2020-04-15 19:52:31 +08:00
2betop
34fc9dd094 修复 tinymce sdk css 问题 2020-04-15 18:21:49 +08:00
2betop
f33bc8afec rebuild pages 2020-04-15 17:22:26 +08:00
2betop
9842d010ed 更新 gh-pages 2020-04-15 17:17:16 +08:00
2betop
5d588da47e Merge remote-tracking branch 'baidu/master' 2020-04-15 17:14:59 +08:00