@openui5/sap.ui.layout 1.117.1 → 1.119.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/THIRDPARTY.txt +2 -2
- package/package.json +2 -2
- package/src/sap/ui/layout/.library +1 -1
- package/src/sap/ui/layout/AlignedFlowLayout.js +15 -6
- package/src/sap/ui/layout/AssociativeSplitter.js +1 -1
- package/src/sap/ui/layout/BlockLayout.js +1 -1
- package/src/sap/ui/layout/BlockLayoutCell.js +1 -1
- 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 +3 -3
- package/src/sap/ui/layout/ResponsiveSplitterPage.js +1 -1
- package/src/sap/ui/layout/ResponsiveSplitterRenderer.js +4 -3
- 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 +1 -1
- 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 +1 -1
- package/src/sap/ui/layout/changeHandler/HideSimpleForm.js +1 -1
- package/src/sap/ui/layout/changeHandler/MoveSimpleForm.js +1 -1
- package/src/sap/ui/layout/changeHandler/RenameFormContainer.js +1 -1
- package/src/sap/ui/layout/changeHandler/RenameSimpleForm.js +1 -1
- package/src/sap/ui/layout/changeHandler/UnhideSimpleForm.js +1 -1
- 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 +11 -4
- package/src/sap/ui/layout/form/FormElement.js +22 -4
- 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 +33 -1
- package/src/sap/ui/layout/form/SimpleForm.js +1 -1
- package/src/sap/ui/layout/library.js +4 -3
- package/src/sap/ui/layout/messagebundle_bg.properties +1 -1
- package/src/sap/ui/layout/themes/base/AlignedFlowLayout.less +1 -1
- package/src/sap/ui/layout/themes/base/Splitter.less +1 -1
package/THIRDPARTY.txt
CHANGED
|
@@ -401,7 +401,7 @@ License: MIT
|
|
|
401
401
|
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
|
|
402
402
|
Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptive-expressions.js
|
|
403
403
|
|
|
404
|
-
Component: Markdown-it, version: 12.2
|
|
404
|
+
Component: Markdown-it, version: 12.3.2
|
|
405
405
|
Copyright: 2014 Vitaly Puzrin, Alex Kocharin
|
|
406
406
|
License: MIT
|
|
407
407
|
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
|
|
@@ -466,7 +466,7 @@ License: Apache-2.0
|
|
|
466
466
|
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
|
|
467
467
|
Contained in: lib/jsdoc/ui5/plugin.js
|
|
468
468
|
|
|
469
|
-
Component: SAP Theming Base Content, version: 11.
|
|
469
|
+
Component: SAP Theming Base Content, version: 11.6.8
|
|
470
470
|
Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
|
|
471
471
|
License: Apache-2.0
|
|
472
472
|
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openui5/sap.ui.layout",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.119.0",
|
|
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.119.0"
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<copyright>OpenUI5
|
|
7
7
|
* (c) Copyright 2009-2023 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.119.0</version>
|
|
10
10
|
|
|
11
11
|
<documentation>SAPUI5 library with layout controls.</documentation>
|
|
12
12
|
|
|
@@ -40,7 +40,7 @@ sap.ui.define([
|
|
|
40
40
|
* @extends sap.ui.core.Control
|
|
41
41
|
*
|
|
42
42
|
* @author SAP SE
|
|
43
|
-
* @version 1.
|
|
43
|
+
* @version 1.119.0
|
|
44
44
|
*
|
|
45
45
|
* @constructor
|
|
46
46
|
* @private
|
|
@@ -321,16 +321,21 @@ sap.ui.define([
|
|
|
321
321
|
iEndItemOffsetLeft,
|
|
322
322
|
iAvailableWidthForEndItem;
|
|
323
323
|
|
|
324
|
+
var oLastItemComputedStyle = window.getComputedStyle(oLastItemDomRef);
|
|
324
325
|
if (Core.getConfiguration().getRTL()) {
|
|
325
|
-
|
|
326
|
+
var iLastItemMarginLeft = Number.parseFloat(oLastItemComputedStyle.marginLeft);
|
|
327
|
+
iAvailableWidthForEndItem = iLastItemOffsetLeft - iLastItemMarginLeft;
|
|
326
328
|
} else {
|
|
327
|
-
var iLastItemMarginRight = Number.parseFloat(
|
|
328
|
-
var iRightBorderOfLastItem = iLastItemOffsetLeft + oLastItemDomRef.offsetWidth + iLastItemMarginRight;
|
|
329
|
+
var iLastItemMarginRight = Number.parseFloat(oLastItemComputedStyle.marginRight);
|
|
330
|
+
var iRightBorderOfLastItem = iLastItemOffsetLeft + oLastItemDomRef.offsetWidth + iLastItemMarginRight; // iLastItemOffsetLeft includes marginLeft
|
|
331
|
+
|
|
329
332
|
iAvailableWidthForEndItem = oDomRef.offsetWidth - iRightBorderOfLastItem;
|
|
330
333
|
}
|
|
331
334
|
|
|
332
|
-
var
|
|
333
|
-
var
|
|
335
|
+
var oEndItemComputedStyle = window.getComputedStyle(oEndItemDomRef);
|
|
336
|
+
var iEndItemMarginLeft = Number.parseFloat(oEndItemComputedStyle.marginLeft);
|
|
337
|
+
var iEndItemMarginRight = Number.parseFloat(oEndItemComputedStyle.marginRight);
|
|
338
|
+
var bEnoughSpaceForEndItem = iAvailableWidthForEndItem >= iEndItemMarginLeft + iEndItemWidth + iEndItemMarginRight;
|
|
334
339
|
|
|
335
340
|
// if the end item fits into the line
|
|
336
341
|
if (bEnoughSpaceForEndItem) {
|
|
@@ -387,6 +392,8 @@ sap.ui.define([
|
|
|
387
392
|
var sEndItemWidth = iEndItemWidth + "px";
|
|
388
393
|
mLastSpacerStyle.width = sEndItemWidth;
|
|
389
394
|
mLastSpacerStyle.minWidth = sEndItemWidth;
|
|
395
|
+
mLastSpacerStyle.marginLeft = iEndItemMarginLeft + "px";
|
|
396
|
+
mLastSpacerStyle.marginRight = iEndItemMarginRight + "px";
|
|
390
397
|
this.toggleDisplayOfSpacers(oDomRef);
|
|
391
398
|
};
|
|
392
399
|
|
|
@@ -418,6 +425,8 @@ sap.ui.define([
|
|
|
418
425
|
mLastSpacerStyle.width = "";
|
|
419
426
|
mLastSpacerStyle.height = "";
|
|
420
427
|
mLastSpacerStyle.display = "";
|
|
428
|
+
mLastSpacerStyle.marginLeft = "";
|
|
429
|
+
mLastSpacerStyle.marginRight = "";
|
|
421
430
|
}
|
|
422
431
|
|
|
423
432
|
oDomRef.classList.remove(oDomRef.classList.item(0) + "OneLine");
|
|
@@ -70,7 +70,7 @@ sap.ui.define([
|
|
|
70
70
|
* @extends sap.ui.core.Control
|
|
71
71
|
*
|
|
72
72
|
* @author SAP SE
|
|
73
|
-
* @version 1.
|
|
73
|
+
* @version 1.119.0
|
|
74
74
|
*
|
|
75
75
|
* @constructor
|
|
76
76
|
* @public
|
|
@@ -499,8 +499,8 @@ sap.ui.define([
|
|
|
499
499
|
aPages[iPageIndex] && aPages[iPageIndex].setVisible(true);
|
|
500
500
|
$OldSelectedButton.removeClass("sapUiResponsiveSplitterPaginatorSelectedButton");
|
|
501
501
|
$PaginatorButtons.eq(iPageIndex).addClass("sapUiResponsiveSplitterPaginatorSelectedButton");
|
|
502
|
-
$OldSelectedButton.attr("aria-
|
|
503
|
-
$PaginatorButtons.eq(iPageIndex).attr("aria-
|
|
502
|
+
$OldSelectedButton.attr("aria-selected", false);
|
|
503
|
+
$PaginatorButtons.eq(iPageIndex).attr("aria-selected", true);
|
|
504
504
|
};
|
|
505
505
|
|
|
506
506
|
/**
|
|
@@ -63,7 +63,8 @@ sap.ui.define([
|
|
|
63
63
|
|
|
64
64
|
oRm.openStart("div")
|
|
65
65
|
.class("sapUiResponsiveSplitterPaginatorButtons")
|
|
66
|
-
.attr("role", "
|
|
66
|
+
.attr("role", "listbox")
|
|
67
|
+
.attr("aria-multiselectable", true) // Still, only one item at a time can be selected. Set to 'true', as JAWS won't announce selection and root's descriptions otherwise.
|
|
67
68
|
.attr("aria-label", oResourceBundle.getText("RESPONSIVE_SPLITTER_ARIA_PAGINATOR_LABEL"));
|
|
68
69
|
|
|
69
70
|
if (aPages.length > 0) {
|
|
@@ -83,8 +84,8 @@ sap.ui.define([
|
|
|
83
84
|
|
|
84
85
|
oRm.class("sapUiResponsiveSplitterHiddenElement")
|
|
85
86
|
.class("sapUiResponsiveSplitterPaginatorButton")
|
|
86
|
-
.attr("role", "
|
|
87
|
-
.attr("aria-
|
|
87
|
+
.attr("role", "option")
|
|
88
|
+
.attr("aria-selected", false)
|
|
88
89
|
.openEnd()
|
|
89
90
|
.close("div");
|
|
90
91
|
}
|
|
@@ -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.119.0
|
|
28
28
|
*
|
|
29
29
|
* @constructor
|
|
30
30
|
* @public
|
|
@@ -17,7 +17,7 @@ sap.ui.define([
|
|
|
17
17
|
* Change handler for adding a simple form group.
|
|
18
18
|
* @alias sap.ui.layout.changeHandler.AddSimpleFormGroup
|
|
19
19
|
* @author SAP SE
|
|
20
|
-
* @version 1.
|
|
20
|
+
* @version 1.119.0
|
|
21
21
|
* @experimental Since 1.27.0
|
|
22
22
|
*/
|
|
23
23
|
var AddSimpleFormGroup = {};
|
|
@@ -14,7 +14,7 @@ sap.ui.define([
|
|
|
14
14
|
*
|
|
15
15
|
* @alias sap.ui.layout.changeHandler.RenameFormContainer
|
|
16
16
|
* @author SAP SE
|
|
17
|
-
* @version 1.
|
|
17
|
+
* @version 1.119.0
|
|
18
18
|
* @since 1.48
|
|
19
19
|
* @private
|
|
20
20
|
* @experimental Since 1.48. This class is experimental and provides only limited functionality. Also the API might be changed in future.
|
|
@@ -18,7 +18,7 @@ sap.ui.define([
|
|
|
18
18
|
*
|
|
19
19
|
* @alias sap.ui.layout.changeHandler.RenameForm
|
|
20
20
|
* @author SAP SE
|
|
21
|
-
* @version 1.
|
|
21
|
+
* @version 1.119.0
|
|
22
22
|
* @since 1.40
|
|
23
23
|
* @private
|
|
24
24
|
* @experimental Since 1.40. This class is experimental and provides only limited functionality. Also the API might be changed in future.
|
|
@@ -96,7 +96,7 @@ sap.ui.define([
|
|
|
96
96
|
* @see {@link https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Grid_Layout MDN web docs: CSS Grid Layout}
|
|
97
97
|
*
|
|
98
98
|
* @author SAP SE
|
|
99
|
-
* @version 1.
|
|
99
|
+
* @version 1.119.0
|
|
100
100
|
*
|
|
101
101
|
* @extends sap.ui.core.Control
|
|
102
102
|
* @implements sap.ui.layout.cssgrid.IGridConfigurable
|
|
@@ -21,7 +21,7 @@ sap.ui.define([
|
|
|
21
21
|
* Have to possibility to hold multiple sap.ui.layout.cssgrid.GridSettings and apply the currently active GridSettings.
|
|
22
22
|
*
|
|
23
23
|
* @author SAP SE
|
|
24
|
-
* @version 1.
|
|
24
|
+
* @version 1.119.0
|
|
25
25
|
*
|
|
26
26
|
* @extends sap.ui.layout.cssgrid.GridLayoutBase
|
|
27
27
|
*
|
|
@@ -60,7 +60,7 @@ sap.ui.define([
|
|
|
60
60
|
* This control cannot be used stand-alone, it just renders a <code>Form</code> control,
|
|
61
61
|
* so it must be assigned to a <code>Form</code> control using the <code>layout</code> aggregation.
|
|
62
62
|
* @extends sap.ui.layout.form.FormLayout
|
|
63
|
-
* @version 1.
|
|
63
|
+
* @version 1.119.0
|
|
64
64
|
*
|
|
65
65
|
* @constructor
|
|
66
66
|
* @public
|
|
@@ -28,7 +28,7 @@ sap.ui.define([
|
|
|
28
28
|
* @extends sap.ui.core.Element
|
|
29
29
|
*
|
|
30
30
|
* @author SAP SE
|
|
31
|
-
* @version 1.
|
|
31
|
+
* @version 1.119.0
|
|
32
32
|
*
|
|
33
33
|
* @constructor
|
|
34
34
|
* @public
|
|
@@ -121,6 +121,8 @@ sap.ui.define([
|
|
|
121
121
|
|
|
122
122
|
FormContainer.prototype.init = function(){
|
|
123
123
|
|
|
124
|
+
this._oInitPromise = library.form.FormHelper.init();
|
|
125
|
+
|
|
124
126
|
this._rb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.layout");
|
|
125
127
|
|
|
126
128
|
this._oObserver = new ManagedObjectObserver(this._observeChanges.bind(this));
|
|
@@ -148,9 +150,14 @@ sap.ui.define([
|
|
|
148
150
|
|
|
149
151
|
if (bExpandable) {
|
|
150
152
|
if (!this._oExpandButton) {
|
|
151
|
-
if (
|
|
152
|
-
|
|
153
|
-
|
|
153
|
+
if (this._oInitPromise) {
|
|
154
|
+
// module needs to be loaded -> create Button async
|
|
155
|
+
this._oInitPromise.then(function () {
|
|
156
|
+
delete this._oInitPromise; // not longer needed as resolved
|
|
157
|
+
_expandButtonCreated.call(this, library.form.FormHelper.createButton(this.getId() + "--Exp", _handleExpButtonPress, this));
|
|
158
|
+
}.bind(this));
|
|
159
|
+
} else {
|
|
160
|
+
_expandButtonCreated.call(this, library.form.FormHelper.createButton(this.getId() + "--Exp", _handleExpButtonPress, this));
|
|
154
161
|
}
|
|
155
162
|
} else {
|
|
156
163
|
_setExpanderIcon.call(this);
|
|
@@ -26,7 +26,7 @@ sap.ui.define([
|
|
|
26
26
|
* @extends sap.ui.core.Element
|
|
27
27
|
*
|
|
28
28
|
* @author SAP SE
|
|
29
|
-
* @version 1.
|
|
29
|
+
* @version 1.119.0
|
|
30
30
|
*
|
|
31
31
|
* @constructor
|
|
32
32
|
* @public
|
|
@@ -85,6 +85,8 @@ sap.ui.define([
|
|
|
85
85
|
|
|
86
86
|
FormElement.prototype.init = function(){
|
|
87
87
|
|
|
88
|
+
this._oInitPromise = library.form.FormHelper.init();
|
|
89
|
+
|
|
88
90
|
this._oFieldDelegate = {oElement: this, onAfterRendering: _fieldOnAfterRendering};
|
|
89
91
|
|
|
90
92
|
this._oObserver = new ManagedObjectObserver(this._observeChanges.bind(this));
|
|
@@ -139,7 +141,18 @@ sap.ui.define([
|
|
|
139
141
|
this.setAggregation("label", vAny);
|
|
140
142
|
var oLabel = vAny;
|
|
141
143
|
if (typeof oLabel === "string") {
|
|
142
|
-
this.
|
|
144
|
+
if (this._oInitPromise) {
|
|
145
|
+
// module needs to be loaded -> create Label async
|
|
146
|
+
this._oInitPromise.then(function () {
|
|
147
|
+
delete this._oInitPromise; // not longer needed as resolved
|
|
148
|
+
var oLabel = this.getLabel(); // Label might have changed
|
|
149
|
+
if (typeof oLabel === "string") {
|
|
150
|
+
this._setInternalLabel(oLabel);
|
|
151
|
+
}
|
|
152
|
+
}.bind(this));
|
|
153
|
+
} else {
|
|
154
|
+
this._setInternalLabel(oLabel);
|
|
155
|
+
}
|
|
143
156
|
} else {
|
|
144
157
|
if (this._oLabel) {
|
|
145
158
|
this._oLabel.destroy();
|
|
@@ -170,7 +183,7 @@ sap.ui.define([
|
|
|
170
183
|
|
|
171
184
|
if (!this._oLabel) {
|
|
172
185
|
this._oLabel = library.form.FormHelper.createLabel(sText, this.getId() + "-label");
|
|
173
|
-
this.setAggregation("_label", this._oLabel
|
|
186
|
+
this.setAggregation("_label", this._oLabel); // use Aggregation to allow model inheritance
|
|
174
187
|
this._oLabel.disableRequiredChangeCheck(true);
|
|
175
188
|
if (this._oLabel.isRequired) {
|
|
176
189
|
this._oLabel.isRequired = _labelIsRequired;
|
|
@@ -214,7 +227,12 @@ sap.ui.define([
|
|
|
214
227
|
if (this._oLabel) {
|
|
215
228
|
return this._oLabel;
|
|
216
229
|
} else {
|
|
217
|
-
|
|
230
|
+
var vLabel = this.getLabel();
|
|
231
|
+
if (typeof vLabel === "string") {
|
|
232
|
+
// happens if internal label needs to be created async (see this._oInitPromise)
|
|
233
|
+
vLabel = null;
|
|
234
|
+
}
|
|
235
|
+
return vLabel;
|
|
218
236
|
}
|
|
219
237
|
|
|
220
238
|
};
|
|
@@ -53,7 +53,7 @@ sap.ui.define([
|
|
|
53
53
|
*
|
|
54
54
|
* This control cannot be used stand-alone, it just renders a <code>Form</code>, so it must be assigned to a <code>Form</code> using the <code>layout</code> aggregation.
|
|
55
55
|
* @extends sap.ui.layout.form.FormLayout
|
|
56
|
-
* @version 1.
|
|
56
|
+
* @version 1.119.0
|
|
57
57
|
*
|
|
58
58
|
* @constructor
|
|
59
59
|
* @public
|
|
@@ -30,7 +30,7 @@ sap.ui.define([
|
|
|
30
30
|
* @extends sap.ui.layout.form.FormElement
|
|
31
31
|
*
|
|
32
32
|
* @author SAP SE
|
|
33
|
-
* @version 1.
|
|
33
|
+
* @version 1.119.0
|
|
34
34
|
*
|
|
35
35
|
* @constructor
|
|
36
36
|
* @public
|
|
@@ -374,6 +374,17 @@ sap.ui.define([
|
|
|
374
374
|
|
|
375
375
|
function _updateControlsForEdit() {
|
|
376
376
|
|
|
377
|
+
if (this._oInitPromise) {
|
|
378
|
+
// module needs to be loaded -> create Delemiters async
|
|
379
|
+
this._oInitPromise.then(function () {
|
|
380
|
+
delete this._oInitPromise; // not longer needed as resolved
|
|
381
|
+
if (!_renderAsText.call(this)) { // as edit mode might have changed
|
|
382
|
+
_updateControlsForEdit.call(this);
|
|
383
|
+
}
|
|
384
|
+
}.bind(this));
|
|
385
|
+
return;
|
|
386
|
+
}
|
|
387
|
+
|
|
377
388
|
var aFields = this.getFields();
|
|
378
389
|
var aDelimiters = this.getAggregation("_delimiters", []);
|
|
379
390
|
var sDelimiter = this.getDelimiter();
|
|
@@ -415,6 +426,17 @@ sap.ui.define([
|
|
|
415
426
|
|
|
416
427
|
function _updateControlsForDisplay(bSetTextAsync) {
|
|
417
428
|
|
|
429
|
+
if (this._oInitPromise) {
|
|
430
|
+
// module needs to be loaded -> create Delemiters async
|
|
431
|
+
this._oInitPromise.then(function () {
|
|
432
|
+
delete this._oInitPromise; // not longer needed as resolved
|
|
433
|
+
if (_renderAsText.call(this)) { // as edit mode might have changed
|
|
434
|
+
_updateControlsForDisplay.call(this);
|
|
435
|
+
}
|
|
436
|
+
}.bind(this));
|
|
437
|
+
return;
|
|
438
|
+
}
|
|
439
|
+
|
|
418
440
|
var oDisplay = this.getAggregation("_displayField");
|
|
419
441
|
|
|
420
442
|
if (oDisplay) {
|
|
@@ -430,6 +452,7 @@ sap.ui.define([
|
|
|
430
452
|
|
|
431
453
|
// As display text might need some logic to be determined -> determine only if really rendered and not for every update
|
|
432
454
|
function _updateDisplayText(bForce) {
|
|
455
|
+
|
|
433
456
|
var oDisplay = this.getAggregation("_displayField");
|
|
434
457
|
|
|
435
458
|
if (oDisplay && (oDisplay.getDomRef() || bForce)) { // update only if rendered (or forced on before rendering)
|
|
@@ -499,6 +522,15 @@ sap.ui.define([
|
|
|
499
522
|
|
|
500
523
|
if (!this.getLabel()) {
|
|
501
524
|
// only use if no Label is set on FormElement level
|
|
525
|
+
if (this._oInitPromise) {
|
|
526
|
+
// module needs to be loaded -> create Label async
|
|
527
|
+
this._oInitPromise.then(function () {
|
|
528
|
+
delete this._oInitPromise; // not longer needed as resolved
|
|
529
|
+
_updateLabelText.call(this);
|
|
530
|
+
}.bind(this));
|
|
531
|
+
return;
|
|
532
|
+
}
|
|
533
|
+
|
|
502
534
|
var aFieldLabels = this.getFieldLabels();
|
|
503
535
|
var aFields = this.getFields();
|
|
504
536
|
var aTexts = [];
|
|
@@ -67,7 +67,7 @@ sap.ui.define([
|
|
|
67
67
|
* <b>Note:</b> If a more complex form is needed, use the <code>{@link sap.ui.layout.form.Form Form}</code> control instead.
|
|
68
68
|
*
|
|
69
69
|
* @extends sap.ui.core.Control
|
|
70
|
-
* @version 1.
|
|
70
|
+
* @version 1.119.0
|
|
71
71
|
*
|
|
72
72
|
* @constructor
|
|
73
73
|
* @public
|
|
@@ -20,13 +20,13 @@ sap.ui.define([
|
|
|
20
20
|
* @namespace
|
|
21
21
|
* @alias sap.ui.layout
|
|
22
22
|
* @author SAP SE
|
|
23
|
-
* @version 1.
|
|
23
|
+
* @version 1.119.0
|
|
24
24
|
* @since 1.15
|
|
25
25
|
* @public
|
|
26
26
|
*/
|
|
27
27
|
var thisLib = sap.ui.getCore().initLibrary({
|
|
28
28
|
name : "sap.ui.layout",
|
|
29
|
-
version: "1.
|
|
29
|
+
version: "1.119.0",
|
|
30
30
|
dependencies: ["sap.ui.core"],
|
|
31
31
|
designtime: "sap/ui/layout/designtime/library.designtime",
|
|
32
32
|
types: [
|
|
@@ -773,8 +773,9 @@ sap.ui.define([
|
|
|
773
773
|
// factory for Form to create labels and buttons to be overwritten by commons and mobile library
|
|
774
774
|
if (!thisLib.form.FormHelper) {
|
|
775
775
|
thisLib.form.FormHelper = {
|
|
776
|
+
init: function() {return null;}, /* must return a Promise if modules still needs to be loaded. The promise must be fulfilled if everything is loaded. */
|
|
776
777
|
createLabel: function(sText){ throw new Error("no Label control available!"); }, /* must return a Label control */
|
|
777
|
-
createButton: function(sId, fPressFunction,
|
|
778
|
+
createButton: function(sId, fPressFunction, oListener){ throw new Error("no Button control available!"); }, /* must return a button control */
|
|
778
779
|
setButtonContent: function(oButton, sText, sTooltip, sIcon, sIconHovered){ throw new Error("no Button control available!"); },
|
|
779
780
|
addFormClass: function(){ return null; },
|
|
780
781
|
setToolbar: function(oToolbar){ return oToolbar; }, /* allow to overwrite toolbar settings */
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
FORM_EXPAND=\u0420\u0430\u0437\u0448\u0438\u0440\u044F\u0432\u0430\u043D\u0435
|
|
3
3
|
FORM_COLLAPSE=\u0421\u043A\u0440\u0438\u0432\u0430\u043D\u0435
|
|
4
4
|
|
|
5
|
-
SPLITTER_MOVE=\
|
|
5
|
+
SPLITTER_MOVE=\u041D\u0430\u0442\u0438\u0441\u043D\u0435\u0442\u0435 \u043A\u043B\u0430\u0432\u0438\u0448\u0438\u0442\u0435 \u0441\u044A\u0441 \u0441\u0442\u0440\u0435\u043B\u043A\u0438 \u0437\u0430 \u043F\u0440\u0438\u0434\u0432\u0438\u0436\u0432\u0430\u043D\u0435
|
|
6
6
|
|
|
7
7
|
SIDE_CONTENT_LABEL=\u0414\u043E\u043F\u044A\u043B\u043D\u0438\u0442\u0435\u043B\u043D\u043E \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435
|
|
8
8
|
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
|
|
18
18
|
@_sap_ui_layout_Splitter_BarActiveDecorationColors: @sapUiHighlight, @sapUiHighlight;
|
|
19
19
|
@_sap_ui_layout_Splitter_BarDecorationColors: @sapUiHighlight, fade(@sapUiHighlight, 0);
|
|
20
|
-
@_sap_ui_layout_Splitter_BarBorder:
|
|
20
|
+
@_sap_ui_layout_Splitter_BarBorder: 0.0625rem solid @sapUiGroupContentBorderColor;
|
|
21
21
|
@_sap_ui_layout_Splitter_BarHoverIconBorderColor: @sapUiButtonLiteBorderColor;
|
|
22
22
|
@_sap_ui_layout_Splitter_BarHoverIconBackground: @sapUiButtonLiteBackground;
|
|
23
23
|
@_sap_ui_layout_Splitter_GripButtonColor: @sapUiContentIconColor;
|