fix(Form): fix invalid requiredMark property (#4555)

* fix(Form): fix invalid requiredMark property

* fix: fix cr

* chore: stash changelog [ci skip]

---------

Co-authored-by: tdesign-bot <tdesign@tencent.com>

Author: anlyyao

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',

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))

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))

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';
       },