Merge branch 'gaoang-2024-9' into 'dev'

feat: 日期选择控件disabled修改 See merge request itc-framework/ma/2024/front!21
2024-10-28 06:49:16 +00:00
parent cc52793d70 d5cb26486f
commit 7fc5f5d5a1
1 changed files with 1 additions and 1 deletions
--- 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"