Skip to content

Commit f7f50b1

Browse files
authored
Merge pull request umicro#1191 from qianjue520/master
修复select组件在小程序端展示选值的bug,修复步进器设置可输入小数在小程序真机上无法输入的问题
2 parents 739cb48 + 473d878 commit f7f50b1

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

uview-ui/components/u-number-box/u-number-box.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</view>
1111
<input :disabled="disabledInput || disabled" :cursor-spacing="getCursorSpacing" :class="{ 'u-input-disabled': disabled }"
1212
v-model="inputVal" class="u-number-input" @blur="onBlur" @focus="onFocus"
13-
type="number" :style="{
13+
:type="positiveInteger?'number':'digit'" :style="{
1414
color: color,
1515
fontSize: size + 'rpx',
1616
background: bgColor,

uview-ui/components/u-select/u-select.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,13 @@ export default {
278278
let columnIndex = e.detail.value;
279279
// 由于后面是需要push进数组的,所以需要先清空数组
280280
this.selectValue = [];
281+
this.defaultSelector = columnIndex;
281282
if(this.mode == 'mutil-column-auto') {
282283
// 对比前后两个数组,寻找变更的是哪一列,如果某一个元素不同,即可判定该列发生了变化
283284
this.lastSelectIndex.map((val, idx) => {
284285
if (val != columnIndex[idx]) index = idx;
285286
});
286-
this.defaultSelector = columnIndex;
287+
287288
for (let i = index + 1; i < this.columnNum; i++) {
288289
// 当前变化列的下一列的数据,需要获取上一列的数据,同时需要指定是上一列的第几个的children,再往后的
289290
// 默认是队列的第一个为默认选项

0 commit comments

Comments
 (0)