@porscheinformatik/material-addons 17.2.1 → 17.2.3
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/esm2022/lib/data-table/configuration/data-table-global-configuration.mjs +3 -3
- package/esm2022/lib/data-table/util/data-table-sort-util.mjs +17 -13
- package/fesm2022/porscheinformatik-material-addons.mjs +18 -14
- package/fesm2022/porscheinformatik-material-addons.mjs.map +1 -1
- package/lib/data-table/util/data-table-sort-util.d.ts +3 -3
- package/lib/data-table/util/data-table-sort-util.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -5,12 +5,12 @@ export const MAD_DATA_TABL_GLOBAL_CONFIGURATION_PROVIDER = {
|
|
|
5
5
|
provide: MAD_DATA_TABLE_GLOBAL_CONFIGURATION,
|
|
6
6
|
deps: [[new Optional(), new SkipSelf(), new Inject(MAD_DATA_TABLE_GLOBAL_CONFIGURATION)]],
|
|
7
7
|
useFactory: (dataTableConfig) => dataTableConfig ?? {
|
|
8
|
-
dateTimeFormat: dataTableConfig
|
|
9
|
-
numberFormat: dataTableConfig
|
|
8
|
+
dateTimeFormat: dataTableConfig?.dateTimeFormat ?? 'dd.MM.yyyy',
|
|
9
|
+
numberFormat: dataTableConfig?.numberFormat ?? {
|
|
10
10
|
decimalSeparator: ',',
|
|
11
11
|
groupingSeparator: '.',
|
|
12
12
|
units: ['€', '$'],
|
|
13
13
|
},
|
|
14
14
|
},
|
|
15
15
|
};
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YS10YWJsZS1nbG9iYWwtY29uZmlndXJhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21hdGVyaWFsLWFkZG9ucy9zcmMvbGliL2RhdGEtdGFibGUvY29uZmlndXJhdGlvbi9kYXRhLXRhYmxlLWdsb2JhbC1jb25maWd1cmF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFjM0UsTUFBTSxDQUFDLE1BQU0sbUNBQW1DLEdBQUcsSUFBSSxjQUFjLENBQStCLHFDQUFxQyxDQUFDLENBQUM7QUFFM0ksMkdBQTJHO0FBQzNHLE1BQU0sQ0FBQyxNQUFNLDJDQUEyQyxHQUFHO0lBQ3pELE9BQU8sRUFBRSxtQ0FBbUM7SUFDNUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxJQUFJLFFBQVEsRUFBRSxFQUFFLElBQUksUUFBUSxFQUFFLEVBQUUsSUFBSSxNQUFNLENBQUMsbUNBQW1DLENBQUMsQ0FBQyxDQUFDO0lBQ3pGLFVBQVUsRUFBRSxDQUFDLGVBQThDLEVBQUUsRUFBRSxDQUM3RCxlQUFlLElBQUk7UUFDakIsY0FBYyxFQUFFLGVBQWUsRUFBRSxjQUFjLElBQUksWUFBWTtRQUMvRCxZQUFZLEVBQUUsZUFBZSxFQUFFLFlBQVksSUFBSTtZQUM3QyxnQkFBZ0IsRUFBRSxHQUFHO1lBQ3JCLGlCQUFpQixFQUFFLEdBQUc7WUFDdEIsS0FBSyxFQUFFLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQztTQUNsQjtLQUNGO0NBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdCwgSW5qZWN0aW9uVG9rZW4sIE9wdGlvbmFsLCBTa2lwU2VsZiB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5leHBvcnQgaW50ZXJmYWNlIE51bWJlckZvcm1hdCB7XG4gIGRlY2ltYWxTZXBhcmF0b3I6IHN0cmluZztcbiAgZ3JvdXBpbmdTZXBhcmF0b3I6IHN0cmluZztcbiAgdW5pdHM6IHN0cmluZ1tdOyAvLyBlLmcuIHNpZ25zIGxpa2Ug4oKsLCAkXG59XG5cbi8vIHRoaXMgY291bGQgYWxzbyBiZSBleHRlbmRlZCB3aXRoIGUuZy4gbGFiZWxzIG9yIG90aGVyIGdlbmVyYWwgY29uZmlndXJhdGlvbiBzdHVmZlxuZXhwb3J0IGludGVyZmFjZSBEYXRhVGFibGVHbG9iYWxDb25maWd1cmF0aW9uIHtcbiAgZGF0ZVRpbWVGb3JtYXQ/OiBzdHJpbmc7XG4gIG51bWJlckZvcm1hdD86IE51bWJlckZvcm1hdDtcbn1cblxuZXhwb3J0IGNvbnN0IE1BRF9EQVRBX1RBQkxFX0dMT0JBTF9DT05GSUdVUkFUSU9OID0gbmV3IEluamVjdGlvblRva2VuPERhdGFUYWJsZUdsb2JhbENvbmZpZ3VyYXRpb24+KCdtYWQtZGF0YS10YWJsZS1nbG9iYWwtY29uZmlndXJhdGlvbicpO1xuXG4vLyBJZiB0aGVyZSBpcyBhIGN1c3RvbSBEQVRBX1RBQkxFX0NPTkZJR19QUk9WSURFUiBhdmFpbGFibGUsIHVzZSB0aGF0LiBPdGhlcndpc2UsIHByb3ZpZGUgdGhlIGRlZmF1bHQgb25lLlxuZXhwb3J0IGNvbnN0IE1BRF9EQVRBX1RBQkxfR0xPQkFMX0NPTkZJR1VSQVRJT05fUFJPVklERVIgPSB7XG4gIHByb3ZpZGU6IE1BRF9EQVRBX1RBQkxFX0dMT0JBTF9DT05GSUdVUkFUSU9OLFxuICBkZXBzOiBbW25ldyBPcHRpb25hbCgpLCBuZXcgU2tpcFNlbGYoKSwgbmV3IEluamVjdChNQURfREFUQV9UQUJMRV9HTE9CQUxfQ09ORklHVVJBVElPTildXSxcbiAgdXNlRmFjdG9yeTogKGRhdGFUYWJsZUNvbmZpZz86IERhdGFUYWJsZUdsb2JhbENvbmZpZ3VyYXRpb24pID0+XG4gICAgZGF0YVRhYmxlQ29uZmlnID8/IHtcbiAgICAgIGRhdGVUaW1lRm9ybWF0OiBkYXRhVGFibGVDb25maWc/LmRhdGVUaW1lRm9ybWF0ID8/ICdkZC5NTS55eXl5JyxcbiAgICAgIG51bWJlckZvcm1hdDogZGF0YVRhYmxlQ29uZmlnPy5udW1iZXJGb3JtYXQgPz8ge1xuICAgICAgICBkZWNpbWFsU2VwYXJhdG9yOiAnLCcsXG4gICAgICAgIGdyb3VwaW5nU2VwYXJhdG9yOiAnLicsXG4gICAgICAgIHVuaXRzOiBbJ+KCrCcsICckJ10sXG4gICAgICB9LFxuICAgIH0sXG59O1xuIl19
|
|
@@ -19,16 +19,20 @@ export class DataTableSortUtil {
|
|
|
19
19
|
case 'string': {
|
|
20
20
|
const stringY = String(y);
|
|
21
21
|
// a string could be a date
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
return DataTableSortUtil.compareDate(dateX, dateY, ascending);
|
|
22
|
+
if (!!dateTimeFormat) {
|
|
23
|
+
const dateX = DateTime.fromFormat(x, dateTimeFormat);
|
|
24
|
+
const dateY = DateTime.fromFormat(stringY, dateTimeFormat);
|
|
25
|
+
if (dateX.isValid && dateY.isValid) {
|
|
26
|
+
return DataTableSortUtil.compareDate(dateX, dateY, ascending);
|
|
27
|
+
}
|
|
29
28
|
}
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
// .. but also a formatted number
|
|
30
|
+
if (!!numberFormat) {
|
|
31
|
+
const numberX = DataTableSortUtil.parseNumber(x, numberFormat);
|
|
32
|
+
const numberY = DataTableSortUtil.parseNumber(y, numberFormat);
|
|
33
|
+
if (typeof numberX === 'number' && typeof numberY === 'number') {
|
|
34
|
+
return DataTableSortUtil.compareNumber(numberX, numberY, ascending);
|
|
35
|
+
}
|
|
32
36
|
}
|
|
33
37
|
return DataTableSortUtil.compareString(x, stringY, ascending);
|
|
34
38
|
}
|
|
@@ -63,9 +67,9 @@ export class DataTableSortUtil {
|
|
|
63
67
|
}
|
|
64
68
|
static parseNumber(value, numberFormat) {
|
|
65
69
|
const sanitized = value
|
|
66
|
-
.replace(numberFormat.groupingSeparator, '')
|
|
67
|
-
.replace(numberFormat.decimalSeparator, '.')
|
|
68
|
-
.replace(new RegExp(numberFormat.units.join('|')), '');
|
|
70
|
+
.replace(numberFormat.groupingSeparator ?? '', '')
|
|
71
|
+
.replace(numberFormat.decimalSeparator ?? '', '.')
|
|
72
|
+
.replace(new RegExp((numberFormat.units ?? []).join('|')), '');
|
|
69
73
|
const numberValue = Number(sanitized);
|
|
70
74
|
if (typeof numberValue === 'number' && !isNaN(numberValue)) {
|
|
71
75
|
return numberValue;
|
|
@@ -73,4 +77,4 @@ export class DataTableSortUtil {
|
|
|
73
77
|
return value;
|
|
74
78
|
}
|
|
75
79
|
}
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"data-table-sort-util.js","sourceRoot":"","sources":["../../../../../../projects/material-addons/src/lib/data-table/util/data-table-sort-util.ts"],"names":[],"mappings":"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","sourcesContent":["import { MatSort, Sort } from '@angular/material/sort';\nimport { DateTime } from 'luxon';\nimport { NumberFormat } from '../configuration/data-table-global-configuration';\n\nexport class DataTableSortUtil {\n  static sortData(dateTimeFormat?: string, numberFormat?: NumberFormat): (tableData: any[], matSort: MatSort) => any[] {\n    return (tableData: any[], matSort: MatSort) =>\n      [...tableData].sort((a, b) => DataTableSortUtil.compare(a, b, matSort, dateTimeFormat, numberFormat));\n  }\n\n  static sortNothing(): (tableData: any[], matSort: MatSort) => any[] {\n    return (tableData: any[], _: MatSort) => tableData;\n  }\n\n  static compare(a: Record<string, any>, b: Record<string, any>, sort: Sort, dateTimeFormat?: string, numberFormat?: NumberFormat): number {\n    const x = a[sort.active];\n    const y = b[sort.active];\n    const ascending = sort.direction === 'asc';\n\n    switch (typeof x) {\n      case 'number':\n        if (typeof y !== 'number') {\n          return DataTableSortUtil.compareString(String(x), y, ascending);\n        }\n        return DataTableSortUtil.compareNumber(x, y, ascending);\n      case 'string': {\n        const stringY = String(y);\n\n        // a string could be a date\n        if (!!dateTimeFormat) {\n          const dateX = DateTime.fromFormat(x, dateTimeFormat);\n          const dateY = DateTime.fromFormat(stringY, dateTimeFormat);\n\n          if (dateX.isValid && dateY.isValid) {\n            return DataTableSortUtil.compareDate(dateX, dateY, ascending);\n          }\n        }\n\n        // .. but also a formatted number\n        if (!!numberFormat) {\n          const numberX = DataTableSortUtil.parseNumber(x, numberFormat);\n          const numberY = DataTableSortUtil.parseNumber(y, numberFormat);\n\n          if (typeof numberX === 'number' && typeof numberY === 'number') {\n            return DataTableSortUtil.compareNumber(numberX, numberY, ascending);\n          }\n        }\n\n        return DataTableSortUtil.compareString(x, stringY, ascending);\n      }\n      case 'boolean':\n        return DataTableSortUtil.compareBoolean(x, y, ascending);\n      default:\n        // cannot compare -> return equal\n        return 0;\n    }\n  }\n\n  static compareNumber(x: number, y: number, ascending: boolean): number {\n    return ascending ? x - y : y - x;\n  }\n\n  static compareDate(x: DateTime, y: DateTime, ascending: boolean): number {\n    return DataTableSortUtil.compareNumber(+x, +y, ascending);\n  }\n\n  static compareString(x: string, y: string, ascending: boolean): number {\n    return ascending ? x.localeCompare(y) : y.localeCompare(x);\n  }\n\n  static compareBoolean(x: boolean, y: boolean, ascending: boolean): number {\n    if (x === y) {\n      return 0;\n    }\n    if (ascending) {\n      // true first\n      return x ? -1 : 1;\n    } else {\n      // false first\n      return x ? 1 : -1;\n    }\n  }\n\n  static parseNumber(value: string, numberFormat?: NumberFormat): number | string {\n    const sanitized = value\n      .replace(numberFormat.groupingSeparator ?? '', '')\n      .replace(numberFormat.decimalSeparator ?? '', '.')\n      .replace(new RegExp((numberFormat.units ?? []).join('|')), '');\n\n    const numberValue = Number(sanitized);\n\n    if (typeof numberValue === 'number' && !isNaN(numberValue)) {\n      return numberValue;\n    }\n\n    return value;\n  }\n}\n"]}
|
|
@@ -1926,16 +1926,20 @@ class DataTableSortUtil {
|
|
|
1926
1926
|
case 'string': {
|
|
1927
1927
|
const stringY = String(y);
|
|
1928
1928
|
// a string could be a date
|
|
1929
|
-
|
|
1930
|
-
|
|
1931
|
-
|
|
1932
|
-
|
|
1933
|
-
|
|
1934
|
-
|
|
1935
|
-
return DataTableSortUtil.compareDate(dateX, dateY, ascending);
|
|
1929
|
+
if (!!dateTimeFormat) {
|
|
1930
|
+
const dateX = DateTime.fromFormat(x, dateTimeFormat);
|
|
1931
|
+
const dateY = DateTime.fromFormat(stringY, dateTimeFormat);
|
|
1932
|
+
if (dateX.isValid && dateY.isValid) {
|
|
1933
|
+
return DataTableSortUtil.compareDate(dateX, dateY, ascending);
|
|
1934
|
+
}
|
|
1936
1935
|
}
|
|
1937
|
-
|
|
1938
|
-
|
|
1936
|
+
// .. but also a formatted number
|
|
1937
|
+
if (!!numberFormat) {
|
|
1938
|
+
const numberX = DataTableSortUtil.parseNumber(x, numberFormat);
|
|
1939
|
+
const numberY = DataTableSortUtil.parseNumber(y, numberFormat);
|
|
1940
|
+
if (typeof numberX === 'number' && typeof numberY === 'number') {
|
|
1941
|
+
return DataTableSortUtil.compareNumber(numberX, numberY, ascending);
|
|
1942
|
+
}
|
|
1939
1943
|
}
|
|
1940
1944
|
return DataTableSortUtil.compareString(x, stringY, ascending);
|
|
1941
1945
|
}
|
|
@@ -1970,9 +1974,9 @@ class DataTableSortUtil {
|
|
|
1970
1974
|
}
|
|
1971
1975
|
static parseNumber(value, numberFormat) {
|
|
1972
1976
|
const sanitized = value
|
|
1973
|
-
.replace(numberFormat.groupingSeparator, '')
|
|
1974
|
-
.replace(numberFormat.decimalSeparator, '.')
|
|
1975
|
-
.replace(new RegExp(numberFormat.units.join('|')), '');
|
|
1977
|
+
.replace(numberFormat.groupingSeparator ?? '', '')
|
|
1978
|
+
.replace(numberFormat.decimalSeparator ?? '', '.')
|
|
1979
|
+
.replace(new RegExp((numberFormat.units ?? []).join('|')), '');
|
|
1976
1980
|
const numberValue = Number(sanitized);
|
|
1977
1981
|
if (typeof numberValue === 'number' && !isNaN(numberValue)) {
|
|
1978
1982
|
return numberValue;
|
|
@@ -2158,8 +2162,8 @@ const MAD_DATA_TABL_GLOBAL_CONFIGURATION_PROVIDER = {
|
|
|
2158
2162
|
provide: MAD_DATA_TABLE_GLOBAL_CONFIGURATION,
|
|
2159
2163
|
deps: [[new Optional(), new SkipSelf(), new Inject(MAD_DATA_TABLE_GLOBAL_CONFIGURATION)]],
|
|
2160
2164
|
useFactory: (dataTableConfig) => dataTableConfig ?? {
|
|
2161
|
-
dateTimeFormat: dataTableConfig
|
|
2162
|
-
numberFormat: dataTableConfig
|
|
2165
|
+
dateTimeFormat: dataTableConfig?.dateTimeFormat ?? 'dd.MM.yyyy',
|
|
2166
|
+
numberFormat: dataTableConfig?.numberFormat ?? {
|
|
2163
2167
|
decimalSeparator: ',',
|
|
2164
2168
|
groupingSeparator: '.',
|
|
2165
2169
|
units: ['€', '$'],
|