From 7a10363a2bf82dd26909b1e15dfab6dd58c2e0c7 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Mon, 26 Feb 2024 13:15:40 +0300 Subject: [PATCH] =?UTF-8?q?WEB=20APP:=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=B0=D0=BD=D1=8B=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D1=8B=20-P8PTable=20-=20=D1=82=D0=BE=D0=BB=D0=B5=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D1=82=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BA=20?= =?UTF-8?q?=D0=BF=D1=83=D1=81=D1=82=D1=8B=D0=BC=20=D0=B3=D1=80=D1=83=D0=BF?= =?UTF-8?q?=D0=BF=D0=B0=D0=BC,=20P8PanelsMenu=20-=20=D0=BA=D0=BE=D1=81?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=B8=D0=BA=D0=B0=20=D0=B2=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D1=81=D1=82=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D0=BD=D1=82=D0=B5=D0=B3?= =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B2=20=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=87=D0=B8=D0=B9=20=D1=81=D1=82=D0=BE=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/p8p_panels_menu.js | 20 ++++++++++++++++---- app/components/p8p_table.js | 4 ++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/components/p8p_panels_menu.js b/app/components/p8p_panels_menu.js index 145258f..458e50b 100644 --- a/app/components/p8p_panels_menu.js +++ b/app/components/p8p_panels_menu.js @@ -61,9 +61,18 @@ const STYLES = { GRID_PANEL_CARD_CONTENT_TITLE: { alignItems: "center" }, GRID_PANEL_CARD_ACTIONS: { marginTop: "auto", display: "flex", justifyContent: "flex-end", alignItems: "flex-start" }, DESKTOP_GROUP_HEADER: { fontWeight: "bold", fontFamily: "tahoma, arial, verdana, sans-serif!important", fontSize: "13px!important" }, - DESKTOP_ITEM_BUTTON: { fontSize: "12px", textTransform: "none", "&:hover": { backgroundColor: "#c3e1ff" } }, - DESKTOP_ITEM_STACK: { justifyContent: "center", alignItems: "center" }, - DESKTOP_ITEM_ICON: { width: "64px", height: "64px", fontSize: "64px" } + DESKTOP_ITEM_BUTTON: { fontSize: "12px", textTransform: "none", "&:hover": { backgroundColor: "#c3e1ff" }, maxWidth: "150px" }, + DESKTOP_ITEM_STACK: { justifyContent: "center", alignItems: "center", fontSize: "12px" }, + DESKTOP_ITEM_ICON: { width: "48px", height: "48px", fontSize: "48px" }, + DESKTOP_ITEM_CATION: { + display: "-webkit-box", + overflow: "hidden", + WebkitBoxOrient: "vertical", + WebkitLineClamp: 2, + fontSize: "12px", + maxWidth: "140px", + lineHeight: "1.2" + } }; //-------------------------------- @@ -153,10 +162,13 @@ const getPanelsLinks = ({ variant, panels, selectedPanel, group, defaultGroupTyt key={panel.name} onClick={() => (onItemNavigate ? onItemNavigate(panel) : null)} sx={STYLES.DESKTOP_ITEM_BUTTON} + title={panel.caption} > {panel.icon} - {panel.caption} + + {panel.caption} + ) diff --git a/app/components/p8p_table.js b/app/components/p8p_table.js index 4ab6149..27d970c 100644 --- a/app/components/p8p_table.js +++ b/app/components/p8p_table.js @@ -455,7 +455,7 @@ P8PTableFiltersChips.propTypes = { //Таблица const P8PTable = ({ columnsDef, - groups = [{}], + groups, rows, orders, filters, @@ -744,7 +744,7 @@ const P8PTable = ({ {rows.length > 0 - ? groups.map((group, g) => { + ? (Array.isArray(groups) && groups.length > 0 ? groups : [{}]).map((group, g) => { const rowsView = rows.map((row, i) => !group?.name || group?.name == row.groupName ? (