Skip to content

Commit 51377ce

Browse files
wlxuquwlxuqu
committed
Merge branch 'yiruiwen' into dev
2 parents 6355799 + ddca204 commit 51377ce

File tree

15 files changed

+375
-305
lines changed

15 files changed

+375
-305
lines changed

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全
3838
#### **vue-admin-beautiful** —— [在线演示](http://beautiful.panm.cn/vue-admin-beautiful/#/index)
3939

4040
#### **pl-table** —— [ 完美解决 element 万级表格数据渲染卡顿问题](https://github.com/livelyPeng/pl-table)
41+
42+
#### **luch-request** —— [基于 Promise 开发的 uni-app 跨平台、项目级别的请求库，它有更小的体积，易用的 api，方便简单的自定义能力](https://www.quanzhan.co/luch-request/)
4143
<br>
4244

4345
## 链接

‎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.4",
5+
"versionName" : "1.5.5",
66
"versionCode" : "100",
77
"transformPx" : false,
88
"app-plus" : {

‎pages/componentsA/navbar/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
return {
8585
title: '新闻',
8686
backText: '返回',
87-
backIconName: 'arrow-left',
87+
backIconName: 'nav-back',
8888
right: false,
8989
showAction: false,
9090
rightSlot: false,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
},
162162
methods: {
163163
onClickLabel() {
164-
if (!this.isLabelDisabled) {
164+
if (!this.isLabelDisabled && !this.isDisabled) {
165165
this.setValue();
166166
}
167167
},

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
marginLeft: 100 / 12 * offset + '%',
77
flex: `0 0 ${100 / 12 * span}%`,
88
alignItems: uAlignItem,
9-
justifyContent: uJustify
9+
justifyContent: uJustify,
10+
textAlign: this.textAlign
1011
}" @tap.stop.prevent="click">
1112
<slot></slot>
1213
</view>
@@ -18,6 +19,7 @@
1819
* @description 通过基础的 12 分栏，迅速简便地创建布局（搭配<u-row>使用）
1920
* @tutorial https://www.uviewui.com/components/layout.html
2021
* @property {String Number} span 栅格占据的列数，总12等分（默认0）
22+
* @property {String} text-align 文字水平对齐方式（默认left）
2123
* @property {String Number} offset 分栏左边偏移，计算方式与span相同（默认0）
2224
* @example <u-col span="3"><view class="demo-layout bg-purple"></view></u-col>
2325
*/
@@ -43,6 +45,11 @@
4345
align: {
4446
type: String,
4547
default: 'center'
48+
},
49+
// 文字对齐方式
50+
textAlign: {
51+
type: String,
52+
default: 'left'
4653
}
4754
},
4855
inject: ['gutter'],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<view class="u-mask" :style="[maskStyle, zoomStyle]" @tap="click" @touchmove.stop.prevent :class="{
2+
<view class="u-mask" hover-stop-propagation :style="[maskStyle, zoomStyle]" @tap="click" @touchmove.stop.prevent :class="{
33
'u-mask-zoom': zoom,
44
'u-mask-show': show
55
}">

0 commit comments

Comments
 (0)