@openui5/sap.ui.layout 1.104.0 → 1.105.1
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/.reuse/dep5 +1 -1
- package/THIRDPARTY.txt +1 -1
- package/package.json +2 -2
- package/src/sap/ui/layout/.library +1 -1
- package/src/sap/ui/layout/AlignedFlowLayout.js +1 -1
- package/src/sap/ui/layout/AssociativeSplitter.js +3 -4
- package/src/sap/ui/layout/BlockLayout.js +1 -1
- package/src/sap/ui/layout/BlockLayoutCell.js +2 -3
- package/src/sap/ui/layout/BlockLayoutCellData.js +1 -1
- package/src/sap/ui/layout/BlockLayoutRow.js +1 -1
- package/src/sap/ui/layout/DynamicSideContent.js +1 -1
- package/src/sap/ui/layout/FixFlex.js +1 -1
- package/src/sap/ui/layout/Grid.js +1 -1
- package/src/sap/ui/layout/GridData.js +1 -1
- package/src/sap/ui/layout/GridRenderer.js +1 -1
- package/src/sap/ui/layout/HorizontalLayout.js +1 -1
- package/src/sap/ui/layout/PaneContainer.js +1 -1
- package/src/sap/ui/layout/ResponsiveFlowLayout.js +1 -1
- package/src/sap/ui/layout/ResponsiveFlowLayoutData.js +1 -1
- package/src/sap/ui/layout/ResponsiveSplitter.js +1 -1
- package/src/sap/ui/layout/ResponsiveSplitterPage.js +1 -1
- package/src/sap/ui/layout/SplitPane.js +1 -1
- package/src/sap/ui/layout/Splitter.js +1 -1
- package/src/sap/ui/layout/SplitterLayoutData.js +1 -1
- package/src/sap/ui/layout/VerticalLayout.js +1 -1
- package/src/sap/ui/layout/changeHandler/AddFormContainer.js +24 -34
- package/src/sap/ui/layout/changeHandler/AddFormField.js +1 -1
- package/src/sap/ui/layout/changeHandler/AddSimpleFormField.js +1 -1
- package/src/sap/ui/layout/changeHandler/AddSimpleFormGroup.js +27 -32
- package/src/sap/ui/layout/changeHandler/HideSimpleForm.js +11 -9
- package/src/sap/ui/layout/changeHandler/MoveSimpleForm.js +8 -6
- package/src/sap/ui/layout/changeHandler/RenameFormContainer.js +8 -19
- package/src/sap/ui/layout/changeHandler/RenameSimpleForm.js +18 -20
- package/src/sap/ui/layout/changeHandler/UnhideSimpleForm.js +13 -13
- package/src/sap/ui/layout/cssgrid/CSSGrid.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridBasicLayout.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridBoxLayout.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridItemLayoutData.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridLayoutBase.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridLayoutDelegate.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridResponsiveLayout.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridSettings.js +1 -1
- package/src/sap/ui/layout/cssgrid/ResponsiveColumnItemLayoutData.js +1 -1
- package/src/sap/ui/layout/cssgrid/ResponsiveColumnLayout.js +1 -1
- package/src/sap/ui/layout/form/ColumnContainerData.js +1 -1
- package/src/sap/ui/layout/form/ColumnElementData.js +1 -1
- package/src/sap/ui/layout/form/ColumnLayout.js +1 -1
- package/src/sap/ui/layout/form/Form.js +1 -1
- package/src/sap/ui/layout/form/FormContainer.js +1 -1
- package/src/sap/ui/layout/form/FormElement.js +1 -1
- package/src/sap/ui/layout/form/FormLayout.js +1 -1
- package/src/sap/ui/layout/form/GridContainerData.js +1 -1
- package/src/sap/ui/layout/form/GridElementData.js +1 -1
- package/src/sap/ui/layout/form/GridLayout.js +1 -1
- package/src/sap/ui/layout/form/ResponsiveGridLayout.js +1 -1
- package/src/sap/ui/layout/form/ResponsiveLayout.js +1 -1
- package/src/sap/ui/layout/form/SemanticFormElement.js +1 -1
- package/src/sap/ui/layout/form/SimpleForm.js +1 -1
- package/src/sap/ui/layout/library.js +2 -2
package/.reuse/dep5
CHANGED
|
@@ -159,7 +159,7 @@ Copyright:
|
|
|
159
159
|
License: Apache-2.0 and MIT
|
|
160
160
|
Comment: these files contain content from SAP and jQuery.rtl-scroll-type: _FeatureDetection.js is overall written by SAP, but contains code which is inspired by jQuery.rtl-scroll-type
|
|
161
161
|
|
|
162
|
-
Files: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite
|
|
162
|
+
Files: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite.*
|
|
163
163
|
Copyright: jQuery Foundation and other contributors
|
|
164
164
|
License: MIT
|
|
165
165
|
Comment: these files belong to: QUnit Composite
|
package/THIRDPARTY.txt
CHANGED
|
@@ -104,7 +104,7 @@ Component: QUnit Composite, version: 1.0.2-pre
|
|
|
104
104
|
Copyright: jQuery Foundation and other contributors
|
|
105
105
|
License: MIT
|
|
106
106
|
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
|
|
107
|
-
Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite
|
|
107
|
+
Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite.*
|
|
108
108
|
|
|
109
109
|
Component: JUnit Reporter for QUnit, version: 1.1.1
|
|
110
110
|
Copyright: jQuery Foundation and other contributors
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openui5/sap.ui.layout",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.105.1",
|
|
4
4
|
"description": "OpenUI5 UI Library sap.ui.layout",
|
|
5
5
|
"author": "SAP SE (https://www.sap.com)",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -14,6 +14,6 @@
|
|
|
14
14
|
"url": "https://github.com/SAP/openui5.git"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@openui5/sap.ui.core": "1.
|
|
17
|
+
"@openui5/sap.ui.core": "1.105.1"
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<copyright>OpenUI5
|
|
7
7
|
* (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
|
|
8
8
|
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
|
|
9
|
-
<version>1.
|
|
9
|
+
<version>1.105.1</version>
|
|
10
10
|
|
|
11
11
|
<documentation>SAPUI5 library with layout controls.</documentation>
|
|
12
12
|
|
|
@@ -7,9 +7,8 @@
|
|
|
7
7
|
sap.ui.define([
|
|
8
8
|
'./Splitter',
|
|
9
9
|
'./SplitterRenderer',
|
|
10
|
-
"sap/base/Log"
|
|
11
|
-
|
|
12
|
-
], function(Splitter, SplitterRenderer, Log, SplitterLayoutData) {
|
|
10
|
+
"sap/base/Log"
|
|
11
|
+
], function(Splitter, SplitterRenderer, Log) {
|
|
13
12
|
"use strict";
|
|
14
13
|
|
|
15
14
|
/**
|
|
@@ -25,7 +24,7 @@ sap.ui.define([
|
|
|
25
24
|
* @extends sap.ui.layout.Splitter
|
|
26
25
|
*
|
|
27
26
|
* @author SAP SE
|
|
28
|
-
* @version 1.
|
|
27
|
+
* @version 1.105.1
|
|
29
28
|
*
|
|
30
29
|
* @constructor
|
|
31
30
|
* @private
|
|
@@ -9,10 +9,9 @@ sap.ui.define([
|
|
|
9
9
|
'./library',
|
|
10
10
|
"./BlockLayoutCellRenderer",
|
|
11
11
|
"sap/base/Log",
|
|
12
|
-
"./BlockLayoutCellData",
|
|
13
12
|
"sap/ui/thirdparty/jquery"
|
|
14
13
|
],
|
|
15
|
-
function(Control, library, BlockLayoutCellRenderer, Log,
|
|
14
|
+
function(Control, library, BlockLayoutCellRenderer, Log, jQuery) {
|
|
16
15
|
"use strict";
|
|
17
16
|
|
|
18
17
|
/**
|
|
@@ -27,7 +26,7 @@ sap.ui.define([
|
|
|
27
26
|
* @extends sap.ui.core.Control
|
|
28
27
|
*
|
|
29
28
|
* @author SAP SE
|
|
30
|
-
* @version 1.
|
|
29
|
+
* @version 1.105.1
|
|
31
30
|
*
|
|
32
31
|
* @constructor
|
|
33
32
|
* @public
|
|
@@ -24,7 +24,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library'],
|
|
|
24
24
|
* (The CSS value "auto" is used internally to recalculate the size of the content
|
|
25
25
|
* dynamically and is not directly set as style property.)
|
|
26
26
|
* @extends sap.ui.core.LayoutData
|
|
27
|
-
* @version 1.
|
|
27
|
+
* @version 1.105.1
|
|
28
28
|
*
|
|
29
29
|
* @constructor
|
|
30
30
|
* @public
|
|
@@ -6,14 +6,10 @@
|
|
|
6
6
|
|
|
7
7
|
sap.ui.define([
|
|
8
8
|
"sap/ui/fl/changeHandler/Base",
|
|
9
|
-
"sap/ui/core/util/reflection/JsControlTreeModifier"
|
|
10
|
-
"sap/base/Log",
|
|
11
|
-
"sap/ui/thirdparty/jquery"
|
|
9
|
+
"sap/ui/core/util/reflection/JsControlTreeModifier"
|
|
12
10
|
], function(
|
|
13
11
|
Base,
|
|
14
|
-
JsControlTreeModifier
|
|
15
|
-
Log,
|
|
16
|
-
jQuery
|
|
12
|
+
JsControlTreeModifier
|
|
17
13
|
) {
|
|
18
14
|
"use strict";
|
|
19
15
|
|
|
@@ -21,7 +17,7 @@ sap.ui.define([
|
|
|
21
17
|
* Change handler for adding a form group.
|
|
22
18
|
* @alias sap.ui.layout.changeHandler.AddFormContainer
|
|
23
19
|
* @author SAP SE
|
|
24
|
-
* @version 1.
|
|
20
|
+
* @version 1.105.1
|
|
25
21
|
* @experimental Since 1.48.0
|
|
26
22
|
*/
|
|
27
23
|
var AddGroup = { };
|
|
@@ -42,18 +38,21 @@ sap.ui.define([
|
|
|
42
38
|
var oModifier = mPropertyBag.modifier;
|
|
43
39
|
var oAppComponent = mPropertyBag.appComponent;
|
|
44
40
|
var oView = mPropertyBag.view;
|
|
45
|
-
var
|
|
41
|
+
var oContent = oChange.getContent();
|
|
42
|
+
var oTexts = oChange.getTexts();
|
|
46
43
|
|
|
47
|
-
if (
|
|
48
|
-
|
|
49
|
-
&&
|
|
50
|
-
&&
|
|
51
|
-
&&
|
|
52
|
-
&&
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
var
|
|
56
|
-
var
|
|
44
|
+
if (
|
|
45
|
+
oTexts
|
|
46
|
+
&& oTexts.groupLabel
|
|
47
|
+
&& oTexts.groupLabel.value
|
|
48
|
+
&& oContent
|
|
49
|
+
&& oContent.group
|
|
50
|
+
&& (oContent.group.selector || oContent.group.id)
|
|
51
|
+
) {
|
|
52
|
+
var sTitleText = oTexts.groupLabel.value;
|
|
53
|
+
var iInsertIndex = oContent.group.index;
|
|
54
|
+
var mNewGroupSelector = oContent.group.selector || { id : oContent.group.id };
|
|
55
|
+
var mNewTitleSelector = Object.assign({}, mNewGroupSelector);
|
|
57
56
|
|
|
58
57
|
mNewTitleSelector.id = mNewTitleSelector.id + "--title"; //same as FormRenderer does it
|
|
59
58
|
oChange.setRevertData({newGroupSelector: mNewGroupSelector});
|
|
@@ -81,12 +80,6 @@ sap.ui.define([
|
|
|
81
80
|
.then(oModifier.insertAggregation.bind(oModifier, oForm, "formContainers", oGroup, iInsertIndex, oView));
|
|
82
81
|
});
|
|
83
82
|
} else {
|
|
84
|
-
Log.error("Change does not contain sufficient information to be applied: ["
|
|
85
|
-
+ oChangeDefinition.layer + "]"
|
|
86
|
-
+ oChangeDefinition.namespace + "/"
|
|
87
|
-
+ oChangeDefinition.fileName + "."
|
|
88
|
-
+ oChangeDefinition.fileType);
|
|
89
|
-
//however subsequent changes should be applied
|
|
90
83
|
return Promise.resolve();
|
|
91
84
|
}
|
|
92
85
|
};
|
|
@@ -103,32 +96,29 @@ sap.ui.define([
|
|
|
103
96
|
* @public
|
|
104
97
|
*/
|
|
105
98
|
AddGroup.completeChangeContent = function(oChange, oSpecificChangeInfo, mPropertyBag) {
|
|
106
|
-
var oChangeDefinition = oChange.getDefinition();
|
|
107
99
|
var oAppComponent = mPropertyBag.appComponent;
|
|
108
100
|
|
|
109
101
|
if (oSpecificChangeInfo.newLabel) {
|
|
110
|
-
|
|
102
|
+
oChange.setText("groupLabel", oSpecificChangeInfo.newLabel, "XFLD");
|
|
111
103
|
} else {
|
|
112
104
|
throw new Error("Cannot create a new group: oSpecificChangeInfo.groupLabel attribute required");
|
|
113
105
|
}
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
}
|
|
117
|
-
if (!oChangeDefinition.content.group) {
|
|
118
|
-
oChangeDefinition.content.group = {};
|
|
119
|
-
}
|
|
106
|
+
var oContent = {
|
|
107
|
+
group: {}
|
|
108
|
+
};
|
|
120
109
|
|
|
121
110
|
if (oSpecificChangeInfo.index === undefined) {
|
|
122
111
|
throw new Error("Cannot create a new group: oSpecificChangeInfo.index attribute required");
|
|
123
112
|
} else {
|
|
124
|
-
|
|
113
|
+
oContent.group.index = oSpecificChangeInfo.index;
|
|
125
114
|
}
|
|
126
115
|
|
|
127
116
|
if ( oSpecificChangeInfo.newControlId ){
|
|
128
|
-
|
|
117
|
+
oContent.group.selector = JsControlTreeModifier.getSelector(oSpecificChangeInfo.newControlId, oAppComponent);
|
|
129
118
|
} else {
|
|
130
119
|
throw new Error("Cannot create a new group: oSpecificChangeInfo.newControlId attribute required");
|
|
131
120
|
}
|
|
121
|
+
oChange.setContent(oContent);
|
|
132
122
|
};
|
|
133
123
|
|
|
134
124
|
/**
|
|
@@ -6,12 +6,10 @@
|
|
|
6
6
|
|
|
7
7
|
sap.ui.define([
|
|
8
8
|
"sap/ui/fl/changeHandler/Base",
|
|
9
|
-
"sap/ui/core/util/reflection/JsControlTreeModifier"
|
|
10
|
-
"sap/base/Log"
|
|
9
|
+
"sap/ui/core/util/reflection/JsControlTreeModifier"
|
|
11
10
|
], function (
|
|
12
11
|
Base,
|
|
13
|
-
JsControlTreeModifier
|
|
14
|
-
Log
|
|
12
|
+
JsControlTreeModifier
|
|
15
13
|
) {
|
|
16
14
|
"use strict";
|
|
17
15
|
|
|
@@ -19,7 +17,7 @@ sap.ui.define([
|
|
|
19
17
|
* Change handler for adding a simple form group.
|
|
20
18
|
* @alias sap.ui.layout.changeHandler.AddSimpleFormGroup
|
|
21
19
|
* @author SAP SE
|
|
22
|
-
* @version 1.
|
|
20
|
+
* @version 1.105.1
|
|
23
21
|
* @experimental Since 1.27.0
|
|
24
22
|
*/
|
|
25
23
|
var AddSimpleFormGroup = {};
|
|
@@ -94,11 +92,14 @@ sap.ui.define([
|
|
|
94
92
|
var oAppComponent = mPropertyBag.appComponent;
|
|
95
93
|
var iInsertIndex;
|
|
96
94
|
|
|
97
|
-
var
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
95
|
+
var oTexts = oChangeWrapper.getTexts();
|
|
96
|
+
var oContent = oChangeWrapper.getContent();
|
|
97
|
+
if (
|
|
98
|
+
oTexts && oTexts.groupLabel && oTexts.groupLabel.value
|
|
99
|
+
&& oContent && oContent.group &&
|
|
100
|
+
(oContent.group.selector || oContent.group.id)
|
|
101
|
+
) {
|
|
102
|
+
var oGroupSelector = oContent.group.selector;
|
|
102
103
|
var sGroupId;
|
|
103
104
|
if (oGroupSelector) {
|
|
104
105
|
if (oGroupSelector.idIsLocal) {
|
|
@@ -107,21 +108,21 @@ sap.ui.define([
|
|
|
107
108
|
sGroupId = oGroupSelector.id;
|
|
108
109
|
}
|
|
109
110
|
} else {
|
|
110
|
-
sGroupId =
|
|
111
|
+
sGroupId = oContent.group.id;
|
|
111
112
|
}
|
|
112
113
|
oChangeWrapper.setRevertData({groupId: sGroupId});
|
|
113
|
-
var sLabelText =
|
|
114
|
+
var sLabelText = oTexts.groupLabel.value;
|
|
114
115
|
var iRelativeIndex;
|
|
115
116
|
return Promise.resolve()
|
|
116
117
|
.then(function(){
|
|
117
118
|
return oModifier.getAggregation(oForm, AddSimpleFormGroup.CONTENT_AGGREGATION);
|
|
118
119
|
})
|
|
119
120
|
.then(function(aContent){
|
|
120
|
-
if (typeof
|
|
121
|
+
if (typeof oContent.group.index === "number") {
|
|
121
122
|
// The old code support
|
|
122
|
-
return
|
|
123
|
+
return oContent.group.index;
|
|
123
124
|
} else {
|
|
124
|
-
iRelativeIndex =
|
|
125
|
+
iRelativeIndex = oContent.group.relativeIndex;
|
|
125
126
|
return fnMapGroupIndexToContentAggregationIndex(oModifier,
|
|
126
127
|
["sap.ui.core.Title", "sap.m.Title", "sap.m.Toolbar", "sap.m.OverflowToolbar"],
|
|
127
128
|
aContent, iRelativeIndex);
|
|
@@ -139,17 +140,13 @@ sap.ui.define([
|
|
|
139
140
|
oModifier.setProperty(oTitle, "text", sLabelText);
|
|
140
141
|
return oModifier.insertAggregation(oForm, "content", oTitle, iInsertIndex, oView);
|
|
141
142
|
});
|
|
142
|
-
|
|
143
|
-
} else {
|
|
144
|
-
Log.error("Change does not contain sufficient information to be applied: [" + oChange.layer + "]" + oChange.namespace + "/" + oChange.fileName + "." + oChange.fileType);
|
|
145
|
-
//however subsequent changes should be applied
|
|
146
143
|
}
|
|
147
144
|
};
|
|
148
145
|
|
|
149
146
|
/**
|
|
150
147
|
* Completes the change by adding change handler specific content
|
|
151
148
|
*
|
|
152
|
-
* @param {sap.ui.fl.Change}
|
|
149
|
+
* @param {sap.ui.fl.Change} oChange Change wrapper object to be completed
|
|
153
150
|
* @param {object} oSpecificChangeInfo with attributes "groupLabel", the group label to be included in the change and "newControlId", the control ID for the control to be added
|
|
154
151
|
* @param {object} mPropertyBag Property bag containing the modifier, the appComponent and the view
|
|
155
152
|
* @param {object} mPropertyBag.modifier Modifier for the controls
|
|
@@ -157,23 +154,19 @@ sap.ui.define([
|
|
|
157
154
|
* @param {object} mPropertyBag.view Application view
|
|
158
155
|
* @public
|
|
159
156
|
*/
|
|
160
|
-
AddSimpleFormGroup.completeChangeContent = function (
|
|
161
|
-
var oChange = oChangeWrapper.getDefinition();
|
|
157
|
+
AddSimpleFormGroup.completeChangeContent = function (oChange, oSpecificChangeInfo, mPropertyBag) {
|
|
162
158
|
var oAppComponent = mPropertyBag.appComponent;
|
|
159
|
+
var oContent = {
|
|
160
|
+
group: {}
|
|
161
|
+
};
|
|
163
162
|
|
|
164
163
|
if (oSpecificChangeInfo.newLabel) {
|
|
165
|
-
|
|
164
|
+
oChange.setText("groupLabel", oSpecificChangeInfo.newLabel, "XFLD");
|
|
166
165
|
} else {
|
|
167
166
|
throw new Error("oSpecificChangeInfo.newLabel attribute required");
|
|
168
167
|
}
|
|
169
|
-
if (!oChange.content) {
|
|
170
|
-
oChange.content = {};
|
|
171
|
-
}
|
|
172
|
-
if (!oChange.content.group) {
|
|
173
|
-
oChange.content.group = {};
|
|
174
|
-
}
|
|
175
168
|
if (oSpecificChangeInfo.newControlId) {
|
|
176
|
-
|
|
169
|
+
oContent.group.selector = JsControlTreeModifier.getSelector(oSpecificChangeInfo.newControlId, oAppComponent);
|
|
177
170
|
} else {
|
|
178
171
|
throw new Error("oSpecificChangeInfo.newControlId attribute required");
|
|
179
172
|
}
|
|
@@ -181,8 +174,10 @@ sap.ui.define([
|
|
|
181
174
|
if (oSpecificChangeInfo.index === undefined) {
|
|
182
175
|
throw new Error("oSpecificChangeInfo.index attribute required");
|
|
183
176
|
} else {
|
|
184
|
-
|
|
177
|
+
oContent.group.relativeIndex = oSpecificChangeInfo.index;
|
|
185
178
|
}
|
|
179
|
+
|
|
180
|
+
oChange.setContent(oContent);
|
|
186
181
|
};
|
|
187
182
|
|
|
188
183
|
/**
|
|
@@ -233,7 +228,7 @@ sap.ui.define([
|
|
|
233
228
|
};
|
|
234
229
|
|
|
235
230
|
AddSimpleFormGroup.getChangeVisualizationInfo = function(oChange, oAppComponent) {
|
|
236
|
-
var oSelector = oChange.
|
|
231
|
+
var oSelector = oChange.getContent().group.selector;
|
|
237
232
|
var oAffectedGroup = JsControlTreeModifier.bySelector(oSelector, oAppComponent).getParent().getId();
|
|
238
233
|
return {
|
|
239
234
|
affectedControls: [oAffectedGroup]
|
|
@@ -17,7 +17,7 @@ sap.ui.define([
|
|
|
17
17
|
* Change handler for hiding of a control.
|
|
18
18
|
* @alias sap.ui.fl.changeHandler.HideControl
|
|
19
19
|
* @author SAP SE
|
|
20
|
-
* @version 1.
|
|
20
|
+
* @version 1.105.1
|
|
21
21
|
* @experimental Since 1.27.0
|
|
22
22
|
*/
|
|
23
23
|
var HideForm = { };
|
|
@@ -58,7 +58,6 @@ sap.ui.define([
|
|
|
58
58
|
var oView = mPropertyBag.view;
|
|
59
59
|
var oAppComponent = mPropertyBag.appComponent;
|
|
60
60
|
|
|
61
|
-
var oChangeDefinition = oChange.getDefinition();
|
|
62
61
|
|
|
63
62
|
// in case of custom fields the application needs to be on JS.
|
|
64
63
|
// In the other case the visuality of the hidden control will be overriden by the custom field binding afterwards
|
|
@@ -66,8 +65,9 @@ sap.ui.define([
|
|
|
66
65
|
return Promise.reject(Error("Change cannot be applied in XML. Retrying in JS."));
|
|
67
66
|
}
|
|
68
67
|
|
|
68
|
+
var oContent = oChange.getContent();
|
|
69
69
|
// !important : sHideId was used in 1.40, do not remove for compatibility!
|
|
70
|
-
var oRemovedElement = oModifier.bySelector(
|
|
70
|
+
var oRemovedElement = oModifier.bySelector(oContent.elementSelector || oContent.sHideId, oAppComponent, oView);
|
|
71
71
|
var aContent;
|
|
72
72
|
|
|
73
73
|
return this._getState(oControl, oModifier, oAppComponent)
|
|
@@ -88,7 +88,8 @@ sap.ui.define([
|
|
|
88
88
|
})
|
|
89
89
|
.then(function() {
|
|
90
90
|
var iStart = -1;
|
|
91
|
-
|
|
91
|
+
var sChangeType = oChange.getChangeType();
|
|
92
|
+
if (sChangeType === "hideSimpleFormField") {
|
|
92
93
|
aContent.some(function (oField, index) {
|
|
93
94
|
if (oField === oRemovedElement) {
|
|
94
95
|
iStart = index;
|
|
@@ -104,7 +105,7 @@ sap.ui.define([
|
|
|
104
105
|
}
|
|
105
106
|
}
|
|
106
107
|
});
|
|
107
|
-
} else if (
|
|
108
|
+
} else if (sChangeType === "removeSimpleFormGroup") {
|
|
108
109
|
var aPromises = [];
|
|
109
110
|
var oTitleOrToolbar = fnGetFirstToolbarOrTitle(aContent, oModifier);
|
|
110
111
|
var bFirstContainerWithoutTitle = oTitleOrToolbar && !oRemovedElement;
|
|
@@ -161,7 +162,7 @@ sap.ui.define([
|
|
|
161
162
|
}
|
|
162
163
|
return Promise.resolve();
|
|
163
164
|
})
|
|
164
|
-
.
|
|
165
|
+
.catch(function(oError) {
|
|
165
166
|
oChange.resetRevertData();
|
|
166
167
|
Log.error(oError.message || oError.name);
|
|
167
168
|
});
|
|
@@ -192,10 +193,11 @@ sap.ui.define([
|
|
|
192
193
|
* @public
|
|
193
194
|
*/
|
|
194
195
|
HideForm.completeChangeContent = function(oChangeWrapper, oSpecificChangeInfo, mPropertyBag) {
|
|
195
|
-
var oChange = oChangeWrapper.getDefinition();
|
|
196
196
|
if (oSpecificChangeInfo.removedElement && oSpecificChangeInfo.removedElement.id) {
|
|
197
197
|
var oStableElement = this._getStableElement(sap.ui.getCore().byId(oSpecificChangeInfo.removedElement.id));
|
|
198
|
-
|
|
198
|
+
oChangeWrapper.setContent({
|
|
199
|
+
elementSelector: JsControlTreeModifier.getSelector(oStableElement, mPropertyBag.appComponent)
|
|
200
|
+
});
|
|
199
201
|
oChangeWrapper.addDependentControl(oStableElement, "elementSelector", mPropertyBag);
|
|
200
202
|
} else {
|
|
201
203
|
throw new Error("oSpecificChangeInfo.removedElement.id attribute required");
|
|
@@ -268,7 +270,7 @@ sap.ui.define([
|
|
|
268
270
|
};
|
|
269
271
|
|
|
270
272
|
HideForm.getChangeVisualizationInfo = function(oChange, oAppComponent) {
|
|
271
|
-
var oSelector = oChange.
|
|
273
|
+
var oSelector = oChange.getContent().elementSelector;
|
|
272
274
|
var oElement = JsControlTreeModifier.bySelector(oSelector, oAppComponent);
|
|
273
275
|
var oDisplaySelector = oChange.getChangeType() === "removeSimpleFormGroup"
|
|
274
276
|
? oElement.getParent().getId()
|
|
@@ -20,7 +20,7 @@ sap.ui.define([
|
|
|
20
20
|
*
|
|
21
21
|
* @alias sap.ui.layout.changeHandler.MoveSimpleForm
|
|
22
22
|
* @author SAP SE
|
|
23
|
-
* @version 1.
|
|
23
|
+
* @version 1.105.1
|
|
24
24
|
* @experimental Since 1.34.0
|
|
25
25
|
*/
|
|
26
26
|
var MoveSimpleForm = {};
|
|
@@ -410,11 +410,13 @@ sap.ui.define([
|
|
|
410
410
|
Log.error("Element not found. This may be caused by an unstable id!");
|
|
411
411
|
}
|
|
412
412
|
|
|
413
|
-
var
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
413
|
+
var oContent = {
|
|
414
|
+
targetSelector: mStableChangeInfo.targetSelector,
|
|
415
|
+
movedElements: mStableChangeInfo.movedElements,
|
|
416
|
+
// legacy changes had only a string with <appComponentId>---<uid>
|
|
417
|
+
newControlId: oModifier.getSelector(oView.createId(uid()), oAppComponent)
|
|
418
|
+
};
|
|
419
|
+
oChange.setContent(oContent);
|
|
418
420
|
|
|
419
421
|
if (mStableChangeInfo.source && mStableChangeInfo.target){
|
|
420
422
|
oChange.addDependentControl(mStableChangeInfo.source, "sourceParent", mPropertyBag);
|