Skip to content

Commit 64b1d33

Browse files
over58xuyongchao
andauthored
feat: ArrayCollapse header support ReactNode & update extra position (#38)
* feat: arrayCollapse support ReactNode * chore: update text * feat: update extra position --------- Co-authored-by: xuyongchao <xuyongchao@bytedance.com>
1 parent f8bb2e8 commit 64b1d33

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

docs/components/ArrayCollapse.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
} from '@formily/antd-v5'
1818
import { createForm } from '@formily/core'
1919
import { FormProvider, createSchemaField } from '@formily/react'
20-
import { Button } from 'antd'
20+
import { Button, Typography } from 'antd'
2121

2222
const SchemaField = createSchemaField({
2323
components: {
@@ -107,7 +107,12 @@ export default () => {
107107
<SchemaField.Void
108108
x-component="ArrayCollapse.CollapsePanel"
109109
x-component-props={{
110-
header: 'String array',
110+
header: (
111+
<Typography.Text type="danger" style={{ marginLeft: 4 }}>
112+
String Array
113+
</Typography.Text>
114+
),
115+
extra: 'extra text',
111116
}}
112117
>
113118
<SchemaField.Void x-component="ArrayCollapse.Index" />

docs/components/ArrayCollapse.zh-CN.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
} from '@formily/antd-v5'
1818
import { createForm } from '@formily/core'
1919
import { FormProvider, createSchemaField } from '@formily/react'
20-
import { Button } from 'antd'
20+
import { Button, Typography } from 'antd'
2121

2222
const SchemaField = createSchemaField({
2323
components: {
@@ -107,7 +107,12 @@ export default () => {
107107
<SchemaField.Void
108108
x-component="ArrayCollapse.CollapsePanel"
109109
x-component-props={{
110-
header: '字符串数组',
110+
header: (
111+
<Typography.Text type="danger" style={{ marginLeft: 4 }}>
112+
字符串数组
113+
</Typography.Text>
114+
),
115+
extra: '额外信息',
111116
}}
112117
>
113118
<SchemaField.Void x-component="ArrayCollapse.Index" />

packages/components/src/array-collapse/index.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,8 @@ const InternalArrayCollapse: ReactFC<IArrayCollapseProps> = observer(
141141
.get('componentProps')
142142
const props: CollapsePanelProps = items['x-component-props']
143143
const header = () => {
144-
const header = `${
145-
panelProps?.header || props.header || field.title
146-
}`
144+
const header = panelProps?.header || props.header || field.title
145+
147146
const path = field.address.concat(index)
148147
const errors = field.form.queryFeedbacks({
149148
type: 'error',
@@ -180,6 +179,7 @@ const InternalArrayCollapse: ReactFC<IArrayCollapseProps> = observer(
180179

181180
const extra = (
182181
<ArrayBase.Item index={index} record={item}>
182+
{panelProps?.extra}
183183
<RecursionField
184184
schema={items}
185185
name={index}
@@ -189,7 +189,6 @@ const InternalArrayCollapse: ReactFC<IArrayCollapseProps> = observer(
189189
}}
190190
onlyRenderProperties
191191
/>
192-
{panelProps?.extra}
193192
</ArrayBase.Item>
194193
)
195194

0 commit comments

Comments
 (0)