From 87ca8edd1cba74a9cb57289985c15ee1dab7b2b5 Mon Sep 17 00:00:00 2001 From: zhangtao07 Date: Fri, 1 Nov 2024 14:26:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8A=98=E5=8F=A0?= =?UTF-8?q?=E5=AE=B9=E5=99=A8=E8=A7=A6=E5=8F=91=E7=88=B6=E6=8A=98=E5=8F=A0?= =?UTF-8?q?=E5=AE=B9=E5=99=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/amis/src/renderers/CollapseGroup.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/amis/src/renderers/CollapseGroup.tsx b/packages/amis/src/renderers/CollapseGroup.tsx index 2fd87fa9557..a985548e8cc 100644 --- a/packages/amis/src/renderers/CollapseGroup.tsx +++ b/packages/amis/src/renderers/CollapseGroup.tsx @@ -78,7 +78,7 @@ export class CollapseGroupRender extends React.Component< collapseId: string | number, collapsed: boolean ) { - const {dispatchEvent, onCollapse} = this.props; + const {dispatchEvent} = this.props; const renderEvent = await dispatchEvent( 'change', resolveEventData(this.props, { @@ -90,7 +90,6 @@ export class CollapseGroupRender extends React.Component< if (renderEvent?.prevented) { return; } - onCollapse?.(activeKeys, collapseId, collapsed); } render() { From 17ae1a11c9da675681af27de07a9221062b1848e Mon Sep 17 00:00:00 2001 From: zhangtao07 Date: Mon, 4 Nov 2024 14:53:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20fieldset=E4=B8=8D=E4=B8=8B=E5=8F=91d?= =?UTF-8?q?ata=E9=81=BF=E5=85=8D=E7=BB=84=E4=BB=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/amis/src/renderers/Form/FieldSet.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/amis/src/renderers/Form/FieldSet.tsx b/packages/amis/src/renderers/Form/FieldSet.tsx index 8ac62ffc871..a3e701ba9a5 100644 --- a/packages/amis/src/renderers/Form/FieldSet.tsx +++ b/packages/amis/src/renderers/Form/FieldSet.tsx @@ -116,8 +116,6 @@ export default class FieldSetControl extends React.Component< } = this.props; let props: any = { - store, - data: store?.data, render, disabled, formMode: subFormMode || formMode, From 65a24486efa84c39b30b9d9d8f53740bdfe8a851 Mon Sep 17 00:00:00 2001 From: zhangtao07 Date: Mon, 4 Nov 2024 17:02:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dtable2=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=B1=95=E5=BC=80=E5=86=85=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E8=A1=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/amis/src/renderers/Table2/index.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/amis/src/renderers/Table2/index.tsx b/packages/amis/src/renderers/Table2/index.tsx index 2a9225020cb..49e31127be8 100644 --- a/packages/amis/src/renderers/Table2/index.tsx +++ b/packages/amis/src/renderers/Table2/index.tsx @@ -1304,7 +1304,7 @@ export default class Table2 extends React.Component { { data: { ...this.props.data, - record, + ...record, rowIndex } } @@ -1580,7 +1580,11 @@ export default class Table2 extends React.Component { dispatchEvent } = this.props; actions = Array.isArray(actions) ? actions.concat() : []; - const config = isObject(columnsTogglable) ? columnsTogglable : {}; + const config = isObject(columnsTogglable) + ? columnsTogglable + : { + align: 'left' + }; // 现在默认从crud里传进来的columnsTogglable是boolean类型 // table单独配置的是SchemaNode类型