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

frontend/src/components/canvas/components/Editor/ContextMenu.vue

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

frontend/src/views/chart/components/table/TableNormal.vue

@@ -181,7 +181,7 @@ export default {
         if (columnIndex === 0) {
           means.push('合计')
         } 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))) {
             means[columnIndex] = values.reduce((prev, curr) => {