@sl-material/sl-import 1.0.0-beta20 → 1.1.0-beat0

package/sl-import.es.js

@@ -2633,15 +2633,31 @@ class ImportDialogRenderer {
     `;
   }
   renderDownloadSection() {
-    return `
-      <div class="import-dialog-vanilla-section">
-        <div class="import-dialog-vanilla-section-title">${t("downloadTemplateTitle")}</div>
-        <a id="import-dialog-download-btn" class="import-dialog-vanilla-btn download-template-btn import-dialog-vanilla-btn-primary" href="${this.context.currentConfig.templateUrl}">
-          <i class="iconfont icon-xiazai"></i>
-          ${t("downloadTemplateText")}
-        </a>
-      </div>
-    `;
+    const hasTemplateUrl = !!this.context.currentConfig.templateUrl;
+    const hasDownloadCallback = !!this.context.modalOptions.onDownloadTemplate;
+    if (hasDownloadCallback) {
+      return `
+        <div class="import-dialog-vanilla-section">
+          <div class="import-dialog-vanilla-section-title">${t("downloadTemplateTitle")}</div>
+          <button id="import-dialog-download-btn" class="import-dialog-vanilla-btn download-template-btn import-dialog-vanilla-btn-primary">
+            <i class="iconfont icon-xiazai"></i>
+            ${t("downloadTemplateText")}
+          </button>
+        </div>
+      `;
+    } else if (hasTemplateUrl) {
+      return `
+        <div class="import-dialog-vanilla-section">
+          <div class="import-dialog-vanilla-section-title">${t("downloadTemplateTitle")}</div>
+          <a id="import-dialog-download-btn" class="import-dialog-vanilla-btn download-template-btn import-dialog-vanilla-btn-primary" href="${this.context.currentConfig.templateUrl}">
+            <i class="iconfont icon-xiazai"></i>
+            ${t("downloadTemplateText")}
+          </a>
+        </div>
+      `;
+    } else {
+      return "";
+    }
   }
   renderSettingSection() {
     const config = this.context.currentConfig;
@@ -2902,7 +2918,7 @@ class ChunkedUploader {
         fileItem.file.name,
         fileItem.file.size
       );
-      fileItem.uploadSessionId = initResult.uploadSessionId;
+      console.info("upload>>>分片结果", initResult);
       this.currentFileItem = fileItem;
       this.initResumable(initResult);
       this.resumable.addFile(fileItem.file);
@@ -2925,6 +2941,7 @@ class ChunkedUploader {
    * 初始化Resumable实例
    */
   initResumable(initResult) {
+    console.log("[分片上传] 初始化分片上传...", initResult);
     if (this.resumable) {
       this.resumable.cancel();
     }
@@ -2943,6 +2960,7 @@ class ChunkedUploader {
       forceChunkSize: true
     };
     const finalConfig = { ...defaultConfig, ...customConfig };
+    console.info("finalConfig>>>分片上传配置", finalConfig);
     this.resumable = new Resumable(finalConfig);
     this.bindResumableEvents();
   }
@@ -2953,6 +2971,7 @@ class ChunkedUploader {
     this.resumable.on("progress", () => {
       var _a, _b, _c, _d;
       const progress = Math.floor(this.resumable.progress() * 100);
+      console.log(`[Resumable分片上传] 进度: ${progress}%`);
       if (this.currentFileItem) {
         this.currentFileItem.progress = Math.min(progress, 90);
         (_b = (_a = this.callbacks).onProgress) == null ? void 0 : _b.call(
@@ -2964,6 +2983,7 @@ class ChunkedUploader {
       (_d = (_c = this.callbacks).onUpdate) == null ? void 0 : _d.call(_c);
     });
     this.resumable.on("fileSuccess", () => {
+      console.log("[Resumable分片上传] 文件上传成功");
       this.handleResumableComplete();
     });
     this.resumable.on("error", (message) => {
@@ -2971,6 +2991,7 @@ class ChunkedUploader {
       this.handleResumableError(message);
     });
     this.resumable.on("fileAdded", () => {
+      console.info("fileAdded>>>开始上传");
       this.resumable.upload();
     });
   }
@@ -3054,9 +3075,6 @@ class ImportDialogUploader {
     __publicField(this, "callbacks");
     // 分片上传器实例
     __publicField(this, "chunkedUploader", null);
-    // 并发上传队列
-    __publicField(this, "uploadQueue", []);
-    __publicField(this, "activeUploads", 0);
     // 上传状态
     __publicField(this, "uploadFileList", []);
     //上传文件列表
@@ -3089,12 +3107,6 @@ class ImportDialogUploader {
       });
     }
   }
-  /**
-   * 获取并发限制数
-   */
-  get concurrentLimit() {
-    return this.config.concurrentLimit != null ? this.config.concurrentLimit : 3;
-  }
   /**
    * 判断是否应该使用分片上传
    * 条件：配置了chunkedUpload 且 是单文件模式
@@ -3118,8 +3130,6 @@ class ImportDialogUploader {
     this.isUploading = false;
     this.uploadMessage = "";
     this.uploadMessageType = "info";
-    this.uploadQueue = [];
-    this.activeUploads = 0;
   }
   /**
    * 文件上传之前的校验 选择文件时调用
@@ -3252,12 +3262,6 @@ class ImportDialogUploader {
         (_c = (_b = this.callbacks).onMessage) == null ? void 0 : _c.call(_b, "文件正在上传中，无法删除", "warning");
         return false;
       }
-      const queueIndex = this.uploadQueue.findIndex(
-        (q) => q.id === fileItem.id
-      );
-      if (queueIndex !== -1) {
-        this.uploadQueue.splice(queueIndex, 1);
-      }
       this.uploadFileList.splice(index, 1);
       this.fileList.splice(index, 1);
     } else {
@@ -3270,7 +3274,6 @@ class ImportDialogUploader {
           return false;
         }
       }
-      this.uploadQueue = [];
       this.uploadFileList = [];
       this.fileList = [];
     }
@@ -3284,32 +3287,6 @@ class ImportDialogUploader {
     (_i = (_h = this.callbacks).onUpdate) == null ? void 0 : _i.call(_h);
     return true;
   }
-  /**
-   * 将文件加入上传队列并启动处理
-   */
-  enqueueUpload(fileItems) {
-    const newItems = fileItems.filter(
-      (item) => !this.uploadQueue.some((q) => q.id === item.id)
-    );
-    this.uploadQueue.push(...newItems);
-    this.processUploadQueue();
-  }
-  /**
-   * 处理上传队列（支持并发）
-   */
-  processUploadQueue() {
-    while (this.uploadQueue.length > 0 && this.activeUploads < this.concurrentLimit) {
-      const fileItem = this.uploadQueue.shift();
-      if (fileItem.status !== "pending") {
-        continue;
-      }
-      this.activeUploads++;
-      this.uploadSingleFile(fileItem).finally(() => {
-        this.activeUploads--;
-        this.processUploadQueue();
-      });
-    }
-  }
   /**
    * 单个文件分片上传
    * @param fileItem
@@ -3346,21 +3323,23 @@ class ImportDialogUploader {
     return await this.chunkedUploader.upload(fileItem);
   }
   /**
-   * 手动触发分片上传（仅用于分片上传场景）
+   * 手动触发上传（用于延迟上传场景）
+   * 分片上传：直接调用 uploadSingleFile 并等待完成
+   * 普通上传：已在选择文件时通过 customUpload 处理完成
    */
   async startUpload() {
-    if (this.shouldUseChunkedUpload()) {
-      await this.startChunkedUploadFiles();
+    if (!this.shouldUseChunkedUpload()) {
+      return;
     }
-  }
-  /**
-   * 启动分片上传
-   */
-  async startChunkedUploadFiles() {
     const pendingFiles = this.uploadFileList.filter(
       (f) => f.status === "pending"
     );
-    this.enqueueUpload(pendingFiles);
+    if (pendingFiles.length === 0) {
+      return;
+    }
+    for (const fileItem of pendingFiles) {
+      await this.uploadSingleFile(fileItem);
+    }
   }
   /**
    * 暂停上传（仅分片上传支持）
@@ -3382,8 +3361,6 @@ class ImportDialogUploader {
   cancelUpload() {
     var _a, _b, _c;
     (_a = this.chunkedUploader) == null ? void 0 : _a.cancel();
-    this.uploadQueue = [];
-    this.activeUploads = 0;
     this.isUploading = false;
     this.uploadMessage = "上传已取消";
     this.uploadMessageType = "info";
@@ -3599,6 +3576,7 @@ const _ImportDialog = class _ImportDialog {
     var _a, _b;
     return {
       currentConfig: this.currentConfig,
+      modalOptions: this.modalOptions,
       dialogTitle: this.dialogTitle,
       width: this.dialogWidth,
       activeTabIndex: this.activeTabIndex,
@@ -3782,6 +3760,13 @@ const _ImportDialog = class _ImportDialog {
       "#import-dialog-cancel-btn"
     );
     cancelBtn == null ? void 0 : cancelBtn.addEventListener("click", () => this.handleCancel());
+    const downloadBtn = this.modalElement.querySelector(
+      "#import-dialog-download-btn"
+    );
+    downloadBtn == null ? void 0 : downloadBtn.addEventListener("click", (e) => {
+      e.preventDefault();
+      this.handleDownloadTemplate();
+    });
   }
   bindFormEvents() {
     if (!this.modalElement) return;
@@ -4042,6 +4027,25 @@ const _ImportDialog = class _ImportDialog {
   closeModal() {
     this.handleCancel();
   }
+  /**
+   * 处理下载模板
+   */
+  handleDownloadTemplate() {
+    var _a;
+    if (this.modalOptions.onDownloadTemplate) {
+      this.modalOptions.onDownloadTemplate({
+        url: this.currentConfig.templateUrl || "",
+        activeTab: (_a = this.modalOptions.tabs) == null ? void 0 : _a[this.activeTabIndex]
+      });
+    } else if (this.currentConfig.templateUrl) {
+      const link = document.createElement("a");
+      link.href = this.currentConfig.templateUrl;
+      link.download = "";
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+    }
+  }
   setConfirmLoading(loading) {
     this.confirmLoading = loading;
     this.updateModal();