Skip to content

Commit b052555

Browse files
wlxuquwlxuqu
committed
1. 【新增】新增parse富文本解析器组件
2. 【优化】优化field组件使用right插槽时内容和清除图标距离太近的问题 3. 【修复】修复readmore组件示例在支付宝小程序无效的问题 4. 【修复】修复picker组件start-year和end-year传递字符串类型无效的问题 5. 【修复】修复瀑布流组件的modify方法可能会导致数据错乱的问题 6. 【修复】修复H5端popup等弹出组件层级比uni.showToast()的层级高的问题 7. 【修复】修复modal组件异步关闭模式，可能无法清除loading的问题 8. 【修复】修复picker和select点击确定时，收起动画无效的问题 9. 【新增】u-search在disabled为true时，点击可以发出click事件，用于跳转 10. 【新增】u-image新增bg-color参数，可以设置加载中阶段的背景颜色
1 parent befa02f commit b052555

File tree

12 files changed

+32
-11
lines changed

12 files changed

+32
-11
lines changed

‎manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name" : "uView",
33
"appid" : "__UNI__60F4B81",
44
"description" : "多平台快速开发的UI框架",
5-
"versionName" : "1.5.2",
5+
"versionName" : "1.5.3",
66
"versionCode" : "100",
77
"transformPx" : false,
88
"app-plus" : {

‎pages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"current": 0, //当前激活的模式(list 的索引项)
77
"list": [{
88
"name": "test", //模式名称
9-
"path": "pages/componentsC/test/index", //启动页面，必选
9+
"path": "pages/componentsB/readMore/index", //启动页面，必选
1010
"query": "id=1&name=2" //启动参数，在页面的onLoad函数里面得到
1111
}]
1212
},

‎pages/componentsB/picker/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
v-model="show"
1111
:defaultRegion="defaultRegion"
1212
:params="params"
13+
end-year="2030"
1314
@confirm="confirm"
1415
:defaultSelector="defaultSelector"
1516
:range="range"

‎pages/componentsB/readMore/index.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@
33
<view class="u-demo-wrap">
44
<view class="u-demo-title">演示效果</view>
55
<view class="u-demo-area">
6-
<u-read-more :toggle="toggle" :show-height="showHeight">
6+
<u-read-more :toggle="toggle" :show-height="showHeight" ref="uReadMore">
7+
<!-- u-parse组件在微信小程序渲染慢，支付宝小程序rich-text不支持nodes属性 -->
8+
<!-- #ifdef MP-ALIPAY -->
9+
<u-parse :html="content"></u-parse>
10+
<!-- #endif -->
11+
<!-- #ifndef MP-ALIPAY -->
712
<rich-text :nodes="content"></rich-text>
13+
<!-- #endif -->
814
</u-read-more>
915
</view>
1016
</view>

‎pages/componentsC/test/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<view class="u-content">
3-
<u-parse :html="content" show-with-animation></u-parse>
3+
<u-dropdown-list></u-dropdown-list>
44
</view>
55
</template>
66

‎uview-ui/components/u-field/u-field.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,4 +363,8 @@ export default {
363363
.u-input-class {
364364
font-size: 28rpx;
365365
}
366+
367+
.u-button-wrap {
368+
margin-left: 8rpx;
369+
}
366370
</style>

‎uview-ui/components/u-image/u-image.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
></image>
1919
<view v-if="showLoading && loading" class="u-image__loading" :style="{
2020
borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius),
21+
backgroundColor: this.bgColor
2122
}">
2223
<slot v-if="$slots.loading" name="loading" />
2324
<u-icon v-else :name="loadingIcon"></u-icon>
@@ -108,6 +109,11 @@ export default {
108109
duration: {
109110
type: [String, Number],
110111
default: 500
112+
},
113+
// 背景颜色，用于深色页面加载图片时，为了和背景色融合
114+
bgColor: {
115+
type: String,
116+
default: '#f3f4f6'
111117
}
112118
},
113119
data() {
@@ -189,7 +195,6 @@ export default {
189195
@import '../../libs/css/style.components.scss';
190196
191197
.u-image {
192-
background-color: $u-bg-color;
193198
position: relative;
194199
transition: opacity 0.5s ease-in-out;
195200

‎uview-ui/components/u-picker/u-picker.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,9 @@ export default {
330330
},
331331
// 生成递进的数组
332332
generateArray: function(start, end) {
333+
// 转为数值格式，否则用户给end-year等传递字符串值时，下面的end+1会导致字符串拼接，而不是相加
334+
start = Number(start);
335+
end = Number(end);
333336
end = end > start ? end : start;
334337
// 生成数组，获取其中的索引，并剪出来
335338
return [...Array(end + 1).keys()].slice(start);

‎uview-ui/components/u-read-more/u-read-more.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@
9999
};
100100
},
101101
mounted() {
102-
this.init();
102+
this.$nextTick(function(){
103+
this.init();
104+
})
103105
},
104106
methods: {
105107
init() {

‎uview-ui/components/u-waterfall/u-waterfall.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ export default {
137137
index = this.leftList.findIndex(val => val[this.idKey] == id);
138138
if(index != -1) {
139139
// 如果index不等于-1，说明已经找到了要找的id，修改对应key的值
140-
this.leftList[key] = value;
140+
this.leftList[index][key] = value;
141141
} else {
142142
// 同理于上方面的方法
143143
index = this.rightList.findIndex(val => val[this.idKey] == id);
144-
if(index != -1) this.leftList[key] = value;
144+
if(index != -1) this.rightList[index][key] = value;
145145
}
146146
// 修改父组件的数据中的对应id的条目
147147
index = this.value.findIndex(val => val[this.idKey] == id);

‎uview-ui/libs/config/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// 此版本发布于2020-07-15
2-
let version = '1.5.2';
1+
// 此版本发布于2020-07-17
2+
let version = '1.5.3';
33

44
export default {
55
v: version,

‎uview-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "uview-ui",
3-
"version": "1.5.2",
3+
"version": "1.5.3",
44
"description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
55
"main": "index.js",
66
"keywords": ["uview", "uView", "uni-app", "uni-app ui", "uniapp", "uviewui", "uview ui", "uviewUI", "uViewui", "uViewUI", "uView UI", "uni ui", "uni UI", "uniapp ui", "ui", "UI框架", "uniapp ui框架", "uniapp UI"],

0 commit comments

Comments
 (0)