@visns-studio/visns-components 1.1.9 → 1.1.11
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.
|
@@ -592,33 +592,39 @@ const DataGrid = (props) => {
|
|
|
592
592
|
column.width && column.width > 0
|
|
593
593
|
? column.width
|
|
594
594
|
: undefined,
|
|
595
|
+
defaultWidth:
|
|
596
|
+
column.width && column.width > 0
|
|
597
|
+
? column.width
|
|
598
|
+
: undefined,
|
|
595
599
|
link: column.link ? column.link : {},
|
|
596
600
|
render: ({ data }) => {
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
if (Array.isArray(column.nameFrom)) {
|
|
613
|
-
value = column.nameFrom
|
|
614
|
-
.map((nf) => value[nf])
|
|
615
|
-
.join(" ");
|
|
616
|
-
} else {
|
|
617
|
-
value = value[column.nameFrom];
|
|
618
|
-
}
|
|
601
|
+
let value = column.id.reduce((acc, id) => {
|
|
602
|
+
if (acc === "") {
|
|
603
|
+
return data[id];
|
|
604
|
+
} else {
|
|
605
|
+
return acc[id];
|
|
606
|
+
}
|
|
607
|
+
}, "");
|
|
608
|
+
|
|
609
|
+
if (value) {
|
|
610
|
+
if (Array.isArray(column.nameFrom)) {
|
|
611
|
+
value = column.nameFrom
|
|
612
|
+
.map((nf) => value[nf])
|
|
613
|
+
.join(" ");
|
|
614
|
+
} else {
|
|
615
|
+
value = value[column.nameFrom];
|
|
619
616
|
}
|
|
620
617
|
|
|
621
|
-
|
|
618
|
+
if (
|
|
619
|
+
column.placeholder &&
|
|
620
|
+
column.placeholder !== ""
|
|
621
|
+
) {
|
|
622
|
+
return <span>{column.placeholder}</span>;
|
|
623
|
+
} else {
|
|
624
|
+
return <span>{value}</span>;
|
|
625
|
+
}
|
|
626
|
+
} else {
|
|
627
|
+
return null;
|
|
622
628
|
}
|
|
623
629
|
},
|
|
624
630
|
};
|
package/package.json
CHANGED
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"react-dom": ">=18.2.0"
|
|
33
33
|
},
|
|
34
34
|
"name": "@visns-studio/visns-components",
|
|
35
|
-
"version": "1.1.
|
|
35
|
+
"version": "1.1.11",
|
|
36
36
|
"description": "Various packages to assist in the development of our Custom Applications.",
|
|
37
37
|
"main": "index.js",
|
|
38
38
|
"devDependencies": {},
|