From ee159961187ad9e34f380afa868e6eff096a8bbf Mon Sep 17 00:00:00 2001
From: mehaotian <490272692@qq.com>
Date: Fri, 18 Dec 2020 18:35:42 +0800
Subject: [PATCH] build uni-ui 1.2.10

---
 components/uni-badge/uni-badge.vue            |    2 +-
 components/uni-card/uni-card.vue              |    6 +-
 components/uni-combox/uni-combox.vue          |    2 +-
 components/uni-data-checkbox/clientdb.js      |   52 -
 .../uni-data-checkbox/uni-data-checkbox.vue   |   84 +-
 .../uni-datetime-picker.vue                   |    6 +-
 components/uni-easyinput/uni-easyinput.vue    |   76 +-
 components/uni-field/uni-field.vue            | 1218 ++++++++---------
 components/uni-forms-item/uni-forms-item.vue  |    1 -
 .../uni-indexed-list/uni-indexed-list.vue     |    6 +-
 components/uni-list-ad/uni-list-ad.vue        |    2 +-
 components/uni-list-chat/uni-list-chat.vue    |    2 +-
 components/uni-list-item/uni-list-item.vue    |    2 +-
 .../uni-swipe-action-item.vue                 |    4 +-
 components/uni-title/uni-title.vue            |    2 +-
 components/uni-tr/uni-tr.vue                  |    2 +-
 pages/extUI/easyinput/easyinput.vue           |   23 +-
 pages/extUI/forms/forms.vue                   |    9 +-
 18 files changed, 760 insertions(+), 739 deletions(-)

diff --git a/components/uni-badge/uni-badge.vue b/components/uni-badge/uni-badge.vue
index 995648c..192deca 100644
--- a/components/uni-badge/uni-badge.vue
+++ b/components/uni-badge/uni-badge.vue
@@ -81,7 +81,7 @@
 		background-color: #f1f1f1;
 		background-color: transparent;
 		text-align: center;
-		font-family: "Helvetica Neue", Helvetica, sans-serif;
+		font-family: 'Helvetica Neue', Helvetica, sans-serif;
 		font-size: 12px;
 		padding: 0px 6px;
 	}
