From 2777cdba08b990efa4b8160b105c0533b03d02a8 Mon Sep 17 00:00:00 2001
From: Mohammad Jalali <muhammad.art79@gmail.com>
Date: Mon, 24 Jun 2024 14:49:41 +0330
Subject: [PATCH] complete filter part of datatable

---
 src/core/components/DataTable/filter/FilterBody.jsx            | 3 ++-
 .../components/DataTable/filter/fieldsType/CustomSelect.jsx    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/components/DataTable/filter/FilterBody.jsx b/src/core/components/DataTable/filter/FilterBody.jsx
index 17f830c..6d020a2 100644
--- a/src/core/components/DataTable/filter/FilterBody.jsx
+++ b/src/core/components/DataTable/filter/FilterBody.jsx
@@ -187,10 +187,11 @@ function FilterBody({columns, drawerState, setDrawerState, userId, pageName, tab
                                             size="large"
                                             disabled={isSubmitting || !isValid || !dirty}
                                             sx={{
+                                                px: 8,
                                                 boxShadow: "rgba(0, 0, 0, 0.23) 0px 6px 6px, rgba(0, 0, 0, 0.19) 10px 0px 20px",
                                                 backgroundColor: "#155175", ':hover': {
                                                     backgroundColor: "#155175",
-                                                }, width: "50%"
+                                                }
                                             }}>
                                             اعمال فیلتر
                                         </Button>
diff --git a/src/core/components/DataTable/filter/fieldsType/CustomSelect.jsx b/src/core/components/DataTable/filter/fieldsType/CustomSelect.jsx
index 6fa20e4..44f0599 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomSelect.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomSelect.jsx
@@ -18,6 +18,7 @@ function CustomSelect({column, filterParameters, defaultFilterTranslation, setFi
                     setFieldValue(`${column.id}.value`, e.target.value)
                 }}
             >
+                <MenuItem value="">{column.header}</MenuItem>
                 {columnSelectOption.map((option) => (
                     <MenuItem
                         key={option.value}