diff --git a/src/core/components/DataTable/filter/fieldsType/CustomDate/MuiDatePicker.jsx b/src/core/components/DataTable/filter/fieldsType/CustomDate/MuiDatePicker.jsx
index 0e91257..fafbb9b 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomDate/MuiDatePicker.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomDate/MuiDatePicker.jsx
@@ -30,6 +30,7 @@ function MuiDatePicker({ label, value, setFieldValue, name, minDate, maxDate, he
maxDate={maxDate ? new Date(maxDate) : null}
slotProps={{
textField: {
+ size: 'small',
error: error,
placeholder: placeholder,
InputProps: {
@@ -60,9 +61,9 @@ function MuiDatePicker({ label, value, setFieldValue, name, minDate, maxDate, he
},
}}
/>
-
+ {/*
{helperText ? helperText : ""}
-
+ */}
);
diff --git a/src/core/components/DataTable/filter/fieldsType/CustomSelect.jsx b/src/core/components/DataTable/filter/fieldsType/CustomSelect.jsx
index 274a58b..5fefa2f 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomSelect.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomSelect.jsx
@@ -1,46 +1,32 @@
"use client";
import { FormControl, FormHelperText, InputLabel, MenuItem, OutlinedInput, Select, Typography } from "@mui/material";
-import { useEffect, useMemo } from "react";
-
-function CustomSelect({ column, dependencyFieldValue, filterParameters, defaultFilterTranslation, handleChange }) {
- const columnSelectOption = useMemo(() => {
- return column?.columnSelectOption?.(dependencyFieldValue) || [];
- }, [dependencyFieldValue]);
-
- useEffect(() => {
- const isValidValue = columnSelectOption.some((option) => option.value === filterParameters.value);
- if (!isValidValue) {
- handleChange({ ...filterParameters, value: "" });
- }
- }, [columnSelectOption, filterParameters.value, handleChange]);
-
- const isValidValue = columnSelectOption.some((option) => option.value === filterParameters.value);
- const selectedValue = isValidValue ? filterParameters.value : "";
+function CustomSelect({ column, filterParameters, defaultFilterTranslation, handleChange }) {
return (
-
+
{column.header}
}
+ size="small"
onChange={(e) => handleChange({ ...filterParameters, value: e.target.value })}
>
- {columnSelectOption.map((option) => (
+ {column.columnSelectOption().map((option) => (
))}
-
-
+ {/*
+
نوع فیلتر: {defaultFilterTranslation}
-
+ */}
);
}
diff --git a/src/core/components/DataTable/filter/fieldsType/CustomSelectByDependency.jsx b/src/core/components/DataTable/filter/fieldsType/CustomSelectByDependency.jsx
index 5d809e3..b1ee04d 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomSelectByDependency.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomSelectByDependency.jsx
@@ -12,13 +12,14 @@ function CustomSelectByDependency({
columnSelectOption,
}) {
return (
-
+
{column.header}
}
onChange={(e) => handleChange({ ...filterParameters, value: e.target.value })}
>
@@ -28,11 +29,11 @@ function CustomSelectByDependency({
))}
-
-
+ {/*
+
نوع فیلتر: {defaultFilterTranslation}
-
+ */}
);
}
diff --git a/src/core/components/DataTable/filter/fieldsType/CustomSelectMultiple.jsx b/src/core/components/DataTable/filter/fieldsType/CustomSelectMultiple.jsx
index 22ff8aa..4d28321 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomSelectMultiple.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomSelectMultiple.jsx
@@ -21,7 +21,7 @@ function CustomSelectMultiple({ column, filterParameters, defaultFilterTranslati
};
return (
-
+
{column.header}
@@ -30,6 +30,7 @@ function CustomSelectMultiple({ column, filterParameters, defaultFilterTranslati
id={column.id}
value={filterParameters.value}
multiple
+ size="small"
onChange={(e) => handleChange({ ...filterParameters, value: e.target.value })}
renderValue={(selected) => (
@@ -46,11 +47,11 @@ function CustomSelectMultiple({ column, filterParameters, defaultFilterTranslati
))}
-
-
+ {/*
+
نوع فیلتر: {defaultFilterTranslation}
-
+ */}
);
}
diff --git a/src/core/components/DataTable/filter/fieldsType/CustomTextField.jsx b/src/core/components/DataTable/filter/fieldsType/CustomTextField.jsx
index 619237a..cfaab03 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomTextField.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomTextField.jsx
@@ -19,12 +19,12 @@ function CustomTextField({
onBlur={handleBlur}
fullWidth
helperText={
-
+
نوع فیلتر: {defaultFilterTranslation}
}
variant="outlined"
- size="normal"
+ size="small"
sx={{ marginY: 1 }}
InputProps={{
endAdornment: (
diff --git a/src/core/components/DataTable/filter/fieldsType/CustomTextFieldRange.jsx b/src/core/components/DataTable/filter/fieldsType/CustomTextFieldRange.jsx
index 20afcbd..114744c 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomTextFieldRange.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomTextFieldRange.jsx
@@ -24,12 +24,12 @@ function CustomTextFieldRange({
fullWidth
error={touched?.[`${column.id}`]?.value && Boolean(errors?.[`${column.id}`]?.value)}
helperText={
-
+
نوع فیلتر: {defaultFilterTranslation}
}
variant="outlined"
- size="normal"
+ size="small"
sx={{ marginY: 1, marginRight: 1 }}
/>