test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-11-29 18:48:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: collapse修复事件动作无效问题

Browse Source
This commit is contained in:
hongyang03 2022-06-10 11:37:49 +08:00
parent 00bcca021b
commit 4b9bfec58a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/amis-ui/src/components/Collapse.tsx
View File

@ -25,7 +25,7 @@ const collapseStyles: {
export interface CollapseProps {
key?: string;
id?: string;
collapseId?: string;
propKey?: string;
mountOnEnter?: boolean;
unmountOnExit?: boolean;

14
packages/amis-ui/src/components/CollapseGroup.tsx
View File

@ -64,7 +64,7 @@ class CollapseGroup extends React.Component<
activeKey = [];
} else {
for (let i = 0; i < activeKey.length; i++) {
if (activeKey[i] === item.id) {
if (activeKey[i] === item.collapseId) {
activeKey.splice(i, 1);
break;
}
@ -72,9 +72,9 @@ class CollapseGroup extends React.Component<
}
} else {
if (this.props.accordion) {
activeKey = [item.id as string];
activeKey = [item.collapseId as string];
} else {
activeKey.push(item.id as string);
activeKey.push(item.collapseId as string);
}
}
this.setState({
@ -90,13 +90,13 @@ class CollapseGroup extends React.Component<
return children.map((child: React.ReactElement, index: number) => {
let props = child.props;
const id = props.propKey || String(index);
const collapsed = this.state.activeKey.indexOf(id) === -1;
const collapseId = props.propKey || String(index);
const collapsed = this.state.activeKey.indexOf(collapseId) === -1;
return React.cloneElement(child as any, {
...props,
key: id,
id,
key: collapseId,
collapseId,
collapsed,
expandIcon: this.props.expandIcon,
propsUpdate: true,