mdt-charts 1.12.3 → 1.12.7

package/lib/model/featuresModel/scaleModel.d.ts

@@ -1,5 +1,5 @@
 import { ScaleKeyModel, ScaleKeyType, ScaleValueModel, ScaleValueType } from "../model";
-import { AxisPosition, NumberDomain, IntervalChart, MdtChartsTwoDimensionalChart, MdtChartsTwoDimensionalOptions, ChartOrientation, MdtChartsDataSource } from "../../config/config";
+import { AxisPosition, NumberDomain, IntervalChart, MdtChartsTwoDimensionalChart, MdtChartsTwoDimensionalOptions, ChartOrientation, MdtChartsDataSource, MdtChartsDataRow } from "../../config/config";
 import { CanvasModel } from "../modelInstance/canvasModel/canvasModel";
 export declare enum ScaleType {
     Key = 0,
@@ -14,5 +14,6 @@ export declare class ScaleModel {
     static getScaleKeyType(charts: MdtChartsTwoDimensionalChart[]): ScaleKeyType;
     static getScaleValueType(charts: MdtChartsTwoDimensionalChart[] | IntervalChart[]): ScaleValueType;
     static getElementsAmount(barCharts: MdtChartsTwoDimensionalChart[]): number;
-    static getScaleMaxValue(charts: MdtChartsTwoDimensionalChart[], dataSource: string, data: MdtChartsDataSource): number;
+    static getScaleMaxValue(charts: MdtChartsTwoDimensionalChart[], dataRows: MdtChartsDataRow[]): number;
+    static getScaleMinValue(charts: MdtChartsTwoDimensionalChart[], dataRows: MdtChartsDataRow[]): number;
 }

package/lib/model/featuresModel/scaleModel.js

@@ -47,11 +47,11 @@ export class ScaleModel {
         let domainPeekMin;
         let domainPeekMax;
         if (configDomain.start === -1)
-            domainPeekMin = 0;
+            domainPeekMin = this.getScaleMinValue(configOptions.charts, data[configOptions.data.dataSource]);
         else
             domainPeekMin = configDomain.start;
         if (configDomain.end === -1)
-            domainPeekMax = this.getScaleMaxValue(configOptions.charts, configOptions.data.dataSource, data);
+            domainPeekMax = this.getScaleMaxValue(configOptions.charts, data[configOptions.data.dataSource]);
         else
             domainPeekMax = configDomain.end;
         if (configOptions.axis.key.position === 'start')
@@ -80,10 +80,10 @@ export class ScaleModel {
         });
         return barsAmount;
     }
