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

---
 app/panels/samples/data_grid.js | 9 +++++----
 app/panels/samples/gantt.js     | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/panels/samples/data_grid.js b/app/panels/samples/data_grid.js
index 423e9b6..8041cb7 100644
--- a/app/panels/samples/data_grid.js
+++ b/app/panels/samples/data_grid.js
@@ -117,10 +117,11 @@ const DataGrid = ({ title }) => {
                 ...pv,
                 columnsDef: data.XCOLUMNS_DEF ? [...data.XCOLUMNS_DEF] : pv.columnsDef,
                 rows: pv.pageNumber == 1 ? [...(data.XROWS || [])] : [...pv.rows, ...(data.XROWS || [])],
-                groups:
-                    pv.pageNumber == 1
-                        ? [...(data.XGROUPS || [])]
-                        : [...pv.groups, ...(data.XGROUPS.filter(g => !pv.groups.find(pg => pg.name == g.name)) || [])],
+                groups: data.XGROUPS
+                    ? pv.pageNumber == 1
+                        ? [...data.XGROUPS]
+                        : [...pv.groups, ...data.XGROUPS.filter(g => !pv.groups.find(pg => pg.name == g.name))]
+                    : [...pv.groups],
                 dataLoaded: true,
                 reload: false,
                 morePages: (data.XROWS || []).length >= DATA_GRID_PAGE_SIZE
diff --git a/app/panels/samples/gantt.js b/app/panels/samples/gantt.js
index 4883581..6ce43b9 100644
--- a/app/panels/samples/gantt.js
+++ b/app/panels/samples/gantt.js
@@ -20,7 +20,7 @@ import { BackEndСtx } from "../../context/backend"; //Контекст взаи
 //---------
 
 //Высота диаграммы Ганта
-const GANTT_HEIGHT = "600px";
+const GANTT_HEIGHT = "70vh";
 
 //Ширина диаграммы Ганта
 const GANTT_WIDTH = "98vw";