diff --git a/src/modules/extend/excel/import-btn.vue b/src/modules/extend/excel/import-btn.vue
index a23a49a..d7d4a77 100644
--- a/src/modules/extend/excel/import-btn.vue
+++ b/src/modules/extend/excel/import-btn.vue
@@ -174,7 +174,7 @@ function onUpload(raw: File, _: any, { next }: any) {
 
 	next();
 
-	return true;
+	return false;
 }
 
 // 下载模版
diff --git a/src/modules/upload/components/upload.vue b/src/modules/upload/components/upload.vue
index 94c3eac..7d21c9b 100644
--- a/src/modules/upload/components/upload.vue
+++ b/src/modules/upload/components/upload.vue
@@ -294,7 +294,7 @@ async function onBeforeUpload(file: any, item?: Upload.Item) {
 			size: file.size,
 			name: file.name,
 			type: getType(file.name),
-			progress: 0,
+			progress: props.autoUpload ? 0 : 100, // 非自动上传时默认100%
 			url: "",
 			preload: "",
 			error: ""
@@ -310,24 +310,20 @@ async function onBeforeUpload(file: any, item?: Upload.Item) {
 		// 上传事件
 		emit("upload", d, file);
 
-		// 是否自动上传
-		if (props.autoUpload) {
-			// 赋值
-			if (item) {
-				Object.assign(item, d);
-			} else {
-				if (props.multiple) {
-					if (!isAdd.value) {
-						ElMessage.warning(`最多只能上传${limit.value}个文件`);
-					} else {
-						list.value.push(d);
-					}
+		// 赋值
+		if (item) {
+			Object.assign(item, d);
+		} else {
+			if (props.multiple) {
+				if (!isAdd.value) {
+					ElMessage.warning(`最多只能上传${limit}个文件`);
+					return false;
 				} else {
-					list.value = [d];
+					list.value.push(d);
 				}
+			} else {
+				list.value = [d];
 			}
-
-			return true;
 		}
 
 		return true;
@@ -335,13 +331,13 @@ async function onBeforeUpload(file: any, item?: Upload.Item) {
 
 	// 自定义上传事件
 	if (props.beforeUpload) {
-		const r = props.beforeUpload(file, item, { next });
+		let r = props.beforeUpload(file, item, { next });
 
 		if (isPromise(r)) {
 			r.then(next).catch(() => null);
 		} else {
 			if (r) {
-				next();
+				r = next();
 			}
 		}