@sapui5/sap.chart 1.134.0 → 1.135.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.chart",
-  "version": "1.134.0",
+  "version": "1.135.0",
   "description": "SAPUI5 Library sap.chart",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/chart/.library

@@ -5,7 +5,7 @@
 	<vendor>SAP SE</vendor>
 	<copyright>SAPUI5
  * (c) Copyright 2009-2024 SAP SE. All rights reserved.</copyright>
-	<version>1.134.0</version>
+	<version>1.135.0</version>
 
 	<documentation>Smart viz control based on Vizframe</documentation>
 

package/src/sap/chart/Chart.js

@@ -4,7 +4,6 @@
  */
 sap.ui.define([
 	'sap/base/i18n/Formatting',
-	'sap/base/i18n/ResourceBundle',
 	'sap/chart/library',
 	'sap/viz/ui5/controls/VizFrame',
 	'sap/viz/ui5/controls/common/BaseControl',
@@ -37,6 +36,7 @@ sap.ui.define([
 	'sap/ui/core/LocaleData',
 	'sap/ui/core/Control',
 	'sap/ui/core/BusyIndicatorUtils',
+	'sap/ui/core/Lib',
 	'sap/ui/core/theming/Parameters',
 	'sap/chart/SeriesColorTracker',
 	'sap/viz/ui5/format/ChartFormatter',
@@ -48,8 +48,7 @@ sap.ui.define([
 	"sap/ui/thirdparty/jquery"
 ], function(
 	Formatting,
-	ResourceBundle,
-	library,
+	chartLibrary,
 	VizFrame,
 	BaseControl,
 	Dataset,
@@ -81,6 +80,7 @@ sap.ui.define([
 	LocaleData,
 	Control,
 	BusyIndicatorUtils,
+	Library,
 	ThemeParameters,
 	SeriesColorTracker,
 	ChartFormatter,
@@ -93,8 +93,8 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var SelectionBehavior = library.SelectionBehavior,
-		SelectionMode = library.SelectionMode;
+	var SelectionBehavior = chartLibrary.SelectionBehavior,
+		SelectionMode = chartLibrary.SelectionMode;
 
 	/**
 	 * Constructor for a new Chart.
@@ -3395,7 +3395,7 @@ sap.ui.define([
 	/**
 	 * @private
 	 */
-	Chart.getChartTypes = library.api.getChartTypes;
+	Chart.getChartTypes = chartLibrary.api.getChartTypes;
 
 	/**
 	 * Returns available and unavailable chart types with current Dimensions and Measures.
@@ -3610,9 +3610,7 @@ sap.ui.define([
 
 				if (oColoring) {
 					try {
-						const oBundle = ResourceBundle.create({
-							bundleName: "sap.chart.messages.messagebundle"
-						});
+						const oBundle = Library.getResourceBundleFor("sap.chart");
 						var options = {
 							bFiltered: this._bFilterCalledByCustomer
 						};
@@ -4065,13 +4063,13 @@ sap.ui.define([
 		//var $next = $text.next();
 		$text.css({
 			"top": oPosition.height / 2,
-			"font-weight": ThemeParameters.get("sapUiChartTitleFontWeight"),
-			"font-size": ThemeParameters.get("sapUiChartMainTitleFontSize"),
-			"color": ThemeParameters.get("sapUiChartMainTitleFontSize")
+			"font-weight": ThemeParameters.get({name: ["sapUiChartTitleFontWeight"], callback: function() {}}),
+			"font-size": ThemeParameters.get({name: ["sapUiChartMainTitleFontSize"], callback: function() {}}),
+			"color": ThemeParameters.get({name: ["sapUiChartMainTitleFontSize"], callback: function() {}})
 		});
 
 		this._$loadingIndicator.css({
-			"background-color": ThemeParameters.get("sapUiExtraLightBG")
+			"background-color": ThemeParameters.get({name: ["sapUiExtraLightBG"], callback: function() {}})
 		});
 	};
 

package/src/sap/chart/library.js

@@ -8,7 +8,6 @@
  */
 sap.ui.define([
 	'sap/base/i18n/Localization',
-	'sap/base/i18n/ResourceBundle',
 	'sap/viz/ui5/format/ChartFormatter',
 	'sap/ui/base/DataType',
 	'sap/ui/core/Lib',
@@ -28,7 +27,6 @@ sap.ui.define([
 	'sap/chart/data/MeasureRoleType'
 ], function(
 	Localization,
-	ResourceBundle,
 	ChartFormatter,
 	DataType,
 	Library,
@@ -72,7 +70,7 @@ sap.ui.define([
 			"sap.chart.data.Measure"
 		],
 		noLibraryCSS: true,
-		version: "1.134.0"
+		version: "1.135.0"
 	});
 
 	/**
@@ -164,9 +162,7 @@ sap.ui.define([
 	thisLib.api.getChartTypes = function() {
 		if (oLibBundle == null || sBundleLocale !== Localization.getLanguage()) {
 			sBundleLocale = Localization.getLanguage();
-			oLibBundle = ResourceBundle.create({
-				bundleName: "sap.chart.messages.messagebundle"
-			});
+			oLibBundle = Library.getResourceBundleFor("sap.chart");
 		}
 		return Object.keys(ChartType).reduce(function(oMap, sChartTypeKey) {
 			var sChartType = ChartType[sChartTypeKey];

package/src/sap/chart/utils/DateFormatUtil.js

@@ -34,8 +34,21 @@ sap.ui.define([
 			return null;
 		}
 	}
+	function getInstanceByEnLocal(sTimeUnitType) {
+		var sPattern = PATTERN_TABLE[sTimeUnitType];
+		if (sPattern) {
+			if (sPattern === PATTERN_TABLE[TimeUnitType.yearweek]) {
+				return DateFormat.getDateInstance({pattern: sPattern, calendarType: CalendarType.Gregorian},
+					new sap.ui.core.Locale("en"));
+			}
+			return DateFormat.getDateInstance({pattern: sPattern}, new sap.ui.core.Locale("en"));
+		} else {
+			return null;
+		}
+	}
 
 	return {
-		getInstance: getInstance
+		getInstance: getInstance,
+		getInstanceByEnLocal: getInstanceByEnLocal
 	};
 });

package/src/sap/chart/utils/RoleFitter.js

@@ -237,12 +237,22 @@ sap.ui.define([
 
 		var oDimensionDefinition = new DimensionDefinition(oDimConfig);
 		if (isTimeChart && oDimension instanceof TimeDimension) {
-			var oDateInstance = DateFormatUtil.getInstance(oDimension.getTimeUnit());
+			var sTimeUnit = oDimension.getTimeUnit();
+			var oDateInstance = DateFormatUtil.getInstance(sTimeUnit);
 			if (oDateInstance) {
 				var fnParser = oDateInstance.parse.bind(oDateInstance);
+				var fnParserbyEnLocal;
+				if (sTimeUnit === TimeUnitType.yearquarter) {
+					var oDateInstanceByEnLocal = DateFormatUtil.getInstanceByEnLocal(sTimeUnit);
+					fnParserbyEnLocal = oDateInstanceByEnLocal.parse.bind(oDateInstanceByEnLocal);
+				}
 				var bUTC = oDimension._getIsUTC();
 				oDimensionDefinition.getBindingInfo("value").formatter = function (oValue) {
-					return fnParser(oValue, bUTC);
+					var result = fnParser(oValue, bUTC);
+					if (!result && fnParserbyEnLocal) {
+						result = fnParserbyEnLocal(oValue, bUTC);
+					}
+					return result;
 				};
 			}