From 6277cf12f0d8edb55202941e28b389ff7eaae1b1 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 25 Mar 2021 14:43:37 +0800
Subject: [PATCH] Merge branch 'master' of ssh://dev.zhiheiot.com:29418/mob-components

---
 forms/form/CForm.vue |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/forms/form/CForm.vue b/forms/form/CForm.vue
index 6008449..e50dd75 100644
--- a/forms/form/CForm.vue
+++ b/forms/form/CForm.vue
@@ -34,13 +34,14 @@
     methods: {
         handleSubmit() {
             const checklist = [];
-            Object.keys(this.validators).forEach((key) => {
+            // 所有项验证
+            Object.keys(this.validators).forEach(key => {
                 // 仍有效的验证器
                 if (this.validators[key]) {
                     checklist.push(this.validators[key]());
                 }
             });
-            Promise.all(checklist).then((validations) => {
+            Promise.all(checklist).then(validations => {
                 for (let validation of validations) {
                     // 第一个不通过项提示
                     if (!validation.passed) {
@@ -57,20 +58,18 @@
                 this.onFinish && this.onFinish();
             });
         },
-        preCheckValidators(callback) {
+        preCheckValidators(keys, callback) {
             const checklist = [];
-            Object.keys(this.validators).forEach((key) => {
-                // 仍有效的验证器
+            // 从选定的项中验证
+            keys.forEach(key => {
+                // 效的验证器
                 if (this.validators[key]) {
                     checklist.push(this.validators[key]('msgOnly'));
                 }
             });
-            Promise.all(checklist).then((validations) => {
+            Promise.all(checklist).then(validations => {
                 for (let validation of validations) {
-                    // 跳过同意协议
-                    if (validation.name === '$agreement') {
-                        continue;
-                    }
+                    // 第一个不通过项提示
                     if (!validation.passed) {
                         Taro.showToast({
                             title: validation.msg,
@@ -83,7 +82,7 @@
                         return;
                     }
                 }
-                // 检查通过
+                // 所有检查通过
                 callback && callback(true);
             });
         },
@@ -91,7 +90,7 @@
     mounted() {
         // 当表单项变化时
         this.formRes.$handleChange = (evt = []) => {
-            Object.keys(evt).forEach((key) => {
+            Object.keys(evt).forEach(key => {
                 // 直接改值
                 if (typeof this.formRes.formData[key] === 'undefined') {
                     this.$set(this.formRes.formData, key, evt[key]);

--
Gitblit v1.9.1