feat: requiredMark可选项样式接入antd多语言

alibaba · Feb 22, 2023 · e51dfda · e51dfda
1 parent e9b04cb
commit e51dfda
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/antd/docs/components/FormItem.zh-CN.md b/packages/antd/docs/components/FormItem.zh-CN.md
@@ -379,7 +379,8 @@ export default () => {
 ```tsx
 import React, { useState } from 'react'
 import { Input, FormItem, FormLayout } from '@formily/antd'
-import { Radio } from 'antd'
+import { Radio, ConfigProvider } from 'antd'
+import zhCN from 'antd/es/locale/zh_CN'
 import { createForm } from '@formily/core'
 import { FormProvider, createSchemaField } from '@formily/react'
 
@@ -395,7 +396,7 @@ const form = createForm()
 export default () => {
   const [requiredMark, setRequiredMark] = useState(true)
   return (
-    <div>
+    <ConfigProvider locale={zhCN}>
       <p>
         Required Mark：
         <Radio.Group
@@ -424,7 +425,7 @@ export default () => {
           </SchemaField>
         </FormLayout>
       </FormProvider>
-    </div>
+    </ConfigProvider>
   )
 }
 ```

diff --git a/packages/antd/src/form-item/index.tsx b/packages/antd/src/form-item/index.tsx
@@ -5,6 +5,8 @@ import { isVoidField } from '@formily/core'
 import { connect, mapProps } from '@formily/react'
 import { useFormLayout, FormLayoutShallowContext } from '../form-layout'
 import { Tooltip, Popover } from 'antd'
+import { useLocaleReceiver } from 'antd/es/locale-provider/LocaleReceiver'
+import defaultLocale from 'antd/es/locale/default'
 import {
   QuestionCircleOutlined,
   CloseCircleOutlined,
@@ -130,6 +132,7 @@ export const BaseItem: React.FC<React.PropsWithChildren<IFormItemProps>> = ({
 }) => {
   const [active, setActive] = useState(false)
   const formLayout = useFormItemLayout(props)
+  const [formLocale] = useLocaleReceiver('Form')
   const { containerRef, contentRef, overflow } = useOverflow<
     HTMLDivElement,
     HTMLSpanElement
@@ -235,7 +238,7 @@ export const BaseItem: React.FC<React.PropsWithChildren<IFormItemProps>> = ({
           )}
           <label>{label}</label>
           {!asterisk && requiredMark === 'optional' && (
-            <span className={`${prefixCls}-optional`}>（可选）</span>
+            <span className={`${prefixCls}-optional`}>{formLocale?.optional || defaultLocale.Form?.optional}</span>
           )}
         </span>
       </div>