@visns-studio/visns-components 1.1.10 → 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.
|
@@ -598,31 +598,33 @@ const DataGrid = (props) => {
|
|
|
598
598
|
: undefined,
|
|
599
599
|
link: column.link ? column.link : {},
|
|
600
600
|
render: ({ data }) => {
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
if (Array.isArray(column.nameFrom)) {
|
|
617
|
-
value = column.nameFrom
|
|
618
|
-
.map((nf) => value[nf])
|
|
619
|
-
.join(" ");
|
|
620
|
-
} else {
|
|
621
|
-
value = value[column.nameFrom];
|
|
622
|
-
}
|
|
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];
|
|
623
616
|
}
|
|
624
617
|
|
|
625
|
-
|
|
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;
|
|
626
628
|
}
|
|
627
629
|
},
|
|
628
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": {},
|