@whitesev/pops 1.7.6 → 1.7.8

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

@@ -1,8 +1,9 @@
+import type { PopsCommonConfig } from "./types/components";
 type EnterReturnType<T> = null | T | (() => T);
 type GlobalConfigOption = {
     style?: EnterReturnType<string>;
     zIndex?: EnterReturnType<number> | EnterReturnType<string>;
-};
+} & Partial<PopsCommonConfig>;
 export declare const GlobalConfig: {
     config: GlobalConfigOption;
     /**
@@ -15,6 +16,15 @@ export declare const GlobalConfig: {
     getGlobalConfig(): {
         style?: string | undefined;
         zIndex?: string | number | undefined;
+        class?: string | undefined;
+        only?: boolean | undefined;
+        width?: string | undefined;
+        height?: string | undefined;
+        position?: import("./types/position").PopsPosition | undefined;
+        animation?: import("./types/animation").PopsAnimation | undefined;
+        mask?: import("./types/mask").PopsMaskDetails | undefined;
+        forbiddenScroll?: boolean | undefined;
+        beforeAppendToPageCallBack?: void;
     };
 };
 export {};

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

@@ -239,14 +239,23 @@ declare class Pops {
         config: {
             style?: string | (() => string) | null;
             zIndex?: (number | (() => number) | null) | (string | (() => string) | null);
-        };
+        } & Partial<import("./types/components").PopsCommonConfig>;
         setGlobalConfig(config: {
             style?: string | (() => string) | null;
             zIndex?: (number | (() => number) | null) | (string | (() => string) | null);
-        }): void;
+        } & Partial<import("./types/components").PopsCommonConfig>): void;
         getGlobalConfig(): {
             style?: string | undefined;
             zIndex?: string | number | undefined;
+            class?: string | undefined;
+            only?: boolean | undefined;
+            width?: string | undefined;
+            height?: string | undefined;
+            position?: import("./types/position").PopsPosition | undefined;
+            animation?: import("./types/animation").PopsAnimation | undefined;
+            mask?: import("./types/mask").PopsMaskDetails | undefined;
+            forbiddenScroll?: boolean | undefined;
+            beforeAppendToPageCallBack?: void;
         };
     };
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitesev/pops",
-  "version": "1.7.6",
+  "version": "1.7.8",
   "description": "弹窗库",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

package/src/GlobalConfig.ts

@@ -1,9 +1,11 @@
+import type { PopsCommonConfig } from "./types/components";
+
 type EnterReturnType<T> = null | T | (() => T);
 
 type GlobalConfigOption = {
 	style?: EnterReturnType<string>;
 	zIndex?: EnterReturnType<number> | EnterReturnType<string>;
-};
+} & Partial<PopsCommonConfig>;
 
 type ResultGlobalConfigOption<T> = T extends null | undefined
 	? never
@@ -29,32 +31,49 @@ export const GlobalConfig = {
 				GlobalConfigOption[P]
 			>;
 		} = {};
-		let style =
-			GlobalConfig.config.style == null
-				? ""
-				: typeof GlobalConfig.config.style === "function"
-				? GlobalConfig.config.style()
-				: GlobalConfig.config.style;
+		Object.keys(GlobalConfig.config).forEach((keyName) => {
+			let configValue = Reflect.get(GlobalConfig.config, keyName);
+			if (keyName === "style") {
+				// 设置style属性
+				let style =
+					configValue == null
+						? ""
+						: typeof configValue === "function"
+						? // @ts-ignore
+						  configValue()
+						: configValue;
 
-		if (typeof style === "string") {
-			result.style = style;
-		}
-		let zIndex =
-			GlobalConfig.config.zIndex == null
-				? ""
-				: typeof GlobalConfig.config.zIndex === "function"
-				? GlobalConfig.config.zIndex()
-				: GlobalConfig.config.zIndex;
-		if (typeof zIndex === "string") {
-			let newIndex = (zIndex = parseInt(zIndex));
-			if (!isNaN(newIndex)) {
-				result.zIndex = newIndex;
+				if (typeof style === "string") {
+					result.style = style;
+				}
+			} else if (keyName === "zIndex") {
+				// 设置zIndex属性
+				let zIndex =
+					configValue == null
+						? ""
+						: typeof configValue === "function"
+						? configValue()
+						: configValue;
+				if (typeof zIndex === "string") {
+					let newIndex = (zIndex = parseInt(zIndex));
+					if (!isNaN(newIndex)) {
+						result.zIndex = newIndex;
+					}
+				} else {
+					if (!isNaN(zIndex)) {
+						result.zIndex = zIndex;
+					}
+				}
+			} else if (keyName === "mask") {
+				let mask =
+					GlobalConfig.config.mask == null ? {} : GlobalConfig.config.mask;
+				if (typeof mask === "object" && mask != null) {
+					result.mask = mask;
+				}
+			} else {
+				Reflect.set(result, keyName, configValue);
 			}
-		} else {
-			if (!isNaN(zIndex)) {
-				result.zIndex = zIndex;
-			}
-		}
+		});
 		return result;
 	},
 };

package/src/components/iframe/index.ts

@@ -221,6 +221,9 @@ export class PopsIframe {
 				if (typeof config?.btn?.min?.callback === "function") {
 					config.btn.min.callback(eventDetails, event);
 				}
+			},
+			{
+				capture: true,
 			}
 		);
 		/* 最大化按钮点击事件 */
@@ -252,6 +255,9 @@ export class PopsIframe {
 				if (typeof config?.btn?.max?.callback === "function") {
 					config.btn.max.callback(eventDetails, event);
 				}
+			},
+			{
+				capture: true,
 			}
 		);
 		/* 先隐藏窗口化按钮 */
