feat: support for image preview on image upload

This commit is contained in:
chenos 2021-01-07 08:57:44 +08:00
parent 6194009d41
commit 8b1bd64034
4 changed files with 72 additions and 5 deletions

View File

@ -9,6 +9,9 @@ import {
InboxOutlined InboxOutlined
} from '@ant-design/icons' } from '@ant-design/icons'
const { Dragger: UploadDragger } = AntdUpload const { Dragger: UploadDragger } = AntdUpload
import get from 'lodash/get';
import findIndex from 'lodash/findIndex';
import Lightbox from 'react-image-lightbox';
const exts = [ const exts = [
{ {
@ -171,10 +174,19 @@ function toValues(fileList) {
return fileList.map(toValue); return fileList.map(toValue);
} }
export function getImgUrls(value) {
const values = Array.isArray(value) ? value : [value];
return values.filter(item => testUrl(item.url, {
exclude: ['.png', '.jpg', '.jpeg', '.gif']
})).map(item => toValue(item));
}
export const Upload = connect({ export const Upload = connect({
getProps: mapStyledProps getProps: mapStyledProps
})((props) => { })((props) => {
const { value, onChange } = props; const { value, onChange } = props;
const [visible, setVisible] = useState(false);
const [imgIndex, setImgIndex] = useState(0);
const [fileList, setFileList] = useState(toFileList(value)); const [fileList, setFileList] = useState(toFileList(value));
const uploadProps = { const uploadProps = {
name: 'file', name: 'file',
@ -185,15 +197,53 @@ export const Upload = connect({
onChange(toValues(fileList)); onChange(toValues(fileList));
}, },
}; };
const images = getImgUrls(fileList);
// console.log(images);
return ( return (
<div> <div>
<AntdUpload <AntdUpload
listType={'picture-card'}
{...uploadProps} {...uploadProps}
fileList={fileList} fileList={fileList}
multiple={true} multiple={true}
onPreview={(file) => {
const value = toValue(file)||{};
const index = findIndex(images, image => image.id === value.id);
if (index >= 0) {
setImgIndex(index);
setVisible(true);
} else {
window.location.href = value.url;
}
}}
// itemRender={(originNode, file, fileList) => {
// console.log(file);
// const value = toValue(file);
// return (
// <div>
// <img style={{marginRight: 5}} height={20} src={`${value.url}?x-oss-process=style/thumbnail`}/>
// </div>
// );
// }}
// onRemove={(file) => {
// }}
> >
<Button><UploadOutlined /> </Button> <PlusOutlined />
<div style={{marginTop: 5}}></div>
</AntdUpload> </AntdUpload>
{visible && <Lightbox
mainSrc={get(images, [imgIndex, 'url'])}
nextSrc={get(images, [imgIndex + 1, 'url'])}
prevSrc={get(images, [imgIndex - 1, 'url'])}
onCloseRequest={() => setVisible(false)}
onMovePrevRequest={() => {
setImgIndex((imgIndex + images.length - 1) % images.length);
}}
onMoveNextRequest={() => {
setImgIndex((imgIndex + 1) % images.length);
}}
/>}
</div> </div>
) )
}); });

View File

@ -305,7 +305,7 @@ export function AttachmentFieldItem(props: any) {
e.preventDefault(); e.preventDefault();
} }
}} className={'attachment-field-item'} target={'_blank'} href={url}> }} className={'attachment-field-item'} target={'_blank'} href={url}>
<img style={{marginRight: 5}} height={20} alt={title} title={title} src={`${img}?x-oss-process=style/thumbnail`}/> <img height={20} alt={title} title={title} src={`${img}?x-oss-process=style/thumbnail`}/>
</a> </a>
{/* <Modal {/* <Modal
className={'attachment-modal'} className={'attachment-modal'}

View File

@ -37,4 +37,22 @@
.ant-table-cell.noco-field-percent, .ant-table-cell.noco-field-percent,
.ant-table-cell.noco-field-number { .ant-table-cell.noco-field-number {
text-align: right; text-align: right;
}
.ant-upload.ant-upload-select-picture-card > .ant-upload {
flex-direction: column;
}
.attachment-field-item {
display: inline-block;
line-height: 0;
margin-right: 3px;
padding: 1px;
border: 1px solid #d9d9d9;
border-radius: 2px;
background: #fafafa;
img {
height: 18px;
border-radius: 2px;
}
} }

View File

@ -52,7 +52,7 @@ const transforms = {
prop.type = 'string' prop.type = 'string'
} }
if (field.get('component.tooltip')) { if (field.get('component.tooltip')) {
prop.description = field.get('component.tooltip'); prop.description = `{{html('${field.get('component.tooltip')}')}}`;
} }
if (field.get('name') === 'dataSource') { if (field.get('name') === 'dataSource') {
@ -182,7 +182,7 @@ export default async (ctx, next) => {
const table = ctx.db.getTable(associatedName); const table = ctx.db.getTable(associatedName);
const resourceField = table.getField(resourceFieldName); const resourceField = table.getField(resourceFieldName);
if (resourceField instanceof BELONGSTOMANY) { if (resourceField instanceof BELONGSTOMANY) {
console.log({associatedName, resourceField}); // console.log({associatedName, resourceField});
throughName = resourceField.options.through; throughName = resourceField.options.through;
} }
} }
@ -239,7 +239,6 @@ export default async (ctx, next) => {
}); });
view.setDataValue('defaultTabName', get(defaultTabs, [0, 'name'])); view.setDataValue('defaultTabName', get(defaultTabs, [0, 'name']));
} }
if (view.get('type') === 'table') { if (view.get('type') === 'table') {
view.setDataValue('rowViewName', 'form'); view.setDataValue('rowViewName', 'form');
} }