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 | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 a207f72..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,9 +4,9 @@
<text>{{label}}</text>
</view>
<view class="uni-combox__input-box">
- <input class="uni-combox__input" type="text" :placeholder="placeholder"
- placeholder-class="uni-combox__input-plac" v-model="inputVal" @input="onInput" @focus="onFocus"
-@blur="onBlur" />
+ <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">
</uni-icons>
</view>
@@ -16,8 +16,8 @@
<view class="uni-combox__selector-empty" v-if="filterCandidatesLength === 0">
<text>{{emptyTips}}</text>
</view>
- <view class="uni-combox__selector-item" v-for="(item,index) in filterCandidates" :key="index"
- @click="onSelectorClick(index)">
+ <view class="uni-combox__selector-item" v-for="(item,index) in filterCandidates" :key="index"
+ @click="onSelectorClick(index)">
<text>{{item}}</text>
</view>
</scroll-view>
@@ -66,6 +66,22 @@
emptyTips: {
type: String,
default: '鏃犲尮閰嶉」'
+ },
+ isAutoFocus: {
+ type: Boolean,
+ default: false
+ },
+ blurCall: {
+ type: Function,
+ default: () => {}
+ },
+ confirmCall: {
+ type: Function,
+ default: () => {}
+ },
+ isFocus: {
+ type: Boolean,
+ default: false
},
// #ifndef VUE3
value: {
@@ -135,7 +151,13 @@
onBlur() {
setTimeout(() => {
this.showSelector = false
+ this.blurCall()
}, 153)
+ },
+ onConfirm() {
+ this.showSelector = false
+ this.$emit('confirm', this.inputVal)
+ this.$emit('update:modelValue', this.inputVal)
},
onSelectorClick(index) {
this.inputVal = this.filterCandidates[index]
@@ -278,4 +300,4 @@
.uni-combox__no-border {
border: none;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1