From 54b3bfdc426f3d31f968515af41c644f5aa2297b Mon Sep 17 00:00:00 2001 From: PotapovaA Date: Wed, 26 Aug 2026 12:25:30 +0300 Subject: [PATCH] =?UTF-8?q?feat:=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=20=D0=B8=20?= =?UTF-8?q?=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5=D0=BD=D1=82=D1=8B=20=D0=B8=D0=BD?= =?UTF-8?q?=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RealtimeTable/SettingPanel/SettingPanel.jsx | 2 +- web/src/components/common/TaskCardComponent.jsx | 16 +++++++++++++++- web/src/pages/AdminPanel/SppsPage/SspTable.jsx | 7 +++++++ web/src/pages/TasksPage/TasksPage.jsx | 3 ++- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/web/src/components/RealtimeTable/SettingPanel/SettingPanel.jsx b/web/src/components/RealtimeTable/SettingPanel/SettingPanel.jsx index 2975c43..c8129c2 100644 --- a/web/src/components/RealtimeTable/SettingPanel/SettingPanel.jsx +++ b/web/src/components/RealtimeTable/SettingPanel/SettingPanel.jsx @@ -194,7 +194,7 @@ const SettingPanel = ({ {/* проверяем на 4 форму */} - {formType === FORM_TYPE_OPTIONS[3] && ( + {formType === FORM_TYPE_OPTIONS[2] && ( <> diff --git a/web/src/components/common/TaskCardComponent.jsx b/web/src/components/common/TaskCardComponent.jsx index b5f7165..382a360 100644 --- a/web/src/components/common/TaskCardComponent.jsx +++ b/web/src/components/common/TaskCardComponent.jsx @@ -13,7 +13,7 @@ import Modal from './Modal/Modal'; import { CheckBoxCheckSvg, CheckBoxUncheckSvg, DateIcon, UserIcon } from './icons/icons'; const TaskCard = styled.div` - width: 26.8rem; + width: ${({ $fluidWidth }) => ($fluidWidth ? 'calc((100% - 2.25rem) / 4)' : '26.8rem')}; min-height: 10rem; display: flex; padding: 1rem; @@ -32,6 +32,18 @@ const TaskCard = styled.div` cursor: pointer; position: relative; + @media (max-width: 1200px) { + width: ${({ $fluidWidth }) => ($fluidWidth ? 'calc((100% - 1.5rem) / 3)' : '26.8rem')}; + } + + @media (max-width: 900px) { + width: ${({ $fluidWidth }) => ($fluidWidth ? 'calc((100% - 0.75rem) / 2)' : '26.8rem')}; + } + + @media (max-width: 600px) { + width: ${({ $fluidWidth }) => ($fluidWidth ? '100%' : '26.8rem')}; + } + &:hover { transform: translateY(-5px); box-shadow: 0 8px 20px rgba(0, 0, 0, 0.12); @@ -73,6 +85,7 @@ const TaskTitle = styled.div` export const TaskCardComponent = ({ taskForm, isForm = false, + fluidWidth = false, exportMode = false, isLoadingFile = false, onAddForExport, @@ -158,6 +171,7 @@ export const TaskCardComponent = ({ return ( <> { if (exportMode) { handleCheckboxClick(event); diff --git a/web/src/pages/AdminPanel/SppsPage/SspTable.jsx b/web/src/pages/AdminPanel/SppsPage/SspTable.jsx index bb856b0..b8292a2 100644 --- a/web/src/pages/AdminPanel/SppsPage/SspTable.jsx +++ b/web/src/pages/AdminPanel/SppsPage/SspTable.jsx @@ -178,6 +178,13 @@ const SspDataTable = ({ enableRowActions={true} renderRowActions={renderRowActions} positionActionsColumn='last' + tableOptions={{ + displayColumnDefOptions: { + 'mrt-row-actions': { + header: 'Действия', + }, + }, + }} initialState={initialState} enableSorting={false} enableColumnFilters={false} diff --git a/web/src/pages/TasksPage/TasksPage.jsx b/web/src/pages/TasksPage/TasksPage.jsx index b3d719b..b7760ac 100644 --- a/web/src/pages/TasksPage/TasksPage.jsx +++ b/web/src/pages/TasksPage/TasksPage.jsx @@ -223,11 +223,12 @@ export default function TasksPage() { totalCount={totalCount} page={page} limit={limit} + maxHeight='none' onPageChange={handlePageChange} onLimitChange={handleLimitChange} entityName='задач' emptyMessage='Задачи не найдены' - renderItem={(task, exportProps) => } + renderItem={(task, exportProps) => } getItemId={(task) => task.id} getItemTitle={(task) => task.title || -- 2.47.2