-    static getScaleMaxValue(charts, dataSource, data) {
+    static getScaleMaxValue(charts, dataRows) {
         let max = 0;
         charts.forEach(chart => {
-            data[dataSource].forEach(dataRow => {
+            dataRows.forEach(dataRow => {
                 let sumInRow = 0;
                 chart.data.valueFields.forEach(field => {
                     if (chart.isSegmented)
@@ -97,4 +97,19 @@ export class ScaleModel {
         });
         return max;
     }
+    static getScaleMinValue(charts, dataRows) {
+        let min = 0;
+        charts.forEach(chart => {
+            dataRows.forEach(dataRow => {
+                let sumInRow = 0;
+                chart.data.valueFields.forEach(field => {
+                    if (dataRow[field.name] < sumInRow)
+                        sumInRow = dataRow[field.name];
+                });
+                if (min > sumInRow)
+                    min = sumInRow;
+            });
+        });
+        return min;
+    }
 }

package/lib/model/featuresModel/titleModel.js

@@ -4,7 +4,7 @@ export class TitleModel {
         const pad = titleText ? defaultPads : 0;
         return {
             margin: {
-                bottom: 10,
+                bottom: 5,
                 left: 0,
                 right: 0,
                 top: 0

package/lib/model/marginModel.d.ts

@@ -1,13 +1,12 @@
 import { MdtChartsConfig, MdtChartsDataSource } from "../config/config";
 import { DesignerConfig } from "../designer/designerConfig";
-import { DataScope, LegendBlockModel, Orient, OtherCommonComponents, PolarOptionsModel } from "./model";
+import { DataScope, LegendBlockModel, Orient, OtherCommonComponents } from "./model";
 import { ModelInstance } from "./modelInstance/modelInstance";
 import { CanvasModel } from "./modelInstance/canvasModel/canvasModel";
 export declare const AXIS_HORIZONTAL_LABEL_PADDING = 15;
 export declare const AXIS_VERTICAL_LABEL_PADDING = 10;
 export declare class MarginModel {
     static initMargin(designerConfig: DesignerConfig, config: MdtChartsConfig, otherComponents: OtherCommonComponents, data: MdtChartsDataSource, modelInstance: ModelInstance): void;
-    static recalcPolarMarginWithScopedData(modelInstance: ModelInstance, designerConfig: DesignerConfig, config: MdtChartsConfig, legendBlockModel: LegendBlockModel, dataScope: DataScope, options: PolarOptionsModel): void;
     static recalcMarginByVerticalAxisLabel(modelInstance: ModelInstance, config: MdtChartsConfig, designerConfig: DesignerConfig, dataScope: DataScope): void;
     private static getHorizontalMarginByAxisLabels;
     private static recalcVerticalMarginByAxisLabelHeight;
@@ -15,6 +14,5 @@ export declare class MarginModel {
     private static recalcMarginWithLegend;
     private static getLegendItemsContent;
     static appendToGlobalMarginValuesLegendMargin(canvasModel: CanvasModel, position: Orient, legendBlockModel: LegendBlockModel): void;
-    private static clearMarginByLegendBlockPosition;
     private static recalcMarginByTitle;
 }

package/lib/model/marginModel.js

@@ -3,7 +3,7 @@ import { DataManagerModel } from "./dataManagerModel/dataManagerModel";
 import { LegendModel } from "./featuresModel/legendModel/legendModel";
 import { AxisType } from "./modelBuilder";
 import { TwoDimensionalModel } from "./notations/twoDimensionalModel";
-import { PolarModel } from "./notations/polar/polarModel";
+import { keyAxisLabelHorizontalLog, keyAxisLabelVerticalLog } from "./featuresModel/scaleModel/scaleAxisRecalcer";
 export const AXIS_HORIZONTAL_LABEL_PADDING = 15;
 export const AXIS_VERTICAL_LABEL_PADDING = 10;
 export class MarginModel {
@@ -24,28 +24,15 @@ export class MarginModel {
             this.recalcHorizontalMarginByAxisLabelWidth(labelSize, canvasModel, config.options.orientation, config.options.axis, showingFlag);
         }
     }
-    static recalcPolarMarginWithScopedData(modelInstance, designerConfig, config, legendBlockModel, dataScope, options) {
-        const canvasModel = modelInstance.canvasModel;
-        let position = canvasModel.legendCanvas.getPosition();
-        if (position !== 'off') {
-            position = PolarModel.getLegendPositionByBlockSize(canvasModel); // reset position
-            this.clearMarginByLegendBlockPosition(canvasModel, legendBlockModel);
-            let allowableKeys = [...dataScope.allowableKeys];
-            if (dataScope.hidedRecordsAmount !== 0 && position === 'bottom')
-                allowableKeys.push('1'); // Если есть спрятанные записи, то в массив добавляется объект, чтобы выделить место в легенде для индикатора переполнения
-            const legendSize = LegendModel.getLegendSize(config.options.type, position, allowableKeys, designerConfig.canvas.legendBlock.maxWidth, config.canvas.size, legendBlockModel);
-            canvasModel.increaseMarginSide(position, legendSize + legendBlockModel.coordinate[position].margin[position]);
-            legendBlockModel.coordinate[position].size = legendSize;
-            options.legend.position = position;
-        }
-    }
     static recalcMarginByVerticalAxisLabel(modelInstance, config, designerConfig, dataScope) {
         if ((config.options.type === '2d' || config.options.type === 'interval') && config.options.orientation === 'vertical') {
             const axisLabelSize = AxisModel.getLabelSize(designerConfig.canvas.axisLabel.maxSize.main, dataScope.allowableKeys);
             const axisConfig = AxisModel.getKeyAxisLabelPosition(modelInstance.canvasModel, dataScope.allowableKeys.length, config.options.axis.key);
             const marginOrient = config.options.axis.key.position === 'end' ? 'bottom' : 'top';
-            if (axisConfig === 'rotated')
-                modelInstance.canvasModel.setMarginSide(marginOrient, modelInstance.canvasModel.getMarginSide(marginOrient) + (axisLabelSize.width - axisLabelSize.height));
+            if (axisConfig === 'rotated') {
+                modelInstance.canvasModel.decreaseMarginSide(marginOrient, axisLabelSize.height);
+                modelInstance.canvasModel.increaseMarginSide(marginOrient, axisLabelSize.width, keyAxisLabelVerticalLog);
+            }
         }
     }
     static getHorizontalMarginByAxisLabels(labelsMaxWidth, axis, data, options) {
@@ -64,7 +51,7 @@ export class MarginModel {
         const valueAxisOrient = AxisModel.getAxisOrient(AxisType.Value, orientation, axis.value.position);
         if ((keyAxisOrient === 'bottom' || keyAxisOrient === 'top')) {
             if (axis.key.visibility)
-                canvasModel.increaseMarginSide(keyAxisOrient, labelSize.height + AXIS_HORIZONTAL_LABEL_PADDING);
+                canvasModel.increaseMarginSide(keyAxisOrient, labelSize.height + AXIS_HORIZONTAL_LABEL_PADDING, keyAxisLabelVerticalLog);
         }
         else if (axis.value.visibility)
             canvasModel.increaseMarginSide(valueAxisOrient, labelSize.height + AXIS_HORIZONTAL_LABEL_PADDING);
@@ -73,7 +60,7 @@ export class MarginModel {
         const keyAxisOrient = AxisModel.getAxisOrient(AxisType.Key, orientation, axis.key.position);
         const valueAxisOrient = AxisModel.getAxisOrient(AxisType.Value, orientation, axis.value.position);
         if ((keyAxisOrient === 'left' || keyAxisOrient === 'right') && isShow && axis.key.visibility) {
-            canvasModel.increaseMarginSide(keyAxisOrient, labelSize.width + AXIS_VERTICAL_LABEL_PADDING);
+            canvasModel.increaseMarginSide(keyAxisOrient, labelSize.width + AXIS_VERTICAL_LABEL_PADDING, keyAxisLabelHorizontalLog);
         }
         else if ((valueAxisOrient === 'left' || valueAxisOrient === 'right') && axis.value.visibility) {
             canvasModel.increaseMarginSide(valueAxisOrient, labelSize.width + AXIS_VERTICAL_LABEL_PADDING);
@@ -117,15 +104,6 @@ export class MarginModel {
         else
             canvasModel.increaseMarginSide(position, legendCoordinate[position].margin.top + legendCoordinate[position].margin.bottom);
     }
-    static clearMarginByLegendBlockPosition(canvasModel, legendBlockModel) {
-        const legendCoordinate = legendBlockModel.coordinate;
-        ['left', 'right', 'top', 'bottom'].forEach((position) => {
-            const decreaseByValue = legendCoordinate[position].size === 0
-                ? 0
-                : legendCoordinate[position].size + legendCoordinate[position].margin[position];
-            canvasModel.descreaseMarginSide(position, decreaseByValue);
-        });
-    }
     static recalcMarginByTitle(canvasModel, titleBlockModel) {
         canvasModel.increaseMarginSide("top", titleBlockModel.margin.top + titleBlockModel.size + titleBlockModel.margin.bottom);
     }

package/lib/model/modelBuilder.js

@@ -30,16 +30,16 @@ function getChartBlockModel(modelInstance) {
         margin: modelInstance.canvasModel.getMargin()
     };
 }
-function getOptions(config, designerConfig, modelInstance, dataScope, data) {
+function getOptions(config, designerConfig, modelInstance, data) {
     //TODO: migrate to polymorphism
     if (config.options.type === '2d') {
-        return TwoDimensionalModel.getOptions(config.options, designerConfig, dataScope, data, modelInstance);
+        return TwoDimensionalModel.getOptions(config.options, designerConfig, data, modelInstance);
     }
     else if (config.options.type === 'polar') {
-        return PolarModel.getOptions(config.options, data, designerConfig, modelInstance);
+        return PolarModel.getOptions(config.options, designerConfig, modelInstance);
     }
     else if (config.options.type === 'interval') {
-        return IntervalModel.getOptions(config, designerConfig, modelInstance.canvasModel.getMargin(), dataScope, data, modelInstance);
+        return IntervalModel.getOptions(config, designerConfig, modelInstance.canvasModel.getMargin(), modelInstance.dataModel.getScope(), data, modelInstance);
     }
 }
 function getDataSettings(dataScope, designerConfig) {
@@ -57,7 +57,7 @@ function getTransitions(designerConfig) {
     return designerConfig.transitions;
 }
 export function assembleModel(config, data, designerConfig) {
-    const modelInstance = ModelInstance.create(config);
+    const modelInstance = ModelInstance.create(config, data);
     if (!data || Object.keys(data).length === 0)
         return {
             blockCanvas: getBlockCanvas(config, modelInstance),
@@ -71,15 +71,14 @@ export function assembleModel(config, data, designerConfig) {
     MarginModel.initMargin(designerConfig, config, otherComponents, data, modelInstance);
     DataManagerModel.initDataScope(config, data, designerConfig, otherComponents.legendBlock, modelInstance);
     const preparedData = DataManagerModel.getPreparedData(data, modelInstance.dataModel.getAllowableKeys(), config);
+    modelInstance.dataModel.repository.initScopedFullSource(preparedData);
     if (config.options.type === '2d' && config.options.axis.key.visibility)
         MarginModel.recalcMarginByVerticalAxisLabel(modelInstance, config, designerConfig, modelInstance.dataModel.getScope());
     const blockCanvas = getBlockCanvas(config, modelInstance);
     const chartBlock = getChartBlockModel(modelInstance);
-    const options = getOptions(config, designerConfig, modelInstance, modelInstance.dataModel.getScope(), preparedData);
+    const options = getOptions(config, designerConfig, modelInstance, preparedData);
     const dataSettings = getDataSettings(modelInstance.dataModel.getScope(), designerConfig);
     const transitions = getTransitions(designerConfig);
-    // if (options.type === 'polar')
-    //     MarginModel.recalcPolarMarginWithScopedData(modelInstance, designerConfig, config, otherComponents.legendBlock, modelInstance.dataModel.getScope(), options);
     modelInstance.canvasModel.roundMargin();
     return {
         blockCanvas,

package/lib/model/modelInstance/canvasModel/canvasModel.d.ts

@@ -1,11 +1,13 @@
 import { Size } from "../../../config/config";
 import { BlockMargin } from "../../model";
 import { LegendCanvasModelInstance } from "./legendCanvasModel";
+import { MarginModelService } from "./marginModelService";
 import { TitleCanvasModel } from "./titleCanvas";
-declare type MarginSide = keyof BlockMargin;
+export declare type MarginSide = keyof BlockMargin;
 export declare class CanvasModel {
     titleCanvas: TitleCanvasModel;
     legendCanvas: LegendCanvasModelInstance;
+    marginService: MarginModelService;
     private blockSize;
     private margin;
     constructor();
@@ -13,12 +15,11 @@ export declare class CanvasModel {
     getMargin(): BlockMargin;
     getMarginSide(side: MarginSide): number;
     setMarginSide(side: MarginSide, size: number): void;
-    increaseMarginSide(side: MarginSide, byValue: number): void;
-    descreaseMarginSide(side: MarginSide, byValue: number): void;
+    increaseMarginSide(side: MarginSide, byValue: number, key?: string): void;
+    decreaseMarginSide(side: MarginSide, byValue: number): void;
     roundMargin(): void;
     initBlockSize(blockSize: Size): void;
     getBlockSize(): Size;
     getChartBlockWidth(): number;
     getChartBlockHeight(): number;
 }
-export {};

package/lib/model/modelInstance/canvasModel/canvasModel.js

@@ -1,9 +1,11 @@
 import { LegendCanvasModelInstance } from "./legendCanvasModel";
+import { MarginModelService } from "./marginModelService";
 import { TitleCanvasModel } from "./titleCanvas";
 export class CanvasModel {
     constructor() {
         this.titleCanvas = new TitleCanvasModel();
         this.legendCanvas = new LegendCanvasModelInstance();
+        this.marginService = new MarginModelService();
     }
     initMargin(margin) {
         this.margin = margin;
@@ -17,10 +19,12 @@ export class CanvasModel {
     setMarginSide(side, size) {
         this.margin[side] = size;
     }
-    increaseMarginSide(side, byValue) {
+    increaseMarginSide(side, byValue, key) {
         this.margin[side] += byValue;
+        if (key)
+            this.marginService.appendLog(key, side, byValue);
     }
-    descreaseMarginSide(side, byValue) {
+    decreaseMarginSide(side, byValue) {
         this.margin[side] -= byValue;
     }
     roundMargin() {

package/lib/model/modelInstance/canvasModel/marginModelService.d.ts

@@ -0,0 +1,11 @@
+import { MarginSide } from "./canvasModel";
+export interface MarginLogData {
+    side: MarginSide;
+    byValue: number;
+}
+export declare class MarginModelService {
+    private log;
+    appendLog(key: string, side: MarginSide, byValue: number): void;
+    getDataByKey(key: string): MarginLogData;
+    private findLogByKey;
+}

package/lib/model/modelInstance/canvasModel/marginModelService.js

@@ -0,0 +1,26 @@
+export class MarginModelService {
+    constructor() {
+        this.log = [];
+    }
+    appendLog(key, side, byValue) {
+        const log = this.findLogByKey(key);
+        if (log) {
+            log.data = { side, byValue };
+            return;
+        }
+        this.log.push({
+            key,
+            data: {
+                side,
+                byValue
+            }
+        });
+    }
+    getDataByKey(key) {
+        var _a;
+        return (_a = this.findLogByKey(key)) === null || _a === void 0 ? void 0 : _a.data;
+    }
+    findLogByKey(key) {
+        return this.log.find(l => l.key === key);
+    }
+}

package/lib/model/modelInstance/dataModel/dataModel.d.ts

@@ -0,0 +1,14 @@
+import { DataScope } from "../../model";
+import { DataRepositoryModel } from "./dataRepository";
+export declare const DEFAULT_MAX_RECORDS_AMOUNT = 50;
+export declare class DataModelInstance {
+    repository: DataRepositoryModel;
+    constructor();
+    private maxRecordsAmount;
+    private scope;
+    initMaxRecordsAmount(amount: number): void;
+    getMaxRecordsAmount(): number;
+    initScope(scope: DataScope): void;
+    getScope(): DataScope;
+    getAllowableKeys(): string[];
+}

package/lib/model/modelInstance/dataModel/dataModel.js

@@ -0,0 +1,26 @@
+import { DataRepositoryModel } from "./dataRepository";
+export const DEFAULT_MAX_RECORDS_AMOUNT = 50;
+export class DataModelInstance {
+    constructor() {
+        //TODO: create dataScopeModel. 
+        this.maxRecordsAmount = DEFAULT_MAX_RECORDS_AMOUNT;
+        this.repository = new DataRepositoryModel();
+    }
+    initMaxRecordsAmount(amount) {
+        if (typeof amount === "number" && amount > 0) {
+            this.maxRecordsAmount = amount;
+        }
+    }
+    getMaxRecordsAmount() {
+        return this.maxRecordsAmount;
+    }
+    initScope(scope) {
+        this.scope = scope;
+    }
+    getScope() {
+        return this.scope;
+    }
+    getAllowableKeys() {
+        return this.getScope().allowableKeys;
+    }
+}

package/lib/model/modelInstance/dataModel/dataRepository.d.ts

@@ -0,0 +1,12 @@
+import { MdtChartsDataSource } from "../../../config/config";
+export declare class DataRepositoryModel {
+    private rawFullSource;
+    private scopedFullSource;
+    private sourceName;
+    initSourceName(sourceName: string): void;
+    initRawFullSource(rawSource: MdtChartsDataSource): void;
+    getRawRows(): import("../../../config/config").MdtChartsDataRow[];
+    initScopedFullSource(scopedSource: MdtChartsDataSource): void;
+    getScopedFullSource(): MdtChartsDataSource;
+    getScopedRows(): import("../../../config/config").MdtChartsDataRow[];
+}

package/lib/model/modelInstance/dataModel/dataRepository.js

@@ -0,0 +1,20 @@
+export class DataRepositoryModel {
+    initSourceName(sourceName) {
+        this.sourceName = sourceName;
+    }
+    initRawFullSource(rawSource) {
+        this.rawFullSource = rawSource;
+    }
+    getRawRows() {
+        return this.rawFullSource[this.sourceName];
+    }
+    initScopedFullSource(scopedSource) {
+        this.scopedFullSource = scopedSource;
+    }
+    getScopedFullSource() {
+        return this.scopedFullSource;
+    }
+    getScopedRows() {
+        return this.scopedFullSource[this.sourceName];
+    }
+}

package/lib/model/modelInstance/modelInstance.d.ts

@@ -1,8 +1,8 @@
-import { MdtChartsConfig } from "../../main";
+import { MdtChartsConfig, MdtChartsDataSource } from "../../config/config";
 import { CanvasModel } from "./canvasModel/canvasModel";
-import { DataModelInstance } from "./dataModel";
+import { DataModelInstance } from "./dataModel/dataModel";
 export declare class ModelInstance {
-    static create(config: MdtChartsConfig): ModelInstance;
+    static create(config: MdtChartsConfig, data: MdtChartsDataSource): ModelInstance;
     private static initInitialParams;
     canvasModel: CanvasModel;
     dataModel: DataModelInstance;

package/lib/model/modelInstance/modelInstance.js

@@ -1,17 +1,19 @@
 import { CanvasModel } from "./canvasModel/canvasModel";
-import { DataModelInstance } from "./dataModel";
+import { DataModelInstance } from "./dataModel/dataModel";
 export class ModelInstance {
     constructor() {
         this.canvasModel = new CanvasModel();
         this.dataModel = new DataModelInstance();
     }
-    static create(config) {
+    static create(config, data) {
         const modelInstance = new ModelInstance();
-        this.initInitialParams(modelInstance, config);
+        this.initInitialParams(modelInstance, config, data);
         return modelInstance;
     }
-    static initInitialParams(modelInstance, config) {
+    static initInitialParams(modelInstance, config, data) {
         modelInstance.canvasModel.initBlockSize(config.canvas.size);
         modelInstance.dataModel.initMaxRecordsAmount(config.options.data.maxRecordsAmount);
+        modelInstance.dataModel.repository.initSourceName(config.options.data.dataSource);
+        modelInstance.dataModel.repository.initRawFullSource(data);
     }
 }

package/lib/model/notations/intervalModel.js

@@ -2,7 +2,7 @@ import { AxisModel } from "../featuresModel/axisModel";
 import { ChartStyleModelService } from "../chartStyleModel/chartStyleModel";
 import { DataManagerModel } from "../dataManagerModel/dataManagerModel";
 import { AxisType } from "../modelBuilder";
-import { ScaleModel, ScaleType } from "../featuresModel/scaleModel";
+import { ScaleModel, ScaleType } from "../featuresModel/scaleModel/scaleModel";
 import { TwoDimensionalModel } from "./twoDimensionalModel";
 export class IntervalModel {
     static getOptions(config, designerConfig, margin, dataScope, data, modelInstance) {

package/lib/model/notations/polar/donut/donutAggregatorService.js

@@ -1,7 +1,7 @@
 export const AGGREGATOR_DEFAULT_TITLE = "Сумма";
 export class DonutAggregatorService {
     getContent(aggregatorOptions, dataOptions) {
-        if (!(aggregatorOptions === null || aggregatorOptions === void 0 ? void 0 : aggregatorOptions.content))
+        if (!(aggregatorOptions === null || aggregatorOptions === void 0 ? void 0 : aggregatorOptions.content) || !dataOptions.rows)
             return this.generateDefaultContent(dataOptions);
         const content = aggregatorOptions.content({ data: dataOptions.rows });
         if (this.doesValueExist(content.value) && content.title)
@@ -19,7 +19,7 @@ export class DonutAggregatorService {
     generateDefaultContent(dataOptions) {
         return {
             title: AGGREGATOR_DEFAULT_TITLE,
-            value: dataOptions.rows.reduce((acc, row) => acc + row[dataOptions.valueFieldName], 0)
+            value: dataOptions.rows ? dataOptions.rows.reduce((acc, row) => acc + row[dataOptions.valueFieldName], 0) : 0
         };
     }
 }

package/lib/model/notations/polar/donut/donutModel.d.ts

@@ -4,7 +4,7 @@ import { DonutChartSettings } from "../../../model";
 export declare class DonutModel {
     private thicknessService;
     private aggregatorService;
-    getSettings(settingsFromConfig: DonutOptionsCanvas, chartOptions: PolarChart, dataRows: MdtChartsDataRow[]): DonutChartSettings;
+    getSettings(settingsFromConfig: DonutOptionsCanvas, chartOptions: PolarChart, rawDataRows: MdtChartsDataRow[]): DonutChartSettings;
     private getThicknessOptions;
     private getAggregatorOptions;
 }

package/lib/model/notations/polar/donut/donutModel.js

@@ -5,11 +5,11 @@ export class DonutModel {
         this.thicknessService = new DonutThicknessService();
         this.aggregatorService = new DonutAggregatorService();
     }
-    getSettings(settingsFromConfig, chartOptions, dataRows) {
+    getSettings(settingsFromConfig, chartOptions, rawDataRows) {
         return {
             padAngle: settingsFromConfig.padAngle,
             thickness: this.getThicknessOptions(settingsFromConfig.thickness),
-            aggregator: this.getAggregatorOptions(settingsFromConfig, chartOptions, dataRows)
+            aggregator: this.getAggregatorOptions(settingsFromConfig, chartOptions, rawDataRows)
         };
     }
     getThicknessOptions(settingsFromConfig) {
@@ -20,11 +20,11 @@ export class DonutModel {
             value: this.thicknessService.valueToNumber(settingsFromConfig.value),
         };
     }
-    getAggregatorOptions(settingsFromConfig, chartOptions, dataRows) {
+    getAggregatorOptions(settingsFromConfig, chartOptions, rawDataRows) {
         return {
             margin: settingsFromConfig.aggregatorPad,
             content: this.aggregatorService.getContent(chartOptions.aggregator, {
-                rows: dataRows,
+                rows: rawDataRows,
                 valueFieldName: chartOptions.data.valueField.name
             })
         };

package/lib/model/notations/polar/polarModel.d.ts

@@ -1,13 +1,12 @@
-import { MdtChartsDataSource, MdtChartsPolarOptions } from "../../../config/config";
+import { MdtChartsPolarOptions } from "../../../config/config";
 import { DesignerConfig } from "../../../designer/designerConfig";
 import { PolarOptionsModel, LegendCoordinate } from "../../model";
 import { CanvasModel } from "../../modelInstance/canvasModel/canvasModel";
 import { ModelInstance } from "../../modelInstance/modelInstance";
-/** If donut block has width less than this const, legend change postion from "right" to "bottom" */
 export declare const MIN_DONUT_BLOCK_SIZE = 120;
 export declare class PolarModel {
     private static donutModel;
-    static getOptions(options: MdtChartsPolarOptions, data: MdtChartsDataSource, designerConfig: DesignerConfig, modelInstance: ModelInstance): PolarOptionsModel;
+    static getOptions(options: MdtChartsPolarOptions, designerConfig: DesignerConfig, modelInstance: ModelInstance): PolarOptionsModel;
     static getLegendPositionByBlockSize(canvasModel: CanvasModel): "bottom" | "right";
     static doesChartBlockHasEnoughWidthForContainsLegend(chartBlockWidth: number, legendWidth: number, legendCoordinate: LegendCoordinate): boolean;
     static doesChartBlockHasEnoughHeightForContainsLegend(chartBlockHeight: number, legendCoordinate: LegendCoordinate): boolean;

package/lib/model/notations/polar/polarModel.js

@@ -1,19 +1,17 @@
 import { ChartStyleModelService } from "../../chartStyleModel/chartStyleModel";
 import { DonutModel } from "./donut/donutModel";
-/** If donut block has width less than this const, legend change postion from "right" to "bottom" */
 export const MIN_DONUT_BLOCK_SIZE = 120;
 export class PolarModel {
-    static getOptions(options, data, designerConfig, modelInstance) {
-        const dataRows = data[options.data.dataSource];
+    static getOptions(options, designerConfig, modelInstance) {
         return {
             type: options.type,
             selectable: !!options.selectable,
             title: options.title,
             data: Object.assign({}, options.data),
-            charts: this.getChartsModel(options.chart, dataRows.length, designerConfig.chartStyle),
+            charts: this.getChartsModel(options.chart, modelInstance.dataModel.repository.getScopedRows().length, designerConfig.chartStyle),
             legend: modelInstance.canvasModel.legendCanvas.getModel(),
             tooltip: options.tooltip,
-            chartCanvas: this.getDonutSettings(designerConfig.canvas.chartOptions.donut, options.chart, dataRows)
+            chartCanvas: this.getDonutSettings(designerConfig.canvas.chartOptions.donut, options.chart, modelInstance.dataModel.repository.getRawRows())
         };
     }
     //TODO: type for returned value

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

@@ -1,9 +1,9 @@
 import { ChartOrientation, MdtChartsDataSource, MdtChartsTwoDimensionalChart, MdtChartsTwoDimensionalOptions } from "../../config/config";
 import { BarOptionsCanvas, DesignerConfig } from "../../designer/designerConfig";
-import { DataScope, TwoDimensionalOptionsModel, TwoDimChartElementsSettings } from "../model";
+import { TwoDimensionalOptionsModel, TwoDimChartElementsSettings } from "../model";
 import { ModelInstance } from "../modelInstance/modelInstance";
 export declare class TwoDimensionalModel {
-    static getOptions(options: MdtChartsTwoDimensionalOptions, designerConfig: DesignerConfig, dataScope: DataScope, data: MdtChartsDataSource, modelInstance: ModelInstance): TwoDimensionalOptionsModel;
+    static getOptions(options: MdtChartsTwoDimensionalOptions, designerConfig: DesignerConfig, data: MdtChartsDataSource, modelInstance: ModelInstance): TwoDimensionalOptionsModel;
     static getChartsEmbeddedLabelsFlag(charts: MdtChartsTwoDimensionalChart[], chartOrientation: ChartOrientation): boolean;
     /**
      * Сортирует список чартов в порядке: area - bar - line.

package/lib/model/notations/twoDimensionalModel.js

@@ -1,21 +1,25 @@
 import { ChartStyleModelService } from "../chartStyleModel/chartStyleModel";
 import { TwoDimensionalChartStyleModel } from "../chartStyleModel/TwoDimensionalChartStyleModel";
 import { AxisModel } from "../featuresModel/axisModel";
-import { ScaleModel } from "../featuresModel/scaleModel";
+import { ScaleAxisRecalcer } from "../featuresModel/scaleModel/scaleAxisRecalcer";
+import { ScaleModel } from "../featuresModel/scaleModel/scaleModel";
 export class TwoDimensionalModel {
-    static getOptions(options, designerConfig, dataScope, data, modelInstance) {
+    static getOptions(options, designerConfig, data, modelInstance) {
         const canvasModel = modelInstance.canvasModel;
+        const scaleMarginRecalcer = new ScaleAxisRecalcer(() => ScaleModel.getScaleLinear(options, data, canvasModel));
+        scaleMarginRecalcer.recalculateMargin(canvasModel, options.orientation, options.axis.key);
+        const scaleValueInfo = scaleMarginRecalcer.getScaleValue();
         return {
             legend: canvasModel.legendCanvas.getModel(),
             title: options.title,
             selectable: !!options.selectable,
             orient: options.orientation,
             scale: {
-                key: ScaleModel.getScaleKey(dataScope.allowableKeys, options.orientation, canvasModel, options.charts, this.getChartsByType(options.charts, 'bar')),
-                value: ScaleModel.getScaleLinear(options, data, canvasModel)
+                key: ScaleModel.getScaleKey(modelInstance.dataModel.getAllowableKeys(), options.orientation, canvasModel, options.charts, this.getChartsByType(options.charts, 'bar')),
+                value: scaleValueInfo.scale
             },
             axis: {
-                key: AxisModel.getKeyAxis(options, data, designerConfig.canvas.axisLabel, canvasModel, designerConfig.elementsOptions.tooltip),
+                key: AxisModel.getKeyAxis(options, data, designerConfig.canvas.axisLabel, canvasModel, designerConfig.elementsOptions.tooltip, () => scaleValueInfo.scaleFn(0)),
                 value: AxisModel.getValueAxis(options.orientation, options.axis.value, designerConfig.canvas.axisLabel, canvasModel)
             },
             type: options.type,

package/lib/style/charts-main.css

@@ -58,6 +58,7 @@
 .legend-item {
     cursor: default;
     transition: opacity 0.1s;
+    line-height: 1;
     /* will-change: opacity;      */
 }
 .legend-block-column .legend-item:not(:first-of-type) {

package/lib/style/charts-main.less

@@ -58,6 +58,7 @@
 .legend-item {
     cursor: default;
     transition: opacity 0.1s;
+    line-height: 1;
     /* will-change: opacity;      */
 }
 .legend-block-column .legend-item:not(:first-of-type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdt-charts",
-  "version": "1.12.3",
+  "version": "1.12.7",
   "description": "",
   "main": "lib/main.js",
   "scripts": {