From b490e07d19c1c9182c1357224ef30920681ece1a Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Thu, 26 Sep 2024 19:27:34 +0300 Subject: [PATCH] =?UTF-8?q?WEB=20APP:=20=D0=9F=D0=B0=D0=BD=D0=B5=D0=BB?= =?UTF-8?q?=D1=8C=20"=D0=93=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=BE=D0=B2"=20-=20=D0=B0=D0=B4?= =?UTF-8?q?=D0=B0=D0=BF=D1=82=D0=B8=D0=B2=D0=BD=D0=B0=D1=8F=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=81=D1=82=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D0=B2=D1=81?= =?UTF-8?q?=D1=8E=20=D0=BF=D0=BB=D0=BE=D1=89=D0=B0=D0=B4=D1=8C=20=D1=8D?= =?UTF-8?q?=D0=BA=D1=80=D0=B0=D0=BD=D0=B0,=20=D1=81=D1=82=D0=B8=D0=BB?= =?UTF-8?q?=D0=B8=20=D0=BF=D0=BE=D0=BB=D0=BE=D1=81=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=D1=80=D1=83=D1=82=D0=BA=D0=B8=20=D0=BF=D0=BE-=D1=83?= =?UTF-8?q?=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/panels/prj_graph/prj_graph.js | 52 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/app/panels/prj_graph/prj_graph.js b/app/panels/prj_graph/prj_graph.js index 1fc4f99..bc26b95 100644 --- a/app/panels/prj_graph/prj_graph.js +++ b/app/panels/prj_graph/prj_graph.js @@ -9,6 +9,8 @@ import React, { useState, useContext, useCallback, useEffect } from "react"; //Классы React import { Grid, Box } from "@mui/material"; //Интерфейсные элементы +import { APP_BAR_HEIGHT } from "../../components/p8p_app_workspace"; //Заголовок страницы +import { APP_STYLES } from "../../../app.styles"; //Типовые стили import { P8PDataGrid, P8P_DATA_GRID_SIZE } from "../../components/p8p_data_grid"; //Таблица данных import { P8P_DATA_GRID_CONFIG_PROPS } from "../../config_wrapper"; //Подключение компонентов к настройкам приложения import { ApplicationСtx } from "../../context/application"; //Контекст приложения @@ -21,7 +23,7 @@ import { dataCellRender, groupCellRender } from "./layouts"; //Дополнит //Стили const STYLES = { - DATA_GRID_CONTAINER: { minWidth: "95vw", maxWidth: "95vw", minHeight: "87vh", maxHeight: "87vh" } + DATA_GRID_CONTAINER: { height: `calc(100vh - ${APP_BAR_HEIGHT})`, width: "100vw", ...APP_STYLES.SCROLL } }; //----------- @@ -71,32 +73,30 @@ const PrjGraph = () => { //Генерация содержимого return ( -
- - - - {dataGrid.dataLoaded ? ( - dataCellRender({ ...prms, pOnlineShowDocument })} - groupCellRender={prms => groupCellRender({ ...prms, pOnlineShowDocument })} - containerComponentProps={{ - elevation: 3, - sx: STYLES.DATA_GRID_CONTAINER - }} - /> - ) : null} - - + + + + {dataGrid.dataLoaded ? ( + dataCellRender({ ...prms, pOnlineShowDocument })} + groupCellRender={prms => groupCellRender({ ...prms, pOnlineShowDocument })} + containerComponentProps={{ + elevation: 0, + sx: STYLES.DATA_GRID_CONTAINER + }} + /> + ) : null} + -
+ ); };