@visns-studio/visns-components 1.1.18 → 1.1.20

package/components/crm/visns-data-grid.jsx

@@ -60,6 +60,7 @@ const DataGrid = (props) => {
 		form,
 		columns,
 		settings,
+		style,
 		tableFilters,
 		historySearch,
 		historyUrl,
@@ -105,7 +106,6 @@ const DataGrid = (props) => {
 		[ajaxSetting, dataReload, dSearch]
 	);
 	const [gridColumns, setGridColumns] = useState([]);
-	const [gridHeight, setGridHeight] = useState(550);
 	const limit = ajaxSetting.take || 10;
 	const [search, setSearch] = useState("");
 	const sortInfo =
@@ -621,6 +621,52 @@ const DataGrid = (props) => {
 							}
 						},
 					};
+				case "relationArray":
+					let relationArrayName = column.id.reduce(
+						(acc, id) => acc + `${id}.`,
+						""
+					);
+					relationArrayName += column.nameFrom;
+
+					return {
+						name: relationArrayName,
+						header: column.label,
+						defaultFlex: 1,
+						minWidth:
+							column.width && column.width > 0
+								? column.width
+								: undefined,
+						link: column.link ? column.link : {},
+						render: ({ data }) => {
+							let relationValue = column.id.reduce((acc, id) => {
+								if (acc === "") {
+									return data[id];
+								} else {
+									return acc[id];
+								}
+							}, "");
+
+							if (relationValue) {
+								if (Array.isArray(relationValue)) {
+									let value = '';
+
+									relationValue.forEach((rv, rvKey) => {
+										if ( rvKey > 0 ) {
+											value += ', ';
+										}
+
+										value += rv[column.nameFrom];
+									});
+
+									return <span>{value}</span>;
+								} else {
+									return null;
+								}
+							} else {
+								return null;
+							}
+						},
+					};
 				case "stage":
 					return {
 						name: column.id,
@@ -741,15 +787,7 @@ const DataGrid = (props) => {
 		minHeight: windowHeight * 0.6 > 550 ? windowHeight * 0.6 : 550,
 	};
 	const headerProps = {
-		style: {
-			color: import.meta.env.VITE_VISNS_COMPONENT_HEADER_STYLE_COLOR
-				? import.meta.env.VITE_VISNS_COMPONENT_HEADER_STYLE_COLOR
-				: null,
-			background: import.meta.env
-				.VITE_VISNS_COMPONENT_HEADER_STYLE_BACKGROUND
-				? import.meta.env.VITE_VISNS_COMPONENT_HEADER_STYLE_BACKGROUND
-				: null,
-		},
+		style: style ? style : {},
 	};
 
 	useEffect(() => {

package/package.json

@@ -33,7 +33,7 @@
 		"react-dom": ">=18.2.0"
 	},
 	"name": "@visns-studio/visns-components",
-	"version": "1.1.18",
+	"version": "1.1.20",
 	"description": "Various packages to assist in the development of our Custom Applications.",
 	"main": "index.js",
 	"devDependencies": {},