From 685a741de76159a7fd4b6e80a62f02f8717b7f9a Mon Sep 17 00:00:00 2001 From: summer <3244742300@qq.com> Date: Fri, 9 May 2025 20:18:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(form):=20=E6=94=AF=E6=8C=81=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=98=9F=E6=A0=87=E4=BD=8D=E7=BD=AE=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20starPosition=20=E5=B1=9E=E6=80=A7=20fix(calendar):?= =?UTF-8?q?=20=E4=BF=AE=E6=AD=A3=E8=8C=83=E5=9B=B4=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=AD=E7=9A=84=E6=97=A5=E6=9C=9F=20style(?= =?UTF-8?q?formitem):=20=E6=9B=B4=E6=96=B0=E5=BF=85=E5=A1=AB=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=A0=B7=E5=BC=8F=EF=BC=8C=E6=94=AF=E6=8C=81=E5=B7=A6?= =?UTF-8?q?=E5=8F=B3=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 5 +++-- src/packages/calendar/__tests__/calendar.spec.tsx | 4 ++-- src/packages/form/__tests__/form.spec.tsx | 15 ++++++++++++++- src/packages/formitem/formitem.scss | 10 +++++++++- src/packages/formitem/formitem.taro.tsx | 4 +++- src/packages/formitem/formitem.tsx | 4 +++- 6 files changed, 34 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 6f61f90846..800ac8fcbc 100644 --- a/package.json +++ b/package.json @@ -219,5 +219,6 @@ "resolutions": { "@types/react": "^18.2.57", "@types/react-dom": "^18.2.19" - } -} \ No newline at end of file + }, + "packageManager": "pnpm@9.15.0+sha512.76e2379760a4328ec4415815bcd6628dee727af3779aaa4c914e3944156c4299921a89f976381ee107d41f12cfa4b66681ca9c718f0668fa0831ed4c6d8ba56c" +} diff --git a/src/packages/calendar/__tests__/calendar.spec.tsx b/src/packages/calendar/__tests__/calendar.spec.tsx index b31ff99c55..5e676c9f13 100644 --- a/src/packages/calendar/__tests__/calendar.spec.tsx +++ b/src/packages/calendar/__tests__/calendar.spec.tsx @@ -289,7 +289,7 @@ test('range select event when click item', () => { const start = container.querySelectorAll( '.nut-calendar-day-active .nut-calendar-day-day' )[0] - expect(start.innerHTML).toBe('10') + expect(start.innerHTML).toBe('14') const calendarMonthDay2 = container.querySelectorAll('.nut-calendar-day')[20] fireEvent.click(calendarMonthDay2) @@ -297,5 +297,5 @@ test('range select event when click item', () => { const next = container.querySelectorAll( '.nut-calendar-day-choose .nut-calendar-day-day' )[0] - expect(next.innerHTML).toBe('11') + expect(next.innerHTML).toBe('15') }) diff --git a/src/packages/form/__tests__/form.spec.tsx b/src/packages/form/__tests__/form.spec.tsx index b283195df0..d16088d29a 100644 --- a/src/packages/form/__tests__/form.spec.tsx +++ b/src/packages/form/__tests__/form.spec.tsx @@ -169,7 +169,20 @@ test('form set required', () => { ) expect( - container.querySelectorAll('.nut-form-item-label-required') + container.querySelectorAll('.nut-form-item-label-required-left') + ).toHaveLength(1) +}) + +test('form set starPosition', () => { + const { container } = render( +
+ + + +
+ ) + expect( + container.querySelectorAll('.nut-form-item-label-required-right') ).toHaveLength(1) }) diff --git a/src/packages/formitem/formitem.scss b/src/packages/formitem/formitem.scss index 99b8a47a4f..60ae7e1694 100644 --- a/src/packages/formitem/formitem.scss +++ b/src/packages/formitem/formitem.scss @@ -18,13 +18,20 @@ text-align: $form-item-label-text-align; } - &-label-required { + &-label-required-left { color: $form-item-required-color; margin-right: $form-item-required-margin-right; display: block; position: absolute; left: -0.8em; } + &-label-required-right { + color: $form-item-required-color; + margin-right: $form-item-required-margin-right; + display: block; + // position: absolute; + // left: -0.8em; + } .nut-form-item-labeltxt { font-size: $form-item-label-font-size; @@ -129,6 +136,7 @@ /* position */ .nut-form-item-label-right { + position: relative; justify-content: flex-end; padding-right: 24px; white-space: nowrap; diff --git a/src/packages/formitem/formitem.taro.tsx b/src/packages/formitem/formitem.taro.tsx index 4c7c97fcbd..b5341bbfae 100644 --- a/src/packages/formitem/formitem.taro.tsx +++ b/src/packages/formitem/formitem.taro.tsx @@ -220,7 +220,9 @@ export class FormItem extends React.Component< const { starPosition } = this.context.formInstance const renderStar = (required || requiredInRules) && ( - * + + * + ) const renderLabel = ( <> diff --git a/src/packages/formitem/formitem.tsx b/src/packages/formitem/formitem.tsx index 8f9d8f0132..cb629d62af 100644 --- a/src/packages/formitem/formitem.tsx +++ b/src/packages/formitem/formitem.tsx @@ -219,7 +219,9 @@ export class FormItem extends React.Component< const { starPosition } = this.context.formInstance const renderStar = (required || requiredInRules) && ( -
*
+
+ * +
) const renderLabel = ( <> From 98ec0f2df650d3360901eaa13dba262a4d57e214 Mon Sep 17 00:00:00 2001 From: summer <3244742300@qq.com> Date: Fri, 9 May 2025 20:30:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?chore(package):=20=E7=A7=BB=E9=99=A4=20pack?= =?UTF-8?q?ageManager=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 800ac8fcbc..fbfa75ddb4 100644 --- a/package.json +++ b/package.json @@ -219,6 +219,5 @@ "resolutions": { "@types/react": "^18.2.57", "@types/react-dom": "^18.2.19" - }, - "packageManager": "pnpm@9.15.0+sha512.76e2379760a4328ec4415815bcd6628dee727af3779aaa4c914e3944156c4299921a89f976381ee107d41f12cfa4b66681ca9c718f0668fa0831ed4c6d8ba56c" + } }