@eclipse-scout/chart 25.1.14 → 25.2.0-beta.0

package/dist/file-list

@@ -1,15 +1,15 @@
 cyclonedx/bom.json
 cyclonedx/bom.xml
-eclipse-scout-chart-ed9a921fecef1983eec1.min.js
-eclipse-scout-chart-ed9a921fecef1983eec1.min.js.map
+eclipse-scout-chart-be2b168cca15cd40d8b5.min.js
+eclipse-scout-chart-be2b168cca15cd40d8b5.min.js.map
 eclipse-scout-chart-theme-03e8dfdce2c2cd602f40.min.css
 eclipse-scout-chart-theme-dark-378a537154001198a741.min.css
 eclipse-scout-chart-theme-dark.css
 eclipse-scout-chart-theme-dark.css.map
 eclipse-scout-chart-theme.css
 eclipse-scout-chart-theme.css.map
-eclipse-scout-chart.esm-d01856792fe1a3c69851.min.js
-eclipse-scout-chart.esm-d01856792fe1a3c69851.min.js.map
+eclipse-scout-chart.esm-01320c901d73a0e772c5.min.js
+eclipse-scout-chart.esm-01320c901d73a0e772c5.min.js.map
 eclipse-scout-chart.esm.js
 eclipse-scout-chart.esm.js.map
 eclipse-scout-chart.js

package/dist/texts.json

@@ -35,6 +35,23 @@
     "ui.groupedByYear": "groupé par an",
     "ui.line": "Ligne"
   },