diff --git a/components/uni-card/uni-card.vue b/components/uni-card/uni-card.vue
index 0186f75..e7a322c 100644
--- a/components/uni-card/uni-card.vue
+++ b/components/uni-card/uni-card.vue
@@ -136,7 +136,7 @@
 
 	/* #ifndef APP-NVUE */
 	.uni-border:after {
-		content: "";
+		content: '';
 		position: absolute;
 		bottom: 0;
 		left: 0;
@@ -165,7 +165,7 @@
 
 	/* #ifndef APP-NVUE */
 	.uni-border-bottom:after {
-		content: "";
+		content: '';
 		position: absolute;
 		bottom: 0;
 		left: 0;
@@ -193,7 +193,7 @@
 
 	/* #ifndef APP-NVUE */
 	.uni-border-top:after {
-		content: "";
+		content: '';
 		position: absolute;
 		bottom: 0;
 		left: 0;
diff --git a/components/uni-combox/uni-combox.vue b/components/uni-combox/uni-combox.vue
index 3fac4b0..0fc4d59 100644
--- a/components/uni-combox/uni-combox.vue
+++ b/components/uni-combox/uni-combox.vue
@@ -180,7 +180,7 @@
 	}
 
 	.uni-combox__selector::before {
-		content: "";
+		content: '';
 		position: absolute;
 		width: 0;
 		height: 0;
diff --git a/components/uni-data-checkbox/clientdb.js b/components/uni-data-checkbox/clientdb.js
index b4a0fb0..7079ade 100644
--- a/components/uni-data-checkbox/clientdb.js
+++ b/components/uni-data-checkbox/clientdb.js
@@ -20,58 +20,6 @@ const attrs = [
 ]
 
 export default {
-	props: {
-		options: {
-			type: [Object, Array],
-			default () {
-				return {}
-			}
-		},
-		collection: {
-			type: String,
-			default: ''
-		},
-		action: {
-			type: String,
-			default: ''
-		},
-		field: {
-			type: String,
-			default: ''
-		},
-		pageData: {
-			type: String,
-			default: 'add'
-		},
-		pageCurrent: {
-			type: Number,
-			default: 1
-		},
-		pageSize: {
-			type: Number,
-			default: 20
-		},
-		getcount: {
-			type: [Boolean, String],
-			default: false
-		},
-		orderby: {
-			type: String,
-			default: ''
-		},
-		where: {
-			type: [String, Object],
-			default: ''
-		},
-		getone: {
-			type: [Boolean, String],
-			default: false
-		},
-		manual: {
-			type: Boolean,
-			default: false
-		}
-	},
 	data() {
 		return {
 			loading: false,
diff --git a/components/uni-data-checkbox/uni-data-checkbox.vue b/components/uni-data-checkbox/uni-data-checkbox.vue
index b5f2beb..43e9e9b 100755
--- a/components/uni-data-checkbox/uni-data-checkbox.vue
+++ b/components/uni-data-checkbox/uni-data-checkbox.vue
@@ -8,7 +8,7 @@
 		<template v-else>
 			<checkbox-group v-if="multiple" class="checklist-group" :class="{'is-list':mode==='list','is-wrap':wrap}" @change="chagne">
 				<label class="checklist-box" :class="item.labelClass" :style="[item.styleBackgroud]" v-for="(item,index) in dataList" :key="index">
-					<checkbox hidden :disabled="!!item.disable" :value="item.value+''" :checked="item.selected" />
+					<checkbox class="hidden" hidden :disabled="!!item.disabled" :value="item.value+''" :checked="item.selected" />
 					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')" class="checkbox__inner" :class="item.checkboxBgClass" :style="[item.styleIcon]">
 						<view class="checkbox__inner-icon" :class="item.checkboxClass"></view>
 					</view>
@@ -20,7 +20,7 @@
 			</checkbox-group>
 			<radio-group v-else class="checklist-group" :class="{'is-list':mode==='list','is-wrap':wrap}" @change="chagne">
 				<label class="checklist-box" :class="item.labelClass" :style="[item.styleBackgroud]" v-for="(item,index) in dataList" :key="index">
-					<radio hidden :disabled="item.disable" :value="item.value+''" :checked="item.selected" />
+					<radio hidden :disabled="item.disabled" :value="item.value+''" :checked="item.selected" />
 					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')" class="radio__inner" :class="item.checkboxBgClass" :style="[item.styleBackgroud]">
 						<view class="radio__inner-icon" :class="item.checkboxClass" :style="[item.styleIcon]"></view>
 					</view>
@@ -106,11 +106,63 @@
 			selectedTextColor: {
 				type: String,
 				default: ''
+			},
+			// clientDB 相关
+			options: {
+				type: [Object, Array],
+				default () {
+					return {}
+				}
+			},
+			collection: {
+				type: String,
+				default: ''
+			},
+			action: {
+				type: String,
+				default: ''
+			},
+			field: {
+				type: String,
+				default: ''
+			},
+			pageData: {
+				type: String,
+				default: 'add'
+			},
+			pageCurrent: {
+				type: Number,
+				default: 1
+			},
+			pageSize: {
+				type: Number,
+				default: 20
+			},
+			getcount: {
+				type: [Boolean, String],
+				default: false
+			},
+			orderby: {
+				type: String,
+				default: ''
+			},
+			where: {
+				type: [String, Object],
+				default: ''
+			},
+			getone: {
+				type: [Boolean, String],
+				default: false
+			},
+			manual: {
+				type: Boolean,
+				default: false
 			}
 		},
 		watch: {
 			localdata: {
 				handler(newVal) {
+					this.range = newVal
 					this.dataList = this.getDataList(this.getSelectedValue(newVal))
 				},
 				deep: true
@@ -119,7 +171,6 @@
 			listData(newVal) {
 				this.range = newVal
 				this.dataList = this.getDataList(this.getSelectedValue(newVal))
-				// console.log('----listData', this.dataList);
 			},
 			value(newVal) {
 				this.dataList = this.getDataList(newVal)
@@ -223,7 +274,7 @@
 				let classes = []
 				switch (this.mode) {
 					case 'default':
-						item.disable && classes.push('disabled-cursor')
+						item.disabled && classes.push('disabled-cursor')
 						break
 					case 'button':
 						classes.push(...['is-button', ...this.getClasses(item, 'button')])
@@ -234,7 +285,7 @@
 						} else {
 							classes.push('is-list-box')
 						}
-						item.disable && classes.push('is-list-disabled')
+						item.disabled && classes.push('is-list-disabled')
 						index !== 0 && classes.push('is-list-border')
 						break
 					case 'tag':
@@ -289,6 +340,7 @@
 					}
 				}
 				dataList.forEach((item, index) => {
+					item.disabled = item.disable || item.disabled || false
 					if (this.multiple) {
 						if (value.length > 0) {
 							let have = value.find(val => val === item.value)
@@ -317,14 +369,14 @@
 						if (selectList.length <= min) {
 							let have = selectList.find(val => val.value === item.value)
 							if (have !== undefined) {
-								item.disable = true
+								item.disabled = true
 							}
 						}
 
 						if (selectList.length >= max && max !== '') {
 							let have = selectList.find(val => val.value === item.value)
 							if (have === undefined) {
-								item.disable = true
+								item.disabled = true
 							}
 						}
 					}
@@ -361,11 +413,11 @@
 			 */
 			getClasses(item, name, type = '') {
 				let classes = []
-				item.disable && classes.push('is-' + name + '-disabled' + type)
+				item.disabled && classes.push('is-' + name + '-disabled' + type)
 				item.selected && classes.push('is-' + name + '-checked' + type)
 
 				if (this.mode !== 'button' || name === 'button') {
-					item.selected && item.disable && classes.push('is-' + name + '-disabled-checked' + type)
+					item.selected && item.disabled && classes.push('is-' + name + '-disabled-checked' + type)
 				}
 
 				return classes
@@ -443,6 +495,8 @@
 	@charset "UTF-8";
 
 	.uni-data-checklist {
+		position: relative;
+		z-index: 0;
 		/* min-height: 36px; */
 	}
 
@@ -564,7 +618,7 @@
 		top: 1px;
 		width: 3px;
 		opacity: 0;
-		transition: transform 0.2s;
+		transition: transform .2s;
 		transform-origin: center;
 		transform: rotate(40deg) scaleY(0.4);
 	}
@@ -585,7 +639,7 @@
 		border-radius: 16px;
 		background-color: #fff;
 		z-index: 1;
-		transition: border-color 0.3s;
+		transition: border-color .3s;
 	}
 
 	.radio__inner-icon {
@@ -593,7 +647,7 @@
 		height: 8px;
 		border-radius: 10px;
 		opacity: 0;
-		transition: transform 0.3s;
+		transition: transform .3s;
 	}
 
 	.checkobx__list {
@@ -758,4 +812,10 @@
 	.is-wrap {
 		flex-direction: column;
 	}
+
+	.hidden {
+		/* #ifdef MP-ALIPAY */
+		display: none;
+		/* #endif */
+	}
 </style>
\ No newline at end of file
diff --git a/components/uni-datetime-picker/uni-datetime-picker.vue b/components/uni-datetime-picker/uni-datetime-picker.vue
index 6d0d5c0..1a233c9 100644
--- a/components/uni-datetime-picker/uni-datetime-picker.vue
+++ b/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -304,14 +304,14 @@
 	}
 
 	.uni-datetime-picker-colon::after {
-		content: ":";
+		content: ':';
 		position: absolute;
 		top: 53px;
 		right: 0;
 	}
 
 	.uni-datetime-picker-hyphen::after {
-		content: "-";
+		content: '-';
 		position: absolute;
 		top: 53px;
 		right: -2px;
@@ -342,7 +342,7 @@
 		border-style: solid;
 		transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
 		transform-origin: center;
-		transition: transform 0.3s;
+		transition: transform .3s;
 		position: absolute;
 		top: 50%;
 		right: 5px;
diff --git a/components/uni-easyinput/uni-easyinput.vue b/components/uni-easyinput/uni-easyinput.vue
index 37e0c9d..5da1b51 100644
--- a/components/uni-easyinput/uni-easyinput.vue
+++ b/components/uni-easyinput/uni-easyinput.vue
@@ -1,18 +1,17 @@
 <template>
-	<view class="uni-easyinput" :class="{'uni-easyinput-error':msg}">
-		<view class="uni-easyinput__content" :class="{'is-input-border':inputBorder ,'is-input-error-border':inputBorder && msg,'is-textarea':type==='textarea','is-disabled':disabled}">
-			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc"></uni-icons>
+	<view class="uni-easyinput" :class="{'uni-easyinput-error':msg}" :style="{color:inputBorder && msg?'#dd524d':styles.color}">
+		<view class="uni-easyinput__content" :class="{'is-input-border':inputBorder ,'is-input-error-border':inputBorder && msg,'is-textarea':type==='textarea','is-disabled':disabled}" :style="{'border-color':inputBorder && msg?'#dd524d':styles.borderColor,'background-color':disabled?styles.disableColor:'#fff'}">
+			<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" @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',
-				 'padding-left':prefixIcon?'':'10px',
-				 'color':msg?'#dd524d':''
+				 'padding-left':prefixIcon?'':'10px'
 			 }" :name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" :maxlength="inputMaxlength" :focus="focused" @focus="onFocus" @blur="onBlur" @input="onInput" @confirm="onConfirm" />
 			<template v-if="type === 'password'">
 				<uni-icons v-if="val != '' " class="content-clear-icon" :class="{'is-textarea-icon':type==='textarea'}" :type="showPassword?'eye-slash-filled':'eye-filled'" :size="18" color="#c0c4cc" @click="onEyes"></uni-icons>
 			</template>
 			<template v-else-if="suffixIcon">
-				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc"></uni-icons>
+				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc" @click="onClickIcon('suffix')"></uni-icons>
 			</template>
 			<template v-else>
 				<uni-icons class="content-clear-icon" :class="{'is-textarea-icon':type==='textarea'}" type="clear" :size="clearSize" v-if="clearable && focused && val " color="#c0c4cc" @click="onClear"></uni-icons>
@@ -26,31 +25,33 @@
 	 * Field 输入框
 	 * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=21001
-	 * @property {String| Number} 	value 				输入内容
-	 * @property {String } 	type 				输入框的类型（默认text） password/text/textarea/..
-	 * @value text		文本输入键盘
-	 * @value textarea 	多行文本输入键盘
-	 * @value password 	密码输入键盘
-	 * @value number	数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式
-	 * @value idcard	身份证输入键盘，信、支付宝、百度、QQ小程序
-	 * @value digit		带小数点的数字键盘	，App的nvue页面、微信、支付宝、百度、头条、QQ小程序支持
-	 * @property {Boolean} 	clearable 			是否显示右侧清空内容的图标控件(输入框有内容，且获得焦点时才显示)，点击可清空输入框内容（默认true）
-	 * @property {Boolean} 	autoHeight 		是否自动增高输入区域，type为textarea时有效（默认true）
-	 * @property {String } 	placeholder 		输入框的提示文字
+	 * @property {String| Number} 	value 		输入内容
+	 * @property {String } 	type 							输入框的类型（默认text） password/text/textarea/..
+	 * 	@value text				文本输入键盘
+	 * 	@value textarea 	多行文本输入键盘
+	 * 	@value password 	密码输入键盘
+	 * 	@value number			数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式
+	 * 	@value idcard			身份证输入键盘，信、支付宝、百度、QQ小程序
+	 * 	@value digit			带小数点的数字键盘	，App的nvue页面、微信、支付宝、百度、头条、QQ小程序支持
+	 * @property {Boolean} 	clearable 				是否显示右侧清空内容的图标控件(输入框有内容，且获得焦点时才显示)，点击可清空输入框内容（默认true）
+	 * @property {Boolean} 	autoHeight 				是否自动增高输入区域，type为textarea时有效（默认true）
+	 * @property {String } 	placeholder 			输入框的提示文字
 	 * @property {String } 	placeholderStyle 	placeholder的样式(内联样式，字符串)，如"color: #ddd"
-	 * @property {Boolean} 	focus 				是否自动获得焦点（默认false）
-	 * @property {Boolean} 	disabled 			是否不可输入（默认false）
-	 * @property {Number } 	maxlength 			最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
-	 * @property {String } 	confirmType 		设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
-	 * @property {Number } 	clearSize 			清除图标的大小，单位px（默认15）
-	 * @property {String} 	prefixIcon			输入框头部图标
-	 * @property {String} 	suffixIcon			输入框尾部图标
-	 * @property {Boolean} 	trim 				是否自动去除两端的空格
-	 * @property {Boolean} 	inputBorder 		是否显示input输入框的边框（默认false）
-	 * @event {Function} 	input 				输入框内容发生变化时触发
-	 * @event {Function} 	focus 				输入框获得焦点时触发
-	 * @event {Function} 	blur 				输入框失去焦点时触发
-	 * @event {Function} 	confirm 			点击完成按钮时触发
+	 * @property {Boolean} 	focus 						是否自动获得焦点（默认false）
+	 * @property {Boolean} 	disabled 					是否不可输入（默认false）
+	 * @property {Number } 	maxlength 				最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
+	 * @property {String } 	confirmType 			设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
+	 * @property {Number } 	clearSize 				清除图标的大小，单位px（默认15）
+	 * @property {String} 	prefixIcon				输入框头部图标
+	 * @property {String} 	suffixIcon				输入框尾部图标
+	 * @property {Boolean} 	trim 							是否自动去除两端的空格
+	 * @property {Boolean} 	inputBorder 			是否显示input输入框的边框（默认false）
+	 * @property {Object} 	styles 						自定义颜色
+	 * @event {Function} 		input 						输入框内容发生变化时触发
+	 * @event {Function} 		focus 						输入框获得焦点时触发
+	 * @event {Function} 		blur 							输入框失去焦点时触发
+	 * @event {Function} 		confirm 					点击完成按钮时触发
+	 * @event {Function} 		iconClick 				点击图标时触发
 	 * @example <uni-easyinput v-model="mobile"></uni-easyinput>
 	 */
 
@@ -116,6 +117,17 @@
 			trim: {
 				type: Boolean,
 				default: true
+			},
+			// 自定义样式
+			styles: {
+				type: Object,
+				default () {
+					return {
+						color: '#333',
+						disableColor: '#eee',
+						borderColor: '#e5e5e5'
+					}
+				}
 			}
 		},
 		data() {
@@ -141,6 +153,7 @@
 		},
 		watch: {
 			value(newVal) {
+				if (this.errMsg) this.errMsg = ''
 				this.val = newVal
 				if (this.formItem) {
 					this.formItem.setValue(newVal)
@@ -176,6 +189,9 @@
 			 */
 			init() {
 
+			},
+			onClickIcon(type) {
+				this.$emit('iconClick', type)
 			},
 			/**
 			 * 获取父元素实例
diff --git a/components/uni-field/uni-field.vue b/components/uni-field/uni-field.vue
index b20f8cb..21cb548 100644
--- a/components/uni-field/uni-field.vue
+++ b/components/uni-field/uni-field.vue
@@ -18,649 +18,635 @@
 			<view class="fild-body" :class="[inputBorder ? 'uni-input-border' : '']" :style="[borderEixstTextareaStyle]">
 				<view class="uni-flex-1 uni-flex" :style="[inputWrapStyle]">
 					<textarea v-if="type == 'textarea'" class="uni-flex-1 uni-textarea-class" :name="name" :value="value" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" :maxlength="inputMaxlength" :focus="focus" :autoHeight="autoHeight" @input="onInput" @blur="onBlur" @focus="onFocus" @confirm="onConfirm" @tap="fieldClick" />
-					<input v-else :type="type" class="uni-flex-1 uni-field__input-wrap" :name="name" :value="value" :password="password || this.type === 'password'" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" :maxlength="inputMaxlength" :focus="focus" :confirmType="confirmType" @focus="onFocus" @blur="onBlur" @input="onInput" @confirm="onConfirm" @tap="fieldClick" />
+					<input
+						v-else
+						:type="type"
+						class="uni-flex-1 uni-field__input-wrap"
+						:name="name"
+						:value="value"
+						:password="password || this.type === 'password'"
+						:placeholder="placeholder"
+						:placeholderStyle="placeholderStyle"
+						:disabled="disabled"
+						:maxlength="inputMaxlength"
+						:focus="focus"
+						:confirmType="confirmType"
+						@focus="onFocus"
+						@blur="onBlur"
+						@input="onInput"
+						@confirm="onConfirm"
+						@tap="fieldClick"
+					/>
 					<uni-icons :size="clearSize" v-if="clearable && value != ''" type="clear" color="#c0c4cc" @click="onClear" class="uni-clear-icon" />
 				</view>
-				<view class="uni-button-wrap">
-					<slot name="right" />
-				</view>
+				<view class="uni-button-wrap"><slot name="right" /></view>
 				<uni-icons v-if="rightIcon" size="16" @click="rightIconClick" :type="rightIcon" color="#c0c4cc" :style="[rightIconStyle]" />
 			</view>
 		</view>
-		<view v-if="errorBottom" class="uni-error-message" :style="{
+		<view
+			v-if="errorBottom"
+			class="uni-error-message"
+			:style="{
 				paddingLeft: Number(labelWid) + 4 + 'px'
-			}">
+			}"
+		>
 			{{ msg }}
 		</view>
 	</view>
 </template>
 
 <script>
-	/**
-	 * Field 输入框
-	 * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=21001
-	 * @property {String } 	type 				输入框的类型（默认text）
-	 * @property {Boolean} 	required 			是否必填，左边您显示红色"*"号（默认false）
-	 * @property {String } 	leftIcon 			label左边的图标，限uni-ui的图标名称
-	 * @property {String } 	iconColor 			左边通过icon配置的图标的颜色（默认#606266）
-	 * @property {Boolean} 	rightIcon 			输入框右边的图标名称，限uni-ui的图标名称（默认false）
-	 * @property {String } 	label 				输入框左边的文字提示
-	 * @property {Number } 	labelWidth 			label的宽度，单位px（默认65）
-	 * @property {String } 	labelAlign 			label的文字对齐方式（默认left）
-	 * @property {String } 	labelPosition 		label的文字的位置（默认left）
-	 * @property {Boolean} 	clearable 			是否显示右侧清空内容的图标控件(输入框有内容，且获得焦点时才显示)，点击可清空输入框内容（默认true）
-	 * @property {String } 	placeholder 		输入框的提示文字
-	 * @property {String } 	placeholderStyle 	placeholder的样式(内联样式，字符串)，如"color: #ddd"
-	 * @property {Boolean} 	password 			是否密码输入方式(用点替换文字)，type为text时有效（默认false）
-	 * @property {Boolean} 	focus 				是否自动获得焦点（默认false）
-	 * @property {Boolean} 	disabled 			是否不可输入（默认false）
-	 * @property {Number } 	maxlength 			最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
-	 * @property {String } 	confirmType 		设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
-	 * @property {String } 	errorMessage 		显示的错误提示内容，如果为空字符串或者false，则不显示错误信息
-	 * @property {Number } 	clearSize 			清除图标的大小，单位px（默认15）
-	 * @property {Boolean} 	trim 				是否自动去除两端的空格
-	 * @property {String } 	name 				表单域的属性名，在使用校验规则时必填
-	 * @property {Array  }  rules 				单行表单验证规则，接受一个数组
-	 * @property {Boolean} 	inputBorder 		是否显示input输入框的边框（默认false）
-	 * @property {Boolean} 	border-bottom 		是否显示field的下边框（默认true）
-	 * @property {Boolean} 	border-top 			是否显示field的上边框（默认false）
-	 * @property {Boolean} 	auto-height 		是否自动增高输入区域，type为textarea时有效（默认true）
-	 * @event {Function} 	input 				输入框内容发生变化时触发
-	 * @event {Function} 	focus 				输入框获得焦点时触发
-	 * @event {Function} 	blur 				输入框失去焦点时触发
-	 * @event {Function} 	confirm 			点击完成按钮时触发
-	 * @event {Function} 	right-icon-click 	通过right-icon生成的图标被点击时触发
-	 * @event {Function} 	click 				输入框被点击或者通过right-icon生成的图标被点击时触发，这样设计是考虑到传递右边的图标，一般都为需要弹出"picker"等操作时的场景，点击倒三角图标，理应发出此事件，见上方说明
-	 * @example <uni-field v-model="mobile" label="手机号" required :error-message="errorMessage"></uni-field>
-	 */
-	export default {
-		name: 'uni-field',
-		props: {
-			// rules:{
-			// 	type:Array,
-			// 	default(){
-			// 		return []
-			// 	}
-			// },
-			trigger: {
-				type: String,
-				default: ''
-			},
-			leftIcon: String,
-			rightIcon: String,
-			required: Boolean,
-			label: String,
-			password: Boolean,
-			clearable: {
-				type: Boolean,
-				default: true
-			},
-			// 左边标题的宽度单位px
-			labelWidth: {
-				type: [Number, String],
-				default: ''
-			},
-			// 对齐方式，left|center|right
-			labelAlign: {
-				type: String,
-				default: ''
-			},
-			iconColor: {
-				type: String,
-				default: '#606266'
-			},
-			autoHeight: {
-				type: Boolean,
-				default: true
-			},
-			errorMessage: {
-				type: [String, Boolean],
-				default: ''
-			},
-			placeholder: String,
-			placeholderStyle: String,
-			focus: Boolean,
-			name: String,
-			value: [Number, String],
-			type: {
-				type: String,
-				default: 'text'
-			},
-			disabled: {
-				type: Boolean,
-				default: false
-			},
-			maxlength: {
-				type: [Number, String],
-				default: 140
-			},
-			confirmType: {
-				type: String,
-				default: 'done'
-			},
-			// lable的位置，可选为 left-左边，top-上边
-			labelPosition: {
-				type: String,
-				default: ''
-			},
-			// 清除按钮的大小
-			clearSize: {
-				type: [Number, String],
-				default: 15
-			},
-			// 是否显示 input 边框
-			inputBorder: {
-				type: Boolean,
-				default: false
-			},
-			// 是否显示上边框
-			borderTop: {
-				type: Boolean,
-				default: false
-			},
-			// 是否显示下边框
-			borderBottom: {
-				type: Boolean,
-				default: true
-			},
-			// 是否自动去除两端的空格
-			trim: {
-				type: Boolean,
-				default: true
+/**
+ * Field 输入框
+ * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=21001
+ * @property {String } 	type 				输入框的类型（默认text）
+ * @property {Boolean} 	required 			是否必填，左边您显示红色"*"号（默认false）
+ * @property {String } 	leftIcon 			label左边的图标，限uni-ui的图标名称
+ * @property {String } 	iconColor 			左边通过icon配置的图标的颜色（默认#606266）
+ * @property {Boolean} 	rightIcon 			输入框右边的图标名称，限uni-ui的图标名称（默认false）
+ * @property {String } 	label 				输入框左边的文字提示
+ * @property {Number } 	labelWidth 			label的宽度，单位px（默认65）
+ * @property {String } 	labelAlign 			label的文字对齐方式（默认left）
+ * @property {String } 	labelPosition 		label的文字的位置（默认left）
+ * @property {Boolean} 	clearable 			是否显示右侧清空内容的图标控件(输入框有内容，且获得焦点时才显示)，点击可清空输入框内容（默认true）
+ * @property {String } 	placeholder 		输入框的提示文字
+ * @property {String } 	placeholderStyle 	placeholder的样式(内联样式，字符串)，如"color: #ddd"
+ * @property {Boolean} 	password 			是否密码输入方式(用点替换文字)，type为text时有效（默认false）
+ * @property {Boolean} 	focus 				是否自动获得焦点（默认false）
+ * @property {Boolean} 	disabled 			是否不可输入（默认false）
+ * @property {Number } 	maxlength 			最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
+ * @property {String } 	confirmType 		设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
+ * @property {String } 	errorMessage 		显示的错误提示内容，如果为空字符串或者false，则不显示错误信息
+ * @property {Number } 	clearSize 			清除图标的大小，单位px（默认15）
+ * @property {Boolean} 	trim 				是否自动去除两端的空格
+ * @property {String } 	name 				表单域的属性名，在使用校验规则时必填
+ * @property {Array  }  rules 				单行表单验证规则，接受一个数组
+ * @property {Boolean} 	inputBorder 		是否显示input输入框的边框（默认false）
+ * @property {Boolean} 	border-bottom 		是否显示field的下边框（默认true）
+ * @property {Boolean} 	border-top 			是否显示field的上边框（默认false）
+ * @property {Boolean} 	auto-height 		是否自动增高输入区域，type为textarea时有效（默认true）
+ * @event {Function} 	input 				输入框内容发生变化时触发
+ * @event {Function} 	focus 				输入框获得焦点时触发
+ * @event {Function} 	blur 				输入框失去焦点时触发
+ * @event {Function} 	confirm 			点击完成按钮时触发
+ * @event {Function} 	right-icon-click 	通过right-icon生成的图标被点击时触发
+ * @event {Function} 	click 				输入框被点击或者通过right-icon生成的图标被点击时触发，这样设计是考虑到传递右边的图标，一般都为需要弹出"picker"等操作时的场景，点击倒三角图标，理应发出此事件，见上方说明
+ * @example <uni-field v-model="mobile" label="手机号" required :error-message="errorMessage"></uni-field>
+ */
+export default {
+	name: 'uni-field',
+	props: {
+		// rules:{
+		// 	type:Array,
+		// 	default(){
+		// 		return []
+		// 	}
+		// },
+		trigger: {
+			type: String,
+			default: ''
+		},
+		leftIcon: String,
+		rightIcon: String,
+		required: Boolean,
+		label: String,
+		password: Boolean,
+		clearable: {
+			type: Boolean,
+			default: true
+		},
+		// 左边标题的宽度单位px
+		labelWidth: {
+			type: [Number, String],
+			default: ''
+		},
+		// 对齐方式，left|center|right
+		labelAlign: {
+			type: String,
+			default: ''
+		},
+		iconColor: {
+			type: String,
+			default: '#606266'
+		},
+		autoHeight: {
+			type: Boolean,
+			default: true
+		},
+		errorMessage: {
+			type: [String, Boolean],
+			default: ''
+		},
+		placeholder: String,
+		placeholderStyle: String,
+		focus: Boolean,
+		name: String,
+		value: [Number, String],
+		type: {
+			type: String,
+			default: 'text'
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		maxlength: {
+			type: [Number, String],
+			default: 140
+		},
+		confirmType: {
+			type: String,
+			default: 'done'
+		},
+		// lable的位置，可选为 left-左边，top-上边
+		labelPosition: {
+			type: String,
+			default: ''
+		},
+		// 清除按钮的大小
+		clearSize: {
+			type: [Number, String],
+			default: 15
+		},
+		// 是否显示 input 边框
+		inputBorder: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示上边框
+		borderTop: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示下边框
+		borderBottom: {
+			type: Boolean,
+			default: true
+		},
+		// 是否自动去除两端的空格
+		trim: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			focused: false,
+			itemIndex: 0,
+			errorTop: false,
+			errorBottom: false,
+			labelMarginBottom: '',
+			errorWidth: '',
+			errMsg: '',
+			errorBorderColor: false,
+			val: '',
+			labelPos: '',
+			labelWid: '',
+			labelAli: ''
+		};
+	},
+	computed: {
+		msg() {
+			return this.errorMessage || this.errMsg;
+		},
+		fieldStyle() {
+			let style = {};
+			if (this.labelPos === 'top') {
+				style.padding = '10px 14px';
+				this.labelMarginBottom = '6px';
+			}
+			if (this.labelPos === 'left' && this.msg !== false && this.msg !== '') {
+				style.paddingBottom = '0px';
+				this.errorBottom = true;
+				this.errorTop = false;
+			} else if (this.labelPos === 'top' && this.msg !== false && this.msg !== '') {
+				this.errorBottom = false;
+				this.errorTop = true;
+			} else {
+				// style.paddingBottom = ''
+				this.errorTop = false;
+				this.errorBottom = false;
 			}
+			return style;
 		},
-		data() {
-			return {
-				focused: false,
-				itemIndex: 0,
-				errorTop: false,
-				errorBottom: false,
-				labelMarginBottom: '',
-				errorWidth: '',
-				errMsg: '',
-				errorBorderColor: false,
-				val: '',
-				labelPos: '',
-				labelWid: '',
-				labelAli: ''
-			};
-		},
-		computed: {
-			msg() {
-				return this.errorMessage || this.errMsg;
-			},
-			fieldStyle() {
-				let style = {};
-				if (this.labelPos === 'top') {
-					style.padding = '10px 14px';
-					this.labelMarginBottom = '6px';
-				}
-				if (this.labelPos === 'left' && this.msg !== false && this.msg !== '') {
-					style.paddingBottom = '0px';
-					this.errorBottom = true;
-					this.errorTop = false;
-				} else if (this.labelPos === 'top' && this.msg !== false && this.msg !== '') {
-					this.errorBottom = false;
-					this.errorTop = true;
-				} else {
-					// style.paddingBottom = ''
-					this.errorTop = false;
-					this.errorBottom = false;
-				}
-				return style;
-			},
-
-			borderEixstTextareaStyle() {
-				let style = {};
-				if (this.inputBorder) {
-					if (this.type === 'textarea') {
-						style.minHeight = '60px';
-					}
-					if (this.msg !== false && this.msg != '') {
-						style.borderColor = '#dd524d';
-					}
-				}
-				return style;
-			},
-
-			inputWrapStyle() {
-				let style = {};
-				// 判断lable的位置，如果是left的话，让input左边两边有间隙
-				if (this.labelPos == 'left') {
-					style.margin = `0 4px`;
-				} else {
-					// 如果lable是top的，input的左边就没必要有间隙了
-					style.marginRight = `4px`;
-					// this.fieldStyle.style.padding = '10px 14px'
+
+		borderEixstTextareaStyle() {
+			let style = {};
+			if (this.inputBorder) {
+				if (this.type === 'textarea') {
+					style.minHeight = '60px';
 				}
-				return style;
-			},
-			rightIconStyle() {
-				let style = {};
-				if (this.arrowDirection == 'top') style.transform = 'roate(-90deg)';
-				if (this.arrowDirection == 'bottom') style.transform = 'roate(90deg)';
-				else style.transform = 'roate(0deg)';
-				return style;
-			},
-			labelStyle() {
-				let style = {};
-				if (this.labelAli == 'left') style.justifyContent = 'flext-start';
-				if (this.labelAli == 'center') style.justifyContent = 'center';
-				if (this.labelAli == 'right') style.justifyContent = 'flext-end';
-				return style;
-			},
-			// uni不支持在computed中写style.justifyContent = 'center'的形式，故用此方法
-			justifyContent() {
-				if (this.labelAli == 'left') return 'flex-start';
-				if (this.labelAli == 'center') return 'center';
-				if (this.labelAli == 'right') return 'flex-end';
-			},
-			// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，给用户可以传入字符串数值
-			inputMaxlength() {
-				return Number(this.maxlength);
-			},
-			// label的位置
-			fieldInnerStyle() {
-				let style = {};
-				if (this.labelPos == 'left') {
-					style.flexDirection = 'row';
-				} else {
-					style.flexDirection = 'column';
+				if (this.msg !== false && this.msg != '') {
+					style.borderColor = '#dd524d';
 				}
-
-				return style;
 			}
+			return style;
 		},
-		watch: {
-			trigger(trigger) {
-				this.formTrigger = trigger;
+
+		inputWrapStyle() {
+			let style = {};
+			// 判断lable的位置，如果是left的话，让input左边两边有间隙
+			if (this.labelPos == 'left') {
+				style.margin = `0 4px`;
+			} else {
+				// 如果lable是top的，input的左边就没必要有间隙了
+				style.marginRight = `4px`;
+				// this.fieldStyle.style.padding = '10px 14px'
 			}
+			return style;
 		},
-		created() {
-			this.form = this.getForm();
-			this.formRules = [];
-			this.formTrigger = this.trigger;
-			this.init();
-		},
-		methods: {
-			/**
-			 * 初始化变量值
-			 */
-			init() {
-				if (this.form) {
-					this.form.childrens.push(this);
-					this.labelPos = this.labelPosition ? this.labelPosition : this.form.labelPosition;
-					this.labelWid = this.labelWidth ? this.labelWidth : this.form.labelWidth;
-					this.labelAli = this.labelAlign ? this.labelAlign : this.form.labelAlign;
-
-					if (this.form.formRules) {
-						this.formRules = this.form.formRules[this.name];
-					}
-					this.validator = this.form.validator;
-					if (this.name) {
-						this.form.formData[this.name] = this.value || '';
-					}
-				} else {
-					this.labelPos = this.labelPosition || 'left';
-					this.labelWid = this.labelWidth || 65;
-					this.labelAli = this.labelAlign || 'left';
-				}
-			},
-			/**
-			 * 获取父元素实例
-			 */
-			getForm() {
-				let parent = this.$parent;
-				let parentName = parent.$options.name;
-				while (parentName !== 'uniForms') {
-					parent = parent.$parent;
-					if (!parent) return false;
-					parentName = parent.$options.name;
-				}
-				return parent;
-			},
-
-			/**
-			 * 移除该表单项的校验结果
-			 */
-			clearValidate() {
-				this.errMsg = '';
-			},
-			/**
-			 * 父组件处理函数
-			 * @param {Object} callback
-			 */
-			parentVal(callback) {
-				if (this.type === 'number') {
-					this.val = this.val === '' ? this.val : Number(this.val);
-				}
-				typeof callback === 'function' &&
-					callback({
-							[this.name]: this.val
-						},
-						this.name
-					);
-			},
-			/**
-			 * 触发校验
-			 * @param {Object} trigger
-			 * @param {Object} value
-			 */
-			triggerValidator(trigger, value) {
-				let isValid = false;
-				// 如果 name 不存在，则不开启校验
-				this.formRules &&
-					this.formRules.rules &&
-					this.formRules.rules.forEach(item => {
-						item.trigger = this.isTrigger(this.form.formTrigger, this.formTrigger, item.trigger);
-						if (item.trigger !== trigger || item.trigger === 'submit') return;
-						isValid = true;
-					});
-
-				isValid && this.triggerCheck(value);
-			},
-			/**
-			 * 校验规则
-			 * @param {Object} value
-			 */
-			triggerCheck(value, item) {
-				// 输入值为 number
-				if (this.type === 'number') {
-					value = value === '' ? value : Number(value);
-				}
-				const result = this.validator.validateUpdate({
-					[this.name]: value
-				});
-				this.errMsg = !result ? '' : result.errorMessage;
-				this.form.validateCheck(result);
-			},
-			/**
-			 * 触发时机
-			 * @param {Object} event
-			 */
-			isTrigger(parentRule, itemRlue, rule) {
-				let rl = 'none';
-				if (rule) {
-					rl = rule;
-				} else if (itemRlue) {
-					rl = itemRlue;
-				} else if (parentRule) {
-					rl = parentRule;
-				} else {
-					rl = 'blur';
+		rightIconStyle() {
+			let style = {};
+			if (this.arrowDirection == 'top') style.transform = 'roate(-90deg)';
+			if (this.arrowDirection == 'bottom') style.transform = 'roate(90deg)';
+			else style.transform = 'roate(0deg)';
+			return style;
+		},
+		labelStyle() {
+			let style = {};
+			if (this.labelAli == 'left') style.justifyContent = 'flext-start';
+			if (this.labelAli == 'center') style.justifyContent = 'center';
+			if (this.labelAli == 'right') style.justifyContent = 'flext-end';
+			return style;
+		},
+		// uni不支持在computed中写style.justifyContent = 'center'的形式，故用此方法
+		justifyContent() {
+			if (this.labelAli == 'left') return 'flex-start';
+			if (this.labelAli == 'center') return 'center';
+			if (this.labelAli == 'right') return 'flex-end';
+		},
+		// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，给用户可以传入字符串数值
+		inputMaxlength() {
+			return Number(this.maxlength);
+		},
+		// label的位置
+		fieldInnerStyle() {
+			let style = {};
+			if (this.labelPos == 'left') {
+				style.flexDirection = 'row';
+			} else {
+				style.flexDirection = 'column';
+			}
+
+			return style;
+		}
+	},
+	watch: {
+		trigger(trigger) {
+			this.formTrigger = trigger;
+		}
+	},
+	created() {
+		this.form = this.getForm();
+		this.formRules = [];
+		this.formTrigger = this.trigger;
+		this.init();
+	},
+	methods: {
+		/**
+		 * 初始化变量值
+		 */
+		init() {
+			if (this.form) {
+				this.form.childrens.push(this);
+				this.labelPos = this.labelPosition ? this.labelPosition : this.form.labelPosition;
+				this.labelWid = this.labelWidth ? this.labelWidth : this.form.labelWidth;
+				this.labelAli = this.labelAlign ? this.labelAlign : this.form.labelAlign;
+
+				if (this.form.formRules) {
+					this.formRules = this.form.formRules[this.name];
 				}
-				return rl;
-			},
-
-			onInput(event) {
-				let value = event.detail.value;
-				// 判断是否去除空格
-				if (this.trim) value = this.trimStr(value);
-				this.form.formData[this.name] = value || '';
-				this.val = value;
-				this.$emit('input', value);
-				// 校验输入
-				this.triggerValidator('change', value);
-			},
-
-			onFocus(event) {
-				this.focused = true;
-				this.$emit('focus', event);
-			},
-			onBlur(event) {
-				let value = event.detail.value;
-				// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
-				// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
-				setTimeout(() => {
-					this.focused = false;
-				}, 100);
-				this.$emit('blur', event);
-
-				// 校验输入
-				this.triggerValidator('blur', value);
-			},
-			onConfirm(e) {
-				this.$emit('confirm', e.detail.value);
-			},
-			onClear(event) {
-				this.val = '';
-				this.$emit('input', '');
-				this.clearValidate();
-			},
-			rightIconClick() {
-				this.$emit('right-icon-click');
-				this.$emit('click');
-			},
-			fieldClick() {
-				this.$emit('click');
-			},
-			trimStr(str, pos = 'both') {
-				if (pos == 'both') {
-					return str.replace(/^\s+|\s+$/g, '');
-				} else if (pos == 'left') {
-					return str.replace(/^\s*/, '');
-				} else if (pos == 'right') {
-					return str.replace(/(\s*$)/g, '');
-				} else if (pos == 'all') {
-					return str.replace(/\s+/g, '');
-				} else {
-					return str;
+				this.validator = this.form.validator;
+				if(this.name){
+					this.form.formData[this.name] = this.value || '';
 				}
+			} else {
+				this.labelPos = this.labelPosition || 'left';
+				this.labelWid = this.labelWidth || 65;
+				this.labelAli = this.labelAlign || 'left';
 			}
-		}
-	};
-</script>
-
-<style scoped>
-	@charset "UTF-8";
-
-	.uni-field {
-		padding: 16px 14px;
-		text-align: left;
-		color: #333;
-		font-size: 14px;
-		background-color: #fff;
-	}
-
-	.uni-field-inner {
-		display: flex;
-		align-items: center;
-	}
-
-	.uni-textarea-inner {
-		align-items: flex-start;
-	}
-
-	.uni-textarea-class {
-		min-height: 48px;
-		width: auto;
-		font-size: 14px;
-	}
-
-	.fild-body {
-		width: 100%;
-		display: flex;
-		flex: 1;
-		align-items: center;
-	}
-
-	.uni-arror-right {
-		margin-left: 4px;
-	}
-
-	.uni-label-text {
-		display: inline-block;
-	}
-
-	.uni-label-left-gap {
-		margin-left: 3px;
-	}
-
-	.uni-label-postion-top {
-		flex-direction: column;
-		align-items: flex-start;
-		flex: 1;
-	}
-
-	.uni-field-label {
-		width: 65px;
-		flex: 1 1 65px;
-		text-align: left;
-		position: relative;
-		display: flex;
-		align-items: center;
-	}
-
-	.uni-required::before {
-		content: "*";
-		position: absolute;
-		left: -8px;
-		font-size: 14px;
-		color: #dd524d;
-		height: 9px;
-		line-height: 1;
-	}
-
-	.uni-field__input-wrap {
-		position: relative;
-		overflow: hidden;
-		font-size: 14px;
-		height: 24px;
-		flex: 1;
-		width: auto;
-	}
-
-	.uni-clear-icon {
-		display: flex;
-		align-items: center;
-	}
-
-	.uni-error-message {
-		line-height: 12px;
-		padding-top: 2px;
-		padding-bottom: 2px;
-		color: #dd524d;
-		font-size: 12px;
-		text-align: left;
-	}
-
-	.uni-input-error-border {
-		border-color: #dd524d;
-	}
-
-	.placeholder-style {
-		color: #969799;
-	}
-
-	.uni-input-class {
-		font-size: 14px;
-	}
-
-	.uni-button-wrap {
-		margin-left: 4px;
-	}
-
-	/* start--Retina 屏幕下的 1px 边框--start */
-	.uni-border,
-	.uni-border-bottom,
-	.uni-border-left,
-	.uni-border-right,
-	.uni-border-top,
-	.uni-border-top-bottom {
-		position: relative;
-	}
-
-	.uni-border-bottom:after,
-	.uni-border-left:after,
-	.uni-border-right:after,
-	.uni-border-top-bottom:after,
-	.uni-border-top:after,
-	.uni-border:after {
-		/* #ifndef APP-NVUE */
-		content: " ";
-		/* #endif */
-		position: absolute;
-		left: 0;
-		top: 0;
-		pointer-events: none;
-		box-sizing: border-box;
-		-webkit-transform-origin: 0 0;
-		transform-origin: 0 0;
-		width: 199.8%;
-		height: 199.7%;
-		transform: scale(0.5, 0.5);
-		border: 0 solid #e5e5e5;
-		z-index: 2;
-	}
-
-	.uni-input-border {
-		min-height: 34px;
-		padding-left: 4px;
-		border: 1px solid #e5e5e5;
-		border-radius: 6px;
-		box-sizing: border-box;
-	}
-
-	.uni-border-top:after {
-		border-top-width: 1px;
-	}
-
-	.uni-border-left:after {
-		border-left-width: 1px;
-	}
-
-	.uni-border-right:after {
-		border-right-width: 1px;
-	}
-
-	.uni-border-bottom:after {
-		border-bottom-width: 1px;
-	}
-
-	.uni-border-top-bottom:after {
-		border-width: 1px 0;
-	}
-
-	.uni-border:after {
-		border-width: 1px;
-	}
-
-	/* end--Retina 屏幕下的 1px 边框--end */
-	.uni-icon-wrap {
-		padding-left: 3px;
-		padding-right: 3px;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
+		},
+		/**
+		 * 获取父元素实例
+		 */
+		getForm() {
+			let parent = this.$parent;
+			let parentName = parent.$options.name;
+			while (parentName !== 'uniForms') {
+				parent = parent.$parent;
+				if (!parent) return false;
+				parentName = parent.$options.name;
+			}
+			return parent;
+		},
 
-	.uni-button-wrap {
-		display: flex;
-		align-items: right;
-		justify-content: center;
-	}
+		/**
+		 * 移除该表单项的校验结果
+		 */
+		clearValidate() {
+			this.errMsg = '';
+		},
+		/**
+		 * 父组件处理函数
+		 * @param {Object} callback
+		 */
+		parentVal(callback) {
+			if (this.type === 'number') {
+				this.val = this.val === '' ? this.val : Number(this.val);
+			}
+			typeof callback === 'function' &&
+				callback(
+					{
+						[this.name]: this.val
+					},
+					this.name
+				);
+		},
+		/**
+		 * 触发校验
+		 * @param {Object} trigger
+		 * @param {Object} value
+		 */
+		triggerValidator(trigger, value) {
+			let isValid = false;
+			// 如果 name 不存在，则不开启校验
+			this.formRules &&
+				this.formRules.rules &&
+				this.formRules.rules.forEach(item => {
+					item.trigger = this.isTrigger(this.form.formTrigger, this.formTrigger, item.trigger);
+					if (item.trigger !== trigger || item.trigger === 'submit') return;
+					isValid = true;
+				});
 
-	.uni-clear-icon {
-		display: flex;
-		align-items: center;
-		margin-left: 4px;
-	}
+			isValid && this.triggerCheck(value);
+		},
+		/**
+		 * 校验规则
+		 * @param {Object} value
+		 */
+		triggerCheck(value, item) {
+			// 输入值为 number
+			if (this.type === 'number') {
+				value = value === '' ? value : Number(value);
+			}
+			const result = this.validator.validateUpdate({
+				[this.name]: value
+			});
+			this.errMsg = !result ? '' : result.errorMessage;
+			this.form.validateCheck(result);
+		},
+		/**
+		 * 触发时机
+		 * @param {Object} event
+		 */
+		isTrigger(parentRule, itemRlue, rule) {
+			let rl = 'none';
+			if (rule) {
+				rl = rule;
+			} else if (itemRlue) {
+				rl = itemRlue;
+			} else if (parentRule) {
+				rl = parentRule;
+			} else {
+				rl = 'blur';
+			}
+			return rl;
+		},
 
-	.uni-flex {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-	}
+		onInput(event) {
+			let value = event.detail.value;
+			// 判断是否去除空格
+			if (this.trim) value = this.trimStr(value);
+			this.form.formData[this.name] = value || '';
+			this.val = value;
+			this.$emit('input', value);
+			// 校验输入
+			this.triggerValidator('change', value);
+		},
 
-	.uni-flex-1 {
-		flex: 1;
+		onFocus(event) {
+			this.focused = true;
+			this.$emit('focus', event);
+		},
+		onBlur(event) {
+			let value = event.detail.value;
+			// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
+			// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
+			setTimeout(() => {
+				this.focused = false;
+			}, 100);
+			this.$emit('blur', event);
+
+			// 校验输入
+			this.triggerValidator('blur', value);
+		},
+		onConfirm(e) {
+			this.$emit('confirm', e.detail.value);
+		},
+		onClear(event) {
+			this.val = '';
+			this.$emit('input', '');
+			this.clearValidate();
+		},
+		rightIconClick() {
+			this.$emit('right-icon-click');
+			this.$emit('click');
+		},
+		fieldClick() {
+			this.$emit('click');
+		},
+		trimStr(str, pos = 'both') {
+			if (pos == 'both') {
+				return str.replace(/^\s+|\s+$/g, '');
+			} else if (pos == 'left') {
+				return str.replace(/^\s*/, '');
+			} else if (pos == 'right') {
+				return str.replace(/(\s*$)/g, '');
+			} else if (pos == 'all') {
+				return str.replace(/\s+/g, '');
+			} else {
+				return str;
+			}
+		}
 	}
+};
+</script>
 
-	.uni-error-in-label {
-		display: flex;
-		flex-direction: row;
-	}
+<style scoped>@charset "UTF-8";
+.uni-field {
+  padding: 16px 14px;
+  text-align: left;
+  color: #333;
+  font-size: 14px;
+  background-color: #fff; }
+
+.uni-field-inner {
+  display: flex;
+  align-items: center; }
+
+.uni-textarea-inner {
+  align-items: flex-start; }
+
+.uni-textarea-class {
+  min-height: 48px;
+  width: auto;
+  font-size: 14px; }
+
+.fild-body {
+  width: 100%;
+  display: flex;
+  flex: 1;
+  align-items: center; }
+
+.uni-arror-right {
+  margin-left: 4px; }
+
+.uni-label-text {
+  display: inline-block; }
+
+.uni-label-left-gap {
+  margin-left: 3px; }
+
+.uni-label-postion-top {
+  flex-direction: column;
+  align-items: flex-start;
+  flex: 1; }
+
+.uni-field-label {
+  width: 65px;
+  flex: 1 1 65px;
+  text-align: left;
+  position: relative;
+  display: flex;
+  align-items: center; }
+
+.uni-required::before {
+  content: '*';
+  position: absolute;
+  left: -8px;
+  font-size: 14px;
+  color: #dd524d;
+  height: 9px;
+  line-height: 1; }
+
+.uni-field__input-wrap {
+  position: relative;
+  overflow: hidden;
+  font-size: 14px;
+  height: 24px;
+  flex: 1;
+  width: auto; }
+
+.uni-clear-icon {
+  display: flex;
+  align-items: center; }
+
+.uni-error-message {
+  line-height: 12px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  color: #dd524d;
+  font-size: 12px;
+  text-align: left; }
+
+.uni-input-error-border {
+  border-color: #dd524d; }
+
+.placeholder-style {
+  color: #969799; }
+
+.uni-input-class {
+  font-size: 14px; }
+
+.uni-button-wrap {
+  margin-left: 4px; }
+
+/* start--Retina 屏幕下的 1px 边框--start */
+.uni-border,
+.uni-border-bottom,
+.uni-border-left,
+.uni-border-right,
+.uni-border-top,
+.uni-border-top-bottom {
+  position: relative; }
+
+.uni-border-bottom:after,
+.uni-border-left:after,
+.uni-border-right:after,
+.uni-border-top-bottom:after,
+.uni-border-top:after,
+.uni-border:after {
+  /* #ifndef APP-NVUE */
+  content: ' ';
+  /* #endif */
+  position: absolute;
+  left: 0;
+  top: 0;
+  pointer-events: none;
+  box-sizing: border-box;
+  -webkit-transform-origin: 0 0;
+  transform-origin: 0 0;
+  width: 199.8%;
+  height: 199.7%;
+  transform: scale(0.5, 0.5);
+  border: 0 solid #e5e5e5;
+  z-index: 2; }
+
+.uni-input-border {
+  min-height: 34px;
+  padding-left: 4px;
+  border: 1px solid #e5e5e5;
+  border-radius: 6px;
+  box-sizing: border-box; }
+
+.uni-border-top:after {
+  border-top-width: 1px; }
+
+.uni-border-left:after {
+  border-left-width: 1px; }
+
+.uni-border-right:after {
+  border-right-width: 1px; }
+
+.uni-border-bottom:after {
+  border-bottom-width: 1px; }
+
+.uni-border-top-bottom:after {
+  border-width: 1px 0; }
+
+.uni-border:after {
+  border-width: 1px; }
+
+/* end--Retina 屏幕下的 1px 边框--end */
+.uni-icon-wrap {
+  padding-left: 3px;
+  padding-right: 3px;
+  display: flex;
+  align-items: center;
+  justify-content: center; }
+
+.uni-button-wrap {
+  display: flex;
+  align-items: right;
+  justify-content: center; }
+
+.uni-clear-icon {
+  display: flex;
+  align-items: center;
+  margin-left: 4px; }
+
+.uni-flex {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  align-items: center; }
+
+.uni-flex-1 {
+  flex: 1; }
+
+.uni-error-in-label {
+  display: flex;
+  flex-direction: row; }
 </style>
\ No newline at end of file
diff --git a/components/uni-forms-item/uni-forms-item.vue b/components/uni-forms-item/uni-forms-item.vue
index fb189af..4cc7bcf 100755
--- a/components/uni-forms-item/uni-forms-item.vue
+++ b/components/uni-forms-item/uni-forms-item.vue
@@ -179,7 +179,6 @@
 					this.labelPos = this.labelPosition ? this.labelPosition : labelPosition
 					this.labelWid = this.label ? (this.labelWidth ? this.labelWidth : labelWidth) : 0
 					this.labelAli = this.labelAlign ? this.labelAlign : labelAlign
-					console.log(this.labelWid);
 					// 判断第一个 item
 					if (!this.form.isFirstBorder) {
 						this.form.isFirstBorder = true
diff --git a/components/uni-indexed-list/uni-indexed-list.vue b/components/uni-indexed-list/uni-indexed-list.vue
index df36ec3..4ad32b2 100644
--- a/components/uni-indexed-list/uni-indexed-list.vue
+++ b/components/uni-indexed-list/uni-indexed-list.vue
@@ -8,7 +8,7 @@
 				<scroll-view :scroll-into-view="scrollViewId" class="uni-indexed-list__scroll" scroll-y>
 					<view v-for="(list, idx) in lists" :key="idx" :id="'uni-indexed-list-' + idx">
 						<!-- #endif -->
-						<uni-indexed-list-item :list="list" :loaded="loaded" :idx="idx" :showSelect="showSelect" @itemClick="onClick"></uni-indexed-list-item>
+						<indexed-list-item :list="list" :loaded="loaded" :idx="idx" :showSelect="showSelect" @itemClick="onClick"></indexed-list-item>
 						<!-- #ifndef APP-NVUE -->
 					</view>
 				</scroll-view>
@@ -29,7 +29,7 @@
 </template>
 <script>
 	import uniIcons from '../uni-icons/uni-icons.vue'
-	import uniIndexedListItem from './uni-indexed-list-item.vue'
+	import indexedListItem from './uni-indexed-list-item.vue'
 	// #ifdef APP-NVUE
 	const dom = weex.requireModule('dom');
 	// #endif
@@ -85,7 +85,7 @@
 		name: 'UniIndexedList',
 		components: {
 			uniIcons,
-			uniIndexedListItem
+			indexedListItem
 		},
 		props: {
 			options: {
diff --git a/components/uni-list-ad/uni-list-ad.vue b/components/uni-list-ad/uni-list-ad.vue
index 9501c19..4144876 100644
--- a/components/uni-list-ad/uni-list-ad.vue
+++ b/components/uni-list-ad/uni-list-ad.vue
@@ -92,7 +92,7 @@
 		right: 0;
 		left: 0;
 		height: 1px;
-		content: "";
+		content: '';
 		-webkit-transform: scaleY(0.5);
 		transform: scaleY(0.5);
 		background-color: #e5e5e5;
diff --git a/components/uni-list-chat/uni-list-chat.vue b/components/uni-list-chat/uni-list-chat.vue
index 8f42c33..fa17b12 100644
--- a/components/uni-list-chat/uni-list-chat.vue
+++ b/components/uni-list-chat/uni-list-chat.vue
@@ -244,7 +244,7 @@
 		right: 0;
 		left: 0;
 		height: 1px;
-		content: "";
+		content: '';
 		-webkit-transform: scaleY(0.5);
 		transform: scaleY(0.5);
 		background-color: #e5e5e5;
diff --git a/components/uni-list-item/uni-list-item.vue b/components/uni-list-item/uni-list-item.vue
index 9f84d89..d200d68 100644
--- a/components/uni-list-item/uni-list-item.vue
+++ b/components/uni-list-item/uni-list-item.vue
@@ -294,7 +294,7 @@
 		right: 0;
 		left: 0;
 		height: 1px;
-		content: "";
+		content: '';
 		-webkit-transform: scaleY(0.5);
 		transform: scaleY(0.5);
 		background-color: #e5e5e5;
diff --git a/components/uni-swipe-action-item/uni-swipe-action-item.vue b/components/uni-swipe-action-item/uni-swipe-action-item.vue
index 3aa40b2..6b79728 100644
--- a/components/uni-swipe-action-item/uni-swipe-action-item.vue
+++ b/components/uni-swipe-action-item/uni-swipe-action-item.vue
@@ -247,8 +247,8 @@
 	}
 
 	/* .transition {
-	transition: all 0.3s;
-} */
+		transition: all 0.3s;
+	} */
 	.movable-view-box {
 		flex-shrink: 0;
 		height: 100%;
diff --git a/components/uni-title/uni-title.vue b/components/uni-title/uni-title.vue
index bab884d..f1f356c 100644
--- a/components/uni-title/uni-title.vue
+++ b/components/uni-title/uni-title.vue
@@ -117,7 +117,7 @@
 <style scoped>
 	/* .uni-title {
 
-} */
+	} */
 	.uni-title__box {
 		/* #ifndef APP-NVUE */
 		display: flex;
diff --git a/components/uni-tr/uni-tr.vue b/components/uni-tr/uni-tr.vue
index 2c39261..d406961 100644
--- a/components/uni-tr/uni-tr.vue
+++ b/components/uni-tr/uni-tr.vue
@@ -77,7 +77,7 @@
 <style scoped>
 	.uni-table-tr {
 		display: table-row;
-		transition: all 0.3s;
+		transition: all .3s;
 		box-sizing: border-box;
 	}
 
diff --git a/pages/extUI/easyinput/easyinput.vue b/pages/extUI/easyinput/easyinput.vue
index 121fba7..f9c8d34 100644
--- a/pages/extUI/easyinput/easyinput.vue
+++ b/pages/extUI/easyinput/easyinput.vue
@@ -5,17 +5,21 @@
 		<view class="example">
 			<uni-easyinput v-model="value" focus placeholder="请输入内容" @input="input"></uni-easyinput>
 		</view>
+		<uni-section title="自定义样式" type="line"></uni-section>
+		<view class="example">
+			<uni-easyinput v-model="value" :styles="styles" :placeholderStyle="placeholderStyle" focus placeholder="请输入内容" @input="input"></uni-easyinput>
+		</view>
 		<uni-section title="左图标" type="line"></uni-section>
 		<view class="example">
-			<uni-easyinput prefixIcon="search" v-model="value" placeholder="请输入内容"></uni-easyinput>
+			<uni-easyinput prefixIcon="search" v-model="value" placeholder="请输入内容" @iconClick="iconClick"></uni-easyinput>
 		</view>
 		<uni-section title="右图标" type="line"></uni-section>
 		<view class="example">
-			<uni-easyinput suffixIcon="search" v-model="value" placeholder="请输入内容"></uni-easyinput>
+			<uni-easyinput suffixIcon="search" v-model="value" placeholder="请输入内容" @iconClick="iconClick"></uni-easyinput>
 		</view>
 		<uni-section title="禁用" type="line"></uni-section>
 		<view class="example">
-			<uni-easyinput disabled v-model="value" placeholder="请输入内容"></uni-easyinput>
+			<uni-easyinput disabled value="已禁用" placeholder="请输入内容"></uni-easyinput>
 		</view>
 		<uni-section title="密码框" type="line"></uni-section>
 		<view class="example">
@@ -39,7 +43,12 @@
 		data() {
 			return {
 				value: '',
-				password: ''
+				password: '',
+				placeholderStyle: "color:#499721;font-size:16px",
+				styles: {
+					color: 'blue',
+					borderColor: '#499721'
+				}
 			}
 
 		},
@@ -48,6 +57,12 @@
 		methods: {
 			input(e) {
 				console.log('输入内容：', e);
+			},
+			iconClick(type) {
+				uni.showToast({
+					title: `点击了${type==='prefix'?'左侧':'右侧'}的图标`,
+					icon: 'none'
+				})
 			}
 		}
 	}
diff --git a/pages/extUI/forms/forms.vue b/pages/extUI/forms/forms.vue
index 10401d2..987398a 100644
--- a/pages/extUI/forms/forms.vue
+++ b/pages/extUI/forms/forms.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<text class="example-info"> uni-forms 组件一般由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据。</text>
-		<uni-forms :value="formData" ref="form" validate-trigger="bind" err-show-type="undertext">
+		<uni-forms :value="formData" ref="form" validate-trigger="bind" err-show-type="toast">
 			<uni-group title="基本信息" top="0">
 				<uni-forms-item name="name" required label="用户名">
 					<uni-easyinput type="text" :inputBorder="true" v-model="formData.name" placeholder="请输入用户名"></uni-easyinput>
@@ -16,9 +16,9 @@
 				<uni-forms-item name="email" label="邮箱">
 					<uni-easyinput type="text" v-model="formData.email" placeholder="请输入邮箱"></uni-easyinput>
 				</uni-forms-item>
-				<!-- <uni-forms-item name="time" label="创建时间">
+				<uni-forms-item name="time" label="创建时间">
 					<uni-datetime-picker v-model="formData.time" :min-year="2000" :max-year="2030" :timestamp="true" @change="datetimeChange"></uni-datetime-picker>
-				</uni-forms-item> -->
+				</uni-forms-item>
 				<uni-forms-item name="checked" label="详细信息">
 					<switch :checked="formData.checked" @change="change('checked',$event.detail.value)" />
 				</uni-forms-item>
@@ -185,9 +185,6 @@
 			this.$refs.form.setRules(this.rules)
 		},
 		methods: {
-			test(e) {
-				console.log('---', e.detail.value);
-			},
 			change(name, value) {
 				this.formData.checked = value
 				this.$refs.form.setValue(name, value)
-- 
GitLab