diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 99fccc8b24..344eb45540 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -1090,7 +1090,7 @@ public class DataSetTableService { if (!hasVariables && !tmpSql.contains(SubstitutedParams)) { return tmpSql; } - CCJSqlParserUtil.parse(tmpSql, parser -> parser.withSquareBracketQuotation(true)); + Statement statement = CCJSqlParserUtil.parse(tmpSql); Select select = (Select) statement; diff --git a/frontend/src/components/canvas/components/editor/DeEditor.vue b/frontend/src/components/canvas/components/editor/DeEditor.vue index 64ee36fd7f..8f2eeff20e 100644 --- a/frontend/src/components/canvas/components/editor/DeEditor.vue +++ b/frontend/src/components/canvas/components/editor/DeEditor.vue @@ -126,7 +126,7 @@ :canvas-id="canvasId" /> - + false } - const [parentWidth, parentHeight] = this.getParentSize() - this.parentWidth = parentWidth - this.parentHeight = parentHeight - const [width, height] = getComputedSize(this.$el) - this.aspectFactor = (this.w !== 'auto' ? this.w : width) / (this.h !== 'auto' ? this.h : height) - if (this.outsideAspectRatio) { - this.aspectFactor = this.outsideAspectRatio - } - this.width = this.w !== 'auto' ? this.w : width - this.height = this.h !== 'auto' ? this.h : height - this.right = this.parentWidth - this.width - this.left - this.bottom = this.parentHeight - this.height - this.top + this.sizeAdaptor() // 绑定data-*属性 this.settingAttribute()