From a60685fe10de1c33b6353e2f4fac8a5fe6ffa897 Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Thu, 26 Jun 2025 17:07:48 +0800 Subject: [PATCH] =?UTF-8?q?fix(form):=20=E4=BF=AE=E5=A4=8D=E5=8F=B3?= =?UTF-8?q?=E4=BE=A7=E6=98=9F=E6=98=9F=E6=97=A0=E6=B3=95=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/form/demos/h5/demo2.tsx | 1 + src/packages/form/demos/taro/demo2.tsx | 1 + src/packages/formitem/formitem.scss | 27 ++++++++++++------------- src/packages/formitem/formitem.taro.tsx | 6 ++++-- src/packages/formitem/formitem.tsx | 6 ++++-- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/packages/form/demos/h5/demo2.tsx b/src/packages/form/demos/h5/demo2.tsx index 8c17a584fd..4d68c0e52e 100644 --- a/src/packages/form/demos/h5/demo2.tsx +++ b/src/packages/form/demos/h5/demo2.tsx @@ -35,6 +35,7 @@ const Demo2 = () => {
submitSucceed(values)} onFinishFailed={(values, errors) => submitFailed(errors)} footer={ diff --git a/src/packages/form/demos/taro/demo2.tsx b/src/packages/form/demos/taro/demo2.tsx index ab81d3c104..a6f7eb7256 100644 --- a/src/packages/form/demos/taro/demo2.tsx +++ b/src/packages/form/demos/taro/demo2.tsx @@ -35,6 +35,7 @@ const Demo2 = () => { submitSucceed(values)} onFinishFailed={(values, errors) => submitFailed(errors)} footer={ diff --git a/src/packages/formitem/formitem.scss b/src/packages/formitem/formitem.scss index 939c59f9f5..95cc3872fd 100644 --- a/src/packages/formitem/formitem.scss +++ b/src/packages/formitem/formitem.scss @@ -18,14 +18,20 @@ word-wrap: break-word; text-align: $form-item-label-text-align; line-height: unset; - } - &-label-required { - color: $form-item-required-color; - margin-right: $form-item-required-margin-right; - display: block; - position: absolute; - left: -10px; + &-left-required { + color: $form-item-required-color; + margin-right: $form-item-required-margin-right; + position: absolute; + left: -10px; + } + + &-right-required { + color: $form-item-required-color; + margin-left: $form-item-required-margin-right; + position: absolute; + right: -10px; + } } .nut-form-item-labeltxt { @@ -136,13 +142,6 @@ white-space: nowrap; } -.nut-form-item-label-left-required { - display: block; - line-height: 1.5; - position: absolute; - left: 0.1em; -} - .nut-form-item-top { flex-direction: column; align-items: flex-start; diff --git a/src/packages/formitem/formitem.taro.tsx b/src/packages/formitem/formitem.taro.tsx index a44eef22b3..c64f2ffc93 100644 --- a/src/packages/formitem/formitem.taro.tsx +++ b/src/packages/formitem/formitem.taro.tsx @@ -189,15 +189,17 @@ export class FormItem extends React.Component< const { starPosition } = this.context.formInstance const renderStar = (required || requiredInRules) && ( - * + + * + ) const renderLabel = ( <> {starPosition === 'left' ? renderStar : null} {label} + {starPosition === 'right' ? renderStar : null} - {starPosition === 'right' ? renderStar : null} ) return ( diff --git a/src/packages/formitem/formitem.tsx b/src/packages/formitem/formitem.tsx index 523c570a8c..12ca25ad05 100644 --- a/src/packages/formitem/formitem.tsx +++ b/src/packages/formitem/formitem.tsx @@ -197,15 +197,17 @@ export class FormItem extends React.Component< const { starPosition } = this.context.formInstance const renderStar = (required || requiredInRules) && ( -
*
+ + * + ) const renderLabel = ( <> {starPosition === 'left' ? renderStar : null} {label} + {starPosition === 'right' ? renderStar : null} - {starPosition === 'right' ? renderStar : null} ) return (