@kipicore/dbcore 1.1.152 → 1.1.153
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/dist/helpers/utils.d.ts +2 -1
- package/dist/helpers/utils.js +14 -10
- package/package.json +1 -1
package/dist/helpers/utils.d.ts
CHANGED
package/dist/helpers/utils.js
CHANGED
|
@@ -555,21 +555,19 @@ function chunkArray(array, size) {
|
|
|
555
555
|
function formatDateIfNeeded(value) {
|
|
556
556
|
if (!value)
|
|
557
557
|
return value;
|
|
558
|
-
|
|
559
|
-
|
|
558
|
+
function isStrictISODate(val) {
|
|
559
|
+
return /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2}(\.\d+)?Z?)?$/.test(val);
|
|
560
|
+
}
|
|
560
561
|
if (value instanceof Date) {
|
|
561
|
-
|
|
562
|
+
return value.toLocaleDateString('en-GB');
|
|
562
563
|
}
|
|
563
|
-
|
|
564
|
-
else if (typeof value === 'string') {
|
|
564
|
+
if (typeof value === 'string' && isStrictISODate(value)) {
|
|
565
565
|
const parsed = new Date(value);
|
|
566
566
|
if (!isNaN(parsed.getTime())) {
|
|
567
|
-
|
|
567
|
+
return parsed.toLocaleDateString('en-GB');
|
|
568
568
|
}
|
|
569
569
|
}
|
|
570
|
-
|
|
571
|
-
return value;
|
|
572
|
-
return date.toLocaleDateString('en-GB');
|
|
570
|
+
return value;
|
|
573
571
|
}
|
|
574
572
|
function resolvePath(value, parts) {
|
|
575
573
|
if (value === undefined || value === null)
|
|
@@ -607,7 +605,13 @@ function extractFromObject(data, config) {
|
|
|
607
605
|
const userdata = data.map(item => {
|
|
608
606
|
const row = {};
|
|
609
607
|
config.columns.forEach(col => {
|
|
610
|
-
|
|
608
|
+
if (Array.isArray(col.field)) {
|
|
609
|
+
const values = col.field.map(path => getNestedValueForArray(item, path)).filter(v => v !== '-' && v !== undefined && v !== null);
|
|
610
|
+
row[col.title] = values.length ? values.join(col.joinContent ?? ' ') : '-';
|
|
611
|
+
}
|
|
612
|
+
else {
|
|
613
|
+
row[col.title] = getNestedValueForArray(item, col.field);
|
|
614
|
+
}
|
|
611
615
|
});
|
|
612
616
|
return row;
|
|
613
617
|
});
|
package/package.json
CHANGED