Merge branch 'yiruiwen' into dev

README.md

@@ -38,6 +38,8 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全
 #### **vue-admin-beautiful** —— [在线演示](http://beautiful.panm.cn/vue-admin-beautiful/#/index)
 
 #### **pl-table** —— [ 完美解决 element 万级表格数据渲染卡顿问题](https://github.com/livelyPeng/pl-table)
+
+#### **luch-request** —— [基于 Promise 开发的 uni-app 跨平台、项目级别的请求库，它有更小的体积，易用的 api，方便简单的自定义能力](https://www.quanzhan.co/luch-request/)
 <br>
 
 ## 链接

manifest.json

@@ -2,7 +2,7 @@
     "name" : "uView",
     "appid" : "__UNI__60F4B81",
     "description" : "多平台快速开发的UI框架",
-    "versionName" : "1.5.4",
+    "versionName" : "1.5.5",
     "versionCode" : "100",
     "transformPx" : false,
     "app-plus" : {

pages/componentsA/navbar/index.vue

@@ -84,7 +84,7 @@
 			return {
 				title: '新闻',
 				backText: '返回',
-				backIconName: 'arrow-left',
+				backIconName: 'nav-back',
 				right: false,
 				showAction: false,
 				rightSlot: false,

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

@@ -161,7 +161,7 @@
 		},
 		methods: {
 			onClickLabel() {
-				if (!this.isLabelDisabled) {
+				if (!this.isLabelDisabled && !this.isDisabled) {
 					this.setValue();
 				}
 			},

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

@@ -6,7 +6,8 @@
 		marginLeft: 100 / 12 * offset + '%',
 		flex: `0 0 ${100 / 12 * span}%`,
 		alignItems: uAlignItem,
-		justifyContent: uJustify
+		justifyContent: uJustify,
+		textAlign: this.textAlign
 	}" @tap.stop.prevent="click">
 		<slot></slot>
 	</view>
@@ -18,6 +19,7 @@
 	 * @description 通过基础的 12 分栏，迅速简便地创建布局（搭配<u-row>使用）
 	 * @tutorial https://www.uviewui.com/components/layout.html
 	 * @property {String Number} span 栅格占据的列数，总12等分（默认0）
+	 * @property {String} text-align 文字水平对齐方式（默认left）
 	 * @property {String Number} offset 分栏左边偏移，计算方式与span相同（默认0）
 	 * @example <u-col span="3"><view class="demo-layout bg-purple"></view></u-col>
 	 */
@@ -43,6 +45,11 @@
 			align: {
 				type: String,
 				default: 'center'
+			},
+			// 文字对齐方式
+			textAlign: {
+				type: String,
+				default: 'left'
 			}
 		},
 		inject: ['gutter'],

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

 <template>
-	<view class="u-mask" :style="[maskStyle, zoomStyle]" @tap="click" @touchmove.stop.prevent :class="{
+	<view class="u-mask" hover-stop-propagation :style="[maskStyle, zoomStyle]" @tap="click" @touchmove.stop.prevent :class="{
 		'u-mask-zoom': zoom,
 		'u-mask-show': show
 	}">

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

@@ -4,7 +4,9 @@
 			<view class="u-status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
 			<view class="u-navbar-inner" :style="[navbarInnerStyle]">
 				<view class="u-back-wrap" v-if="isBack" @tap="goBack">
-					<view class="u-icon-wrap"><u-icon :name="backIconName" :color="backIconColor" :size="backIconSize"></u-icon></view>
+					<view class="u-icon-wrap">
+						<u-icon :name="backIconName" :color="backIconColor" :size="backIconSize"></u-icon>
+					</view>
 					<view class="u-icon-wrap u-back-text u-line-1" v-if="backText" :style="[backTextStyle]">{{ backText }}</view>
 				</view>
 				<view class="u-navbar-content-title" v-if="title" :style="[titleStyle]">
@@ -13,13 +15,16 @@
 					    :style="{
 							color: titleColor,
 							fontSize: titleSize + 'rpx'
