diff --git a/package-lock.json b/package-lock.json index 626b5f5..2c2cd97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "gp-smart-echart-widget", - "version": "1.1.0", + "version": "1.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -6020,6 +6020,22 @@ "safer-buffer": "^2.1.0" } }, + "echarts": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.1.tgz", + "integrity": "sha512-nWdlbgX3OVY0hpqncSvp0gDt1FRSKWn7lsWEH+PHmfCuvE0QmSw17pczQvm8AvawnLEkmf1Cts7YwQJZNC0AEQ==", + "requires": { + "tslib": "2.3.0", + "zrender": "5.3.1" + }, + "dependencies": { + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + } + } + }, "echarts-simple-transform": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/echarts-simple-transform/-/echarts-simple-transform-1.0.0.tgz", @@ -6035,22 +6051,6 @@ } } }, - "echarts522": { - "version": "npm:echarts@5.3.1", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.1.tgz", - "integrity": "sha512-nWdlbgX3OVY0hpqncSvp0gDt1FRSKWn7lsWEH+PHmfCuvE0QmSw17pczQvm8AvawnLEkmf1Cts7YwQJZNC0AEQ==", - "requires": { - "tslib": "2.3.0", - "zrender": "5.3.1" - }, - "dependencies": { - "tslib": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", - "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" - } - } - }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", diff --git a/package.json b/package.json index c3c7c34..5954a60 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gp-smart-echart-widget", - "version": "1.1.0", + "version": "1.2.0", "description": "This is an Angular 11 widget, which is designed to display the chart based on the REST data or Datahub.", "author": "Neeru Arora - Software AG, Global Presales", "license": "Apache 2.0", @@ -35,7 +35,7 @@ "@juggle/resize-observer": "^3.3.1", "angular-resize-event": "^2.1.0", "echarts-simple-transform": "^1.0.0", - "echarts522": "npm:echarts@^5.2.2", + "echarts": "^5.2.2", "ngx-bootstrap": "6.2.0", "ngx-echarts": "^7.1.0", "rxjs": "~6.6.3", diff --git a/projects/gp-smart-echart-widget/package.json b/projects/gp-smart-echart-widget/package.json index 572331b..4b918c5 100644 --- a/projects/gp-smart-echart-widget/package.json +++ b/projects/gp-smart-echart-widget/package.json @@ -1,6 +1,6 @@ { "name": "gp-smart-echart-widget", - "version": "1.1.0", + "version": "1.2.0", "description": "This is an Angular 11 widget, which is designed to display the chart based on the REST data or Datahub.", "author": "Neeru Arora - Software AG, Global Presales", "license": "Apache 2.0", diff --git a/projects/gp-smart-echart-widget/src/lib/gp-smart-echart-widget.component.ts b/projects/gp-smart-echart-widget/src/lib/gp-smart-echart-widget.component.ts index 178f55e..fd5fd66 100644 --- a/projects/gp-smart-echart-widget/src/lib/gp-smart-echart-widget.component.ts +++ b/projects/gp-smart-echart-widget/src/lib/gp-smart-echart-widget.component.ts @@ -16,8 +16,8 @@ * limitations under the License. */ import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import * as echarts from 'echarts522'; -import { EChartsOption } from 'echarts522'; +import * as echarts from 'echarts'; +import { EChartsOption } from 'echarts'; import { ChartConfig } from './model/config.modal'; import { GpSmartEchartWidgetService } from './gp-smart-echart-widget.service'; import { isDevMode } from '@angular/core'; @@ -236,7 +236,6 @@ export class GpSmartEchartWidgetComponent implements OnInit, OnDestroy { } } if (isDevMode()) { console.log('Pie Chart For API', this.chartOption); } - console.log('Pie Chart For API', this.chartOption); } // End of piechart for API else if (userInput.type === 'polar') { @@ -556,7 +555,6 @@ export class GpSmartEchartWidgetComponent implements OnInit, OnDestroy { } }; if (isDevMode()) { console.log('Simple bar or line chart for API', this.chartOption); } - console.log('Simple bar or line chart for API', this.chartOption); } // End of Simple Line,Simple Bar,Stacked Line And Stacked Bar for API else if (userInput.type === 'bar' && (userInput.layout === 'simpleHorizontalBar' || userInput.layout === 'stackedHorizontalBar')) { @@ -1190,7 +1188,6 @@ export class GpSmartEchartWidgetComponent implements OnInit, OnDestroy { series: encodeData }; if (isDevMode()) { console.log('Aggregate Bar or Line chart', this.chartOption); } - console.log('Aggregate Bar or Line chart', this.chartOption); } // End of Bar,Line Chart with Aggregation for datahub and API else if (userInput.type === 'scatter') { if (this.isDatahubPostCall) { @@ -1364,7 +1361,6 @@ export class GpSmartEchartWidgetComponent implements OnInit, OnDestroy { series: encodeData }; if (isDevMode()) { console.log('Aggregate Pie chart', this.chartOption); } - console.log('Aggregate Pie chart', this.chartOption); } // End of Pie Chart with Aggregation for datahub and API else if (userInput.type === 'polar') { let yDimensions; let xDimensions; diff --git a/projects/gp-smart-echart-widget/src/lib/gp-smart-echart-widget.module.ts b/projects/gp-smart-echart-widget/src/lib/gp-smart-echart-widget.module.ts index e7f2e0d..9935bf1 100644 --- a/projects/gp-smart-echart-widget/src/lib/gp-smart-echart-widget.module.ts +++ b/projects/gp-smart-echart-widget/src/lib/gp-smart-echart-widget.module.ts @@ -22,7 +22,7 @@ import * as preview from './preview-image'; import { NgxEchartsModule } from 'ngx-echarts'; import { SmartChartConfigComponent } from './smart-chart-config/smart-chart-config.component'; import { GpSmartEchartWidgetService } from './gp-smart-echart-widget.service'; -import * as echarts from 'echarts522'; +import * as echarts from 'echarts'; import { AngularResizedEventModule } from 'angular-resize-event'; diff --git a/runtime/cumulocity.json b/runtime/cumulocity.json index f5e9235..d0e71dc 100644 --- a/runtime/cumulocity.json +++ b/runtime/cumulocity.json @@ -9,7 +9,7 @@ "manifest": { "noAppSwitcher": true, "requiredPlatformVersion": ">=1011.0.0", - "version":"1.1.0", + "version":"1.2.0", "author":"Software AG, Global Presales", "description": "This is an Angular 11 widget, which is designed to display the chart based on the REST data or Datahub.", "license": "Apache 2.0" diff --git a/runtime/package.json b/runtime/package.json index 9ad61a1..6cd055d 100644 --- a/runtime/package.json +++ b/runtime/package.json @@ -4,7 +4,7 @@ "dist\\bundle-src\\custom-widget.js": "smart-echart-runtime-widget-CustomWidget", "dist/bundle-src/custom-widget.js": "smart-echart-runtime-widget-CustomWidget" }, - "version": "1.1.0", + "version": "1.2.0", "description": "Runtime package.json for library widget (written by Software AG Global Presales)", "author": "Darpankumar Lalani - Software AG, Global Presales", "license": "Apache 2.0"