Merge branch 'feature/table_fixes' into 'dev'

table sort fixes

See merge request spatial/postamates_frontend!13
dev
Timofey Malinin 3 years ago
commit 483c66c868

@ -79,7 +79,7 @@ const YandexPanoramaLink = ({ lat, lng }) => {
const link = `https://yandex.ru/maps/?panorama[point]=${lng},${lat}` const link = `https://yandex.ru/maps/?panorama[point]=${lng},${lat}`
return ( return (
<div className="pl-1 flex"> <div className="pl-1 flex">
<a href={link}> <a target="_blank" href={link}>
<PanoramaIcon /> <PanoramaIcon />
</a> </a>
</div> </div>

@ -40,9 +40,9 @@ export const TableSettings = ({orderColumns}) => {
return ( return (
<Draggable key={`list-${num}`} draggableId={`list-${num}`} index={index}> <Draggable key={`list-${num}`} draggableId={`list-${num}`} index={index}>
{(provided) => ( {(provided) => (
<div className="flex flex-row gap-2" ref={provided.innerRef} {...provided.draggableProps} {...provided.dragHandleProps}> <div className="flex flex-row gap-2 p-1 hover:bg-gray-300" ref={provided.innerRef} {...provided.draggableProps} {...provided.dragHandleProps}>
<Checkbox onChange={() => hideColumn(index)} checked={item.show} /> <Checkbox onChange={() => hideColumn(index)} checked={item.show} />
<p> <p className="m-0">
{ orderColumns.defaultColumns[num].name || orderColumns.defaultColumns[num].title } { orderColumns.defaultColumns[num].name || orderColumns.defaultColumns[num].title }
</p> </p>
</div> </div>

@ -34,7 +34,7 @@ export const useColumns = (key) => {
trigger="click" trigger="click"
placement={"right"} placement={"right"}
> >
<Button> <Button onClick={(e) => e.stopPropagation()}>
<SearchOutlined/> <SearchOutlined/>
</Button> </Button>
</Popover> </Popover>

@ -35,7 +35,7 @@ export const useColumns = (fields = [], key) => {
trigger="click" trigger="click"
placement={"right"} placement={"right"}
> >
<Button> <Button onClick={(e) => e.stopPropagation()} >
<SearchOutlined /> <SearchOutlined />
</Button> </Button>
</Popover> </Popover>

Loading…
Cancel
Save