@whitesev/pops 3.3.2 → 3.3.4

package/dist/types/src/Pops.d.ts

@@ -85,12 +85,13 @@ declare class Pops {
         };
         /** 禁止滚动 */
         forbiddenScroll: {
-            event(event: Event): boolean;
+            event(event: Event): false;
         };
         /** pops使用的工具类 */
         Utils: {
             isWin(target: any): boolean;
             isDOM(target: any): boolean;
+            isNodeList($ele: any): $ele is any[] | NodeList;
             delete(target: any, propName: any): void;
             assign<T1, T2 extends object, T3 extends boolean>(target: T1, source: T2, isAdd?: T3 | undefined): T3 extends true ? T1 & T2 : T1;
             getRandomGUID(): string;
@@ -172,15 +173,27 @@ declare class Pops {
             onReady<T extends (...args: any[]) => any>(callback: T): void;
             emit(element: HTMLElement | string | NodeList | any[] | Window | Document, eventType: string | string[], details?: object, useDispatchToEmitEvent?: boolean): void;
             emit(element: HTMLElement | string | NodeList | any[] | Window | Document, eventType: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_EventType | import("./types/PopsDOMUtilsEventType").PopsDOMUtils_EventType[], details?: object, useDispatchToEmitEvent?: boolean): void;
-            click(element: HTMLElement | string | Window, handler?: (event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["click"]) => void, details?: any, useDispatchToEmitEvent?: boolean): void;
-            blur(element: HTMLElement | string | Window, handler?: (event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["blur"]) => void, details?: object, useDispatchToEmitEvent?: boolean): void;
-            focus(element: HTMLElement | string | Window, handler?: (event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["focus"]) => void, details?: object, useDispatchToEmitEvent?: boolean): void;
-            onHover(element: HTMLElement | string, handler: (event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["hover"]) => void, option?: boolean | AddEventListenerOptions): void;
-            onKeyup(target: HTMLElement | string | Window | typeof globalThis, handler: (event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["keyup"]) => void, option?: boolean | AddEventListenerOptions): void;
-            onKeydown(target: HTMLElement | Window | typeof globalThis | string, handler: (event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["keydown"]) => void, option?: boolean | AddEventListenerOptions): void;
-            onKeypress(target: HTMLElement | Window | typeof globalThis | string, handler: (event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["keypress"]) => void, option?: boolean | AddEventListenerOptions): void;
-            preventEvent(event: Event): boolean;
-            preventEvent(element: HTMLElement, eventNameList?: string | string[], capture?: boolean): boolean;
+            click(element: HTMLElement | string | Window, handler?: (event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["click"]) => void, details?: any, useDispatchToEmitEvent?: boolean): import("./types/PopsDOMUtilsEventType").PopsDOMUtilsAddEventListenerResult | undefined;
+            blur(element: HTMLElement | string | Window, handler?: (event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["blur"]) => void, details?: object, useDispatchToEmitEvent?: boolean): import("./types/PopsDOMUtilsEventType").PopsDOMUtilsAddEventListenerResult | undefined;
+            focus(element: HTMLElement | string | Window, handler?: (event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["focus"]) => void, details?: object, useDispatchToEmitEvent?: boolean): import("./types/PopsDOMUtilsEventType").PopsDOMUtilsAddEventListenerResult | undefined;
+            onHover(element: import("./types/PopsDOMUtilsEventType").PopsDOMUtilsTargetElementType | Element | DocumentFragment | Node, handler: (this: HTMLElement, event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["hover"]) => void, option?: boolean | import("./types/PopsDOMUtilsEventType").PopsDOMUtilsEventListenerOption): import("./types/PopsDOMUtilsEventType").PopsDOMUtilsAddEventListenerResult | undefined;
+            onKeyup(target: HTMLElement | string | Window | typeof globalThis, handler: (event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["keyup"]) => void, option?: boolean | AddEventListenerOptions): import("./types/PopsDOMUtilsEventType").PopsDOMUtilsAddEventListenerResult | undefined;
+            onKeydown(target: HTMLElement | Window | typeof globalThis | string, handler: (event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["keydown"]) => void, option?: boolean | AddEventListenerOptions): import("./types/PopsDOMUtilsEventType").PopsDOMUtilsAddEventListenerResult | undefined;
+            onKeypress(target: HTMLElement | Window | typeof globalThis | string, handler: (event: import("./types/PopsDOMUtilsEventType").PopsDOMUtils_Event["keypress"]) => void, option?: boolean | AddEventListenerOptions): import("./types/PopsDOMUtilsEventType").PopsDOMUtilsAddEventListenerResult | undefined;
+            preventEvent(event: Event): false;
+            preventEvent<T extends boolean>(event: Event, onlyStopPropagation: T): T extends true ? void : false;
+            preventEvent($el: HTMLElement, eventNameList: string | string[], option?: {
+                capture?: boolean;
+                onlyStopPropagation?: boolean;
+            }): {
+                off(): void;
+            };
+            preventEvent($el: HTMLElement, eventNameList: string | string[], selector: string | string[] | null | undefined, option?: {
+                capture?: boolean;
+                onlyStopPropagation?: boolean;
+            }): {
+                off(): void;
+            };
             selector<K extends keyof HTMLElementTagNameMap>(selector: K): HTMLElementTagNameMap[K] | undefined;
             selector<E extends Element = Element>(selector: string): E | undefined;
             selectorAll<K extends keyof HTMLElementTagNameMap>(selector: K): HTMLElementTagNameMap[K][];

package/dist/types/src/components/folder/types/index.d.ts

@@ -4,18 +4,7 @@ import type { PopsTitleConfig, PopsDragConfig, PopsGeneralConfig, PopsMoreButton
  */
 export type PopsFolderDownloadOption = {
     /**
-     * 是否点击后自动触发下载
-     *
-     * + `true`: 自动根据设置的`mode`值来选择下载方式
-     * + `false`: 不触发下载
-     */
-    autoDownload: boolean;
-    /**
-     * 触发下载后会根据提供的url链接进行下载
-     */
-    url: string;
-    /**
-     * 下载方式
+     * 下载方式，不传入就不下载（不做任何处理）
      *
      * + `a`: 使用`a标签`进行下载
      * + `aBlank`: 使用`a标签`进行下载（添加属性`target="_blank"`）
@@ -26,6 +15,10 @@ export type PopsFolderDownloadOption = {
      * @default "aBlank"
      */
     mode?: "a" | "aBlank" | "iframe" | "open" | "openBlank";
+    /**
+     * 触发下载后会根据提供的url链接进行下载
+     */
+    url: string;
 };
 /**
  * pops.folder的folder配置信息
@@ -85,14 +78,22 @@ export interface PopsFolderDataConfig {
      * 层级
      */
     index: number;
+    /**
+     * 列表项的点击事件回调
+     *
+     * 如果是配置项，则自动根据配置项来创建下载事件，也可以自定义函数
+     *
+     * 如果是自定义函数的话，根据返回值来判断，如果为空则什么都不做
+     */
+    clickEvent?: ((
     /**
      * 点击事件
      */
-    clickEvent?: (event: MouseEvent | PointerEvent, 
+    event: MouseEvent | PointerEvent, 
     /**
      * 当前层级的文件|文件夹信息配置
      */
-    config: PopsFolderDataConfig) => IPromise<PopsFolderDownloadOption | PopsFolderDataConfig[] | null | undefined | void>;
+    config: PopsFolderDataConfig) => IPromise<PopsFolderDownloadOption | PopsFolderDataConfig[] | null | undefined | void>) | PopsFolderDownloadOption | PopsFolderDataConfig[] | null | undefined | void;
 }
 /**
  * pops.folder

package/dist/types/src/utils/PopsDOMUtils.d.ts

@@ -211,7 +211,7 @@ declare class PopsDOMUtilsEvent {
      *  console.log("触发click事件成功")
      * })
      * */
-    click(element: HTMLElement | string | Window, handler?: (event: PopsDOMUtils_Event["click"]) => void, details?: any, useDispatchToEmitEvent?: boolean): void;
+    click(element: HTMLElement | string | Window, handler?: (event: PopsDOMUtils_Event["click"]) => void, details?: any, useDispatchToEmitEvent?: boolean): PopsDOMUtilsAddEventListenerResult | undefined;
     /**
      * 绑定或触发元素的blur事件
      * @param element 目标元素
@@ -226,7 +226,7 @@ declare class PopsDOMUtilsEvent {
      *  console.log("触发blur事件成功")
      * })
      * */
-    blur(element: HTMLElement | string | Window, handler?: (event: PopsDOMUtils_Event["blur"]) => void, details?: object, useDispatchToEmitEvent?: boolean): void;
+    blur(element: HTMLElement | string | Window, handler?: (event: PopsDOMUtils_Event["blur"]) => void, details?: object, useDispatchToEmitEvent?: boolean): PopsDOMUtilsAddEventListenerResult | undefined;
     /**
      * 绑定或触发元素的focus事件
      * @param element 目标元素
@@ -241,7 +241,7 @@ declare class PopsDOMUtilsEvent {
      *  console.log("触发focus事件成功")
      * })
      * */
-    focus(element: HTMLElement | string | Window, handler?: (event: PopsDOMUtils_Event["focus"]) => void, details?: object, useDispatchToEmitEvent?: boolean): void;
+    focus(element: HTMLElement | string | Window, handler?: (event: PopsDOMUtils_Event["focus"]) => void, details?: object, useDispatchToEmitEvent?: boolean): PopsDOMUtilsAddEventListenerResult | undefined;
     /**
      * 当鼠标移入或移出元素时触发事件
      * @param element 当前元素
@@ -256,7 +256,7 @@ declare class PopsDOMUtilsEvent {
      *   console.log("移入/移除");
      * })
      */
-    onHover(element: HTMLElement | string, handler: (event: PopsDOMUtils_Event["hover"]) => void, option?: boolean | AddEventListenerOptions): void;
+    onHover(element: PopsDOMUtilsTargetElementType | Element | DocumentFragment | Node, handler: (this: HTMLElement, event: PopsDOMUtils_Event["hover"]) => void, option?: boolean | PopsDOMUtilsEventListenerOption): PopsDOMUtilsAddEventListenerResult | undefined;
     /**
      * 当按键松开时触发事件
      * keydown - > keypress - > keyup
@@ -272,7 +272,7 @@ declare class PopsDOMUtilsEvent {
      *   console.log("按键松开");
      * })
      */
-    onKeyup(target: HTMLElement | string | Window | typeof globalThis, handler: (event: PopsDOMUtils_Event["keyup"]) => void, option?: boolean | AddEventListenerOptions): void;
+    onKeyup(target: HTMLElement | string | Window | typeof globalThis, handler: (event: PopsDOMUtils_Event["keyup"]) => void, option?: boolean | AddEventListenerOptions): PopsDOMUtilsAddEventListenerResult | undefined;
     /**
      * 当按键按下时触发事件
      * keydown - > keypress - > keyup
@@ -288,7 +288,7 @@ declare class PopsDOMUtilsEvent {
      *   console.log("按键按下");
      * })
      */
-    onKeydown(target: HTMLElement | Window | typeof globalThis | string, handler: (event: PopsDOMUtils_Event["keydown"]) => void, option?: boolean | AddEventListenerOptions): void;
+    onKeydown(target: HTMLElement | Window | typeof globalThis | string, handler: (event: PopsDOMUtils_Event["keydown"]) => void, option?: boolean | AddEventListenerOptions): PopsDOMUtilsAddEventListenerResult | undefined;
     /**
      * 当按键按下时触发事件
      * keydown - > keypress - > keyup
@@ -304,29 +304,79 @@ declare class PopsDOMUtilsEvent {
      *   console.log("按键按下");
      * })
      */
-    onKeypress(target: HTMLElement | Window | typeof globalThis | string, handler: (event: PopsDOMUtils_Event["keypress"]) => void, option?: boolean | AddEventListenerOptions): void;
+    onKeypress(target: HTMLElement | Window | typeof globalThis | string, handler: (event: PopsDOMUtils_Event["keypress"]) => void, option?: boolean | AddEventListenerOptions): PopsDOMUtilsAddEventListenerResult | undefined;
     /**
      * 阻止事件传递
-     * @param element 要进行处理的元素
-     * @param eventNameList （可选）要阻止的事件名|列表
-     * @param capture （可选）是否捕获，默认false
-     * @example
-     * Utils.preventEvent(document.querySelector("a"),"click")
+     *
+     * + `.preventDefault()`: 阻止事件的默认行为发生。例如，当点击一个链接时，浏览器会默认打开链接的URL，或者在输入框内输入文字
+     * + `.stopPropagation()`: 停止事件的传播，阻止它继续向更上层的元素冒泡，事件将不会再传播给其他的元素
+     * + `.stopImmediatePropagation()`: 阻止事件传播，并且还能阻止元素上的其他事件处理程序被触发
+     * @param event 要阻止传递的事件
      * @example
-     * Utils.preventEvent(event);
+     * DOMUtils.preventEvent(event);
      */
-    preventEvent(event: Event): boolean;
+    preventEvent(event: Event): false;
     /**
      * 阻止事件传递
-     * @param element 要进行处理的元素
-     * @param eventNameList （可选）要阻止的事件名|列表
-     * @param capture （可选）是否捕获，默认false
+     * @param event 要阻止传递的事件
+     * @param onlyStopPropagation （可选）是否仅阻止事件的传播，默认false，不调用`.preventDefault()`
+     * @example
+     * DOMUtils.preventEvent(event, true);
+     */
+    preventEvent<T extends boolean>(event: Event, onlyStopPropagation: T): T extends true ? void : false;
+    /**
+     * 通过监听事件来主动阻止事件的传递
+     * @param $el 要进行处理的元素
+     * @param eventNameList 要阻止的事件名|列表
+     * @param option （可选）配置项
+     * @example
+     * DOMUtils.preventEvent(document.querySelector("a"), "click")
+     * @example
+     * DOMUtils.preventEvent(document.querySelector("a"), "click", undefined, {
+     *   capture: true,
+     * })
+     * @example
+     * DOMUtils.preventEvent(document, "click", "a.xxx", {
+     *   capture: true,
+     *   onlyStopPropagation: true,
+     * })
+     */
+    preventEvent($el: HTMLElement, eventNameList: string | string[], option?: {
+        /** （可选）是否捕获，默认false */
+        capture?: boolean;
+        /** （可选）是否仅阻止事件的传播，默认false，不调用`.preventDefault()` */
+        onlyStopPropagation?: boolean;
+    }): {
+        /** 移除监听事件 */
+        off(): void;
+    };
+    /**
+     * 通过监听事件来主动阻止事件的传递
+     * @param $el 要进行处理的元素
+     * @param eventNameList 要阻止的事件名|列表
+     * @param selector 子元素选择器
+     * @param option （可选）配置项
      * @example
-     * Utils.preventEvent(document.querySelector("a"),"click")
+     * DOMUtils.preventEvent(document.querySelector("a"), "click")
      * @example
-     * Utils.preventEvent(event);
+     * DOMUtils.preventEvent(document.querySelector("a"), "click", undefined, {
+     *   capture: true,
+     * })
+     * @example
+     * DOMUtils.preventEvent(document, "click", "a.xxx", {
+     *   capture: true,
+     *   onlyStopPropagation: true,
+     * })
      */
-    preventEvent(element: HTMLElement, eventNameList?: string | string[], capture?: boolean): boolean;
+    preventEvent($el: HTMLElement, eventNameList: string | string[], selector: string | string[] | null | undefined, option?: {
+        /** （可选）是否捕获，默认false */
+        capture?: boolean;
+        /** （可选）是否仅阻止事件的传播，默认false，不调用`.preventDefault()` */
+        onlyStopPropagation?: boolean;
+    }): {
+        /** 移除监听事件 */
+        off(): void;
+    };
     /**
      * 选择器，可使用以下的额外语法
      *
@@ -662,7 +712,7 @@ declare class PopsDOMUtils extends PopsDOMUtilsEvent {
      * @param content 子元素或HTML字符串
      * @example
      * // 元素a.xx的内部末尾添加一个元素
-     * DOMUtils.append(document.querySelector("a.xx"),document.querySelector("b.xx"))
+     * DOMUtils.append(document.querySelector("a.xx"), document.querySelector("b.xx"))
      * DOMUtils.append("a.xx","'<b class="xx"></b>")
      * */
     append(element: Element | Node | ShadowRoot | HTMLElement | string, content: HTMLElement | string | (HTMLElement | string | Element)[] | NodeList): void;

package/dist/types/src/utils/PopsUtils.d.ts

@@ -17,6 +17,11 @@ declare class PopsUtils {
      * > true
      */
     isDOM(target: any): boolean;
+    /**
+     * 判断是否是元素列表
+     * @param $ele
+     */
+    isNodeList($ele: any): $ele is any[] | NodeList;
     /**
      * 删除对象上的属性
      * @param target

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitesev/pops",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "弹窗库，包含了alert、confirm、prompt、drawer、folder、loading、iframe、panel、tooltip、searchSuggestion、rightClickMenu组件",
   "keywords": [
     "ScriptCat",

package/src/components/folder/index.ts

@@ -10,7 +10,7 @@ import { popsUtils } from "../../utils/PopsUtils";
 import { PopsLoading } from "../loading";
 import { PopsFolderDefaultConfig } from "./defaultConfig";
 import { Folder_ICON } from "./folderIcon";
-import type { PopsFolderDataConfig, PopsFolderConfig, PopsFolderDownloadOption } from "./types";
+import type { PopsFolderConfig, PopsFolderDataConfig, PopsFolderDownloadOption } from "./types";
 
 export const PopsFolder = {
   init(__config__: PopsFolderConfig) {
@@ -517,10 +517,13 @@ export const PopsFolder = {
         );
         // 存储原来的值
         Reflect.set($fileName, "__value__", folderData);
-        Reflect.set($folder, "folderData", folderData);
+        Reflect.set($folder, "__value__", folderData);
         $folder.appendChild($fileName);
         return {
           folderElement: $folder,
+          /**
+           * 超链接标签的容器
+           */
           fileNameElement: $fileName,
         };
       }
@@ -619,8 +622,16 @@ export const PopsFolder = {
           },
           addIndexCSS: false,
         });
