From 786f2ac02907c2590918560b475167dcd820efe0 Mon Sep 17 00:00:00 2001
From: GAOANG <1140589958@qq.com>
Date: Wed, 21 Aug 2024 10:11:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=8F=AF=E7=82=B9x=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8A=E4=BC=A0=E6=8C=89=E9=92=AEdisabled=E6=97=B6?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/components/Upload.vue | 2 +-
 src/components/SecondDev/OpinionDialog.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Form/src/components/Upload.vue b/src/components/Form/src/components/Upload.vue
index edcbaa3..e247737 100644
--- a/src/components/Form/src/components/Upload.vue
+++ b/src/components/Form/src/components/Upload.vue
@@ -65,7 +65,7 @@
     >
       <plus-outlined v-if="listType == 'picture-card'" />
       <div :style="style" v-else>
-        <a-button :loading="loading" :disabled="loading">
+        <a-button :loading="loading" :disabled="loading" v-if="!disabled">
           <upload-outlined />
           点击上传
         </a-button>
diff --git a/src/components/SecondDev/OpinionDialog.vue b/src/components/SecondDev/OpinionDialog.vue
index 3373549..e5c50a1 100644
--- a/src/components/SecondDev/OpinionDialog.vue
+++ b/src/components/SecondDev/OpinionDialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <a-modal :mask-closable="false" :title="dialogTitle" :visible="isOpen" :width="500" centered class="geg">
+    <a-modal :mask-closable="false" :title="dialogTitle" :visible="isOpen" :width="500" centered class="geg" @cancel="onClickCancel">
         <template #footer>
             <a-button :disabled="loading" @click="onClickCancel">取消</a-button>
             <a-button :loading="loading" type="primary" @click="onClickOK">确定</a-button>