@whitesev/pops 1.7.3 → 1.7.5

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

@@ -79,7 +79,7 @@ declare class Pops {
             formatTime(text?: string | number | Date, formatType?: string): string;
             formatTime(text?: string | number | Date, formatType?: "yyyy-MM-dd HH:mm:ss" | "yyyy/MM/dd HH:mm:ss" | "yyyy_MM_dd_HH_mm_ss" | "yyyy\u5E74MM\u6708dd\u65E5 HH\u65F6mm\u5206ss\u79D2" | "yyyy\u5E74MM\u6708dd\u65E5 hh:mm:ss" | "yyyy\u5E74MM\u6708dd\u65E5 HH:mm:ss" | "yyyy-MM-dd" | "yyyyMMdd" | "HH:mm:ss"): string;
             formatByteToSize<T extends boolean>(byteSize: number | string, addType?: T | undefined): T extends true ? string : number;
-            AnyTouch: () => any;
+            AnyTouch: () => typeof import("any-touch").default;
         };
         /** pops使用的DOM工具类 */
         DOMUtils: {
@@ -162,6 +162,7 @@ declare class Pops {
             drag(moveElement: HTMLElement, options: {
                 dragElement: HTMLElement;
                 limit: boolean;
+                triggerClick?: boolean;
                 extraDistance: number;
                 container?: Window | typeof globalThis | HTMLElement;
                 moveCallBack?: (moveElement: HTMLElement, left: number, top: number) => void;

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

@@ -92,6 +92,7 @@ export declare const PopsInstanceUtils: {
     drag(moveElement: HTMLElement, options: {
         dragElement: HTMLElement;
         limit: boolean;
+        triggerClick?: boolean;
         extraDistance: number;
         container?: Window | typeof globalThis | HTMLElement;
         moveCallBack?: (moveElement: HTMLElement, left: number, top: number) => void;

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

@@ -1,3 +1,4 @@
+import AnyTouch from "any-touch";
 declare class PopsUtils {
     /**
      * 判断是否是window，例如window、self、globalThis
@@ -117,7 +118,7 @@ declare class PopsUtils {
      * > 793.27
      **/
     formatByteToSize<T extends boolean>(byteSize: number | string, addType?: T): T extends true ? string : number;
-    AnyTouch: () => any;
+    AnyTouch: () => typeof AnyTouch;
 }
 declare const popsUtils: PopsUtils;
 export { popsUtils };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitesev/pops",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "description": "弹窗库",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -37,6 +37,7 @@
     "@rollup/plugin-commonjs": "^25.0.8",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
+    "any-touch": "^2.2.0",
     "rollup-plugin-clear": "^2.0.7",
     "tslib": "^2.6.2"
   },

package/src/Pops.ts

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

package/src/components/alert/index.css

@@ -16,30 +16,32 @@
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	font-weight: 500;
-	line-height: var(--container-title-height);
-}
-.pops[type-value="alert"] .pops-alert-content p[pops] {
-	padding: 5px 10px;
-	color: rgb(51, 51, 51);
-	text-indent: 15px;
+	line-height: normal;
 }
 .pops[type-value="alert"] .pops-alert-content {
 	width: 100%;
-	height: calc(
+	/*height: calc(
 		100% - var(--container-title-height) - var(--container-bottom-btn-height)
-	);
+	);*/
+	flex: 1;
 	overflow: auto;
 	word-break: break-word;
 }
+.pops[type-value="alert"] .pops-alert-content p[pops] {
+	padding: 5px 10px;
+	color: rgb(51, 51, 51);
+	text-indent: 15px;
+}
 .pops[type-value="alert"] .pops-alert-btn {
-	position: absolute;
-	bottom: 0;
+	/*position: absolute;
+	bottom: 0;*/
 	display: flex;
 	padding: 10px 10px 10px 10px;
 	width: 100%;
 	height: var(--container-bottom-btn-height);
+	max-height: var(--container-bottom-btn-height);
+	line-height: normal;
 	border-top: 1px solid rgb(229, 229, 229, var(--pops-bd-opacity));
 	text-align: right;
-	line-height: var(--container-bottom-btn-height);
 	align-items: center;
 }

package/src/components/confirm/index.css

@@ -16,30 +16,32 @@
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	font-weight: 500;
-	line-height: var(--container-title-height);
-}
-.pops[type-value="confirm"] .pops-confirm-content p[pops] {
-	padding: 5px 10px;
-	color: rgb(51, 51, 51);
-	text-indent: 15px;
+	line-height: normal;
 }
 .pops[type-value="confirm"] .pops-confirm-content {
 	width: 100%;
-	height: calc(
+	/*height: calc(
 		100% - var(--container-title-height) - var(--container-bottom-btn-height)
-	);
+	);*/
+	flex: 1;
 	overflow: auto;
 	word-break: break-word;
 }
+.pops[type-value="confirm"] .pops-confirm-content p[pops] {
+	padding: 5px 10px;
+	color: rgb(51, 51, 51);
+	text-indent: 15px;
+}
 .pops[type-value="confirm"] .pops-confirm-btn {
-	position: absolute;
-	bottom: 0;
+	/*position: absolute;
+	bottom: 0;*/
 	display: flex;
 	padding: 10px 10px 10px 10px;
 	width: 100%;
 	height: var(--container-bottom-btn-height);
+	max-height: var(--container-bottom-btn-height);
+	line-height: normal;
 	border-top: 1px solid rgb(229, 229, 229, var(--pops-bd-opacity));
 	text-align: right;
-	line-height: var(--container-bottom-btn-height);
 	align-items: center;
 }

package/src/components/drawer/config.ts

@@ -7,20 +7,16 @@ export const PopsDrawerConfig = (): Required<PopsDrawerDetails> => {
 			position: "center",
 			text: "默认标题",
 			html: false,
-			style: "height: 60px;line-height: 60px;",
 		},
 		content: {
 			text: "默认内容",
 			html: false,
-			style: "overflow: auto;padding: 0px 10px;",
 		},
 		btn: {
 			position: "flex-end",
 			ok: {
 				enable: true,
-
 				size: void 0,
-
 				icon: void 0,
 				rightIcon: false,
 				iconIsLoading: false,

package/src/components/drawer/index.css

@@ -13,7 +13,19 @@
 	align-items: center;
 	justify-content: space-between;
 }
+.pops[type-value] .pops-drawer-title p[pops] {
+	line-height: normal;
+	align-content: center;
+}
 
+.pops-drawer-content {
+	flex: 1;
+	overflow: auto;
+}
+.pops[type-value="drawer"] .pops-drawer-btn {
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
 .pops[type-value="drawer"][direction="top"] {
 	width: 100%;
 	left: 0;
@@ -38,10 +50,3 @@
 	bottom: 0;
 	right: 0;
 }
-.pops-drawer-content {
-	height: 100%;
-}
-.pops[type-value="drawer"] .pops-drawer-btn {
-	padding-top: 10px;
-	padding-bottom: 10px;
-}

package/src/components/folder/index.css

@@ -16,7 +16,7 @@
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	font-weight: 500;
-	line-height: var(--container-title-height);
+	line-height: normal;
 }
 .pops[type-value="folder"] .pops-folder-content p[pops] {
 	padding: 5px 10px;
@@ -25,22 +25,24 @@
 }
 .pops[type-value="folder"] .pops-folder-content {
 	width: 100%;
-	height: calc(
+	/*height: calc(
 		100% - var(--container-title-height) - var(--container-bottom-btn-height)
-	);
+	);*/
+	flex: 1;
 	overflow: auto;
 	word-break: break-word;
 }
 .pops[type-value="folder"] .pops-folder-btn {
-	position: absolute;
-	bottom: 0;
+	/*position: absolute;
+	bottom: 0;*/
 	display: flex;
 	padding: 10px 10px 10px 10px;
 	width: 100%;
 	height: var(--container-bottom-btn-height);
+	max-height: var(--container-bottom-btn-height);
+	line-height: normal;
 	border-top: 1px solid rgb(229, 229, 229, var(--pops-bd-opacity));
 	text-align: right;
-	line-height: var(--container-bottom-btn-height);
 	align-items: center;
 }
 .pops-folder-list .cursor-p {
@@ -79,11 +81,13 @@ table.pops-folder-list-table__body {
 	user-select: none;
 }
 .pops-folder-list table tr {
-	line-height: 1;
+	line-height: normal;
+	align-content: center;
 }
 .pops-folder-list-table__header-row {
 	height: 50px;
-	line-height: 50px;
+	line-height: normal;
+	align-content: center;
 	color: rgb(129, 137, 153);
 	text-align: left;
 	font-size: 12px;
@@ -96,7 +100,8 @@ table.pops-folder-list-table__body {
 }
 .pops-folder-list-table__body-row {
 	height: 50px;
-	line-height: 50px;
+	line-height: normal;
+	align-content: center;
 	color: #03081a;
 	font-size: 12px;
 }
@@ -115,7 +120,8 @@ table.pops-folder-list-table__body {
 .pops-folder-list .list-name-text {
 	display: inline-block;
 	padding-left: 12px;
-	line-height: 40px;
+	line-height: normal;
+	align-content: center;
 	max-width: 176px;
 }
 .pops-folder-list-file-name > div {
@@ -204,7 +210,8 @@ table.pops-folder-list-table__body {
 	height: 32px;
 }
 .pops-folder-list .pops-folder-list-file-icon {
-	line-height: 1;
+	line-height: normal;
+	align-content: center;
 	position: relative;
 	vertical-align: middle;
 }
@@ -265,7 +272,8 @@ table.pops-folder-list-table__body {
 .pops-folder-list .pops-folder-file-list-breadcrumb-allFiles {
 	font-size: 12px;
 	color: #333;
-	line-height: 20px;
+	line-height: normal;
+	align-content: center;
 	font-weight: 700;
 	display: inline-block;
 	max-width: 140px;

package/src/components/iframe/config.ts

@@ -28,7 +28,7 @@ export const PopsIframeConfig = (): Required<PopsIframeDetails> => {
 		},
 		animation: "pops-anim-fadein-zoom",
 		position: "center",
-		drag: false,
+		drag: true,
 		dragLimit: true,
 		dragExtraDistance: 3,
 		dragMoveCallBack() {},

package/src/components/iframe/index.css

@@ -1,5 +1,6 @@
 .pops[type-value="iframe"] {
 	--container-title-height: 55px;
+	transition: width 0.35s ease, height 0.35s ease;
 }
 .pops[type-value] .pops-iframe-title {
 	display: flex;
@@ -19,19 +20,21 @@
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	font-weight: 500;
-	line-height: var(--container-title-height);
-}
-.pops[type-value="iframe"] .pops-iframe-content p[pops] {
-	padding: 5px 10px;
-	color: #333;
-	text-indent: 15px;
+	line-height: normal;
+	align-content: center;
 }
 .pops[type-value="iframe"] .pops-iframe-content {
 	width: 100%;
-	height: calc(100% - var(--container-title-height));
+	/*height: calc(100% - var(--container-title-height));*/
+	flex: 1;
 	overflow: hidden;
 	word-break: break-word;
 }
+.pops[type-value="iframe"] .pops-iframe-content p[pops] {
+	padding: 5px 10px;
+	color: #333;
+	text-indent: 15px;
+}
 .pops-loading {
 	position: absolute;
 	top: 40px;
@@ -56,22 +59,30 @@
 	animation: pops-anim-wait-rotate 1.2s linear infinite;
 }
 .pops[type-value="iframe"].pops[type-module="min"] {
-	top: unset !important;
 	bottom: 0;
 	max-width: 200px;
 	max-height: 53px;
-	transform: none;
+	position: unset;
 }
 .pops[type-value="iframe"].pops[type-module="min"]
 	.pops-header-control[type="min"] {
 	display: none;
 }
-.pops[type-value="iframe"].pops[type-module="max"] {
+.pops[type-value="iframe"].pops-iframe-unset-top {
 	top: unset !important;
+}
+.pops[type-value="iframe"].pops-iframe-unset-left {
 	left: unset !important;
+}
+.pops[type-value="iframe"].pops-iframe-unset-transform {
+	transform: none !important;
+}
+.pops[type-value="iframe"].pops-iframe-unset-transition {
+	transition: none !important;
+}
+.pops[type-value="iframe"].pops[type-module="max"] {
 	width: 100% !important;
 	height: 100% !important;
-	transform: none;
 }
 .pops[type-value="iframe"] iframe[pops] {
 	width: calc(100% - 4px);
@@ -88,3 +99,7 @@
 	background: linear-gradient(to right, #4995dd, #fff, rgb(202 224 246));
 	animation: iframeLoadingChange 2s forwards;
 }
+
+.pops-anim:has(.pops[type-value="iframe"].pops[type-module="min"]) {
+	position: unset;
+}