@eclipse-scout/chart 23.1.19 → 23.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/d.ts/chart/AbstractChartRenderer.d.ts.map +1 -1
- package/dist/d.ts/chart/Chart.d.ts +1 -1
- package/dist/d.ts/chart/Chart.d.ts.map +1 -1
- package/dist/d.ts/chart/ChartJsRenderer.d.ts +8 -8
- package/dist/d.ts/chart/ChartJsRenderer.d.ts.map +1 -1
- package/dist/d.ts/chart/VennChartRenderer.d.ts.map +1 -1
- package/dist/d.ts/table/controls/ChartTableControl.d.ts +1 -0
- package/dist/d.ts/table/controls/ChartTableControl.d.ts.map +1 -1
- package/dist/eclipse-scout-chart-7bef43c691398f0f5930.min.js +3 -0
- package/dist/eclipse-scout-chart-7bef43c691398f0f5930.min.js.map +1 -0
- package/dist/eclipse-scout-chart-theme-dark.css +1 -1
- package/dist/eclipse-scout-chart-theme-dark.css.map +1 -1
- package/dist/eclipse-scout-chart-theme.css +1 -1
- package/dist/eclipse-scout-chart-theme.css.map +1 -1
- package/dist/eclipse-scout-chart.esm-cf2a1f4f475648b72788.min.js +3 -0
- package/dist/eclipse-scout-chart.esm-cf2a1f4f475648b72788.min.js.map +1 -0
- package/dist/eclipse-scout-chart.esm.js +88 -40
- package/dist/eclipse-scout-chart.esm.js.map +1 -1
- package/dist/eclipse-scout-chart.js +90 -40
- package/dist/eclipse-scout-chart.js.map +1 -1
- package/dist/file-list +4 -4
- package/package.json +6 -6
- package/src/chart/AbstractChartRenderer.ts +2 -2
- package/src/chart/Chart.ts +1 -1
- package/src/chart/ChartJsRenderer.ts +81 -39
- package/src/chart/FulfillmentChartRenderer.ts +3 -3
- package/src/chart/SalesfunnelChartRenderer.ts +3 -3
- package/src/chart/VennChartRenderer.ts +4 -3
- package/src/table/controls/ChartTableControl.ts +9 -4
- package/dist/eclipse-scout-chart-c0371fbf62b6717784f4.min.js +0 -3
- package/dist/eclipse-scout-chart-c0371fbf62b6717784f4.min.js.map +0 -1
- package/dist/eclipse-scout-chart.esm-a918cb3af9403c83adfe.min.js +0 -3
- package/dist/eclipse-scout-chart.esm-a918cb3af9403c83adfe.min.js.map +0 -1
|
@@ -14,6 +14,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
14
14
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
15
15
|
/* harmony export */ "AbstractChartRenderer": () => (/* binding */ AbstractChartRenderer)
|
|
16
16
|
/* harmony export */ });
|
|
17
|
+
/* harmony import */ var _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @eclipse-scout/core */ "@eclipse-scout/core");
|
|
17
18
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
18
19
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
19
20
|
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
@@ -26,6 +27,7 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
|
|
|
26
27
|
*
|
|
27
28
|
* SPDX-License-Identifier: EPL-2.0
|
|
28
29
|
*/
|
|
30
|
+
|
|
29
31
|
class AbstractChartRenderer {
|
|
30
32
|
constructor(chart) {
|
|
31
33
|
_defineProperty(this, "chart", void 0);
|
|
@@ -71,7 +73,7 @@ class AbstractChartRenderer {
|
|
|
71
73
|
}
|
|
72
74
|
}
|
|
73
75
|
// color should have been set.
|
|
74
|
-
if (!this.chart.config.options.autoColor && !chartValueGroup.colorHexValue && !chartValueGroup.cssClass) {
|
|
76
|
+
if (!this.chart.config.options.autoColor && !_eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__.arrays.ensure(chartValueGroup.colorHexValue).length && !chartValueGroup.cssClass) {
|
|
75
77
|
return false;
|
|
76
78
|
}
|
|
77
79
|
}
|
|
@@ -1789,7 +1791,7 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
|
|
|
1789
1791
|
index;
|
|
1790
1792
|
if (_eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.scout.isOneOf(dataset.type || config.type, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.LINE, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.BAR, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.BAR_HORIZONTAL, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.RADAR, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.BUBBLE, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.SCATTER)) {
|
|
1791
1793
|
borderColor = dataset.borderColor;
|
|
1792
|
-
legendColor = dataset.legendColor;
|
|
1794
|
+
legendColor = Array.isArray(dataset.legendColor) ? dataset.legendColor[tooltipItem.dataIndex] : dataset.legendColor;
|
|
1793
1795
|
index = tooltipItem.datasetIndex;
|
|
1794
1796
|
}
|
|
1795
1797
|
if (_eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.scout.isOneOf(config.type, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.PIE, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.DOUGHNUT, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.POLAR_AREA)) {
|
|
@@ -2455,12 +2457,20 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
|
|
|
2455
2457
|
};
|
|
2456
2458
|
colors = jquery__WEBPACK_IMPORTED_MODULE_5___default().extend(true, colors, this._computeDatasetColors(config, multipleColorsPerDataset));
|
|
2457
2459
|
data.datasets.forEach((elem, idx) => {
|
|
2458
|
-
|
|
2459
|
-
|
|
2460
|
-
|
|
2461
|
-
|
|
2462
|
-
|
|
2463
|
-
|
|
2460
|
+
const getColor = colorsArray => {
|
|
2461
|
+
let candidate = colorsArray[idx];
|
|
2462
|
+
if (multipleColorsPerDataset && !Array.isArray(candidate)) {
|
|
2463
|
+
// we want multiple colors -> get the parent array
|
|
2464
|
+
candidate = colorsArray;
|
|
2465
|
+
}
|
|
2466
|
+
return candidate;
|
|
2467
|
+
};
|
|
2468
|
+
let backgroundColor = getColor(colors.backgroundColors),
|
|
2469
|
+
borderColor = getColor(colors.borderColors),
|
|
2470
|
+
hoverBackgroundColor = getColor(colors.hoverBackgroundColors),
|
|
2471
|
+
hoverBorderColor = getColor(colors.hoverBorderColors),
|
|
2472
|
+
legendColor = getColor(colors.legendColors),
|
|
2473
|
+
pointHoverBackgroundColor = getColor(colors.pointHoverColors);
|
|
2464
2474
|
let setProperty = (identifier, value) => {
|
|
2465
2475
|
if (typeof elem[identifier] === 'function') {
|
|
2466
2476
|
return;
|
|
@@ -2480,12 +2490,18 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
|
|
|
2480
2490
|
setProperty('pointHoverBorderColor', this.firstOpaqueBackgroundColor);
|
|
2481
2491
|
}
|
|
2482
2492
|
if (checkable) {
|
|
2483
|
-
|
|
2493
|
+
const datasetLength = elem.data.length,
|
|
2494
|
+
ensureColorArray = color => {
|
|
2495
|
+
if (Array.isArray(color)) {
|
|
2496
|
+
return color;
|
|
2497
|
+
}
|
|
2498
|
+
return _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.arrays.init(datasetLength, color);
|
|
2499
|
+
};
|
|
2484
2500
|
if (_eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.scout.isOneOf(type, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.PIE, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.DOUGHNUT, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.POLAR_AREA, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.BUBBLE, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.SCATTER) || type === _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.BAR && (elem.type || _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.BAR) === _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.BAR) {
|
|
2485
|
-
let uncheckedBackgroundColor =
|
|
2486
|
-
uncheckedHoverBackgroundColor =
|
|
2487
|
-
checkedBackgroundColor =
|
|
2488
|
-
checkedHoverBackgroundColor =
|
|
2501
|
+
let uncheckedBackgroundColor = ensureColorArray(backgroundColor),
|
|
2502
|
+
uncheckedHoverBackgroundColor = ensureColorArray(hoverBackgroundColor),
|
|
2503
|
+
checkedBackgroundColor = ensureColorArray(getColor(colors.checkedBackgroundColors)),
|
|
2504
|
+
checkedHoverBackgroundColor = ensureColorArray(getColor(colors.checkedHoverBackgroundColors));
|
|
2489
2505
|
setProperty('uncheckedBackgroundColor', uncheckedBackgroundColor);
|
|
2490
2506
|
setProperty('uncheckedHoverBackgroundColor', uncheckedHoverBackgroundColor);
|
|
2491
2507
|
setProperty('checkedBackgroundColor', checkedBackgroundColor);
|
|
@@ -2493,10 +2509,10 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
|
|
|
2493
2509
|
setProperty('backgroundColor', elem.uncheckedBackgroundColor);
|
|
2494
2510
|
setProperty('hoverBackgroundColor', elem.uncheckedHoverBackgroundColor);
|
|
2495
2511
|
} else if (_eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.scout.isOneOf(type, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.LINE, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.RADAR) || type === _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.BAR && elem.type === _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.LINE) {
|
|
2496
|
-
let uncheckedPointBackgroundColor =
|
|
2497
|
-
uncheckedPointHoverBackgroundColor =
|
|
2498
|
-
checkedPointBackgroundColor =
|
|
2499
|
-
checkedPointHoverBackgroundColor =
|
|
2512
|
+
let uncheckedPointBackgroundColor = ensureColorArray(pointHoverBackgroundColor),
|
|
2513
|
+
uncheckedPointHoverBackgroundColor = ensureColorArray(pointHoverBackgroundColor),
|
|
2514
|
+
checkedPointBackgroundColor = ensureColorArray(borderColor),
|
|
2515
|
+
checkedPointHoverBackgroundColor = ensureColorArray(hoverBorderColor || borderColor);
|
|
2500
2516
|
setProperty('uncheckedPointBackgroundColor', uncheckedPointBackgroundColor);
|
|
2501
2517
|
setProperty('uncheckedPointHoverBackgroundColor', uncheckedPointHoverBackgroundColor);
|
|
2502
2518
|
setProperty('checkedPointBackgroundColor', checkedPointBackgroundColor);
|
|
@@ -2625,8 +2641,6 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
|
|
|
2625
2641
|
pointHoverColors: []
|
|
2626
2642
|
};
|
|
2627
2643
|
this.chart.data.chartValueGroups.forEach(elem => {
|
|
2628
|
-
let rgbColor = _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.styles.hexToRgb(elem.colorHexValue),
|
|
2629
|
-
adjustColor = (opacity, darker) => this._adjustColorOpacity(_eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.styles.darkerColor(rgbColor, darker), opacity);
|
|
2630
2644
|
let backgroundOpacity = 1,
|
|
2631
2645
|
hoverBackgroundOpacity = 1,
|
|
2632
2646
|
hoverBackgroundDarker = 0.1,
|
|
@@ -2662,14 +2676,40 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
|
|
|
2662
2676
|
hoverBackgroundOpacity = 0.35;
|
|
2663
2677
|
hoverBackgroundDarker = 0;
|
|
2664
2678
|
}
|
|
2665
|
-
|
|
2666
|
-
|
|
2667
|
-
|
|
2668
|
-
|
|
2669
|
-
|
|
2670
|
-
|
|
2671
|
-
|
|
2672
|
-
|
|
2679
|
+
const backgroundColors = [],
|
|
2680
|
+
borderColors = [],
|
|
2681
|
+
hoverBackgroundColors = [],
|
|
2682
|
+
hoverBorderColors = [],
|
|
2683
|
+
checkedBackgroundColors = [],
|
|
2684
|
+
checkedHoverBackgroundColors = [],
|
|
2685
|
+
legendColors = [],
|
|
2686
|
+
pointHoverColors = [];
|
|
2687
|
+
let colorHexValues = _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.arrays.ensure(elem.colorHexValue);
|
|
2688
|
+
const datasetLength = _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.arrays.length(elem.values);
|
|
2689
|
+
if (colorHexValues.length && colorHexValues.length < datasetLength) {
|
|
2690
|
+
// repeat colors for the whole dataset
|
|
2691
|
+
colorHexValues = _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.arrays.init(datasetLength, null).map((elem, idx) => colorHexValues[idx % colorHexValues.length]);
|
|
2692
|
+
}
|
|
2693
|
+
colorHexValues.forEach(colorHexValue => {
|
|
2694
|
+
const rgbColor = _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.styles.hexToRgb(colorHexValue),
|
|
2695
|
+
adjustColor = (opacity, darker) => this._adjustColorOpacity(_eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.styles.darkerColor(rgbColor, darker), opacity);
|
|
2696
|
+
backgroundColors.push(adjustColor(checkable || transparent ? uncheckedBackgroundOpacity : backgroundOpacity, 0));
|
|
2697
|
+
borderColors.push(adjustColor(1, 0));
|
|
2698
|
+
hoverBackgroundColors.push(adjustColor(checkable || transparent ? uncheckedHoverBackgroundOpacity : hoverBackgroundOpacity, checkable || transparent ? 0 : hoverBackgroundDarker));
|
|
2699
|
+
hoverBorderColors.push(adjustColor(1, hoverBorderDarker));
|
|
2700
|
+
checkedBackgroundColors.push(adjustColor(checkedBackgroundOpacity, checkedBackgroundDarker));
|
|
2701
|
+
checkedHoverBackgroundColors.push(adjustColor(checkedHoverBackgroundOpacity, checkedHoverBackgroundDarker));
|
|
2702
|
+
legendColors.push(adjustColor(1, 0));
|
|
2703
|
+
pointHoverColors.push(adjustColor(1, 0));
|
|
2704
|
+
});
|
|
2705
|
+
colors.backgroundColors.push(backgroundColors);
|
|
2706
|
+
colors.borderColors.push(borderColors);
|
|
2707
|
+
colors.hoverBackgroundColors.push(hoverBackgroundColors);
|
|
2708
|
+
colors.hoverBorderColors.push(hoverBorderColors);
|
|
2709
|
+
colors.checkedBackgroundColors.push(checkedBackgroundColors);
|
|
2710
|
+
colors.checkedHoverBackgroundColors.push(checkedHoverBackgroundColors);
|
|
2711
|
+
colors.legendColors.push(legendColors);
|
|
2712
|
+
colors.pointHoverColors.push(pointHoverColors);
|
|
2673
2713
|
});
|
|
2674
2714
|
colors.datalabelColor = this._computeDatalabelColor(type);
|
|
2675
2715
|
return colors;
|
|
@@ -2755,7 +2795,7 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
|
|
|
2755
2795
|
borderColor,
|
|
2756
2796
|
backgroundColor;
|
|
2757
2797
|
if (dataset && _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.scout.isOneOf(dataset.type || config.type, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.LINE, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.BAR, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.RADAR, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.BUBBLE, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.SCATTER)) {
|
|
2758
|
-
legendColor = dataset.legendColor;
|
|
2798
|
+
legendColor = _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.arrays.ensure(dataset.legendColor)[0];
|
|
2759
2799
|
borderColor = this._adjustColorOpacity(dataset.borderColor, 1);
|
|
2760
2800
|
} else if (data.datasets.length && _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_3__.scout.isOneOf(config.type, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.PIE, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.DOUGHNUT, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.POLAR_AREA)) {
|
|
2761
2801
|
dataset = data.datasets[0];
|
|
@@ -3572,7 +3612,7 @@ class FulfillmentChartRenderer extends _index__WEBPACK_IMPORTED_MODULE_1__.Abstr
|
|
|
3572
3612
|
_renderPercentage(value, total) {
|
|
3573
3613
|
// arc segment
|
|
3574
3614
|
let arcClass = 'fulfillment-chart',
|
|
3575
|
-
color = this.chart.data.chartValueGroups[0].colorHexValue,
|
|
3615
|
+
color = _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__.arrays.ensure(this.chart.data.chartValueGroups[0].colorHexValue)[0],
|
|
3576
3616
|
chartGroupCss = this.chart.data.chartValueGroups[0].cssClass;
|
|
3577
3617
|
if (this.chart.config.options.autoColor) {
|
|
3578
3618
|
arcClass += ' auto-color';
|
|
@@ -3632,7 +3672,7 @@ class FulfillmentChartRenderer extends _index__WEBPACK_IMPORTED_MODULE_1__.Abstr
|
|
|
3632
3672
|
}
|
|
3633
3673
|
_renderCirclePath(cssClass, id, radius) {
|
|
3634
3674
|
let chartGroupCss = this.chart.data.chartValueGroups[0].cssClass;
|
|
3635
|
-
let color = this.chart.data.chartValueGroups[1].colorHexValue;
|
|
3675
|
+
let color = _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__.arrays.ensure(this.chart.data.chartValueGroups[1].colorHexValue)[0];
|
|
3636
3676
|
if (this.chart.config.options.autoColor) {
|
|
3637
3677
|
cssClass += ' auto-color';
|
|
3638
3678
|
} else if (chartGroupCss) {
|
|
@@ -3799,7 +3839,7 @@ class SalesfunnelChartRenderer extends _index__WEBPACK_IMPORTED_MODULE_1__.Abstr
|
|
|
3799
3839
|
width: width,
|
|
3800
3840
|
widthBottom: widthBottom,
|
|
3801
3841
|
cssClass: 'salesfunnel-chart-bar',
|
|
3802
|
-
fill: chartValueGroups[i].colorHexValue,
|
|
3842
|
+
fill: _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__.arrays.ensure(chartValueGroups[i].colorHexValue)[0],
|
|
3803
3843
|
label: chartValueGroups[i].groupName,
|
|
3804
3844
|
clickObject: this._createClickObject(null, i)
|
|
3805
3845
|
};
|
|
@@ -3956,7 +3996,7 @@ class SalesfunnelChartRenderer extends _index__WEBPACK_IMPORTED_MODULE_1__.Abstr
|
|
|
3956
3996
|
width: width,
|
|
3957
3997
|
widthBottom: width,
|
|
3958
3998
|
cssClass: 'salesfunnel-chart-bar',
|
|
3959
|
-
fill: chartValueGroups[i].colorHexValue,
|
|
3999
|
+
fill: _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__.arrays.ensure(chartValueGroups[i].colorHexValue)[0],
|
|
3960
4000
|
label: chartValueGroups[i].groupName,
|
|
3961
4001
|
clickObject: this._createClickObject(null, i)
|
|
3962
4002
|
};
|
|
@@ -4079,6 +4119,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
4079
4119
|
/* harmony export */ });
|
|
4080
4120
|
/* harmony import */ var _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @eclipse-scout/core */ "@eclipse-scout/core");
|
|
4081
4121
|
/* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../index */ "./src/index.ts");
|
|
4122
|
+
var _class;
|
|
4082
4123
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
4083
4124
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
4084
4125
|
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
@@ -4430,6 +4471,7 @@ class SpeedoChartRenderer extends _index__WEBPACK_IMPORTED_MODULE_1__.AbstractSv
|
|
|
4430
4471
|
});
|
|
4431
4472
|
}
|
|
4432
4473
|
}
|
|
4474
|
+
_class = SpeedoChartRenderer;
|
|
4433
4475
|
_defineProperty(SpeedoChartRenderer, "Position", {
|
|
4434
4476
|
LEFT: 'left',
|
|
4435
4477
|
CENTER: 'center',
|
|
@@ -4442,7 +4484,7 @@ _defineProperty(SpeedoChartRenderer, "TEN_THOUSAND", 10000);
|
|
|
4442
4484
|
_defineProperty(SpeedoChartRenderer, "ONE_MILLION", 1000000);
|
|
4443
4485
|
_defineProperty(SpeedoChartRenderer, "ARC_MIN", -0.25);
|
|
4444
4486
|
_defineProperty(SpeedoChartRenderer, "ARC_MAX", 0.25);
|
|
4445
|
-
_defineProperty(SpeedoChartRenderer, "ARC_RANGE",
|
|
4487
|
+
_defineProperty(SpeedoChartRenderer, "ARC_RANGE", _class.ARC_MAX - _class.ARC_MIN);
|
|
4446
4488
|
_defineProperty(SpeedoChartRenderer, "SEGMENT_GAP", 0.0103);
|
|
4447
4489
|
|
|
4448
4490
|
/***/ }),
|
|
@@ -4676,6 +4718,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
4676
4718
|
/* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../index */ "./src/index.ts");
|
|
4677
4719
|
/* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! jquery */ "jquery");
|
|
4678
4720
|
/* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(jquery__WEBPACK_IMPORTED_MODULE_1__);
|
|
4721
|
+
/* harmony import */ var _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @eclipse-scout/core */ "@eclipse-scout/core");
|
|
4679
4722
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
4680
4723
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
4681
4724
|
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
@@ -4690,6 +4733,7 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
|
|
|
4690
4733
|
*/
|
|
4691
4734
|
|
|
4692
4735
|
|
|
4736
|
+
|
|
4693
4737
|
class VennChartRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractSvgChartRenderer {
|
|
4694
4738
|
constructor(chart) {
|
|
4695
4739
|
super(chart);
|
|
@@ -4748,17 +4792,17 @@ class VennChartRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractSvgC
|
|
|
4748
4792
|
this.vennCircleHelper = new _index__WEBPACK_IMPORTED_MODULE_0__.VennCircleHelper(distR, maxR, minR, total);
|
|
4749
4793
|
// create svg elements and venns
|
|
4750
4794
|
if (this.numberOfCircles > 0) {
|
|
4751
|
-
this.$v1 = this._createCircle(0, this.data[0].colorHexValue, this.data[0].cssClass);
|
|
4795
|
+
this.$v1 = this._createCircle(0, _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_2__.arrays.ensure(this.data[0].colorHexValue)[0], this.data[0].cssClass);
|
|
4752
4796
|
this.vennNumber1 = new _index__WEBPACK_IMPORTED_MODULE_0__.VennCircle(this.$v1);
|
|
4753
4797
|
this.vennReal1 = new _index__WEBPACK_IMPORTED_MODULE_0__.VennCircle(this.$v1);
|
|
4754
4798
|
}
|
|
4755
4799
|
if (this.numberOfCircles > 1) {
|
|
4756
|
-
this.$v2 = this._createCircle(1, this.data[1].colorHexValue, this.data[1].cssClass);
|
|
4800
|
+
this.$v2 = this._createCircle(1, _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_2__.arrays.ensure(this.data[1].colorHexValue)[0], this.data[1].cssClass);
|
|
4757
4801
|
this.vennNumber2 = new _index__WEBPACK_IMPORTED_MODULE_0__.VennCircle(this.$v2);
|
|
4758
4802
|
this.vennReal2 = new _index__WEBPACK_IMPORTED_MODULE_0__.VennCircle(this.$v2);
|
|
4759
4803
|
}
|
|
4760
4804
|
if (this.numberOfCircles > 2) {
|
|
4761
|
-
this.$v3 = this._createCircle(2, this.data[2].colorHexValue, this.data[2].cssClass);
|
|
4805
|
+
this.$v3 = this._createCircle(2, _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_2__.arrays.ensure(this.data[2].colorHexValue)[0], this.data[2].cssClass);
|
|
4762
4806
|
this.vennNumber3 = new _index__WEBPACK_IMPORTED_MODULE_0__.VennCircle(this.$v3);
|
|
4763
4807
|
this.vennReal3 = new _index__WEBPACK_IMPORTED_MODULE_0__.VennCircle(this.$v3);
|
|
4764
4808
|
}
|
|
@@ -5628,6 +5672,7 @@ class ChartTableControl extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__
|
|
|
5628
5672
|
_defineProperty(this, "_chartValueClickedHandler", void 0);
|
|
5629
5673
|
_defineProperty(this, "_filterResetListener", void 0);
|
|
5630
5674
|
_defineProperty(this, "_tableUpdatedTimeOutId", void 0);
|
|
5675
|
+
this.iconId = _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__.icons.CHART;
|
|
5631
5676
|
this.tooltipText = '${textKey:ui.Chart}';
|
|
5632
5677
|
this.chartAggregation = {
|
|
5633
5678
|
modifier: _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__.TableMatrix.NumberGroup.COUNT
|
|
@@ -5882,7 +5927,10 @@ class ChartTableControl extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__
|
|
|
5882
5927
|
this.setProperty('chartType', chartType);
|
|
5883
5928
|
}
|
|
5884
5929
|
_hasColumns() {
|
|
5885
|
-
return this.
|
|
5930
|
+
return this._columns().length > 0;
|
|
5931
|
+
}
|
|
5932
|
+
_columns() {
|
|
5933
|
+
return new _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__.TableMatrix(this.table, this.session).columns();
|
|
5886
5934
|
}
|
|
5887
5935
|
_axisCount(columnCount, column) {
|
|
5888
5936
|
let tmpColumn;
|
|
@@ -6290,7 +6338,7 @@ class ChartTableControl extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__
|
|
|
6290
6338
|
return segments;
|
|
6291
6339
|
}
|
|
6292
6340
|
_handleIconLabel(label, axis, iconClasses) {
|
|
6293
|
-
if (axis && axis.
|
|
6341
|
+
if (axis && axis.isIcon) {
|
|
6294
6342
|
let icon = _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__.icons.parseIconId(label);
|
|
6295
6343
|
if (icon && icon.isFontIcon()) {
|
|
6296
6344
|
iconClasses.push(...icon.appendCssClass('font-icon').split(' '));
|
|
@@ -6401,7 +6449,7 @@ class ChartTableControl extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__
|
|
|
6401
6449
|
}
|
|
6402
6450
|
}
|
|
6403
6451
|
label = axis.format(label);
|
|
6404
|
-
if (axis.
|
|
6452
|
+
if (axis.isIcon) {
|
|
6405
6453
|
let icon = _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__.icons.parseIconId(label);
|
|
6406
6454
|
if (icon && icon.isFontIcon()) {
|
|
6407
6455
|
label = icon.iconCharacter;
|
|
@@ -6605,7 +6653,7 @@ class ChartTableControl extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__
|
|
|
6605
6653
|
};
|
|
6606
6654
|
}
|
|
6607
6655
|
return {
|
|
6608
|
-
text: '[' + (this.
|
|
6656
|
+
text: '[' + (this._columns().indexOf(column) + 1) + ']'
|
|
6609
6657
|
};
|
|
6610
6658
|
}
|
|
6611
6659
|
_removeContent() {
|