diff --git a/packages/components/form-item/form-item.ts b/packages/components/form-item/form-item.ts index cc85494a3..70366a1dc 100644 --- a/packages/components/form-item/form-item.ts +++ b/packages/components/form-item/form-item.ts @@ -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', diff --git a/packages/tdesign-miniprogram/.changelog/pr-4555.md b/packages/tdesign-miniprogram/.changelog/pr-4555.md new file mode 100644 index 000000000..658b1e91c --- /dev/null +++ b/packages/tdesign-miniprogram/.changelog/pr-4555.md @@ -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)) diff --git a/packages/tdesign-uniapp/.changelog/pr-4555.md b/packages/tdesign-uniapp/.changelog/pr-4555.md new file mode 100644 index 000000000..658b1e91c --- /dev/null +++ b/packages/tdesign-uniapp/.changelog/pr-4555.md @@ -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)) diff --git a/packages/uniapp-components/form-item/form-item.vue b/packages/uniapp-components/form-item/form-item.vue index 9c0e364e3..e2ee73c2a 100644 --- a/packages/uniapp-components/form-item/form-item.vue +++ b/packages/uniapp-components/form-item/form-item.vue @@ -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'; @@ -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'; },