From cf44e51eef4154370f8c9170a7205f4889aff633 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 26 Apr 2024 21:45:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E5=AF=BC=E8=87=B4=E7=BC=96=E8=BE=91=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8B=E5=85=A8=E5=B1=8F=E9=A2=84=E8=A7=88=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E4=BB=AA=E8=A1=A8=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/backend/src/main/resources/application.properties | 4 ++-- .../src/components/canvas/components/editor/Preview.vue | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/backend/src/main/resources/application.properties b/core/backend/src/main/resources/application.properties index 86dbd06b8c..59caa2a006 100644 --- a/core/backend/src/main/resources/application.properties +++ b/core/backend/src/main/resources/application.properties @@ -2,8 +2,8 @@ spring.profiles.active=@profiles.active@ spring.application.name=dataease server.port=8081 -spring.jackson.serialization.fail-on-empty-beans=true -spring.jackson.deserialization.fail-on-unknown-properties=true +# spring.jackson.serialization.fail-on-empty-beans=true +# spring.jackson.deserialization.fail-on-unknown-properties=true # Hikari spring.datasource.type=com.zaxxer.hikari.HikariDataSource spring.datasource.hikari.minimum-idle=5 diff --git a/core/frontend/src/components/canvas/components/editor/Preview.vue b/core/frontend/src/components/canvas/components/editor/Preview.vue index 3eceb1c18c..6e6306b0d7 100644 --- a/core/frontend/src/components/canvas/components/editor/Preview.vue +++ b/core/frontend/src/components/canvas/components/editor/Preview.vue @@ -833,7 +833,10 @@ export default { const componentData = deepCopy(this.componentData) componentData.forEach(component => { if (component.type === 'custom') { - component.style = deepCopy(this.findSourceComponent(component.id).style) + const sourceComponent = this.findSourceComponent(component.id) + if (sourceComponent?.style) { + component.style = deepCopy(this.findSourceComponent(component.id).style) + } } Object.keys(component.style).forEach(key => { if (this.needToChangeHeight.includes(key)) {