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)) {