From 314903104c517794d8f6cb6624a59fad97c2d308 Mon Sep 17 00:00:00 2001 From: tcy <1193318383@qq.com> Date: Wed, 20 Aug 2025 19:40:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FileUpload/index.vue | 9 +-------- src/views/ctr/index.vue | 7 +++++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index ee2449a..8f7db5c 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -308,20 +308,13 @@ const uploadedSuccessfully = (res: any) => { emit('update:modelValue', listToString(fileList.value)); proxy?.$modal.closeLoading(); } -<<<<<<< Updated upstream - if (props.autoUpload && props.limit === fileList.value.length) { - fileUploadRef.value?.clearFiles(); - fileList.value = []; - emit('update:modelValue', ''); // 同步到外部 v-model - } -======= + // if (props.autoUpload && props.limit === fileList.value.length) { // fileUploadRef.value?.clearFiles(); // fileList.value = []; // emit('update:modelValue', ''); // 同步到外部 v-model // } ->>>>>>> Stashed changes props.onUploadSuccess?.(fileList.value, res); }; diff --git a/src/views/ctr/index.vue b/src/views/ctr/index.vue index 1fa0c19..0be90d9 100644 --- a/src/views/ctr/index.vue +++ b/src/views/ctr/index.vue @@ -7,8 +7,11 @@