@sapui5/sap.ui.vbm 1.103.0 → 1.104.0

package/src/sap/ui/vbm/adapter3d/VBIJSONParser.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.104.0
 	 * @alias sap.ui.vbm.adapter3d.VBIJSONParser
 	 */
 	var VBIJSONParser = BaseObject.extend("sap.ui.vbm.adapter3d.VBIJSONParser", /** @lends sap.ui.vbm.adapter3d.VBIJSONParser.prototype */ {
@@ -84,12 +84,17 @@ sap.ui.define([
 	 * @public
 	 */
 	VBIJSONParser.prototype.loadVBIJSON = function(payload) {
-		// Resources
 		if (payload && payload.SAPVB) {
+			// Resources
 			if (payload.SAPVB.Resources) {
 				this._processResources(payload.SAPVB.Resources);
 			}
 
+			// Config
+			if (payload.SAPVB.Config) {
+				this._processConfig(payload.SAPVB.Config);
+			}
+
 			// DataTypes
 			if (payload.SAPVB.DataTypes) {
 				this._processDataTypes(payload.SAPVB.DataTypes);
@@ -130,7 +135,7 @@ sap.ui.define([
 
 	////////////////////////////////////////////////////////////////////////////
 	// region: Helper functions
-	
+
 	/**
 	 * Copies the named properties from the source to the target if the properties exist in the source.
 	 *
@@ -177,6 +182,29 @@ sap.ui.define([
 	// endregion: Resources
 	////////////////////////////////////////////////////////////////////////////
 
+
+	////////////////////////////////////////////////////////////////////////////
+	// region: Config
+
+	/**
+	 * Processes the config section of VBI JSON.
+	 *
+	 * @param {object} config The config section of VBI JSON.
+	 * @returns {sap.ui.vbm.adapter3d.VBIJSONParser} <code>this</code> to allow method chaining.
+	 * @private
+	 */
+	 VBIJSONParser.prototype._processConfig = function(config) {
+		// Delta not supported
+		toArray(config.Set.P).forEach(function(cfg) {
+			this._context.config.set(cfg.name, cfg.value);
+		}, this);
+		return this;
+	};
+
+	// endregion: config
+	////////////////////////////////////////////////////////////////////////////
+
+
 	////////////////////////////////////////////////////////////////////////////
 	// region: DataTypes
 
@@ -203,6 +231,7 @@ sap.ui.define([
 					dataType.attributes.push(copyProperties(this._factory.createDataTypeAttribute(), attributeElement, ["name", "alias", "type"]));
 				}, this);
 
+				// Nested data types processed to one level deep only
 				toArray(dataTypeElement.N).forEach(function(childDataTypeElement) {
 					dataType.dataTypes.push(create(childDataTypeElement));
 				});
@@ -835,6 +864,9 @@ sap.ui.define([
 			// the DataTypes section and is used in the Data section but no visual object has a standard attribute
 			// corresponding to it.
 
+			// TODO directly copy changeable attribute for now
+			vo["VB:c"] = dataInstance["VB:c"];
+
 			// update selection
 			var wasSelected = vo["VB:s"] && vo["VB:s"] !== "false" ? true : false;
 			var isSelected = dataInstance["VB:s"] && dataInstance["VB:s"] !== "false" ? true : false;
@@ -1145,5 +1177,28 @@ sap.ui.define([
 		return this;
 	};
 
+	/**
+	 * Utility function returns alias for the specified Attribute within DataType.
+	 * Only top level data types are checked, nested data types are ignored.
+	 *
+	 * @param {string} dataType The DataType name for the given attribute
+	 * @param {string} attribute The Attribute name
+	 * @returns {string} String alias of an attribute or undefined if not found
+	 */
+	 VBIJSONParser.prototype.getAttributeAlias = function(dataType, attribute) {
+		for (var i = 0; i < this._context.dataTypes.length; ++i) {
+			var type = this._context.dataTypes[i];
+			if (type.name === dataType) {
+				for (var j = 0; j < type.attributes.length; ++j) {
+					var attr = type.attributes[j];
+					if (attr.name === attribute) {
+						return attr.alias;
+					}
+				}
+			}
+		}
+		return undefined;
+	 };
+
 	return VBIJSONParser;
 });

package/src/sap/ui/vbm/adapter3d/thirdparty/OrbitControls.js

@@ -154,6 +154,21 @@
 				state = STATE.NONE;
 			};
 
+			this.setEnabled = function(enabled) {
+				if (scope.enabled !== enabled) {
+					if (pointers.length > 0) {
+						pointers.forEach(function(event) {
+							delete pointerPositions[event.pointerId];
+						});
+						scope.domElement.releasePointerCapture(pointers[pointers.length-1].pointerId);
+						scope.domElement.removeEventListener('pointermove', onPointerMove);
+						scope.domElement.removeEventListener('pointerup', onPointerUp);
+					}
+					state = STATE.NONE;
+					pointers.length = 0;
+					scope.enabled = enabled;
+				}
+			};
 
 			this.update = function (tag) {
 

package/src/sap/ui/vbm/lib/sapscene.js

@@ -677,18 +677,24 @@ VBI.Scene = function(target) {
 			}
 			// standard case - click on single object
 			if (event.hitTests.length > 0) {
-				event.hitCached = event.hitTests[0];
-				var obj = event.hitCached.m_Vo;
-				delete event.hitTests; //has to be deleted to avoid collecting hits information again
-				return obj["on" + eventType].call(obj, event);
+				event.hitCached = event.hitTests[0]; // cache first hit test
+				delete event.hitTests; // has to be deleted to avoid collecting hits information again
+				// if there is a VO then pass event to it
+				if (event.hitCached.m_Vo) {
+					return event.hitCached.m_Vo["on" + eventType].call(event.hitCached.m_Vo, event);
+				} else {
+					delete event.hitCached; // remove it to keep things going "old" way
+				}
+			} else {
+				return false; // not handled
 			}
-		} else { // old approach -> process from last to first which corresponds to the rendering order (from topmost to last)
-			for (var i = scene.m_VOS.length - 1;  i >= 0; --i) {
-				if ((func = scene.m_VOS[i]["on" + eventType]) && typeof (func) == 'function') {
-					// call the handler with the context set to corresponded visual object
-					if (func.call(scene.m_VOS[i], event)) {
-						return true; // handled
-					}
+		}
+		// "old" approach -> process from last to first which corresponds to the rendering order (from topmost to last)
+		for (var i = scene.m_VOS.length - 1;  i >= 0; --i) {
+			if ((func = scene.m_VOS[i]["on" + eventType]) && typeof (func) == 'function') {
+				// call the handler with the context set to corresponded visual object
+				if (func.call(scene.m_VOS[i], event)) {
+					return true; // handled
 				}
 			}
 		}

package/src/sap/ui/vbm/lib/sapvobase.js

@@ -1222,7 +1222,7 @@ VBI.VisualObjects = function() {
 			}
 			// check for design handle context menu subscription.............//
 			var action, actions = scene.m_Ctx.m_Actions;
-			if (actions && ocb.m_Design && ocb.m_Handle > -1) {
+			if (actions && ocb.m_Design && (ocb.m_Handle > -1 || ocb.m_Hit === VBI.HTBOX)) {
 				// the action is raised whenever a design action has stopped..//
 				// for the instanced type.....................................//
 				// is it a HandleMoved or a HandleClick action ...............//

package/src/sap/ui/vbm/library.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.vbm
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.104.0
 	 * @public
 	 */
 
@@ -42,7 +42,7 @@ sap.ui.define([
 			"sap.ui.vbm.ClusterBase", "sap.ui.vbm.ClusterTree", "sap.ui.vbm.ClusterGrid", "sap.ui.vbm.ClusterDistance", "sap.ui.vbm.Heatmap",
 			"sap.ui.vbm.HeatPoint", "sap.ui.vbm.ClusterContainer", "sap.ui.vbm.Adapter", "sap.ui.vbm.Adapter3D"
 		],
-		version: "1.103.0"
+		version: "1.104.0"
 	});
 
 	sap.ui.loader.config({

package/src/sap/ui/vbm/themes/sap_belize_hcb/AnalyticMap.less

@@ -0,0 +1,4 @@
+
+.sapUiVbmAnalyticMap {
+	background-color: @sapUiBaseBG;
+}

package/src/sap/ui/vbm/themes/sap_belize_hcb/VBI.less

@@ -0,0 +1,96 @@
+
+.vbi-detail {
+	background-color: @sapUiBaseBG;
+}
+
+.vbi-detail-closebutton
+{
+	background-color: @sapUiBaseBG;
+}
+
+.vbi-detail-content
+{
+	background-color: @sapUiBaseBG;
+}
+
+.vbi-detail-phone
+{
+	background-color: @sapUiBaseBG;
+}
+
+.vbi-detail > .vbi-detail-arrow.vbi-detail-left
+{
+	border-right-color: @sapUiBaseBG;
+}
+
+.vbi-detail > .vbi-detail-header
+{
+   font-size: @sapUiFontHeader4Size;
+   font-family: @sapUiFontHeaderFamily;
+   font-weight: @sapUiFontHeaderWeight;
+   color: @sapTextColor; 
+}
+
+.vbi-detail-header-phone
+{
+   font-family: @sapUiFontHeaderFamily;
+   font-weight: @sapUiFontHeaderWeight;
+   color: @sapTextColor;
+}
+
+.vbi-legend {
+	box-shadow: lighten(@sapUiContentForegroundColor, 20%) 0rem 0rem 0.9rem 0.0625rem;
+	font-family: @sapUiFontFamily;
+	background-color: @sapUiBaseBG;
+	color: @sapTextColor;
+}
+
+.vbi-legend > .vbi-legend-header
+{
+   font-size: @sapMFontMediumSize;
+}
+
+.vbi-legend-button-col:hover
+{
+	background-color: @sapUiHighlight;
+}
+
+.vbi-legend-button-col:active
+{
+	background-color: darken(@sapUiHighlight, 20%);
+}
+
+.vbi-legend-button-exp:hover
+{
+	background-color: @sapUiHighlight;
+}
+
+.vbi-legend-button-exp:active
+{
+	background-color: darken(@sapUiHighlight, 20%);
+}
+
+.vbi-legend-table
+{
+	font-size: @sapMFontSmallSize;
+}
+
+.vbi-legend-table-click
+{
+	tr:hover {
+		background-color: @sapUiHighlight;
+	};
+	tr:active {
+		background-color: darken(@sapUiHighlight, 20%);
+	};
+}
+
+.vbi-legend-content-celltext
+{
+	color: @sapUiChartLegendLabelFontColor;
+}
+
+.vbi-legend-content-celldiv-square
+{
+	border-color: @sapUiContentForegroundColor;
+}

package/src/sap/ui/vbm/themes/sap_belize_hcb/library.source.less

@@ -4,4 +4,7 @@
 
 @import "../base/library.source.less";
 @import "../../../../../sap/ui/core/themes/sap_belize_hcb/base.less";
-@import "../../../../../sap/ui/core/themes/sap_belize_hcb/global.less";
+@import "../../../../../sap/ui/core/themes/sap_belize_hcb/global.less";
+
+@import "AnalyticMap.less";
+@import "VBI.less";