diff --git a/src/components/DataTableTest.jsx b/src/components/DataTableTest.jsx index d9960ac..d255aaa 100644 --- a/src/components/DataTableTest.jsx +++ b/src/components/DataTableTest.jsx @@ -2,6 +2,7 @@ import {useMemo, useState} from 'react'; import {MaterialReactTable} from 'material-react-table'; import useTableSetting from "@/lib/hooks/useTableSetting"; +import {Typography} from "@mui/material"; const data = [ @@ -56,7 +57,7 @@ const TestDataTable = () => { const [userId, setUserId] = useState(2); const [pageName, setPageName] = useState('loan'); const [tableName, setTableName] = useState('loan_table'); - const {settingStore, hideAction, filterAction, sortAction, oldSorting} = useTableSetting(); + const {settingStore, hideAction, filterAction, sortAction,} = useTableSetting(); const columns = useMemo( () => [ @@ -147,21 +148,26 @@ const TestDataTable = () => { sortAction(userId, pageName, tableName, settingValue, columns); } - return ; + return ( + <> + {settingStore?.[userId]?.[pageName]?.[tableName]?.['summary']} + + + ); }; export default TestDataTable; diff --git a/src/lib/contexts/tableSetting.jsx b/src/lib/contexts/tableSetting.jsx index 0fa46bd..8ade22b 100644 --- a/src/lib/contexts/tableSetting.jsx +++ b/src/lib/contexts/tableSetting.jsx @@ -66,7 +66,8 @@ export const TableSettingProvider = ({children}) => { const _column = columns.find(column => column.id == sort.id) _list.push(`${_column.header}` + `(${sort.desc ? "نزولی" : "صعودی"})`) } - SortText = " مرتب شده بر اساس " + _list.join(", ") + if (_list.length > 0) + SortText = " مرتب شده بر اساس " + _list.join(", ") } if (values.hides) { @@ -78,7 +79,8 @@ export const TableSettingProvider = ({children}) => { const _column = columns.find(c => c.id == hide.id) _list.push(_column.header) } - HideText = "ستون های مخفی شده : " + _list.join(", "); + if (_list.length > 0) + HideText = "ستون های مخفی شده : " + _list.join(", "); } }