@whitesev/pops 1.9.0 → 1.9.2

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,24 +16,25 @@ 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();
 				},
 			},
 		},
+		useShadowRoot: true,
 		class: "",
 		only: false,
 		width: "350px",
@@ -47,7 +48,7 @@ export const PopsAlertConfig = (): Required<PopsAlertDetails> => {
 				toClose: false,
 				toHide: false,
 			},
-			clickCallBack: void 0,
+			clickCallBack: null,
 		},
 		drag: false,
 		dragLimit: true,
@@ -57,5 +58,5 @@ export const PopsAlertConfig = (): Required<PopsAlertDetails> => {
 		forbiddenScroll: false,
 		style: null,
 		beforeAppendToPageCallBack() {},
-	};
+	} as DeepRequired<PopsAlertDetails>;
 };

package/src/components/alert/index.ts

@@ -11,7 +11,15 @@ import type { PopsAlertDetails } from "./indexType";
 
 export class PopsAlert {
 	constructor(details: PopsAlertDetails) {
-		const { $shadowContainer, $shadowRoot } = PopsHandler.handlerShadow();
+		const guid = popsUtils.getRandomGUID();
+		// 设置当前类型
+		const PopsType: PopsMode = "alert";
+		let config = PopsAlertConfig();
+		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
+		config = popsUtils.assign(config, details);
+		config = PopsHandler.handleOnly(PopsType, config);
+
+		const { $shadowContainer, $shadowRoot } = PopsHandler.handlerShadow(config);
 		PopsHandler.handleInit($shadowRoot, [
 			pops.config.cssText.index,
 			pops.config.cssText.ninePalaceGridPosition,
@@ -22,14 +30,6 @@ export class PopsAlert {
 			pops.config.cssText.alertCSS,
 		]);
 
-		let config: Required<PopsAlertDetails> = PopsAlertConfig();
-		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
-		config = popsUtils.assign(config, details);
-		let guid = popsUtils.getRandomGUID();
-		// 设置当前类型
-		const PopsType: PopsMode = "alert";
-		config = PopsHandler.handleOnly(PopsType, config);
-
 		// 先把z-index提取出来
 		let zIndex = PopsHandler.handleZIndex(config.zIndex);
 		let maskHTML = PopsElementHandler.getMaskHTML(guid, zIndex);

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,53 +20,48 @@ 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();
 				},
 			},
 		},
+		useShadowRoot: true,
 		class: "",
 		only: false,
 		width: "350px",
@@ -80,8 +75,7 @@ export const PopsConfirmConfig = (): Required<PopsConfirmDetails> => {
 				toClose: false,
 				toHide: false,
 			},
-
-			clickCallBack: void 0,
+			clickCallBack: null,
 		},
 		drag: false,
 		dragLimit: true,
@@ -92,5 +86,5 @@ export const PopsConfirmConfig = (): Required<PopsConfirmDetails> => {
 
 		style: null,
 		beforeAppendToPageCallBack() {},
-	};
+	} as DeepRequired<PopsConfirmDetails>;
 };

package/src/components/confirm/index.ts

