diff --git a/package.json b/package.json
index 6f61f90846..fbfa75ddb4 100644
--- a/package.json
+++ b/package.json
@@ -220,4 +220,4 @@
"@types/react": "^18.2.57",
"@types/react-dom": "^18.2.19"
}
-}
\ No newline at end of file
+}
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 = (
<>