Commit Graph

5614 Commits

Author SHA1 Message Date
吴多益
90d4eba909
Merge pull request #1158 from 2betop/image
修复图片放大功能读取图片地址错误问题
2020-12-09 15:23:09 +08:00
2betop
fe3a190f0b 修复图片放大功能读取图片地址错误问题 2020-12-09 14:28:27 +08:00
吴多益
dabe43331d
Merge pull request #1157 from 2betop/iframe
xss 问题修复
2020-12-09 14:21:25 +08:00
2betop
1aedc6889c 只允许 ./ ../ / 或者 https?:// 打头的地址 2020-12-09 14:08:04 +08:00
2betop
66a1f910b0 xss 问题修复 2020-12-09 13:20:54 +08:00
liaoxuezhi
0d642c3b91
Update custom.md 2020-12-09 13:10:54 +08:00
吴多益
c4896378f7
Merge pull request #1156 from 2betop/picker
picker 的 loadOptions 接口判断优化
2020-12-09 12:17:28 +08:00
2betop
c9a82bd0f2 picker 的 loadOPtions 接口判断优化 2020-12-09 12:10:36 +08:00
RickCole
54b887347f
Merge pull request #1155 from 2betop/fix
修复 select autocomplete 可能初始不请求的问题
2020-12-09 11:51:25 +08:00
RickCole21
8213202e48 update doc 2020-12-09 11:48:50 +08:00
2betop
a914e6f1ad 修复 select autocomplete 可能初始不请求的问题 2020-12-09 11:47:35 +08:00
liaoxuezhi
9a70c1ddd8 优化预览样式 2020-12-09 00:35:24 +08:00
liaoxuezhi
b38efd9905 Merge remote-tracking branch 'baidu/master' into css 2020-12-08 23:03:37 +08:00
2betop
64703d358c css 文档 2020-12-08 19:57:59 +08:00
RickCole
eb939b0e3f
Merge pull request #1150 from 2betop/api
优化一下 api 适配无status 字段的情况
2020-12-08 15:10:13 +08:00
liaoxuezhi
1a4b129caf
Merge pull request #1152 from Zclhlmgqzc/master
fix: fixed table footable height
2020-12-08 15:08:59 +08:00
吴多益
6eaec8c6d3
Merge pull request #1153 from 2betop/import
修复修复 dynamic import 用法问题
2020-12-08 14:41:31 +08:00
2betop
1b3fb46ba6 修复修复 dynamic import 用法问题 2020-12-08 14:39:23 +08:00
Zclhlmgqzc
7d0b1b1701 fix: footable height 2020-12-08 13:04:21 +08:00
liaoxuezhi
e38e1a5c2b
Merge pull request #1151 from 2betop/1208
window 通信逻辑优化
2020-12-08 12:11:02 +08:00
2betop
fdbe89fb51 window 通信逻辑优化 2020-12-08 12:09:14 +08:00
liaoxuezhi
d437f1fdf7 优化一下 api 适配无status 字段的情况 2020-12-07 22:56:23 +08:00
RickCole
37787b610c
Merge pull request #1148 from 2betop/api
Api 非 status 接口返回适配问题修复
2020-12-07 22:47:42 +08:00
liaoxuezhi
ade2d70bab api 支持无status 字段返回 2020-12-07 22:38:52 +08:00
liaoxuezhi
ded3240372 Merge remote-tracking branch 'baidu/master' 2020-12-07 22:36:54 +08:00
liaoxuezhi
3ff762c193 Merge branch 'master' of https://github.com/2betop/amis 2020-12-07 22:36:39 +08:00
liaoxuezhi
d6b8b05451
Merge pull request #1146 from 2betop/fix
还原固定列显示切换逻辑, 固定列跟 footable 搭配有问题
2020-12-07 19:42:42 +08:00
2betop
4e3a7ec949 还原固定列显示切换逻辑, 固定列跟 footable 搭配有问题 2020-12-07 19:36:23 +08:00
吴多益
d7c0f0b6ca
Merge pull request #1144 from 2betop/fix
1. 修复Table,嵌套+固定列 样式错乱问题 2. 优化 picker 的配置项
2020-12-07 19:01:03 +08:00
吴多益
7ee124e1a8
Merge pull request #1145 from 2betop/date-range
优化日期范围值
2020-12-07 18:58:10 +08:00
吴多益
33b058a28d
Merge pull request #1143 from 2betop/embed
embed 用法优化地址栏更新
2020-12-07 18:56:02 +08:00
2betop
38b9e505cc 优化日期范围值 2020-12-07 18:09:10 +08:00
liaoxuezhi
8b3c3e936f
Merge pull request #1141 from nwind/fix-headcell
fix: Dark 模式下 header 的展现
2020-12-07 17:04:26 +08:00
2betop
a7d2bbc920 公用代码,解决因为不一致导致的嵌套+固定列用法的样式错乱问题 2020-12-07 17:02:06 +08:00
2betop
164b2d7840 Picker labelTpl 透传 2020-12-07 16:30:19 +08:00
2betop
8bb434f6e5 picker 可以配置 checkOnItemClick 属性 2020-12-07 16:11:19 +08:00
2betop
dd25b46732 解决冲突 2020-12-07 16:08:35 +08:00
2betop
e4ad0b90b4 embed 用法优化地址栏更新 2020-12-07 14:56:16 +08:00
wuduoyi
632401e80e fix: Dark 模式下 header 的展现 2020-12-04 16:49:11 +08:00
吴多益
2f985954b0
Merge pull request #1139 from 2betop/drawer-issue
drawer showErrorMsg 逻辑补充
2020-12-04 16:00:05 +08:00
2betop
6f1b9b3397 drawer showErrorMsg 逻辑补充 2020-12-03 13:55:36 +08:00
吴多益
55a6140057
Merge pull request #1138 from 2betop/test-fix
test 修复 & 异步 require 改成 dynamic import
2020-12-03 13:16:16 +08:00
2betop
deb546bce4 test 修复 & 异步 require 改成 dynamic import 2020-12-03 13:07:58 +08:00
liaoxuezhi
a12d4e35af
Merge pull request #1135 from nwind/fix-jest
修复一些 jest 的报错
2020-12-03 10:11:05 +08:00
wuduoyi
f8ec77d388 修复一些 jest 的报错 2020-12-02 23:06:38 +08:00
RickCole21
572aa54886 fix typo 2020-12-02 17:02:44 +08:00
liaoxuezhi
3bb36ac024
Merge pull request #1132 from nwind/city-pass-select-prop
city 支持配置 searchable;treeselect 选择后显示祖先节点
2020-12-02 16:32:56 +08:00
吴多益
e692625457
Merge pull request #1130 from 2betop/ts-fix
升级到最新的 typescript,并修复错误
2020-12-02 16:31:00 +08:00
liaoxuezhi
3c393f10fc
Update linkage.md 2020-12-02 16:27:21 +08:00
wuduoyi
12edccd02e city 支持配置 searchable;treeselect 选择后显示祖先节点 2020-12-02 15:08:47 +08:00