+        let childConfig: PopsFolderDataConfig[] | undefined;
         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());
           // 添加顶部导航的链接文字
@@ -637,54 +648,63 @@ export const PopsFolder = {
         }
         loadingMask.close();
       }
+      /**
+       * 更新文件的显示的链接信息
+       *
+       * 这里主要用于鼠标中键或者右键触发，左键触发方式会根据mode进行处理
+       * @returns 更新的文件的下载链接
+       */
+      updateFileLink($row: HTMLElement, downloadInfo: PopsFolderDownloadOption) {
+        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: MouseEvent | PointerEvent, $row: HTMLElement, dataConfig: PopsFolderDataConfig) {
-        popsDOMUtils.preventEvent(clickEvent);
-
-        const $link = $row.querySelector("a")!;
+      async onFileClick(evt: MouseEvent | PointerEvent, $row: HTMLElement, dataConfig: PopsFolderDataConfig) {
+        let downloadInfo: PopsFolderDownloadOption | undefined;
         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();
@@ -860,9 +880,14 @@ export const PopsFolder = {
             // 文件 - 点击事件
             popsDOMUtils.on<MouseEvent | PointerEvent>(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);
           }
         });

package/src/components/folder/types/index.ts

@@ -10,18 +10,7 @@ import type {
  */
 export type PopsFolderDownloadOption = {
   /**
-   * 是否点击后自动触发下载
-   *
-   * + `true`: 自动根据设置的`mode`值来选择下载方式
-   * + `false`: 不触发下载
-   */
-  autoDownload: boolean;
-  /**
-   * 触发下载后会根据提供的url链接进行下载
-   */
-  url: string;
-  /**
-   * 下载方式
+   * 下载方式，不传入就不下载（不做任何处理）
    *
    * + `a`: 使用`a标签`进行下载
    * + `aBlank`: 使用`a标签`进行下载（添加属性`target="_blank"`）
@@ -32,6 +21,10 @@ export type PopsFolderDownloadOption = {
    * @default "aBlank"
    */
   mode?: "a" | "aBlank" | "iframe" | "open" | "openBlank";
+  /**
+   * 触发下载后会根据提供的url链接进行下载
+   */
+  url: string;
 };
 /**
  * pops.folder的folder配置信息
@@ -96,15 +89,28 @@ export interface PopsFolderDataConfig {
    */
   index: number;
   /**
-   * 点击事件
+   * 列表项的点击事件回调
+   *
+   * 如果是配置项，则自动根据配置项来创建下载事件，也可以自定义函数
+   *
+   * 如果是自定义函数的话，根据返回值来判断，如果为空则什么都不做
    */
-  clickEvent?: (
-    event: MouseEvent | PointerEvent,
-    /**
-     * 当前层级的文件|文件夹信息配置
-     */
-    config: PopsFolderDataConfig
-  ) => IPromise<PopsFolderDownloadOption | PopsFolderDataConfig[] | null | undefined | void>;
+  clickEvent?:
+    | ((
+        /**
+         * 点击事件
+         */
+        event: MouseEvent | PointerEvent,
+        /**
+         * 当前层级的文件|文件夹信息配置
+         */
+        config: PopsFolderDataConfig
+      ) => IPromise<PopsFolderDownloadOption | PopsFolderDataConfig[] | null | undefined | void>)
+    | PopsFolderDownloadOption
+    | PopsFolderDataConfig[]
+    | null
+    | undefined
+    | void;
 }
 
 /**

package/src/components/iframe/index.ts

@@ -1,15 +1,14 @@
-import { PopsCore } from "../../PopsCore";
 import { GlobalConfig } from "../../config/GlobalConfig";
 import { PopsElementHandler } from "../../handler/PopsElementHandler";
 import { PopsHandler } from "../../handler/PopsHandler";
 import { PopsCSS } from "../../PopsCSS";
 import { PopsInstData } from "../../PopsInst";
+import type { PopsType } from "../../types/main";
 import { popsDOMUtils } from "../../utils/PopsDOMUtils";
 import { PopsInstanceUtils } from "../../utils/PopsInstanceUtils";
 import { popsUtils } from "../../utils/PopsUtils";
 import { PopsIframeDefaultConfig } from "./defaultConfig";
 import type { PopsIframeClickEventConfig, PopsIframeConfig } from "./types";
-import type { PopsType } from "../../types/main";
 
 export const PopsIframe = {
   init(__config__: PopsIframeConfig) {
@@ -102,7 +101,7 @@ export const PopsIframe = {
       $headerBtnMax: headerMaxBtnElement,
       $headerBtnMise: headerMiseBtnElement,
     } = PopsHandler.handleQueryElement($anim, popsType);
-    let $iframeContainer = PopsCore.document.querySelector<HTMLDivElement>(".pops-iframe-container");
+    let $iframeContainer = popsDOMUtils.selector<HTMLDivElement>(".pops-iframe-container");
     if (!$iframeContainer) {
       $iframeContainer = popsDOMUtils.createElement("div", {
         className: "pops-iframe-container",