From fb0d024283a24042e55c70019dffbcd104792135 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期二, 21 四月 2026 16:53:50 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 uni_modules/uni-combox/components/uni-combox/uni-combox.vue |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/uni_modules/uni-combox/components/uni-combox/uni-combox.vue b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
index de02940..c02df01 100644
--- a/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
+++ b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
@@ -4,7 +4,7 @@
 			<text>{{label}}</text>
 		</view>
 		<view class="uni-combox__input-box">
-			<input :auto-focus="isAutoFocus" :blur-call="blurCall" class="uni-combox__input" type="text"
+			<input :auto-focus="isAutoFocus" :focus="isFocus" :blur-call="blurCall" class="uni-combox__input" type="text"
 				:placeholder="placeholder" placeholder-class="uni-combox__input-plac" v-model="inputVal"
 				@input="onInput" @focus="onFocus" @blur="onBlur" @confirm="onConfirm" />
 			<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" @click="onIconClick">
@@ -79,6 +79,10 @@
 				type: Function,
 				default: () => {}
 			},
+			isFocus: {
+				type: Boolean,
+				default: false
+			},
 			// #ifndef VUE3
 			value: {
 				type: [String, Number],
@@ -151,10 +155,9 @@
 				}, 153)
 			},
 			onConfirm() {
-				setTimeout(() => {
-					this.showSelector = false
-					this.confirmCall()
-				}, 153)
+				this.showSelector = false
+				this.$emit('confirm', this.inputVal)
+				this.$emit('update:modelValue', this.inputVal)
 			},
 			onSelectorClick(index) {
 				this.inputVal = this.filterCandidates[index]

--
Gitblit v1.9.1