@whitesev/pops 1.5.6 → 1.5.9

package/src/components/rightClickMenu/index.ts

@@ -255,13 +255,24 @@ export class PopsRightClickMenu {
 				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 as HTMLDivElement,
+						popsElement: rootElement as HTMLDivElement,
+						beforeRemoveCallBack(layerCommonConfig) {
+							PopsContextMenu.closeAllMenu(layerCommonConfig.popsElement);
+						},
+					});
+				}
 			},
 			/**
 			 * 添加contextmenu事件
@@ -337,6 +348,9 @@ export class PopsRightClickMenu {
 			 * @param rootElement
 			 */
 			closeAllMenu(rootElement: HTMLElement) {
+				if (rootElement == null) {
+					return;
+				}
 				if ((rootElement as any)?.["__menuData__"]?.root) {
 					rootElement = (rootElement as any)?.["__menuData__"]?.root;
 				}
@@ -725,7 +739,9 @@ export class PopsRightClickMenu {
 			},
 		};
 
+		// 添加右键菜单事件
 		PopsContextMenu.addContextMenuEvent(config.target, config.targetSelector!);
+		// 添加全局点击检测
 		PopsContextMenu.addWindowCheckClickListener();
 
 		return {

package/src/handler/PopsHandler.ts

@@ -631,11 +631,10 @@ export const PopsHandler = {
 				type === "tooltip" ||
 				type === "rightClickMenu"
 			) {
-				PopsInstanceUtils.removeInstance(
-					[(pops.config.layer as any)[type]],
-					"",
-					true
-				);
+				let layer = pops.config.layer[type as keyof typeof pops.config.layer];
+				if (layer) {
+					PopsInstanceUtils.removeInstance([layer], "", true);
+				}
 			} else {
 				PopsInstanceUtils.removeInstance(
 					[
@@ -662,7 +661,7 @@ export const PopsHandler = {
 					);
 					return maxZIndex;
 				};
-			}else{
+			} else {
 				const { zIndex: maxZIndex } = PopsInstanceUtils.getPopsMaxZIndex(
 					PopsHandler.handleZIndex(config.zIndex) + 100
 				);

package/src/types/layer.d.ts

@@ -17,4 +17,6 @@ export interface PopsLayerCommonConfig extends PopsLayerConfig {
 	$shadowContainer: HTMLDivElement;
 	/** shadow容器的shandowRoot */
 	$shadowRoot: ShadowRoot;
+	/** 移除实例前的回调函数 */
+	beforeRemoveCallBack?: (layerCommonConfig: PopsLayerCommonConfig) => void;
 }

package/src/types/main.d.ts

@@ -48,7 +48,7 @@ export type PopsType = keyof PopsTypeDetails;
 export type PopsMode = PopsType | "tooltip" | "rightClickMenu";
 
 /** 存储实例的类型 9个 */
-export type PopsLayerMode = PopsType | "tooltip";
+export type PopsLayerMode = PopsType | "tooltip" | "rightClickMenu";
 
 /** pops弹窗支持动画元素的配置 */
 export interface PopsSupportAnim {

package/src/types/mask.d.ts

@@ -25,7 +25,7 @@ export interface PopsMaskDetails {
 	 * @param config 配置信息
 	 */
 	clickCallBack?: (
-		originalRun: (originalRun: Function) => void,
+		originalRun: () => void,
 		config:
 			| PopsAlertDetails
 			| PopsDrawerDetails

package/src/utils/PopsInstanceUtils.ts

@@ -84,17 +84,27 @@ export const PopsInstanceUtils = {
 		guid: string,
 		isAll = false
 	) {
-		function removeItem(item: PopsLayerCommonConfig) {
-			item?.animElement?.remove();
-			item?.popsElement?.remove();
-			item?.maskElement?.remove();
-			item?.$shadowContainer?.remove();
+		/**
+		 * 移除元素实例
+		 * @param layerCommonConfig
+		 */
+		function removeItem(layerCommonConfig: PopsLayerCommonConfig) {
+			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") as string