From 46d0c23afff913732741d662c5f321d846d1c573 Mon Sep 17 00:00:00 2001 From: qiqiboy Date: Tue, 17 Mar 2020 11:31:54 +0800 Subject: [PATCH] chore(Form): male $getFirstError immutable --- src/Form.js | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/src/Form.js b/src/Form.js index 411fab0..cf2a858 100644 --- a/src/Form.js +++ b/src/Form.js @@ -544,6 +544,28 @@ class Form extends Component { callback ); + $getFirstError = name => { + const $formutil = this.$formutil; + + if (name) { + const $fieldutil = $formutil.$getField(name); + + return $fieldutil && $fieldutil.$getFirstError(); + } + + for (let name in $formutil.$weakErrors) { + if ($formutil.$weakErrors.hasOwnProperty(name)) { + const $fieldError = $formutil.$weakErrors[name]; + + for (let key in $fieldError) { + if ($fieldError.hasOwnProperty(key)) { + return $fieldError[key] instanceof Error ? $fieldError[key].message : $fieldError[key]; + } + } + } + } + }; + $new = () => this.$formutil; _render() { @@ -698,25 +720,7 @@ class Form extends Component { $weakFocuses, $weakPendings, - $getFirstError(name) { - if (name) { - const $fieldutil = $formutil.$getField(name); - - return $fieldutil && $fieldutil.$getFirstError(); - } - - for (let name in $formutil.$weakErrors) { - if ($formutil.$weakErrors.hasOwnProperty(name)) { - const $fieldError = $formutil.$weakErrors[name]; - - for (let key in $fieldError) { - if ($fieldError.hasOwnProperty(key)) { - return $fieldError[key] instanceof Error ? $fieldError[key].message : $fieldError[key]; - } - } - } - } - }, + $getFirstError: this.$getFirstError, $render: this.$render,