@sl-material/sl-import 1.0.0-beta10 → 1.0.0-beta12

package/sl-import.es.js

@@ -2886,12 +2886,12 @@ class ImportDialogRenderer {
             <path d="M4 6C4 4.89543 4.89543 4 6 4H14L18 8H26C27.1046 8 28 8.89543 28 10V26C28 27.1046 27.1046 28 26 28H6C4.89543 28 4 27.1046 4 26V6Z" fill="${iconColor}"/>
           </svg>
         </div>
-        <button class="import-dialog-vanilla-file-remove-btn" data-file-index="${index}" title="删除">
+        <div class="import-dialog-vanilla-file-remove-btn" data-file-index="${index}" title="删除">
           <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
             <circle cx="8" cy="8" r="8" fill="rgba(0,0,0)"/>
             <path d="M5 5L11 11M11 5L5 11" stroke="white" stroke-width="1.5" stroke-linecap="round"/>
           </svg>
-        </button>
+        </div>
         <div class="import-dialog-vanilla-file-info">
           <div class="import-dialog-vanilla-file-name" title="${fileItem.name}">${fileItem.name}</div>
           <div class="import-dialog-vanilla-file-meta">
@@ -3120,50 +3120,6 @@ class ChunkedUploader {
     this.cleanup();
   }
 }
