@things-factory/grist-ui 4.0.5 → 4.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/client/data-report.js +17 -6
- package/package.json +9 -8
- package/translations/zh.json +2 -2
package/client/data-report.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import './data-report/data-report-component'
|
|
2
2
|
|
|
3
|
-
import { css, html
|
|
4
|
-
|
|
5
|
-
import { pulltorefresh } from '@things-factory/utils'
|
|
3
|
+
import { LitElement, css, html } from 'lit-element'
|
|
6
4
|
|
|
5
|
+
import { DataProvider } from './data-provider'
|
|
7
6
|
import { buildColumn } from './configure/column-builder'
|
|
8
7
|
import { buildConfig } from './configure/config-builder'
|
|
9
|
-
import {
|
|
8
|
+
import { i18next } from '@things-factory/i18n-base'
|
|
9
|
+
import { pulltorefresh } from '@things-factory/utils'
|
|
10
10
|
|
|
11
11
|
const DEFAULT_DATA = {
|
|
12
12
|
page: 1,
|
|
@@ -199,7 +199,16 @@ export class DataReport extends LitElement {
|
|
|
199
199
|
var getColumnIndex = name => columns.filter(column => !column.hidden).findIndex(column => column.name == name)
|
|
200
200
|
|
|
201
201
|
/* 그룹 토털 레코드를 추가한다. */
|
|
202
|
-
var groupFieldsForTotalRecord = [
|
|
202
|
+
var groupFieldsForTotalRecord = [
|
|
203
|
+
{
|
|
204
|
+
column: '*',
|
|
205
|
+
title: i18next.exists('text.ox-data-report-grand-total')
|
|
206
|
+
? i18next.t('text.ox-data-report-grand-total')
|
|
207
|
+
: 'grand total',
|
|
208
|
+
align: 'right'
|
|
209
|
+
} /* for total */,
|
|
210
|
+
...groups
|
|
211
|
+
]
|
|
203
212
|
groupFieldsForTotalRecord = groupFieldsForTotalRecord.map(group => {
|
|
204
213
|
return {
|
|
205
214
|
...group,
|
|
@@ -251,7 +260,9 @@ export class DataReport extends LitElement {
|
|
|
251
260
|
{
|
|
252
261
|
'*': {
|
|
253
262
|
titleColumn: groupFieldsForTotalRecord[0].titleColumn,
|
|
254
|
-
value: 'grand
|
|
263
|
+
value: i18next.exists('text.ox-data-report-grand-total')
|
|
264
|
+
? i18next.t('text.ox-data-report-grand-total')
|
|
265
|
+
: 'grand total',
|
|
255
266
|
groupName: '*',
|
|
256
267
|
row: 1,
|
|
257
268
|
rowspan: 1,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/grist-ui",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.6",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,13 +24,14 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@material/mwc-icon": "^0.
|
|
28
|
-
"@operato/data-grist": "^0.2.
|
|
29
|
-
"@operato/headroom": "^0.
|
|
30
|
-
"@things-factory/
|
|
31
|
-
"@things-factory/
|
|
32
|
-
"
|
|
27
|
+
"@material/mwc-icon": "^0.25.3",
|
|
28
|
+
"@operato/data-grist": "^0.2.28",
|
|
29
|
+
"@operato/headroom": "^0.2.26",
|
|
30
|
+
"@things-factory/i18n-base": "^4.0.6",
|
|
31
|
+
"@things-factory/styles": "^4.0.6",
|
|
32
|
+
"@things-factory/utils": "^4.0.6",
|
|
33
|
+
"lit": "^2.0.2",
|
|
33
34
|
"underscore": "^1.11.0"
|
|
34
35
|
},
|
|
35
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "471247c3499ba439b074c7654ae8d8e9fc3972f0"
|
|
36
37
|
}
|
package/translations/zh.json
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
{
|
|
2
|
-
"
|
|
3
|
-
}
|
|
2
|
+
"text.ox-data-report-grand-total": "[zh] grand total"
|
|
3
|
+
}
|