+  "it": {
+    "ui.Bio": "Bio",
+    "ui.Brd": "Brd",
+    "ui.Chart": "Diagramma",
+    "ui.Mio": "Mio",
+    "ui.Mrd": "Mrd",
+    "ui.TooMuchData": "Troppi dati",
+    "ui.Trd": "Trd",
+    "ui.Tri": "Tri",
+    "ui.Value": "Valore",
+    "ui.bar": "barra",
+    "ui.groupedByDate": "raggruppato per data",
+    "ui.groupedByMonth": "raggruppato per mese",
+    "ui.groupedByWeekday": "raggruppato per giorno della settimana",
+    "ui.groupedByYear": "raggruppato per anno",
+    "ui.line": "Linea"
+  },
   "de": {
     "ui.Bio": "Bio.",
     "ui.Brd": "Brd.",
@@ -53,22 +70,5 @@
     "ui.groupedByWeekday": "gruppiert nach Wochentag",
     "ui.groupedByYear": "gruppiert nach Jahr",
     "ui.line": "Linie"
-  },
-  "it": {
-    "ui.Bio": "Bio",
-    "ui.Brd": "Brd",
-    "ui.Chart": "Diagramma",
-    "ui.Mio": "Mio",
-    "ui.Mrd": "Mrd",
-    "ui.TooMuchData": "Troppi dati",
-    "ui.Trd": "Trd",
-    "ui.Tri": "Tri",
-    "ui.Value": "Valore",
-    "ui.bar": "barra",
-    "ui.groupedByDate": "raggruppato per data",
-    "ui.groupedByMonth": "raggruppato per mese",
-    "ui.groupedByWeekday": "raggruppato per giorno della settimana",
-    "ui.groupedByYear": "raggruppato per anno",
-    "ui.line": "Linea"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-scout/chart",
-  "version": "25.1.14",
+  "version": "25.2.0-beta.0",
   "description": "Eclipse Scout chart",
   "author": "BSI Business Systems Integration AG",
   "homepage": "https://eclipse.dev/scout/",
@@ -34,7 +34,7 @@
     "src"
   ],
   "devDependencies": {
-    "@eclipse-scout/cli": "25.1.14",
+    "@eclipse-scout/cli": "25.2.0-beta.0",
     "@eclipse-scout/releng": "^25.1.0",
     "jasmine-core": "5.5.0",
     "jasmine-jquery": "2.1.1",
@@ -44,7 +44,7 @@
     "@types/jasmine-jquery": "1.5.37"
   },
   "dependencies": {
-    "@eclipse-scout/core": "25.1.14",
+    "@eclipse-scout/core": "25.2.0-beta.0",
     "jquery": "3.7.1",
     "chart.js": "4.4.6",
     "chartjs-plugin-datalabels": "2.2.0"

package/src/bookmark/ChartTableControlConfigHelperImpl.ts

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2025 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import {ChartTableControlConfigHelper, Page, scout, TableMatrixDateGroup, TableMatrixNumberGroup} from '@eclipse-scout/core';
+import {ChartTableControl, ChartTableControlConfigDo, TableControlChartType} from '../index';
+
+export class ChartTableControlConfigHelperImpl extends ChartTableControlConfigHelper {
+
+  protected override async _exportConfig(page: Page): Promise<ChartTableControlConfigDo> {
+    if (!page?.detailTable) {
+      return null;
+    }
+    let chartTableControl = page.detailTable.findTableControl(ChartTableControl);
+    if (chartTableControl && chartTableControl.selected) {
+      return scout.create(ChartTableControlConfigDo, {
+        chartTypeId: chartTableControl.chartType,
+        chartGroup1ColumnId: chartTableControl.chartGroup1?.id,
+        chartGroup1Modifier: chartTableControl.chartGroup1?.modifier,
+        chartGroup2ColumnId: chartTableControl.chartGroup2?.id,
+        chartGroup2Modifier: chartTableControl.chartGroup2?.modifier,
+        chartAggregationColumnId: chartTableControl.chartAggregation?.id,
+        chartAggregationModifier: chartTableControl.chartAggregation?.modifier
+      });
+    }
+    return null;
+  }
+
+  protected override async _importConfig(page: Page, config: ChartTableControlConfigDo): Promise<void> {
+    if (!page?.detailTable || !config) {
+      return;
+    }
+    let chartTableControl = page.detailTable.findTableControl(ChartTableControl);
+    if (chartTableControl) {
+      chartTableControl.setSelected(true); // necessary, because otherwise internal data structures might not be properly initialized
+      chartTableControl.setChartType(config.chartTypeId as TableControlChartType);
+      chartTableControl.setChartGroup1({id: config.chartGroup1ColumnId, modifier: config.chartGroup1Modifier as TableMatrixNumberGroup | TableMatrixDateGroup});
+      chartTableControl.setChartGroup2({id: config.chartGroup2ColumnId, modifier: config.chartGroup2Modifier as TableMatrixNumberGroup | TableMatrixDateGroup});
+      chartTableControl.setChartAggregation({id: config.chartAggregationColumnId, modifier: config.chartAggregationModifier as TableMatrixNumberGroup});
+    }
+  }
+}

package/src/chart/AbstractSvgChartRenderer.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
+ * Copyright (c) 2010, 2025 BSI Business Systems Integration AG
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-import {aria, ObjectFactory, strings, styles} from '@eclipse-scout/core';
+import {aria, ObjectIdProvider, strings, styles} from '@eclipse-scout/core';
 import $ from 'jquery';
 import {AbstractChartRenderer, Chart} from '../index';
 import {ClickObject} from './Chart';
@@ -29,8 +29,8 @@ export class AbstractSvgChartRenderer extends AbstractChartRenderer {
     super(chart);
     this.chartBox = null;
 
-    this.clipId = 'Clip-' + ObjectFactory.get().createUniqueId();
-    this.maskId = 'Mask-' + ObjectFactory.get().createUniqueId();
+    this.clipId = 'Clip-' + ObjectIdProvider.get().createUiSeqId();
+    this.maskId = 'Mask-' + ObjectIdProvider.get().createUiSeqId();
 
     this.suppressLegendBox = false;
   }
@@ -253,7 +253,7 @@ export class AbstractSvgChartRenderer extends AbstractChartRenderer {
     $mask[0].id = this.maskId;
 
     this.chart.$container.find('.' + cssClass).each(function(i) {
-      this.id = 'ClipMask-' + ObjectFactory.get().createUniqueId();
+      this.id = 'ClipMask-' + ObjectIdProvider.get().createUiSeqId();
       $clip.appendSVG('use').attrXLINK('href', '#' + this.id);
       $mask.appendSVG('use').attrXLINK('href', '#' + this.id);
     });

package/src/chart/Chart.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024 BSI Business Systems Integration AG
+ * Copyright (c) 2010, 2025 BSI Business Systems Integration AG
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 import {AbstractChartRenderer, ChartEventMap, ChartJsRenderer, ChartLayout, ChartModel, FulfillmentChartRenderer, SalesfunnelChartRenderer, SpeedoChartRenderer, VennChartRenderer} from '../index';
-import {aria, arrays, ColorScheme, colorSchemes, EnumObject, HtmlComponent, InitModelOf, objects, Widget} from '@eclipse-scout/core';
+import {aria, arrays, ColorScheme, colorSchemes, DeepPartial, EnumObject, HtmlComponent, InitModelOf, objects, Widget} from '@eclipse-scout/core';
 import {GreenAreaPosition} from './SpeedoChartRenderer';
 import {CategoryScaleOptions, ChartConfiguration, ChartOptions, LinearScaleOptions, LogarithmicScaleOptions, RadialLinearScaleOptions, ScaleType, TimeScaleOptions as ChartJsTimeScaleOptions} from 'chart.js';
 import $ from 'jquery';
@@ -532,7 +532,3 @@ export type UpdateChartOptions = {
   onlyRefresh?: boolean;
   enforceRerender?: boolean;
 };
-
-type DeepPartial<T> = T extends object ? {
-  [P in keyof T]?: DeepPartial<T[P]>;
-} : T;

package/src/index.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
+ * Copyright (c) 2010, 2025 BSI Business Systems Integration AG
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,8 @@
 import {ObjectFactory} from '@eclipse-scout/core';
 import * as self from './index';
 
+export * from './objectFactories';
+export * from './bookmark/ChartTableControlConfigHelperImpl';
 export * from './chart/Chart';
 export * from './chart/ChartAdapter';
 export * from './chart/ChartEventMap';
@@ -33,12 +35,13 @@ export * from './tile/ChartFieldTile';
 export * from './tile/ChartFieldTileAdapter';
 export * from './tile/ChartFieldTileModel';
 export * from './table/controls/ChartTableControl';
+export * from './table/controls/ChartTableControlAdapter';
+export * from './table/controls/ChartTableControlConfigDo';
 export * from './table/controls/ChartTableControlEventMap';
+export * from './table/controls/ChartTableControlLayout';
 export * from './table/controls/ChartTableControlModel';
 export * from './table/controls/ChartTableUserFilter';
 export * from './table/controls/ChartTableUserFilterModel';
-export * from './table/controls/ChartTableControlAdapter';
-export * from './table/controls/ChartTableControlLayout';
 
 export default self;
 

package/src/objectFactories.ts

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2010, 2025 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import {scout} from '@eclipse-scout/core';
+import {ChartTableControlConfigHelperImpl} from './index';
+
+scout.addObjectFactories({
+  'ChartTableControlConfigHelper': () => new ChartTableControlConfigHelperImpl()
+});

package/src/table/controls/ChartTableControl.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024 BSI Business Systems Integration AG
+ * Copyright (c) 2010, 2025 BSI Business Systems Integration AG
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -323,6 +323,10 @@ export class ChartTableControl extends TableControl implements ChartTableControl
     }
   }
 
