@whitesev/pops 2.1.4 → 2.1.6

package/src/handler/PopsElementHandler.ts

@@ -1,6 +1,6 @@
-import type { PopsAlertDetails } from "../components/alert/indexType";
-import type { PopsConfirmDetails } from "../components/confirm/indexType";
-import type { PopsIframeDetails } from "../components/iframe/indexType";
+import type { PopsAlertDetails } from "../components/alert/types";
+import type { PopsConfirmDetails } from "../components/confirm/types";
+import type { PopsIframeDetails } from "../components/iframe/types";
 import type { PopsIconType } from "../types/icon";
 import type {
 	PopsSupportAnim,
@@ -266,13 +266,13 @@ export const PopsElementHandler = {
 				flexStyle += "flex-direction: row;";
 			}
 			resultHTML = /*html*/ `
-            <div class="pops-${type}-btn" style="${btnStyle}">${ohterHTML}<div 
+            <div class="pops-botttom-btn-controls pops-${type}-btn" style="${btnStyle}">${ohterHTML}<div 
                     class="pops-${type}-btn-merge"
                     style="${flexStyle}">${okHTML}${cancelHTML}</div>
             </div>
             `;
 		} else {
-			resultHTML = /*html*/ `<div class="pops-${type}-btn" style="${btnStyle}">${okHTML}${cancelHTML}${ohterHTML}</div>`;
+			resultHTML = /*html*/ `<div class="pops-botttom-btn-controls pops-${type}-btn" style="${btnStyle}">${okHTML}${cancelHTML}${ohterHTML}</div>`;
 		}
 		return resultHTML;
 	},

package/src/handler/PopsHandler.ts

@@ -1,14 +1,14 @@
-import type { PopsAlertDetails } from "../components/alert/indexType";
-import type { PopsConfirmDetails } from "../components/confirm/indexType";
-import type { PopsDrawerDetails } from "../components/drawer/indexType";
-import type { PopsFolderDetails } from "../components/folder/indexType";
-import type { PopsIframeDetails } from "../components/iframe/indexType";
-import type { PopsLoadingDetails } from "../components/loading/indexType";
-import type { PopsPanelDetails } from "../components/panel/indexType";
-import type { PopsPromptDetails } from "../components/prompt/indexType";
-import { PopsCore } from "../Core";
+import type { PopsAlertDetails } from "../components/alert/types";
+import type { PopsConfirmDetails } from "../components/confirm/types";
+import type { PopsDrawerDetails } from "../components/drawer/types";
+import type { PopsFolderDetails } from "../components/folder/types";
+import type { PopsIframeDetails } from "../components/iframe/types";
+import type { PopsLoadingDetails } from "../components/loading/types";
+import type { PopsPanelDetails } from "../components/panel/types";
+import type { PopsPromptDetails } from "../components/prompt/types/index";
+import { PopsCore } from "../PopsCore";
 import { PopsAnimation } from "../PopsAnimation";
-import { PopsLayer } from "../PopsLayer";
+import { PopsLayerData } from "../PopsLayer";
 import type { PopsCommonConfig } from "../types/components";
 import { PopsEventDetails, PopsHandlerEventDetails } from "../types/event";
 import { PopsLayerCommonConfig } from "../types/layer";