@@ -10,7 +10,15 @@ import type { PopsConfirmDetails } from "./indexType";
 
 export class PopsConfirm {
 	constructor(details: PopsConfirmDetails) {
-		const { $shadowContainer, $shadowRoot } = PopsHandler.handlerShadow();
+		const guid = popsUtils.getRandomGUID();
+		// 设置当前类型
+		const PopsType = "confirm";
+		let config = PopsConfirmConfig();
+		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
+		config = popsUtils.assign(config, details);
+		config = PopsHandler.handleOnly(PopsType, config);
+
+		const { $shadowContainer, $shadowRoot } = PopsHandler.handlerShadow(config);
 		PopsHandler.handleInit($shadowRoot, [
 			pops.config.cssText.index,
 			pops.config.cssText.ninePalaceGridPosition,
@@ -20,14 +28,6 @@ export class PopsConfirm {
 			pops.config.cssText.common,
 			pops.config.cssText.confirmCSS,
 		]);
-		let config: Required<PopsConfirmDetails> = PopsConfirmConfig();
-		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
-		config = popsUtils.assign(config, details);
-		let guid = popsUtils.getRandomGUID();
-		// 设置当前类型
-		const PopsType = "confirm";
-
-		config = PopsHandler.handleOnly(PopsType, config);
 
 		// 先把z-index提取出来
 		let zIndex = PopsHandler.handleZIndex(config.zIndex);

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,9 +68,9 @@ export const PopsDrawerConfig = (): Required<PopsDrawerDetails> => {
 				toClose: true,
 				toHide: false,
 			},
-
-			clickCallBack: void 0,
+			clickCallBack: null,
 		},
+		useShadowRoot: true,
 		class: "",
 		zIndex: 10000,
 		only: false,

package/src/components/drawer/index.ts

@@ -9,7 +9,15 @@ import type { PopsDrawerDetails } from "./indexType";
 
 export class PopsDrawer {
 	constructor(details: PopsDrawerDetails) {
-		const { $shadowContainer, $shadowRoot } = PopsHandler.handlerShadow();
+		const guid = popsUtils.getRandomGUID();
+		// 设置当前类型
+		const PopsType = "drawer";
+		let config = PopsDrawerConfig();
+		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
+		config = popsUtils.assign(config, details);
+		config = PopsHandler.handleOnly(PopsType, config);
+		
+		const { $shadowContainer, $shadowRoot } = PopsHandler.handlerShadow(config);
 		PopsHandler.handleInit($shadowRoot, [
 			pops.config.cssText.index,
 			pops.config.cssText.ninePalaceGridPosition,
@@ -20,14 +28,6 @@ export class PopsDrawer {
 			pops.config.cssText.drawerCSS,
 		]);
 
-		let config: Required<PopsDrawerDetails> = PopsDrawerConfig();
-		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
-		config = popsUtils.assign(config, details);
-		let guid = popsUtils.getRandomGUID();
-		const PopsType = "drawer";
-
-		config = PopsHandler.handleOnly(PopsType, config);
-
 		// 先把z-index提取出来
 		let zIndex = PopsHandler.handleZIndex(config.zIndex);
 		let maskHTML = PopsElementHandler.getMaskHTML(guid, zIndex);

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,47 +64,48 @@ 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();
 				},
 			},
 		},
+		useShadowRoot: true,
 		class: "",
 		only: false,
 		width: "500px",
@@ -118,7 +119,7 @@ export const PopsFolderConfig = (): Required<PopsFolderDetails> => {
 				toClose: false,
 				toHide: false,
 			},
-			clickCallBack: void 0,
+			clickCallBack: null,
 		},
 		drag: false,
 		dragLimit: true,

package/src/components/folder/index.ts

@@ -11,7 +11,16 @@ import type { PopsFolderDataConfig, PopsFolderDetails } from "./indexType";
 
 export class PopsFolder {
 	constructor(details: PopsFolderDetails) {
-		const { $shadowContainer, $shadowRoot } = PopsHandler.handlerShadow();
+		const guid = popsUtils.getRandomGUID();
+		// 设置当前类型
+		const PopsType = "folder";
+
+		let config = PopsFolderConfig();
+		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
+		config = popsUtils.assign(config, details);
+		config = PopsHandler.handleOnly(PopsType, config);
+
+		const { $shadowContainer, $shadowRoot } = PopsHandler.handlerShadow(config);
 		PopsHandler.handleInit($shadowRoot, [
 			pops.config.cssText.index,
 			pops.config.cssText.ninePalaceGridPosition,
@@ -22,17 +31,19 @@ export class PopsFolder {
 			pops.config.cssText.folderCSS,
 		]);
 
-		let config: Required<PopsFolderDetails> = PopsFolderConfig();
-		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
-		config = popsUtils.assign(config, details);
-
 		/* 办公几件套 */
-		(Folder_ICON as any).docx = Folder_ICON.doc;
-		(Folder_ICON as any).rtf = Folder_ICON.doc;
-		(Folder_ICON as any).xlsx = Folder_ICON.xls;
-		(Folder_ICON as any).pptx = Folder_ICON.ppt;
-		(Folder_ICON as any).dmg = Folder_ICON.ipa;
-		(Folder_ICON as any).json = Folder_ICON.js;
+		// @ts-ignore
+		Folder_ICON.docx = Folder_ICON.doc;
+		// @ts-ignore;
+		Folder_ICON.rtf = Folder_ICON.doc;
+		// @ts-ignore
+		Folder_ICON.xlsx = Folder_ICON.xls;
+		// @ts-ignore
+		Folder_ICON.pptx = Folder_ICON.ppt;
+		// @ts-ignore;
+		Folder_ICON.dmg = Folder_ICON.ipa;
+		// @ts-ignore
+		Folder_ICON.json = Folder_ICON.js;
 
 		/* 压缩包 */
 		let zipIconList = [
@@ -73,38 +84,35 @@ export class PopsFolder {
 		let androidIconList = ["apk", "apkm", "xapk"];
 
 		zipIconList.forEach((keyName) => {
-			(Folder_ICON as any)[keyName] = Folder_ICON.zip;
+			// @ts-ignore
+			Folder_ICON[keyName] = Folder_ICON.zip;
 		});
 		imageIconList.forEach((keyName) => {
-			(Folder_ICON as any)[keyName] = Folder_ICON.png;
+			// @ts-ignore
+			Folder_ICON[keyName] = Folder_ICON.png;
 		});
 		codeLanguageIconList.forEach((keyName) => {
-			(Folder_ICON as any)[keyName] = Folder_ICON.html;
+			// @ts-ignore
+			Folder_ICON[keyName] = Folder_ICON.html;
 		});
 		androidIconList.forEach((keyName) => {
-			(Folder_ICON as any)[keyName] = Folder_ICON.apk;
+			// @ts-ignore
+			Folder_ICON[keyName] = Folder_ICON.apk;
 		});
 
 		if (details?.folder) {
+			// @ts-ignore
 			config.folder = details.folder;
 		}
-		let guid = popsUtils.getRandomGUID();
-		const PopsType = "folder";
-
-		config = PopsHandler.handleOnly(PopsType, config);
 
 		// 先把z-index提取出来
 		let zIndex = PopsHandler.handleZIndex(config.zIndex);
 		let maskHTML = PopsElementHandler.getMaskHTML(guid, zIndex);
 
 		let headerBtnHTML = PopsElementHandler.getHeaderBtnHTML(PopsType, config);
-		let bottomBtnHTML = PopsElementHandler.getBottomBtnHTML(
-			PopsType,
-			config as any
-		);
+		let bottomBtnHTML = PopsElementHandler.getBottomBtnHTML(PopsType, config);
 		let { headerStyle, headerPStyle } = PopsElementHandler.getHeaderStyle(
 			PopsType,
-
 			config
 		);
 		let animHTML = PopsElementHandler.getAnimHTML(

package/src/components/iframe/config.ts

@@ -1,6 +1,6 @@
 import type { PopsIframeDetails } from "./indexType";
 
-export const PopsIframeConfig = (): Required<PopsIframeDetails> => {
+export const PopsIframeConfig = (): DeepRequired<PopsIframeDetails> => {
 	return {
 		title: {
 			position: "center",
@@ -13,6 +13,7 @@ export const PopsIframeConfig = (): Required<PopsIframeDetails> => {
 			icon: true,
 			text: "",
 		},
+		useShadowRoot: true,
 		class: "",
 		url: window.location.href,
 		only: false,
@@ -23,8 +24,7 @@ export const PopsIframeConfig = (): Required<PopsIframeDetails> => {
 				toClose: false,
 				toHide: false,
 			},
-
-			clickCallBack: void 0,
+			clickCallBack: null,
 		},
 		animation: "pops-anim-fadein-zoom",
 		position: "center",

package/src/components/iframe/index.ts

@@ -12,7 +12,19 @@ import type { PopsIframeDetails } from "./indexType";
 
 export class PopsIframe {
 	constructor(details: PopsIframeDetails) {
-		const { $shadowContainer, $shadowRoot } = PopsHandler.handlerShadow();
+		const guid = popsUtils.getRandomGUID();
+		// 设置当前类型
+		const PopsType = "iframe";
+
+		let config = PopsIframeConfig();
+		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
+		config = popsUtils.assign(config, details);
+		if (config.url == null) {
+			throw "config.url不能为空";
+		}
+		config = PopsHandler.handleOnly(PopsType, config);
+
+		const { $shadowContainer, $shadowRoot } = PopsHandler.handlerShadow(config);
 		PopsHandler.handleInit($shadowRoot, [
 			pops.config.cssText.index,
 			pops.config.cssText.ninePalaceGridPosition,
@@ -21,18 +33,10 @@ export class PopsIframe {
 			pops.config.cssText.common,
 			pops.config.cssText.iframeCSS,
 		]);
-		let config: Required<PopsIframeDetails> = PopsIframeConfig();
-		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
-		config = popsUtils.assign(config, details);
-		if (config.url == null) {
-			throw "config.url不能为空";
-		}
-		let guid = popsUtils.getRandomGUID();
-		const PopsType = "iframe";
 
-		config = PopsHandler.handleOnly(PopsType, config);
 		let maskExtraStyle =
-			config.animation != null && (config as any).animation != ""
+			// @ts-ignore
+			config.animation != null && config.animation != ""
 				? "position:absolute;"
 				: "";
 

package/src/components/loading/config.ts

@@ -1,6 +1,6 @@
 import type { PopsLoadingDetails } from "./indexType";
 
-export const PopsLoadingConfig = (): Required<PopsLoadingDetails> => {
+export const PopsLoadingConfig = (): DeepRequired<PopsLoadingDetails> => {
 	return {
 		parent: document.body,
 		content: {
@@ -8,6 +8,7 @@ export const PopsLoadingConfig = (): Required<PopsLoadingDetails> => {
 			icon: "loading",
 			style: "",
 		},
+		useShadowRoot: true,
 		class: "",
 		only: false,
 		zIndex: 10000,
@@ -17,8 +18,7 @@ export const PopsLoadingConfig = (): Required<PopsLoadingDetails> => {
 				toClose: false,
 				toHide: false,
 			},
-
-			clickCallBack: void 0,
+			clickCallBack: null,
 		},
 		animation: "pops-anim-fadein-zoom",
 		forbiddenScroll: false,

package/src/components/loading/index.ts

@@ -9,7 +9,7 @@ import type { PopsLoadingDetails } from "./indexType";
 
 export class PopsLoading {
 	constructor(details: PopsLoadingDetails) {
-		let config: Required<PopsLoadingDetails> = PopsLoadingConfig();
+		let config = PopsLoadingConfig();
 		config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
 		config = popsUtils.assign(config, details);
 		let guid = popsUtils.getRandomGUID();