mdt-charts 1.28.2 → 1.29.0

package/lib/model/notations/twoDimensional/styles.js

@@ -3,151 +3,260 @@ import { styledElementValues } from "../../modelBuilder";
 const BAR_CHART_BORDER_RADIUS_DEFAULT = 2;
 export const LINE_CHART_DEFAULT_WIDTH = 2;
 export function parseShape(chartOrientation, configOptions) {
-    var _a;
-    const curveType = (_a = configOptions === null || configOptions === void 0 ? void 0 : configOptions.curve) === null || _a === void 0 ? void 0 : _a.type;
-    return {
-        curve: {
-            type: parseCurveType(chartOrientation, curveType)
-        }
-    };
+	var _a;
+	const curveType =
+		(_a = configOptions === null || configOptions === void 0 ? void 0 : configOptions.curve) === null ||
+		_a === void 0
+			? void 0
+			: _a.type;
+	return {
+		curve: {
+			type: parseCurveType(chartOrientation, curveType)
+		}
+	};
 }
 function parseCurveType(chartOrientation, curveType) {
-    if (curveType === "monotone" || curveType == null) {
-        if (chartOrientation === "horizontal")
-            return LineCurveType.monotoneY;
-        return LineCurveType.monotoneX;
-    }
-    return LineCurveType.none;
+	if (curveType === "monotone" || curveType == null) {
+		if (chartOrientation === "horizontal") return LineCurveType.monotoneY;
+		return LineCurveType.monotoneX;
+	}
+	return LineCurveType.none;
 }
 export function parseDashStyles(configOptions) {
-    var _a, _b, _c;
-    const DEFAULT_DASH_SIZE_PX = 10;
-    const DEFAULT_GAP_SIZE_PX = 3;
-    return {
-        on: (_a = configOptions === null || configOptions === void 0 ? void 0 : configOptions.on) !== null && _a !== void 0 ? _a : false,
-        dashSize: (_b = configOptions === null || configOptions === void 0 ? void 0 : configOptions.dashSize) !== null && _b !== void 0 ? _b : DEFAULT_DASH_SIZE_PX,
-        gapSize: (_c = configOptions === null || configOptions === void 0 ? void 0 : configOptions.gapSize) !== null && _c !== void 0 ? _c : DEFAULT_GAP_SIZE_PX
-    };
+	var _a, _b, _c;
+	const DEFAULT_DASH_SIZE_PX = 10;
+	const DEFAULT_GAP_SIZE_PX = 3;
+	return {
+		on:
+			(_a = configOptions === null || configOptions === void 0 ? void 0 : configOptions.on) !== null &&
+			_a !== void 0
+				? _a
+				: false,
+		dashSize:
+			(_b = configOptions === null || configOptions === void 0 ? void 0 : configOptions.dashSize) !== null &&
+			_b !== void 0
+				? _b
+				: DEFAULT_DASH_SIZE_PX,
+		gapSize:
+			(_c = configOptions === null || configOptions === void 0 ? void 0 : configOptions.gapSize) !== null &&
+			_c !== void 0
+				? _c
+				: DEFAULT_GAP_SIZE_PX
+	};
 }
 export function getBarViewOptions(chart, keyAxisOrient, barIndexes) {
-    var _a, _b, _c, _d, _e, _f;
-    const hatch = { on: (_c = (_b = (_a = chart.barStyles) === null || _a === void 0 ? void 0 : _a.hatch) === null || _b === void 0 ? void 0 : _b.on) !== null && _c !== void 0 ? _c : false };
-    const defaultRadius = (_f = (_e = (_d = chart.barStyles) === null || _d === void 0 ? void 0 : _d.borderRadius) === null || _e === void 0 ? void 0 : _e.value) !== null && _f !== void 0 ? _f : BAR_CHART_BORDER_RADIUS_DEFAULT;
-    const borderRadius = {
-        grouped: getRadiusValues(defaultRadius),
-        segmented: {
-            handle: (valueIndex) => getSegmentedRadiusValues(chart.data.valueFields.length, valueIndex, keyAxisOrient, defaultRadius)
-        }
-    };
-    return { hatch, borderRadius, barIndexes };
+	var _a, _b, _c, _d, _e, _f;
+	const hatch = {
+		on:
+			(_c =
+				(_b = (_a = chart.barStyles) === null || _a === void 0 ? void 0 : _a.hatch) === null || _b === void 0
+					? void 0
+					: _b.on) !== null && _c !== void 0
+				? _c
+				: false
+	};
+	const defaultRadius =
+		(_f =
+			(_e = (_d = chart.barStyles) === null || _d === void 0 ? void 0 : _d.borderRadius) === null || _e === void 0
+				? void 0
+				: _e.value) !== null && _f !== void 0
+			? _f
+			: BAR_CHART_BORDER_RADIUS_DEFAULT;
+	const borderRadius = {
+		grouped: getRadiusValues(defaultRadius),
+		segmented: {
+			handle: (valueIndex) =>
+				getSegmentedRadiusValues(chart.data.valueFields.length, valueIndex, keyAxisOrient, defaultRadius)
+		}
+	};
+	return { hatch, borderRadius, barIndexes };
 }
 export function calculateBarIndexes(allCharts, currentChart, currentChartIndex) {
-    const prevBarCharts = allCharts.slice(0, currentChartIndex).filter((ch) => ch.type === "bar");
-    const startBarIndex = prevBarCharts.reduce((acc, ch) => acc + (ch.isSegmented ? 1 : ch.data.valueFields.length), 0);
-    if (currentChart.isSegmented)
-        return [startBarIndex];
-    return currentChart.data.valueFields.map((_, index) => startBarIndex + index);
+	const prevBarCharts = allCharts.slice(0, currentChartIndex).filter((ch) => ch.type === "bar");
+	const startBarIndex = prevBarCharts.reduce((acc, ch) => acc + (ch.isSegmented ? 1 : ch.data.valueFields.length), 0);
+	if (currentChart.isSegmented) return [startBarIndex];
+	return currentChart.data.valueFields.map((_, index) => startBarIndex + index);
 }
 function getRadiusValues(defaultRadius) {
-    return {
-        topLeft: defaultRadius,
-        topRight: defaultRadius,
-        bottomLeft: defaultRadius,
-        bottomRight: defaultRadius
-    };
+	return {
+		topLeft: defaultRadius,
+		topRight: defaultRadius,
+		bottomLeft: defaultRadius,
+		bottomRight: defaultRadius
+	};
 }
 export function getSegmentedRadiusValues(segmentsLength, segmentIndex, keyAxisOrient, defaultRadius) {
-    const radiusConfigs = {
-        first: {
-            top: { topLeft: defaultRadius, topRight: defaultRadius, bottomLeft: 0, bottomRight: 0 },
-            bottom: { topLeft: 0, topRight: 0, bottomLeft: defaultRadius, bottomRight: defaultRadius },
-            left: { topLeft: defaultRadius, topRight: 0, bottomLeft: defaultRadius, bottomRight: 0 },
-            right: { topLeft: 0, topRight: defaultRadius, bottomLeft: 0, bottomRight: defaultRadius }
-        },
-        last: {
-            top: { topLeft: 0, topRight: 0, bottomLeft: defaultRadius, bottomRight: defaultRadius },
-            bottom: { topLeft: defaultRadius, topRight: defaultRadius, bottomLeft: 0, bottomRight: 0 },
-            left: { topLeft: 0, topRight: defaultRadius, bottomLeft: 0, bottomRight: defaultRadius },
-            right: { topLeft: defaultRadius, topRight: 0, bottomLeft: defaultRadius, bottomRight: 0 }
-        },
-        middle: { topLeft: 0, topRight: 0, bottomLeft: 0, bottomRight: 0 },
-        default: getRadiusValues(defaultRadius)
-    };
-    if (segmentsLength === 1)
-        return radiusConfigs.default;
-    else if (segmentIndex === 0)
-        return radiusConfigs.first[keyAxisOrient];
-    else if (segmentIndex === segmentsLength - 1)
-        return radiusConfigs.last[keyAxisOrient];
-    else
-        return radiusConfigs.middle;
+	const radiusConfigs = {
+		first: {
+			top: {
+				topLeft: defaultRadius,
+				topRight: defaultRadius,
+				bottomLeft: 0,
+				bottomRight: 0
+			},
+			bottom: {
+				topLeft: 0,
+				topRight: 0,
+				bottomLeft: defaultRadius,
+				bottomRight: defaultRadius
+			},
+			left: {
+				topLeft: defaultRadius,
+				topRight: 0,
+				bottomLeft: defaultRadius,
+				bottomRight: 0
+			},
+			right: {
+				topLeft: 0,
+				topRight: defaultRadius,
+				bottomLeft: 0,
+				bottomRight: defaultRadius
+			}
+		},
+		last: {
+			top: {
+				topLeft: 0,
+				topRight: 0,
+				bottomLeft: defaultRadius,
+				bottomRight: defaultRadius
+			},
+			bottom: {
+				topLeft: defaultRadius,
+				topRight: defaultRadius,
+				bottomLeft: 0,
+				bottomRight: 0
+			},
+			left: {
+				topLeft: 0,
+				topRight: defaultRadius,
+				bottomLeft: 0,
+				bottomRight: defaultRadius
+			},
+			right: {
+				topLeft: defaultRadius,
+				topRight: 0,
+				bottomLeft: defaultRadius,
+				bottomRight: 0
+			}
+		},
+		middle: { topLeft: 0, topRight: 0, bottomLeft: 0, bottomRight: 0 },
+		default: getRadiusValues(defaultRadius)
+	};
+	if (segmentsLength === 1) return radiusConfigs.default;
+	else if (segmentIndex === 0) return radiusConfigs.first[keyAxisOrient];
+	else if (segmentIndex === segmentsLength - 1) return radiusConfigs.last[keyAxisOrient];
+	else return radiusConfigs.middle;
 }
 export function getLegendMarkerOptions(chart) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-    const shapeByType = {
-        area: "line",
-        bar: "bar",
-        line: "line",
-        dot: (_c = (_b = (_a = chart.dotLikeStyles) === null || _a === void 0 ? void 0 : _a.shape) === null || _b === void 0 ? void 0 : _b.type) !== null && _c !== void 0 ? _c : "line"
-    };
-    return {
-        markerShape: shapeByType[chart.type],
-        barViewOptions: {
-            hatch: { on: (_f = (_e = (_d = chart.barStyles) === null || _d === void 0 ? void 0 : _d.hatch) === null || _e === void 0 ? void 0 : _e.on) !== null && _f !== void 0 ? _f : false },
-            borderRadius: getRadiusValues((_j = (_h = (_g = chart.barStyles) === null || _g === void 0 ? void 0 : _g.borderRadius) === null || _h === void 0 ? void 0 : _h.value) !== null && _j !== void 0 ? _j : BAR_CHART_BORDER_RADIUS_DEFAULT),
-            width: getWidthOfLegendMarkerByType("bar")
-        },
-        lineViewOptions: getLineViewOptions(chart)
-    };
+	var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+	const shapeByType = {
+		area: "line",
+		bar: "bar",
+		line: "line",
+		dot:
+			(_c =
+				(_b = (_a = chart.dotLikeStyles) === null || _a === void 0 ? void 0 : _a.shape) === null ||
+				_b === void 0
+					? void 0
+					: _b.type) !== null && _c !== void 0
+				? _c
+				: "line"
+	};
+	return {
+		markerShape: shapeByType[chart.type],
+		barViewOptions: {
+			hatch: {
+				on:
+					(_f =
+						(_e = (_d = chart.barStyles) === null || _d === void 0 ? void 0 : _d.hatch) === null ||
+						_e === void 0
+							? void 0
+							: _e.on) !== null && _f !== void 0
+						? _f
+						: false
+			},
+			borderRadius: getRadiusValues(
+				(_j =
+					(_h = (_g = chart.barStyles) === null || _g === void 0 ? void 0 : _g.borderRadius) === null ||
+					_h === void 0
+						? void 0
+						: _h.value) !== null && _j !== void 0
+					? _j
+					: BAR_CHART_BORDER_RADIUS_DEFAULT
+			),
+			width: getWidthOfLegendMarkerByType("bar")
+		},
+		lineViewOptions: getLineViewOptions(chart)
+	};
 }
 export function getLineViewOptions(chart) {
-    var _a, _b, _c, _d, _e, _f;
-    switch (chart.type) {
-        case "dot":
-            return {
-                dashedStyles: { on: false, dashSize: 0, gapSize: 0 },
-                strokeWidth: (_c = (_b = (_a = chart.dotLikeStyles) === null || _a === void 0 ? void 0 : _a.shape) === null || _b === void 0 ? void 0 : _b.width) !== null && _c !== void 0 ? _c : LINE_CHART_DEFAULT_WIDTH,
-                length: getWidthOfLegendMarkerByType("line")
-            };
-        case "area":
-            return {
-                dashedStyles: { on: false, dashSize: 0, gapSize: 0 },
-                strokeWidth: LINE_CHART_DEFAULT_WIDTH,
-                length: getWidthOfLegendMarkerByType("line")
-            };
-        default:
-            return {
-                dashedStyles: parseDashStyles((_d = chart.lineStyles) === null || _d === void 0 ? void 0 : _d.dash),
-                strokeWidth: (_f = (_e = chart.lineStyles) === null || _e === void 0 ? void 0 : _e.width) !== null && _f !== void 0 ? _f : LINE_CHART_DEFAULT_WIDTH,
-                length: getWidthOfLegendMarkerByType("line")
-            };
-    }
+	var _a, _b, _c, _d, _e, _f;
+	switch (chart.type) {
+		case "dot":
+			return {
+				dashedStyles: { on: false, dashSize: 0, gapSize: 0 },
+				strokeWidth:
+					(_c =
+						(_b = (_a = chart.dotLikeStyles) === null || _a === void 0 ? void 0 : _a.shape) === null ||
+						_b === void 0
+							? void 0
+							: _b.width) !== null && _c !== void 0
+						? _c
+						: LINE_CHART_DEFAULT_WIDTH,
+				length: getWidthOfLegendMarkerByType("line")
+			};
+		case "area":
+			return {
+				dashedStyles: { on: false, dashSize: 0, gapSize: 0 },
+				strokeWidth: LINE_CHART_DEFAULT_WIDTH,
+				length: getWidthOfLegendMarkerByType("line")
+			};
+		default:
+			return {
+				dashedStyles: parseDashStyles((_d = chart.lineStyles) === null || _d === void 0 ? void 0 : _d.dash),
+				strokeWidth:
+					(_f = (_e = chart.lineStyles) === null || _e === void 0 ? void 0 : _e.width) !== null &&
+					_f !== void 0
+						? _f
+						: LINE_CHART_DEFAULT_WIDTH,
+				length: getWidthOfLegendMarkerByType("line")
+			};
+	}
 }
 export function getWidthOfLegendMarkerByType(chartType) {
-    if (chartType === "bar")
-        return 8;
-    if (chartType === "line")
-        return 24;
-    if (chartType === "area")
-        return styledElementValues.defaultLegendMarkerSizes.widthPx;
+	if (chartType === "bar") return 8;
+	if (chartType === "line") return 24;
+	if (chartType === "area") return styledElementValues.defaultLegendMarkerSizes.widthPx;
 }
 export function getAreaViewOptions(chart, chartIndex, style, chartBlockId) {
-    var _a, _b, _c, _d, _e;
-    let gradientIds = [];
-    for (let index = 0; index < style.elementColors.length; index++) {
-        gradientIds.push(getGradientId(chartIndex, index, chartBlockId));
-    }
-    const fill = ((_b = (_a = chart.areaStyles) === null || _a === void 0 ? void 0 : _a.gradient) === null || _b === void 0 ? void 0 : _b.on) ? { type: "gradient", ids: gradientIds }
-        : { type: "paletteColor" };
-    const borderLine = {
-        on: (_e = (_d = (_c = chart.areaStyles) === null || _c === void 0 ? void 0 : _c.borderLine) === null || _d === void 0 ? void 0 : _d.on) !== null && _e !== void 0 ? _e : false,
-        colorStyle: {
-            elementColors: style.elementColors,
-            opacity: 1
-        }
-    };
-    return { fill, borderLine };
+	var _a, _b, _c, _d, _e;
+	let gradientIds = [];
+	for (let index = 0; index < style.elementColors.length; index++) {
+		gradientIds.push(getGradientId(chartIndex, index, chartBlockId));
+	}
+	const fill = (
+		(_b = (_a = chart.areaStyles) === null || _a === void 0 ? void 0 : _a.gradient) === null || _b === void 0
+			? void 0
+			: _b.on
+	)
+		? { type: "gradient", ids: gradientIds }
+		: { type: "paletteColor" };
+	const borderLine = {
+		on:
+			(_e =
+				(_d = (_c = chart.areaStyles) === null || _c === void 0 ? void 0 : _c.borderLine) === null ||
+				_d === void 0
+					? void 0
+					: _d.on) !== null && _e !== void 0
+				? _e
+				: false,
+		colorStyle: {
+			elementColors: style.elementColors,
+			opacity: 1
+		}
+	};
+	return { fill, borderLine };
 }
 export function getGradientId(chartIndex, subIndex, chartBlockId) {
-    return `chart-${chartBlockId}-gradient-chart-${chartIndex}-sub-${subIndex}`;
+	return `chart-${chartBlockId}-gradient-chart-${chartIndex}-sub-${subIndex}`;
 }

