@things-factory/export-ui-excel 4.3.122 → 4.3.123

package/client/bootstrap.js

@@ -62,7 +62,8 @@ async function objDataToExcel({ extension, name, data }) {
         return {
           header: column.header || '',
           key: column.key || '',
-          width: column.width ? column.width : column.header.length < 12 ? 12 : column.header.length
+          width: column.width ? column.width : column.header.length < 12 ? 12 : column.header.length,
+          rowCount: column.rowCount || false
         }
       })
     ]
@@ -109,7 +110,8 @@ async function objDataToExcel({ extension, name, data }) {
         printData,
         records.groups.map(itm => itm.column),
         records.groups,
-        records.totals
+        records.totals,
+        header
       )
     } else {
       printData = printData.map(row => {
@@ -262,7 +264,7 @@ export default function bootstrap() {
   })
 }
 
-function multiGroupTree(array, groups, groupsRaw, totals) {
+function multiGroupTree(array, groups, groupsRaw, totals, header) {
   if (!groups) {
     return array
   }
@@ -301,7 +303,7 @@ function multiGroupTree(array, groups, groupsRaw, totals) {
 
         totals.forEach(total => {
           sumData.data[total] = grouping[itm].reduce((acc, obj) => {
-            acc = acc + (parseFloat(obj.data[total]) || 0)
+            acc = acc + ((header.find(x => x.key == total)?.rowCount ? 1 : parseFloat(obj?.data[total])) || 0)
             return acc
           }, 0)
         })
@@ -319,7 +321,7 @@ function multiGroupTree(array, groups, groupsRaw, totals) {
   let result = transform(
     grouping,
     (result, value, key) => {
-      let rows = multiGroupTree(value, restGroups, groupsRaw, totals)
+      let rows = multiGroupTree(value, restGroups, groupsRaw, totals, header)
 
       let currentGroupSetting = groupsRaw.filter(x => x.column === currentGroup)[0]
 
@@ -335,7 +337,7 @@ function multiGroupTree(array, groups, groupsRaw, totals) {
 
         totals.forEach(total => {
           sumData.data[total] = value.reduce((acc, obj) => {
-            acc = acc + (parseFloat(obj[total]) || 0)
+            acc = acc + parseFloat(obj[total]) || 0
             return acc
           }, 0)
         })
@@ -407,7 +409,7 @@ function stripObject(source) {
           ? null
           : t == 'object'
           ? stripObject(source[key])
-          : { string: '', number: 0, boolean: false }[t]
+          : { string: '', number: '', boolean: '' }[t]
     }
   }
   return o

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/export-ui-excel",
-  "version": "4.3.122",
+  "version": "4.3.123",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -31,5 +31,5 @@
     "file-saver": "^2.0.2",
     "xlsx": "^0.16.8"
   },
-  "gitHead": "3edd80e6ca68480b22ee0e25eba34d13ab0e49f1"
+  "gitHead": "4b257504bfc8c0a626dd90dc0216abb7ca30d8d3"
 }