publish v1.3.5

Author: Fasttian

docs/changelog.md

@@ -7,6 +7,40 @@
 - 主版本号：含有破坏性更新和新特性，不在发布周期内。
 
 <!-- 更新占位 -->
+<log title="1.3.5" date="2021-07-02">
+	<log-item title="uni-card 组件更新">
+		<log-item-text tag-type="perf">
+			 图文卡片无图片加载时，提供占位图标
+		</log-item-text>
+		<log-item-text tag-type="feat">
+			 header 插槽，自定义卡片头部（ 图文卡片 mode="style" 时，不支持）
+		</log-item-text>
+		<log-item-text tag-type="fix">
+			 thumbnail 不存在仍然占位的 bug
+		</log-item-text>
+	</log-item>
+	<log-item title="uni-data-checkbox 组件更新">
+		<log-item-text tag-type="fix">
+			 selectedTextColor 属性不生效的Bug
+		</log-item-text>
+	</log-item>
+	<log-item title="uni-datetime-picker 组件更新">
+		<log-item-text tag-type="perf">
+			 添加 uni-icons 依赖
+		</log-item-text>
+	</log-item>
+	<log-item title="uni-easyinput 组件更新">
+		<log-item-text tag-type="fix">
+			 confirmType 属性（仅 type="text" 生效）导致多行文本框无法换行的 bug
+		</log-item-text>
+	</log-item>
+	<log-item title="uni-forms 组件更新">
+		<log-item-text tag-type="fix">
+			 pattern 属性在微信小程序平台无效的问题
+		</log-item-text>
+	</log-item>
+</log>
+
 <log title="1.3.4" date="2021-06-25">
 	<log-item title="uni-badge 组件更新">
 		<log-item-text tag-type="perf">

package.json

@@ -1,7 +1,7 @@
 {
 	"id": "55",
 	"name": "@dcloudio/uni-ui",
-	"version": "1.3.4",
+	"version": "1.3.5",
 	"description": "",
 	"author": "dcloud",
 	"license": "Apache-2.0",

packages/lib/uni-card/uni-card.vue

@@ -1,38 +1,51 @@
 <template>
-	<view class="uni-card uni-border" :class="{ 'uni-card--full': isFull === true || isFull === 'true', 'uni-card--shadow': isShadow === true || isShadow === 'true'}">
+	<view class="uni-card uni-border"
+		:class="{ 'uni-card--full': isFull === true || isFull === 'true', 'uni-card--shadow': isShadow === true || isShadow === 'true'}">
 		<!-- 基础 -->
-		<view v-if="mode === 'basic' && title" class="uni-card__header uni-border-bottom" @click.stop="onClick">
-			<view v-if="thumbnail" class="uni-card__header-extra-img-view">
-				<image :src="thumbnail" class="uni-card__header-extra-img" />
+		<view v-if="mode === 'basic' && title" @click.stop="onClick" class="uni-card__head-padding">
+			<view class="uni-card__header uni-border-bottom">
+				<slot name="header">
+					<view v-if="thumbnail" class="uni-card__header-extra-img-view">
+						<image :src="thumbnail" class="uni-card__header-extra-img" />
+					</view>
+					<text class="uni-card__header-title-text">{{ title }}</text>
+					<text v-if="extra" class="uni-card__header-extra-text">{{ extra }}</text>
+				</slot>
 			</view>
-			<text class="uni-card__header-title-text">{{ title }}</text>
-			<text v-if="extra" class="uni-card__header-extra-text">{{ extra }}</text>
 		</view>
 		<!-- 标题 -->
-		<view v-if="mode === 'title'" class="uni-card__title uni-border-bottom" @click.stop="onClick">
-			<view class="uni-card__title-box">
-				<view class="uni-card__title-header">
-					<image class="uni-card__title-header-image" :src="thumbnail" mode="scaleToFill" />
-				</view>
-				<view class="uni-card__title-content">
-					<text class="uni-card__title-content-title uni-ellipsis">{{ title }}</text>
-					<text class="uni-card__title-content-extra uni-ellipsis">{{ subTitle }}</text>
-				</view>
-			</view>
-			<view v-if="extra">
-				<text class="uni-card__header-extra-text">{{ extra }}</text>
+		<view v-if="mode === 'title'" @click.stop="onClick" class="uni-card__head-padding">
+			<view class="uni-card__title uni-border-bottom">
+				<slot name="header">
+					<view class="uni-card__title-box">
+						<view v-if="thumbnail" class="uni-card__title-header">
+							<image class="uni-card__title-header-image" :src="thumbnail" mode="scaleToFill" />
+						</view>
+						<view class="uni-card__title-content">
+							<text class="uni-card__title-content-title uni-ellipsis">{{ title }}</text>
+							<text class="uni-card__title-content-extra uni-ellipsis">{{ subTitle }}</text>
+						</view>
+					</view>
+					<view v-if="extra">
+						<text class="uni-card__header-extra-text">{{ extra }}</text>
+					</view>
+				</slot>
 			</view>
 		</view>
 		<!-- 图文 -->
 		<view v-if="mode === 'style'" class="uni-card__thumbnailimage" @click.stop="onClick">
 			<view class="uni-card__thumbnailimage-box">
-				<image class="uni-card__thumbnailimage-image" :src="thumbnail" mode="aspectFill" />
+				<image v-if="thumbnail" class="uni-card__thumbnailimage-image" :src="thumbnail" mode="aspectFill" />
+				<uni-icons v-if="!thumbnail" type="image" size="30" color="#999" />
+			</view>
+			<view v-if="title" class="uni-card__thumbnailimage-title">
+				<text class="uni-card__thumbnailimage-title-text">{{ title }}</text>
 			</view>
-			<view v-if="title" class="uni-card__thumbnailimage-title"><text class="uni-card__thumbnailimage-title-text">{{ title }}</text></view>
 		</view>
 		<!-- 内容 -->
 		<view class="uni-card__content uni-card__content--pd" @click.stop="onClick">
-			<view v-if="mode === 'style' && extra" class=""><text class="uni-card__content-extra">{{ extra }}</text></view>
+			<view v-if="mode === 'style' && extra" class=""><text class="uni-card__content-extra">{{ extra }}</text>
+			</view>
 			<slot />
 		</view>
 		<!-- 底部 -->
@@ -52,8 +65,8 @@
 	 * @property {String} title 标题文字
 	 * @property {String} subTitle 副标题（仅仅mode=title下生效）
 	 * @property {String} extra 标题额外信息
-	 * @property {String} note 标题左侧缩略图
-	 * @property {String} thumbnail 底部信息
+	 * @property {String} note 底部信息
+	 * @property {String} thumbnail 标题左侧缩略图
 	 * @property {String} mode = [basic|style|title] 卡片模式
 	 * 	@value basic 基础卡片
 	 * 	@value style 图文卡片
@@ -121,9 +134,9 @@
 		position: relative;
 		flex-direction: column;
 		border-radius: 5px;
-		overflow: hidden;
-		/* #ifdef H5 */
-		cursor: pointer;
+		overflow: hidden;
+		/* #ifdef H5 */
+		cursor: pointer;
 		/* #endif */
 	}
 
