Commit Graph

5174 Commits

Author SHA1 Message Date
2betop
5ba81331cd tpl 统一用 div 包裹 2020-09-25 11:05:24 +08:00
charescape
18c0a56508
Merge pull request #3 from baidu/master
merge upstream
2020-09-25 09:01:27 +08:00
liaoxuezhi
0b7b6e1d16
Merge pull request #963 from VoidIsVoid/master
add `hideRoot` and `source` to Json Renderer
2020-09-24 12:01:08 +08:00
Gimling
a843a60d47 change resolveVariable to resolveVariableAndFilter 2020-09-24 11:59:37 +08:00
liaoxuezhi
534ad09e80
Merge pull request #964 from charescape/master
修复 文档说明属性类型错误
2020-09-24 10:55:55 +08:00
charescape
76dee6e790
Update image.md 2020-09-24 10:52:52 +08:00
charescape
6aa3ca039b
Update file.md 2020-09-24 10:51:46 +08:00
charescape
fa57caee39
Merge pull request #2 from baidu/master
merge upstream
2020-09-24 10:50:59 +08:00
Gimling
4876fa6dd2 Merge branch 'master' of https://github.com/VoidIsVoid/amis 2020-09-24 09:59:58 +08:00
Gimling
7fec05d34a add hideRoot and source to Json Renderer 2020-09-24 09:56:50 +08:00
2betop
1db0f67d72 修复 isObjectShallowModified 判断不正确的问题 2020-09-23 12:50:06 +08:00
2betop
264884f1a8 pick filter 用法支持下标 2020-09-23 11:44:56 +08:00
2betop
f120a575da 调整 diff函数 2020-09-23 11:32:39 +08:00
2betop
94eb0b1793 Merge remote-tracking branch 'baidu/master' 2020-09-23 11:29:16 +08:00
2betop
6cca0a3a70 调整 diff函数 2020-09-23 11:28:46 +08:00
RickCole21
a8dcae00db fix doc 2020-09-23 11:28:38 +08:00
2betop
46ca467911 Merge remote-tracking branch 'baidu/master' 2020-09-23 11:06:32 +08:00
2betop
c7bfa305f2 添加参数开启数组diff 2020-09-23 11:06:14 +08:00
RickCole21
2d8ed83ed0 fix doc and examples 2020-09-22 19:38:33 +08:00
liaoxuezhi
147b2c9b9f
Merge pull request #957 from RickCole21/master
resetOnQuickSaveFailed
2020-09-22 19:25:35 +08:00
rickcole
7f2e6dcdd4 fix 2020-09-22 19:16:41 +08:00
rickcole
048f34ef9a resetOnQuickSaveFailed 2020-09-22 18:37:51 +08:00
RickCole21
0fdc0ab42d fix doc 2020-09-22 17:07:41 +08:00
liaoxuezhi
1fe556e9df
Update data-mapping.md 2020-09-22 15:05:01 +08:00
liaoxuezhi
bebc630ad2
Update data-mapping.md 2020-09-22 15:02:25 +08:00
2betop
d2ea5e4f5a Merge remote-tracking branch 'baidu/master' 2020-09-22 11:38:08 +08:00
2betop
4e745eb033 formData 数据需要清空 2020-09-22 11:37:58 +08:00
liaoxuezhi
974cc044ef
Merge pull request #955 from CareyToboo/fix-bug
移除 window.alert 提示. 修复 tinymce 弹窗内菜单展示问题.
2020-09-21 19:59:13 +08:00
吴多益
c1ed584f4e
Merge pull request #954 from nwind/master
改叫代码编辑器更好找
2020-09-21 19:46:38 +08:00
wuduoyi
9c17baf063 改叫代码编辑器更好找 2020-09-21 19:45:54 +08:00
toboos
ffc9e3d09a 移除 window.alert 提示. 修复 tinymce 弹窗内菜单展示问题. 2020-09-21 19:45:24 +08:00
RickCole21
7f11c804d0 fix doc 2020-09-21 16:38:51 +08:00
liaoxuezhi
863cd31d2a
Merge pull request #953 from RickCole21/master
query --> __query
2020-09-21 16:06:11 +08:00
rickcole
1ea7012794 query --> __query 2020-09-21 16:04:29 +08:00
RickCole21
ce482a782d fix style 2020-09-21 13:20:54 +08:00
liaoxuezhi
c95f350655
Merge pull request #952 from RickCole21/master
修复transfer配置disabled无效的问题
2020-09-21 11:11:20 +08:00
rickcole
856b4b651d 修复transfer配置disabled无效的问题 2020-09-21 11:06:30 +08:00
rickcole
2dcc51d0b8 Merge remote-tracking branch 'upstream/master' 2020-09-21 10:35:21 +08:00
rickcole
b2ad56d004 Merge branch 'master' of https://github.com/RickCole21/amis 2020-09-21 10:34:53 +08:00
2betop
aef5e27c45 暴露 Schema 的类型定义 2020-09-18 12:14:01 +08:00
2betop
b4aa03a2a0 Merge remote-tracking branch 'baidu/master' 2020-09-18 11:27:54 +08:00
2betop
fe2477c24a 补充注释 2020-09-18 11:27:42 +08:00
liaoxuezhi
6634108565 补充 Schema 说明 2020-09-17 21:54:55 +08:00
liaoxuezhi
7faaebd928
Update getting-started.md 2020-09-17 21:40:59 +08:00
RickCole
275bd710c6 Update issue templates 2020-09-17 18:56:25 +08:00
2betop
804486fe0d type 优先级不对 2020-09-17 17:26:06 +08:00
2betop
a6ba7c46d9 Merge branch 'master' of https://github.com/2betop/amis 2020-09-17 10:13:33 +08:00
2betop
a7dbb9c340 暴露 animation 2020-09-17 10:13:25 +08:00
liaoxuezhi
b47ffe877a 更新示例 2020-09-16 23:41:51 +08:00
liaoxuezhi
dbf4555f65 优化 Schema 配置 2020-09-16 21:44:01 +08:00