Merge branch 'dev'

wlxuqu · wlxuqu · commit 427ef7f64c62 · 2020-11-10T19:25:12.000+08:00
diff --git a/App.vue b/App.vue
@@ -9,6 +9,10 @@
 			// 注意，需要在/main.js中实例化Vue之后引入如下(详见文档说明)：
 			// import httpInterceptor from '@/common/http.interceptor.js'
 			// Vue.use(httpInterceptor, app)
+			// process.env.VUE_APP_PLATFORM 为通过js判断平台名称的方法，结果分别如下：
+			/**
+			 * h5，app-plus(nvue下也为app-plus)，mp-weixin，mp-alipay......
+			 */
 		},
 	}
 </script>
diff --git a/main.js b/main.js
@@ -1,38 +1,38 @@
-import Vue from 'vue'
-import App from './App'
+import Vue from 'vue';
+import App from './App';
 
-Vue.config.productionTip = false
+Vue.config.productionTip = false;
 
-App.mpType = 'app'
+App.mpType = 'app';
 
 // 此处为演示Vue.prototype使用，非uView的功能部分
-Vue.prototype.vuePrototype = '枣红'
+Vue.prototype.vuePrototype = '枣红';
 
 // 引入全局uView
-import uView from 'uview-ui'
-Vue.use(uView)
+import uView from 'uview-ui';
+Vue.use(uView);
 
 // 此处为演示vuex使用，非uView的功能部分
-import store from '@/store'
+import store from '@/store';
 
 // 引入uView提供的对vuex的简写法文件
-let vuexStore = require('@/store/$u.mixin.js')
-Vue.mixin(vuexStore)
+let vuexStore = require('@/store/$u.mixin.js');
+Vue.mixin(vuexStore);
 
 // 引入uView对小程序分享的mixin封装
 let mpShare = require('uview-ui/libs/mixin/mpShare.js');
-Vue.mixin(mpShare)
+Vue.mixin(mpShare);
 
 // i18n部分的配置
 // 引入语言包，注意路径
 import Chinese from '@/common/locales/zh.js';
 import English from '@/common/locales/en.js';
 
 // VueI18n
-import VueI18n from '@/common/vue-i18n.min.js'
+import VueI18n from '@/common/vue-i18n.min.js';
 
 // VueI18n
-Vue.use(VueI18n)
+Vue.use(VueI18n);
 
 const i18n = new VueI18n({
 	// 默认语言
@@ -42,23 +42,23 @@ const i18n = new VueI18n({
 		'zh': Chinese,
 		'en': English,
 	}
-})
+});
 
 // 由于微信小程序的运行机制问题，需声明如下一行，H5和APP非必填
-Vue.prototype._i18n = i18n
+Vue.prototype._i18n = i18n;
 
 const app = new Vue({
 	i18n,
 	store,
 	...App
-})
+});
 
 // http拦截器，将此部分放在new Vue()和app.$mount()之间，才能App.vue中正常使用
-import httpInterceptor from '@/common/http.interceptor.js'
-Vue.use(httpInterceptor, app)
+import httpInterceptor from '@/common/http.interceptor.js';
+Vue.use(httpInterceptor, app);
 
 // http接口API抽离，免于写url或者一些固定的参数
-import httpApi from '@/common/http.api.js'
-Vue.use(httpApi, app)
+import httpApi from '@/common/http.api.js';
+Vue.use(httpApi, app);
 
-app.$mount()
+app.$mount();
diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "uView",
     "appid" : "__UNI__60F4B81",
     "description" : "多平台快速开发的UI框架",
