@sapui5/sap.ui.vbm 1.96.2 → 1.99.0
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/package.json +1 -1
- package/src/sap/ui/vbm/.library +8 -1
- package/src/sap/ui/vbm/Adapter.js +63 -11
- package/src/sap/ui/vbm/Adapter3D.js +54 -53
- package/src/sap/ui/vbm/AnalyticMap.js +1 -2
- package/src/sap/ui/vbm/AnalyticMapRenderer.js +1 -2
- package/src/sap/ui/vbm/Area.js +1 -2
- package/src/sap/ui/vbm/Areas.js +1 -2
- package/src/sap/ui/vbm/Box.js +1 -2
- package/src/sap/ui/vbm/Boxes.js +1 -2
- package/src/sap/ui/vbm/Circle.js +1 -2
- package/src/sap/ui/vbm/Circles.js +1 -2
- package/src/sap/ui/vbm/Cluster.js +1 -2
- package/src/sap/ui/vbm/ClusterBase.js +1 -2
- package/src/sap/ui/vbm/ClusterContainer.js +1 -2
- package/src/sap/ui/vbm/ClusterDistance.js +1 -2
- package/src/sap/ui/vbm/ClusterGrid.js +1 -2
- package/src/sap/ui/vbm/ClusterRenderer.js +1 -2
- package/src/sap/ui/vbm/ClusterTree.js +1 -2
- package/src/sap/ui/vbm/Container.js +1 -2
- package/src/sap/ui/vbm/Containers.js +1 -2
- package/src/sap/ui/vbm/DragSource.js +1 -2
- package/src/sap/ui/vbm/DropTarget.js +1 -2
- package/src/sap/ui/vbm/Feature.js +1 -2
- package/src/sap/ui/vbm/FeatureCollection.js +1 -2
- package/src/sap/ui/vbm/GeoCircle.js +1 -2
- package/src/sap/ui/vbm/GeoCircles.js +1 -2
- package/src/sap/ui/vbm/GeoJsonLayer.js +1 -2
- package/src/sap/ui/vbm/GeoMap.js +16 -7
- package/src/sap/ui/vbm/GeoMapRenderer.js +1 -2
- package/src/sap/ui/vbm/HeatPoint.js +1 -2
- package/src/sap/ui/vbm/Heatmap.js +1 -2
- package/src/sap/ui/vbm/Legend.js +1 -2
- package/src/sap/ui/vbm/LegendItem.js +1 -2
- package/src/sap/ui/vbm/Pie.js +1 -2
- package/src/sap/ui/vbm/PieItem.js +1 -2
- package/src/sap/ui/vbm/Pies.js +1 -2
- package/src/sap/ui/vbm/Region.js +1 -2
- package/src/sap/ui/vbm/Resource.js +1 -2
- package/src/sap/ui/vbm/Route.js +1 -2
- package/src/sap/ui/vbm/Routes.js +1 -2
- package/src/sap/ui/vbm/Spot.js +1 -2
- package/src/sap/ui/vbm/Spots.js +1 -2
- package/src/sap/ui/vbm/VBI.js +1 -2
- package/src/sap/ui/vbm/VBIRenderer.js +1 -2
- package/src/sap/ui/vbm/Viewport.js +2 -3
- package/src/sap/ui/vbm/ViewportRenderer.js +1 -2
- package/src/sap/ui/vbm/VoAbstract.js +1 -2
- package/src/sap/ui/vbm/VoAggregation.js +1 -2
- package/src/sap/ui/vbm/VoBase.js +1 -2
- package/src/sap/ui/vbm/adapter3d/ModelHandler.js +2 -3
- package/src/sap/ui/vbm/adapter3d/ObjectFactory.js +2 -3
- package/src/sap/ui/vbm/adapter3d/PolygonHandler.js +2 -3
- package/src/sap/ui/vbm/adapter3d/SceneBuilder.js +2 -3
- package/src/sap/ui/vbm/adapter3d/Utilities.js +36 -13
- package/src/sap/ui/vbm/adapter3d/VBIJSONParser.js +2 -3
- package/src/sap/ui/vbm/adapter3d/thirdparty/html2canvas-dbg.js +7274 -0
- package/src/sap/ui/vbm/adapter3d/thirdparty/html2canvas.js +6 -0
- package/src/sap/ui/vbm/adapter3d/thirdparty/three-dbg.js +36365 -0
- package/src/sap/ui/vbm/adapter3d/thirdparty/three.js +6 -0
- package/src/sap/ui/vbm/lib/sapactions.js +1 -2
- package/src/sap/ui/vbm/lib/sapautomations.js +1 -2
- package/src/sap/ui/vbm/lib/sapconfig.js +1 -2
- package/src/sap/ui/vbm/lib/sapdataprovider.js +1 -2
- package/src/sap/ui/vbm/lib/sapevents.js +1 -2
- package/src/sap/ui/vbm/lib/sapgeolocation.js +1 -2
- package/src/sap/ui/vbm/lib/sapgeomath.js +1 -2
- package/src/sap/ui/vbm/lib/sapgeotool.js +1 -2
- package/src/sap/ui/vbm/lib/sapheatmap.js +1 -2
- package/src/sap/ui/vbm/lib/saplabels.js +1 -2
- package/src/sap/ui/vbm/lib/saplassotrack.js +1 -2
- package/src/sap/ui/vbm/lib/sapmaplayer.js +1 -2
- package/src/sap/ui/vbm/lib/sapmapmanager.js +2 -3
- package/src/sap/ui/vbm/lib/sapmapprovider.js +1 -2
- package/src/sap/ui/vbm/lib/sapnavigation.js +1 -2
- package/src/sap/ui/vbm/lib/sapparsing.js +1 -2
- package/src/sap/ui/vbm/lib/sappositioning.js +1 -2
- package/src/sap/ui/vbm/lib/sapprojection.js +1 -2
- package/src/sap/ui/vbm/lib/saprecttrack.js +1 -2
- package/src/sap/ui/vbm/lib/sapresources.js +1 -2
- package/src/sap/ui/vbm/lib/sapscale.js +1 -2
- package/src/sap/ui/vbm/lib/sapscene.js +1 -2
- package/src/sap/ui/vbm/lib/saputilities.js +1 -2
- package/src/sap/ui/vbm/lib/sapvbcluster.js +1 -2
- package/src/sap/ui/vbm/lib/sapvbi.js +1 -2
- package/src/sap/ui/vbm/lib/sapvbicontext.js +1 -2
- package/src/sap/ui/vbm/lib/sapvbmenu.js +1 -2
- package/src/sap/ui/vbm/lib/sapvobase.js +1 -2
- package/src/sap/ui/vbm/lib/sapvoutils.js +1 -2
- package/src/sap/ui/vbm/lib/sapwindow.js +1 -2
- package/src/sap/ui/vbm/library.js +3 -4
- package/src/sap/ui/vbm/themes/base/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_belize/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_belize_hcb/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_belize_hcw/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_belize_plus/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_bluecrystal/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_fiori_3/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_fiori_3_dark/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_fiori_3_hcb/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_fiori_3_hcw/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_hcb/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_horizon/library.source.less +1 -2
- package/ui5.yaml +6 -5
- package/src/sap/ui/vbm/themes/sap_mvi/empty.less +0 -0
package/package.json
CHANGED
package/src/sap/ui/vbm/.library
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<name>sap.ui.vbm</name>
|
|
4
4
|
<vendor>SAP SE</vendor>
|
|
5
5
|
<copyright>SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved</copyright>
|
|
6
|
-
<version>1.
|
|
6
|
+
<version>1.99.0</version>
|
|
7
7
|
|
|
8
8
|
<documentation>SAP UI library: sap.ui.vbm</documentation>
|
|
9
9
|
|
|
@@ -36,6 +36,13 @@
|
|
|
36
36
|
<exclude name="sap.ui.vbm.js." />
|
|
37
37
|
<exclude name="sap.ui.vbm.lib." />
|
|
38
38
|
</jscoverage>
|
|
39
|
+
|
|
40
|
+
<packaging xmlns="http://www.sap.com/ui5/buildext/packaging" version="2.0" >
|
|
41
|
+
<all-in-one>
|
|
42
|
+
<exclude name="sap/ui/vbm/adapter3d/thirdparty/" />
|
|
43
|
+
</all-in-one>
|
|
44
|
+
</packaging>
|
|
45
|
+
|
|
39
46
|
<documentation xmlns="http://www.sap.com/ui5/buildext/documentation"
|
|
40
47
|
indexUrl="../../../../test-resources/sap/ui/vbm/demokit/docuindex.json"
|
|
41
48
|
resolve="lib"
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
2
|
+
* ! SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved
|
|
4
3
|
*/
|
|
5
4
|
|
|
6
5
|
// Provides class sap.ui.vbm.Adapter
|
|
@@ -23,13 +22,12 @@ sap.ui.define([
|
|
|
23
22
|
* @param {string} [sId] id for the new control, generated automatically if no id is given
|
|
24
23
|
* @param {object} [mSettings] initial settings for the new object
|
|
25
24
|
* @author SAP SE
|
|
26
|
-
* @version 1.
|
|
25
|
+
* @version 1.99.0
|
|
27
26
|
* @extends sap.ui.core.Element
|
|
28
27
|
* @constructor
|
|
29
28
|
* @public
|
|
30
29
|
* @alias sap.ui.vbm.Adapter
|
|
31
30
|
* @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
|
|
32
|
-
* @experimental Since 1.48.0 This class is experimental and might be modified or removed in future versions.
|
|
33
31
|
*/
|
|
34
32
|
var Adapter = Element.extend("sap.ui.vbm.Adapter", /** @lends sap.ui.vbm.Adapter.prototype */ {
|
|
35
33
|
metadata: {
|
|
@@ -103,6 +101,32 @@ sap.ui.define([
|
|
|
103
101
|
"start",
|
|
104
102
|
"tooltip"];
|
|
105
103
|
|
|
104
|
+
this._areaProperties = [
|
|
105
|
+
"key", //K: VoBase
|
|
106
|
+
"color", //C: Area, OBJECT_BASE_DATA->FILL_COLOR
|
|
107
|
+
"colorBorder", //D/CB: Area, OBJECT_BASE_DATA->BORDER_COLOR
|
|
108
|
+
"posarray", //H, PM (multipart) /P: Area, AREA_EXTENSION->BORDER_POINTS
|
|
109
|
+
"selectColor", //SC: OBJECT_BASE_DATA->SELECT_COLOR
|
|
110
|
+
"dragdata", //DD: VoAggregation, OBJECT_BASE_DATA->DRAG_DATA
|
|
111
|
+
"VB:s", //VB:s: elected, OBJECT_BASE_DATA->SELECTED
|
|
112
|
+
"VB:c", //H/VB:c: VoAggregation (changeable) OBJECT_BASE_DATA->CHANGEABLE
|
|
113
|
+
"hotScale", //HS: VoAggregation
|
|
114
|
+
"hotDeltaColor", //HC/HDC: VoAggregation, OBJECT_BASE_DATA->HOT_COLOR
|
|
115
|
+
"borderDash", //BD: Area
|
|
116
|
+
"selectColor", //SC: VoAggregation
|
|
117
|
+
"fxdir", //FD: VoAggregation
|
|
118
|
+
"fxsize", //FS: VoAggregation
|
|
119
|
+
"entity", //ET: VoAggregation
|
|
120
|
+
"labelBgColor", //LC/LBC: VoAggregation
|
|
121
|
+
"labelBorderColor", //LBBC: VoAggregation
|
|
122
|
+
"labelPos", //LP: VoAggregation
|
|
123
|
+
"labelText", //LT: VoAggregation
|
|
124
|
+
"labelArrow", //??VOBase
|
|
125
|
+
"label", //L
|
|
126
|
+
"labelAlignment", //"LA"
|
|
127
|
+
"tooltip" //B/TT: VoAggregation
|
|
128
|
+
];
|
|
129
|
+
|
|
106
130
|
// Allowed Spot properties
|
|
107
131
|
this._spotProperties = [
|
|
108
132
|
"alignment",
|
|
@@ -475,6 +499,7 @@ sap.ui.define([
|
|
|
475
499
|
* "Set": [
|
|
476
500
|
* { "name": "Spots", "type": "N", ....},
|
|
477
501
|
* { "name": "Links", "type": "N", ....},
|
|
502
|
+
* { "name": "Areas", "type": "N", ....},
|
|
478
503
|
* ]
|
|
479
504
|
* }
|
|
480
505
|
*
|
|
@@ -484,6 +509,7 @@ sap.ui.define([
|
|
|
484
509
|
* "N": [
|
|
485
510
|
* { "name": "Spots", ... },
|
|
486
511
|
* { "name": "Links", ... },
|
|
512
|
+
* { "name": "Areas", ... },
|
|
487
513
|
* ]
|
|
488
514
|
* }
|
|
489
515
|
* }
|
|
@@ -788,13 +814,18 @@ sap.ui.define([
|
|
|
788
814
|
processDragAndDrop();
|
|
789
815
|
break;
|
|
790
816
|
case "{00100000-2012-0004-B001-F311DE491C77}": // Area
|
|
817
|
+
processProperties(this._areaProperties, this._propsAnomalies);
|
|
818
|
+
voTemplate = new sap.ui.vbm.Area(settings);
|
|
819
|
+
voAggregation = new sap.ui.vbm.Areas(this._ui5Id(definition.id));
|
|
820
|
+
processDragAndDrop();
|
|
821
|
+
break;
|
|
822
|
+
case "{00100000-2014-0004-BDA8-87B904609063}": // "ExtArea" GUID??? from sapvobase
|
|
823
|
+
case "{00100000-2014-0004-B001-9F1B43BE944A}": // "ExtLink" GUID??? from sapvobase
|
|
791
824
|
case "{00100000-2013-0004-B001-7EB3CCC039C4}": // Circle
|
|
792
825
|
case "{00100000-2013-0004-B001-686F01B57873}": // Geo Circle
|
|
793
826
|
case "{00100000-2012-0004-B001-BFED458C3076}": // Box
|
|
794
827
|
case "{00100000-2012-0004-B001-383477EA1DEB}": // Pie Chart
|
|
795
828
|
case "{388951f5-a66b-4423-a5ad-e0ee13c2246f}": // Decal
|
|
796
|
-
case "ExtLink": // GUID???
|
|
797
|
-
case "ExtArea": // GUID???
|
|
798
829
|
default:
|
|
799
830
|
Log.debug("unsupported VO type", definition.type, thisModule);
|
|
800
831
|
return;
|
|
@@ -918,6 +949,9 @@ sap.ui.define([
|
|
|
918
949
|
case "Drop":
|
|
919
950
|
this._event = "drop";
|
|
920
951
|
break;
|
|
952
|
+
case "CreateComplete":
|
|
953
|
+
this._event = "createComplete";
|
|
954
|
+
break;
|
|
921
955
|
case "Select":
|
|
922
956
|
this._event = "select";
|
|
923
957
|
break;
|
|
@@ -931,7 +965,14 @@ sap.ui.define([
|
|
|
931
965
|
this._handler = this._adapter._getKeyboardHandler(this.name);
|
|
932
966
|
break;
|
|
933
967
|
default:
|
|
934
|
-
|
|
968
|
+
if (this.refEvent && this.name) {
|
|
969
|
+
//register for event on map that we don't explicitly handle using its legacy name as its refevent name is unlikely to propagate
|
|
970
|
+
Log.info("No UI5 event found to attach action to. Falling through to default vbi event handling.", this.name, thisModule);
|
|
971
|
+
this._event = this.name;
|
|
972
|
+
} else {
|
|
973
|
+
Log.error("Action invalid. No refEvent or name supplied.", this, thisModule);
|
|
974
|
+
return false;
|
|
975
|
+
}
|
|
935
976
|
}
|
|
936
977
|
this._target.attachEvent(this._event, this._handler, this._listener);
|
|
937
978
|
this._target.invalidate(); // neccessary evil, to force recreation of VO on VBI level, otherwise VO on GeoMap level updated but not on VBI level
|
|
@@ -1469,17 +1510,28 @@ sap.ui.define([
|
|
|
1469
1510
|
var oParameters = event.getParameters();
|
|
1470
1511
|
var oEventData = oParameters.data ? oParameters.data : oParameters;
|
|
1471
1512
|
|
|
1513
|
+
//If no event object then fire submit with original data
|
|
1514
|
+
if (oEventData.Action && !oEventData.Action.object) {
|
|
1515
|
+
this.fireSubmit({
|
|
1516
|
+
data: JSON.stringify(oEventData)
|
|
1517
|
+
});
|
|
1518
|
+
return;
|
|
1519
|
+
}
|
|
1520
|
+
|
|
1472
1521
|
if (oEventData.Action.object.startsWith(this._map().getId())) {
|
|
1473
1522
|
oEventData.Action.object = oEventData.Action.object.substr(this._map().getId().length + 1)
|
|
1474
1523
|
}
|
|
1475
1524
|
if (oEventData.Action && oEventData.Action.object) {
|
|
1476
1525
|
// Whatever back-end refers to as Links, they are referred to as Routes by Geomap
|
|
1477
|
-
|
|
1478
|
-
|
|
1526
|
+
var routeName = "Route", linkName = "Link";
|
|
1527
|
+
var actionObjects = [oEventData.Action.object];
|
|
1528
|
+
if (oEventData.Action.object === routeName) {
|
|
1529
|
+
actionObjects.push(linkName);
|
|
1530
|
+
oEventData.Action.object = linkName;
|
|
1479
1531
|
}
|
|
1480
1532
|
|
|
1481
1533
|
var oAction = sap.ui.vbm.findInArray(this._actions, function(action) {
|
|
1482
|
-
return
|
|
1534
|
+
return (actionObjects.indexOf(action.refVO) != -1) && oEventData.Action.name.toLowerCase() === action.refEvent.toLowerCase();
|
|
1483
1535
|
});
|
|
1484
1536
|
|
|
1485
1537
|
if (oAction) {
|
|
@@ -1587,7 +1639,7 @@ sap.ui.define([
|
|
|
1587
1639
|
}
|
|
1588
1640
|
}, this);
|
|
1589
1641
|
|
|
1590
|
-
|
|
1642
|
+
this.fireSubmit({
|
|
1591
1643
|
data: JSON.stringify(oEventData)
|
|
1592
1644
|
});
|
|
1593
1645
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
2
|
+
* ! SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved
|
|
4
3
|
*/
|
|
5
4
|
|
|
6
5
|
// Provides class sap.ui.vbm.Adapter3D
|
|
@@ -24,7 +23,7 @@ sap.ui.define([
|
|
|
24
23
|
"./adapter3d/thirdparty/three",
|
|
25
24
|
"sap/base/Log",
|
|
26
25
|
"jquery.sap.global",
|
|
27
|
-
"./library"
|
|
26
|
+
"./library"
|
|
28
27
|
], function(Element, Observer, Menu, MenuItem, Popover, Viewport, ObjectFactory, Parser, SceneBuilder, Utilities, HBox, VBox, Link, Button, Text, Image, THREE, Log, jQuery, library) {
|
|
29
28
|
"use strict";
|
|
30
29
|
|
|
@@ -42,7 +41,7 @@ sap.ui.define([
|
|
|
42
41
|
* @param {string} [sId] id for the new control, generated automatically if no id is given
|
|
43
42
|
* @param {object} [mSettings] initial settings for the new object
|
|
44
43
|
* @author SAP SE
|
|
45
|
-
* @version 1.
|
|
44
|
+
* @version 1.99.0
|
|
46
45
|
* @extends sap.ui.core.Element
|
|
47
46
|
* @constructor
|
|
48
47
|
* @public
|
|
@@ -154,7 +153,7 @@ sap.ui.define([
|
|
|
154
153
|
this.toAdd.clear();
|
|
155
154
|
this.toUpdate.clear();
|
|
156
155
|
this.toRemove.clear();
|
|
157
|
-
}
|
|
156
|
+
}
|
|
158
157
|
},
|
|
159
158
|
|
|
160
159
|
// Each queue contains a list of scenes to add, update or remove.
|
|
@@ -217,7 +216,7 @@ sap.ui.define([
|
|
|
217
216
|
anchor: undefined, // anchor DOM element to display responsive popover
|
|
218
217
|
pending: undefined // pending popover, if viewport has not been rendered yet
|
|
219
218
|
};
|
|
220
|
-
|
|
219
|
+
|
|
221
220
|
this._raycaster = new THREE.Raycaster();
|
|
222
221
|
};
|
|
223
222
|
|
|
@@ -385,7 +384,7 @@ sap.ui.define([
|
|
|
385
384
|
that._context.voQueues.clear();
|
|
386
385
|
that._context.sceneQueues.clear();
|
|
387
386
|
that._context.windowQueues.clear();
|
|
388
|
-
|
|
387
|
+
|
|
389
388
|
// scene has changed -> adjust camera clipping planes
|
|
390
389
|
that._viewport._resetBBox();
|
|
391
390
|
that._viewport._updateCamera();
|
|
@@ -721,6 +720,13 @@ sap.ui.define([
|
|
|
721
720
|
};
|
|
722
721
|
|
|
723
722
|
Adapter3D.prototype._genericEventHandler = function(name, event) {
|
|
723
|
+
// special handling section for hardcoded keys
|
|
724
|
+
// 'h' button pressed -> change camera to 'home' (initial) view
|
|
725
|
+
if (event.keyCode == 72) {
|
|
726
|
+
this._viewport.applyCameraHome(false); // no fly-to animation needed here
|
|
727
|
+
return;
|
|
728
|
+
}
|
|
729
|
+
|
|
724
730
|
var instance = event.instance;
|
|
725
731
|
var groupId = instance ? instance.voGroup.id : event.voGroupId;
|
|
726
732
|
var actionDefinition = sap.ui.vbm.findInArray(this._context.actions, function(action) { return action.refVO === groupId && action.refEvent === name; });
|
|
@@ -742,40 +748,32 @@ sap.ui.define([
|
|
|
742
748
|
};
|
|
743
749
|
|
|
744
750
|
if (actionDefinition.name === "KEY_PRESS") {
|
|
745
|
-
|
|
746
|
-
|
|
747
|
-
|
|
748
|
-
|
|
751
|
+
if (["Shift", "Control", "Alt", "Meta"].indexOf(event.key) !== -1 || [16, 17, 18, 91].indexOf(event.code) !== -1) {
|
|
752
|
+
return;
|
|
753
|
+
} else {
|
|
754
|
+
param.push(
|
|
755
|
+
{
|
|
756
|
+
"name": "code",
|
|
757
|
+
"#": event.keyCode
|
|
758
|
+
},
|
|
759
|
+
{
|
|
760
|
+
"name": "shift",
|
|
761
|
+
"#": event.shiftKey
|
|
762
|
+
},
|
|
763
|
+
{
|
|
764
|
+
"name": "ctrl",
|
|
765
|
+
"#": event.ctrlKey
|
|
766
|
+
},
|
|
767
|
+
{
|
|
768
|
+
"name": "alt",
|
|
769
|
+
"#": event.altKey
|
|
770
|
+
},
|
|
771
|
+
{
|
|
772
|
+
"name": "meta",
|
|
773
|
+
"#": event.metaKey
|
|
774
|
+
}
|
|
775
|
+
);
|
|
749
776
|
}
|
|
750
|
-
if (event.key == "Shift" || event.code == 16 ||
|
|
751
|
-
event.key == "Control" || event.code == 17 ||
|
|
752
|
-
event.key == "Alt" || event.code == 18 ||
|
|
753
|
-
event.key == "Meta" || event.code == 91) {
|
|
754
|
-
return;
|
|
755
|
-
} else {
|
|
756
|
-
param.push(
|
|
757
|
-
{
|
|
758
|
-
"name": "code",
|
|
759
|
-
"#": event.keyCode
|
|
760
|
-
},
|
|
761
|
-
{
|
|
762
|
-
"name": "shift",
|
|
763
|
-
"#": event.shiftKey
|
|
764
|
-
},
|
|
765
|
-
{
|
|
766
|
-
"name": "ctrl",
|
|
767
|
-
"#": event.ctrlKey
|
|
768
|
-
},
|
|
769
|
-
{
|
|
770
|
-
"name": "alt",
|
|
771
|
-
"#": event.altKey
|
|
772
|
-
},
|
|
773
|
-
{
|
|
774
|
-
"name": "meta",
|
|
775
|
-
"#": event.metaKey
|
|
776
|
-
}
|
|
777
|
-
);
|
|
778
|
-
}
|
|
779
777
|
} else if (event && event.cursor) {
|
|
780
778
|
param.push(
|
|
781
779
|
{
|
|
@@ -822,22 +820,25 @@ sap.ui.define([
|
|
|
822
820
|
}
|
|
823
821
|
|
|
824
822
|
if (instance && name === "Click" && event.selectionChanges) {
|
|
823
|
+
var dataType = instance.voGroup.datasource, obj;
|
|
824
|
+
var keyAlias = Utilities.getAttributeAlias(this._context, dataType, instance.voGroup.keyAttributeName);
|
|
825
|
+
|
|
825
826
|
payload.Data = {
|
|
826
827
|
Merge: {
|
|
827
828
|
N: [
|
|
828
829
|
{
|
|
829
830
|
name: instance.voGroup.datasource,
|
|
830
831
|
E: event.selectionChanges.selected.map(function(instance) {
|
|
831
|
-
|
|
832
|
-
|
|
833
|
-
|
|
834
|
-
|
|
835
|
-
|
|
836
|
-
|
|
837
|
-
|
|
838
|
-
|
|
839
|
-
|
|
840
|
-
|
|
832
|
+
obj = {};
|
|
833
|
+
obj[keyAlias] = instance.id || "";
|
|
834
|
+
obj["VB:s"] = "true";
|
|
835
|
+
return obj;
|
|
836
|
+
}).concat(event.selectionChanges.deselected.map(function(instance) {
|
|
837
|
+
obj = {};
|
|
838
|
+
obj[keyAlias] = instance.id || "";
|
|
839
|
+
obj["VB:s"] = "false";
|
|
840
|
+
return obj;
|
|
841
|
+
}))
|
|
841
842
|
}
|
|
842
843
|
]
|
|
843
844
|
}
|
|
@@ -918,7 +919,7 @@ sap.ui.define([
|
|
|
918
919
|
|
|
919
920
|
if (instance !== this._hoverInstance) {
|
|
920
921
|
clearTimeout(this._hoverTimeOutId);
|
|
921
|
-
|
|
922
|
+
|
|
922
923
|
this._hoverTimeOutId = setTimeout(function() {
|
|
923
924
|
this._propogateHoverChange(event);
|
|
924
925
|
this._hoverTimeOutId = undefined;
|
|
@@ -949,7 +950,7 @@ sap.ui.define([
|
|
|
949
950
|
|
|
950
951
|
var rect = this._viewport.getDomRef().getBoundingClientRect();
|
|
951
952
|
var normalizedXY = new THREE.Vector2(p.x / rect.width * 2 - 1, -p.y / rect.height * 2 + 1);
|
|
952
|
-
|
|
953
|
+
|
|
953
954
|
this._raycaster.layers.set(0); // test objects from layer #0 only
|
|
954
955
|
this._raycaster.setFromCamera(normalizedXY, camera);
|
|
955
956
|
var intersects = this._raycaster.intersectObjects(scene.children, true);
|
|
@@ -962,7 +963,7 @@ sap.ui.define([
|
|
|
962
963
|
} else {
|
|
963
964
|
instance = info.object._sapInstance;
|
|
964
965
|
}
|
|
965
|
-
|
|
966
|
+
|
|
966
967
|
return {
|
|
967
968
|
info: info,
|
|
968
969
|
point: info.point,
|
package/src/sap/ui/vbm/Area.js
CHANGED
package/src/sap/ui/vbm/Areas.js
CHANGED
package/src/sap/ui/vbm/Box.js
CHANGED
package/src/sap/ui/vbm/Boxes.js
CHANGED
package/src/sap/ui/vbm/Circle.js
CHANGED
package/src/sap/ui/vbm/GeoMap.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-2022 SAP SE. All rights reserved.
|
|
2
|
+
* ! SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved
|
|
4
3
|
*/
|
|
5
4
|
|
|
6
5
|
// Provides control sap.ui.vbm.GeoMap.
|
|
@@ -1059,7 +1058,8 @@ sap.ui.define([
|
|
|
1059
1058
|
case "click":
|
|
1060
1059
|
// fire the click..................................................//
|
|
1061
1060
|
this.fireClick({
|
|
1062
|
-
pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#']
|
|
1061
|
+
pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#'],
|
|
1062
|
+
data: datEvent //include VBI data to the UI5 event payload
|
|
1063
1063
|
});
|
|
1064
1064
|
break;
|
|
1065
1065
|
case "contextMenu":
|
|
@@ -1074,7 +1074,8 @@ sap.ui.define([
|
|
|
1074
1074
|
case "drop":
|
|
1075
1075
|
// fire the drop..................................................//
|
|
1076
1076
|
this.fireDrop({
|
|
1077
|
-
pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#']
|
|
1077
|
+
pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#'],
|
|
1078
|
+
data: datEvent //include VBI data to the UI5 event payload
|
|
1078
1079
|
});
|
|
1079
1080
|
break;
|
|
1080
1081
|
case "zoomChanged":
|
|
@@ -1085,7 +1086,8 @@ sap.ui.define([
|
|
|
1085
1086
|
viewportBB: {
|
|
1086
1087
|
upperLeft: datEvent.Action.Params.Param[3]['#'],
|
|
1087
1088
|
lowerRight: datEvent.Action.Params.Param[4]['#']
|
|
1088
|
-
}
|
|
1089
|
+
},
|
|
1090
|
+
data: datEvent //include VBI data to the UI5 event payload
|
|
1089
1091
|
});
|
|
1090
1092
|
break;
|
|
1091
1093
|
case "centerChanged":
|
|
@@ -1096,7 +1098,8 @@ sap.ui.define([
|
|
|
1096
1098
|
viewportBB: {
|
|
1097
1099
|
upperLeft: datEvent.Action.Params.Param[3]['#'],
|
|
1098
1100
|
lowerRight: datEvent.Action.Params.Param[4]['#']
|
|
1099
|
-
}
|
|
1101
|
+
},
|
|
1102
|
+
data: datEvent //include VBI data to the UI5 event payload
|
|
1100
1103
|
});
|
|
1101
1104
|
break;
|
|
1102
1105
|
case "select":
|
|
@@ -1122,6 +1125,12 @@ sap.ui.define([
|
|
|
1122
1125
|
this.mIACreateCB = null;
|
|
1123
1126
|
throw exc;
|
|
1124
1127
|
}
|
|
1128
|
+
} else {
|
|
1129
|
+
// If interactive editing was triggered indirectly (e.g. via vbiJSON load) then fire event
|
|
1130
|
+
datEvent.Action.name = "CreateComplete";
|
|
1131
|
+
//include VBI data to the UI5 event payload
|
|
1132
|
+
this.fireEvent("createComplete", {data: datEvent}, true);
|
|
1133
|
+
e.preventDefault();
|
|
1125
1134
|
}
|
|
1126
1135
|
break;
|
|
1127
1136
|
case "keydown":
|
|
@@ -2227,4 +2236,4 @@ sap.ui.define([
|
|
|
2227
2236
|
|
|
2228
2237
|
return GeoMap;
|
|
2229
2238
|
|
|
2230
|
-
}, /* bExport= */true);
|
|
2239
|
+
}, /* bExport= */true);
|