@things-factory/grist-ui 4.3.122 → 4.3.123

package/client/data-report.js

@@ -1,13 +1,14 @@
 import './data-report/data-report-component'
 
-import { LitElement, css, html } from 'lit'
+import { css, html, LitElement } from 'lit'
 
-import { DataProvider } from './data-provider'
-import { buildColumn } from './configure/column-builder'
-import { buildConfig } from './configure/config-builder'
 import { i18next } from '@things-factory/i18n-base'
 import { pulltorefresh } from '@things-factory/utils'
 
+import { buildColumn } from './configure/column-builder'
+import { buildConfig } from './configure/config-builder'
+import { DataProvider } from './data-provider'
+
 const DEFAULT_DATA = {
   page: 1,
   limit: 20,
@@ -226,7 +227,7 @@ export class DataReport extends LitElement {
           /* 처음 만드는 total records */
           let record = sortedRecords[0]
           let totalBase = totals.reduce((base, field) => {
-            base[field] = record[field]
+            base[field] = columns.find(col => col.name == field)?.rowCount ? 1 : record[field]
             return base
           }, {})
           let groupBase = {}
@@ -297,7 +298,7 @@ export class DataReport extends LitElement {
             (isSameGroupRecord && groupValues[group.column] === lastGroupValues[group.column])
           ) {
             for (let field of totals) {
-              totalRecord[field] += record[field]
+              totalRecord[field] += columns.find(col => col.name == field)?.rowCount ? 1 : record[field]
             }
 
             totalRecord['*'].rowspan++
@@ -316,7 +317,7 @@ export class DataReport extends LitElement {
             idx,
             record: totals.reduce(
               (sum, field) => {
-                sum[field] = record[field]
+                sum[field] = columns.find(col => col.name == field)?.rowCount ? 1 : record[field]
                 return sum
               },
               {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/grist-ui",
-  "version": "4.3.122",
+  "version": "4.3.123",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -34,5 +34,5 @@
     "lodash-es": "^4.17.15",
     "underscore": "^1.11.0"
   },
-  "gitHead": "3edd80e6ca68480b22ee0e25eba34d13ab0e49f1"
+  "gitHead": "4b257504bfc8c0a626dd90dc0216abb7ca30d8d3"
 }