Skip to content

fix(Form): fix invalid requiredMark property #4555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anlyyao merged 3 commits into from
Jul 9, 2026
+15 −3
Merged

fix(Form): fix invalid requiredMark property #4555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5baf580
fix(Form): fix invalid requiredMark property
anlyyao Jul 8, 2026
69c3110
fix: fix cr
anlyyao Jul 8, 2026
505a29b
chore: stash changelog [ci skip]
tdesign-bot Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/components/form-item/form-item.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export default class FormItem extends SuperComponent {
innerLabelWidth: normalizeLabelWidth(labelWidth || target.data.labelWidth),
innerContentAlign,
contentStyle: innerContentAlign ? `text-align: ${innerContentAlign}` : '',
innerRequiredMark: requiredMark || target.data.requiredMark || globalConfig.requiredMark || isRequired,
innerRequiredMark: requiredMark ?? target.data.requiredMark ?? globalConfig.requiredMark ?? isRequired,
innerShowErrorMessage:
typeof showErrorMessage === 'boolean' ? showErrorMessage : target.properties.showErrorMessage,
requiredMarkPosition: target.data.requiredMarkPosition || globalConfig.requiredMarkPosition || 'left',
Expand Down
6 changes: 6 additions & 0 deletions packages/tdesign-miniprogram/.changelog/pr-4555.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
pr_number: 4555
contributor: anlyyao
---

- fix(Form): `FormRule.required` 为 true 时，`requiredMark` 属性无效 @anlyyao ([#4555](https://github.com/Tencent/tdesign-miniprogram/pull/4555))
6 changes: 6 additions & 0 deletions packages/tdesign-uniapp/.changelog/pr-4555.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
pr_number: 4555
contributor: anlyyao
---

- fix(Form): `FormRule.required` 为 true 时，`requiredMark` 属性无效 @anlyyao ([#4555](https://github.com/Tencent/tdesign-miniprogram/pull/4555))
4 changes: 2 additions & 2 deletions packages/uniapp-components/form-item/form-item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ import { prefix } from '../common/config';

import { ChildrenMixin, RELATION_MAP } from '../common/relation';
import { uniComponent } from '../common/src/index';
import { getRect } from '../common/utils';
import { coalesce, getRect } from '../common/utils';
import tools from '../common/utils.wxs';
import { isNumeric } from '../common/validator';
import TIcon from '../icon/icon.vue';
Expand Down Expand Up @@ -187,7 +187,7 @@ export default {
this.dataLabelAlign = labelAlign || target.labelAlign;
this.dataLabelWidth = normalizeLabelWidth(labelWidth || target.labelWidth);
this.dataContentAlign = contentAlign || target.contentAlign;
this.dataRequiredMark = requiredMark || target.requiredMark || globalConfig.requiredMark || isRequired;
this.dataRequiredMark = coalesce(requiredMark, target.requiredMark, globalConfig.requiredMark, isRequired);
this.dataShowErrorMessage = typeof showErrorMessage === 'boolean' ? showErrorMessage : target.showErrorMessage;
this.requiredMarkPosition = target.requiredMarkPosition || globalConfig.requiredMarkPosition || 'left';
},
Expand Down
Loading