package/lib/model/notations/twoDimensionalModel.d.ts

@@ -4,17 +4,27 @@ import { TwoDimensionalOptionsModel, TwoDimChartElementsSettings } from "../mode
 import { TwoDimConfigReader } from "../modelInstance/configReader";
 import { ModelInstance } from "../modelInstance/modelInstance";
 export declare class TwoDimensionalModel {
-    static getOptions(configReader: TwoDimConfigReader, designerConfig: DesignerConfig, modelInstance: ModelInstance): TwoDimensionalOptionsModel;
-    static getChartsEmbeddedLabelsFlag(charts: MdtChartsTwoDimensionalChart[], chartOrientation: ChartOrientation): boolean;
-    /**
-     * Сортирует список чартов в порядке: area - bar - line.
-     * Используется для того, чтобы при рендере графики с наибольшей площадью (area) не перекрывали графики с меньшей площадью (bar, line).
-     * @param charts Чарты из конфига
-     */
-    static sortCharts(charts: MdtChartsTwoDimensionalChart[]): void;
-    static getChartsSettings(chartOptions: ChartOptionsCanvas, chartOrientation: ChartOrientation): TwoDimChartElementsSettings;
-    private static getChartsModel;
-    private static findChartsWithEmbeddedKeyLabels;
-    private static getEmbeddedLabelType;
-    private static getAdditionalElements;
+	static getOptions(
+		configReader: TwoDimConfigReader,
+		designerConfig: DesignerConfig,
+		modelInstance: ModelInstance
+	): TwoDimensionalOptionsModel;
+	static getChartsEmbeddedLabelsFlag(
+		charts: MdtChartsTwoDimensionalChart[],
+		chartOrientation: ChartOrientation
+	): boolean;
+	/**
+	 * Сортирует список чартов в порядке: area - bar - line.
+	 * Используется для того, чтобы при рендере графики с наибольшей площадью (area) не перекрывали графики с меньшей площадью (bar, line).
+	 * @param charts Чарты из конфига
+	 */
+	static sortCharts(charts: MdtChartsTwoDimensionalChart[]): void;
+	static getChartsSettings(
+		chartOptions: ChartOptionsCanvas,
+		chartOrientation: ChartOrientation
+	): TwoDimChartElementsSettings;
+	private static getChartsModel;
+	private static findChartsWithEmbeddedKeyLabels;
+	private static getEmbeddedLabelType;
+	private static getAdditionalElements;
 }