From 04bc51cf8dc5ff24fc5d71b3bbf755a9787ca57d Mon Sep 17 00:00:00 2001
From: wbfsa <wbfsa@qq.com>
Date: Sun, 2 Aug 2020 03:18:28 +0800
Subject: [PATCH] fix(pivot table show error): when column area have field and
 row area is null,pivot table show error

---
 src/controllers/pivotTable.js | 24 +++++++++++++++++++++++-
 src/global/array.js           |  9 +++++++--
 src/locale/en.js              |  2 +-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/controllers/pivotTable.js b/src/controllers/pivotTable.js
index 1a34ccfe0..80ab3c31f 100644
--- a/src/controllers/pivotTable.js
+++ b/src/controllers/pivotTable.js
@@ -2899,7 +2899,7 @@ const pivotTable = {
         }
 
         let datacoltitle_index = datacoltitle;
-        datacoltitle = luckysheetArray.transpose(datacoltitle);
+        datacoltitle = luckysheetArray.transpose(datacoltitle, false);
 
         let valuenslen = values.length == 0 ? 0 : 1;
         let rowLen = (datacoltitle.length == 0 ? valuenslen : datacoltitle.length) + (datarowtitle.length == 0 ? valuenslen : datarowtitle.length), colLen = (datacoltitle.length == 0 ? valuenslen : datacoltitle[0].length) + (datarowtitle.length == 0 ? valuenslen : datarowtitle[0].length);
@@ -3015,6 +3015,28 @@ const pivotTable = {
             retdata[0][0] = values[0].fullname;
             retdata.splice(column.length, 1);
         }
+        else if(values.length == 1 && column.length > 0){
+            // 0: (6) ["English", "foreign language", "mathematics", "science", "Sum", undefined]
+            // 1: (6) ["CountA:score", "CountA:score", "CountA:score", "CountA:score", "CountA:score", undefined]
+            // 2: (6) [3, 3, 3, 3, 12, ""]
+            //The above format does not meet viewing habits,Process retdata into the correct format
+            let titleRow = retdata.splice(column.length, 1);
+            let newRetdata = [];
+            for(let r=0;r<retdata.length;r++){
+                let row = [];
+                if(r==retdata.length-1){
+                    row.push(titleRow[0][0]);
+                }
+                else{
+                    row.push("");
+                }
+                for(let c=0;c<retdata[r].length-1;c++){
+                    row.push(retdata[r][c]);
+                }
+                newRetdata.push(row);
+            }
+            retdata = newRetdata;
+        }
 
         _this.pivotDatas = retdata;
 
diff --git a/src/global/array.js b/src/global/array.js
index 730095820..669045e1e 100644
--- a/src/global/array.js
+++ b/src/global/array.js
@@ -1,7 +1,7 @@
 import { getcellvalue } from './getdata';
 
 const luckysheetArray = {
-    transpose: function (getdata) {
+    transpose: function (getdata, useGetcellValue=true) {
         let arr = [];
         if (getdata.length == 0) {
             return [];
@@ -16,7 +16,12 @@ const luckysheetArray = {
             for (let r = 0; r < getdata.length; r++) {
                 let value = "";
                 if (getdata[r] != null && getdata[r][c] != null) {
-                    value = getcellvalue(r, c, getdata);
+                    if(useGetcellValue){
+                        value = getcellvalue(r, c, getdata);
+                    }
+                    else{
+                        value = getdata[r][c];
+                    }
                 }
                 a.push(value);
             }
diff --git a/src/locale/en.js b/src/locale/en.js
index 837b6b909..7651f26fe 100644
--- a/src/locale/en.js
+++ b/src/locale/en.js
@@ -951,7 +951,7 @@ export default {
         titleSelectionDataRange:"Select range",
         titleDataRange:"Data range",
 
-        valueSum:"Sum",
+        valueSum:"SUM",
 
         valueStatisticsSUM:"Sum",
         valueStatisticsCOUNT:"Count",