-    "versionName" : "1.7.8",
+    "versionName" : "1.7.9",
     "versionCode" : "100",
     "transformPx" : false,
     "app-plus" : {
diff --git a/pages/componentsB/upload/index.vue b/pages/componentsB/upload/index.vue
@@ -53,7 +53,7 @@
 	export default {
 		data() {
 			return {
-				action: 'http://www.tp5.com',
+				action: 'http://127.0.0.1:7001/upload',
 				// 预置上传列表
 				fileList: [],
 				// fileList: [{
diff --git a/pages/library/timeFormat/index.vue b/pages/library/timeFormat/index.vue
@@ -3,7 +3,7 @@
 		<view class="u-demo-wrap">
 			<view class="u-demo-title">演示效果</view>
 			<view class="u-demo-area">
-				<view class="u-no-demo-here">时间戳为：{{timestamp}}</view>
+				<view class="u-no-demo-here">输入时间：{{timestamp}}</view>
 				<view class="u-demo-result-line">
 					{{result}}
 				</view>
@@ -28,7 +28,7 @@
 	export default {
 		data() {
 			return {
-				timestamp: '1582711721',
+				timestamp: '2020-11-02T02:59:24.732Z',
 				result: null
 			}
 		},
diff --git a/uview-ui/components/u-card/u-card.vue b/uview-ui/components/u-card/u-card.vue
@@ -262,6 +262,7 @@ export default {
 		// 如果是与屏幕之间不留空隙，应该设置左右边距为0
 		margin-left: 0 !important;
 		margin-right: 0 !important;
+		width: 100%;
 	}
 	
 	&--border:after {
diff --git a/uview-ui/components/u-mask/u-mask.vue b/uview-ui/components/u-mask/u-mask.vue
@@ -16,7 +16,7 @@
 	 * @property {String Number} z-index z-index 层级（默认1070）
 	 * @property {Object} custom-style 自定义样式对象，见上方说明
 	 * @property {String Number} duration 动画时长，单位毫秒（默认300）
-	 * @property {Boolean} zoom 是否使用scale对这招进行缩放（默认true）
+	 * @property {Boolean} zoom 是否使用scale对遮罩进行缩放（默认true）
 	 * @property {Boolean} mask-click-able 遮罩是否可点击，为false时点击不会发送click事件（默认true）
 	 * @event {Function} click mask-click-able为true时，点击遮罩发送此事件
 	 * @example <u-mask :show="show" @click="show = false"></u-mask>
diff --git a/uview-ui/components/u-upload/u-upload.vue b/uview-ui/components/u-upload/u-upload.vue
@@ -246,7 +246,9 @@ export default {
 		limitType:{
 			type: Array,
 			default() {
-				return ['png', 'jpg', 'jpeg', 'webp', 'gif'];
+				// 支付宝小程序真机选择图片的后缀为"image"
+				// https://opendocs.alipay.com/mini/api/media-image
+				return ['png', 'jpg', 'jpeg', 'webp', 'gif', 'image'];
 			}
 		},
 		// 在各个回调事件中的最后一个参数返回，用于区别是哪一个组件的事件
diff --git a/uview-ui/index.js b/uview-ui/index.js
@@ -82,6 +82,7 @@ const $u = {
 	date: timeFormat, // 另名date
 	timeFrom,
 	colorGradient: colorGradient.colorGradient,
+	colorToRgba: colorGradient.colorToRgba,
 	guid,
 	color,
 	sys,
@@ -112,6 +113,9 @@ const $u = {
 	throttle,
 }
 
+// $u挂载到uni对象上
+uni.$u = $u
+
 const install = Vue => {
 	Vue.mixin(mixin) 
 	if (Vue.prototype.openShare) {
diff --git a/uview-ui/libs/config/config.js b/uview-ui/libs/config/config.js
@@ -1,5 +1,5 @@
-// 此版本发布于2020-10-31
-let version = '1.7.8';
+// 此版本发布于2020-11-10
+let version = '1.7.9';
 
 export default {
 	v: version,
diff --git a/uview-ui/libs/function/colorGradient.js b/uview-ui/libs/function/colorGradient.js
@@ -93,8 +93,42 @@ function rgbToHex(rgb) {
 	}
 }
 
+
+/**
+* JS颜色十六进制转换为rgb或rgba,返回的格式为 rgba（255，255，255，0.5）字符串
+* sHex为传入的十六进制的色值
+* alpha为rgba的透明度
+*/
+function colorToRgba(color, alpha = 0.3) {
+	color = rgbToHex(color)
+	// 十六进制颜色值的正则表达式
+	var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+	/* 16进制颜色转为RGB格式 */
+	let sColor = color.toLowerCase()
+	if (sColor && reg.test(sColor)) {
+		if (sColor.length === 4) {
+			var sColorNew = '#'
+			for (let i = 1; i < 4; i += 1) {
+				sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
+			}
+			sColor = sColorNew
+		}
+		// 处理六位的颜色值
+		var sColorChange = []
+		for (let i = 1; i < 7; i += 2) {
+			sColorChange.push(parseInt('0x' + sColor.slice(i, i + 2)))
+		}
+		// return sColorChange.join(',')
+		return 'rgba(' + sColorChange.join(',') + ',' + alpha + ')'
+	} 
+	else {
+		return sColor
+	}
+}
+
 export default {
 	colorGradient,
 	hexToRgb,
-	rgbToHex
+	rgbToHex,
+	colorToRgba
 }
diff --git a/uview-ui/libs/function/route.js b/uview-ui/libs/function/route.js
diff --git a/uview-ui/libs/function/timeFormat.js b/uview-ui/libs/function/timeFormat.js
diff --git a/uview-ui/libs/function/timeFrom.js b/uview-ui/libs/function/timeFrom.js
diff --git a/uview-ui/package.json b/uview-ui/package.json

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ export default {`
`262`	`262`	`// 如果是与屏幕之间不留空隙，应该设置左右边距为0`
`263`	`263`	`margin-left: 0 !important;`
`264`	`264`	`margin-right: 0 !important;`
	`265`	`+ width: 100%;`
`265`	`266`	`}`
`266`	`267`
`267`	`268`	`&--border:after {`