added and updated

master
mahdi andalib 3 years ago
parent fcc711d00d
commit 3505bcc6a8
  1. 7
      src/components/ReactTable4/BasicTable.js
  2. 8
      src/components/ReactTable4/ColumnSearch.js
  3. 4
      src/components/ReactTable4/GlobalFilter.js
  4. 7
      src/components/ReactTable4/SelectColumnFilter.js
  5. 1
      src/components/ReactTable4/columns.js

@ -187,15 +187,12 @@ const BasicTable = ({ settingsIcon }) => {
</tr> </tr>
))} ))}
</thead> </thead>
{/* filters */} {/* filter row */}
<thead style={{ backgroundColor: "#FAFBFF" }}> <thead style={{ backgroundColor: "#FAFBFF" }}>
{headerGroups.map((headerGroup) => ( {headerGroups.map((headerGroup) => (
<tr {...headerGroup.getHeaderGroupProps()}> <tr {...headerGroup.getHeaderGroupProps()}>
{headerGroup.headers.map((column) => ( {headerGroup.headers.map((column) => (
<th <th {...column.getHeaderProps()} className="py-2 text-sm ">
{...column.getHeaderProps()}
className="py-2 text-right text-sm"
>
{column.canFilter ? column.render("Filter") : null} {column.canFilter ? column.render("Filter") : null}
</th> </th>
))} ))}

@ -8,26 +8,26 @@ export const ColumnSearch = ({ column }) => {
const [activeSearchBox, setActiveSearchBox] = useState(false); const [activeSearchBox, setActiveSearchBox] = useState(false);
return ( return (
<div className="rounded-md flex flex-row items-center"> <div className="flex flex-row items-center">
<div className="flex flex-row items-center relative"> <div className="flex flex-row items-center relative">
{activeSearchBox && ( {activeSearchBox && (
<img <img
src={settings} src={settings}
alt="" alt=""
className="w-4 h-4 absolute left-7 cursor-pointer" className="w-4 h-4 absolute left-16 cursor-pointer"
onClick={() => setActiveSearchBox(false)} onClick={() => setActiveSearchBox(false)}
/> />
)} )}
<img <img
src={search} src={search}
alt="" alt=""
className="w-4 h-4 absolute left-2 cursor-pointer" className="w-4 h-4 absolute left-11 cursor-pointer"
/> />
<input <input
value={filterValue || ""} value={filterValue || ""}
onChange={(e) => setFilter(e.target.value)} onChange={(e) => setFilter(e.target.value)}
onFocus={() => setActiveSearchBox(true)} onFocus={() => setActiveSearchBox(true)}
className={`text-xs text-blue-400 rounded focus:outline-none placeholder-blue-400 border p-1`} className={`w-9/12 text-xs text-blue-400 rounded focus:outline-none border p-1 focus:border-blue-200 focus:ring focus:ring-blue-200 focus:ring-opacity-20`}
style={{ backgroundColor: "#F9FBFF", borderColor: "#B5D6FF" }} style={{ backgroundColor: "#F9FBFF", borderColor: "#B5D6FF" }}
/> />
</div> </div>

@ -14,7 +14,7 @@ export const GlobalFilter = ({ filter, setFilter }) => {
}, 400); }, 400);
return ( return (
<div className="flex flex-row-reverse items-center relative ml-2"> <div className="flex flex-row-reverse items-center relative ml-2 ">
{activeSearchBox && ( {activeSearchBox && (
<img <img
src={settings} src={settings}
@ -34,7 +34,7 @@ export const GlobalFilter = ({ filter, setFilter }) => {
onFocus={() => setActiveSearchBox(true)} onFocus={() => setActiveSearchBox(true)}
// onBlur={() => setActiveSearchBox(false)} // onBlur={() => setActiveSearchBox(false)}
type="text" type="text"
className={`text-xs text-blue-400 rounded focus:outline-none placeholder-blue-400 border`} className={`text-xs text-blue-400 rounded focus:outline-none border focus:border-blue-200 focus:ring focus:ring-blue-200 focus:ring-opacity-20`}
style={{ backgroundColor: "#F9FBFF", borderColor: "#B5D6FF" }} style={{ backgroundColor: "#F9FBFF", borderColor: "#B5D6FF" }}
/> />
</div> </div>

@ -13,7 +13,8 @@ export const SelectColumnFilter = ({
return ( return (
<select <select
className="rounded-md border-gray-300 shadow-sm text-xs focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50" className="text-xs flex flex-row items-start justify-start p-1 text-blue-400 rounded focus:outline-none border focus:border-blue-200 focus:ring focus:ring-blue-200 focus:ring-opacity-20"
style={{ backgroundColor: "#F9FBFF", borderColor: "#B5D6FF" }}
name={id} name={id}
id={id} id={id}
value={filterValue} value={filterValue}
@ -21,11 +22,11 @@ export const SelectColumnFilter = ({
setFilter(e.target.value || undefined); setFilter(e.target.value || undefined);
}} }}
> >
<option className="text-xs" value=""> <option className="" value="">
همه همه
</option> </option>
{options.map((option, i) => ( {options.map((option, i) => (
<option key={i} value={option} className="text-xs"> <option key={i} value={option} className="text-right">
{(() => { {(() => {
if (option === 1) { if (option === 1) {
return "وضعیت عادی"; return "وضعیت عادی";

@ -14,7 +14,6 @@ export const COLUMNS = [
Footer: "نام و نام خانوادگی", Footer: "نام و نام خانوادگی",
accessor: "name", accessor: "name",
disableSortBy: true, disableSortBy: true,
disableFilters: true,
}, },
{ {
Header: "تاریخ سفارش", Header: "تاریخ سفارش",

Loading…
Cancel
Save