@visns-studio/visns-components 1.6.5 → 1.6.7

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

@@ -153,7 +153,7 @@ const DataGrid = ({
 	const [filterDataSource, setFilterDataSource] = useState([]);
 	const [filterValue, setFilterValue] = useState([]);
 	const [gridColumns, setGridColumns] = useState([]);
-	const limit = ajaxSetting.take || 10;
+	const [limit, setLimit] = useState(ajaxSetting.take || 10);
 	const [search, setSearch] = useState("");
 	const sortInfo =
 		ajaxSetting.sortBy && ajaxSetting.sort
@@ -1322,15 +1322,17 @@ const DataGrid = ({
 					: 400,
 		}));
 
-		console.info(
+		let dgHeight =
 			dataCount > 5
 				? dataCount > 8
 					? windowHeight * 0.7 > 550
 						? windowHeight * 0.7
 						: 550
 					: 450
-				: 400
-		);
+				: 400;
+
+		let rowCount = Math.floor((dgHeight - 50) / 60);
+		setLimit(rowCount);
 	}, [dataCount]);
 
 	useEffect(() => {
@@ -1385,7 +1387,6 @@ const DataGrid = ({
 				columns={gridColumns}
 				dataSource={data}
 				filterValue={filterValue}
-				defaultLimit={limit}
 				defaultSortInfo={sortInfo}
 				enableColumnAutosize={false}
 				enableColumnFilterContextMenu={false}
@@ -1395,8 +1396,10 @@ const DataGrid = ({
 					/\//g,
 					"-"
 				)}`}
+				limit={limit}
 				minRowHeight={40}
 				onFilterValueChange={setFilterValue}
+				onLimitChange={setLimit}
 				onRenderRow={onRenderRow}
 				pagination
 				renderColumnContextMenu={renderColumnContextMenu}

package/components/cms/visns-field.jsx

@@ -17,6 +17,7 @@ import CustomFetch from "../crm/visns-fetch";
 import Select from "../crm/visns-select";
 import MultiSelect from "../crm/visns-multi-select";
 import VisnsAutocomplete from "../crm/visns-autocomplete";
+import moment from "moment";
 
 Quill.register("modules/imageUploader", ImageUploader);
 
@@ -63,6 +64,7 @@ const Field = ({
 	inputValue,
 	inputClass,
 	onChange,
+	onChangeDate,
 	onChangeFile,
 	onChangeRicheditor,
 	onChangeSelect,
@@ -556,7 +558,11 @@ const Field = ({
 										: "dd-MM-yyyy"
 								}
 								className={inputClass[settings.id]}
-								selected={inputValue || ""}
+								selected={
+									inputValue
+										? moment(inputValue).toDate()
+										: ""
+								}
 								showMonthDropdown
 								showYearDropdown
 								dropdownMode="select"
@@ -576,7 +582,11 @@ const Field = ({
 								}
 								showTimeSelect
 								className={inputClass[settings.id]}
-								selected={inputValue || null}
+								selected={
+									inputValue
+										? moment(inputValue).toDate()
+										: ""
+								}
 								showMonthDropdown
 								showYearDropdown
 								dropdownMode="select"
@@ -600,7 +610,11 @@ const Field = ({
 								timeIntervals={15}
 								timeCaption="Time"
 								className={inputClass[settings.id]}
-								selected={inputValue || ""}
+								selected={
+									inputValue
+										? moment(inputValue).toDate()
+										: ""
+								}
 								onChange={(date) =>
 									onChangeDate(date, settings.id)
 								}

package/components/cms/visns-form.jsx

@@ -67,6 +67,13 @@ function Form(props) {
 		}
 	};
 
+	const handleChangeDate = (date, id) => {
+		setData((prevState) => ({
+			...prevState,
+			[id]: date,
+		}));
+	};
+
 	const handleChangeSelect = (value, action, id) => {
 		if (value && action && id) {
 			setData((prevState) => ({
@@ -406,6 +413,7 @@ function Form(props) {
 									}
 									inputClass={dataClass}
 									onChange={handleChange}
+									onChangeDate={handleChangeDate}
 									onChangeFile={handleChangeFile}
 									onChangeRicheditor={handleChangeRicheditor}
 									onChangeSelect={handleChangeSelect}

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

@@ -172,7 +172,7 @@ const DataGrid = forwardRef(
 		const [filterDataSource, setFilterDataSource] = useState([]);
 		const [filterValue, setFilterValue] = useState([]);
 		const [gridColumns, setGridColumns] = useState([]);
-		const limit = ajaxSetting.take || 10;
+		const [limit, setLimit] = useState(ajaxSetting.take || 10);
 		const [search, setSearch] = useState("");
 		const sortInfo =
 			ajaxSetting.sortBy && ajaxSetting.sort
@@ -1653,15 +1653,17 @@ const DataGrid = forwardRef(
 						: 400,
 			}));
 
-			console.info(
+			let dgHeight =
 				dataCount > 5
 					? dataCount > 8
 						? windowHeight * 0.7 > 550
 							? windowHeight * 0.7
 							: 550
 						: 450
-					: 400
-			);
+					: 400;
+
+			let rowCount = Math.floor((dgHeight - 100) / 40);
+			setLimit(rowCount);
 		}, [dataCount]);
 
 		useEffect(() => {
@@ -1685,7 +1687,7 @@ const DataGrid = forwardRef(
 					columns={gridColumns}
 					dataSource={data}
 					filterValue={filterValue}
-					defaultLimit={limit}
+					limit={limit}
 					defaultSortInfo={sortInfo}
 					enableColumnAutosize={false}
 					enableColumnFilterContextMenu={false}
@@ -1697,6 +1699,7 @@ const DataGrid = forwardRef(
 					)}`}
 					minRowHeight={40}
 					onFilterValueChange={setFilterValue}
+					onLimitChange={setLimit}
 					onRenderRow={onRenderRow}
 					pagination
 					renderColumnContextMenu={renderColumnContextMenu}

package/components/crm/visns-form.jsx

@@ -583,6 +583,8 @@ function Form(props) {
 							? result.data
 							: result;
 
+						console.info(result);
+
 						Object.keys(formData).forEach((item) => {
 							let tempRes = "";
 							let tempResKey = "";
@@ -655,9 +657,20 @@ function Form(props) {
 										tempObj !== undefined &&
 										tempObj !== null
 									) {
+										let labelValue;
+
+										if (Array.isArray(field.relationName)) {
+											labelValue = field.relationName.map(
+												(name) => `${tempObj[name]} `
+											);
+										} else {
+											labelValue =
+												tempObj[field.relationName];
+										}
+
 										tempRes = {
 											value: tempObj.id,
-											label: tempObj[field.relationName],
+											label: labelValue,
 										};
 									}
 
@@ -709,14 +722,23 @@ function Form(props) {
 											}
 										}
 
+										let labelValue;
+
+										if (Array.isArray(field.relationName)) {
+											labelValue = field.relationName.map(
+												(name) => `${tempObj[name]} `
+											);
+										} else {
+											labelValue =
+												tempObj[field.relationName];
+										}
+
 										tempRes =
 											tempObj !== undefined &&
 											tempObj !== null
 												? {
 														value: tempObj.id,
-														label: tempObj[
-															field.relationName
-														],
+														label: labelValue,
 												  }
 												: {};
 

package/package.json

@@ -34,7 +34,7 @@
 		"react-dom": "^17.0.1"
 	},
 	"name": "@visns-studio/visns-components",
-	"version": "1.6.5",
+	"version": "1.6.7",
 	"description": "Various packages to assist in the development of our Custom Applications.",
 	"main": "index.js",
 	"devDependencies": {},