Skip to content

Commit a69b9b8

Browse files
FasttianFasttian
committed
publish v1.3.3
1 parent 042560f commit a69b9b8

File tree

12 files changed

+93
-42
lines changed

12 files changed

+93
-42
lines changed

‎docs/changelog.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,39 @@
77
- 主版本号：含有破坏性更新和新特性，不在发布周期内。
88

99
<!-- 更新占位 -->
10+
<log title="1.3.3" date="2021-06-18">
11+
<log-item title="uni-easyinput 组件更新">
12+
<log-item-text tag-type="feat">
13+
passwordIcon 属性，当type=password时是否显示小眼睛图标
14+
</log-item-text>
15+
<log-item-text tag-type="fix">
16+
confirmType 属性不生效的问题
17+
</log-item-text>
18+
<log-item-text tag-type="fix">
19+
disabled 状态可清出内容的 bug
20+
</log-item-text>
21+
</log-item>
22+
<log-item title="uni-file-picker 组件更新">
23+
<log-item-text tag-type="fix">
24+
删除文件时无法触发 v-model 的Bug
25+
</log-item-text>
26+
</log-item>
27+
<log-item title="uni-popup 组件更新">
28+
<log-item-text tag-type="fix">
29+
H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
30+
</log-item-text>
31+
<log-item-text tag-type="fix">
32+
错误的 watch 字段
33+
</log-item-text>
34+
<log-item-text tag-type="fix">
35+
safeArea 属性不生效的问题
36+
</log-item-text>
37+
<log-item-text tag-type="fix">
38+
点击内容，再点击遮罩无法关闭的Bug
39+
</log-item-text>
40+
</log-item>
41+
</log>
42+
1043
<log title="1.3.2" date="2021-06-04">
1144
<log-item title="uni-data-checkbox 组件更新">
1245
<log-item-text tag-type="feat">

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "55",
33
"name": "@dcloudio/uni-ui",
4-
"version": "1.3.2",
4+
"version": "1.3.3",
55
"description": "",
66
"author": "dcloud",
77
"license": "Apache-2.0",

