From b686ae7513c810786b5523eb5e7930d83c995686 Mon Sep 17 00:00:00 2001
From: Mikhail Chechnev <mim_@mail.ru>
Date: Fri, 24 May 2024 19:39:24 +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=9C=D0=BE=D0=BD=D0=B8=D1=82=D0=BE=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B3=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B4=D0=B5=D0=BB=D0=B8=D0=B9"=20-=20=D0=BF=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=BD=D0=B0=D1=8F=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=B4=D0=B0=D1=87=D0=B0=20=D0=B2=20=D1=82=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=86=D0=B0=D1=85=20=D0=B4=D0=B5=D1=82=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BA=D0=B0=D1=80=D1=82?=
 =?UTF-8?q?=D0=BE=D1=87=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mech_rec_assembly_mon/components/plan_detail.js       | 8 ++++----
 app/panels/mech_rec_assembly_mon/hooks.js                 | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/panels/mech_rec_assembly_mon/components/plan_detail.js b/app/panels/mech_rec_assembly_mon/components/plan_detail.js
index 305928d..03f2971 100644
--- a/app/panels/mech_rec_assembly_mon/components/plan_detail.js
+++ b/app/panels/mech_rec_assembly_mon/components/plan_detail.js
@@ -69,7 +69,7 @@ const STYLES = {
         width: "280px",
         borderBottom: "1px solid"
     },
-    TABLE_DETAILS: { height: "260px" },
+    TABLE_DETAILS: { height: "230px" },
     TABLE_DETAILS_HEADER_CELL: maxWidth => ({
         padding: "2px 2px",
         fontSize: "11px",
@@ -78,6 +78,7 @@ const STYLES = {
         ...(maxWidth ? { maxWidth } : {})
     }),
     TABLE_DETAILS_DATA_CELL: textAlign => ({ padding: "2px 2px", fontSize: "11px", ...(textAlign ? { textAlign } : {}) }),
+    TABLE_DETAILS_MORE_BUTTON: { borderRadius: "25px" },
     CARD_DETAILS_CONTAINER: { minWidth: "1200px", maxWidth: "1400px" },
     CARD_DETAILS_NAVIGATION_STACK: { width: "100%" }
 };
@@ -193,20 +194,19 @@ const ProductDetailsTable = ({ plan, product, stored, noProductMessage, noDataFo
         <Box sx={STYLES.BOX_INFO_SUB(!product || data.rows.length === 0)}>
             {!product ? (
                 <Typography variant="UDO_body2">{noProductMessage}</Typography>
-            ) : isLoading ? null : data.rows.length === 0 ? (
-                <Typography variant="subtitle2">{noDataFoundMessage}</Typography>
             ) : (
                 <>
                     <Typography variant="h4">
                         <b>{title}</b>
                     </Typography>
                     <P8PDataGrid
-                        {...P8P_DATA_GRID_CONFIG_PROPS}
+                        {...{ ...P8P_DATA_GRID_CONFIG_PROPS, noDataFoundText: isLoading ? "" : noDataFoundMessage }}
                         containerComponentProps={{ sx: STYLES.TABLE_DETAILS, elevation: 0 }}
                         columnsDef={data.columnsDef}
                         rows={data.rows}
                         size={P8P_DATA_GRID_SIZE.SMALL}
                         morePages={data.morePages}
+                        morePagesBtnProps={{ sx: STYLES.TABLE_DETAILS_MORE_BUTTON }}
                         fixedHeader={true}
                         reloading={false}
                         dataCellRender={dataCellRender}
diff --git a/app/panels/mech_rec_assembly_mon/hooks.js b/app/panels/mech_rec_assembly_mon/hooks.js
index c8ace98..41a5a6a 100644
--- a/app/panels/mech_rec_assembly_mon/hooks.js
+++ b/app/panels/mech_rec_assembly_mon/hooks.js
@@ -16,7 +16,7 @@ import { object2Base64XML } from "../../core/utils"; //Вспомогатель
 //---------
 
 //Размер страницы данных
-const DATA_GRID_PAGE_SIZE = 0;
+const DATA_GRID_PAGE_SIZE = 50;
 
 //-----------
 //Тело модуля
@@ -194,7 +194,7 @@ const useProductDetailsTable = (plan, product, orders, pageNumber, stored) => {
                         CORDERS: { VALUE: object2Base64XML(orders, { arrayNodeName: "orders" }), SDATA_TYPE: SERV_DATA_TYPE_CLOB },
                         NPAGE_NUMBER: pageNumber,
                         NPAGE_SIZE: DATA_GRID_PAGE_SIZE,
-                        NINCLUDE_DEF: 1
+                        NINCLUDE_DEF: pageNumber == 1 ? 1 : 0
                     },
                     respArg: "COUT"
                 });