fix: uni-app-x版本popup

ijry · Sep 12, 2024 · 4e77f32 · 4e77f32
1 parent 7d50a20
commit 4e77f32
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 15 deletions.
diff --git a/src/uni_modules/uview-plus/components/up-button/up-button.uvue b/src/uni_modules/uview-plus/components/up-button/up-button.uvue
@@ -21,7 +21,7 @@
         :hover-class="!disabled && !loading ? 'up-button--active' : ''"
         class="up-button up-reset-button"
         :style="[baseColor, nvueTextStyle, addStyle(customStyle)]"
-        @tap="clickHandler"
+        @click="clickHandler"
         :class="bemClass"
     >
         <template v-if="loading">
@@ -236,11 +236,14 @@ export default {
         clickHandler(): void {
             // 非禁止并且非加载中，才能点击
             if (!this.disabled && !this.loading) {
+				console.log('点击');
 				// 进行节流控制，每throttle毫秒内，只在开始处执行
 				throttle(() => {
 					this.$emit("click");
 				}, this.throttleTime);
-            }
+            } else {
+				console.log('禁止点击');
+			}
         },
         // 下面为对接uniapp官方按钮开放能力事件回调的对接
         getphonenumber(res: UTSJSONObject): void {

diff --git a/src/uni_modules/uview-plus/components/up-icon/props.uts b/src/uni_modules/uview-plus/components/up-icon/props.uts
@@ -24,7 +24,7 @@ export const propsIcon = defineMixin({
         },
         // 字体大小，单位px
         size: {
-            type: [String],
+            type: [String, Number],
             default: crtProp['size']
         },
         // 是否显示粗体

diff --git a/src/uni_modules/uview-plus/components/up-icon/up-icon.uvue b/src/uni_modules/uview-plus/components/up-icon/up-icon.uvue
@@ -98,8 +98,8 @@
 			},
 			iconStyle(): any {
 				let style = {
-					fontSize: addUnit(this.size),
-					lineHeight: addUnit(this.size),
+					fontSize: addUnit(this.size.toString()),
+					lineHeight: addUnit(this.size.toString()),
 					fontWeight: this.bold ? 'bold' : 'normal',
 					// 某些特殊情况需要设置一个到顶部的距离，才能更好的垂直居中
 					top: addUnit(this.top)
@@ -120,8 +120,8 @@
 			imgStyle(): any {
 				let style = {}
 				// 如果设置width和height属性，则优先使用，否则使用size属性
-				style['width'] = this.width != '' ? addUnit(this.width) : addUnit(this.size)
-				style['height'] = this.height != '' ? addUnit(this.height) : addUnit(this.size)
+				style['width'] = this.width != '' ? addUnit(this.width) : addUnit(this.size.toString())
+				style['height'] = this.height != '' ? addUnit(this.height) : addUnit(this.size.toString())
 				return style
 			},
 			// 通过图标名，查找对应的图标

diff --git a/src/uni_modules/uview-plus/components/up-popup/up-popup.uvue b/src/uni_modules/uview-plus/components/up-popup/up-popup.uvue
@@ -79,9 +79,12 @@
 		mixins: [mpMixin, mixin, propsPopup],
 		data() {
 			return {
-				overlayDuration: parseInt(this.duration.toString()) + 50
+				overlayDuration: 0
 			}
 		},
+		created() {
+			this.overlayDuration = parseInt(this.duration.toString()) + 50
+		},
 		watch: {
 			show(newValue, oldValue) {
 				if (newValue === true) {
@@ -95,7 +98,7 @@
 		computed: {
 			transitionStyle():any {
 				const style = {
-					zIndex: parseInt(this.zIndex),
+					zIndex: parseInt(this.zIndex.toString()),
 					position: 'fixed',
 					display: 'flex',
 				}

diff --git a/src/uni_modules/uview-plus/components/up-transition/props.uts b/src/uni_modules/uview-plus/components/up-transition/props.uts
@@ -24,7 +24,7 @@ export const propsTransition = defineMixin({
         },
         // 动画的执行时间，单位ms
         duration: {
-            type: [Number],
+            type: [Number, String],
             default: crtProp['duration']
         },
         // 使用的动画过渡函数

diff --git a/uni-app-x/pages/componentsA/popup/popup.uvue b/uni-app-x/pages/componentsA/popup/popup.uvue
@@ -53,12 +53,12 @@
 					marginTop: ['left', 'right'].includes(getMode(popupData)) ? '480rpx' : '0',
 				}"
 			>
-				<up-button
+				<up-tag
 					type="success"
 					text="点我关闭"
 					customStyle="width: 200rpx"
-					@click="show = !show"
-				></up-button>
+					@click="close"
+				></up-tag>
 			</view>
 		</up-popup>
 	</view>
@@ -162,7 +162,7 @@
 			openPopup(popupData?: UTSJSONObject): void {
 				this.popupData = popupData as UTSJSONObject
 				// sleep().then(() => {
-				// 	this.show = !this.show
+				 	this.show = !this.show
 				// })
 			},
 			navigateBack(): void {
@@ -180,7 +180,7 @@
 			},
 			close(): void {
 				this.show = false
-				// console.log('close');
+				console.log('close');
 			}
 		}
 	}