@evergis/react 4.0.106 → 4.0.108

package/dist/components/Dashboard/containers/FiltersContainer/constants.d.ts

@@ -6,6 +6,7 @@ export declare const DEFAULT_BAR_PADDING = 1;
 export declare const DEFAULT_BAR_CHART_HEIGHT = 100;
 export declare const BAR_CHART_HEADER_HEIGHT = 40;
 export declare const BAR_CHART_FOOTER_MARGIN = 16;
+export declare const LINE_CHART_LABEL_MARGIN = 20;
 export declare const DEFAULT_BAR_CHART_MARGINS: {
     top: number;
     left: number;

package/dist/components/Dashboard/types.d.ts

@@ -383,6 +383,7 @@ export interface ConfigDataSourceAttribute {
     attributeName: string;
     alias?: string;
     type?: AttributeType;
+    description?: string;
     stringFormat?: AttributeFormatConfigurationDc;
 }
 export interface ConfigDataSource {

package/dist/index.js

@@ -7665,17 +7665,17 @@ const useHideIfEmptyDataSource = (type = exports.WidgetType.Dashboard) => {
 };
 
 const useProjectDashboardInit = () => {
+    const { currentPage } = useWidgetPage();
     const { projectInfo, updateProject } = useWidgetContext();
     return React.useCallback(() => {
-        if (!lodash.isEmpty(projectInfo?.content?.dashboardConfiguration) || !projectInfo?.content?.items?.length) {
+        if (!projectInfo || !lodash.isEmpty(projectInfo.content?.dashboardConfiguration)) {
             return;
         }
-        const { alias, name, content } = projectInfo || {};
-        const { items } = content || {};
+        const { alias, name } = projectInfo;
         const newProjectInfo = JSON.parse(JSON.stringify(projectInfo));
-        newProjectInfo.content.dashboardConfiguration = getDefaultConfig({ title: alias || name, items });
+        newProjectInfo.content.dashboardConfiguration = getDefaultConfig({ title: alias || name, items: currentPage?.layers });
         updateProject(newProjectInfo);
-    }, [projectInfo, updateProject]);
+    }, [currentPage?.layers, projectInfo, updateProject]);
 };
 
 const useRelatedDataSourceAttributes = ({ type = exports.WidgetType.Dashboard, elementConfig, dataSources, feature, }) => {
@@ -8313,6 +8313,7 @@ const DEFAULT_BAR_PADDING = 1;
 const DEFAULT_BAR_CHART_HEIGHT = 100;
 const BAR_CHART_HEADER_HEIGHT = 40;
 const BAR_CHART_FOOTER_MARGIN = 16;
+const LINE_CHART_LABEL_MARGIN = 20;
 const DEFAULT_BAR_CHART_MARGINS = {
     top: 0,
     left: 0,
@@ -9356,7 +9357,7 @@ const useLayerGroupMenu = () => {
 
 const LayerGroup = ({ group, onlyMainTools }) => {
     const { projectInfo, updateProject } = useWidgetContext();
-    const { pageIndex } = useWidgetPage();
+    const { pageIndex, currentPage } = useWidgetPage();
     const { isMenuOpen, toggleMenu, options, selectOption } = useLayerGroupMenu();
     const onToggleExpand = React.useCallback((name, isExpanded) => {
         if (!projectInfo) {
@@ -9364,18 +9365,18 @@ const LayerGroup = ({ group, onlyMainTools }) => {
         }
         const newProjectInfo = JSON.parse(JSON.stringify(projectInfo));
         const page = getPagesFromProjectInfo(newProjectInfo)?.[pageIndex - 1];
-        page.layers = findAnd.changeProps(projectInfo.content.items, { name }, { isExpanded });
+        page.layers = findAnd.changeProps(currentPage?.layers, { name }, { isExpanded });
         updateProject(newProjectInfo);
-    }, [pageIndex, projectInfo, updateProject]);
+    }, [currentPage?.layers, pageIndex, projectInfo, updateProject]);
     const onToggleVisibility = React.useCallback((name, isVisible) => {
         if (!projectInfo) {
             return;
         }
         const newProjectInfo = JSON.parse(JSON.stringify(projectInfo));
         const page = getPagesFromProjectInfo(newProjectInfo)?.[pageIndex - 1];
-        page.layers = findAnd.changeProps(projectInfo.content.items, { name }, { isVisible });
+        page.layers = findAnd.changeProps(currentPage?.layers, { name }, { isVisible });
         updateProject(newProjectInfo);
-    }, [pageIndex, projectInfo, updateProject]);
+    }, [currentPage?.layers, pageIndex, projectInfo, updateProject]);
     if (!group) {
         return null;
     }
@@ -14378,11 +14379,17 @@ const Chart = React.memo(({ config, element, elementConfig, type, renderElement
                 .flat()
                 .map(({ values }) => values)
                 .flat();
+            // Резервируем нижнюю полосу под подписи оси X: без неё ось прижата к нижней границе,
+            // подписи (сдвинутые на +16px) вылезают за тело и режутся overflow: hidden у ChartFillMeasure.
+            const lineMargin = {
+                ...margin,
+                bottom: Math.max(margin.bottom, LINE_CHART_LABEL_MARGIN),
+            };
             return (jsxRuntime.jsxs(AnyChartWrapper, { height: chartHeight, children: [jsxRuntime.jsx(LineChartStyles, {}), jsxRuntime.jsx(charts.LineChart, { data: lineChartData, labels: labels, markers: markers, width: chartWidth, height: chartHeight, xAxisPadding: 15, yAxisPadding: 0, min: Math.min(...chartValues), customYAxisSelection: yAxis => {
                             if (isHidedY) {
                                 yAxis.remove();
                             }
-                        }, customYAxis: yAxis => yAxis.ticks(4), renderTooltip: renderLineChartTooltip, customize: customize, dotSnapping: dotSnapping, dynamicTooltipEnable: true, stackedTooltip: true, tooltipClassName: "dashboardLineChartTooltip", drawGridX: !isHidedY, margin: margin })] }));
+                        }, customYAxis: yAxis => yAxis.ticks(4), renderTooltip: renderLineChartTooltip, customize: customize, dotSnapping: dotSnapping, dynamicTooltipEnable: true, stackedTooltip: true, tooltipClassName: "dashboardLineChartTooltip", drawGridX: !isHidedY, margin: lineMargin })] }));
         }
         if (isStackBar) {
             // Вне fill chartHeight — высота самой полосы, и обёртка честно становится выше на строку
@@ -14409,8 +14416,9 @@ const Chart = React.memo(({ config, element, elementConfig, type, renderElement
             ? chartHeight - margin.bottom - BAR_CHART_FOOTER_MARGIN
             : chartHeight;
         return (jsxRuntime.jsx(BarChartWrapper, { height: barBodyHeight + margin.bottom, children: jsxRuntime.jsx(BarChartContainer, { children: jsxRuntime.jsx(StyledBarChart, { data: barChartData, colors: getColorsFromFilterItems(data[0]?.items, defaultColor, formatFilterColor), minValue: getMinValueFromFilterItems(data[0]?.items), markers: markers, width: chartWidth, height: barBodyHeight, barWidth: barWidth, barPadding: padding, customYAxisLeft: customYAxisLeft, customXAxisBottom: xAxisBottom => customXAxisBottom(xAxisBottom, barChartData), customYAxis: axis => !showLabels && axis.remove(), customBars: ({ bars }) => {
-                        bars.attr("rx", radius);
-                        bars.attr("ry", radius);
+                        const barRadius = options?.cornerRadius ?? DEFAULT_BARCHART_RADIUS;
+                        bars.attr("rx", barRadius);
+                        bars.attr("ry", barRadius);
                     }, margin: margin, xAxisPadding: 0, yAxisPadding: 0, formatTooltipValue: formatTooltipValue, formatTooltipName: formatTooltipName, hideTooltipGroupName: true, dynamicTooltipEnable: true, isBarTooltip: true, onBarClick: filterName ? item => onFilter(item.name) : undefined }) }) }));
     }, [
         customXAxisBottom,