@visns-studio/visns-components 1.1.10 → 1.1.12
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,37 +592,35 @@ 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,
|
|
599
595
|
link: column.link ? column.link : {},
|
|
600
596
|
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
|
-
}
|
|
597
|
+
let value = column.id.reduce((acc, id) => {
|
|
598
|
+
if (acc === "") {
|
|
599
|
+
return data[id];
|
|
600
|
+
} else {
|
|
601
|
+
return acc[id];
|
|
602
|
+
}
|
|
603
|
+
}, "");
|
|
604
|
+
|
|
605
|
+
if (value) {
|
|
606
|
+
if (Array.isArray(column.nameFrom)) {
|
|
607
|
+
value = column.nameFrom
|
|
608
|
+
.map((nf) => value[nf])
|
|
609
|
+
.join(" ");
|
|
610
|
+
} else {
|
|
611
|
+
value = value[column.nameFrom];
|
|
623
612
|
}
|
|
624
613
|
|
|
625
|
-
|
|
614
|
+
if (
|
|
615
|
+
column.placeholder &&
|
|
616
|
+
column.placeholder !== ""
|
|
617
|
+
) {
|
|
618
|
+
return <span>{column.placeholder}</span>;
|
|
619
|
+
} else {
|
|
620
|
+
return <span>{value}</span>;
|
|
621
|
+
}
|
|
622
|
+
} else {
|
|
623
|
+
return null;
|
|
626
624
|
}
|
|
627
625
|
},
|
|
628
626
|
};
|
|
@@ -777,6 +775,7 @@ const DataGrid = (props) => {
|
|
|
777
775
|
onRenderRow={onRenderRow}
|
|
778
776
|
pagination
|
|
779
777
|
renderColumnContextMenu={renderColumnContextMenu}
|
|
778
|
+
showZebraRows={true}
|
|
780
779
|
/>
|
|
781
780
|
<Popup
|
|
782
781
|
open={modalShow}
|
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.12",
|
|
36
36
|
"description": "Various packages to assist in the development of our Custom Applications.",
|
|
37
37
|
"main": "index.js",
|
|
38
38
|
"devDependencies": {},
|