@whitesev/pops 3.3.3 → 3.3.4

package/dist/index.umd.js

@@ -5354,10 +5354,13 @@
           </div>`);
                     // 存储原来的值
                     Reflect.set($fileName, "__value__", folderData);
-                    Reflect.set($folder, "folderData", folderData);
+                    Reflect.set($folder, "__value__", folderData);
                     $folder.appendChild($fileName);
                     return {
                         folderElement: $folder,
+                        /**
+                         * 超链接标签的容器
+                         */
                         fileNameElement: $fileName,
                     };
                 }
@@ -5446,8 +5449,17 @@
                         },
                         addIndexCSS: false,
                     });
+                    let childConfig;
                     if (typeof dataConfig.clickEvent === "function") {
-                        const childConfig = await dataConfig.clickEvent(clickEvent, dataConfig);
+                        const result = await dataConfig.clickEvent(clickEvent, dataConfig);
+                        if (Array.isArray(result)) {
+                            childConfig = result;
+                        }
+                    }
+                    else if (Array.isArray(dataConfig.clickEvent)) {
+                        childConfig = dataConfig.clickEvent;
+                    }
+                    if (childConfig) {
                         // 添加顶部导航的箭头
                         folderFileListBreadcrumbPrimaryElement.appendChild(this.createHeaderArrowIcon());
                         // 添加顶部导航的链接文字
@@ -5461,50 +5473,65 @@
                     }
                     loadingMask.close();
                 }
+                /**
+                 * 更新文件的显示的链接信息
+                 *
+                 * 这里主要用于鼠标中键或者右键触发，左键触发方式会根据mode进行处理
+                 * @returns 更新的文件的下载链接
+                 */
+                updateFileLink($row, downloadInfo) {
+                    const downloadUrl = typeof downloadInfo?.url === "string" ? downloadInfo.url.trim() : "";
+                    if (downloadUrl !== "" && downloadUrl !== "null" && downloadUrl !== "undefined") {
+                        const $link = $row.querySelector("a");
+                        $link.setAttribute("href", downloadUrl);
+                        return downloadUrl;
+                    }
+                }
                 /**
                  * 文件的点击事件 - 下载文件
-                 * @param $target
+                 * @param evt 点击事件
+                 * @param $row 列表项
                  * @param dataConfig
                  */
-                async downloadFile(clickEvent, $row, dataConfig) {
-                    popsDOMUtils.preventEvent(clickEvent);
-                    const $link = $row.querySelector("a");
+                async onFileClick(evt, $row, dataConfig) {
+                    let downloadInfo;
                     if (typeof dataConfig.clickEvent === "function") {
-                        const downloadInfo = await dataConfig.clickEvent(clickEvent, dataConfig);
-                        if (downloadInfo != null &&
-                            typeof downloadInfo === "object" &&
-                            !Array.isArray(downloadInfo) &&
-                            typeof downloadInfo.url === "string" &&
-                            downloadInfo.url.trim() !== "") {
-                            $link.setAttribute("href", downloadInfo.url);
-                            $link.setAttribute("target", "_blank");
-                            if (downloadInfo.autoDownload) {
-                                if (downloadInfo.mode == null || String(downloadInfo.mode) === "") {
-                                    // 未设置mode的话默认为aBlank
-                                    downloadInfo.mode = "aBlank";
-                                }
+                        const result = await dataConfig.clickEvent(evt, dataConfig);
+                        if (typeof result === "object" && result != null && !Array.isArray(result)) {
+                            downloadInfo = result;
+                        }
+                    }
+                    else if (typeof dataConfig.clickEvent === "object" &&
+                        dataConfig.clickEvent != null &&
+                        !Array.isArray(dataConfig.clickEvent)) {
+                        downloadInfo = dataConfig.clickEvent;
+                    }
+                    if (downloadInfo) {
+                        const downloadUrl = this.updateFileLink($row, downloadInfo);
+                        if (downloadUrl) {
+                            if (typeof downloadInfo.mode === "string") {
                                 if (downloadInfo.mode === "a" || downloadInfo.mode === "aBlank") {
                                     // a标签下载
                                     const $anchor = popsDOMUtils.createElement("a");
                                     if (downloadInfo.mode === "aBlank") {
                                         $anchor.setAttribute("target", "_blank");
                                     }
-                                    $anchor.href = downloadInfo.url;
+                                    $anchor.href = downloadUrl;
                                     $anchor.click();
                                 }
                                 else if (downloadInfo.mode === "open" || downloadInfo.mode === "openBlank") {
                                     // window.open下载
                                     if (downloadInfo.mode === "openBlank") {
-                                        globalThis.open(downloadInfo.url, "_blank");
+                                        globalThis.open(downloadUrl, "_blank");
                                     }
                                     else {
-                                        globalThis.open(downloadInfo.url);
+                                        globalThis.open(downloadUrl);
                                     }
                                 }
                                 else if (downloadInfo.mode === "iframe") {
                                     // iframe下载
                                     const $downloadIframe = popsDOMUtils.createElement("iframe");
-                                    $downloadIframe.src = downloadInfo.url;
+                                    $downloadIframe.src = downloadUrl;
                                     $downloadIframe.onload = function () {
                                         popsUtils.setTimeout(() => {
                                             $downloadIframe.remove();
@@ -5686,8 +5713,14 @@
                             // 文件 - 点击事件
                             popsDOMUtils.on(fileNameElement, "click", (event) => {
                                 // 下载文件
-                                this.downloadFile(event, fileNameElement, item);
+                                popsDOMUtils.preventEvent(event);
+                                this.onFileClick(event, fileNameElement, item);
                             });
+                            // 如果clickEvent不是函数，那么现在就可以进行配置
+                            if (typeof item.clickEvent === "object" && item.clickEvent !== null && !Array.isArray(item.clickEvent)) {
+                                // {} 单文件配置
+                                this.updateFileLink(fileNameElement, item.clickEvent);
+                            }
                             folderListBodyElement.appendChild(folderElement);
                         }
                     });
@@ -13372,7 +13405,7 @@
         },
     };
 
-    const version = "3.3.3";
+    const version = "3.3.4";
 
     class Pops {
         /** 配置 */