@sapui5/sap.zen.crosstab 1.136.1 → 1.138.0

package/package.json

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

package/src/sap/zen/crosstab/.library

@@ -6,7 +6,7 @@
   </deprecation>
   <vendor>SAP SE</vendor>
   <copyright>(c) Copyright 2010-2019 SAP SE or an SAP affiliate company.</copyright>
-  <version>1.136.1</version>
+  <version>1.138.0</version>
   <documentation>Design Studio Crosstab library.  NOT INTENDED FOR STANDALONE USAGE.</documentation>
   <appData>
     <jsdoc xmlns="http://www.sap.com/ui5/buildext/jsdoc" >

package/src/sap/zen/crosstab/HeaderCell.js

@@ -180,6 +180,7 @@ sap.ui.define(
       this.bIsPivotCell = false;
       this.bIsSplitPivotCell = false;
       this.bIsRevertDrop = false;
+      this.sCustomFormat = undefined;
     };
 
     HeaderCell.prototype.getCellType = function() {
@@ -350,11 +351,20 @@ sap.ui.define(
       }
       var oFormatter = this.getFormatter();
       if (oFormatter) {
-        lText = oFormatter.format(lText);
+        var lCustomFormat = this.getCustomFormat();
+        lText = oFormatter.format(lText, lCustomFormat);
       }
       return lText;
     };
 
+    HeaderCell.prototype.setCustomFormat = function (sName) {
+      this.sCustomFormat = sName;
+    };
+
+    HeaderCell.prototype.getCustomFormat = function () {
+      return this.sCustomFormat;
+    };
+
     return HeaderCell;
   }
 );

package/src/sap/zen/crosstab/datahandler/JsonDataHandler.js

@@ -567,7 +567,7 @@ sap.ui.define(
       };
 
       var parseCommonCellData = function (oJsonCellControl, oCommonCell) {
-        var oFormatter = getFormatter(oJsonCellControl);
+        var oFormatter = getFormatter(oJsonCellControl, oCommonCell);
         if (oFormatter) {
           oCommonCell.setFormatter(oFormatter);
         }
@@ -726,7 +726,7 @@ sap.ui.define(
         }
       };
 
-      function getFormatter(oJsonCellControl) {
+      function getFormatter(oJsonCellControl, oCommonCell) {
         var oFormatter;
 
         if (oJsonCellControl.valueType) {
@@ -740,6 +740,14 @@ sap.ui.define(
               pattern: sPattern, // CLDR pattern (example "* #,### Tests" -> "* 10.000 Tests")
               showMeasure: true // show measure in pattern
             };
+            if (oJsonCellControl.customFormat && oJsonCellControl.customFormat.name) {
+              oCommonCell.setCustomFormat(oJsonCellControl.customFormat.name);
+              oFormatOptions.currencyCode = false;
+              oFormatOptions.customCurrencies = oFormatOptions.customCurrencies || {};
+              oFormatOptions.customCurrencies[oJsonCellControl.customFormat.name] = {
+                symbol: oJsonCellControl.customFormat.symbol
+              };
+            }
             oFormatter = sap.ui.core.format.NumberFormat.getCurrencyInstance(oFormatOptions);
           } else if (oJsonCellControl.valueType === "Amount" || oJsonCellControl.valueType === "Price" || oJsonCellControl.valueType === "Quantity") {
             oFormatOptions = {

package/src/sap/zen/crosstab/library.js

@@ -33,7 +33,7 @@ sap.ui.define(
         "sap.zen.crosstab.HeaderCell"
       ],
       elements: [],
-      version: "1.136.1"
+      version: "1.138.0"
     });
     return thisLib;
   }