Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(upload): update file in non-default case #607

Merged
merged 21 commits into from
Dec 16, 2020
Merged

fix(upload): update file in non-default case #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f1530aa
fix(upload): fix upload and remove action of component upload
huqiyao Dec 7, 2020
0011395
fix(upload): remove unnessary code
huqiyao Dec 7, 2020
413d1f7
fix(upload): format code
huqiyao Dec 7, 2020
ca2c409
fix(upload): remove unused hook
huqiyao Dec 7, 2020
655f855
fix(upload): resolve compile error
huqiyao Dec 7, 2020
1330c62
refactor(upload): resolve compile error
huqiyao Dec 7, 2020
6686c53
refactor(upload): remove log
huqiyao Dec 7, 2020
d327d9a
fix(upload): reconstruct code
huqiyao Dec 7, 2020
1eed3b7
Merge branch 'master' of https://github.com/growingio/gio-design into…
huqiyao Dec 7, 2020
7acc89a
test(upload): modify upload test
huqiyao Dec 7, 2020
c5c6032
fix(upload): fix the problem that upload cannot trigger
huqiyao Dec 8, 2020
02f9daf
fix(upload): remove semicolon
huqiyao Dec 8, 2020
bfc2b45
Merge branch 'master' into fix-upload
jack0pan Dec 8, 2020
1c5bfb5
Merge branch 'master' of https://github.com/growingio/gio-design into…
huqiyao Dec 11, 2020
80e950e
fix(upload): fix the problem that file do not render in non-standard way
huqiyao Dec 11, 2020
cb6d0ee
style(upload): remove log
huqiyao Dec 11, 2020
30ce0d1
style(upload): format
huqiyao Dec 11, 2020
bf40abf
Merge branch 'master' of https://github.com/growingio/gio-design into…
huqiyao Dec 15, 2020
e8b9876
test(upload): update snapshot
huqiyao Dec 15, 2020
21230f1
Merge branch 'master' into fix-upload
huskylengcb Dec 15, 2020
c189b0e
Merge branch 'master' into fix-upload
jack0pan Dec 15, 2020
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
7 changes: 5 additions & 2 deletions packages/components/src/components/upload/Upload.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useRef } from 'react';
import React, { useState, useRef, useEffect } from 'react';
import RcUpload from 'rc-upload';
import classnames from 'classnames';
import usePrefixCls from '../../utils/hooks/use-prefix-cls';
Expand Down Expand Up @@ -55,6 +55,10 @@ const Upload: React.FC<IUploadProps> = ({
...restProps
}: IUploadProps) => {
const [file, setFile] = useState<IUploadFile>(getEmptyFileObj(uploadedFile));
useEffect(() => {
setFile(getEmptyFileObj(uploadedFile));
}, [uploadedFile]);

const rcUploadRef = useRef(null);
const prefixCls = usePrefixCls('upload', customPrefixCls);

Expand All @@ -64,7 +68,6 @@ const Upload: React.FC<IUploadProps> = ({
[`${prefixCls}--success`]: file?.status === STATUS_SUCCESS && !successBorder,
[`${prefixCls}--success-border`]: file?.status === STATUS_SUCCESS && successBorder,
});

const Trigger = triggerMap[type];

const handleBeforeUpload = (fileBeforeUpload: IRcFile, fileList: IRcFile[]) =>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/components/upload/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const getEmptyFileObj = (file?: IUploadFile): IUploadFile => ({
size: file?.size ?? 0,
name: file?.name ?? '本地上传',
type: file?.type ?? '$empty-file',
status: file?.dataUrl ? STATUS_SUCCESS : STATUS_NOT_YET,
status: file?.dataUrl && file?.status === STATUS_SUCCESS ? STATUS_SUCCESS : STATUS_NOT_YET,
dataUrl: file?.dataUrl ?? '',
});

Expand Down