-						}"
-					>
+						}">
 						{{ title }}
 					</view>
 				</view>
-				<view class="u-slot-content"><slot></slot></view>
-				<view class="u-slot-right"><slot name="right"></slot></view>
+				<view class="u-slot-content">
+					<slot></slot>
+				</view>
+				<view class="u-slot-right">
+					<slot name="right"></slot>
+				</view>
 			</view>
 		</view>
 		<!-- 解决fixed定位后导航栏塌陷的问题 -->
@@ -28,14 +33,14 @@
 </template>
 
 <script>
-// 获取系统状态栏的高度
-let systemInfo = uni.getSystemInfoSync();
-let menuButtonInfo = {};
-// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
-// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
-menuButtonInfo = uni.getMenuButtonBoundingClientRect();
-// #endif
-/**
+	// 获取系统状态栏的高度
+	let systemInfo = uni.getSystemInfoSync();
+	let menuButtonInfo = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+	/**
 	 * navbar 自定义导航栏
 	 * @description 此组件一般用于在特殊情况下，需要自定义导航栏的时候用到，一般建议使用uniapp自带的导航栏。
 	 * @tutorial https://www.uviewui.com/components/navbar.html
@@ -57,7 +62,7 @@ menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 	 * @property {Boolean} border-bottom 导航栏底部是否显示下边框，如定义了较深的背景颜色，可取消此值（默认true）
 	 * @example <u-navbar back-text="返回" title="剑未配妥，出门已是江湖"></u-navbar>
 	 */
