@bizdoc/core 1.13.0-next.1 → 1.13.0-next.2

package/fesm2020/bizdoc-core.mjs

@@ -14729,7 +14729,7 @@ class CubeMatrixComponent {
             this.refresh();
     }
     _addindices() {
-        const collection = this.indexAt === 'series' ? this.rows : this.columns;
+        const collection = this.indexAt === 'xAxis' ? this.columns : this.rows;
         this.indices.forEach((x, i) => {
             const header = {
                 key: x.name,
@@ -14737,10 +14737,10 @@ class CubeMatrixComponent {
                 index: x,
                 accumulate: x.accumulate
             };
-            if (this.placeAt === 'leading')
-                collection.splice(i, 0, header);
-            else
+            if (this.placeAt === 'trailing')
                 collection.push(header);
+            else
+                collection.splice(i, 0, header);
         });
     }
     _addsumheaders() {
@@ -14806,17 +14806,17 @@ class CubeMatrixComponent {
         const d = {};
         series.forEach(s => {
             if (s.index) {
-                if (this.indexAt === 'series') {
-                    const row = d[s.index] = {};
-                    s.points.forEach(p => row[p.x] = p.y);
-                }
-                else
+                if (this.indexAt === 'xAxis')
                     s.points.forEach(p => {
                         let row = d[p.x];
                         if (!row)
                             row = d[p.x] = {};
                         row[s.index] = p.y;
                     });
+                else {
+                    const row = d[s.index] = {};
+                    s.points.forEach(p => row[p.x] = p.y);
+                }
             }
             else {
                 const row = d[s.name] = {};
@@ -14839,20 +14839,20 @@ class CubeMatrixComponent {
         this.rows.forEach(r => {
             const datarow = data[r.key];
             if (datarow) {
-                let sum = 0;
+                let columnTotal = 0;
                 this.columns.forEach(c => {
                     if (c.accumulate === false || c.sum !== undefined)
                         return;
                     let val = datarow[c.key];
                     if (val !== undefined)
-                        sum += this.indices.length === 0 || this.indexAt === 'series' ||
+                        columnTotal += this.indices.length === 0 || this.indexAt !== 'xAxis' ||
                             c.index !== undefined ? val : -val;
                 });
-                datarow['_total'] = this._format(sum, r);
+                datarow['_total'] = this._format(columnTotal, r);
                 if (!r.sum)
                     grand += this.indices.length === 0 ||
                         this.indexAt === 'xAxis' ||
-                        r.index !== undefined ? sum : -sum;
+                        r.index !== undefined ? columnTotal : -columnTotal;
             }
             else
                 data[r.key] = {
@@ -14862,16 +14862,16 @@ class CubeMatrixComponent {
         const totals = data['_total'] = this.totals = {};
         totals['_grand'] = this._format(grand);
         this.columns.forEach(c => {
-            let sum = 0;
+            let rowTotal = 0;
             this.rows.forEach(row => {
                 if (row.accumulate === false || row.sum !== undefined)
                     return;
                 const val = data[row.key][c.key];
                 if (val !== undefined)
-                    sum += this.indices.length === 0 || this.indexAt === 'xAxis' ||
+                    rowTotal += this.indices.length === 0 || this.indexAt === 'xAxis' ||
                         row.index !== undefined ? val : -val;
             });
-            totals[c.key] = this._format(sum, c);
+            totals[c.key] = this._format(rowTotal, c);
         });
     }
     _calculatesum(data) {