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

Merge branch 'dev' into pr@dev_memory_component

Browse Source
This commit is contained in:
dataeaseShu 2023-01-30 15:00:12 +08:00
commit f50ff84571
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -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;

3
frontend/src/components/canvas/components/editor/DeEditor.vue
View File

@ -126,7 +126,7 @@
:canvas-id="canvasId"
/>
<!-- 右击菜单 -->
<ContextMenu />
<ContextMenu/>
<!-- 对齐标线 -->
<span
@ -1055,7 +1055,6 @@ export default {
lineRef.init(newVal)
}
}
console.log(newVal)
})
},
deep: true

30
frontend/src/components/deDrag/index.vue
View File

@ -830,6 +830,22 @@ export default {
this.beforeDestroyFunction()
},
methods: {
sizeAdaptor() {
this.top = this.y
this.left = this.x
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
},
setChartData(chart) {
this.chart = chart
},
@ -1482,6 +1498,7 @@ export default {
this.hasMove && this.$store.commit('recordSnapshot', 'handleUp')
// 记录snapshot后 移动已记录设置为false
this.hasMove = false
this.sizeAdaptor()
}, 200)
} else {
this.hasMove && this.$store.commit('recordSnapshot', 'handleUp')
@ -1890,18 +1907,7 @@ export default {
if (!this.enableNativeDrag) {
this.$el.ondragstart = () => 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()