From d5cb26486fe80890d6a9971dbed3b637af648815 Mon Sep 17 00:00:00 2001
From: GAOANG <1140589958@qq.com>
Date: Mon, 28 Oct 2024 10:52:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6disabled=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DatePicker/src/DatePicker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/DatePicker/src/DatePicker.vue b/src/components/DatePicker/src/DatePicker.vue
index b49f8bc..c0a8363 100644
--- a/src/components/DatePicker/src/DatePicker.vue
+++ b/src/components/DatePicker/src/DatePicker.vue
@@ -6,7 +6,7 @@
         :format="format"
         :valueFormat="format"
         :allowClear="allowClear"
-        :disabled="originalDisabled"
+        :disabled="originalDisabled || disabled"
         :showTime="format === 'YYYY-MM-DD HH:mm:ss'"
         :picker="picker"
         @change="handleChange"