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

Merge branch 'main' of github.com:dataease/dataease into main

Browse Source
This commit is contained in:
taojinlong 2021-04-27 18:12:40 +08:00
commit 86f5a0fe1b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/canvas/components/Editor/ContextMenu.vue
View File

@ -45,9 +45,9 @@ export default {
this.$store.dispatch('panel/setComponentDataTemp', JSON.stringify(this.componentData)) this.$store.dispatch('panel/setComponentDataTemp', JSON.stringify(this.componentData))
this.$store.dispatch('panel/setCanvasStyleDataTemp', JSON.stringify(this.canvasStyleData)) this.$store.dispatch('panel/setCanvasStyleDataTemp', JSON.stringify(this.canvasStyleData))
if (this.curComponent.component === 'user-view') { if (this.curComponent.component === 'user-view') {
this.$store.dispatch('chart/setViewId', null) // this.$store.dispatch('chart/setViewId', null)
this.$store.dispatch('chart/setViewId', this.curComponent.propValue.viewId) // this.$store.dispatch('chart/setViewId', this.curComponent.propValue.viewId)
bus.$emit('PanelSwitchComponent', { name: 'ChartEdit' }) bus.$emit('PanelSwitchComponent', { name: 'ChartEdit', param: { 'id': this.curComponent.propValue.viewId }})
} }
if (this.curComponent.type === 'custom') { if (this.curComponent.type === 'custom') {
bus.$emit('component-dialog-edit') bus.$emit('component-dialog-edit')

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

@ -181,7 +181,7 @@ export default {
if (columnIndex === 0) { if (columnIndex === 0) {
means.push('合计') means.push('合计')
} else { } else {
const values = data.map(item => Number(item[column.property])) const values = data.map(item => Number((item[column.property] + '').trim() === '' ? 'a' : item[column.property]))
// 合计 // 合计
if (!values.every(value => isNaN(value))) { if (!values.every(value => isNaN(value))) {
means[columnIndex] = values.reduce((prev, curr) => { means[columnIndex] = values.reduce((prev, curr) => {