sync [email protected]

Author: Fasttian

components/uni-data-checkbox/uni-data-checkbox.vue

@@ -157,11 +157,18 @@
 			},
 			value(newVal) {
 				this.dataList = this.getDataList(newVal)
-				this.formItem && this.formItem.setValue(newVal)
+				// fix by mehaotian is_reset 在 uni-forms 中定义
+				if (!this.is_reset) {
+					this.is_reset = false
+					this.formItem && this.formItem.setValue(newVal)
+				}
 			},
 			modelValue(newVal) {
 				this.dataList = this.getDataList(newVal);
-				this.formItem && this.formItem.setValue(newVal);
+				if (!this.is_reset) {
+					this.is_reset = false
+					this.formItem && this.formItem.setValue(newVal)
+				}
 			}
 		},
 		data() {

components/uni-easyinput/uni-easyinput.vue

@@ -173,14 +173,17 @@
 			value(newVal) {
 				if (this.errMsg) this.errMsg = ''
 				this.val = newVal
-				if (this.form && this.formItem) {
+				// fix by mehaotian is_reset 在 uni-forms 中定义
+				if (this.form && this.formItem && !this.is_reset) {
+					this.is_reset = false
 					this.formItem.setValue(newVal)
 				}
 			},
 			modelValue(newVal) {
 				if (this.errMsg) this.errMsg = ''
 				this.val = newVal
-				if (this.form && this.formItem) {
+				if (this.form && this.formItem && !this.is_reset) {
+					this.is_reset = false
 					this.formItem.setValue(newVal)
 				}
 			},

components/uni-file-picker/uni-file-picker.vue

@@ -269,6 +269,8 @@
 				this.localValue = newVal
 				this.formItem && this.formItem.setValue(this.localValue)
 				this.files = [].concat(newVal || [])
+				let filesData = Object.keys(newVal).length > 0 ? newVal : []
+				this.files = [].concat(filesData)
 			},
 
 			/**

components/uni-forms-item/uni-forms-item.vue

@@ -4,9 +4,10 @@
 			<view class="uni-forms-item__inner" :class="['is-direction-' + labelPos]">
 				<view class="uni-forms-item__label" :style="{ width: labelWid , justifyContent: justifyContent }">
 					<slot name="left">
+						<text v-if="required" class="is-required">*</text>
 						<uni-icons v-if="leftIcon" class="label-icon" size="16" :type="leftIcon" :color="iconColor" />
 						<text class="label-text">{{ label }}</text>
-						<text v-if="required" class="is-required">*</text>
+
 						<view v-if="label" class="label-seat"></view>
 					</slot>
 				</view>
@@ -230,18 +231,16 @@
 					this.border = this.form.border;
 					this.showMsg = errShowType;
 					let name = this.isArray ? this.arrayField : this.name;
-					if (formRules) {
+					if (!name) return
+					if (formRules && this.rules.length > 0) {
 						if (!formRules[name]) {
 							formRules[name] = {
 								rules: this.rules
 							}
 						}
-						this.formRules = formRules[name];
-					}
-					if (this.rules.length > 0) {
 						validator.updateSchema(formRules);
 					}
-
+					this.formRules = formRules[name] || {};
 					this.validator = validator;
 				} else {
 					this.labelPos = this.labelPosition || 'left';
@@ -301,7 +300,8 @@
 			async triggerCheck(value, formTrigger) {
 				let promise = null;
 				this.errMsg = '';
-				if (!this.validator) return;
+				// fix by mehaotian 解决没有检验规则的情况下，抛出错误的问题
+				if (!this.validator || Object.keys(this.formRules).length === 0) return;
 				const isNoField = this.isRequired(this.formRules.rules || []);
 				let isTrigger = this.isTrigger(this.formRules.validateTrigger, this.validateTrigger, this.form.validateTrigger);
 				let result = null;
@@ -449,7 +449,8 @@
 	}
 
 	.is-required {
-		color: #dd524d;
+		color: #f00;
+		font-weight: bold;
 	}
 
 	.uni-error-message {

components/uni-forms/uni-forms.vue

@@ -56,11 +56,7 @@
 	export default {
 		name: 'uniForms',
 		components: {},
-		model: {
-			prop: 'modelValue',
-			event: 'update:modelValue'
-		},
-		emits: ['update:modelValue', 'input', 'reset', 'validate', 'submit'],
+		emits: ['input', 'reset', 'validate', 'submit'],
 		props: {
 			// 即将弃用
 			value: {
@@ -236,8 +232,6 @@
 				value = this._getValue(example.name, value);
 				this.formData[name] = value;
 				example.val = value;
-				this.$emit('input', Object.assign({}, this.value, this.formData));
-				this.$emit('update:modelValue', Object.assign({}, this.value, this.formData));
 				return example.triggerCheck(value, callback);
 			},
 
@@ -251,6 +245,8 @@
 					const inputComp = this.inputChildrens.find(child => child.rename === item.name);
 					if (inputComp) {
 						inputComp.errMsg = '';
+						// fix by mehaotian 不触发其他组件的 setValue
+						inputComp.is_reset = true
 						inputComp.$emit('input', inputComp.multiple ? [] : '');
 						inputComp.$emit('update:modelValue', inputComp.multiple ? [] : '');
 					}
@@ -262,8 +258,6 @@
 					}
 				});
 
-				this.$emit('input', this.formData);
-				this.$emit('update:modelValue', this.formData);
 				this.$emit('reset', event);
 			},
 

components/uni-tag/uni-tag.vue

@@ -89,7 +89,7 @@
 					isTrue(circle) ? 'uni-tag--circle' : '',
 					isTrue(mark) ? 'uni-tag--mark' : '',
 					'uni-tag--' + size,
-					type === 'default' ? 'uni-tag--default' : 'uni-tag-text',
+					// type === 'default' ? 'uni-tag--default' : 'uni-tag-text',
 					isTrue(inverted) ? 'uni-tag-text--' + type : '',
 					size === 'small' ? 'uni-tag-text--small' : ''
 				]

pages/extUI/forms/forms.nvue

@@ -21,7 +21,7 @@
 					<uni-easyinput type="textarea" v-model="baseFormData.introduction" placeholder="请输入自我介绍" />
 				</uni-forms-item>
 				<uni-forms-item label="日期时间">
-					<uni-datetime-picker type="datetime" return-type="timestamp" v-model="baseFormData.datetimesingle" @change="changeLog" />
+					<uni-datetime-picker type="datetime" return-type="timestamp" v-model="baseFormData.datetimesingle" />
 				</uni-forms-item>
 			</uni-forms>
 		</view>