From 88ec06b717c48256fba3ef0a6c019098c0af2af7 Mon Sep 17 00:00:00 2001
From: Konv Suu <2583695112@qq.com>
Date: Sun, 22 Oct 2023 21:16:23 -0500
Subject: [PATCH] fix(upload): disabled prop apply order (#7047)

---
 components/upload/Upload.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/upload/Upload.tsx b/components/upload/Upload.tsx
index e07149930..03023e397 100644
--- a/components/upload/Upload.tsx
+++ b/components/upload/Upload.tsx
@@ -44,7 +44,7 @@ export default defineComponent({
     // style
     const [wrapSSR, hashId] = useStyle(prefixCls);
     const disabledContext = useInjectDisabled();
-    const mergedDisabled = computed(() => disabledContext.value ?? disabled.value);
+    const mergedDisabled = computed(() => disabled.value ?? disabledContext.value);
 
     const [mergedFileList, setMergedFileList] = useMergedState(props.defaultFileList || [], {
       value: toRef(props, 'fileList'),