center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #9392 from dataease/pr@dev@fix_fullscreen

Browse Source 
fix(仪表板): 过滤器导致编辑状态下全屏预览为空仪表板
This commit is contained in:
fit2cloud-chenyw 2024-04-26 21:47:42 +08:00 committed by GitHub
commit 2df0be043e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/backend/src/main/resources/application.properties
View File

@ -2,8 +2,8 @@ spring.profiles.active=@profiles.active@
spring.application.name=dataease spring.application.name=dataease
server.port=8081 server.port=8081
spring.jackson.serialization.fail-on-empty-beans=true # spring.jackson.serialization.fail-on-empty-beans=true
spring.jackson.deserialization.fail-on-unknown-properties=true # spring.jackson.deserialization.fail-on-unknown-properties=true
# Hikari # Hikari
spring.datasource.type=com.zaxxer.hikari.HikariDataSource spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=5 spring.datasource.hikari.minimum-idle=5

5
core/frontend/src/components/canvas/components/editor/Preview.vue
View File

@ -833,7 +833,10 @@ export default {
const componentData = deepCopy(this.componentData) const componentData = deepCopy(this.componentData)
componentData.forEach(component => { componentData.forEach(component => {
if (component.type === 'custom') { 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 => { Object.keys(component.style).forEach(key => {
if (this.needToChangeHeight.includes(key)) { if (this.needToChangeHeight.includes(key)) {