Skip to content

Commit 88ec06b

Browse files
authored
fix(upload): disabled prop apply order (#7047)
1 parent 6c39bec commit 88ec06b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

components/upload/Upload.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default defineComponent({
4444
// style
4545
const [wrapSSR, hashId] = useStyle(prefixCls);
4646
const disabledContext = useInjectDisabled();
47-
const mergedDisabled = computed(() => disabledContext.value ?? disabled.value);
47+
const mergedDisabled = computed(() => disabled.value ?? disabledContext.value);
4848

4949
const [mergedFileList, setMergedFileList] = useMergedState(props.defaultFileList || [], {
5050
value: toRef(props, 'fileList'),

0 commit comments

Comments
 (0)