From 3552f758978751d94940e188f3647871bd6c5b61 Mon Sep 17 00:00:00 2001
From: Mikhail Chechnev <mim_@mail.ru>
Date: Thu, 26 Sep 2024 19:29:41 +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=A0=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B5=D0=BA=D1=82=D0=BE=D0=B2"=20-=20=D1=84=D0=B8=D0=BA?=
 =?UTF-8?q?=D1=81=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D0=B9=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BE=D0=BA=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D0=BC=D0=BE=D0=BD=D0=B8=D1=82=D0=BE=D1=80=D0=B0?=
 =?UTF-8?q?=20=D1=80=D0=B5=D1=81=D1=83=D1=80=D1=81=D0=BE=D0=B2,=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=D0=BB=D0=B8=20=D0=BF=D0=BE=D0=BB=D0=BE=D1=81=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BA=D1=80=D1=83=D1=82=D0=BA=D0=B8=20=D0=BF?=
 =?UTF-8?q?=D0=BE-=D1=83=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_jobs/prj_jobs.js |  5 +++--
 app/panels/prj_jobs/res_mon.js  | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/panels/prj_jobs/prj_jobs.js b/app/panels/prj_jobs/prj_jobs.js
index f2ac9fb..ffafa48 100644
--- a/app/panels/prj_jobs/prj_jobs.js
+++ b/app/panels/prj_jobs/prj_jobs.js
@@ -34,6 +34,7 @@ import { MessagingСtx } from "../../context/messaging"; //Контекст со
 import { ApplicationСtx } from "../../context/application"; //Контекст приложения
 import { formatDateJSONDateOnly } from "../../core/utils"; //Вспомогательные функции
 import { APP_BAR_HEIGHT } from "../../components/p8p_app_workspace"; //Заголовок страницы
+import { APP_STYLES } from "../../../app.styles"; //Типовые стили
 import { P8P_GANTT_CONFIG_PROPS } from "../../config_wrapper"; //Подключение компонентов к настройкам приложения
 import { P8PGantt } from "../../components/p8p_gantt"; //Диаграмма Ганта
 import { formatDateRF } from "../../core/utils"; //Вспомогательные функции
@@ -54,11 +55,11 @@ const STYLES = {
     PROJECTS_LIST_ITEM_SECONDARY_NOEDIT: { color: "gray" },
     PROJECTS_LIST_ITEM_SECONDARY_CHANGED: { color: "green" },
     PROJECTS_BUTTON: { position: "absolute", top: `calc(${APP_BAR_HEIGHT} + 16px)`, left: "16px" },
-    PROJECTS_DRAWER: { width: "250px", flexShrink: 0, [`& .MuiDrawer-paper`]: { width: "250px", boxSizing: "border-box" } },
+    PROJECTS_DRAWER: { width: "250px", flexShrink: 0, [`& .MuiDrawer-paper`]: { width: "250px", boxSizing: "border-box", ...APP_STYLES.SCROLL } },
     GANTT_CONTAINER: { height: `calc(100vh - ${APP_BAR_HEIGHT})`, width: "100vw", paddingTop: "24px" },
     GANTT_TITLE: { paddingLeft: "150px", paddingRight: "150px" },
     PERIODS_BUTTON: { position: "absolute", top: `calc(${APP_BAR_HEIGHT} + 16px)`, right: "16px" },
-    PERIODS_DRAWER: { width: "1200px", flexShrink: 0, [`& .MuiDrawer-paper`]: { width: "1200px", boxSizing: "border-box" } }
+    PERIODS_DRAWER: { width: "1200px", flexShrink: 0, [`& .MuiDrawer-paper`]: { width: "1200px", boxSizing: "border-box", ...APP_STYLES.SCROLL } }
 };
 
 //------------------------------------
diff --git a/app/panels/prj_jobs/res_mon.js b/app/panels/prj_jobs/res_mon.js
index 8d61d15..d3a2ba9 100644
--- a/app/panels/prj_jobs/res_mon.js
+++ b/app/panels/prj_jobs/res_mon.js
@@ -9,16 +9,26 @@
 
 import React, { useContext, useState, useCallback, useEffect } from "react"; //Классы React
 import PropTypes from "prop-types"; //Контроль свойств компонента
+import { APP_STYLES } from "../../../app.styles"; //Типовые стили
 import { BackEndСtx } from "../../context/backend"; //Контекст взаимодействия с сервером
 import { ApplicationСtx } from "../../context/application"; //Контекст приложения
 import { object2Base64XML } from "../../core/utils"; //Вспомогательные функции
 import { P8P_DATA_GRID_CONFIG_PROPS } from "../../config_wrapper"; //Подключение компонентов к настройкам приложения
-import { P8PDataGrid, P8P_DATA_GRID_SIZE } from "../../components/p8p_data_grid"; //Таблица данных
+import { P8PDataGrid, P8P_DATA_GRID_SIZE, P8P_DATA_GRID_MORE_HEIGHT } from "../../components/p8p_data_grid"; //Таблица данных
 import { LabPlanFOTDtl } from "./lab_plan_fot_dtl"; //Детализация плановой трудоёмкости по ФОТ
 import { LabFactRptDtl } from "./lab_fact_rpt_dtl"; //Детализация фактической трудоёмкости по "Планам и отчетам подразделений"
 import { LabPlanJobsDtl } from "./lab_plan_jobs_dtl"; //Детализация плановой трудоёмкости по графику
 import { periodsDataCellRender } from "./layouts"; //Дополнительная разметка и вёрстка клиентских элементов
 
+//---------
+//Константы
+//---------
+
+//Стили
+const STYLES = {
+    DATA_GRID_CONTAINER: morePages => ({ height: `calc(100vh - ${morePages ? P8P_DATA_GRID_MORE_HEIGHT : "0px"})`, ...APP_STYLES.SCROLL })
+};
+
 //-----------
 //Тело модуля
 //-----------
@@ -134,11 +144,16 @@ const ResMon = ({ ident, onPlanJobsDtlProjectClick }) => {
             {peridos.dataLoaded ? (
                 <P8PDataGrid
                     {...P8P_DATA_GRID_CONFIG_PROPS}
+                    containerComponentProps={{
+                        elevation: 0,
+                        sx: STYLES.DATA_GRID_CONTAINER(peridos.morePages)
+                    }}
                     columnsDef={peridos.columnsDef}
                     rows={peridos.rows}
                     size={P8P_DATA_GRID_SIZE.SMALL}
                     morePages={peridos.morePages}
                     reloading={peridos.reload}
+                    fixedHeader={true}
                     onOrderChanged={handlePeriodsOrderChanged}
                     onPagesCountChanged={handlePeriodsPagesCountChanged}
                     dataCellRender={prms =>