+  setChartAggregation(chartAggregation: TableControlChartAggregation) {
+    this.setProperty('chartAggregation', chartAggregation);
+  }
+
   protected _setChartAggregation(chartAggregation: TableControlChartAggregation) {
     if (chartAggregation === this.chartAggregation) {
       return;
@@ -333,10 +337,18 @@ export class ChartTableControl extends TableControl implements ChartTableControl
     }
   }
 
+  setChartGroup1(chartGroup: TableControlChartGroup) {
+    this.setProperty('chartGroup1', chartGroup);
+  }
+
   protected _setChartGroup1(chartGroup: TableControlChartGroup) {
     this._setChartGroup(1, chartGroup);
   }
 
+  setChartGroup2(chartGroup: TableControlChartGroup) {
+    this.setProperty('chartGroup2', chartGroup);
+  }
+
   protected _setChartGroup2(chartGroup: TableControlChartGroup) {
     this._setChartGroup(2, chartGroup);
   }

package/src/table/controls/ChartTableControlConfigDo.ts

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2010, 2025 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import {BaseDoEntity, IChartTableControlConfigDo, typeName} from '@eclipse-scout/core';
+
+@typeName('scout.ChartTableControlConfig')
+export class ChartTableControlConfigDo extends BaseDoEntity implements IChartTableControlConfigDo {
+  chartTypeId?: string;
+  chartGroup1ColumnId?: string;
+  chartGroup1Modifier?: number;
+  chartGroup2ColumnId?: string;
+  chartGroup2Modifier?: number;
+  chartAggregationColumnId?: string;
+  chartAggregationModifier?: number;
+}