@@ -217,20 +230,27 @@
 	/* #endif */
 
 	.uni-card__thumbnailimage {
-		position: relative;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		// display: flex;
+		/* #endif */
 		flex-direction: column;
-		justify-content: center;
-		height: 150px;
+		justify-content: center;
+		height: 150px;
+		background-color: #F1F1F1;
 		overflow: hidden;
 	}
 
 	.uni-card__thumbnailimage-box {
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		overflow: hidden;
+		flex: 1;
+		height: 150px;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		overflow: hidden;
 	}
 
 	.uni-card__thumbnailimage-image {
@@ -280,12 +300,13 @@
 		width: 40px;
 		height: 40px;
 		overflow: hidden;
-		border-radius: 5px;
+		border-radius: 5px;
+		padding-right: 10px;
 	}
 
 	.uni-card__title-header-image {
 		width: 40px;
-		height: 40px;
+		height: 40px;
 	}
 
 	.uni-card__title-content {
@@ -295,7 +316,6 @@
 		flex-direction: column;
 		justify-content: center;
 		flex: 1;
-		padding-left: 10px;
 		height: 40px;
 		overflow: hidden;
 	}
@@ -403,4 +423,8 @@
 		lines: 1;
 		/* #endif */
 	}
+
+	.uni-card__head-padding {
+		// mar: 12px;
+	}
 </style>

packages/lib/uni-data-checkbox/uni-data-checkbox.vue

@@ -59,6 +59,7 @@
 	 * @property {Boolean} selectedColor 选中颜色
 	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
 	 * @property {Boolean} selectedTextColor 选中文本颜色，如不填写则自动显示
+	 * @property {Object} map 字段映射， 默认 map={text:'text',value:'value'}
 	 * @value left 左侧显示
 	 * @value right 右侧显示
 	 * @event {Function} change  选中发生变化触发
