From 2a04ae9a602c88c1c8a16da154c3a51075e88d86 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 14 十一月 2024 10:55:29 +0800
Subject: [PATCH] Merge refs/heads/master into refs/heads/branch-novideo

---
 miniprogram_npm/tdesign-miniprogram/upload/props.js |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/miniprogram_npm/tdesign-miniprogram/upload/props.js b/miniprogram_npm/tdesign-miniprogram/upload/props.js
index fbf07c3..193a290 100644
--- a/miniprogram_npm/tdesign-miniprogram/upload/props.js
+++ b/miniprogram_npm/tdesign-miniprogram/upload/props.js
@@ -9,6 +9,10 @@
     config: {
         type: Object,
     },
+    disabled: {
+        type: Boolean,
+        value: false,
+    },
     files: {
         type: Array,
         value: null,
@@ -44,5 +48,12 @@
         type: String,
         value: 'media',
     },
+    draggable: {
+        type: null,
+    },
+    transition: {
+        type: Object,
+        value: { backTransition: true, duration: 300, timingFunction: 'ease' },
+    },
 };
 export default props;

--
Gitblit v1.9.3