@whitesev/pops 2.0.8 → 2.0.10

package/src/components/panel/config.ts

@@ -233,40 +233,66 @@ export const PopsPanelConfig = (): DeepRequired<PopsPanelDetails> => {
 								value: "select-1",
 								text: "单选1",
 								isHTML: false,
-								disable() {
-									return false;
+								disable(value, allSelectedInfo) {
+									return (
+										allSelectedInfo.findIndex((it) =>
+											["select-5"].includes(it.value)
+										) !== -1
+									);
 								},
 							},
 							{
 								value: "select-2",
 								text: "单选2",
 								isHTML: false,
-								disable() {
-									return false;
+								disable(value, allSelectedInfo) {
+									return (
+										allSelectedInfo.findIndex((it) =>
+											["select-5"].includes(it.value)
+										) !== -1
+									);
 								},
 							},
 							{
 								value: "select-3",
 								text: "单选3",
 								isHTML: false,
-								disable() {
-									return false;
+								disable(value, allSelectedInfo) {
+									return (
+										allSelectedInfo.findIndex((it) =>
+											["select-2", "select-5"].includes(it.value)
+										) !== -1
+									);
 								},
 							},
 							{
 								value: "select-4",
 								text: "单选4",
 								isHTML: false,
-								disable() {
-									return false;
+								disable(value, allSelectedInfo) {
+									return (
+										allSelectedInfo.findIndex((it) =>
+											["select-3", "select-5"].includes(it.value)
+										) !== -1
+									);
 								},
 							},
 							{
 								value: "select-5",
-								text: "单选5",
+								text(value, allSelectedInfo) {
+									return allSelectedInfo.findIndex((it) =>
+										["select-4"].includes(it.value)
+									) !== -1
+										? "单选5-禁用"
+										: "单选5";
+								},
 								isHTML: false,
-								disable() {
-									return false;
+								disable(value, allSelectedInfo) {
+									return (
+										allSelectedInfo.findIndex((it) =>
+											["select-4"].includes(it.value)
+										) !== -1
+									);
 								},
 							},
 						],

package/src/components/panel/selectMultipleType.ts

@@ -9,9 +9,17 @@ export interface PopsPanelSelectMultipleDataOption<T> {
 	/**
 	 * 显示的文字
 	 */
-	text: string;
+	text:
+		| string
+		| ((
+				/** 当前的值 */
+				value: T,
+				/** 所有选中的配置信息 */
+				allSelectedInfo: PopsPanelSelectMultipleDataOption<T>[]
+		  ) => string);
 	/**
 	 * 显示的文字是否是html
+	 * @default false
 	 */
 	isHTML?: boolean;
 	/**
@@ -19,8 +27,13 @@ export interface PopsPanelSelectMultipleDataOption<T> {
 	 * 触发条件：
 	 * + 点击select元素
 	 * + select元素触发change事件
+	 * @param value 当前的值
+	 * @param allSelectedInfo 所有选中的配置信息
 	 */
-	disable?(value: T): boolean;
+	disable?(
+		value: T,
+		allSelectedInfo: PopsPanelSelectMultipleDataOption<T>[]
+	): boolean;
 }
 /**
  * pops.panel的 select
@@ -79,12 +92,7 @@ export interface PopsPanelSelectMultipleDetails<T = any>
 	 */
 	callback?(
 		/** 当前已选中的信息 */
-		isSelectedInfo: {
-			/** 值 */
-			value: T;
-			/** 显示的文字 */
-			text: string;
-		}[]
+		isSelectedInfo: PopsPanelSelectMultipleDataOption<any>[]
 	): void;
 	/**
 	 * 点击某个项的元素触发该回调
@@ -95,12 +103,7 @@ export interface PopsPanelSelectMultipleDetails<T = any>
 	clickCallBack?(
 		event: PointerEvent | MouseEvent,
 		/** 当前已选中的信息 */
-		isSelectedInfo: {
-			/** 值 */
-			value: T;
-			/** 显示的文字 */
-			text: string;
-		}[]
+		isSelectedInfo: PopsPanelSelectMultipleDataOption<any>[]
 	): void | boolean;
 	/**
 	 * 点击标签tag的关闭图标触发该回调
@@ -116,7 +119,7 @@ export interface PopsPanelSelectMultipleDetails<T = any>
 			/** 值 */
 			value: T;
 			/** 显示的文字 */
-			text: string;
+			text: PopsPanelSelectMultipleDataOption<T>["text"];
 		}
 	) => void | boolean;
 	/**

package/src/components/tooltip/config.ts

@@ -6,6 +6,7 @@ export const PopsTooltipConfig = (): DeepRequired<PopsToolTipDetails> => {
 		useShadowRoot: true,
 		target: null as any,
 		content: "默认文字",
+		isDiffContent: false,
 		position: "top",
 		className: "",
 		isFixed: false,

package/src/components/tooltip/index.ts

@@ -128,6 +128,19 @@ export class ToolTip {
 		if (text == null) {
 			text = this.getContent();
 		}
+		if (this.$data.config.isDiffContent) {
+			let contentPropKey = "data-content";
+			// @ts-ignore
+			let originContentText: string = this.$el.$content[contentPropKey];
+			if (typeof originContentText === "string") {
+				if (originContentText === text) {
+					// 内容未改变，不修改避免渲染
+					return;
+				}
+			}
+			// @ts-ignore
+			this.$el.$content[contentPropKey] = text;
+		}
 		PopsSafeUtils.setSafeHTML(this.$el.$content, text);
 	}
 	/**

package/src/components/tooltip/indexType.ts

@@ -24,6 +24,13 @@ export interface PopsToolTipDetails
 	 * 显示的文字
 	 */
 	content: string | (() => string);
+	/**
+	 * 是否比较获取到的content的内容是否改变
+	 *
+	 * 如果未改变，则在触发.show时不修改内容
+	 * @default false
+	 */
+	isDiffContent?: boolean;
 	/**
 	 * 位置
 	 * + `follow` 跟随鼠标|触摸位置移动