From a8d5dad362144b5c313f3b4dbb46c3687566fb85 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 15 Mar 2022 14:34:25 +0800 Subject: [PATCH] revert: formItem errorlist animate --- .../__tests__/__snapshots__/demo.test.js.snap | 4 +- .../__snapshots__/index.test.js.snap | 4 +- components/form/ErrorList.tsx | 4 +- .../__tests__/__snapshots__/demo.test.js.snap | 202 +++++++++--------- components/form/style/index.less | 8 +- .../__tests__/__snapshots__/demo.test.js.snap | 6 +- .../__tests__/__snapshots__/demo.test.js.snap | 10 +- 7 files changed, 117 insertions(+), 121 deletions(-) diff --git a/components/comment/__tests__/__snapshots__/demo.test.js.snap b/components/comment/__tests__/__snapshots__/demo.test.js.snap index 74430fdb5..037b2cbfb 100644 --- a/components/comment/__tests__/__snapshots__/demo.test.js.snap +++ b/components/comment/__tests__/__snapshots__/demo.test.js.snap @@ -38,7 +38,7 @@ exports[`renders ./components/comment/demo/editor.vue correctly 1`] = `
-
+ @@ -51,7 +51,7 @@ exports[`renders ./components/comment/demo/editor.vue correctly 1`] = ` -
+ diff --git a/components/comment/__tests__/__snapshots__/index.test.js.snap b/components/comment/__tests__/__snapshots__/index.test.js.snap index 521ac2218..99acaabac 100644 --- a/components/comment/__tests__/__snapshots__/index.test.js.snap +++ b/components/comment/__tests__/__snapshots__/index.test.js.snap @@ -49,7 +49,7 @@ exports[`Comment Comment can be used as editor, user can customize the editor co
-
+ @@ -62,7 +62,7 @@ exports[`Comment Comment can be used as editor, user can customize the editor co -
+ diff --git a/components/form/ErrorList.tsx b/components/form/ErrorList.tsx index b707e0dd1..4bebce09f 100644 --- a/components/form/ErrorList.tsx +++ b/components/form/ErrorList.tsx @@ -37,7 +37,7 @@ export default defineComponent({ colMItem, ); (transitionGroupProps as any).class = baseClassName.value; - return ( + return props.errors?.length ? ( {props.errors?.map((error: any, index: number) => (
))} - ); + ) : null; }; }, }); diff --git a/components/form/__tests__/__snapshots__/demo.test.js.snap b/components/form/__tests__/__snapshots__/demo.test.js.snap index d10cc1783..6e85b92dc 100644 --- a/components/form/__tests__/__snapshots__/demo.test.js.snap +++ b/components/form/__tests__/__snapshots__/demo.test.js.snap @@ -14,7 +14,7 @@ exports[`renders ./components/form/demo/advanced-search.vue correctly 1`] = `
-
+ @@ -29,7 +29,7 @@ exports[`renders ./components/form/demo/advanced-search.vue correctly 1`] = `
-
+ @@ -44,7 +44,7 @@ exports[`renders ./components/form/demo/advanced-search.vue correctly 1`] = `
-
+ @@ -59,7 +59,7 @@ exports[`renders ./components/form/demo/advanced-search.vue correctly 1`] = `
-
+ @@ -74,7 +74,7 @@ exports[`renders ./components/form/demo/advanced-search.vue correctly 1`] = `
-
+ @@ -89,7 +89,7 @@ exports[`renders ./components/form/demo/advanced-search.vue correctly 1`] = `
-
+ @@ -104,7 +104,7 @@ exports[`renders ./components/form/demo/advanced-search.vue correctly 1`] = `
-
+ @@ -119,7 +119,7 @@ exports[`renders ./components/form/demo/advanced-search.vue correctly 1`] = `
-
+ @@ -134,7 +134,7 @@ exports[`renders ./components/form/demo/advanced-search.vue correctly 1`] = `
-
+ @@ -149,7 +149,7 @@ exports[`renders ./components/form/demo/advanced-search.vue correctly 1`] = `
-
+ @@ -178,7 +178,7 @@ exports[`renders ./components/form/demo/basic.vue correctly 1`] = `
-
+ @@ -191,7 +191,7 @@ exports[`renders ./components/form/demo/basic.vue correctly 1`] = `
-
+ @@ -202,7 +202,7 @@ exports[`renders ./components/form/demo/basic.vue correctly 1`] = `
-
+ @@ -215,7 +215,7 @@ exports[`renders ./components/form/demo/basic.vue correctly 1`] = ` -
+ @@ -233,7 +233,7 @@ exports[`renders ./components/form/demo/custom-validation.vue correctly 1`] = `
-
+ @@ -246,7 +246,7 @@ exports[`renders ./components/form/demo/custom-validation.vue correctly 1`] = `
-
+ @@ -264,7 +264,7 @@ exports[`renders ./components/form/demo/custom-validation.vue correctly 1`] = ` -
+ @@ -279,7 +279,7 @@ exports[`renders ./components/form/demo/custom-validation.vue correctly 1`] = ` -
+ @@ -302,7 +302,7 @@ exports[`renders ./components/form/demo/customized-form-controls.vue correctly 1 -
+ @@ -315,7 +315,7 @@ exports[`renders ./components/form/demo/customized-form-controls.vue correctly 1 -
+ @@ -333,7 +333,7 @@ exports[`renders ./components/form/demo/dynamic-form-item.vue correctly 1`] = ` -
+ @@ -348,7 +348,7 @@ exports[`renders ./components/form/demo/dynamic-form-item.vue correctly 1`] = ` -
+ @@ -366,7 +366,7 @@ exports[`renders ./components/form/demo/dynamic-form-items.vue correctly 1`] = ` -
+ @@ -379,7 +379,7 @@ exports[`renders ./components/form/demo/dynamic-form-items.vue correctly 1`] = ` -
+ @@ -406,7 +406,7 @@ exports[`renders ./components/form/demo/dynamic-form-items-complex.vue correctly -
+ @@ -419,7 +419,7 @@ exports[`renders ./components/form/demo/dynamic-form-items-complex.vue correctly -
+ @@ -432,7 +432,7 @@ exports[`renders ./components/form/demo/dynamic-form-items-complex.vue correctly -
+ @@ -450,7 +450,7 @@ exports[`renders ./components/form/demo/dynamic-rule.vue correctly 1`] = `
-
+ @@ -463,7 +463,7 @@ exports[`renders ./components/form/demo/dynamic-rule.vue correctly 1`] = `
-
+ @@ -474,7 +474,7 @@ exports[`renders ./components/form/demo/dynamic-rule.vue correctly 1`] = `
-
+ @@ -487,7 +487,7 @@ exports[`renders ./components/form/demo/dynamic-rule.vue correctly 1`] = ` -
+ @@ -505,7 +505,7 @@ exports[`renders ./components/form/demo/form-context.vue correctly 1`] = `
-
+ @@ -520,7 +520,7 @@ exports[`renders ./components/form/demo/form-context.vue correctly 1`] = ` -
+ @@ -535,7 +535,7 @@ exports[`renders ./components/form/demo/form-context.vue correctly 1`] = ` -
+ @@ -560,7 +560,7 @@ exports[`renders ./components/form/demo/horizontal-login.vue correctly 1`] = `
-
+ @@ -571,7 +571,7 @@ exports[`renders ./components/form/demo/horizontal-login.vue correctly 1`] = `
-
+ @@ -584,7 +584,7 @@ exports[`renders ./components/form/demo/horizontal-login.vue correctly 1`] = ` -
+ @@ -602,7 +602,7 @@ exports[`renders ./components/form/demo/inline-login.vue correctly 1`] = `
-
+ @@ -615,7 +615,7 @@ exports[`renders ./components/form/demo/inline-login.vue correctly 1`] = `
-
+ @@ -628,7 +628,7 @@ exports[`renders ./components/form/demo/inline-login.vue correctly 1`] = ` -
+ @@ -646,7 +646,7 @@ exports[`renders ./components/form/demo/lable-width.vue correctly 1`] = `
-
+ @@ -663,7 +663,7 @@ exports[`renders ./components/form/demo/lable-width.vue correctly 1`] = ` -
+ @@ -678,7 +678,7 @@ exports[`renders ./components/form/demo/lable-width.vue correctly 1`] = ` -
+ @@ -693,7 +693,7 @@ exports[`renders ./components/form/demo/lable-width.vue correctly 1`] = ` -
+ @@ -706,7 +706,7 @@ exports[`renders ./components/form/demo/lable-width.vue correctly 1`] = `
-
+ @@ -721,7 +721,7 @@ exports[`renders ./components/form/demo/lable-width.vue correctly 1`] = ` -
+ @@ -741,7 +741,7 @@ exports[`renders ./components/form/demo/layout.vue correctly 1`] = ` -
+ @@ -754,7 +754,7 @@ exports[`renders ./components/form/demo/layout.vue correctly 1`] = `
-
+ @@ -767,7 +767,7 @@ exports[`renders ./components/form/demo/layout.vue correctly 1`] = `
-
+ @@ -780,7 +780,7 @@ exports[`renders ./components/form/demo/layout.vue correctly 1`] = ` -
+ @@ -798,7 +798,7 @@ exports[`renders ./components/form/demo/nest-messages.vue correctly 1`] = `
-
+ @@ -811,7 +811,7 @@ exports[`renders ./components/form/demo/nest-messages.vue correctly 1`] = `
-
+ @@ -829,7 +829,7 @@ exports[`renders ./components/form/demo/nest-messages.vue correctly 1`] = ` -
+ @@ -842,7 +842,7 @@ exports[`renders ./components/form/demo/nest-messages.vue correctly 1`] = `
-
+ @@ -855,7 +855,7 @@ exports[`renders ./components/form/demo/nest-messages.vue correctly 1`] = `
-
+ @@ -868,7 +868,7 @@ exports[`renders ./components/form/demo/nest-messages.vue correctly 1`] = ` -
+ @@ -886,7 +886,7 @@ exports[`renders ./components/form/demo/normal-login.vue correctly 1`] = `
-
+ @@ -899,7 +899,7 @@ exports[`renders ./components/form/demo/normal-login.vue correctly 1`] = `
-
+ @@ -913,7 +913,7 @@ exports[`renders ./components/form/demo/normal-login.vue correctly 1`] = ` Or register now! -
+ @@ -938,7 +938,7 @@ exports[`renders ./components/form/demo/time-related-controls.vue correctly 1`] -
+ @@ -958,7 +958,7 @@ exports[`renders ./components/form/demo/time-related-controls.vue correctly 1`] -
+ @@ -978,7 +978,7 @@ exports[`renders ./components/form/demo/time-related-controls.vue correctly 1`] -
+ @@ -1000,7 +1000,7 @@ exports[`renders ./components/form/demo/time-related-controls.vue correctly 1`] -
+ @@ -1022,7 +1022,7 @@ exports[`renders ./components/form/demo/time-related-controls.vue correctly 1`] -
+ @@ -1042,7 +1042,7 @@ exports[`renders ./components/form/demo/time-related-controls.vue correctly 1`] -
+ @@ -1055,7 +1055,7 @@ exports[`renders ./components/form/demo/time-related-controls.vue correctly 1`] -
+ @@ -1073,7 +1073,7 @@ exports[`renders ./components/form/demo/useForm-basic.vue correctly 1`] = `
-
+ @@ -1095,7 +1095,7 @@ exports[`renders ./components/form/demo/useForm-basic.vue correctly 1`] = ` -
+ @@ -1110,7 +1110,7 @@ exports[`renders ./components/form/demo/useForm-basic.vue correctly 1`] = ` -
+ @@ -1125,7 +1125,7 @@ exports[`renders ./components/form/demo/useForm-basic.vue correctly 1`] = ` -
+ @@ -1143,7 +1143,7 @@ exports[`renders ./components/form/demo/useForm-merge.vue correctly 1`] = `
-
+ @@ -1165,7 +1165,7 @@ exports[`renders ./components/form/demo/useForm-merge.vue correctly 1`] = ` -
+ @@ -1180,7 +1180,7 @@ exports[`renders ./components/form/demo/useForm-merge.vue correctly 1`] = ` -
+ @@ -1195,7 +1195,7 @@ exports[`renders ./components/form/demo/useForm-merge.vue correctly 1`] = ` -
+ @@ -1213,7 +1213,7 @@ exports[`renders ./components/form/demo/useForm-nested.vue correctly 1`] = `
-
+ @@ -1226,7 +1226,7 @@ exports[`renders ./components/form/demo/useForm-nested.vue correctly 1`] = `
-
+ @@ -1241,7 +1241,7 @@ exports[`renders ./components/form/demo/useForm-nested.vue correctly 1`] = ` -
+ @@ -1259,7 +1259,7 @@ exports[`renders ./components/form/demo/useForm-trigger.vue correctly 1`] = `
-
+ @@ -1281,7 +1281,7 @@ exports[`renders ./components/form/demo/useForm-trigger.vue correctly 1`] = ` -
+ @@ -1296,7 +1296,7 @@ exports[`renders ./components/form/demo/useForm-trigger.vue correctly 1`] = ` -
+ @@ -1314,7 +1314,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = `
China
-
+ @@ -1336,7 +1336,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = ` -
+ @@ -1364,7 +1364,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = ` -
+ @@ -1382,7 +1382,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = ` -
+ @@ -1399,7 +1399,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = ` -
+ @@ -1421,7 +1421,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = ` -
+ @@ -1436,7 +1436,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = ` -
+ @@ -1451,7 +1451,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = ` -
+ @@ -1475,7 +1475,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = ` -
+ @@ -1521,7 +1521,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = ` -
+ @@ -1538,7 +1538,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = ` -
+
longgggggggggggggggggggggggggggggggggg
@@ -1558,7 +1558,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = ` -
+ @@ -1571,7 +1571,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = ` -
+ @@ -1589,7 +1589,7 @@ exports[`renders ./components/form/demo/validation.vue correctly 1`] = `
-
+ @@ -1611,7 +1611,7 @@ exports[`renders ./components/form/demo/validation.vue correctly 1`] = ` -
+ @@ -1631,7 +1631,7 @@ exports[`renders ./components/form/demo/validation.vue correctly 1`] = ` -
+ @@ -1648,7 +1648,7 @@ exports[`renders ./components/form/demo/validation.vue correctly 1`] = ` -
+ @@ -1663,7 +1663,7 @@ exports[`renders ./components/form/demo/validation.vue correctly 1`] = ` -
+ @@ -1678,7 +1678,7 @@ exports[`renders ./components/form/demo/validation.vue correctly 1`] = ` -
+ @@ -1691,7 +1691,7 @@ exports[`renders ./components/form/demo/validation.vue correctly 1`] = `
-
+ @@ -1706,7 +1706,7 @@ exports[`renders ./components/form/demo/validation.vue correctly 1`] = ` -
+ diff --git a/components/form/style/index.less b/components/form/style/index.less index 3f168b022..eb009fe41 100644 --- a/components/form/style/index.less +++ b/components/form/style/index.less @@ -62,11 +62,9 @@ margin-bottom: @form-item-margin-bottom; vertical-align: top; - // We delay one frame (0.017s) here to let CSSMotion goes - transition: margin-bottom @animation-duration-slow 0.017s linear; &-with-help { - // margin-bottom: 0; + margin-bottom: 0; transition: none; } @@ -204,10 +202,8 @@ &-explain-connected { height: 0; - min-height: @form-item-margin-bottom; + min-height: 0; opacity: 0; - margin-top: -@form-item-margin-bottom; - transform: translateY(@form-item-margin-bottom); } &-extra { diff --git a/components/mentions/__tests__/__snapshots__/demo.test.js.snap b/components/mentions/__tests__/__snapshots__/demo.test.js.snap index 993e75b5f..3ab0bed01 100644 --- a/components/mentions/__tests__/__snapshots__/demo.test.js.snap +++ b/components/mentions/__tests__/__snapshots__/demo.test.js.snap @@ -27,7 +27,7 @@ exports[`renders ./components/mentions/demo/form.vue correctly 1`] = ` -
+ @@ -44,7 +44,7 @@ exports[`renders ./components/mentions/demo/form.vue correctly 1`] = ` -
+ @@ -59,7 +59,7 @@ exports[`renders ./components/mentions/demo/form.vue correctly 1`] = ` -
+ diff --git a/components/skeleton/__tests__/__snapshots__/demo.test.js.snap b/components/skeleton/__tests__/__snapshots__/demo.test.js.snap index f519331d6..3863cbc4c 100644 --- a/components/skeleton/__tests__/__snapshots__/demo.test.js.snap +++ b/components/skeleton/__tests__/__snapshots__/demo.test.js.snap @@ -92,7 +92,7 @@ exports[`renders ./components/skeleton/demo/element.vue correctly 1`] = ` -
+ @@ -109,7 +109,7 @@ exports[`renders ./components/skeleton/demo/element.vue correctly 1`] = ` -
+ @@ -124,7 +124,7 @@ exports[`renders ./components/skeleton/demo/element.vue correctly 1`] = ` -
+ @@ -139,7 +139,7 @@ exports[`renders ./components/skeleton/demo/element.vue correctly 1`] = ` -
+ @@ -154,7 +154,7 @@ exports[`renders ./components/skeleton/demo/element.vue correctly 1`] = ` -
+