‎packages/lib/uni-easyinput/uni-easyinput.vue‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc" @click="onClickIcon('prefix')"></uni-icons>
66
<textarea v-if="type === 'textarea'" class="uni-easyinput__content-textarea" :class="{'input-padding':inputBorder}"
77
:name="name" :value="val" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled"
8-
:maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" @input="onInput" @blur="onBlur" @focus="onFocus"
8+
:maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" :confirmType="confirmType" @input="onInput" @blur="onBlur" @focus="onFocus"
99
@confirm="onConfirm"></textarea>
1010
<input v-else :type="type === 'password'?'text':type" class="uni-easyinput__content-input" :style="{
1111
'padding-right':type === 'password' ||clearable || prefixIcon?'':'10px',
1212
'padding-left':prefixIcon?'':'10px'
1313
}"
1414
:name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder"
15-
:placeholderStyle="placeholderStyle" :disabled="disabled" :maxlength="inputMaxlength" :focus="focused" @focus="onFocus"
15+
:placeholderStyle="placeholderStyle" :disabled="disabled" :maxlength="inputMaxlength" :focus="focused" :confirmType="confirmType" @focus="onFocus"
1616
@blur="onBlur" @input="onInput" @confirm="onConfirm" />
17-
<template v-if="type === 'password'">
17+
<template v-if="type === 'password' && passwrodIcon" >
1818
<uni-icons v-if="val != '' " class="content-clear-icon" :class="{'is-textarea-icon':type==='textarea'}" :type="showPassword?'eye-slash-filled':'eye-filled'"
1919
:size="18" color="#c0c4cc" @click="onEyes"></uni-icons>
2020
</template>
@@ -23,7 +23,7 @@
2323
</template>
2424
<template v-else>
2525
<uni-icons class="content-clear-icon" :class="{'is-textarea-icon':type==='textarea'}" type="clear" :size="clearSize"
26-
v-if="clearable && val " color="#c0c4cc" @click="onClear"></uni-icons>
26+
v-if="clearable && val && !disabled" color="#c0c4cc" @click="onClear"></uni-icons>
2727
</template>
2828
<slot name="right"></slot>
2929
</view>
@@ -47,12 +47,12 @@
4747
* @value number 数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式
4848
* @value idcard 身份证输入键盘，信、支付宝、百度、QQ小程序
4949
* @value digit 带小数点的数字键盘 ，App的nvue页面、微信、支付宝、百度、头条、QQ小程序支持
50-
* @property {Boolean} clearable 是否显示右侧清空内容的图标控件(输入框有内容，且获得焦点时才显示)，点击可清空输入框内容（默认true）
50+
* @property {Boolean} clearable 是否显示右侧清空内容的图标控件，点击可清空输入框内容（默认true）
5151
* @property {Boolean} autoHeight 是否自动增高输入区域，type为textarea时有效（默认true）
5252
* @property {String } placeholder 输入框的提示文字
5353
* @property {String } placeholderStyle placeholder的样式(内联样式，字符串)，如"color: #ddd"
5454
* @property {Boolean} focus 是否自动获得焦点（默认false）
55-
* @property {Boolean} disabled 是否不可输入（默认false）
55+
* @property {Boolean} disabled 是否禁用（默认false）
5656
* @property {Number } maxlength 最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
5757
* @property {String } confirmType 设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
5858
* @property {Number } clearSize 清除图标的大小，单位px（默认15）
@@ -67,6 +67,7 @@
6767
* @value all 去除全部空格
6868
* @value none 不去除空格
6969
* @property {Boolean} inputBorder 是否显示input输入框的边框（默认true）
70+
* @property {Boolean} passwrodIcon type=password时是否显示小眼睛图标
7071
* @property {Object} styles 自定义颜色
7172
* @event {Function} input 输入框内容发生变化时触发
7273
* @event {Function} focus 输入框获得焦点时触发
@@ -111,12 +112,10 @@
111112
type: String,
112113
default: 'done'
113114
},
114-
// 清除按钮的大小
115115
clearSize: {
116116
type: [Number, String],
117117
default: 15
118118
},
119-
// 是否显示 input 边框
120119
inputBorder: {
121120
type: Boolean,
122121
default: true
@@ -129,12 +128,14 @@
129128
type: String,
130129
default: ''
131130
},
132-
// 是否自动去除两端的空格
133131
trim: {
134132
type: [Boolean, String],
135133
default: true
136134
},
137-
// 自定义样式
135+
passwrodIcon:{
136+
type: Boolean,
137+
default: true
138+
},
138139
styles: {
139140
type: Object,
140141
default () {

‎packages/lib/uni-file-picker/uni-file-picker.vue‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -459,11 +459,9 @@ export default {
459459
* 删除
460460
* @param {Object} index
461461
*/
462-
delFile(index) {
463-
this.$emit('delete', {
464-
tempFile: this.files[index],
465-
tempFilePath: this.files[index].url
466-
})
462+
delFile(index) {
463+
let fileData = this.files[index]
464+
this.$emit('delete', fileData)
467465
this.files.splice(index, 1)
468466
this.$nextTick(()=>{
469467
this.setEmit()

‎packages/lib/uni-forms-item/uni-forms-item.vue‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<view class="uni-forms-item" :class="{ 'uni-forms-item--border': border, 'is-first-border': border && isFirstBorder, 'uni-forms-item-error': msg }">
33
<view class="uni-forms-item__box">
44
<view class="uni-forms-item__inner" :class="['is-direction-' + labelPos]">
5-
<view class="uni-forms-item__label" :style="{ width: labelWid + 'px', justifyContent: justifyContent }">
5+
<view class="uni-forms-item__label" :style="{ width: labelWid , justifyContent: justifyContent }">
66
<slot name="left">
77
<uni-icons v-if="leftIcon" class="label-icon" size="16" :type="leftIcon" :color="iconColor" />
88
<text class="label-text">{{ label }}</text>
@@ -191,8 +191,19 @@ export default {
191191
init() {
192192
if (this.form) {
193193
let { formRules, validator, formData, value, labelPosition, labelWidth, labelAlign, errShowType } = this.form;
194-
this.labelPos = this.labelPosition ? this.labelPosition : labelPosition;
195-
this.labelWid = this.label ? (this.labelWidth ? this.labelWidth : labelWidth) : 0;
194+
this.labelPos = this.labelPosition ? this.labelPosition : labelPosition;
195+
196+
if(this.label){
197+
this.labelWid = (this.labelWidth ? this.labelWidth : (labelWidth||65))
198+
}else{
199+
this.labelWid =( this.labelWidth ? this.labelWidth : (labelWidth||'auto'))
200+
}
201+
if(this.labelWid && this.labelWid !=='auto') {
202+
this.labelWid +='px'
203+
}
204+
console.log(this.labelWid);
205+
// this.labelWid = (this.labelWidth ? this.labelWidth : labelWidth) + 'px'
206+
// this.labelWid = this.label ? (this.labelWidth ? this.labelWidth : labelWidth) : 0;
196207
this.labelAli = this.labelAlign ? this.labelAlign : labelAlign;
197208
198209
// 判断第一个 item

‎packages/lib/uni-forms/uni-forms.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export default {
8989
// label 宽度，单位 px
9090
labelWidth: {
9191
type: [String, Number],
92-
default: 65
92+
default: ''
9393
},
9494
// label 居中方式，可选值 left/center/right
9595
labelAlign: {

‎packages/lib/uni-popup/uni-popup.vue‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<template>
22
<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']" @touchmove.stop.prevent="clear">
33
<view @touchstart="touchstart" >
4-
<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
4+
<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
5+
<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
6+
<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear"><slot /></view>
7+
</uni-transition>
58
</view>
6-
7-
<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
8-
<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear"><slot /></view>
9-
</uni-transition>
109
<!-- #ifdef H5 -->
1110
<keypress v-if="maskShow" @esc="onTap" />
1211
<!-- #endif -->
@@ -200,7 +199,7 @@ export default {
200199
// #endif
201200
this.clearPropagation = true
202201
},
203-
202+
204203
open(direction) {
205204
let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
206205
if (!(direction && innerType.indexOf(direction) !== -1)) {
@@ -233,7 +232,7 @@ export default {
233232
touchstart(){
234233
this.clearPropagation = false
235234
},
236-
235+
237236
onTap() {
238237
if(this.clearPropagation) return
239238
if (!this.mkclick) return
@@ -369,8 +368,8 @@ export default {
369368
position: relative;
370369
/* iphonex 等安全区设置，底部安全区适配 */
371370
/* #ifndef APP-NVUE */
372-
padding-bottom: constant(safe-area-inset-bottom);
373-
padding-bottom: env(safe-area-inset-bottom);
371+
// padding-bottom: constant(safe-area-inset-bottom);
372+
// padding-bottom: env(safe-area-inset-bottom);
374373
/* #endif */
375374
&.left,
376375
&.right {

‎packages/lib/uni-swipe-action-item/mpwxs.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ export default {
103103
},
104104
onClickForPC(index, item, position) {
105105
// #ifdef H5
106-
if(!isPC()) return
107-
// #endif
108-
this.$emit('click', {
109-
content: item,
110-
index,
111-
position
112-
})
106+
if(!isPC()) return
107+
this.$emit('click', {
108+
content: item,
109+
index,
110+
position
111+
})
112+
// #endif
113113
},
114114
getButtonSize() {
115115
const views = uni.createSelectorQuery().in(this)

‎packages/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@dcloudio/uni-ui",
3-
"version": "1.3.2",
3+
"version": "1.3.3",
44
"description": "",
55
"author": "",
66
"license": "Apache-2.0",

‎temps/sync-version.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
"uni-dateformat": "0.0.4",
1111
"uni-datetime-picker": "2.0.6",
1212
"uni-drawer": "1.0.7",
13-
"uni-easyinput": "0.0.12",
13+
"uni-easyinput": "0.0.14",
1414
"uni-fab": "1.0.7",
1515
"uni-fav": "1.0.6",
16-
"uni-file-picker": "0.0.7",
16+
"uni-file-picker": "0.0.8",
1717
"uni-forms": "1.0.46",
1818
"uni-goods-nav": "1.0.7",
1919
"uni-grid": "1.2.4",
@@ -27,14 +27,14 @@
2727
"uni-notice-bar": "1.0.9",
2828
"uni-number-box": "1.0.7",
2929
"uni-pagination": "1.0.7",
30-
"uni-popup": "1.4.2",
30+
"uni-popup": "1.4.4",
3131
"uni-rate": "1.1.2",
3232
"uni-row": "0.0.4",
3333
"uni-search-bar": "1.0.9",
3434
"uni-section": "0.0.1",
3535
"uni-segmented-control": "1.0.5",
3636
"uni-steps": "1.0.8",
37-
"uni-swipe-action": "1.1.9",
37+
"uni-swipe-action": "1.1.10",
3838
"uni-swiper-dot": "1.0.6",
3939
"uni-table": "1.0.4",
4040
"uni-tag": "1.0.6",

0 commit comments

Comments
 (0)