@whitesev/pops 1.9.5 → 1.9.7

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

@@ -1,4 +1,6 @@
 import type { PopsPanelCommonDetails } from "./commonType";
+import type { PopsPanelFormsDetails } from "./formsType";
+import type { PopsPanelFormsTotalDetails } from "./indexType";
 /**
  * pops.panel的 select
  */
@@ -71,5 +73,9 @@ export interface PopsPanelSelectDetails<T = any> extends PopsPanelCommonDetails<
          * + select元素触发change事件
          */
         disable?(value: T): boolean;
+        /**
+         * 子配置，跟随切换改变
+         */
+        forms?: (PopsPanelFormsDetails | PopsPanelFormsTotalDetails)[] | (() => (PopsPanelFormsDetails | PopsPanelFormsTotalDetails)[]);
     }[];
 }

package/dist/types/src/handler/PopsHandler.d.ts

@@ -174,16 +174,7 @@ export declare const PopsHandler: {
     /**
      * 处理返回的配置，针对popsHandler.handleEventDetails
      */
-    handleResultDetails(details: any): {
-        $shadowContainer: HTMLDivElement;
-        $shadowRoot: ShadowRoot;
-        animElement: HTMLElement;
-        popsElement: HTMLElement;
-        maskElement: HTMLElement;
-        close: () => void;
-        hide: () => void;
-        show: () => void;
-    };
+    handleResultDetails<T extends unknown>(details: T): Omit<T, "type" | "function">;
     /**
      * 处理点击事件
      * @param type 当前按钮类型

package/package.json

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

package/src/Pops.ts

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

package/src/components/drawer/index.ts

@@ -16,7 +16,7 @@ export class PopsDrawer {
 		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,
@@ -121,7 +121,6 @@ export class PopsDrawer {
 			$shadowContainer,
 			$shadowRoot,
 			PopsType,
-
 			$anim,
 			$pops,
 			$mask!,
@@ -243,11 +242,8 @@ export class PopsDrawer {
 
 		PopsHandler.handlePush(PopsType, {
 			guid: guid,
-
 			animElement: $anim,
-
 			popsElement: $pops,
-
 			maskElement: $mask!,
 			$shadowContainer: $shadowContainer,
 			$shadowRoot: $shadowRoot,

package/src/components/panel/PanelHandleContentDetails.ts

@@ -1325,6 +1325,7 @@ export const PanelHandleContentDetails = () => {
 		 * @param formConfig
 		 */
 		createSectionContainerItem_select(formConfig: PopsPanelSelectDetails<any>) {
+			const that = this;
 			let liElement = document.createElement("li");
 			(liElement as any)["__formConfig__"] = formConfig;
 			this.setElementClassName(liElement, formConfig.className);
@@ -1357,6 +1358,7 @@ export const PanelHandleContentDetails = () => {
 				$eleKey: {
 					disable: "__disable__",
 					value: "__value__",
+					forms: "__forms__",
 				},
 				$data: {
 					defaultValue: formConfig.getValue(),
@@ -1387,14 +1389,23 @@ export const PanelHandleContentDetails = () => {
 				getNodeValue($ele: HTMLElement, key: string) {
 					return Reflect.get($ele, key);
 				},
+				/**
+				 * 禁用选项
+				 */
 				disable() {
 					this.$ele.select.setAttribute("disabled", "true");
 					this.$ele.panelSelect.classList.add("pops-panel-select-disable");
 				},
+				/**
+				 * 取消禁用
+				 */
 				notDisable() {
 					this.$ele.select.removeAttribute("disabled");
 					this.$ele.panelSelect.classList.remove("pops-panel-select-disable");
 				},
+				/**
+				 * 判断是否禁用
+				 */
 				isDisabled() {
 					return (
 						this.$ele.select.hasAttribute("disabled") ||
@@ -1403,6 +1414,9 @@ export const PanelHandleContentDetails = () => {
 						)
 					);
 				},
+				/**
+				 * 初始化选项
+				 */
 				initOption() {
 					formConfig.data.forEach((dataItem) => {
 						// 初始化默认选中
@@ -1417,13 +1431,24 @@ export const PanelHandleContentDetails = () => {
 							this.$eleKey.disable,
 							dataItem.disable
 						);
+						this.setNodeValue(
+							optionElement,
+							this.$eleKey.forms,
+							dataItem.forms
+						);
 						if (dataItem.value === this.$data.defaultValue) {
-							optionElement.setAttribute("selected", "true");
+							this.setOptionSelected(optionElement);
 						}
 						optionElement.innerText = dataItem.text;
 						this.$ele.select.appendChild(optionElement);
 					});
 				},
+				/**
+				 * 设置选项选中
+				 */
+				setOptionSelected($option: HTMLOptionElement) {
+					$option.setAttribute("selected", "true");
+				},
 				/** 检测所有option并设置禁用状态 */
 				setSelectOptionsDisableStatus() {
 					if (this.$ele.select.options && this.$ele.select.options.length) {
@@ -1453,9 +1478,14 @@ export const PanelHandleContentDetails = () => {
 				getSelectOptionInfo($option: HTMLOptionElement) {
 					let optionValue = this.getNodeValue($option, this.$eleKey.value);
 					let optionText = $option.innerText || $option.textContent!;
+					let optionForms = this.getNodeValue(
+						$option,
+						this.$eleKey.forms
+					) as (typeof formConfig.data)[0]["forms"];
 					return {
 						value: optionValue,
 						text: optionText,
+						forms: optionForms,
 						$option: $option,
 					};
 				},
@@ -1464,18 +1494,44 @@ export const PanelHandleContentDetails = () => {
 				 */
 				setChangeEvent() {
 					popsDOMUtils.on(this.$ele.select, "change", void 0, (event) => {
+						let $isSelectedElement = (event as any).target[
+							(event as any).target.selectedIndex
+						] as HTMLOptionElement;
+						let selectInfo = this.getSelectOptionInfo($isSelectedElement);
 						this.setSelectOptionsDisableStatus();
 						if (typeof formConfig.callback === "function") {
-							let $isSelectedElement = (event as any).target[
-								(event as any).target.selectedIndex
-							] as HTMLOptionElement;
-							let selectInfo = this.getSelectOptionInfo($isSelectedElement);
 							formConfig.callback(
 								event as any,
 								selectInfo.value,
 								selectInfo.text
 							);
 						}
+						let forms =
+							typeof selectInfo.forms === "function"
+								? selectInfo.forms()
+								: selectInfo.forms;
+						if (Array.isArray(forms)) {
+							/* 如果成功创建，加入到中间容器中 */
+							let childUListClassName = "pops-panel-select-child-forms";
+							// 移除旧的元素
+							while (liElement.nextElementSibling) {
+								if (
+									liElement.nextElementSibling.classList.contains(
+										childUListClassName
+									)
+								) {
+									liElement.nextElementSibling.remove();
+								} else {
+									break;
+								}
+							}
+							let $childUList = document.createElement("ul");
+							$childUList.className = childUListClassName;
+							popsDOMUtils.after(liElement, $childUList);
+							that.uListContainerAddItem(formConfig as any, {
+								ulElement: $childUList,
+							});
+						}
 					});
 				},
 				/**
@@ -1852,6 +1908,19 @@ export const PanelHandleContentDetails = () => {
 							Reflect.set($item, "data-info", dataInfo);
 							return $item;
 						}
+						/**
+						 * 设置选择项的禁用状态
+						 */
+						function setSelectItemDisabled($el: HTMLElement) {
+							$el.setAttribute("aria-disabled", "true");
+						}
+						/**
+						 * 移除选择项的禁用状态
+						 */
+						function removeSelectItemDisabled($el: HTMLElement) {
+							$el.removeAttribute("aria-disabled");
+							$el.removeAttribute("disabled");
+						}
 						/**
 						 * 设置选择项的点击事件
 						 */
@@ -1861,6 +1930,9 @@ export const PanelHandleContentDetails = () => {
 								"click",
 								(event) => {
 									popsDOMUtils.preventEvent(event);
+									if ($ele.hasAttribute("disabled") || $ele.ariaDisabled) {
+										return;
+									}
 									if (typeof formConfig.clickCallBack === "function") {
 										let clickResult = formConfig.clickCallBack(
 											event,
@@ -1931,7 +2003,6 @@ export const PanelHandleContentDetails = () => {
 									--el-fill-color-light: #f5f7fa;
 								}
 								.select-item{
-									cursor: pointer;
 									cursor: pointer;
 									font-size: var(--el-font-size-base);
 									padding: 0 32px 0 20px;
@@ -1944,6 +2015,12 @@ export const PanelHandleContentDetails = () => {
 									line-height: 34px;
 									box-sizing: border-box;
 								}
+								.select-item[aria-disabled],
+								.select-item[disabled]{
+									cursor: not-allowed;
+									color: #a8abb2;
+									background: unset;
+								}
 								.select-item:hover{
 									background-color: var(--el-fill-color-light);
 								}
@@ -1986,6 +2063,17 @@ export const PanelHandleContentDetails = () => {
 							$selectContainer.appendChild($select);
 							// 设置每一项的点击事件
 							setSelectElementClickEvent($select);
+							// 设置禁用状态
+							if (
+								typeof item.disable === "function" &&
+								item.disable(item.value)
+							) {
+								setSelectItemDisabled($select);
+								// 后续不设置元素的选中状态
+								return;
+							}
+							// 移除禁用状态
+							removeSelectItemDisabled($select);
 							let findValue = selectedInfo.find(
 								(value) => value.value === item.value
 							);

package/src/components/panel/config.ts

@@ -187,6 +187,7 @@ export const PopsPanelConfig = (): DeepRequired<PopsPanelDetails> => {
 								disable() {
 									return false;
 								},
+								forms: [],
 							},
 							{
 								value: "text",
@@ -194,6 +195,7 @@ export const PopsPanelConfig = (): DeepRequired<PopsPanelDetails> => {
 								disable() {
 									return false;
 								},
+								forms: [],
 							},
 							{
 								value: "html",
@@ -201,6 +203,7 @@ export const PopsPanelConfig = (): DeepRequired<PopsPanelDetails> => {
 								disable() {
 									return false;
 								},
+								forms: [],
 							},
 						],
 					},

package/src/components/panel/selectType.ts

@@ -1,4 +1,6 @@
 import type { PopsPanelCommonDetails } from "./commonType";
+import type { PopsPanelFormsDetails } from "./formsType";
+import type { PopsPanelFormsTotalDetails } from "./indexType";
 
 /**
  * pops.panel的 select
@@ -80,5 +82,11 @@ export interface PopsPanelSelectDetails<T = any>
 		 * + select元素触发change事件
 		 */
 		disable?(value: T): boolean;
+		/**
+		 * 子配置，跟随切换改变
+		 */
+		forms?:
+			| (PopsPanelFormsDetails | PopsPanelFormsTotalDetails)[]
+			| (() => (PopsPanelFormsDetails | PopsPanelFormsTotalDetails)[]);
 	}[];
 }

package/src/components/tooltip/index.ts

@@ -34,7 +34,12 @@ export class ToolTip {
 		this.$data.guid = guid;
 		this.$el.$shadowContainer = ShadowInfo.$shadowContainer;
 		this.$el.$shadowRoot = ShadowInfo.$shadowRoot;
-
+		this.show = this.show.bind(this);
+		this.close = this.close.bind(this);
+		this.toolTipAnimationFinishEvent =
+			this.toolTipAnimationFinishEvent.bind(this);
+		this.toolTipMouseEnterEvent = this.toolTipMouseEnterEvent.bind(this);
+		this.toolTipMouseLeaveEvent = this.toolTipMouseLeaveEvent.bind(this);
 		this.init();
 	}
 	init() {
@@ -328,7 +333,7 @@ export class ToolTip {
 		popsDOMUtils.on(
 			this.$data.config.target,
 			this.$data.config.triggerShowEventName,
-			this.show.bind(this),
+			this.show,
 			this.$data.config.eventOption
 		);
 	}
@@ -339,7 +344,7 @@ export class ToolTip {
 		popsDOMUtils.off(
 			this.$data.config.target,
 			this.$data.config.triggerShowEventName,
-			this.show.bind(this),
+			this.show,
 			{
 				capture: true,
 			}
@@ -400,7 +405,7 @@ export class ToolTip {
 		popsDOMUtils.on(
 			this.$data.config.target,
 			this.$data.config.triggerCloseEventName,
-			this.close.bind(this),
+			this.close,
 			this.$data.config.eventOption
 		);
 	}
@@ -411,7 +416,7 @@ export class ToolTip {
 		popsDOMUtils.off(
 			this.$data.config.target,
 			this.$data.config.triggerCloseEventName,
-			this.close.bind(this),
+			this.close,
 			{
 				capture: true,
 			}
@@ -450,7 +455,7 @@ export class ToolTip {
 		popsDOMUtils.on(
 			this.$el.$toolTip,
 			popsDOMUtils.getAnimationEndNameList(),
-			this.toolTipAnimationFinishEvent.bind(this)
+			this.toolTipAnimationFinishEvent
 		);
 	}
 	/**
@@ -460,7 +465,7 @@ export class ToolTip {
 		popsDOMUtils.off(
 			this.$el.$toolTip,
 			popsDOMUtils.getAnimationEndNameList(),
-			this.toolTipAnimationFinishEvent.bind(this)
+			this.toolTipAnimationFinishEvent
 		);
 	}
 	/**
@@ -484,7 +489,7 @@ export class ToolTip {
 		popsDOMUtils.on(
 			this.$el.$toolTip,
 			"mouseenter touchstart",
-			this.toolTipMouseEnterEvent.bind(this),
+			this.toolTipMouseEnterEvent,
 			this.$data.config.eventOption
 		);
 	}
@@ -495,7 +500,7 @@ export class ToolTip {
 		popsDOMUtils.off(
 			this.$el.$toolTip,
 			"mouseenter touchstart",
-			this.toolTipMouseEnterEvent.bind(this),
+			this.toolTipMouseEnterEvent,
 			this.$data.config.eventOption
 		);
 	}
@@ -513,7 +518,7 @@ export class ToolTip {
 		popsDOMUtils.on(
 			this.$el.$toolTip,
 			"mouseleave touchend",
-			this.toolTipMouseLeaveEvent.bind(this),
+			this.toolTipMouseLeaveEvent,
 			this.$data.config.eventOption
 		);
 	}
@@ -524,7 +529,7 @@ export class ToolTip {
 		popsDOMUtils.off(
 			this.$el.$toolTip,
 			"mouseleave touchend",
-			this.toolTipMouseLeaveEvent.bind(this),
+			this.toolTipMouseLeaveEvent,
 			this.$data.config.eventOption
 		);
 	}

package/src/handler/PopsHandler.ts

@@ -496,16 +496,7 @@ export const PopsHandler = {
 	/**
 	 * 处理返回的配置，针对popsHandler.handleEventDetails
 	 */
-	handleResultDetails(details: any): {
-		$shadowContainer: HTMLDivElement;
-		$shadowRoot: ShadowRoot;
-		animElement: HTMLElement;
-		popsElement: HTMLElement;
-		maskElement: HTMLElement;
-		close: () => void;
-		hide: () => void;
-		show: () => void;
-	} {
+	handleResultDetails<T extends any>(details: T): Omit<T, "type" | "function"> {
 		let resultDetails = Object.assign({}, details);
 		popsUtils.delete(resultDetails, "type");
 		popsUtils.delete(resultDetails, "function");