main #4

Merged
Dollerok merged 10 commits from CITKParus/P8-Panels:main into main 2024-11-25 15:38:26 +03:00
3 changed files with 26 additions and 11 deletions
Showing only changes of commit 47532b9c19 - Show all commits

View File

@ -33,7 +33,7 @@ import { P8PAppInlineError } from "./p8p_app_message"; //Встраиваемо
//--------- //---------
//Уровни масштаба //Уровни масштаба
const P8P_GANTT_ZOOM = [0, 1, 2, 3, 4]; const P8P_GANTT_ZOOM = [0, 1, 2, 3, 4, 5];
//Уровни масштаба (строковые наименования в терминах библиотеки) //Уровни масштаба (строковые наименования в терминах библиотеки)
const P8P_GANTT_ZOOM_VIEW_MODES = { const P8P_GANTT_ZOOM_VIEW_MODES = {
@ -41,7 +41,8 @@ const P8P_GANTT_ZOOM_VIEW_MODES = {
1: "Half Day", 1: "Half Day",
2: "Day", 2: "Day",
3: "Week", 3: "Week",
4: "Month" 4: "Month",
5: "Year"
}; };
//Структура задачи //Структура задачи

View File

@ -62,8 +62,15 @@ const STYLES = {
GRID_PANEL_CARD_CONTENT_TITLE_ICON: { paddingTop: "4px" }, GRID_PANEL_CARD_CONTENT_TITLE_ICON: { paddingTop: "4px" },
GRID_PANEL_CARD_ACTIONS: { marginTop: "auto", display: "flex", justifyContent: "flex-end", alignItems: "flex-start" }, 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_GROUP_HEADER: { fontWeight: "bold", fontFamily: "tahoma, arial, verdana, sans-serif!important", fontSize: "13px!important" },
DESKTOP_ITEM_BUTTON: { fontSize: "12px", textTransform: "none", "&:hover": { backgroundColor: "#c3e1ff" }, maxWidth: "150px" }, DESKTOP_ITEM_BUTTON: {
DESKTOP_ITEM_STACK: { justifyContent: "center", alignItems: "center", fontSize: "12px" }, fontSize: "12px",
textTransform: "none",
"&:hover": { backgroundColor: "#c3e1ff" },
width: "150px",
height: "90px",
flexDirection: "column",
justifyContent: "flex-start"
},
DESKTOP_ITEM_ICON: { width: "48px", height: "48px", fontSize: "48px" }, DESKTOP_ITEM_ICON: { width: "48px", height: "48px", fontSize: "48px" },
DESKTOP_ITEM_CATION: { DESKTOP_ITEM_CATION: {
display: "-webkit-box", display: "-webkit-box",
@ -165,12 +172,10 @@ const getPanelsLinks = ({ variant, panels, selectedPanel, group, defaultGroupTyt
sx={STYLES.DESKTOP_ITEM_BUTTON} sx={STYLES.DESKTOP_ITEM_BUTTON}
title={panel.caption} title={panel.caption}
> >
<Stack sx={STYLES.DESKTOP_ITEM_STACK}> <Icon sx={STYLES.DESKTOP_ITEM_ICON}>{panel.icon}</Icon>
<Icon sx={STYLES.DESKTOP_ITEM_ICON}>{panel.icon}</Icon> <Typography sx={STYLES.DESKTOP_ITEM_CATION} variant="body1">
<Typography sx={STYLES.DESKTOP_ITEM_CATION} variant="body1"> {panel.caption}
{panel.caption} </Typography>
</Typography>
</Stack>
</Button> </Button>
) )
); );
@ -230,7 +235,12 @@ const P8PPanelsMenuDesktop = ({ group, onItemNavigate, panels = [], defaultGroup
const panelsLinks = getPanelsLinks({ variant: P8P_PANELS_MENU_VARIANT.DESKTOP, panels, group, defaultGroupTytle, onItemNavigate }); const panelsLinks = getPanelsLinks({ variant: P8P_PANELS_MENU_VARIANT.DESKTOP, panels, group, defaultGroupTytle, onItemNavigate });
//Генерация содержимого //Генерация содержимого
return <Box p={2}>{panelsLinks}</Box>; return (
<Box p={2}>
{panelsLinks[0]}
<Stack direction="row">{panelsLinks.map((l, i) => (i > 0 ? l : null))}</Stack>
</Box>
);
}; };
//Контроль свойств - Меню панелей - рабочий стол //Контроль свойств - Меню панелей - рабочий стол

View File

@ -140,6 +140,9 @@ const xml2JSON = ({ xmlDoc, isArray, transformTagName, tagValueProcessor, attrib
//Форматирование даты в формат РФ //Форматирование даты в формат РФ
const formatDateRF = value => (value ? dayjs(value).format("DD.MM.YYYY") : null); const formatDateRF = value => (value ? dayjs(value).format("DD.MM.YYYY") : null);
//Форматирование даты и времени в формат РФ
const formatDateTimeRF = value => (value ? dayjs(value).format("DD.MM.YYYY HH:mm:ss") : null);
//Форматирование даты в формат JSON (только дата, без времени) //Форматирование даты в формат JSON (только дата, без времени)
const formatDateJSONDateOnly = value => (value ? dayjs(value).format("YYYY-MM-DD") : null); const formatDateJSONDateOnly = value => (value ? dayjs(value).format("YYYY-MM-DD") : null);
@ -163,6 +166,7 @@ export {
object2Base64XML, object2Base64XML,
xml2JSON, xml2JSON,
formatDateRF, formatDateRF,
formatDateTimeRF,
formatDateJSONDateOnly, formatDateJSONDateOnly,
formatNumberRFCurrency, formatNumberRFCurrency,
genGUID genGUID