diff --git a/package.json b/package.json index c0ba867..b141027 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kne/react-file", - "version": "0.1.28", + "version": "0.1.29", "description": "提供了文件上传,文件预览,文件批量管理等功能", "syntax": { "esmodules": true diff --git a/src/components/Download/downloadAction.js b/src/components/Download/downloadAction.js index 7084f17..526ef94 100644 --- a/src/components/Download/downloadAction.js +++ b/src/components/Download/downloadAction.js @@ -5,6 +5,7 @@ const downloadAction = (url, filename) => { element.target = '_blank'; element.href = url; // 将生成的URL设置为a.href属性 element.dispatchEvent(event); // 触发a的单击事件 + }; export default downloadAction; diff --git a/src/components/Image/index.js b/src/components/Image/index.js index 7ccdbbc..932b9ad 100644 --- a/src/components/Image/index.js +++ b/src/components/Image/index.js @@ -18,28 +18,35 @@ const avatarDefault = ; const avatarFemale = ; const avatarMale = ; -const ImageInner = ({ data, className, alt, innerLoading, loading, error, innerError, children, onClick, staticUrl: staticUrlProps }) => { +const ImageInner = ({ + data, + className, + alt, + innerLoading, + loading, + error, + innerError, + children, + onClick, + staticUrl: staticUrlProps + }) => { const { apis: baseApis } = usePreset(); const apis = Object.assign({}, baseApis); const fileUrl = useStaticUrl({ staticUrl: staticUrlProps || apis.file?.staticUrl, url: data }); - return ( - { - if (typeof children === 'function') { - return children({ - alt, - className: classnames(className, style['img']), - src: data - }); - } - return {alt}; - }} - /> - ); + return ( { + if (typeof children === 'function') { + return children({ + alt, className: classnames(className, style['img']), src: data + }); + } + return {alt}; + }} + />); }; const FetchImageInner = withOSSFile(ImageInner); @@ -52,52 +59,39 @@ const renderInner = ({ loading, error, src, id, alt, className, children, apis, } return ; }; - const imageLoading = - loading && - cloneElement(loading, { - className: style['loading'] - }); - const imageError = - error && - cloneElement(error, { - className: style['error'] - }); - if (src) { - return ( - - {children} - - ); - } + const imageLoading = loading && cloneElement(loading, { + className: style['loading'] + }); + const imageError = error && cloneElement(error, { + className: style['error'] + }); if (id) { - return ( - - {children} - - ); + return ( + {children} + ); + } + + if (src) { + return ( + {children} + ); } return imageError; }; const Image = p => { - const { id, src, alt, onClick, loading, error, className, apis, staticUrl, ...props } = Object.assign({}, { loading: loadingElement, error: photoFail }, p); - return ( -
- {renderInner({ - loading, - error, - src, - id, - alt, - className, - apis, - onClick, - staticUrl - })} -
- ); + const { + id, src, alt, onClick, loading, error, className, apis, staticUrl, ...props + } = Object.assign({}, { loading: loadingElement, error: photoFail }, p); + return (
+ {renderInner({ + loading, error, src, id, alt, className, apis, onClick, staticUrl + })} +
); }; Image.Avatar = p => { @@ -120,16 +114,9 @@ Image.Avatar = p => { apis, staticUrl, ...props - } = Object.assign( - {}, - { - size: 100, - defaultAvatar: avatarDefault, - error: photoFail, - shape: 'circle' - }, - p - ); + } = Object.assign({}, { + size: 100, defaultAvatar: avatarDefault, error: photoFail, shape: 'circle' + }, p); const inner = (() => { const styleProps = width && height ? { style: { width, height } } : { size }; let shape = propsShape; @@ -167,25 +154,20 @@ Image.Avatar = p => { return ; } - return ( - - {children} - - ); + return ( + {children} + ); })(); - return ( -
- {inner} -
- ); + return (
+ {inner} +
); }; export default Image;