From 2a146fcec49553d2557acb4065d1b97a7687346c Mon Sep 17 00:00:00 2001 From: joelost Date: Thu, 15 Jun 2023 15:24:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=BC=A0=E5=9B=BE=E5=A4=9A?= =?UTF-8?q?=E9=80=89=EF=BC=8CjoinValues=E4=B8=BAfalse=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=EF=BC=8Crender=E6=AD=BB=E5=BE=AA=E7=8E=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/amis/src/renderers/Form/InputImage.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/amis/src/renderers/Form/InputImage.tsx b/packages/amis/src/renderers/Form/InputImage.tsx index 24361d71121..8565cb8953b 100644 --- a/packages/amis/src/renderers/Form/InputImage.tsx +++ b/packages/amis/src/renderers/Form/InputImage.tsx @@ -503,7 +503,12 @@ export default class ImageControl extends React.Component< componentDidUpdate(prevProps: ImageProps) { const props = this.props; - if (prevProps.value !== props.value) { + if ( + (props.value && !prevProps.value) || + (props.value && + prevProps.value && + prevProps.value.length != props.value.length) + ) { const value: string | Array | FileValue = props.value; const multiple = props.multiple; const joinValues = props.joinValues; From 8956591323dd140379a43784301840e638fb47a6 Mon Sep 17 00:00:00 2001 From: 2betop <2betop.cn@gmail.com> Date: Thu, 15 Jun 2023 19:17:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=20id=20=E5=AF=BC=E8=87=B4=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/amis/src/renderers/Form/InputImage.tsx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/amis/src/renderers/Form/InputImage.tsx b/packages/amis/src/renderers/Form/InputImage.tsx index 8565cb8953b..9558a0b5772 100644 --- a/packages/amis/src/renderers/Form/InputImage.tsx +++ b/packages/amis/src/renderers/Form/InputImage.tsx @@ -503,12 +503,7 @@ export default class ImageControl extends React.Component< componentDidUpdate(prevProps: ImageProps) { const props = this.props; - if ( - (props.value && !prevProps.value) || - (props.value && - prevProps.value && - prevProps.value.length != props.value.length) - ) { + if (prevProps.value !== props.value) { const value: string | Array | FileValue = props.value; const multiple = props.multiple; const joinValues = props.joinValues; @@ -537,7 +532,7 @@ export default class ImageControl extends React.Component< obj = { ...org, ...obj, - id: org.id || obj.id + id: org.id || obj.id || guid() }; }