diff --git a/src/packages/uploader/__tests__/uploader.spec.tsx b/src/packages/uploader/__tests__/uploader.spec.tsx index 0b9847dcaf..589c0ed84d 100644 --- a/src/packages/uploader/__tests__/uploader.spec.tsx +++ b/src/packages/uploader/__tests__/uploader.spec.tsx @@ -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() diff --git a/src/packages/uploader/demos/h5/demo1.tsx b/src/packages/uploader/demos/h5/demo1.tsx index fc41fa4fd5..ab55af17f5 100644 --- a/src/packages/uploader/demos/h5/demo1.tsx +++ b/src/packages/uploader/demos/h5/demo1.tsx @@ -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 ( <> ) => { - if (disabled) { - return - } + if (disabled) return + const $el = event.target const { files } = $el @@ -360,6 +359,7 @@ const InternalUploader: ForwardRefRenderFunction< beforeUpload(new Array().slice.call(files)).then( (f: Array | boolean) => { const _files: File[] = filterFiles(new Array().slice.call(f)) + if (!_files.length) $el.value = '' readFile(_files) } )