@@ -108,11 +109,11 @@
 			},
 			selectedColor: {
 				type: String,
-				default: '#007aff'
+				default: ''
 			},
 			selectedTextColor: {
 				type: String,
-				default: '#333'
+				default: ''
 			},
 			emptyText:{
 				type: String,
@@ -385,13 +386,20 @@
 				let classles = ''
 				// if (item.selected) {
 					// if (this.selectedTextColor) {
-					// 	styles.color = item.selected?this.selectedTextColor:'#999'
+					// 	if (this.mode === 'tag') {
+					// 		styles.color = item.selected?this.selectedTextColor:'#333'
+						
+					// 	} else {
+					// 		styles.color = item.selected?this.selectedTextColor:'#333'
+					// 	}
+					// 	if(!item.selected && item.disabled){
+					// 		styles.color = '#999'
+					// 	}
 					// } else {
 						if (this.mode === 'tag') {
-							styles.color = item.selected?'#fff':'#333'
-
+							styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#333'
 						} else {
-							styles.color = item.selected?this.selectedColor:'#333'
+							styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:this.selectedColor):'#333'
 						}
 						if(!item.selected && item.disabled){
 							styles.color = '#999'

packages/lib/uni-datetime-picker/uni-datetime-picker.vue

@@ -101,7 +101,9 @@
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3962
 	 * @property {String} type 选择器类型
 	 * @property {String|Array} value 绑定值
-	 * @property {String} placeholder 单选择时的占位内容
+	 * @property {String} placeholder 单选择时的占位内容
+	 * @property {String} start 起始时间
+	 * @property {String} start 终止时间
 	 * @property {String} start-placeholder 范围选择时开始日期的占位内容
 	 * @property {String} end-placeholder 范围选择时结束日期的占位内容
 	 * @property {String} range-separator 选择范围时的分隔符

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

@@ -5,7 +5,7 @@
 			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc" @click="onClickIcon('prefix')"></uni-icons>
 			<textarea v-if="type === 'textarea'" class="uni-easyinput__content-textarea" :class="{'input-padding':inputBorder}"
 			 :name="name" :value="val" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled"
-			 :maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" :confirmType="confirmType" @input="onInput" @blur="onBlur"  @focus="onFocus"
+			 :maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" @input="onInput" @blur="onBlur"  @focus="onFocus"
 			 @confirm="onConfirm"></textarea>
 			<input v-else :type="type === 'password'?'text':type" class="uni-easyinput__content-input" :style="{
 				 'padding-right':type === 'password' ||clearable || prefixIcon?'':'10px',

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

@@ -192,6 +192,13 @@ export default {
 					}
 					newFils.push(files ? files : v)
 				})
+				let data  = null
+				if (this.returnType === 'object') {
+					data = this.backObject(newFils)[0]
+				} else {
+					data = this.backObject(newFils)
+				}
+				this.formItem && this.formItem.setValue(data)
 				this.files = newFils
 			},
 			immediate: true
@@ -241,9 +248,29 @@ export default {
 	created() {
 		// this.files = Object.assign([], this.value)
 		this.tempData = {}
-
+		this.form = this.getForm('uniForms')
+		this.formItem = this.getForm('uniFormsItem')
+		if (this.form && this.formItem) {
+			if (this.formItem.name) {
+				this.rename = this.formItem.name
+				this.form.inputChildrens.push(this)
+			}
+		}
 	},
 	methods: {
+		/**
+		 * 获取父元素实例
+		 */
+		getForm(name = 'uniForms') {
+			let parent = this.$parent;
+			let parentName = parent.$options.name;
+			while (parentName !== name) {
+				parent = parent.$parent;
+				if (!parent) return false;
+				parentName = parent.$options.name;
+			}
+			return parent;
+		},
 		/**
 		 * 继续上传
 		 */
@@ -402,13 +429,14 @@ export default {
 					this.files[index].url = item.path
 					this.files[index].status = 'error'
 					this.files[index].errMsg = item.errMsg
-					this.files[index].progress = -1
+					// this.files[index].progress = -1
 					errorData.push(this.files[index])
 					errorTempFilePath.push(this.files[index].url)
 				} else {
 					this.files[index].errMsg = ''
 					this.files[index].url = item.url
 					this.files[index].status = 'success'
+					this.files[index].progress += 1
 					successData.push(this.files[index])
 					tempFilePath.push(this.files[index].url)
 				}
@@ -446,7 +474,8 @@ export default {
 				idx = this.files.findIndex(p => p.uuid === progressEvent.tempFile.uuid)
 			}
 			if (idx === -1 || !this.files[idx]) return
-			this.files[idx].progress = percentCompleted
+			// fix by mehaotian 100 就会消失，-1 是为了让进度条消失
+			this.files[idx].progress = percentCompleted - 1
 			// 上传中
 			this.$emit('progress', {
 				index: idx,
@@ -459,10 +488,12 @@ export default {
 		 * 删除
 		 * @param {Object} index
 		 */
-		delFile(index) {
-			let fileData = this.files[index]
-			this.$emit('delete', fileData)
-			this.files.splice(index, 1)
+		delFile(index) {
+			this.$emit('delete', {
+				tempFile: this.files[index],
+				tempFilePath: this.files[index].url
+			})
+			this.files.splice(index, 1)
 			this.$nextTick(()=>{
 				this.setEmit()
 			})

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

@@ -205,7 +205,6 @@ export default {
 				if(this.labelWid && this.labelWid !=='auto') {
 					this.labelWid +='px'
 				}
-				console.log(this.labelWid);
 				// this.labelWid = (this.labelWidth ? this.labelWidth : labelWidth) + 'px'
 				// this.labelWid = this.label ? (this.labelWidth ? this.labelWidth : labelWidth) : 0;
 				this.labelAli = this.labelAlign ? this.labelAlign : labelAlign;