@@ -114,7 +114,7 @@ export const PopsHandler = {
 		function clickEvent(event: MouseEvent | PointerEvent) {
 			popsDOMUtils.preventEvent(event);
 			// 获取该类型实例存储列表
-			let targetLayer = PopsLayer[details.type];
+			let targetLayer = PopsLayerData[details.type];
 			function originalRun() {
 				if (details.config.mask!.clickEvent!.toClose) {
 					/* 关闭 */
@@ -403,7 +403,7 @@ export const PopsHandler = {
 			close() {
 				return PopsInstanceUtils.close(
 					mode,
-					PopsLayer[mode],
+					PopsLayerData[mode],
 					guid,
 					config,
 					animElement
@@ -412,7 +412,7 @@ export const PopsHandler = {
 			hide() {
 				return PopsInstanceUtils.hide(
 					mode,
-					PopsLayer[mode],
+					PopsLayerData[mode],
 					guid,
 					config,
 					animElement,
@@ -422,7 +422,7 @@ export const PopsHandler = {
 			show() {
 				return PopsInstanceUtils.show(
 					mode,
-					PopsLayer[mode],
+					PopsLayerData[mode],
 					guid,
 					config,
 					animElement,
@@ -466,7 +466,7 @@ export const PopsHandler = {
 			close() {
 				return PopsInstanceUtils.close(
 					mode,
-					PopsLayer[mode],
+					PopsLayerData[mode],
 					guid,
 					config,
 					animElement
@@ -475,7 +475,7 @@ export const PopsHandler = {
 			hide() {
 				return PopsInstanceUtils.hide(
 					mode,
-					PopsLayer[mode],
+					PopsLayerData[mode],
 					guid,
 					config,
 					animElement,
@@ -485,7 +485,7 @@ export const PopsHandler = {
 			show() {
 				return PopsInstanceUtils.show(
 					mode,
-					PopsLayer[mode],
+					PopsLayerData[mode],
 					guid,
 					config,
 					animElement,
@@ -639,20 +639,20 @@ export const PopsHandler = {
 				type === "tooltip" ||
 				type === "rightClickMenu"
 			) {
-				let layer = PopsLayer[type as keyof typeof PopsLayer];
+				let layer = PopsLayerData[type as keyof typeof PopsLayerData];
 				if (layer) {
 					PopsInstanceUtils.removeInstance([layer], "", true);
 				}
 			} else {
 				PopsInstanceUtils.removeInstance(
 					[
-						PopsLayer.alert,
-						PopsLayer.confirm,
-						PopsLayer.prompt,
-						PopsLayer.iframe,
-						PopsLayer.drawer,
-						PopsLayer.folder,
-						PopsLayer.panel,
+						PopsLayerData.alert,
+						PopsLayerData.confirm,
+						PopsLayerData.prompt,
+						PopsLayerData.iframe,
+						PopsLayerData.drawer,
+						PopsLayerData.folder,
+						PopsLayerData.panel,
 					],
 					"",
 					true
@@ -677,6 +677,6 @@ export const PopsHandler = {
 	 * @param value
 	 */
 	handlePush(type: PopsLayerMode, value: PopsLayerCommonConfig) {
-		PopsLayer[type].push(value);
+		PopsLayerData[type].push(value);
 	},
 };

package/src/types/button.d.ts

@@ -16,7 +16,8 @@ export type PopsButtonStyleType =
 	| "success"
 	| "info"
 	| "warning"
-	| "danger";
+	| "danger"
+	| "violet";
 
 /**
  * 按钮大小
@@ -118,48 +119,13 @@ export interface PopsButtonDetails<T = {}> {
 /**
  * 按钮配置（匹配任意类型）
  */
-export interface PopsButtonDetailsAnyType<T = {}> {
-	/**
-	 * 是否启用按钮
-	 */
-	enable: boolean;
-	/**
-	 * 图标按钮，如果名字为内置的，则使用内置的，否则为自定义的svg
-	 */
-	icon: PopsIconType;
-	/**
-	 * 图标按钮是否放在右边
-	 */
-	rightIcon: boolean;
-	/**
-	 * 图标按钮是否是旋转360°
-	 * @default false
-	 */
-	iconIsLoading: boolean;
-	/**
-	 * 按钮尺寸大小
-	 * @default ""
-	 */
-	size: PopsButtonSize;
+export type PopsButtonDetailsAnyType<T = {}> = PopsButtonDetails<T> & {
 	/**
 	 * 按钮样式类型
+	 * @default "default"
 	 */
 	type: string;
-	/**
-	 * 按钮文字
-	 * @default ""
-	 */
-	text: string;
-	/**
-	 * 按钮点击的回调
-	 *
-	 * 如果传入该值，那么将不会自动关闭弹窗
-	 */
-	callback(
-		eventDetails: PopsHandlerEventDetails & T,
-		event: PointerEvent | MouseEvent
-	): void;
-}
+};
 
 /** prompt的点击回调 */
 export interface PopsPromptButtonDetails extends PopsButtonDetails {

package/src/types/event.d.ts

@@ -1,4 +1,4 @@
-import type { PopsIframeDetails } from "../components/iframe/indexType";
+import type { PopsIframeDetails } from "../components/iframe/types";
 import type { PopsMode } from "./main";
 
 /**

package/src/types/main.d.ts

@@ -1,21 +1,21 @@
-import type { PopsAlertDetails } from "../components/alert/indexType";
-import type { PopsConfirmDetails } from "../components/confirm/indexType";
-import type { PopsDrawerDetails } from "../components/drawer/indexType";
-import type { PopsFolderDetails } from "../components/folder/indexType";
-import type { PopsIframeDetails } from "../components/iframe/indexType";
-import type { PopsLoadingDetails } from "../components/loading/indexType";
-import type { PopsPanelButtonDetails } from "../components/panel/buttonType";
-import type { PopsPanelDeepMenuDetails } from "../components/panel/deepMenuType";
-import type { PopsPanelDetails } from "../components/panel/indexType";
-import type { PopsPanelInputDetails } from "../components/panel/inputType";
-import type { PopsPanelOwnDetails } from "../components/panel/ownType";
-import type { PopsPanelSelectDetails } from "../components/panel/selectType";
-import type { PopsPanelSliderDetails } from "../components/panel/sliderType";
-import type { PopsPanelSwitchDetails } from "../components/panel/switchType";
-import type { PopsPanelTextAreaDetails } from "../components/panel/textareaType";
-import type { PopsPromptDetails } from "../components/prompt/indexType";
-import { PopsRightClickMenuDetails } from "../components/rightClickMenu/indexType";
-import { PopsToolTipDetails } from "../components/tooltip/indexType";
+import type { PopsAlertDetails } from "../components/alert/types";
+import type { PopsConfirmDetails } from "../components/confirm/types";
+import type { PopsDrawerDetails } from "../components/drawer/types";
+import type { PopsFolderDetails } from "../components/folder/types";
+import type { PopsIframeDetails } from "../components/iframe/types";
+import type { PopsLoadingDetails } from "../components/loading/types";
+import type { PopsPanelButtonDetails } from "../components/panel/types/components-button";
+import type { PopsPanelDeepMenuDetails } from "../components/panel/types/components-deepMenu";
+import type { PopsPanelDetails } from "../components/panel/types";
+import type { PopsPanelInputDetails } from "../components/panel/types/components-input";
+import type { PopsPanelOwnDetails } from "../components/panel/types/components-own";
+import type { PopsPanelSelectDetails } from "../components/panel/types/components-select";
+import type { PopsPanelSliderDetails } from "../components/panel/types/components-slider";
+import type { PopsPanelSwitchDetails } from "../components/panel/types/components-switch";
+import type { PopsPanelTextAreaDetails } from "../components/panel/types/components-textarea";
+import type { PopsPromptDetails } from "../components/prompt/types/index";
+import { PopsRightClickMenuDetails } from "../components/rightClickMenu/types";
+import { PopsToolTipDetails } from "../components/tooltip/types/index";
 
 export interface PopsUtilsOwnObject<V extends any> {
 	[key: string]: V | PopsUtilsOwnObject<V>;

package/src/types/mask.d.ts

@@ -1,10 +1,10 @@
-import type { PopsAlertDetails } from "../components/alert/indexType";
-import type { PopsDrawerDetails } from "../components/drawer/indexType";
-import type { PopsFolderDetails } from "../components/folder/indexType";
-import type { PopsIframeDetails } from "../components/iframe/indexType";
-import type { PopsLoadingDetails } from "../components/loading/indexType";
-import type { PopsPanelDetails } from "../components/panel/indexType";
-import type { PopsPromptDetails } from "../components/prompt/indexType";
+import type { PopsAlertDetails } from "../components/alert/types";
+import type { PopsDrawerDetails } from "../components/drawer/types";
+import type { PopsFolderDetails } from "../components/folder/types";
+import type { PopsIframeDetails } from "../components/iframe/types";
+import type { PopsLoadingDetails } from "../components/loading/types";
+import type { PopsPanelDetails } from "../components/panel/types";
+import type { PopsPromptDetails } from "../components/prompt/types/index";
 
 /**
  * 遮罩层配置

package/src/utils/PopsDOMUtils.ts

@@ -7,8 +7,8 @@ import type {
 	PopsDOMUtils_Event,
 	PopsDOMUtilsElementEventType,
 } from "../types/PopsDOMUtilsEventType";
-import { SymbolEvents } from "../Config";
-import { OriginPrototype, PopsCore } from "../Core";
+import { SymbolEvents } from "./PopsDOMUtilsEventsConfig";
+import { OriginPrototype, PopsCore } from "../PopsCore";
 import { popsUtils } from "./PopsUtils";
 import { PopsSafeUtils } from "./PopsSafeUtils";
 

package/src/{Config.ts → utils/PopsDOMUtilsEventsConfig.ts}

@@ -1,3 +1,6 @@
+/**
+ * 存储在元素属性上的事件名
+ */
 export const SymbolEvents = Symbol(
 	"events_" + (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1)
 );

package/src/utils/PopsInstanceUtils.ts

@@ -1,17 +1,17 @@
-import type { PopsAlertDetails } from "../components/alert/indexType";
-import type { PopsConfirmDetails } from "../components/confirm/indexType";
-import type { PopsDrawerDetails } from "../components/drawer/indexType";
-import type { PopsFolderDetails } from "../components/folder/indexType";
-import type { PopsIframeDetails } from "../components/iframe/indexType";
-import type { PopsLoadingDetails } from "../components/loading/indexType";
-import type { PopsPanelDetails } from "../components/panel/indexType";
-import type { PopsPromptDetails } from "../components/prompt/indexType";
+import type { PopsAlertDetails } from "../components/alert/types";
+import type { PopsConfirmDetails } from "../components/confirm/types";
+import type { PopsDrawerDetails } from "../components/drawer/types";
+import type { PopsFolderDetails } from "../components/folder/types";
+import type { PopsIframeDetails } from "../components/iframe/types";
+import type { PopsLoadingDetails } from "../components/loading/types";
+import type { PopsPanelDetails } from "../components/panel/types";
+import type { PopsPromptDetails } from "../components/prompt/types/index";
 import type { PopsLayerCommonConfig } from "../types/layer";
 import type { PopsLayerMode } from "../types/main";
 import { popsDOMUtils } from "./PopsDOMUtils";
 import { popsUtils } from "./PopsUtils";
-import { PopsCore } from "../Core";
-import { PopsLayer } from "../PopsLayer";
+import { PopsCore } from "../PopsCore";
+import { PopsLayerData } from "../PopsLayer";
 import { PopsAnimation } from "../PopsAnimation";
 
 export const PopsInstanceUtils = {
@@ -121,8 +121,8 @@ export const PopsInstanceUtils = {
 		function isVisibleNode($css: CSSStyleDeclaration): boolean {
 			return $css.position !== "static" && $css.display !== "none";
 		}
-		Object.keys(PopsLayer).forEach((layerName) => {
-			let layerList = PopsLayer[layerName as PopsLayerMode];
+		Object.keys(PopsLayerData).forEach((layerName) => {
+			let layerList = PopsLayerData[layerName as PopsLayerMode];
 			for (let index = 0; index < layerList.length; index++) {
 				const layer = layerList[index];
 				let nodeStyle = window.getComputedStyle(layer.animElement);

package/src/utils/PopsUtils.ts

@@ -1,4 +1,4 @@
-import { PopsCore } from "../Core";
+import { PopsCore } from "../PopsCore";
 import type { PopsUtilsOwnObject } from "../types/main";
 import {
 	clearInterval as WorkerClearInterval,