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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
junjun 2022-11-07 10:50:41 +08:00
commit 9074f8af69
21 changed files with 64 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId>
<version>1.16.0</version>
<version>1.17.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -203,7 +203,7 @@
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-interface</artifactId>
<version>1.16.0</version>
<version>1.17.0</version>
<exclusions>
<exclusion>
<artifactId>guava</artifactId>
@ -214,12 +214,12 @@
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-view</artifactId>
<version>1.16.0</version>
<version>1.17.0</version>
</dependency>
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-datasource</artifactId>
<version>1.16.0</version>
<version>1.17.0</version>
</dependency>
<!-- kettle及数据源依赖 -->
<dependency>

2
frontend/package.json
View File

@ -1,6 +1,6 @@
{
"name": "dataease",
"version": "1.16.0",
"version": "1.17.0",
"description": "dataease front",
"private": true,
"scripts": {

2
frontend/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId>
<version>1.16.0</version>
<version>1.17.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

8
frontend/src/views/chart/components/ChartComponent.vue
View File

@ -207,8 +207,10 @@ export default {
mounted() {
this.preDraw()
},
destroyed() {
beforeDestroy() {
window.removeEventListener('resize', this.myChart.resize)
this.myChart.dispose()
this.myChart = null
},
created() {
this.loadThemeStyle()
@ -403,9 +405,7 @@ export default {
const chart = this.myChart
this.setBackGroundBorder()
setTimeout(chart.setOption(option, true), 500)
window.onresize = function() {
chart.resize()
}
window.removeEventListener('resize', chart.resize)
},
setBackGroundBorder() {
if (this.chart.customStyle) {

10
frontend/src/views/chart/components/ChartComponentG2.vue
View File

@ -155,6 +155,11 @@ export default {
this.drawEcharts()
}
},
beforeDestroy() {
this.myChart.destroy()
window.removeEventListener('resize', this.calcHeightDelay)
this.myChart = null
},
mounted() {
this.preDraw()
},
@ -202,10 +207,7 @@ export default {
new Promise((resolve) => { resolve() }).then(() => {
this.drawView()
})
const that = this
window.onresize = function() {
that.calcHeightDelay()
}
window.addEventListener('resize', this.calcHeightDelay)
},
drawView() {
const chart = this.chart

16
frontend/src/views/chart/components/ChartComponentS2.vue
View File

@ -195,6 +195,9 @@ export default {
},
beforeDestroy() {
clearInterval(this.scrollTimer)
window.removeEventListener('resize', this.onResize)
this.myChart.destroy()
this.myChart = null
},
methods: {
initData() {
@ -221,21 +224,16 @@ export default {
this.tableData = data
},
preDraw() {
this.onResize()
window.addEventListener('resize', this.onResize)
},
onResize() {
this.initData()
this.initTitle()
this.calcHeightDelay()
new Promise((resolve) => { resolve() }).then(() => {
this.drawView()
})
const that = this
window.onresize = function() {
that.initData()
that.initTitle()
that.calcHeightDelay()
new Promise((resolve) => { resolve() }).then(() => {
that.drawView()
})
}
},
drawView() {
const chart = this.chart

6
frontend/src/views/chart/components/normal/LabelNormal.vue
View File

@ -133,15 +133,13 @@ export default {
},
beforeDestroy() {
eventBus.$off('resizing', this.chartResize)
window.removeEventListener('resize', this.calcHeight)
},
methods: {
init() {
const that = this
this.initStyle()
this.resultFormat()
window.onresize = function() {
that.calcHeight()
}
window.addEventListener('resize', this.calcHeight)
this.setBackGroundBorder()
this.initRemark()
},

6
frontend/src/views/chart/components/normal/LabelNormalText.vue
View File

@ -161,14 +161,12 @@ export default {
},
beforeDestroy() {
eventBus.$off('resizing', this.chartResize)
window.removeEventListener('resize', this.calcHeight)
},
methods: {
init() {
const that = this
this.initStyle()
window.onresize = function() {
that.calcHeight()
}
window.addEventListener('resize', this.calcHeight)
this.setBackGroundBorder()
this.initRemark()
},

6
frontend/src/views/chart/components/table/TableNormal.vue
View File

@ -168,6 +168,7 @@ export default {
beforeDestroy() {
eventBus.$off('resizing', this.chartResize)
clearInterval(this.scrollTimer)
window.removeEventListener('resize', this.calcHeightDelay)
},
methods: {
init() {
@ -187,7 +188,6 @@ export default {
}
},
initData() {
const that = this
let data = []
this.showPage = false
if (this.chart.data) {
@ -229,9 +229,7 @@ export default {
this.$nextTick(() => {
this.initStyle()
})
window.onresize = function() {
that.calcHeightDelay()
}
window.addEventListener('resize', this.calcHeightDelay)
},
calcHeightRightNow() {
this.$nextTick(() => {

7
frontend/src/views/chart/view/ChartFieldEdit.vue
View File

@ -568,10 +568,11 @@ export default {
this.filterField(val)
}
},
beforeDestroy() {
window.removeEventListener('resize', this.calcHeight)
},
mounted() {
window.onresize = () => {
this.calcHeight()
}
window.addEventListener('resize', this.calcHeight)
this.calcHeight()
this.initField()
},

7
frontend/src/views/dataset/add/AddApi.vue
View File

@ -312,11 +312,12 @@ export default {
}
}
},
beforeDestroy() {
window.removeEventListener('resize', this.calHeight)
},
mounted() {
this.initDataSource()
window.onresize = () => {
this.calHeight()
}
window.addEventListener('resize', this.calHeight)
this.calHeight()
},
activated() {

7
frontend/src/views/dataset/add/AddCustom.vue
View File

@ -140,10 +140,11 @@ export default {
this.getUnionData()
}
},
beforeDestroy() {
window.removeEventListener('resize', this.calHeight)
},
mounted() {
window.onresize = () => {
this.calHeight()
}
window.addEventListener('resize', this.calHeight)
this.calHeight()
if (this.param && this.param.id && this.param.tableId) {

7
frontend/src/views/dataset/add/AddDB.vue
View File

@ -328,11 +328,12 @@ export default {
}
}
},
beforeDestroy() {
window.removeEventListener('resize', this.calHeight)
},
mounted() {
this.initDataSource()
window.onresize = () => {
this.calHeight()
}
window.addEventListener('resize', this.calHeight)
this.calHeight()
},
activated() {

7
frontend/src/views/dataset/add/AddExcel.vue
View File

@ -304,10 +304,11 @@ export default {
return this.nameList.filter((ele) => ele !== this.originName)
}
},
beforeDestroy() {
window.removeEventListener('resize', this.calHeight)
},
mounted() {
window.onresize = () => {
this.calHeight()
}
window.addEventListener('resize', this.calHeight)
this.calHeight()
},
created() {

7
frontend/src/views/dataset/add/AddSQL.vue
View File

@ -675,10 +675,11 @@ export default {
}
}
},
beforeDestroy() {
window.removeEventListener('resize', this.calHeight)
},
async mounted() {
window.onresize = () => {
this.calHeight()
}
window.addEventListener('resize', this.calHeight)
this.calHeight()
await this.initDataSource()
this.$refs.myCm.codemirror.on('keypress', () => {

7
frontend/src/views/dataset/add/union/UnionPreview.vue
View File

@ -57,12 +57,13 @@ export default {
}
}
},
beforeDestroy() {
window.removeEventListener('resize', this.calHeight)
},
mounted() {
this.initPreview()
this.calHeight()
window.onresize = () => {
this.calHeight()
}
window.addEventListener('resize', this.calHeight)
},
methods: {
calHeight: _.debounce(function() {

6
frontend/src/views/dataset/common/DatasetTableData.vue
View File

@ -80,12 +80,6 @@ export default {
}
},
mounted() {
// window.onresize = () => {
// return (() => {
// this.height = window.innerHeight / 3
// })()
// }
// this.height = window.innerHeight / 3
this.$nextTick(() => {
this.height =
document.getElementById('dsData').parentNode.offsetHeight - 16 - 14 - 5

7
frontend/src/views/dataset/data/FieldEdit.vue
View File

@ -794,10 +794,11 @@ export default {
this.filterField(val)
}
},
beforeDestroy() {
window.removeEventListener('resize', this.calcHeight)
},
mounted() {
window.onresize = () => {
this.calcHeight()
}
window.addEventListener('resize', this.calcHeight)
this.calcHeight()
this.initField()
},

2
mobile/package.json
View File

@ -1,6 +1,6 @@
{
"name": "dataease-mobile",
"version": "1.16.0",
"version": "1.17.0",
"private": true,
"scripts": {
"serve": "npm run dev:h5",

2
mobile/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId>
<version>1.16.0</version>
<version>1.17.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.dataease</groupId>
<artifactId>dataease-server</artifactId>
<version>1.16.0</version>
<version>1.17.0</version>
<packaging>pom</packaging>
<parent>