@@ -291,6 +297,9 @@ export class PopsIframe {
 				if (typeof config?.btn?.mise?.callback === "function") {
 					config.btn.mise.callback(eventDetails, event);
 				}
+			},
+			{
+				capture: true,
 			}
 		);
 		/* 关闭按钮点击事件 */
@@ -298,6 +307,8 @@ export class PopsIframe {
 			headerCloseBtnElement,
 			"click",
 			(event) => {
+				event.preventDefault();
+				event.stopPropagation();
 				PopsInstanceUtils.removeInstance(
 					[pops.config.layer.iframe],
 					guid,
@@ -306,6 +317,9 @@ export class PopsIframe {
 				if (typeof config?.btn?.close?.callback === "function") {
 					config.btn.close.callback(eventDetails, event);
 				}
+			},
+			{
+				capture: true,
 			}
 		);
 

package/src/components/panel/index.css

@@ -573,6 +573,7 @@ section.pops-panel-container
 	border: 1px solid #dcdfe6;
 	border-radius: 4px;
 	background-color: #ffffff;
+	position: relative;
 }
 .pops-panel-input:hover {
 	box-shadow: 0 0 0 1px #c0c4cc inset;
@@ -586,17 +587,12 @@ section.pops-panel-container
 .pops-panel-input input {
 	display: inline-flex;
 	justify-content: center;
+	text-align: start;
 	align-items: center;
-	line-height: normal;
 	align-content: center;
-	height: 32px;
 	white-space: nowrap;
 	cursor: text;
-	text-align: center;
 	box-sizing: border-box;
-	outline: 0;
-	transition: 0.1s;
-	font-weight: 500;
 	user-select: none;
 	-webkit-user-select: none;
 	-moz-user-select: none;
@@ -605,12 +601,17 @@ section.pops-panel-container
 	-webkit-appearance: none;
 	appearance: none;
 	background-color: transparent;
+	outline: 0;
+	transition: 0.1s;
 	border: 0;
-	padding: 8px 8px;
 	font-size: 14px;
-	text-align: start;
+	font-weight: 500;
+	line-height: normal;
+	height: 32px;
 	width: 100%;
 	flex: 1;
+	margin-right: calc(1em + 8px);
+	padding: 8px 8px;
 }
 .pops-panel-input span.pops-panel-input__suffix {
 	display: inline-flex;
@@ -623,6 +624,8 @@ section.pops-panel-container
 	transition: all 0.3s;
 	pointer-events: none;
 	margin: 0 8px;
+	position: absolute;
+	right: 0px;
 }
 .pops-panel-input span.pops-panel-input__suffix-inner {
 	pointer-events: all;

package/src/utils/PopsInstanceUtils.ts

@@ -525,7 +525,8 @@ export const PopsInstanceUtils = {
 				if (typeof options.preventEvent === "function") {
 					return options.preventEvent(event as any);
 				} else {
-					return false;
+					// 返回true阻止滑动
+					return true;
 				}
 			},
 		});