Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/packages/uploader/__tests__/uploader.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ test('should render base uploader other props', () => {
fireEvent.click(container.querySelectorAll('.close')[0])
expect(onDelete).toBeCalled()

const toast2 = container.querySelector('.nut-uploader-preview-img-c')
const toast2 = container.querySelector('.nut-uploader-preview-img-c .nut-img')
expect(toast2).toBeTruthy()
fireEvent.click(container.querySelectorAll('.nut-uploader-preview-img-c')[0])
expect(fileItemClick).toBeCalled()
Expand Down
8 changes: 8 additions & 0 deletions src/packages/uploader/demos/h5/demo1.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,18 @@ const Demo1 = () => {
const onStart = () => {
console.log('start触发')
}
const beforeUpload = async (files: File[]) => {
const allowedTypes = ['image/png']
const filteredFiles = Array.from(files).filter((file) =>
allowedTypes.includes(file.type)
)
return filteredFiles
}
return (
<>
<Cell style={{ flexWrap: 'wrap', paddingBottom: '0px' }}>
<Uploader
beforeUpload={beforeUpload}
url={uploadUrl}
onStart={onStart}
style={{
Expand Down
6 changes: 3 additions & 3 deletions src/packages/uploader/uploader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -350,16 +350,16 @@ const InternalUploader: ForwardRefRenderFunction<
}

const fileChange = (event: React.ChangeEvent<HTMLInputElement>) => {
if (disabled) {
return
}
if (disabled) return

const $el = event.target
const { files } = $el

if (beforeUpload) {
beforeUpload(new Array<File>().slice.call(files)).then(
(f: Array<File> | boolean) => {
const _files: File[] = filterFiles(new Array<File>().slice.call(f))
if (!_files.length) $el.value = ''
readFile(_files)
}
)
Expand Down