evui 3.4.149 → 3.4.150

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.
@@ -11227,7 +11227,7 @@ var update = add("9519e5b6", content, true, {"sourceMap":false,"shadowMode":fals
11227
11227
  /***/ "9224":
11228
11228
  /***/ (function(module) {
11229
11229
 
11230
- module.exports = JSON.parse("{\"a\":\"3.4.149\"}");
11230
+ module.exports = JSON.parse("{\"a\":\"3.4.150\"}");
11231
11231
 
11232
11232
  /***/ }),
11233
11233
 
@@ -55475,11 +55475,7 @@ var chart_core_EvChart = /*#__PURE__*/function () {
55475
55475
  }, {
55476
55476
  key: "adjustXAndYAxisWidth",
55477
55477
  value: function adjustXAndYAxisWidth() {
55478
- var _this2 = this,
55479
- _this$axesRange,
55480
- _this$axesRange$x,
55481
- _this$axesRange2,
55482
- _this$axesRange2$y;
55478
+ var _this2 = this;
55483
55479
 
55484
55480
  var getNotFormattedLabels = function getNotFormattedLabels(axesSteps, axisType, axis) {
55485
55481
  var _ref2 = axesSteps !== null && axesSteps !== void 0 ? axesSteps : {},
@@ -55523,42 +55519,51 @@ var chart_core_EvChart = /*#__PURE__*/function () {
55523
55519
  return result;
55524
55520
  };
55525
55521
 
55526
- var adjustedRange = {
55527
- x: (_this$axesRange = this.axesRange) === null || _this$axesRange === void 0 ? void 0 : (_this$axesRange$x = _this$axesRange.x) === null || _this$axesRange$x === void 0 ? void 0 : _this$axesRange$x.map(function (value, index) {
55528
- var _this2$axesSteps, _axis$labelStyle, _axis$getLabelWidthHa, _axis$getLabelWidthHa2;
55529
-
55530
- var axis = _this2.axesX[index];
55531
- var axesSteps = (_this2$axesSteps = _this2.axesSteps) === null || _this2$axesSteps === void 0 ? void 0 : _this2$axesSteps.x[index];
55532
- var notFormattedLabels = getNotFormattedLabels(axesSteps, 'x', axis);
55533
- var fixWidth = truthyNumber(axis === null || axis === void 0 ? void 0 : (_axis$labelStyle = axis.labelStyle) === null || _axis$labelStyle === void 0 ? void 0 : _axis$labelStyle.fixWidth) ? axis.labelStyle.fixWidth : 0;
55534
- var maxWidth = (_axis$getLabelWidthHa = axis === null || axis === void 0 ? void 0 : (_axis$getLabelWidthHa2 = axis.getLabelWidthHasMaxLength) === null || _axis$getLabelWidthHa2 === void 0 ? void 0 : _axis$getLabelWidthHa2.call(axis, notFormattedLabels, _this2.chartRect)) !== null && _axis$getLabelWidthHa !== void 0 ? _axis$getLabelWidthHa : 0;
55535
- return _objectSpread2(_objectSpread2({}, value), {}, {
55536
- size: {
55537
- width: fixWidth || Math.max(maxWidth, value.size.width),
55538
- height: value.size.height
55539
- }
55540
- });
55541
- }),
55542
- y: (_this$axesRange2 = this.axesRange) === null || _this$axesRange2 === void 0 ? void 0 : (_this$axesRange2$y = _this$axesRange2.y) === null || _this$axesRange2$y === void 0 ? void 0 : _this$axesRange2$y.map(function (value, index) {
55543
- var _this2$axesSteps2, _axis$labelStyle2, _axis$getLabelWidthHa3, _axis$getLabelWidthHa4;
55544
-
55545
- var axis = _this2.axesY[index];
55546
- var axesSteps = (_this2$axesSteps2 = _this2.axesSteps) === null || _this2$axesSteps2 === void 0 ? void 0 : _this2$axesSteps2.y[index];
55547
- var notFormattedLabels = getNotFormattedLabels(axesSteps, 'y', axis);
55548
- var fixWidth = truthyNumber(axis === null || axis === void 0 ? void 0 : (_axis$labelStyle2 = axis.labelStyle) === null || _axis$labelStyle2 === void 0 ? void 0 : _axis$labelStyle2.fixWidth) ? axis.labelStyle.fixWidth : 0;
55549
- var maxWidth = (_axis$getLabelWidthHa3 = axis === null || axis === void 0 ? void 0 : (_axis$getLabelWidthHa4 = axis.getLabelWidthHasMaxLength) === null || _axis$getLabelWidthHa4 === void 0 ? void 0 : _axis$getLabelWidthHa4.call(axis, notFormattedLabels, _this2.chartRect)) !== null && _axis$getLabelWidthHa3 !== void 0 ? _axis$getLabelWidthHa3 : 0;
55550
- return _objectSpread2(_objectSpread2({}, value), {}, {
55551
- size: {
55552
- width: fixWidth || Math.max(maxWidth, value.size.width),
55553
- height: value.size.height
55554
- }
55555
- });
55556
- })
55522
+ var remeasureRange = function remeasureRange(currentRange) {
55523
+ var _currentRange$x, _currentRange$y;
55524
+
55525
+ return {
55526
+ x: currentRange === null || currentRange === void 0 ? void 0 : (_currentRange$x = currentRange.x) === null || _currentRange$x === void 0 ? void 0 : _currentRange$x.map(function (value, index) {
55527
+ var _this2$axesSteps, _axis$labelStyle, _axis$getLabelWidthHa, _axis$getLabelWidthHa2;
55528
+
55529
+ var axis = _this2.axesX[index];
55530
+ var axesSteps = (_this2$axesSteps = _this2.axesSteps) === null || _this2$axesSteps === void 0 ? void 0 : _this2$axesSteps.x[index];
55531
+ var notFormattedLabels = getNotFormattedLabels(axesSteps, 'x', axis);
55532
+ var fixWidth = truthyNumber(axis === null || axis === void 0 ? void 0 : (_axis$labelStyle = axis.labelStyle) === null || _axis$labelStyle === void 0 ? void 0 : _axis$labelStyle.fixWidth) ? axis.labelStyle.fixWidth : 0;
55533
+ var maxWidth = (_axis$getLabelWidthHa = axis === null || axis === void 0 ? void 0 : (_axis$getLabelWidthHa2 = axis.getLabelWidthHasMaxLength) === null || _axis$getLabelWidthHa2 === void 0 ? void 0 : _axis$getLabelWidthHa2.call(axis, notFormattedLabels, _this2.chartRect)) !== null && _axis$getLabelWidthHa !== void 0 ? _axis$getLabelWidthHa : 0;
55534
+ return _objectSpread2(_objectSpread2({}, value), {}, {
55535
+ size: {
55536
+ width: fixWidth || Math.max(maxWidth, value.size.width),
55537
+ height: value.size.height
55538
+ }
55539
+ });
55540
+ }),
55541
+ y: currentRange === null || currentRange === void 0 ? void 0 : (_currentRange$y = currentRange.y) === null || _currentRange$y === void 0 ? void 0 : _currentRange$y.map(function (value, index) {
55542
+ var _this2$axesSteps2, _axis$labelStyle2, _axis$getLabelWidthHa3, _axis$getLabelWidthHa4;
55543
+
55544
+ var axis = _this2.axesY[index];
55545
+ var axesSteps = (_this2$axesSteps2 = _this2.axesSteps) === null || _this2$axesSteps2 === void 0 ? void 0 : _this2$axesSteps2.y[index];
55546
+ var notFormattedLabels = getNotFormattedLabels(axesSteps, 'y', axis);
55547
+ var fixWidth = truthyNumber(axis === null || axis === void 0 ? void 0 : (_axis$labelStyle2 = axis.labelStyle) === null || _axis$labelStyle2 === void 0 ? void 0 : _axis$labelStyle2.fixWidth) ? axis.labelStyle.fixWidth : 0;
55548
+ var maxWidth = (_axis$getLabelWidthHa3 = axis === null || axis === void 0 ? void 0 : (_axis$getLabelWidthHa4 = axis.getLabelWidthHasMaxLength) === null || _axis$getLabelWidthHa4 === void 0 ? void 0 : _axis$getLabelWidthHa4.call(axis, notFormattedLabels, _this2.chartRect)) !== null && _axis$getLabelWidthHa3 !== void 0 ? _axis$getLabelWidthHa3 : 0;
55549
+ return _objectSpread2(_objectSpread2({}, value), {}, {
55550
+ size: {
55551
+ width: fixWidth || Math.max(maxWidth, value.size.width),
55552
+ height: value.size.height
55553
+ }
55554
+ });
55555
+ })
55556
+ };
55557
55557
  };
55558
- this.axesRange = adjustedRange;
55559
- this.labelOffset = this.getLabelOffset(adjustedRange);
55558
+
55559
+ this.axesRange = remeasureRange(this.axesRange);
55560
+ this.labelOffset = this.getLabelOffset(this.axesRange);
55560
55561
  this.labelRange = this.getAxesLabelRange();
55561
- this.axesSteps = this.calculateSteps();
55562
+ this.axesSteps = this.calculateSteps(); // 새로운 step 기준으로 라벨 너비를 다시 측정하여 잘림 방지
55563
+ // TODO: 추후 개선 (3.4.200 이후 버전)
55564
+
55565
+ this.axesRange = remeasureRange(this.axesRange);
55566
+ this.labelOffset = this.getLabelOffset(this.axesRange);
55562
55567
  }
55563
55568
  /**
55564
55569
  * To draw canvas chart, it processes several sequential jobs