@whitesev/pops 1.5.6 → 1.5.8

package/dist/index.amd.js

@@ -3013,17 +3013,27 @@ define((function () { 'use strict';
          * @param isAll 是否全部删除
          */
         removeInstance(moreLayerConfigList, guid, isAll = false) {
-            function removeItem(item) {
-                item?.animElement?.remove();
-                item?.popsElement?.remove();
-                item?.maskElement?.remove();
-                item?.$shadowContainer?.remove();
+            /**
+             * 移除元素实例
+             * @param layerCommonConfig
+             */
+            function removeItem(layerCommonConfig) {
+                if (typeof layerCommonConfig.beforeRemoveCallBack === "function") {
+                    // 调用移除签的回调
+                    layerCommonConfig.beforeRemoveCallBack(layerCommonConfig);
+                }
+                layerCommonConfig?.animElement?.remove();
+                layerCommonConfig?.popsElement?.remove();
+                layerCommonConfig?.maskElement?.remove();
+                layerCommonConfig?.$shadowContainer?.remove();
             }
             // [ layer[], layer[],...]
             moreLayerConfigList.forEach((layerConfigList) => {
                 //  layer[]
                 layerConfigList.forEach((layerConfigItem, index) => {
+                    // 移除全部或者guid相同
                     if (isAll || layerConfigItem["guid"] === guid) {
+                        // 判断是否有动画
                         if (pops.config.animation.hasOwnProperty(layerConfigItem.animElement.getAttribute("anim"))) {
                             layerConfigItem.animElement.style.width = "100%";
                             layerConfigItem.animElement.style.height = "100%";
@@ -4236,7 +4246,10 @@ define((function () { 'use strict';
                 if (type === "loading" ||
                     type === "tooltip" ||
                     type === "rightClickMenu") {
-                    PopsInstanceUtils.removeInstance([pops.config.layer[type]], "", true);
+                    let layer = pops.config.layer[type];
+                    if (layer) {
+                        PopsInstanceUtils.removeInstance([layer], "", true);
+                    }
                 }
                 else {
                     PopsInstanceUtils.removeInstance([
@@ -6381,7 +6394,9 @@ define((function () { 'use strict';
                     let linkElement = targetElement.querySelector("a");
                     if (typeof _config_.clickEvent === "function") {
                         let downloadInfo = await _config_.clickEvent(event, _config_);
-                        if (typeof downloadInfo === "object" &&
+                        if (downloadInfo != null &&
+                            typeof downloadInfo === "object" &&
+                            !Array.isArray(downloadInfo) &&
                             typeof downloadInfo.url === "string" &&
                             downloadInfo.url.trim() !== "") {
                             linkElement.setAttribute("href", downloadInfo.url);
@@ -6441,7 +6456,6 @@ define((function () { 'use strict';
              * @param isDesc 是否降序，默认false（升序）
              */
             function sortFolderConfig(folderDataConfigList, sortName = "fileName", isDesc = false) {
-                console.log(folderDataConfigList, sortName, isDesc);
                 if (sortName === "fileName") {
                     // 如果是以文件名排序，文件夹优先放前面
                     let onlyFolderDataConfigList = folderDataConfigList.filter((value) => {
@@ -9110,10 +9124,24 @@ define((function () { 'use strict';
                     if (config.preventDefault) {
                         popsDOMUtils.preventEvent(event);
                     }
+                    PopsHandler.handleOnly(PopsType, config);
                     if (PopsContextMenu.rootElement) {
                         PopsContextMenu.closeAllMenu(PopsContextMenu.rootElement);
                     }
-                    PopsContextMenu.rootElement = PopsContextMenu.showMenu(event, config.data);
+                    let rootElement = PopsContextMenu.showMenu(event, config.data);
+                    PopsContextMenu.rootElement = rootElement;
+                    if (config.only) {
+                        PopsHandler.handlePush(PopsType, {
+                            $shadowRoot: $shadowRoot,
+                            $shadowContainer: $shadowContainer,
+                            guid: guid,
+                            animElement: rootElement,
+                            popsElement: rootElement,
+                            beforeRemoveCallBack(layerCommonConfig) {
+                                PopsContextMenu.closeAllMenu(layerCommonConfig.popsElement);
+                            },
+                        });
+                    }
                 },
                 /**
                  * 添加contextmenu事件
@@ -9162,6 +9190,9 @@ define((function () { 'use strict';
                  * @param rootElement
                  */
                 closeAllMenu(rootElement) {
+                    if (rootElement == null) {
+                        return;
+                    }
                     if (rootElement?.["__menuData__"]?.root) {
                         rootElement = rootElement?.["__menuData__"]?.root;
                     }
@@ -9464,7 +9495,9 @@ define((function () { 'use strict';
                     });
                 },
             };
+            // 添加右键菜单事件
             PopsContextMenu.addContextMenuEvent(config.target, config.targetSelector);
+            // 添加全局点击检测
             PopsContextMenu.addWindowCheckClickListener();
             return {
                 guid: guid,
@@ -10048,7 +10081,7 @@ define((function () { 'use strict';
         /** 配置 */
         config = {
             /** 版本号 */
-            version: "2024.9.14",
+            version: "2024.9.16",
             cssText: {
                 /** 主CSS */
                 index: indexCSS,
@@ -10127,6 +10160,7 @@ define((function () { 'use strict';
                 drawer: [],
                 folder: [],
                 panel: [],
+                rightClickMenu: [],
             },
             /** 禁止滚动 */
             forbiddenScroll: {