From 86d87d7b479db7c0138e4dbbf6886b14f7774dda Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 27 Apr 2021 18:10:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E8=A7=86=E5=9B=BE=20=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=90=88=E8=AE=A1fix=EF=BC=9B=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=E8=B7=B3=E8=BD=AC=E8=A7=86=E5=9B=BE=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/Editor/ContextMenu.vue | 6 +++---
 frontend/src/views/chart/components/table/TableNormal.vue   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/ContextMenu.vue b/frontend/src/components/canvas/components/Editor/ContextMenu.vue
index 423ac3d5e9..bcfb834aae 100644
--- a/frontend/src/components/canvas/components/Editor/ContextMenu.vue
+++ b/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')
diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue
index e8d542fec3..3e99494190 100644
--- a/frontend/src/views/chart/components/table/TableNormal.vue
+++ b/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) => {