@whitesev/pops 1.9.0 → 1.9.1

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

@@ -153,6 +153,7 @@ declare class Pops {
             getPopsMaxZIndex(deviation?: number): {
                 zIndex: number;
                 animElement: HTMLDivElement | null;
+                isOverMaxZIndex: boolean;
             };
             getMaxZIndex(deviation?: number): number;
             getKeyFrames(sheet: CSSStyleSheet): {};

package/dist/types/src/components/alert/config.d.ts

@@ -1,2 +1,2 @@
 import type { PopsAlertDetails } from "./indexType";
-export declare const PopsAlertConfig: () => Required<PopsAlertDetails>;
+export declare const PopsAlertConfig: () => DeepRequired<PopsAlertDetails>;

package/dist/types/src/components/confirm/config.d.ts

@@ -1,2 +1,2 @@
 import type { PopsConfirmDetails } from "./indexType";
-export declare const PopsConfirmConfig: () => Required<PopsConfirmDetails>;
+export declare const PopsConfirmConfig: () => DeepRequired<PopsConfirmDetails>;

package/dist/types/src/components/drawer/config.d.ts

@@ -1,2 +1,2 @@
 import type { PopsDrawerDetails } from "./indexType";
-export declare const PopsDrawerConfig: () => Required<PopsDrawerDetails>;
+export declare const PopsDrawerConfig: () => DeepRequired<PopsDrawerDetails>;

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

@@ -1,2 +1,2 @@
 import type { PopsFolderDetails } from "./indexType";
-export declare const PopsFolderConfig: () => Required<PopsFolderDetails>;
+export declare const PopsFolderConfig: () => DeepRequired<PopsFolderDetails>;

package/dist/types/src/components/iframe/config.d.ts

@@ -1,2 +1,2 @@
 import type { PopsIframeDetails } from "./indexType";
-export declare const PopsIframeConfig: () => Required<PopsIframeDetails>;
+export declare const PopsIframeConfig: () => DeepRequired<PopsIframeDetails>;

package/dist/types/src/components/loading/config.d.ts

@@ -1,2 +1,2 @@
 import type { PopsLoadingDetails } from "./indexType";
-export declare const PopsLoadingConfig: () => Required<PopsLoadingDetails>;
+export declare const PopsLoadingConfig: () => DeepRequired<PopsLoadingDetails>;

package/dist/types/src/components/panel/config.d.ts

@@ -1,2 +1,2 @@
 import type { PopsPanelDetails } from "./indexType";
-export declare const PopsPanelConfig: () => Required<PopsPanelDetails>;
+export declare const PopsPanelConfig: () => DeepRequired<PopsPanelDetails>;

package/dist/types/src/components/prompt/config.d.ts

@@ -1,2 +1,2 @@
 import type { PopsPromptDetails } from "./indexType";
-export declare const PopsPromptConfig: () => Required<PopsPromptDetails>;
+export declare const PopsPromptConfig: () => DeepRequired<PopsPromptDetails>;

package/dist/types/src/components/rightClickMenu/config.d.ts

@@ -1,2 +1,2 @@
 import type { PopsRightClickMenuDetails } from "./indexType";
-export declare const rightClickMenuConfig: () => Required<PopsRightClickMenuDetails>;
+export declare const rightClickMenuConfig: () => DeepRequired<PopsRightClickMenuDetails>;

package/dist/types/src/components/searchSuggestion/config.d.ts

@@ -1,2 +1,2 @@
 import type { PopsSearchSuggestionDetails } from "./indexType";
-export declare const searchSuggestionConfig: () => Required<PopsSearchSuggestionDetails>;
+export declare const searchSuggestionConfig: () => DeepRequired<PopsSearchSuggestionDetails>;

package/dist/types/src/components/tooltip/config.d.ts

@@ -1,2 +1,2 @@
 import type { PopsToolTipDetails } from "./indexType";
-export declare const PopsTooltipConfig: () => Required<PopsToolTipDetails>;
+export declare const PopsTooltipConfig: () => DeepRequired<PopsToolTipDetails>;

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

@@ -45,12 +45,12 @@ export declare class ToolTip {
      */
     changeZIndex(): void;
     /**
-     * 获取 提示框的位置
+     * 计算 提示框的位置
      * @param targetElement 目标元素
      * @param arrowDistance 箭头和目标元素的距离
      * @param otherDistance 其它位置的偏移
      */
-    getPosition(targetElement: HTMLElement, arrowDistance: number, otherDistance: number): {
+    calcToolTipPosition(targetElement: HTMLElement, arrowDistance: number, otherDistance: number): {
         TOP: {
             left: number;
             top: number;
@@ -154,7 +154,7 @@ export declare class ToolTip {
     /**
      * 鼠标|触摸离开事件
      */
-    toolTipMouseLeaveEvent(): void;
+    toolTipMouseLeaveEvent(event: MouseEvent | PointerEvent): void;
     /**
      * 监听鼠标|触摸离开事件
      */

package/dist/types/src/components/tooltip/indexType.d.ts

@@ -13,12 +13,15 @@ export interface PopsToolTipDetails {
      */
     content: string | (() => string);
     /**
-     * 位置，默认top
+     * 位置
+     * @default "top"
      */
     position?: PopsTooltipPosition;
     /**
-     * 自定义className，默认为空
-     * + github-tooltip
+     * 自定义className
+     *
+     * + github-tooltip github的样式
+     * @default ""
      */
     className?: string;
     /**
@@ -41,18 +44,22 @@ export interface PopsToolTipDetails {
     delayCloseTime?: number;
     /**
      * 触发显示事件的名称，默认mouseenter touchstart，如果是多个事件，按空格分割
+     * @default  "mouseenter touchstart"
      */
     triggerShowEventName?: string;
     /**
      * 触发关闭事件的名称，默认mouseleave touchend，如果是多个事件，按空格分割
+     * @default  "mouseleave touchend"
      */
     triggerCloseEventName?: string;
     /**
-     * z-index，默认10000
+     * z-index
+     * @default 10000
      */
     zIndex?: number | (() => number);
     /**
-     * 是否唯一，默认false
+     * 是否唯一
+     * @default false
      */
     only?: boolean;
     /**
@@ -71,22 +78,34 @@ export interface PopsToolTipDetails {
     showAfterCallBack?: ($toolTip: HTMLElement) => void;
     /**
      * 触发关闭前的回调
+     */
+    closeBeforeCallBack?: (
+    /**
+     *
      * @returns
      * + false 可阻止关闭
      */
-    closeBeforeCallBack?: ($toolTip: HTMLElement) => false | void;
+    $toolTip: HTMLElement) => false | void;
     /**
      * 触发关闭后的回调
      */
     closeAfterCallBack?: ($toolTip: HTMLElement) => void;
     /**
-     * 箭头与目标的的距离，默认12.5(px)
+     * 是否显示箭头
+     * @default true
+     */
+    showArrow?: boolean;
+    /**
+     * 箭头与目标的的距离(px)
+     *
+     * @default 12.5
      */
     arrowDistance?: number;
     /**
-     * 其它的距离，默认0(px)
+     * 其它的距离(px)
      * + 当position为left或者right，这个距离是上、下距离
      * + 当position为top或者bottom，这个距离是左、右距离
+     * @default 0
      */
     otherDistance?: number;
     /**

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

@@ -85,15 +85,18 @@ export interface PopsButtonDetails<T = {}> {
 	 */
 	rightIcon: boolean;
 	/**
-	 * 图标按钮是否是旋转360°，默认false
+	 * 图标按钮是否是旋转360°
+	 * @default false
 	 */
 	iconIsLoading: boolean;
 	/**
-	 * 按钮尺寸大小，默认为空
+	 * 按钮尺寸大小
+	 * @default ""
 	 */
-	size: PopsButtonSize;
+	size: PopsButtonSize | "";
 	/**
-	 * 按钮样式类型，默认为default
+	 * 按钮样式类型
+	 * @default "default"
 	 */
 	type: PopsButtonStyleType;
 	/**
@@ -126,11 +129,13 @@ export interface PopsButtonDetailsAnyType<T = {}> {
 	 */
 	rightIcon: boolean;
 	/**
-	 * 图标按钮是否是旋转360°，默认false
+	 * 图标按钮是否是旋转360°
+	 * @default false
 	 */
 	iconIsLoading: boolean;
 	/**
-	 * 按钮尺寸大小，默认为空
+	 * 按钮尺寸大小
+	 * @default ""
 	 */
 	size: PopsButtonSize;
 	/**
@@ -138,7 +143,8 @@ export interface PopsButtonDetailsAnyType<T = {}> {
 	 */
 	type: string;
 	/**
-	 * 按钮文字，默认为空
+	 * 按钮文字
+	 * @default ""
 	 */
 	text: string;
 	/**
@@ -204,18 +210,6 @@ export interface PopsHeaderCloseButtonDetails {
 	 * 是否启用按钮
 	 */
 	enable?: boolean;
-	/**
-	 * 按钮尺寸大小，默认为空
-	 */
-	size?: PopsButtonSize;
-	/**
-	 * 按钮样式类型，默认为default
-	 */
-	type?: PopsButtonStyleType;
-	/**
-	 * 按钮文字，默认为空
-	 */
-	text?: string;
 	/**
 	 * 按钮点击的回调
 	 */

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

@@ -9,3 +9,12 @@ declare module "*.svg" {
 	const content: string;
 	export default content;
 }
+type DeepRequired<T> = T extends Function
+	? T
+	: T extends object
+	? T extends Node
+		? T
+		: {
+				[K in keyof T]-?: DeepRequired<T[K]>;
+		  }
+	: T;

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

@@ -24,15 +24,18 @@ export interface PopsMaskDetails {
 	 * @param originalRun 当toClose为true，它是关闭弹窗，当toHide为true，它是隐藏弹窗
 	 * @param config 配置信息
 	 */
-	clickCallBack?: (
-		originalRun: () => void,
-		config:
-			| PopsAlertDetails
-			| PopsDrawerDetails
-			| PopsIframeDetails
-			| PopsPromptDetails
-			| PopsFolderDetails
-			| PopsLoadingDetails
-			| PopsPanelDetails
-	) => void;
+	clickCallBack?:
+		| ((
+				originalRun: () => void,
+				config:
+					| PopsAlertDetails
+					| PopsDrawerDetails
+					| PopsIframeDetails
+					| PopsPromptDetails
+					| PopsFolderDetails
+					| PopsLoadingDetails
+					| PopsPanelDetails
+		  ) => void)
+		| undefined
+		| null;
 }

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

@@ -32,12 +32,13 @@ export declare const PopsInstanceUtils: {
     getPopsMaxZIndex(deviation?: number): {
         zIndex: number;
         animElement: HTMLDivElement | null;
+        isOverMaxZIndex: boolean;
     };
     /**
      * 获取页面中最大的z-index
      * @param deviation 获取最大的z-index值的偏移，默认是+1
      * @example
-     * Utils.getMaxZIndex();
+     * getMaxZIndex();
      * > 1001
      **/
     getMaxZIndex(deviation?: number): number;

package/package.json

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

package/src/Pops.ts

@@ -83,7 +83,7 @@ class Pops {
 	/** 配置 */
 	config = {
 		/** 版本号 */
-		version: "2024.11.3",
+		version: "2024.11.21",
 		cssText: {
 			/** 主CSS */
 			index: indexCSS,

package/src/components/alert/config.ts

@@ -1,6 +1,6 @@
 import type { PopsAlertDetails } from "./indexType";
 
-export const PopsAlertConfig = (): Required<PopsAlertDetails> => {
+export const PopsAlertConfig = (): DeepRequired<PopsAlertDetails> => {
 	return {
 		title: {
 			text: "默认标题",
@@ -16,21 +16,21 @@ export const PopsAlertConfig = (): Required<PopsAlertDetails> => {
 		btn: {
 			position: "flex-end",
 			ok: {
-				size: void 0,
+				size: void 0 as any,
 				enable: true,
-				icon: void 0,
+				icon: void 0 as any,
 				rightIcon: false,
 				iconIsLoading: false,
 				text: "确定",
 				type: "primary",
-				callback: function (event) {
-					event.close();
+				callback: function (details: any) {
+					details.close();
 				},
 			},
 			close: {
 				enable: true,
-				callback: function (event) {
-					event.close();
+				callback: function (details: any) {
+					details.close();
 				},
 			},
 		},
@@ -47,7 +47,7 @@ export const PopsAlertConfig = (): Required<PopsAlertDetails> => {
 				toClose: false,
 				toHide: false,
 			},
-			clickCallBack: void 0,
+			clickCallBack: null,
 		},
 		drag: false,
 		dragLimit: true,
@@ -57,5 +57,5 @@ export const PopsAlertConfig = (): Required<PopsAlertDetails> => {
 		forbiddenScroll: false,
 		style: null,
 		beforeAppendToPageCallBack() {},
-	};
+	} as DeepRequired<PopsAlertDetails>;
 };

package/src/components/alert/index.ts

@@ -21,8 +21,7 @@ export class PopsAlert {
 			pops.config.cssText.common,
 			pops.config.cssText.alertCSS,
 		]);
-
-		let config: Required<PopsAlertDetails> = PopsAlertConfig();
+		let config = PopsAlertConfig();
 		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
 		config = popsUtils.assign(config, details);
 		let guid = popsUtils.getRandomGUID();

package/src/components/confirm/config.ts

@@ -1,6 +1,6 @@
 import type { PopsConfirmDetails } from "./indexType";
 
-export const PopsConfirmConfig = (): Required<PopsConfirmDetails> => {
+export const PopsConfirmConfig = (): DeepRequired<PopsConfirmDetails> => {
 	return {
 		title: {
 			text: "默认标题",
@@ -20,50 +20,44 @@ export const PopsConfirmConfig = (): Required<PopsConfirmDetails> => {
 			position: "flex-end",
 			ok: {
 				enable: true,
-
-				size: void 0,
-
-				icon: void 0,
+				size: void 0 as any,
+				icon: void 0 as any,
 				rightIcon: false,
 				iconIsLoading: false,
 				text: "确定",
 				type: "primary",
-				callback(event) {
-					event.close();
+				callback(detail: any) {
+					detail.close();
 				},
 			},
 			cancel: {
 				enable: true,
-
-				size: void 0,
-
-				icon: void 0,
+				size: void 0 as any,
+				icon: void 0 as any,
 				rightIcon: false,
 				iconIsLoading: false,
 				text: "关闭",
 				type: "default",
-				callback(event) {
-					event.close();
+				callback(detail: any) {
+					detail.close();
 				},
 			},
 			other: {
 				enable: false,
-
-				size: void 0,
-
-				icon: void 0,
+				size: void 0 as any,
+				icon: void 0 as any,
 				rightIcon: false,
 				iconIsLoading: false,
 				text: "其它按钮",
 				type: "default",
-				callback(event) {
-					event.close();
+				callback(detail: any) {
+					detail.close();
 				},
 			},
 			close: {
 				enable: true,
-				callback(event) {
-					event.close();
+				callback(detail: any) {
+					detail.close();
 				},
 			},
 		},
@@ -80,8 +74,7 @@ export const PopsConfirmConfig = (): Required<PopsConfirmDetails> => {
 				toClose: false,
 				toHide: false,
 			},
-
-			clickCallBack: void 0,
+			clickCallBack: null,
 		},
 		drag: false,
 		dragLimit: true,
@@ -92,5 +85,5 @@ export const PopsConfirmConfig = (): Required<PopsConfirmDetails> => {
 
 		style: null,
 		beforeAppendToPageCallBack() {},
-	};
+	} as DeepRequired<PopsConfirmDetails>;
 };

package/src/components/confirm/index.ts

@@ -20,7 +20,7 @@ export class PopsConfirm {
 			pops.config.cssText.common,
 			pops.config.cssText.confirmCSS,
 		]);
-		let config: Required<PopsConfirmDetails> = PopsConfirmConfig();
+		let config = PopsConfirmConfig();
 		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
 		config = popsUtils.assign(config, details);
 		let guid = popsUtils.getRandomGUID();

package/src/components/drawer/config.ts

@@ -1,63 +1,64 @@
 import type { PopsDrawerDetails } from "./indexType";
 
-export const PopsDrawerConfig = (): Required<PopsDrawerDetails> => {
+export const PopsDrawerConfig = (): DeepRequired<PopsDrawerDetails> => {
 	return {
 		title: {
 			enable: true,
 			position: "center",
 			text: "默认标题",
 			html: false,
+			style: "",
 		},
 		content: {
 			text: "默认内容",
 			html: false,
+			style: "",
 		},
 		btn: {
+			merge: false,
+			mergeReverse: false,
+			reverse: false,
 			position: "flex-end",
 			ok: {
 				enable: true,
-				size: void 0,
-				icon: void 0,
+				size: void 0 as any,
+				icon: void 0 as any,
 				rightIcon: false,
 				iconIsLoading: false,
 				text: "确定",
 				type: "primary",
-				callback(event) {
-					event.close();
+				callback(detail: any) {
+					detail.close();
 				},
 			},
 			cancel: {
 				enable: true,
-
-				size: void 0,
-
-				icon: void 0,
+				size: void 0 as any,
+				icon: void 0 as any,
 				rightIcon: false,
 				iconIsLoading: false,
 				text: "关闭",
 				type: "default",
-				callback(event) {
-					event.close();
+				callback(detail: any) {
+					detail.close();
 				},
 			},
 			other: {
 				enable: false,
-
-				size: void 0,
-
-				icon: void 0,
+				size: void 0 as any,
+				icon: void 0 as any,
 				rightIcon: false,
 				iconIsLoading: false,
 				text: "其它按钮",
 				type: "default",
-				callback(event) {
-					event.close();
+				callback(detail: any) {
+					detail.close();
 				},
 			},
 			close: {
 				enable: true,
-				callback(event) {
-					event.close();
+				callback(detail: any) {
+					detail.close();
 				},
 			},
 		},
@@ -67,8 +68,7 @@ export const PopsDrawerConfig = (): Required<PopsDrawerDetails> => {
 				toClose: true,
 				toHide: false,
 			},
-
-			clickCallBack: void 0,
+			clickCallBack: null,
 		},
 		class: "",
 		zIndex: 10000,

package/src/components/drawer/index.ts

@@ -19,8 +19,7 @@ export class PopsDrawer {
 			pops.config.cssText.common,
 			pops.config.cssText.drawerCSS,
 		]);
-
-		let config: Required<PopsDrawerDetails> = PopsDrawerConfig();
+		let config = PopsDrawerConfig();
 		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
 		config = popsUtils.assign(config, details);
 		let guid = popsUtils.getRandomGUID();

package/src/components/folder/config.ts

@@ -1,6 +1,6 @@
 import type { PopsFolderDetails } from "./indexType";
 
-export const PopsFolderConfig = (): Required<PopsFolderDetails> => {
+export const PopsFolderConfig = (): DeepRequired<PopsFolderDetails> => {
 	return {
 		title: {
 			text: "pops.Folder",
@@ -64,44 +64,44 @@ export const PopsFolderConfig = (): Required<PopsFolderDetails> => {
 			position: "flex-end",
 			ok: {
 				enable: true,
-				size: void 0,
-				icon: void 0,
+				size: void 0 as any,
+				icon: void 0 as any,
 				rightIcon: false,
 				iconIsLoading: false,
 				text: "确定",
 				type: "primary",
-				callback(event) {
-					event.close();
+				callback(detail: any) {
+					detail.close();
 				},
 			},
 			cancel: {
 				enable: true,
-				size: void 0,
-				icon: void 0,
+				size: void 0 as any,
+				icon: void 0 as any,
 				rightIcon: false,
 				iconIsLoading: false,
 				text: "关闭",
 				type: "default",
-				callback(event) {
-					event.close();
+				callback(detail: any) {
+					detail.close();
 				},
 			},
 			other: {
 				enable: false,
-				size: void 0,
-				icon: void 0,
+				size: void 0 as any,
+				icon: void 0 as any,
 				rightIcon: false,
 				iconIsLoading: false,
 				text: "其它按钮",
 				type: "default",
-				callback(event) {
-					event.close();
+				callback(detail: any) {
+					detail.close();
 				},
 			},
 			close: {
 				enable: true,
-				callback(event) {
-					event.close();
+				callback(detail: any) {
+					detail.close();
 				},
 			},
 		},
@@ -118,7 +118,7 @@ export const PopsFolderConfig = (): Required<PopsFolderDetails> => {
 				toClose: false,
 				toHide: false,
 			},
-			clickCallBack: void 0,
+			clickCallBack: null,
 		},
 		drag: false,
 		dragLimit: true,