mdt-charts 1.12.19 → 1.12.20

package/lib/config/config.d.ts

@@ -39,10 +39,11 @@ export interface NewSize {
     height?: number;
 }
 interface BasicOptions {
-    data: DataOptions;
     tooltip?: TooltipOptions;
+    data: MdtChartsBasicDataOptions;
 }
 interface GraphicNotationOptions extends BasicOptions {
+    data: DataOptions;
     legend: Legend;
     title?: string;
     selectable: boolean;
@@ -76,6 +77,9 @@ export interface MdtChartsCardsOptions extends BasicOptions {
 export interface Legend {
     show: boolean;
 }
+export interface MdtChartsBasicDataOptions {
+    dataSource: string;
+}
 export interface DataOptions {
     dataSource: string;
     keyField: MdtChartsField;

package/lib/model/dataManagerModel/dataManagerModel.js

@@ -7,12 +7,12 @@ import { LegendPolarMarginCalculator } from "../featuresModel/legendModel/polarM
 import { CardsDataManagerModel } from "./notations/cardsDataManagerModel";
 export class DataManagerModel {
     static getPreparedData(data, allowableKeys, config) {
-        const scopedData = this.getScopedData(data, allowableKeys, config);
+        const scopedData = config.options.type !== "card" ? this.getScopedData(data, allowableKeys, config.options.data) : data;
         this.setDataType(scopedData, config);
         return scopedData;
     }
     static initDataScope(config, data, designerConfig, legendBlock, modelInstance) {
-        if (config.options.type === '2d' || config.options.type === 'interval') {
+        if (config.options.type === '2d') {
             this.initDataScopeFor2D(config.options, modelInstance, data, designerConfig);
         }
         else if (config.options.type === 'polar') {
@@ -20,7 +20,7 @@ export class DataManagerModel {
         }
         else if (config.options.type === "card") {
             const manager = new CardsDataManagerModel();
-            manager.initDataScope(modelInstance, data, config.options);
+            manager.initDataScope(modelInstance);
         }
         this.initScopedData(data, modelInstance, config);
     }
@@ -33,13 +33,12 @@ export class DataManagerModel {
     }
     static initDataScopeFor2D(configOptions, modelInstance, data, designerConfig) {
         // Для interval всегда один элемент, так как там может быть только один столбик
+        modelInstance.dataModel.initMaxRecordsAmount(configOptions.data.maxRecordsAmount);
         let itemsLength = 1;
-        if (configOptions.type === '2d') {
-            itemsLength = (configOptions.charts)
-                .filter((chart) => chart.type === 'bar').length;
-            if (itemsLength === 0)
-                itemsLength = 1; // Если баров нет, то для одной записи выделяется столько же места, сколько для одного столбика
-        }
+        itemsLength = (configOptions.charts)
+            .filter((chart) => chart.type === 'bar').length;
+        if (itemsLength === 0)
+            itemsLength = 1; // Если баров нет, то для одной записи выделяется столько же места, сколько для одного столбика
         if (itemsLength !== 0) {
             const axisLength = AxisModel.getAxisLength(configOptions.orientation, modelInstance.canvasModel);
             const uniqueKeys = ModelHelper.getUniqueValues(data[configOptions.data.dataSource].map(d => d[configOptions.data.keyField.name]));
@@ -55,6 +54,7 @@ export class DataManagerModel {
         }
     }
     static initDataScopeForPolar(configOptions, modelInstance, data, legendBlock, legendCanvas) {
+        modelInstance.dataModel.initMaxRecordsAmount(configOptions.data.maxRecordsAmount);
         const canvasModel = modelInstance.canvasModel;
         const keyFieldName = configOptions.data.keyField.name;
         const keys = data[configOptions.data.dataSource].map(dataRow => dataRow[keyFieldName]);
@@ -116,9 +116,9 @@ export class DataManagerModel {
         });
         return barsAmount;
     }
-    static getScopedData(data, allowableKeys, config) {
+    static getScopedData(data, allowableKeys, dataOptions) {
         const newData = {};
-        newData[config.options.data.dataSource] = this.getScopedChartData(data[config.options.data.dataSource], allowableKeys, config.options.data.keyField.name);
+        newData[dataOptions.dataSource] = this.getScopedChartData(data[dataOptions.dataSource], allowableKeys, dataOptions.keyField.name);
         return newData;
     }
     static getScopedChartData(data, allowableKeys, keyFieldName) {

package/lib/model/dataManagerModel/notations/cardsDataManagerModel.d.ts

@@ -1,5 +1,4 @@
-import { MdtChartsCardsOptions, MdtChartsDataSource } from "../../../config/config";
 import { ModelInstance } from "../../modelInstance/modelInstance";
 export declare class CardsDataManagerModel {
-    initDataScope(modelInstance: ModelInstance, data: MdtChartsDataSource, configOptions: MdtChartsCardsOptions): void;
+    initDataScope(modelInstance: ModelInstance): void;
 }

package/lib/model/dataManagerModel/notations/cardsDataManagerModel.js

@@ -1,9 +1,7 @@
-import { DataManagerModel } from "../dataManagerModel";
 export class CardsDataManagerModel {
-    initDataScope(modelInstance, data, configOptions) {
-        const firstKey = DataManagerModel.getDataValuesByKeyField(data, configOptions.data.dataSource, configOptions.data.keyField.name)[0];
+    initDataScope(modelInstance) {
         modelInstance.dataModel.initScope({
-            allowableKeys: [firstKey],
+            allowableKeys: [],
             hidedRecordsAmount: 0
         });
     }

package/lib/model/model.d.ts

@@ -33,11 +33,11 @@ export interface BlockMargin {
     right: number;
 }
 interface BasicOptionsModel {
-    data: OptionsModelData;
     tooltip: TooltipOptions;
 }
 interface GraphicNotationOptionsModel extends BasicOptionsModel {
     legend: ILegendModel;
+    data: OptionsModelData;
     title: string;
     selectable: boolean;
 }
@@ -66,6 +66,7 @@ export interface IntervalOptionsModel extends GraphicNotationOptionsModel {
 }
 export interface CardsOptionsModel extends BasicOptionsModel {
     type: "card";
+    data: BasicOptionsModelData;
     title: string;
     description?: string;
     icon?: MdtChartsIconElement;
@@ -75,8 +76,10 @@ export interface CardsOptionsModel extends BasicOptionsModel {
 export interface ILegendModel {
     position: LegendPosition;
 }
-export interface OptionsModelData {
+export interface BasicOptionsModelData {
     dataSource: string;
+}
+export interface OptionsModelData extends BasicOptionsModelData {
     keyField: Field;
 }
 export interface Field {

package/lib/model/modelBuilder.js

@@ -70,7 +70,7 @@ export function assembleModel(config, data, designerConfig) {
             options: null,
             dataSettings: null
         };
-    resetFalsyValues(data, config.options.data.keyField.name);
+    resetFalsyValues(data);
     const otherComponents = OtherComponentsModel.getOtherComponentsModel({ elementsOptions: designerConfig.elementsOptions, title: config.options.title }, modelInstance);
     const marginModel = new MarginModel();
     marginModel.initMargin(designerConfig, config, otherComponents, data, modelInstance);
@@ -92,14 +92,11 @@ export function assembleModel(config, data, designerConfig) {
         transitions
     };
 }
-function resetFalsyValues(data, keyFieldName) {
+function resetFalsyValues(data) {
     for (let setName in data) {
         data[setName].forEach(dataRow => {
             for (let fieldName in dataRow) {
-                if (fieldName === keyFieldName && !dataRow[fieldName]) {
-                    dataRow[fieldName] = '';
-                }
-                else if (dataRow[fieldName] !== 0 && !dataRow[fieldName]) {
+                if (dataRow[fieldName] == null) {
                     dataRow[fieldName] = 0;
                 }
             }
@@ -107,7 +104,7 @@ function resetFalsyValues(data, keyFieldName) {
     }
 }
 export function getPreparedData(model, data, config) {
-    resetFalsyValues(data, config.options.data.keyField.name);
+    resetFalsyValues(data);
     const isModelOrDataEmpty = !model || Object.keys(model).length === 0 || !data || Object.keys(data).length === 0;
     if (isModelOrDataEmpty)
         return null;

package/lib/model/modelInstance/modelInstance.js

@@ -12,7 +12,6 @@ export class ModelInstance {
     }
     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/package.json

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