Skip to content

Commit be653bd

Browse files
authored
fix: fix collapse and tab props error (#29)
1 parent 4368418 commit be653bd

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,14 @@ const usePanels = () => {
3737
const field = collapseField.query(collapseField.address.concat(name)).take()
3838
if (field?.display === 'none' || field?.display === 'hidden') return
3939
if (schema['x-component']?.indexOf('CollapsePanel') > -1) {
40+
const key =
41+
field?.componentProps?.key || schema?.['x-component-props']?.key || name
4042
panels.push({
4143
name,
4244
props: {
4345
...schema?.['x-component-props'],
44-
key: schema?.['x-component-props']?.key || name,
46+
...field?.componentProps,
47+
key,
4548
},
4649
schema,
4750
})

packages/components/src/form-tab/index.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,14 @@ const useTabs = () => {
4343
const field = tabsField.query(tabsField.address.concat(name)).take()
4444
if (field?.display === 'none' || field?.display === 'hidden') return
4545
if (schema['x-component']?.indexOf('TabPane') > -1) {
46+
const key =
47+
field?.componentProps?.key || schema?.['x-component-props']?.key || name
4648
tabs.push({
4749
name,
4850
props: {
49-
key: schema?.['x-component-props']?.key || name,
5051
...schema?.['x-component-props'],
52+
...field?.componentProps,
53+
key,
5154
},
5255
schema,
5356
})

0 commit comments

Comments
 (0)