From e717135aa986827ebf0a42cdee70ebf888d98987 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Tue, 29 Dec 2020 09:33:37 +0800
Subject: [PATCH] 优化顶部导航显示与交互
---
forms/form/CForm.vue | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/forms/form/CForm.vue b/forms/form/CForm.vue
index 365fcac..6008449 100644
--- a/forms/form/CForm.vue
+++ b/forms/form/CForm.vue
@@ -8,7 +8,7 @@
class="c-form"
@submit="evt=>handleSubmit()"
>
- <slot :formData="formData" />
+ <slot :formRes="formRes" />
</form>
</template>
@@ -25,6 +25,9 @@
},
data() {
return {
+ formRes: {
+ formData: this.formData,
+ },
validators: {},
};
},
@@ -32,15 +35,19 @@
handleSubmit() {
const checklist = [];
Object.keys(this.validators).forEach((key) => {
- checklist.push(this.validators[key]());
+ // 仍有效的验证器
+ if (this.validators[key]) {
+ checklist.push(this.validators[key]());
+ }
});
Promise.all(checklist).then((validations) => {
for (let validation of validations) {
+ // 第一个不通过项提示
if (!validation.passed) {
Taro.showToast({
title: validation.msg,
icon: 'none',
- mask: true,
+ mask: false,
duration: 2000,
});
return;
@@ -50,15 +57,52 @@
this.onFinish && this.onFinish();
});
},
+ preCheckValidators(callback) {
+ const checklist = [];
+ Object.keys(this.validators).forEach((key) => {
+ // 仍有效的验证器
+ if (this.validators[key]) {
+ checklist.push(this.validators[key]('msgOnly'));
+ }
+ });
+ Promise.all(checklist).then((validations) => {
+ for (let validation of validations) {
+ // 跳过同意协议
+ if (validation.name === '$agreement') {
+ continue;
+ }
+ if (!validation.passed) {
+ Taro.showToast({
+ title: validation.msg,
+ icon: 'none',
+ mask: false,
+ duration: 2000,
+ });
+ // 检查失败
+ callback && callback(false);
+ return;
+ }
+ }
+ // 检查通过
+ callback && callback(true);
+ });
+ },
},
mounted() {
- this.formData.$handleChange = (evt = []) => {
+ // 当表单项变化时
+ this.formRes.$handleChange = (evt = []) => {
Object.keys(evt).forEach((key) => {
- this.formData[key] = evt[key];
+ // 直接改值
+ if (typeof this.formRes.formData[key] === 'undefined') {
+ this.$set(this.formRes.formData, key, evt[key]);
+ } else {
+ this.formRes.formData[key] = evt[key];
+ }
});
this.onChange && this.onChange(evt);
};
- this.formData.$regItemValidator = (name, cb) => {
+ // 注册表单验证器
+ this.formRes.$regItemValidator = (name, cb) => {
this.validators[name] = cb;
};
},
--
Gitblit v1.9.1