From b1b53464578ccbf20ec241a513f77dd9eb1c192a Mon Sep 17 00:00:00 2001
From: kovsu <2583695112@qq.com>
Date: Fri, 20 Oct 2023 17:17:23 +0800
Subject: [PATCH] fix(upload): disabled prop apply order

---
 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 e071499303..03023e3971 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'),