test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-11-30 02:58:05 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'baidu/master'

Browse Source
This commit is contained in:
2betop 2020-09-03 11:46:02 +08:00
commit ed408b7817
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/components/iframe.md
View File

@ -27,6 +27,8 @@ order: 51
| frameBorder | `Array` | | frameBorder |
| style | `object` | | 样式 |
| src | `string` | | iframe地址 |
| height | `string` | `"100%"` | iframe高 |
| width | `string` | `"100%"` | iframe宽 |

10
src/renderers/IFrame.tsx
View File

@ -120,13 +120,15 @@ export default class IFrame extends React.Component<IFrameProps, object> {
const {width, height} = this.state;
let {className, src, frameBorder, data, style} = this.props;
let tempStyle: any = {};
width !== void 0 && (tempStyle.width = width);
height !== void 0 && (tempStyle.height = height);
style = {
...tempStyle,
...style
};
width !== void 0 && (style.width = width);
height !== void 0 && (style.height = height);
return (
<iframe
className={className}