@openui5/sap.ui.core 1.120.37 → 1.120.38
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/jquery.sap.global.js +1 -1
- package/src/jquery.sap.properties.js +1 -1
- package/src/jquery.sap.resources.js +1 -1
- package/src/jquery.sap.script.js +1 -1
- package/src/jquery.sap.storage.js +3 -3
- package/src/sap/base/Event.js +1 -1
- package/src/sap/base/Eventing.js +1 -1
- package/src/sap/base/config.js +1 -1
- package/src/sap/base/i18n/LanguageTag.js +1 -1
- package/src/sap/base/i18n/date/TimezoneUtils.js +1 -1
- package/src/sap/base/util/restricted/_CancelablePromise.js +1 -1
- package/src/sap/base/util/restricted/_castArray.js +1 -1
- package/src/sap/base/util/restricted/_compact.js +1 -1
- package/src/sap/base/util/restricted/_curry.js +1 -1
- package/src/sap/base/util/restricted/_debounce.js +1 -1
- package/src/sap/base/util/restricted/_difference.js +1 -1
- package/src/sap/base/util/restricted/_differenceBy.js +1 -1
- package/src/sap/base/util/restricted/_differenceWith.js +1 -1
- package/src/sap/base/util/restricted/_flatMap.js +1 -1
- package/src/sap/base/util/restricted/_flatMapDeep.js +1 -1
- package/src/sap/base/util/restricted/_flatMapDepth.js +1 -1
- package/src/sap/base/util/restricted/_flatten.js +1 -1
- package/src/sap/base/util/restricted/_flattenDeep.js +1 -1
- package/src/sap/base/util/restricted/_flattenDepth.js +1 -1
- package/src/sap/base/util/restricted/_intersection.js +1 -1
- package/src/sap/base/util/restricted/_intersectionBy.js +1 -1
- package/src/sap/base/util/restricted/_intersectionWith.js +1 -1
- package/src/sap/base/util/restricted/_isEqual.js +1 -1
- package/src/sap/base/util/restricted/_isEqualWith.js +1 -1
- package/src/sap/base/util/restricted/_isNil.js +1 -1
- package/src/sap/base/util/restricted/_max.js +1 -1
- package/src/sap/base/util/restricted/_merge.js +1 -1
- package/src/sap/base/util/restricted/_mergeWith.js +1 -1
- package/src/sap/base/util/restricted/_min.js +1 -1
- package/src/sap/base/util/restricted/_omit.js +1 -1
- package/src/sap/base/util/restricted/_pick.js +1 -1
- package/src/sap/base/util/restricted/_pickBy.js +1 -1
- package/src/sap/base/util/restricted/_throttle.js +1 -1
- package/src/sap/base/util/restricted/_toArray.js +1 -1
- package/src/sap/base/util/restricted/_union.js +1 -1
- package/src/sap/base/util/restricted/_unionBy.js +1 -1
- package/src/sap/base/util/restricted/_unionWith.js +1 -1
- package/src/sap/base/util/restricted/_uniq.js +1 -1
- package/src/sap/base/util/restricted/_uniqBy.js +1 -1
- package/src/sap/base/util/restricted/_uniqWith.js +1 -1
- package/src/sap/base/util/restricted/_without.js +1 -1
- package/src/sap/base/util/restricted/_xor.js +1 -1
- package/src/sap/base/util/restricted/_xorBy.js +1 -1
- package/src/sap/base/util/restricted/_xorWith.js +1 -1
- package/src/sap/base/util/restricted/_zipObject.js +1 -1
- package/src/sap/base/util/restricted/_zipObjectDeep.js +1 -1
- package/src/sap/ui/Device.js +3 -3
- package/src/sap/ui/Global.js +4 -4
- package/src/sap/ui/base/Event.js +1 -1
- package/src/sap/ui/base/EventProvider.js +1 -1
- package/src/sap/ui/base/Interface.js +1 -1
- package/src/sap/ui/base/ManagedObject.js +1 -1
- package/src/sap/ui/base/ManagedObjectMetadata.js +1 -1
- package/src/sap/ui/base/Metadata.js +1 -1
- package/src/sap/ui/base/Object.js +1 -1
- package/src/sap/ui/base/ObjectPool.js +1 -1
- package/src/sap/ui/core/.library +2 -2
- package/src/sap/ui/core/BusyIndicator.js +1 -1
- package/src/sap/ui/core/Component.js +1 -1
- package/src/sap/ui/core/ComponentContainer.js +1 -1
- package/src/sap/ui/core/ComponentMetadata.js +1 -1
- package/src/sap/ui/core/ComponentSupport.js +1 -1
- package/src/sap/ui/core/Configuration.js +1 -1
- package/src/sap/ui/core/Control.js +1 -1
- package/src/sap/ui/core/Core.js +1 -1
- package/src/sap/ui/core/CustomData.js +1 -1
- package/src/sap/ui/core/DeclarativeSupport.js +1 -1
- package/src/sap/ui/core/Element.js +1 -1
- package/src/sap/ui/core/ElementMetadata.js +1 -1
- package/src/sap/ui/core/EnabledPropagator.js +1 -1
- package/src/sap/ui/core/EventBus.js +1 -1
- package/src/sap/ui/core/Fragment.js +1 -1
- package/src/sap/ui/core/HTML.js +1 -1
- package/src/sap/ui/core/History.js +1 -1
- package/src/sap/ui/core/Icon.js +1 -1
- package/src/sap/ui/core/IndicationColorSupport.js +1 -1
- package/src/sap/ui/core/IntervalTrigger.js +1 -1
- package/src/sap/ui/core/InvisibleMessage.js +1 -1
- package/src/sap/ui/core/InvisibleRenderer.js +1 -1
- package/src/sap/ui/core/InvisibleText.js +1 -1
- package/src/sap/ui/core/Item.js +1 -1
- package/src/sap/ui/core/LabelEnablement.js +1 -1
- package/src/sap/ui/core/LayoutData.js +1 -1
- package/src/sap/ui/core/ListItem.js +1 -1
- package/src/sap/ui/core/LocalBusyIndicator.js +1 -1
- package/src/sap/ui/core/Locale.js +1 -1
- package/src/sap/ui/core/LocaleData.js +1 -1
- package/src/sap/ui/core/Manifest.js +1 -1
- package/src/sap/ui/core/Message.js +1 -1
- package/src/sap/ui/core/RenderManager.js +1 -1
- package/src/sap/ui/core/Renderer.js +1 -1
- package/src/sap/ui/core/ResizeHandler.js +1 -1
- package/src/sap/ui/core/ScrollBar.js +1 -1
- package/src/sap/ui/core/SeparatorItem.js +1 -1
- package/src/sap/ui/core/Title.js +1 -1
- package/src/sap/ui/core/TooltipBase.js +1 -1
- package/src/sap/ui/core/UIArea.js +1 -1
- package/src/sap/ui/core/UIComponent.js +1 -1
- package/src/sap/ui/core/UIComponentMetadata.js +1 -1
- package/src/sap/ui/core/ValueStateSupport.js +1 -1
- package/src/sap/ui/core/VariantLayoutData.js +1 -1
- package/src/sap/ui/core/XMLComposite.js +1 -1
- package/src/sap/ui/core/XMLCompositeMetadata.js +1 -1
- package/src/sap/ui/core/date/UI5Date.js +1 -1
- package/src/sap/ui/core/delegate/ItemNavigation.js +1 -1
- package/src/sap/ui/core/delegate/ScrollEnablement.js +1 -1
- package/src/sap/ui/core/dnd/DragDropBase.js +1 -1
- package/src/sap/ui/core/dnd/DragDropInfo.js +1 -1
- package/src/sap/ui/core/dnd/DragInfo.js +1 -1
- package/src/sap/ui/core/dnd/DropInfo.js +1 -1
- package/src/sap/ui/core/format/TimezoneUtil.js +1 -1
- package/src/sap/ui/core/getCompatibilityVersion.js +1 -1
- package/src/sap/ui/core/hyphenation/Hyphenation.js +1 -1
- package/src/sap/ui/core/library.js +3 -3
- package/src/sap/ui/core/message/ControlMessageProcessor.js +1 -1
- package/src/sap/ui/core/message/Message.js +1 -1
- package/src/sap/ui/core/message/MessageManager.js +1 -1
- package/src/sap/ui/core/message/MessageParser.js +1 -1
- package/src/sap/ui/core/message/MessageProcessor.js +1 -1
- package/src/sap/ui/core/mvc/HTMLView.js +1 -1
- package/src/sap/ui/core/mvc/JSONView.js +1 -1
- package/src/sap/ui/core/mvc/JSView.js +1 -1
- package/src/sap/ui/core/mvc/TemplateView.js +1 -1
- package/src/sap/ui/core/mvc/View.js +1 -1
- package/src/sap/ui/core/mvc/XMLView.js +1 -1
- package/src/sap/ui/core/plugin/DeclarativeSupport.js +1 -1
- package/src/sap/ui/core/plugin/LessSupport.js +1 -1
- package/src/sap/ui/core/plugin/TemplatingSupport.js +1 -1
- package/src/sap/ui/core/postmessage/Bus.js +1 -1
- package/src/sap/ui/core/postmessage/confirmationDialog.js +1 -1
- package/src/sap/ui/core/search/OpenSearchProvider.js +1 -1
- package/src/sap/ui/core/search/SearchProvider.js +1 -1
- package/src/sap/ui/core/service/Service.js +1 -1
- package/src/sap/ui/core/service/ServiceFactory.js +1 -1
- package/src/sap/ui/core/service/ServiceFactoryRegistry.js +1 -1
- package/src/sap/ui/core/support/Plugin.js +1 -1
- package/src/sap/ui/core/support/Support.js +1 -1
- package/src/sap/ui/core/support/plugins/ControlTree.js +1 -1
- package/src/sap/ui/core/support/plugins/Interaction.js +1 -1
- package/src/sap/ui/core/support/plugins/LocalStorage.js +1 -1
- package/src/sap/ui/core/support/plugins/Performance.js +1 -1
- package/src/sap/ui/core/support/plugins/Selector.js +1 -1
- package/src/sap/ui/core/support/plugins/TechInfo.js +1 -1
- package/src/sap/ui/core/support/plugins/Trace.js +1 -1
- package/src/sap/ui/core/support/plugins/ViewInfo.js +1 -1
- package/src/sap/ui/core/tmpl/DOMAttribute.js +1 -1
- package/src/sap/ui/core/tmpl/DOMElement.js +1 -1
- package/src/sap/ui/core/tmpl/HandlebarsTemplate.js +1 -1
- package/src/sap/ui/core/tmpl/Template.js +1 -1
- package/src/sap/ui/core/tmpl/TemplateControl.js +1 -1
- package/src/sap/ui/core/util/AsyncHintsHelper.js +1 -1
- package/src/sap/ui/core/util/Export.js +1 -1
- package/src/sap/ui/core/util/ExportCell.js +1 -1
- package/src/sap/ui/core/util/ExportColumn.js +1 -1
- package/src/sap/ui/core/util/ExportRow.js +1 -1
- package/src/sap/ui/core/util/ExportType.js +1 -1
- package/src/sap/ui/core/util/ExportTypeCSV.js +1 -1
- package/src/sap/ui/core/util/File.js +1 -1
- package/src/sap/ui/core/util/LibraryInfo.js +1 -1
- package/src/sap/ui/core/util/MockServer.js +1 -1
- package/src/sap/ui/core/util/PasteHelper.js +1 -1
- package/src/sap/ui/core/util/serializer/HTMLViewSerializer.js +1 -1
- package/src/sap/ui/core/util/serializer/Serializer.js +1 -1
- package/src/sap/ui/core/util/serializer/ViewSerializer.js +1 -1
- package/src/sap/ui/core/util/serializer/XMLViewSerializer.js +1 -1
- package/src/sap/ui/core/util/serializer/delegate/Delegate.js +1 -1
- package/src/sap/ui/core/util/serializer/delegate/HTML.js +1 -1
- package/src/sap/ui/core/util/serializer/delegate/XML.js +1 -1
- package/src/sap/ui/core/webc/WebComponent.js +1 -1
- package/src/sap/ui/core/webc/WebComponentMetadata.js +1 -1
- package/src/sap/ui/core/ws/ReadyState.js +1 -1
- package/src/sap/ui/core/ws/SapPcpWebSocket.js +1 -1
- package/src/sap/ui/core/ws/WebSocket.js +1 -1
- package/src/sap/ui/debug/ControlTree.js +1 -1
- package/src/sap/ui/debug/DebugEnv.js +1 -1
- package/src/sap/ui/debug/PropertyList.js +1 -1
- package/src/sap/ui/model/ClientModel.js +1 -1
- package/src/sap/ui/model/CompositeDataState.js +1 -1
- package/src/sap/ui/model/CompositeType.js +1 -1
- package/src/sap/ui/model/DataState.js +1 -1
- package/src/sap/ui/model/MetaModel.js +1 -1
- package/src/sap/ui/model/Model.js +1 -1
- package/src/sap/ui/model/SelectionModel.js +1 -1
- package/src/sap/ui/model/SimpleType.js +1 -1
- package/src/sap/ui/model/TreeAutoExpandMode.js +1 -1
- package/src/sap/ui/model/Type.js +1 -1
- package/src/sap/ui/model/json/JSONModel.js +1 -1
- package/src/sap/ui/model/message/MessageModel.js +1 -1
- package/src/sap/ui/model/odata/ODataAnnotations.js +1 -1
- package/src/sap/ui/model/odata/ODataMessageParser.js +1 -1
- package/src/sap/ui/model/odata/ODataMetaModel.js +1 -1
- package/src/sap/ui/model/odata/ODataMetadata.js +1 -1
- package/src/sap/ui/model/odata/ODataModel.js +1 -1
- package/src/sap/ui/model/odata/type/Boolean.js +1 -1
- package/src/sap/ui/model/odata/type/Byte.js +1 -1
- package/src/sap/ui/model/odata/type/Currency.js +1 -1
- package/src/sap/ui/model/odata/type/Date.js +1 -1
- package/src/sap/ui/model/odata/type/DateTime.js +1 -1
- package/src/sap/ui/model/odata/type/DateTimeBase.js +1 -1
- package/src/sap/ui/model/odata/type/DateTimeOffset.js +1 -1
- package/src/sap/ui/model/odata/type/DateTimeWithTimezone.js +1 -1
- package/src/sap/ui/model/odata/type/Decimal.js +1 -1
- package/src/sap/ui/model/odata/type/Double.js +1 -1
- package/src/sap/ui/model/odata/type/Guid.js +1 -1
- package/src/sap/ui/model/odata/type/Int.js +1 -1
- package/src/sap/ui/model/odata/type/Int16.js +1 -1
- package/src/sap/ui/model/odata/type/Int32.js +1 -1
- package/src/sap/ui/model/odata/type/Int64.js +1 -1
- package/src/sap/ui/model/odata/type/ODataType.js +1 -1
- package/src/sap/ui/model/odata/type/Raw.js +1 -1
- package/src/sap/ui/model/odata/type/SByte.js +1 -1
- package/src/sap/ui/model/odata/type/Single.js +1 -1
- package/src/sap/ui/model/odata/type/Stream.js +1 -1
- package/src/sap/ui/model/odata/type/String.js +1 -1
- package/src/sap/ui/model/odata/type/Time.js +1 -1
- package/src/sap/ui/model/odata/type/TimeOfDay.js +1 -1
- package/src/sap/ui/model/odata/type/Unit.js +1 -1
- package/src/sap/ui/model/odata/v2/Context.js +1 -1
- package/src/sap/ui/model/odata/v2/ODataAnnotations.js +1 -1
- package/src/sap/ui/model/odata/v2/ODataModel.js +4 -3
- package/src/sap/ui/model/odata/v2/ODataTreeBinding.js +14 -9
- package/src/sap/ui/model/odata/v4/Context.js +1 -1
- package/src/sap/ui/model/odata/v4/ODataContextBinding.js +1 -1
- package/src/sap/ui/model/odata/v4/ODataListBinding.js +2 -2
- package/src/sap/ui/model/odata/v4/ODataMetaModel.js +1 -1
- package/src/sap/ui/model/odata/v4/ODataModel.js +1 -1
- package/src/sap/ui/model/odata/v4/ODataPropertyBinding.js +1 -1
- package/src/sap/ui/model/resource/ResourceModel.js +1 -1
- package/src/sap/ui/model/type/Boolean.js +1 -1
- package/src/sap/ui/model/type/Currency.js +1 -1
- package/src/sap/ui/model/type/Date.js +1 -1
- package/src/sap/ui/model/type/DateInterval.js +1 -1
- package/src/sap/ui/model/type/DateTime.js +1 -1
- package/src/sap/ui/model/type/DateTimeInterval.js +1 -1
- package/src/sap/ui/model/type/FileSize.js +1 -1
- package/src/sap/ui/model/type/Float.js +1 -1
- package/src/sap/ui/model/type/Integer.js +1 -1
- package/src/sap/ui/model/type/String.js +1 -1
- package/src/sap/ui/model/type/Time.js +1 -1
- package/src/sap/ui/model/type/TimeInterval.js +1 -1
- package/src/sap/ui/model/type/Unit.js +1 -1
- package/src/sap/ui/model/xml/XMLModel.js +1 -1
- package/src/sap/ui/qunit/utils/ControlIterator.js +1 -1
- package/src/sap/ui/qunit/utils/MemoryLeakCheck.js +1 -1
- package/src/sap/ui/test/generic/TestBase.js +1 -1
- package/src/sap/ui/thirdparty/jszip.js +44 -2
- package/src/sap/ui/util/Storage.js +1 -1
|
@@ -37,7 +37,7 @@ sap.ui.define('sap/ui/debug/DebugEnv', [
|
|
|
37
37
|
* @class Central Class for the Debug Environment
|
|
38
38
|
*
|
|
39
39
|
* @author Martin Schaus, Frank Weigel
|
|
40
|
-
* @version 1.120.
|
|
40
|
+
* @version 1.120.38
|
|
41
41
|
* @private
|
|
42
42
|
* @alias sap.ui.debug.DebugEnv
|
|
43
43
|
* @deprecated As of Version 1.120
|
|
@@ -39,7 +39,7 @@ sap.ui.define(['./SimpleType'],
|
|
|
39
39
|
* <code>true</code>.
|
|
40
40
|
* @extends sap.ui.model.SimpleType
|
|
41
41
|
* @public
|
|
42
|
-
* @version 1.120.
|
|
42
|
+
* @version 1.120.38
|
|
43
43
|
*/
|
|
44
44
|
var CompositeType = SimpleType.extend("sap.ui.model.CompositeType", /** @lends sap.ui.model.CompositeType.prototype */ {
|
|
45
45
|
|
|
@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/EventProvider', "sap/base/assert"],
|
|
|
20
20
|
* @extends sap.ui.base.EventProvider
|
|
21
21
|
*
|
|
22
22
|
* @author SAP SE
|
|
23
|
-
* @version 1.120.
|
|
23
|
+
* @version 1.120.38
|
|
24
24
|
*
|
|
25
25
|
* @param {int} iSelectionMode <code>sap.ui.model.SelectionModel.SINGLE_SELECTION</code> or <code>sap.ui.model.SelectionModel.MULTI_SELECTION</code>
|
|
26
26
|
*
|
package/src/sap/ui/model/Type.js
CHANGED
|
@@ -65,7 +65,7 @@ sap.ui.define([
|
|
|
65
65
|
* @extends sap.ui.model.type.Currency
|
|
66
66
|
* @public
|
|
67
67
|
* @since 1.63.0
|
|
68
|
-
* @version 1.120.
|
|
68
|
+
* @version 1.120.38
|
|
69
69
|
*/
|
|
70
70
|
var Currency = BaseCurrency.extend("sap.ui.model.odata.type.Currency", {
|
|
71
71
|
constructor : function (oFormatOptions, oConstraints) {
|
|
@@ -92,7 +92,7 @@ sap.ui.define([
|
|
|
92
92
|
* @extends sap.ui.model.odata.type.ODataType
|
|
93
93
|
* @public
|
|
94
94
|
* @since 1.27.0
|
|
95
|
-
* @version 1.120.
|
|
95
|
+
* @version 1.120.38
|
|
96
96
|
*/
|
|
97
97
|
var DateTimeBase = ODataType.extend("sap.ui.model.odata.type.DateTimeBase", {
|
|
98
98
|
constructor : function (oFormatOptions, oConstraints) {
|
|
@@ -45,7 +45,7 @@ sap.ui.define([
|
|
|
45
45
|
* @public
|
|
46
46
|
* @see {sap.ui.model.odata.v2.ODataModel#bindProperty}
|
|
47
47
|
* @since 1.99.0
|
|
48
|
-
* @version 1.120.
|
|
48
|
+
* @version 1.120.38
|
|
49
49
|
*/
|
|
50
50
|
var DateTimeWithTimezone = CompositeType.extend("sap.ui.model.odata.type.DateTimeWithTimezone",
|
|
51
51
|
{
|
|
@@ -30,7 +30,7 @@ sap.ui.define([
|
|
|
30
30
|
* @extends sap.ui.model.odata.type.ODataType
|
|
31
31
|
* @public
|
|
32
32
|
* @since 1.37.0
|
|
33
|
-
* @version 1.120.
|
|
33
|
+
* @version 1.120.38
|
|
34
34
|
*/
|
|
35
35
|
var Raw = ODataType.extend("sap.ui.model.odata.type.Raw", {
|
|
36
36
|
constructor : function (oFormatOptions, oConstraints) {
|
|
@@ -60,7 +60,7 @@ sap.ui.define([
|
|
|
60
60
|
* @extends sap.ui.model.odata.type.ODataType
|
|
61
61
|
* @public
|
|
62
62
|
* @since 1.51.0
|
|
63
|
-
* @version 1.120.
|
|
63
|
+
* @version 1.120.38
|
|
64
64
|
*/
|
|
65
65
|
var Stream = ODataType.extend("sap.ui.model.odata.type.Stream", {
|
|
66
66
|
constructor : function (oFormatOptions, oConstraints) {
|
|
@@ -92,7 +92,7 @@ sap.ui.define([
|
|
|
92
92
|
* @extends sap.ui.model.odata.type.ODataType
|
|
93
93
|
* @public
|
|
94
94
|
* @since 1.37.0
|
|
95
|
-
* @version 1.120.
|
|
95
|
+
* @version 1.120.38
|
|
96
96
|
*/
|
|
97
97
|
var TimeOfDay = ODataType.extend("sap.ui.model.odata.type.TimeOfDay", {
|
|
98
98
|
constructor : function (oFormatOptions, oConstraints) {
|
|
@@ -66,7 +66,7 @@ sap.ui.define([
|
|
|
66
66
|
* @extends sap.ui.model.type.Unit
|
|
67
67
|
* @public
|
|
68
68
|
* @since 1.63.0
|
|
69
|
-
* @version 1.120.
|
|
69
|
+
* @version 1.120.38
|
|
70
70
|
*/
|
|
71
71
|
var Unit = BaseUnit.extend("sap.ui.model.odata.type.Unit", {
|
|
72
72
|
constructor : function (oFormatOptions, oConstraints, aDynamicFormatOptionNames) {
|
|
@@ -64,7 +64,7 @@ sap.ui.define([
|
|
|
64
64
|
* @hideconstructor
|
|
65
65
|
* @public
|
|
66
66
|
* @since 1.93.0
|
|
67
|
-
* @version 1.120.
|
|
67
|
+
* @version 1.120.38
|
|
68
68
|
*/
|
|
69
69
|
var Context = BaseContext.extend("sap.ui.model.odata.v2.Context", {
|
|
70
70
|
constructor : function (oModel, sPath, sDeepPath, oCreatePromise, bInactive,
|
|
@@ -219,7 +219,7 @@ sap.ui.define([
|
|
|
219
219
|
* This model is not prepared to be inherited from.
|
|
220
220
|
*
|
|
221
221
|
* @author SAP SE
|
|
222
|
-
* @version 1.120.
|
|
222
|
+
* @version 1.120.38
|
|
223
223
|
*
|
|
224
224
|
* @public
|
|
225
225
|
* @alias sap.ui.model.odata.v2.ODataModel
|
|
@@ -2689,10 +2689,11 @@ sap.ui.define([
|
|
|
2689
2689
|
* Create URL parameters from custom parameters
|
|
2690
2690
|
*
|
|
2691
2691
|
* @param {map} mParameters Map of custom parameters
|
|
2692
|
+
* @param {boolean} [bIgnoreExpandSelect] Whether to ignore the expand and select parameters
|
|
2692
2693
|
* @returns {string} sCustomParameters & joined parameters
|
|
2693
2694
|
* @private
|
|
2694
2695
|
*/
|
|
2695
|
-
ODataModel.prototype.createCustomParams = function(mParameters) {
|
|
2696
|
+
ODataModel.prototype.createCustomParams = function(mParameters, bIgnoreExpandSelect) {
|
|
2696
2697
|
var aCustomParams = [],
|
|
2697
2698
|
mCustomQueryOptions,
|
|
2698
2699
|
mSupportedParams = {
|
|
@@ -2700,7 +2701,7 @@ sap.ui.define([
|
|
|
2700
2701
|
select: true
|
|
2701
2702
|
};
|
|
2702
2703
|
for (var sName in mParameters) {
|
|
2703
|
-
if (sName in mSupportedParams) {
|
|
2704
|
+
if (sName in mSupportedParams && !bIgnoreExpandSelect) {
|
|
2704
2705
|
aCustomParams.push("$" + sName + "=" + encodeURL(mParameters[sName]));
|
|
2705
2706
|
}
|
|
2706
2707
|
if (sName === "custom") {
|
|
@@ -102,7 +102,7 @@ sap.ui.define([
|
|
|
102
102
|
* @extends sap.ui.model.TreeBinding
|
|
103
103
|
* @hideconstructor
|
|
104
104
|
* @public
|
|
105
|
-
* @version 1.120.
|
|
105
|
+
* @version 1.120.38
|
|
106
106
|
*/
|
|
107
107
|
var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
|
|
108
108
|
|
|
@@ -851,18 +851,19 @@ sap.ui.define([
|
|
|
851
851
|
}
|
|
852
852
|
|
|
853
853
|
// figure out how to request the count
|
|
854
|
-
var sCountType = "";
|
|
855
854
|
let oHeaders;
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
} else if (this.sCountMode == CountMode.Inline || this.sCountMode == CountMode.InlineRepeat) {
|
|
855
|
+
const bSeparateCountRequest = this.sCountMode === CountMode.Request || this.sCountMode === CountMode.Both;
|
|
856
|
+
const sCountType = bSeparateCountRequest ? "/$count" : "";
|
|
857
|
+
if (this.sCountMode == CountMode.Inline || this.sCountMode == CountMode.InlineRepeat) {
|
|
860
858
|
aParams.push("$top=0");
|
|
861
859
|
aParams.push("$inlinecount=allpages");
|
|
862
860
|
oHeaders = this._getHeaders();
|
|
863
861
|
}
|
|
864
862
|
|
|
865
|
-
if (this.
|
|
863
|
+
if (this.sCustomParams4CountRequest && bSeparateCountRequest) {
|
|
864
|
+
aParams.push(this.sCustomParams4CountRequest);
|
|
865
|
+
}
|
|
866
|
+
if (this.sCustomParams && !bSeparateCountRequest) {
|
|
866
867
|
aParams.push(this.sCustomParams);
|
|
867
868
|
}
|
|
868
869
|
|
|
@@ -943,8 +944,8 @@ sap.ui.define([
|
|
|
943
944
|
aParams.push(sFilterParams);
|
|
944
945
|
}
|
|
945
946
|
|
|
946
|
-
if (this.
|
|
947
|
-
aParams.push(this.
|
|
947
|
+
if (this.sCustomParams4CountRequest) {
|
|
948
|
+
aParams.push(this.sCustomParams4CountRequest);
|
|
948
949
|
}
|
|
949
950
|
|
|
950
951
|
// Only send request, if path is defined
|
|
@@ -2342,6 +2343,8 @@ sap.ui.define([
|
|
|
2342
2343
|
}
|
|
2343
2344
|
}
|
|
2344
2345
|
this.sCustomParams = this.oModel.createCustomParams(this.mParameters);
|
|
2346
|
+
this.sCustomParams4CountRequest = this.oModel.createCustomParams(this.mParameters,
|
|
2347
|
+
/* bIgnoreExpandSelect */ true);
|
|
2345
2348
|
}
|
|
2346
2349
|
sAdapterModuleName = "sap/ui/model/odata/ODataTreeBindingFlat";
|
|
2347
2350
|
}
|
|
@@ -2397,6 +2400,8 @@ sap.ui.define([
|
|
|
2397
2400
|
}
|
|
2398
2401
|
|
|
2399
2402
|
this.sCustomParams = this.oModel.createCustomParams(this.mParameters);
|
|
2403
|
+
this.sCustomParams4CountRequest = this.oModel.createCustomParams(this.mParameters,
|
|
2404
|
+
/* bIgnoreExpandSelect */ true);
|
|
2400
2405
|
}
|
|
2401
2406
|
|
|
2402
2407
|
//after parameter processing:
|
|
@@ -74,7 +74,7 @@ sap.ui.define([
|
|
|
74
74
|
* @mixes sap.ui.model.odata.v4.ODataParentBinding
|
|
75
75
|
* @public
|
|
76
76
|
* @since 1.37.0
|
|
77
|
-
* @version 1.120.
|
|
77
|
+
* @version 1.120.38
|
|
78
78
|
*
|
|
79
79
|
* @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
|
|
80
80
|
* @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
|
|
@@ -57,7 +57,7 @@ sap.ui.define([
|
|
|
57
57
|
* @mixes sap.ui.model.odata.v4.ODataParentBinding
|
|
58
58
|
* @public
|
|
59
59
|
* @since 1.37.0
|
|
60
|
-
* @version 1.120.
|
|
60
|
+
* @version 1.120.38
|
|
61
61
|
* @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
|
|
62
62
|
* @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
|
|
63
63
|
* @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
|
|
@@ -2252,7 +2252,7 @@ sap.ui.define([
|
|
|
2252
2252
|
oContext.oBinding = that;
|
|
2253
2253
|
});
|
|
2254
2254
|
oCache = oBinding.oCache;
|
|
2255
|
-
oCache.setQueryOptions(mQueryOptions);
|
|
2255
|
+
oCache.setQueryOptions(mQueryOptions, /*bForce*/true);
|
|
2256
2256
|
// avoid that the cache is set inactive or that contexts are destroyed
|
|
2257
2257
|
oBinding.oCache = null;
|
|
2258
2258
|
oBinding.oCachePromise = SyncPromise.resolve(null);
|
|
@@ -234,7 +234,7 @@ sap.ui.define([
|
|
|
234
234
|
* @extends sap.ui.model.Model
|
|
235
235
|
* @public
|
|
236
236
|
* @since 1.37.0
|
|
237
|
-
* @version 1.120.
|
|
237
|
+
* @version 1.120.38
|
|
238
238
|
*/
|
|
239
239
|
ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
|
|
240
240
|
/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
|
|
@@ -42,7 +42,7 @@ sap.ui.define([
|
|
|
42
42
|
* @mixes sap.ui.model.odata.v4.ODataBinding
|
|
43
43
|
* @public
|
|
44
44
|
* @since 1.37.0
|
|
45
|
-
* @version 1.120.
|
|
45
|
+
* @version 1.120.38
|
|
46
46
|
* @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
|
|
47
47
|
* @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
|
|
48
48
|
* @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
|
|
@@ -227,7 +227,7 @@ sap.ui.define([
|
|
|
227
227
|
*
|
|
228
228
|
* @extends sap.ui.model.Model
|
|
229
229
|
* @public
|
|
230
|
-
* @version 1.120.
|
|
230
|
+
* @version 1.120.38
|
|
231
231
|
*/
|
|
232
232
|
var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
|
|
233
233
|
|