main #7

Merged
Dollerok merged 11 commits from CITKParus/P8-Panels:main into main 2025-01-27 15:26:39 +03:00
Showing only changes of commit b06ae0d242 - Show all commits

View File

@ -15,6 +15,7 @@ import { P8PDataGrid, P8P_DATA_GRID_SIZE } from "../../components/p8p_data_grid"
import { P8P_DATA_GRID_CONFIG_PROPS } from "../../config_wrapper"; //Подключение компонентов к настройкам приложения
import { BackEndСtx } from "../../context/backend"; //Контекст взаимодействия с сервером
import { ApplicationСtx } from "../../context/application"; //Контекст приложения
import { APP_STYLES } from "../../../app.styles"; //Типовые стили
//---------
//Константы
@ -27,7 +28,7 @@ const DATA_GRID_PAGE_SIZE = 5;
const STYLES = {
CONTAINER: { textAlign: "center", paddingTop: "20px" },
TITLE: { paddingBottom: "15px" },
DATA_GRID_CONTAINER: { maxWidth: 700, maxHeight: 500, minHeight: 500 }
DATA_GRID_CONTAINER: { maxWidth: 700, maxHeight: 500, minHeight: 500, ...APP_STYLES.SCROLL }
};
//---------------------------------------------
@ -166,7 +167,7 @@ const DataGrid = ({ title }) => {
{dataGrid.dataLoaded ? (
<P8PDataGrid
{...P8P_DATA_GRID_CONFIG_PROPS}
containerComponentProps={{ elevation: 6, style: STYLES.DATA_GRID_CONTAINER }}
containerComponentProps={{ elevation: 6, sx: STYLES.DATA_GRID_CONTAINER }}
{...dataGrid}
size={P8P_DATA_GRID_SIZE.LARGE}
valueFormatter={valueFormatter}