-export default {
+	export default {
 		name: "u-navbar",
 		props: {
 			// 导航栏高度，单位px，非rpx
@@ -73,12 +78,12 @@ export default {
 			// 左边返回的图标
 			backIconName: {
 				type: String,
-			default: 'arrow-left'
+				default: 'nav-back'
 			},
 			// 左边返回图标的大小，rpx
 			backIconSize: {
 				type: [String, Number],
-			default: '30'
+				default: '44'
 			},
 			// 返回的文字提示
 			backText: {
@@ -88,7 +93,7 @@ export default {
 			// 返回的文字的 样式
 			backTextStyle: {
 				type: Object,
-			default() {
+				default () {
 					return {
 						color: '#606266'
 					}
@@ -121,7 +126,7 @@ export default {
 			// 对象形式，因为用户可能定义一个纯色，或者线性渐变的颜色
 			background: {
 				type: Object,
-			default() {
+				default () {
 					return {
 						background: '#ffffff'
 					}
@@ -185,7 +190,8 @@ export default {
 				// 此处是为了让标题显示区域即使在小程序有右侧胶囊的情况下也能处于屏幕的中间，是通过绝对定位实现的
 				let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
 				style.left = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
-			style.right = rightButtonWidth - (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + rightButtonWidth + 'px';
+				style.right = rightButtonWidth - (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + rightButtonWidth +
+					'px';
 				// #endif
 				style.width = uni.upx2px(this.titleWidth) + 'px';
 				return style;
@@ -208,56 +214,56 @@ export default {
 		methods: {
 			goBack() {
 				// 如果自定义了点击返回按钮的函数，则执行，否则执行返回逻辑
-			if(typeof this.customBack === 'function') {
+				if (typeof this.customBack === 'function') {
 					this.customBack();
 				} else {
 					uni.navigateBack();
 				}
 			}
 		}
-};
+	};
 </script>
 
 <style scoped lang="scss">
-@import "../../libs/css/style.components.scss";
+	@import "../../libs/css/style.components.scss";
 
-.u-navbar {
+	.u-navbar {
 		width: 100%;
-}
+	}
 
-.u-navbar-fixed {
+	.u-navbar-fixed {
 		position: fixed;
 		left: 0;
 		right: 0;
 		top: 0;
 		z-index: 991;
-}
+	}
 
-.u-status-bar {
+	.u-status-bar {
 		width: 100%;
-}
+	}
 
-.u-navbar-inner {
+	.u-navbar-inner {
 		display: flex;
 		justify-content: space-between;
 		position: relative;
 		align-items: center;
-}
+	}
 
-.u-back-wrap {
+	.u-back-wrap {
 		display: flex;
 		align-items: center;
 		flex: 1;
 		flex-grow: 0;
 		padding: 14rpx 14rpx 14rpx 24rpx;
-}
+	}
 
-.u-back-text {
+	.u-back-text {
 		padding-left: 4rpx;
 		font-size: 30rpx;
-}
+	}
 
-.u-navbar-content-title {
+	.u-navbar-content-title {
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -268,28 +274,28 @@ export default {
 		height: 60rpx;
 		text-align: center;
 		flex-shrink: 0;
-}
+	}
 
-.u-navbar-centent-slot {
+	.u-navbar-centent-slot {
 		flex: 1;
-}
+	}
 
-.u-title {
+	.u-title {
 		line-height: 60rpx;
 		font-size: 32rpx;
 		flex: 1;
-}
+	}
 
-.u-navbar-right {
+	.u-navbar-right {
 		flex: 1;
 		display: flex;
 		align-items: center;
 		justify-content: flex-end;
-}
+	}
 
-.u-slot-content {
+	.u-slot-content {
 		flex: 1;
 		display: flex;
 		align-items: center;
-}
+	}
 </style>

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

 <template>
 	<view v-if="visibleSync" :style="[customStyle, {
 		zIndex: uZindex - 1
-	}]" :class="{ 'u-drawer-visible': showDrawer }" class="u-drawer">
+	}]" :class="{ 'u-drawer-visible': showDrawer }" class="u-drawer" hover-stop-propagation>
 		<u-mask :custom-style="maskCustomStyle" :maskClickAble="maskCloseAble" :z-index="uZindex - 2" :show="showDrawer && mask" @click="maskClick"></u-mask>
 		<view
 			class="u-drawer-content"

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

@@ -152,7 +152,7 @@
 		},
 		methods: {
 			onClickLabel() {
-				if (!this.elLabelDisabled) {
+				if (!this.elLabelDisabled && !this.elDisabled) {
 					this.parent.setValue(this.name);
 					this.emitEvent();
 				}

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

 <template>
 	<view class="u-section">
-		<view class="u-section-title" :style="{
+		<view class="u-section__title" :style="{
 			fontWeight: bold ? 'bold' : 'normal',
 			color: color,
 			fontSize: fontSize + 'rpx',
-			paddingLeft: showLine ? '10rpx' : 0
+			paddingLeft: showLine ? (fontSize * 0.7) + 'rpx' : 0
 		}" :class="{
 			'u-section--line': showLine
 		}">
-			{{title}}
+			<view class="u-section__title__icon-wrap u-flex" :style="[lineStyle]">
+				<u-icon name="column-line" :size="fontSize * 1.25" bold :color="lineColor ? lineColor : color"></u-icon>
 			</view>
-		<view class="u-right-info" v-if="right" :style="{
+			<text class="u-flex u-section__title__text">{{title}}</text>
+		</view>
+		<view class="u-section__right-info" v-if="right" :style="{
 			color: subColor
 		}" @tap="rightClick">
 			{{subTitle}}
-			<view class="u-icon-arrow">
+			<view class="u-section__right-info__icon-arrow u-flex">
 				<u-icon name="arrow-right" size="24" :color="subColor"></u-icon>
 			</view>
 		</view>
@@ -56,7 +59,7 @@
 			},
 			fontSize: {
 				type: [Number, String],
-				default: 28
+				default: 32
 			},
 			// 主标题是否加粗
 			bold: {
@@ -77,11 +80,22 @@
 			showLine: {
 				type: Boolean,
 				default: true
+			},
+			// 左边竖线的颜色
+			lineColor: {
+				type: String,
+				default: ''
 			}
 		},
-		data() {
+		computed: {
+			// 左边竖条的样式
+			lineStyle() {
+				// 由于安卓和iOS的，需要稍微调整绝对定位的top值，才能让左边的竖线和右边的文字垂直居中
 				return {
-				
+					// 由于竖线为字体图标，具有比实际线宽更宽的宽度，所以也需要根据字体打下动态调整
+					left: -(Number(this.fontSize) * 0.9) + 'rpx',
+					top: -(Number(this.fontSize) * (this.$u.os == 'ios' ? 0.13 : 0.15)) + 'rpx',
+				}
 			}
 		},
 		methods: {
@@ -100,32 +114,32 @@
 		justify-content: space-between;
 		align-items: center;
 		width: 100%;
-	}
 		
-	.u-section-title {
+		&__title {
 			position: relative;
 			font-size: 28rpx;
-		line-height: 1;
-	}
+			padding-left: 20rpx;
+			display: flex;
+			align-items: center;
 			
-	.u-section--line:after {
+			&__icon-wrap {
 				position: absolute;
-		width: 4px;
-		height: 100%;
-		content: '';
-		left: 0;
-		border-radius: 10px;
-		background-color: currentColor;
 			}
 			
-	.u-right-info {
+			&__text {
+				line-height: 1;
+			}
+		}
+		
+		&__right-info {
 			color: $u-tips-color;
 			font-size: 26rpx;
 			display: flex;
 			align-items: center;
-	}
 			
-	.u-icon-arrow {
+			&__icon-arrow {
 				margin-left: 6rpx;
 			}
+		}
+	}
 </style>

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

@@ -230,8 +230,15 @@ export default {
 		beforeUpload: {
 			type: Function,
 			default: null
+		},
+		// 允许上传的图片后缀
+		limitType:{
+			type: Array,
+			default() {
+				return ['png', 'jpg', 'jpeg', 'webp'];
 			}
 		},
+	},
 	mounted() {},
 	data() {
 		return {
@@ -291,6 +298,9 @@ export default {
 					let file = null;
 					let listOldLength = this.lists.length;
 					res.tempFiles.map((val, index) => {
+						// 检查文件后缀是否允许，如果不在this.limitType内，就会返回false
+						if(!this.checkFileExt(val)) return ;
+						
 						// 如果是非多选，index大于等于1或者超出最大限制数量时，不处理
 						if (!multiple && index >= 1) return;
 						if (val.size > maxSize) {
@@ -466,6 +476,29 @@ export default {
 					});
 				}
 			});
+		},
+		// 判断文件后缀是否允许
+		checkFileExt(file) {
+			// 检查是否在允许的后缀中
+			let noArrowExt = false;
+			// 获取后缀名
+			let fileExt = '';
+			const reg = /.+\./;
+			// 如果是H5，需要从name中判断
+			// #ifdef H5
+			fileExt = file.name.replace(reg, "").toLowerCase();
+			// #endif
+			// 非H5，需要从path中读取后缀
+			// #ifndef H5
+			fileExt = file.path.replace(reg, "").toLowerCase();
+			// #endif
+			// 使用数组的some方法，只要符合limitType中的一个，就返回true
+			noArrowExt = this.limitType.some(ext => {
+				// 转为小写
+				return ext.toLowerCase() === fileExt;
+			})
+			if(!noArrowExt) this.showToast(`不允许选择${fileExt}格式的文件`);
+			return noArrowExt;
 		}
 	}
 };

uview-ui/index.js

@@ -117,6 +117,10 @@ const install = Vue => {
 	Vue.filter('timeFrom', (timestamp, format) => {
 		return timeFrom(timestamp, format)
 	})
+	// 获取设备信息，挂载到$u的sys(system的缩写)属性中，
+	// 同时把安卓和ios平台的名称"ios"和"android"挂到$u.os中，方便取用
+	$u.sys = uni.getSystemInfoSync();
+	$u.os = $u.sys.platform;
 	Vue.prototype.$u = $u
 }
 

uview-ui/libs/config/config.js

-// 此版本发布于2020-07-21
-let version = '1.5.4';
+// 此版本发布于2020-07-23
+let version = '1.5.5';
 
 export default {
 	v: version,

uview-ui/package.json

 {
 	"name": "uview-ui",
-	"version": "1.5.4",
+	"version": "1.5.5",
 	"description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
 	"main": "index.js",
 	"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"],