github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(upload): disabled prop apply order (#7047)

pull/7058/head
Konv Suu 2023-10-22 21:16:23 -05:00 committed by GitHub
parent 6c39bec277
commit 88ec06b717
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/upload/Upload.tsx
View File

@ -44,7 +44,7 @@ export default defineComponent({
// style // style
const [wrapSSR, hashId] = useStyle(prefixCls); const [wrapSSR, hashId] = useStyle(prefixCls);
const disabledContext = useInjectDisabled(); const disabledContext = useInjectDisabled();
const mergedDisabled = computed(() => disabledContext.value ?? disabled.value); const mergedDisabled = computed(() => disabled.value ?? disabledContext.value);
const [mergedFileList, setMergedFileList] = useMergedState(props.defaultFileList || [], { const [mergedFileList, setMergedFileList] = useMergedState(props.defaultFileList || [], {
value: toRef(props, 'fileList'), value: toRef(props, 'fileList'),