-class SimpleUploader {
-  constructor(options, callbacks = {}) {
-    __publicField(this, "customUpload");
-    __publicField(this, "callbacks");
-    __publicField(this, "getFileList");
-    __publicField(this, "removeFile");
-    this.customUpload = options.customUpload;
-    this.getFileList = options.getFileList;
-    this.removeFile = options.removeFile;
-    this.callbacks = callbacks;
-  }
-  /**
-   * 更新自定义上传函数
-   */
-  updateCustomUpload(customUpload) {
-    this.customUpload = customUpload;
-  }
-  /**
-   * 上传单个文件
-   */
-  async upload(fileItem) {
-    if (this.customUpload) {
-      const context = {
-        fileList: [...this.getFileList()],
-        removeFile: (index) => {
-          this.removeFile(index);
-        }
-      };
-      const response = await this.customUpload(
-        fileItem.file,
-        context,
-        (progress) => {
-          var _a, _b, _c, _d;
-          fileItem.progress = progress;
-          (_b = (_a = this.callbacks).onProgress) == null ? void 0 : _b.call(_a, fileItem, progress);
-          (_d = (_c = this.callbacks).onUpdate) == null ? void 0 : _d.call(_c);
-        }
-      );
-      return response;
-    } else {
-      return fileItem.file;
-    }
-  }
-}
 const generateId = () => {
   return `file_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
 };
@@ -3171,9 +3127,8 @@ class ImportDialogUploader {
   constructor(config, callbacks = {}) {
     __publicField(this, "config");
     __publicField(this, "callbacks");
-    // 上传器实例
+    // 分片上传器实例
     __publicField(this, "chunkedUploader", null);
-    __publicField(this, "simpleUploader", null);
     // 并发上传队列
     __publicField(this, "uploadQueue", []);
     __publicField(this, "activeUploads", 0);
@@ -3208,24 +3163,6 @@ class ImportDialogUploader {
         }
       });
     }
-    this.simpleUploader = new SimpleUploader(
-      {
-        customUpload: uploadConfig == null ? void 0 : uploadConfig.customUpload,
-        getFileList: () => this.uploadFileList,
-        removeFile: (index) => this.removeFile(index)
-      },
-      {
-        onProgress: (fileItem, progress) => {
-          var _a, _b, _c, _d;
-          (_b = (_a = this.callbacks).onUploadProgress) == null ? void 0 : _b.call(_a, fileItem, progress);
-          (_d = (_c = this.callbacks).onUpdate) == null ? void 0 : _d.call(_c);
-        },
-        onUpdate: () => {
-          var _a, _b;
-          return (_b = (_a = this.callbacks).onUpdate) == null ? void 0 : _b.call(_a);
-        }
-      }
-    );
   }
   /**
    * 获取并发限制数
@@ -3263,7 +3200,7 @@ class ImportDialogUploader {
    * 文件上传之前的校验 选择文件时调用
    */
   beforeUpload(files) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     const fileArray = Array.isArray(files) ? files : [files];
     if (!fileArray.length) {
       (_b = (_a = this.callbacks).onMessage) == null ? void 0 : _b.call(_a, "请选择文件", "warning");
@@ -3309,12 +3246,69 @@ class ImportDialogUploader {
     }
     (_h = (_g = this.callbacks).onUpdate) == null ? void 0 : _h.call(_g);
     (_j = (_i = this.callbacks).onFileChange) == null ? void 0 : _j.call(_i, this.uploadFileList);
-    const autoUpload = ((_k = this.config.uploadConfig) == null ? void 0 : _k.autoUpload) != null ? this.config.uploadConfig.autoUpload : false;
-    if (autoUpload) {
-      this.startUploadFiles();
-    }
+    this.processFilesWithCustomUpload();
     return true;
   }
+  /**
+   * 使用 customUpload 预处理文件
+   * 在选择文件后立即调用，用于二次加工参数或自定义校验
+   */
+  async processFilesWithCustomUpload() {
+    const pendingFiles = this.uploadFileList.filter(
+      (f) => f.status === "pending"
+    );
+    for (const fileItem of pendingFiles) {
+      await this.processFileWithCustomUpload(fileItem);
+    }
+  }
+  /**
+   * 单个文件的预处理
+   */
+  async processFileWithCustomUpload(fileItem) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    const customUpload = (_a = this.config.uploadConfig) == null ? void 0 : _a.customUpload;
+    if (!customUpload) {
+      fileItem.status = "success";
+      fileItem.progress = 100;
+      fileItem.response = fileItem.file;
+      (_c = (_b = this.callbacks).onUpdate) == null ? void 0 : _c.call(_b);
+      return;
+    }
+    fileItem.status = "uploading";
+    fileItem.progress = 0;
+    this.isUploading = true;
+    (_e = (_d = this.callbacks).onUpdate) == null ? void 0 : _e.call(_d);
+    try {
+      const context = {
+        fileList: [...this.uploadFileList],
+        removeFile: (index) => {
+          this.removeFile(index);
+        }
+      };
+      fileItem.response = await customUpload(
+        fileItem.file,
+        context,
+        (progress) => {
+          var _a2, _b2, _c2, _d2;
+          fileItem.progress = progress;
+          (_b2 = (_a2 = this.callbacks).onUploadProgress) == null ? void 0 : _b2.call(_a2, fileItem, progress);
+          (_d2 = (_c2 = this.callbacks).onUpdate) == null ? void 0 : _d2.call(_c2);
+        }
+      );
+      fileItem.status = "success";
+      fileItem.progress = 100;
+      (_g = (_f = this.callbacks).onUploadSuccess) == null ? void 0 : _g.call(_f, fileItem, fileItem.response);
+    } catch (error) {
+      fileItem.status = "error";
+      fileItem.errorMessage = error instanceof Error ? error.message : "处理失败";
+      (_i = (_h = this.callbacks).onUploadError) == null ? void 0 : _i.call(_h, fileItem, error);
+    }
+    this.isUploading = this.uploadFileList.some(
+      (f) => f.status === "uploading"
+    );
+    (_k = (_j = this.callbacks).onUpdate) == null ? void 0 : _k.call(_j);
+    this.updateOverallProgress();
+  }
   /**
    * 删除文件
    */
@@ -3366,14 +3360,8 @@ class ImportDialogUploader {
       });
     }
   }
-  async startUploadFiles() {
-    const pendingFiles = this.uploadFileList.filter(
-      (f) => f.status === "pending"
-    );
-    this.enqueueUpload(pendingFiles);
-  }
   /**
-   * 单个文件上传
+   * 单个文件分片上传
    * @param fileItem
    */
   async uploadSingleFile(fileItem) {
@@ -3383,11 +3371,7 @@ class ImportDialogUploader {
     this.isUploading = true;
     (_b = (_a = this.callbacks).onUpdate) == null ? void 0 : _b.call(_a);
     try {
-      if (this.shouldUseChunkedUpload()) {
-        fileItem.response = await this.uploadFileChunked(fileItem);
-      } else {
-        fileItem.response = await this.uploadFileSimple(fileItem);
-      }
+      fileItem.response = await this.uploadFileChunked(fileItem);
       fileItem.status = "success";
       fileItem.progress = 100;
       (_d = (_c = this.callbacks).onUploadSuccess) == null ? void 0 : _d.call(_c, fileItem, fileItem.response);
@@ -3402,15 +3386,6 @@ class ImportDialogUploader {
     (_h = (_g = this.callbacks).onUpdate) == null ? void 0 : _h.call(_g);
     this.updateOverallProgress();
   }
-  /**
-   * 普通上传（非分片）
-   */
-  async uploadFileSimple(fileItem) {
-    if (!this.simpleUploader) {
-      throw new Error("SimpleUploader 未初始化");
-    }
-    return await this.simpleUploader.upload(fileItem);
-  }
   /**
    * 分片上传
    */
@@ -3421,10 +3396,21 @@ class ImportDialogUploader {
     return await this.chunkedUploader.upload(fileItem);
   }
   /**
-   * 手动触发上传（用于autoUpload=false的场景）
+   * 手动触发分片上传（仅用于分片上传场景）
    */
   async startUpload() {
-    await this.startUploadFiles();
+    if (this.shouldUseChunkedUpload()) {
+      await this.startChunkedUploadFiles();
+    }
+  }
+  /**
+   * 启动分片上传
+   */
+  async startChunkedUploadFiles() {
+    const pendingFiles = this.uploadFileList.filter(
+      (f) => f.status === "pending"
+    );
+    this.enqueueUpload(pendingFiles);
   }
   /**
    * 暂停上传（仅分片上传支持）