From 7cf72d9bf135790d677a8635aff17d3e4fdf1741 Mon Sep 17 00:00:00 2001 From: tanjinzhou <415800467@qq.com> Date: Mon, 16 Mar 2020 13:27:38 +0800 Subject: [PATCH] fix: formmodal layout not work --- antdv-demo | 2 +- components/form-model/Form.jsx | 2 +- components/form-model/FormItem.jsx | 23 +++--- .../__tests__/__snapshots__/demo.test.js.snap | 80 +++++++++---------- 4 files changed, 51 insertions(+), 56 deletions(-) diff --git a/antdv-demo b/antdv-demo index 8c9dee7ff..a69e38301 160000 --- a/antdv-demo +++ b/antdv-demo @@ -1 +1 @@ -Subproject commit 8c9dee7ff6a3a18f335fba08073f14178fffb8b0 +Subproject commit a69e38301cd2c54ecf47678ed4d1aa147eef2d7e diff --git a/components/form-model/Form.jsx b/components/form-model/Form.jsx index e87be7cd3..0be2b74be 100755 --- a/components/form-model/Form.jsx +++ b/components/form-model/Form.jsx @@ -58,7 +58,7 @@ const Form = { }, provide() { return { - FormModelContext: this, + FormContext: this, }; }, inject: { diff --git a/components/form-model/FormItem.jsx b/components/form-model/FormItem.jsx index d8afe3d77..29164fafc 100644 --- a/components/form-model/FormItem.jsx +++ b/components/form-model/FormItem.jsx @@ -69,14 +69,9 @@ export default { hasFeedback: false, autoLink: true, }), - provide() { - return { - FormModelItemContext: this, - }; - }, inject: { configProvider: { default: () => ConfigConsumerProps }, - FormModelContext: { default: () => ({}) }, + FormContext: { default: () => ({}) }, }, data() { return { @@ -89,7 +84,7 @@ export default { computed: { fieldValue() { - const model = this.FormModelContext.model; + const model = this.FormContext.model; if (!model || !this.prop) { return; } @@ -121,13 +116,13 @@ export default { }, mounted() { if (this.prop) { - const { addField } = this.FormModelContext; + const { addField } = this.FormContext; addField && addField(this); this.initialValue = cloneDeep(this.fieldValue); } }, beforeDestroy() { - const { removeField } = this.FormModelContext; + const { removeField } = this.FormContext; removeField && removeField(this); }, methods: { @@ -153,13 +148,13 @@ export default { this.validateState = errors ? 'error' : 'success'; this.validateMessage = errors ? errors[0].message : ''; callback(this.validateMessage, invalidFields); - this.FormModelContext && - this.FormModelContext.$emit && - this.FormModelContext.$emit('validate', this.prop, !errors, this.validateMessage || null); + this.FormContext && + this.FormContext.$emit && + this.FormContext.$emit('validate', this.prop, !errors, this.validateMessage || null); }); }, getRules() { - let formRules = this.FormModelContext.rules; + let formRules = this.FormContext.rules; const selfRules = this.rules; const requiredRule = this.required !== undefined ? { required: !!this.required, trigger: 'change' } : []; @@ -198,7 +193,7 @@ export default { resetField() { this.validateState = ''; this.validateMessage = ''; - let model = this.FormModelContext.model || {}; + let model = this.FormContext.model || {}; let value = this.fieldValue; let path = this.prop; if (path.indexOf(':') !== -1) { diff --git a/components/form-model/__tests__/__snapshots__/demo.test.js.snap b/components/form-model/__tests__/__snapshots__/demo.test.js.snap index 82cbde718..82679dbeb 100644 --- a/components/form-model/__tests__/__snapshots__/demo.test.js.snap +++ b/components/form-model/__tests__/__snapshots__/demo.test.js.snap @@ -3,16 +3,16 @@ exports[`renders ./antdv-demo/docs/form-model/demo/basic.md correctly 1`] = `
-
-
+
+
-
-
+
+
please select your zone
 @@ -20,24 +20,24 @@ exports[`renders ./antdv-demo/docs/form-model/demo/basic.md correctly 1`] = `
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -82,24 +82,24 @@ exports[`renders ./antdv-demo/docs/form-model/demo/basic.md correctly 1`] = ` exports[`renders ./antdv-demo/docs/form-model/demo/custom-validation.md correctly 1`] = `
-
-
+
+
-
-
+
+
-
-
+
+
@@ -163,8 +163,8 @@ exports[`renders ./antdv-demo/docs/form-model/demo/horizontal-login.md correctly exports[`renders ./antdv-demo/docs/form-model/demo/layout.md correctly 1`] = `
-
-
+
+
-
-
+
+
-
-
+
+
@@ -205,16 +205,16 @@ exports[`renders ./antdv-demo/docs/form-model/demo/layout.md correctly 1`] = ` exports[`renders ./antdv-demo/docs/form-model/demo/validation.md correctly 1`] = `
-
-
+
+
-
-
+
+
please select your zone
 @@ -222,24 +222,24 @@ exports[`renders ./antdv-demo/docs/form-model/demo/validation.md correctly 1`] =
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+