diff --git a/frontend/src/components/DropDown/DropDown.styles.scss b/frontend/src/components/DropDown/DropDown.styles.scss index 3527c1385a..232b349545 100644 --- a/frontend/src/components/DropDown/DropDown.styles.scss +++ b/frontend/src/components/DropDown/DropDown.styles.scss @@ -1,11 +1,11 @@ -.Dropdown-button { +.dropdown-button { color: #fff; } -.Dropdown-button--dark { +.dropdown-button--dark { color: #000; } -.Dropdown-icon { +.dropdown-icon { font-size: 1.2rem; } \ No newline at end of file diff --git a/frontend/src/components/DropDown/DropDown.tsx b/frontend/src/components/DropDown/DropDown.tsx index c76ff8daec..c29fbdd15b 100644 --- a/frontend/src/components/DropDown/DropDown.tsx +++ b/frontend/src/components/DropDown/DropDown.tsx @@ -1,7 +1,7 @@ import './DropDown.styles.scss'; import { EllipsisOutlined } from '@ant-design/icons'; -import { Button, Dropdown, MenuProps, Space } from 'antd'; +import { Button, Dropdown, MenuProps } from 'antd'; import { useIsDarkMode } from 'hooks/useDarkMode'; function DropDown({ element }: { element: JSX.Element[] }): JSX.Element { @@ -15,15 +15,13 @@ function DropDown({ element }: { element: JSX.Element[] }): JSX.Element { ); return ( - + ); diff --git a/frontend/src/components/ResizeTable/DynamicColumnTable.syles.scss b/frontend/src/components/ResizeTable/DynamicColumnTable.syles.scss index 30bccd87e3..2bd0606abd 100644 --- a/frontend/src/components/ResizeTable/DynamicColumnTable.syles.scss +++ b/frontend/src/components/ResizeTable/DynamicColumnTable.syles.scss @@ -14,4 +14,12 @@ width: 10.625rem; justify-content: space-between; align-items: center; +} + +@media (max-width: 768px) { + .dynamicColumnsTable-items { + flex-direction: column; + width: auto; + text-align: center; + } } \ No newline at end of file diff --git a/frontend/src/components/ResizeTable/DynamicColumnTable.tsx b/frontend/src/components/ResizeTable/DynamicColumnTable.tsx index 93e3673743..385734f11d 100644 --- a/frontend/src/components/ResizeTable/DynamicColumnTable.tsx +++ b/frontend/src/components/ResizeTable/DynamicColumnTable.tsx @@ -9,7 +9,11 @@ import { popupContainer } from 'utils/selectPopupContainer'; import ResizeTable from './ResizeTable'; import { DynamicColumnTableProps } from './types'; -import { getVisibleColumns, setVisibleColumns } from './unit'; +import { + getNewColumnData, + getVisibleColumns, + setVisibleColumns, +} from './utils'; function DynamicColumnTable({ tablesource, @@ -51,22 +55,14 @@ function DynamicColumnTable({ index, checked, }); - setColumnsData((prevColumns) => { - if (checked && dynamicColumns) { - return prevColumns - ? [ - ...prevColumns.slice(0, prevColumns.length - 1), - dynamicColumns[index], - prevColumns[prevColumns.length - 1], - ] - : undefined; - } - return prevColumns && dynamicColumns - ? prevColumns.filter( - (column) => dynamicColumns[index].title !== column.title, - ) - : undefined; - }); + setColumnsData((prevColumns) => + getNewColumnData({ + checked, + index, + prevColumns, + dynamicColumns, + }), + ); }; const items: MenuProps['items'] = diff --git a/frontend/src/components/ResizeTable/TableComponent/DateComponent.tsx b/frontend/src/components/ResizeTable/TableComponent/DateComponent.tsx new file mode 100644 index 0000000000..87c5c57420 --- /dev/null +++ b/frontend/src/components/ResizeTable/TableComponent/DateComponent.tsx @@ -0,0 +1,15 @@ +import { Typography } from 'antd'; + +import Time from './Time'; + +function DateComponent( + CreatedOrUpdateTime: string | number | Date, +): JSX.Element { + if (CreatedOrUpdateTime === null) { + return - ; + } + + return