fix popup-dialog双向绑定数据逻辑修正

Author: 18148764734

Diff for: pages/index/index.vue

@@ -177,10 +177,10 @@
 					// #endif
 				],
 				functionals: [
-					// {
-					// 	name: 'Calendar 日历',
-					// 	url: 'calendar'
-					// },
+					{
+						name: 'Calendar 日历',
+						url: 'calendar'
+					},
 					{
 						name: 'Collapse 折叠面板',
 						url: 'collapse'

Diff for: pages/vue/popup/popup.vue

@@ -76,7 +76,7 @@
 		<view>
 			<!-- 输入框示例 -->
 			<uni-popup ref="inputDialog" type="dialog">
-				<uni-popup-dialog ref="inputClose" :maxlength="10" mode="input" title="输入内容" value="对话框预置提示内容!"
+				<uni-popup-dialog ref="inputClose" :maxlength="10" mode="input" title="输入内容" v-model="value"
 					placeholder="请输入内容，限制10个字" @confirm="dialogInputConfirm"></uni-popup-dialog>
 			</uni-popup>
 		</view>

Diff for: uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue

@@ -52,7 +52,7 @@
 	 * 	@value input 可输入对话框
 	 * @showClose {Boolean} 是否显示关闭按钮
 	 * @property {String} content 对话框内容
-	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @property {Boolean} beforeClose 是否拦截取消事件
 	 * @property {Number} maxlength 输入
 	 * @event {Function} confirm 点击确认按钮触发
 	 * @event {Function} close 点击取消按钮触发
@@ -61,7 +61,7 @@
 	export default {
 		name: "uniPopupDialog",
 		mixins: [popup],
-		emits: ['confirm', 'close'],
+		emits: ['confirm', 'close', 'update:modelValue', 'input'],
 		props: {
 			inputType: {
 				type: String,
@@ -71,10 +71,20 @@
 				type: Boolean,
 				default: true
 			},
+			// #ifdef VUE2
 			value: {
 				type: [String, Number],
 				default: ''
 			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				type: [Number, String],
+				default: ''
+			},
+			// #endif
+
+
 			placeholder: {
 				type: [String, Number],
 				default: ''
@@ -110,10 +120,10 @@
 			maxlength: {
 				type: Number,
 				default: -1,
-			},
-			focus:{
-				type: Boolean,
-				default: true,
+			},
+			focus: {
+				type: Boolean,
+				default: true,
 			}
 		},
 		data() {
@@ -151,6 +161,16 @@
 				} else {
 					this.val = val
 				}
+			},
+			val(val) {
+				// #ifdef VUE2
+				// TODO 兼容 vue2
+				this.$emit('input', val);
+				// #endif
+				// #ifdef VUE3
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', val);
+				// #endif
 			}
 		},
 		created() {
@@ -173,8 +193,7 @@
 					this.$emit('confirm', this.val)
 				} else {
 					this.$emit('confirm')
-				}
-				this.$emit("input",this.val);
+				}
 				if (this.beforeClose) return
 				this.popup.close()
 			},