@whitesev/pops 3.3.2 → 3.3.4

package/dist/index.system.js

@@ -296,6 +296,13 @@ System.register('pops', [], (function (exports) {
                 isDOM(target) {
                     return target instanceof Node;
                 }
+                /**
+                 * 判断是否是元素列表
+                 * @param $ele
+                 */
+                isNodeList($ele) {
+                    return Array.isArray($ele) || $ele instanceof NodeList;
+                }
                 /**
                  * 删除对象上的属性
                  * @param target
@@ -1028,7 +1035,7 @@ System.register('pops', [], (function (exports) {
                  */
                 emit(element, eventType, details, useDispatchToEmitEvent = true) {
                     if (typeof element === "string") {
-                        element = PopsCore.document.querySelector(element);
+                        element = this.selector(element);
                     }
                     if (element == null) {
                         return;
@@ -1090,18 +1097,18 @@ System.register('pops', [], (function (exports) {
                  * })
                  * */
                 click(element, handler, details, useDispatchToEmitEvent) {
-                    const DOMUtilsContext = this;
                     if (typeof element === "string") {
-                        element = PopsCore.document.querySelector(element);
+                        element = this.selector(element);
                     }
                     if (element == null) {
                         return;
                     }
                     if (handler == null) {
-                        DOMUtilsContext.emit(element, "click", details, useDispatchToEmitEvent);
+                        this.emit(element, "click", details, useDispatchToEmitEvent);
                     }
                     else {
-                        DOMUtilsContext.on(element, "click", null, handler);
+                        const listener = this.on(element, "click", handler);
+                        return listener;
                     }
                 }
                 /**
@@ -1119,18 +1126,18 @@ System.register('pops', [], (function (exports) {
                  * })
                  * */
                 blur(element, handler, details, useDispatchToEmitEvent) {
-                    const DOMUtilsContext = this;
                     if (typeof element === "string") {
-                        element = PopsCore.document.querySelector(element);
+                        element = this.selector(element);
                     }
                     if (element == null) {
                         return;
                     }
                     if (handler === null) {
-                        DOMUtilsContext.emit(element, "blur", details, useDispatchToEmitEvent);
+                        this.emit(element, "blur", details, useDispatchToEmitEvent);
                     }
                     else {
-                        DOMUtilsContext.on(element, "blur", null, handler);
+                        const listener = this.on(element, "blur", handler);
+                        return listener;
                     }
                 }
                 /**
@@ -1148,18 +1155,18 @@ System.register('pops', [], (function (exports) {
                  * })
                  * */
                 focus(element, handler, details, useDispatchToEmitEvent) {
-                    const DOMUtilsContext = this;
                     if (typeof element === "string") {
-                        element = PopsCore.document.querySelector(element);
+                        element = this.selector(element);
                     }
                     if (element == null) {
                         return;
                     }
                     if (handler == null) {
-                        DOMUtilsContext.emit(element, "focus", details, useDispatchToEmitEvent);
+                        this.emit(element, "focus", details, useDispatchToEmitEvent);
                     }
                     else {
-                        DOMUtilsContext.on(element, "focus", null, handler);
+                        const listener = this.on(element, "focus", handler);
+                        return listener;
                     }
                 }
                 /**
@@ -1177,15 +1184,39 @@ System.register('pops', [], (function (exports) {
                  * })
                  */
                 onHover(element, handler, option) {
-                    const DOMUtilsContext = this;
+                    const that = this;
                     if (typeof element === "string") {
-                        element = PopsCore.document.querySelector(element);
+                        element = that.selectorAll(element);
                     }
                     if (element == null) {
                         return;
                     }
-                    DOMUtilsContext.on(element, "mouseenter", null, handler, option);
-                    DOMUtilsContext.on(element, "mouseleave", null, handler, option);
+                    if (popsUtils.isNodeList(element)) {
+                        // 设置
+                        const listenerList = [];
+                        element.forEach(($ele) => {
+                            const listener = that.onHover($ele, handler, option);
+                            listenerList.push(listener);
+                        });
+                        return {
+                            off() {
+                                listenerList.forEach((listener) => {
+                                    if (!listener) {
+                                        return;
+                                    }
+                                    listener.off();
+                                });
+                            },
+                        };
+                    }
+                    const mouseenter_listener = that.on(element, "mouseenter", null, handler, option);
+                    const mouseleave_listener = that.on(element, "mouseleave", null, handler, option);
+                    return {
+                        off() {
+                            mouseenter_listener.off();
+                            mouseleave_listener.off();
+                        },
+                    };
                 }
                 /**
                  * 当按键松开时触发事件
@@ -1203,14 +1234,14 @@ System.register('pops', [], (function (exports) {
                  * })
                  */
                 onKeyup(target, handler, option) {
-                    const DOMUtilsContext = this;
                     if (target == null) {
                         return;
                     }
                     if (typeof target === "string") {
-                        target = PopsCore.document.querySelector(target);
+                        target = this.selector(target);
                     }
-                    DOMUtilsContext.on(target, "keyup", null, handler, option);
+                    const listener = this.on(target, "keyup", handler, option);
+                    return listener;
                 }
                 /**
                  * 当按键按下时触发事件
@@ -1228,14 +1259,14 @@ System.register('pops', [], (function (exports) {
                  * })
                  */
                 onKeydown(target, handler, option) {
-                    const DOMUtilsContext = this;
                     if (target == null) {
                         return;
                     }
                     if (typeof target === "string") {
-                        target = PopsCore.document.querySelector(target);
+                        target = this.selector(target);
                     }
-                    DOMUtilsContext.on(target, "keydown", null, handler, option);
+                    const listener = this.on(target, "keydown", handler, option);
+                    return listener;
                 }
                 /**
                  * 当按键按下时触发事件
@@ -1253,38 +1284,69 @@ System.register('pops', [], (function (exports) {
                  * })
                  */
                 onKeypress(target, handler, option) {
-                    const DOMUtilsContext = this;
                     if (target == null) {
                         return;
                     }
                     if (typeof target === "string") {
-                        target = PopsCore.document.querySelector(target);
+                        target = this.selector(target);
                     }
-                    DOMUtilsContext.on(target, "keypress", null, handler, option);
+                    const listener = this.on(target, "keypress", handler, option);
+                    return listener;
                 }
-                preventEvent(element, eventNameList = [], capture) {
-                    function stopEvent(event) {
-                        // 阻止事件的默认行为发生。例如，当点击一个链接时，浏览器会默认打开链接的URL
+                preventEvent(...args) {
+                    /**
+                     * 阻止事件的默认行为发生，并阻止事件传播
+                     */
+                    const stopEvent = (event, onlyStopPropagation) => {
+                        if (typeof onlyStopPropagation === "boolean" && onlyStopPropagation) {
+                            // 停止事件的传播，阻止它继续向更上层的元素冒泡，事件将不会再传播给其他的元素
+                            event?.stopPropagation();
+                            // 阻止事件传播，并且还能阻止元素上的其他事件处理程序被触发
+                            event?.stopImmediatePropagation();
+                            return;
+                        }
+                        // 阻止事件的默认行为发生。例如，当点击一个链接时，浏览器会默认打开链接的URL，或者在输入框内输入文字
                         event?.preventDefault();
-                        // 停止事件的传播，阻止它继续向更上层的元素冒泡，事件将不会再传播给其他的元素
-                        event?.stopPropagation();
-                        // 阻止事件传播，并且还能阻止元素上的其他事件处理程序被触发
-                        event?.stopImmediatePropagation();
                         return false;
-                    }
-                    if (arguments.length === 1) {
+                    };
+                    if (args[0] instanceof Event) {
                         // 直接阻止事件
-                        // eslint-disable-next-line prefer-rest-params
-                        return stopEvent(arguments[0]);
+                        const onlyStopPropagation = args[1];
+                        return stopEvent(args[0], onlyStopPropagation);
                     }
                     else {
+                        const $el = args[0];
+                        let eventNameList = args[1];
+                        let selector = void 0;
+                        let capture = false;
+                        let onlyStopPropagation = false;
                         // 添加对应的事件来阻止触发
                         if (typeof eventNameList === "string") {
                             eventNameList = [eventNameList];
                         }
-                        eventNameList.forEach((eventName) => {
-                            this.on(element, eventName, stopEvent, { capture: Boolean(capture) });
-                        });
+                        let option = void 0;
+                        if (typeof args[2] === "string" || Array.isArray(args[2])) {
+                            // selector
+                            selector = args[2];
+                            if (typeof args[3] === "object" && args[3] != null) {
+                                option = args[3];
+                            }
+                        }
+                        else if (typeof args[2] === "object" && args[2] != null && !Array.isArray(args[2])) {
+                            // option
+                            option = args[2];
+                        }
+                        else {
+                            throw new TypeError("Invalid argument");
+                        }
+                        if (option) {
+                            capture = Boolean(option.capture);
+                            onlyStopPropagation = Boolean(option.onlyStopPropagation);
+                        }
+                        const listener = this.on($el, eventNameList, selector, (evt) => {
+                            return stopEvent(evt, onlyStopPropagation);
+                        }, { capture: capture });
+                        return listener;
                     }
                 }
                 selector(selector) {
@@ -1470,7 +1532,7 @@ System.register('pops', [], (function (exports) {
                 width(element, isShow = false, parent) {
                     const DOMUtilsContext = this;
                     if (typeof element === "string") {
-                        element = PopsCore.document.querySelector(element);
+                        element = this.selector(element);
                     }
                     if (element == null) {
                         return;
@@ -1521,7 +1583,7 @@ System.register('pops', [], (function (exports) {
                         return PopsCore.window.document.documentElement.clientHeight;
                     }
                     if (typeof element === "string") {
-                        element = PopsCore.document.querySelector(element);
+                        element = this.selector(element);
                     }
                     if (element == null) {
                         return;
@@ -1569,7 +1631,7 @@ System.register('pops', [], (function (exports) {
                         return PopsCore.window.innerWidth;
                     }
                     if (typeof element === "string") {
-                        element = PopsCore.document.querySelector(element);
+                        element = this.selector(element);
                     }
                     if (element == null) {
                         return;
@@ -1594,7 +1656,7 @@ System.register('pops', [], (function (exports) {
                         return PopsCore.window.innerHeight;
                     }
                     if (typeof element === "string") {
-                        element = PopsCore.document.querySelector(element);
+                        element = this.selector(element);
                     }
                     element = element;
                     if (isShow || (!isShow && popsDOMUtils.isShow(element))) {
@@ -2016,12 +2078,12 @@ System.register('pops', [], (function (exports) {
                  * @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, content) {
                     if (typeof element === "string") {
-                        element = PopsCore.document.querySelector(element);
+                        element = this.selector(element);
                     }
                     if (element == null) {
                         return;
@@ -2157,7 +2219,7 @@ System.register('pops', [], (function (exports) {
                  * */
                 before(element, content) {
                     if (typeof element === "string") {
-                        element = PopsCore.document.querySelector(element);
+                        element = this.selector(element);
                     }
                     if (element == null) {
                         return;
@@ -2180,7 +2242,7 @@ System.register('pops', [], (function (exports) {
                  * */
                 after(element, content) {
                     if (typeof element === "string") {
-                        element = PopsCore.document.querySelector(element);
+                        element = this.selector(element);
                     }
                     if (element == null) {
                         return;
@@ -5291,10 +5353,13 @@ System.register('pops', [], (function (exports) {
           </div>`);
                             // 存储原来的值
                             Reflect.set($fileName, "__value__", folderData);
-                            Reflect.set($folder, "folderData", folderData);
+                            Reflect.set($folder, "__value__", folderData);
                             $folder.appendChild($fileName);
                             return {
                                 folderElement: $folder,
+                                /**
+                                 * 超链接标签的容器
+                                 */
                                 fileNameElement: $fileName,
                             };
                         }
@@ -5383,8 +5448,17 @@ System.register('pops', [], (function (exports) {
                                 },
                                 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());
                                 // 添加顶部导航的链接文字
@@ -5398,50 +5472,65 @@ System.register('pops', [], (function (exports) {
                             }
                             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();
@@ -5623,8 +5712,14 @@ System.register('pops', [], (function (exports) {
                                     // 文件 - 点击事件
                                     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);
                                 }
                             });
@@ -5831,7 +5926,7 @@ System.register('pops', [], (function (exports) {
                      */
                     const $anim = PopsElementHandler.parseElement(animHTML);
                     const { $pops: $pops, $headerBtnClose: headerCloseBtnElement, $headerControls: headerControlsElement, $title: $title, $iframe: $iframe, $loading: loadingElement, $contentLoading: $contentLoading, $headerBtnMin: headerMinBtnElement, $headerBtnMax: headerMaxBtnElement, $headerBtnMise: headerMiseBtnElement, } = PopsHandler.handleQueryElement($anim, popsType);
-                    let $iframeContainer = PopsCore.document.querySelector(".pops-iframe-container");
+                    let $iframeContainer = popsDOMUtils.selector(".pops-iframe-container");
                     if (!$iframeContainer) {
                         $iframeContainer = popsDOMUtils.createElement("div", {
                             className: "pops-iframe-container",
@@ -13309,7 +13404,7 @@ System.register('pops', [], (function (exports) {
                 },
             };
 
-            const version = "3.3.2";
+            const version = "3.3.4";
 
             class Pops {
                 /** 配置 */