@openui5/sap.ui.integration 1.98.0 → 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 +3 -3
- package/src/sap/ui/integration/.library +1 -1
- package/src/sap/ui/integration/ActionDefinition.js +1 -1
- package/src/sap/ui/integration/Designtime.js +1 -1
- package/src/sap/ui/integration/Extension.js +1 -1
- package/src/sap/ui/integration/Host.js +1 -1
- package/src/sap/ui/integration/cards/AdaptiveContent.js +5 -25
- package/src/sap/ui/integration/cards/AnalyticalContent.js +1 -1
- package/src/sap/ui/integration/cards/AnalyticsCloudContent.js +1 -1
- package/src/sap/ui/integration/cards/BaseContent.js +77 -7
- package/src/sap/ui/integration/cards/BaseContentRenderer.js +8 -3
- package/src/sap/ui/integration/cards/BaseListContent.js +41 -3
- package/src/sap/ui/integration/cards/CalendarContent.js +1 -1
- package/src/sap/ui/integration/cards/ComponentContent.js +1 -1
- package/src/sap/ui/integration/cards/Footer.js +25 -8
- package/src/sap/ui/integration/cards/Header.js +1 -1
- package/src/sap/ui/integration/cards/ListContent.js +3 -2
- package/src/sap/ui/integration/cards/ListContentRenderer.js +9 -5
- package/src/sap/ui/integration/cards/NumericHeader.js +1 -1
- package/src/sap/ui/integration/cards/ObjectContent.js +1 -1
- package/src/sap/ui/integration/cards/TableContent.js +3 -2
- package/src/sap/ui/integration/cards/TableContentRenderer.js +5 -4
- package/src/sap/ui/integration/cards/TimelineContent.js +3 -2
- package/src/sap/ui/integration/cards/TimelineContentRenderer.js +4 -7
- package/src/sap/ui/integration/cards/WebPageContent.js +1 -1
- package/src/sap/ui/integration/cards/actions/CardActions.js +1 -1
- package/src/sap/ui/integration/cards/adaptivecards/elements/UI5InputChoiceSet.js +44 -2
- package/src/sap/ui/integration/cards/adaptivecards/elements/UI5InputDate.js +38 -3
- package/src/sap/ui/integration/cards/adaptivecards/elements/UI5InputNumber.js +36 -3
- package/src/sap/ui/integration/cards/adaptivecards/elements/UI5InputText.js +41 -4
- package/src/sap/ui/integration/cards/adaptivecards/elements/UI5InputTime.js +26 -115
- package/src/sap/ui/integration/cards/adaptivecards/elements/UI5InputToggle.js +36 -2
- package/src/sap/ui/integration/cards/adaptivecards/overwrites/ActionRender.js +6 -0
- package/src/sap/ui/integration/cards/adaptivecards/overwrites/inputsGeneralOverwrites.js +115 -0
- package/src/sap/ui/integration/cards/filters/BaseFilter.js +19 -2
- package/src/sap/ui/integration/cards/filters/DateRangeFilter.js +6 -1
- package/src/sap/ui/integration/cards/filters/FilterBar.js +1 -1
- package/src/sap/ui/integration/cards/filters/FilterBarFactory.js +1 -1
- package/src/sap/ui/integration/cards/filters/SearchFilter.js +11 -2
- package/src/sap/ui/integration/cards/filters/SelectFilter.js +7 -2
- package/src/sap/ui/integration/controls/ActionsStrip.js +5 -1
- package/src/sap/ui/integration/controls/ActionsToolbar.js +1 -1
- package/src/sap/ui/integration/controls/ActionsToolbarRenderer.js +1 -1
- package/src/sap/ui/integration/controls/ListContentItem.js +1 -1
- package/src/sap/ui/integration/controls/ListContentItemRenderer.js +1 -1
- package/src/sap/ui/integration/controls/Microchart.js +1 -1
- package/src/sap/ui/integration/controls/MicrochartLegend.js +1 -1
- package/src/sap/ui/integration/controls/Paginator.js +171 -0
- package/src/sap/ui/integration/controls/PaginatorRenderer.js +113 -0
- package/src/sap/ui/integration/designtime/baseEditor/BaseEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/PropertyEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/PropertyEditors.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/BasePropertyEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/PropertyEditorFactory.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/arrayEditor/ArrayEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/booleanEditor/BooleanEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/dateEditor/DateEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/dateTimeEditor/DateTimeEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/enumStringEditor/EnumStringEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/groupEditor/GroupEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/iconEditor/IconEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/iconEditor/IsInIconPool.validator.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/integerEditor/IntegerEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/jsonEditor/JsonEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/listEditor/ListEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/mapEditor/MapEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/multiSelectEditor/MultiSelectEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/numberEditor/NumberEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/selectEditor/SelectEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/separatorEditor/SeparatorEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/stringEditor/StringEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/propertyEditor/textAreaEditor/TextAreaEditor.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/util/binding/ObjectBinding.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/util/unset.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/validator/IsBoolean.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/validator/IsDate.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/validator/IsInteger.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/validator/IsNumber.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/validator/IsSelectedKey.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/validator/IsStringList.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/validator/IsUniqueKey.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/validator/IsUniqueList.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/validator/IsValidBinding.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/validator/MaxLength.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/validator/NotABinding.js +1 -1
- package/src/sap/ui/integration/designtime/baseEditor/validator/ValidatorRegistry.js +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/CardEditor.js +4 -4
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n.properties +3 -0
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_ar.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_bg.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_ca.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_cs.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_cy.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_da.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_de.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_el.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_es.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_es_MX.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_et.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_fi.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_fr.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_fr_CA.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_hi.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_hr.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_hu.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_id.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_it.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_iw.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_ja.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_kk.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_ko.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_lt.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_lv.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_ms.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_nl.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_no.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_pl.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_pt.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_pt_PT.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_ro.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_ru.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_sh.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_sk.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_sl.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_sv.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_th.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_tr.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_uk.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_vi.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_zh_CN.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/i18n/i18n_zh_TW.properties +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/complexMapEditor/ComplexMapEditor.js +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/destinationsEditor/DestinationsEditor.js +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/filtersEditor/FiltersEditor.js +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/iconEditor/IconEditor.js +1 -1
- package/src/sap/ui/integration/designtime/cardEditor/propertyEditor/parametersEditor/ParametersEditor.js +21 -1
- package/src/sap/ui/integration/designtime/editor/CardEditor.js +1 -1
- package/src/sap/ui/integration/designtime/editor/CardPreview.js +1 -1
- package/src/sap/ui/integration/editor/Editor.js +356 -78
- package/src/sap/ui/integration/editor/EditorResourceBundles.js +1 -1
- package/src/sap/ui/integration/editor/Extension.js +1 -1
- package/src/sap/ui/integration/editor/Manifest.js +1 -1
- package/src/sap/ui/integration/editor/Settings.js +1 -1
- package/src/sap/ui/integration/editor/css/Editor.css +37 -7
- package/src/sap/ui/integration/editor/fields/BaseField.js +13 -4
- package/src/sap/ui/integration/editor/fields/BooleanField.js +1 -1
- package/src/sap/ui/integration/editor/fields/DateField.js +1 -1
- package/src/sap/ui/integration/editor/fields/DateTimeField.js +1 -1
- package/src/sap/ui/integration/editor/fields/DestinationField.js +1 -1
- package/src/sap/ui/integration/editor/fields/IntegerField.js +1 -1
- package/src/sap/ui/integration/editor/fields/ListField.js +1 -1
- package/src/sap/ui/integration/editor/fields/NumberField.js +1 -1
- package/src/sap/ui/integration/editor/fields/StringField.js +1 -1
- package/src/sap/ui/integration/editor/fields/viz/ColorSelect.js +1 -1
- package/src/sap/ui/integration/editor/fields/viz/IconSelect.js +1 -1
- package/src/sap/ui/integration/editor/fields/viz/ShapeSelect.js +1 -1
- package/src/sap/ui/integration/library.js +3 -3
- package/src/sap/ui/integration/messagebundle.properties +15 -0
- package/src/sap/ui/integration/messagebundle_ar.properties +8 -2
- package/src/sap/ui/integration/messagebundle_bg.properties +10 -4
- package/src/sap/ui/integration/messagebundle_ca.properties +8 -2
- package/src/sap/ui/integration/messagebundle_cs.properties +8 -2
- package/src/sap/ui/integration/messagebundle_cy.properties +8 -2
- package/src/sap/ui/integration/messagebundle_da.properties +8 -2
- package/src/sap/ui/integration/messagebundle_de.properties +8 -2
- package/src/sap/ui/integration/messagebundle_el.properties +8 -2
- package/src/sap/ui/integration/messagebundle_en.properties +8 -2
- package/src/sap/ui/integration/messagebundle_en_GB.properties +8 -2
- package/src/sap/ui/integration/messagebundle_en_US_sappsd.properties +6 -0
- package/src/sap/ui/integration/messagebundle_en_US_saptrc.properties +6 -0
- package/src/sap/ui/integration/messagebundle_es.properties +8 -2
- package/src/sap/ui/integration/messagebundle_es_MX.properties +8 -2
- package/src/sap/ui/integration/messagebundle_et.properties +8 -2
- package/src/sap/ui/integration/messagebundle_fi.properties +8 -2
- package/src/sap/ui/integration/messagebundle_fr.properties +8 -2
- package/src/sap/ui/integration/messagebundle_fr_CA.properties +8 -2
- package/src/sap/ui/integration/messagebundle_hi.properties +8 -2
- package/src/sap/ui/integration/messagebundle_hr.properties +8 -2
- package/src/sap/ui/integration/messagebundle_hu.properties +8 -2
- package/src/sap/ui/integration/messagebundle_id.properties +8 -2
- package/src/sap/ui/integration/messagebundle_it.properties +8 -2
- package/src/sap/ui/integration/messagebundle_iw.properties +8 -2
- package/src/sap/ui/integration/messagebundle_ja.properties +8 -2
- package/src/sap/ui/integration/messagebundle_kk.properties +8 -2
- package/src/sap/ui/integration/messagebundle_ko.properties +8 -2
- package/src/sap/ui/integration/messagebundle_lt.properties +8 -2
- package/src/sap/ui/integration/messagebundle_lv.properties +8 -2
- package/src/sap/ui/integration/messagebundle_ms.properties +8 -2
- package/src/sap/ui/integration/messagebundle_nl.properties +8 -2
- package/src/sap/ui/integration/messagebundle_no.properties +8 -2
- package/src/sap/ui/integration/messagebundle_pl.properties +8 -2
- package/src/sap/ui/integration/messagebundle_pt.properties +8 -2
- package/src/sap/ui/integration/messagebundle_pt_PT.properties +8 -2
- package/src/sap/ui/integration/messagebundle_ro.properties +8 -2
- package/src/sap/ui/integration/messagebundle_ru.properties +8 -2
- package/src/sap/ui/integration/messagebundle_sh.properties +8 -2
- package/src/sap/ui/integration/messagebundle_sk.properties +8 -2
- package/src/sap/ui/integration/messagebundle_sl.properties +8 -2
- package/src/sap/ui/integration/messagebundle_sv.properties +8 -2
- package/src/sap/ui/integration/messagebundle_th.properties +8 -2
- package/src/sap/ui/integration/messagebundle_tr.properties +8 -2
- package/src/sap/ui/integration/messagebundle_uk.properties +11 -5
- package/src/sap/ui/integration/messagebundle_vi.properties +8 -2
- package/src/sap/ui/integration/messagebundle_zh_CN.properties +8 -2
- package/src/sap/ui/integration/messagebundle_zh_TW.properties +8 -2
- package/src/sap/ui/integration/model/ContextModel.js +1 -1
- package/src/sap/ui/integration/model/ObservableModel.js +14 -5
- package/src/sap/ui/integration/model/PagingModelListBinding.js +40 -0
- package/src/sap/ui/integration/schemas/sap-card.json +65 -17
- package/src/sap/ui/integration/themes/base/ActionsStrip.less +15 -0
- package/src/sap/ui/integration/themes/base/Footer.less +9 -0
- package/src/sap/ui/integration/themes/base/Paginator.less +36 -0
- package/src/sap/ui/integration/themes/base/library.source.less +3 -0
- package/src/sap/ui/integration/util/BaseFactory.js +1 -1
- package/src/sap/ui/integration/util/BindingHelper.js +1 -1
- package/src/sap/ui/integration/util/BindingResolver.js +1 -1
- package/src/sap/ui/integration/util/CardObserver.js +1 -1
- package/src/sap/ui/integration/util/ContentFactory.js +1 -1
- package/src/sap/ui/integration/util/CsrfTokenHandler.js +1 -1
- package/src/sap/ui/integration/util/DataProvider.js +1 -1
- package/src/sap/ui/integration/util/DataProviderFactory.js +1 -1
- package/src/sap/ui/integration/util/Destinations.js +1 -1
- package/src/sap/ui/integration/util/ExtensionDataProvider.js +1 -1
- package/src/sap/ui/integration/util/HeaderFactory.js +1 -1
- package/src/sap/ui/integration/util/JSONBindingHelper.js +1 -1
- package/src/sap/ui/integration/util/LoadingProvider.js +14 -4
- package/src/sap/ui/integration/util/Manifest.js +1 -1
- package/src/sap/ui/integration/util/ManifestResolver.js +2 -0
- package/src/sap/ui/integration/util/RequestDataProvider.js +1 -1
- package/src/sap/ui/integration/util/ServiceDataProvider.js +1 -1
- package/src/sap/ui/integration/util/ServiceManager.js +1 -1
- package/src/sap/ui/integration/util/SkeletonCard.js +1 -1
- package/src/sap/ui/integration/util/Utils.js +16 -4
- package/src/sap/ui/integration/widgets/Card.js +176 -64
|
@@ -46,7 +46,8 @@ sap.ui.define([
|
|
|
46
46
|
"./Settings",
|
|
47
47
|
"sap/m/FlexItemData",
|
|
48
48
|
"sap/m/FlexBox",
|
|
49
|
-
"sap/m/Button"
|
|
49
|
+
"sap/m/Button",
|
|
50
|
+
"sap/m/OverflowToolbar"
|
|
50
51
|
], function (
|
|
51
52
|
ui5loader,
|
|
52
53
|
Control,
|
|
@@ -89,7 +90,8 @@ sap.ui.define([
|
|
|
89
90
|
Settings,
|
|
90
91
|
FlexItemData,
|
|
91
92
|
FlexBox,
|
|
92
|
-
Button
|
|
93
|
+
Button,
|
|
94
|
+
OverflowToolbar
|
|
93
95
|
) {
|
|
94
96
|
"use strict";
|
|
95
97
|
|
|
@@ -136,7 +138,7 @@ sap.ui.define([
|
|
|
136
138
|
* @extends sap.ui.core.Control
|
|
137
139
|
*
|
|
138
140
|
* @author SAP SE
|
|
139
|
-
* @version 1.
|
|
141
|
+
* @version 1.99.0
|
|
140
142
|
* @constructor
|
|
141
143
|
* @since 1.94
|
|
142
144
|
* @private
|
|
@@ -267,9 +269,11 @@ sap.ui.define([
|
|
|
267
269
|
//render items
|
|
268
270
|
if (aItems) {
|
|
269
271
|
var oPanel;
|
|
272
|
+
var oSubPanel;
|
|
270
273
|
var oLanguagePanel;
|
|
271
274
|
var oLabelItemForNotWrapping;
|
|
272
275
|
var oColFields = [];
|
|
276
|
+
var oColFieldsOfSubPanel = [];
|
|
273
277
|
var oOriginalField;
|
|
274
278
|
var addColFields = function () {
|
|
275
279
|
if (oColFields.length > 0) {
|
|
@@ -285,38 +289,101 @@ sap.ui.define([
|
|
|
285
289
|
oColFields = [];
|
|
286
290
|
}
|
|
287
291
|
};
|
|
292
|
+
var addColFieldsOfSubPanel = function () {
|
|
293
|
+
if (oColFieldsOfSubPanel.length > 0) {
|
|
294
|
+
var iLess = 2 - oColFieldsOfSubPanel.length;
|
|
295
|
+
for (var n = 0; n < iLess; n++) {
|
|
296
|
+
oColFieldsOfSubPanel.push(new VBox());
|
|
297
|
+
}
|
|
298
|
+
oSubPanel.addContent(new FlexBox({
|
|
299
|
+
alignItems: "Start",
|
|
300
|
+
justifyContent: "SpaceBetween",
|
|
301
|
+
items: oColFieldsOfSubPanel
|
|
302
|
+
}));
|
|
303
|
+
oColFieldsOfSubPanel = [];
|
|
304
|
+
}
|
|
305
|
+
};
|
|
306
|
+
var renderPanel = function (oPanel) {
|
|
307
|
+
if (oPanel.getContent().length > 0) {
|
|
308
|
+
var aContents = oPanel.getContent();
|
|
309
|
+
if (aContents.length === 1 && aContents[0].isA("sap.m.MessageStrip")) {
|
|
310
|
+
return;
|
|
311
|
+
}
|
|
312
|
+
if (aContents[0].isA("sap.m.MessageStrip")) {
|
|
313
|
+
oPanel.removeContent(0);
|
|
314
|
+
oPanel.addContent(aContents[0]);
|
|
315
|
+
}
|
|
316
|
+
oRm.renderControl(oPanel);
|
|
317
|
+
if (oPanel._messageStrip) {
|
|
318
|
+
oRm.renderControl(oPanel._messageStrip);
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
};
|
|
322
|
+
var addSubPanel = function (oPanel, oSubPanel) {
|
|
323
|
+
if (oPanel && oSubPanel.getContent().length > 0) {
|
|
324
|
+
var aContents = oSubPanel.getContent();
|
|
325
|
+
if (aContents[0].isA("sap.m.MessageStrip")) {
|
|
326
|
+
oSubPanel.removeContent(0);
|
|
327
|
+
oSubPanel.addContent(aContents[0]);
|
|
328
|
+
}
|
|
329
|
+
oPanel.addContent(oSubPanel);
|
|
330
|
+
if (oSubPanel._messageStrip) {
|
|
331
|
+
oPanel.addContent(oSubPanel._messageStrip);
|
|
332
|
+
}
|
|
333
|
+
} else {
|
|
334
|
+
oSubPanel = null;
|
|
335
|
+
}
|
|
336
|
+
};
|
|
288
337
|
for (var i = 0; i < aItems.length; i++) {
|
|
289
338
|
var oItem = aItems[i];
|
|
290
339
|
if (oControl.getMode() !== "translation") {
|
|
291
340
|
if (oItem.isA("sap.m.Panel")) {
|
|
292
|
-
if (
|
|
293
|
-
//add current col fields to previous panel, then empty the col fields list
|
|
294
|
-
|
|
295
|
-
//
|
|
296
|
-
|
|
297
|
-
|
|
341
|
+
if (oSubPanel) {
|
|
342
|
+
//add current col fields to previous sub panel, then empty the col fields list
|
|
343
|
+
addColFieldsOfSubPanel();
|
|
344
|
+
//add sub panel to panel
|
|
345
|
+
addSubPanel(oPanel, oSubPanel);
|
|
346
|
+
}
|
|
347
|
+
if (oItem._level === "1") {
|
|
348
|
+
oSubPanel = oItem;
|
|
349
|
+
oSubPanel._subItems = [];
|
|
350
|
+
oSubPanel.addStyleClass("sapUiIntegrationEditorSubPanel");
|
|
351
|
+
} else {
|
|
352
|
+
if (oPanel) {
|
|
353
|
+
//add current col fields to previous panel, then empty the col fields list
|
|
354
|
+
addColFields();
|
|
355
|
+
//render previous panel
|
|
356
|
+
renderPanel(oPanel);
|
|
357
|
+
oSubPanel = null;
|
|
298
358
|
}
|
|
359
|
+
oPanel = oItem;
|
|
360
|
+
oPanel._subItems = [];
|
|
361
|
+
oPanel.addStyleClass("sapUiIntegrationEditorItem");
|
|
299
362
|
}
|
|
300
|
-
oPanel = oItem;
|
|
301
|
-
oPanel.addStyleClass("sapUiIntegrationEditorItem");
|
|
302
363
|
if (i === aItems.length - 1) {
|
|
303
364
|
//add current col fields to panel, then empty the col fields list
|
|
304
365
|
addColFields();
|
|
305
|
-
|
|
306
|
-
oRm.renderControl(oPanel);
|
|
307
|
-
}
|
|
366
|
+
renderPanel(oPanel);
|
|
308
367
|
}
|
|
309
368
|
continue;
|
|
310
369
|
}
|
|
311
370
|
// add style class for the hint under group and checkbox/toggle
|
|
312
371
|
if (oItem.isA("sap.m.FormattedText")) {
|
|
313
|
-
|
|
372
|
+
if (oSubPanel) {
|
|
373
|
+
oSubPanel.addContent(oItem.addStyleClass("sapUiIntegrationEditorHint"));
|
|
374
|
+
} else {
|
|
375
|
+
oPanel.addContent(oItem.addStyleClass("sapUiIntegrationEditorHint"));
|
|
376
|
+
}
|
|
314
377
|
if (i === aItems.length - 1) {
|
|
378
|
+
if (oSubPanel) {
|
|
379
|
+
//add current col fields to previous sub panel, then empty the col fields list
|
|
380
|
+
addColFieldsOfSubPanel();
|
|
381
|
+
//add sub panel to panel
|
|
382
|
+
addSubPanel(oPanel, oSubPanel);
|
|
383
|
+
}
|
|
315
384
|
//add current col fields to panel, then empty the col fields list
|
|
316
385
|
addColFields();
|
|
317
|
-
|
|
318
|
-
oRm.renderControl(oPanel);
|
|
319
|
-
}
|
|
386
|
+
renderPanel(oPanel);
|
|
320
387
|
}
|
|
321
388
|
continue;
|
|
322
389
|
}
|
|
@@ -332,19 +399,36 @@ sap.ui.define([
|
|
|
332
399
|
} else {
|
|
333
400
|
//if cols === 1 and reach the col size, add the col fields to panel, then empty the col fields list
|
|
334
401
|
//if cols === 2, add the col fields to panel, then empty the col fields list
|
|
335
|
-
if (oItem._cols === 2
|
|
402
|
+
if (oItem._cols === 2) {
|
|
403
|
+
if (oSubPanel) {
|
|
404
|
+
addColFieldsOfSubPanel();
|
|
405
|
+
} else {
|
|
406
|
+
addColFields();
|
|
407
|
+
}
|
|
408
|
+
} else if (oColFieldsOfSubPanel.length === 2) {
|
|
409
|
+
addColFieldsOfSubPanel();
|
|
410
|
+
} else if (oColFields.length === 2) {
|
|
336
411
|
addColFields();
|
|
337
412
|
}
|
|
338
|
-
|
|
413
|
+
if (oSubPanel) {
|
|
414
|
+
oSubPanel.addContent(oItem);
|
|
415
|
+
} else {
|
|
416
|
+
oPanel.addContent(oItem);
|
|
417
|
+
}
|
|
339
418
|
}
|
|
340
419
|
} else if (oItem.isA("sap.m.ToolbarSpacer")) {
|
|
341
|
-
addColFields();
|
|
342
420
|
if (oItem._hasLine) {
|
|
343
421
|
oItem.addStyleClass("sapUiIntegrationEditorSpacerWithLine");
|
|
344
422
|
} else {
|
|
345
423
|
oItem.addStyleClass("sapUiIntegrationEditorSpacerWithoutLine");
|
|
346
424
|
}
|
|
347
|
-
|
|
425
|
+
if (oSubPanel) {
|
|
426
|
+
addColFieldsOfSubPanel();
|
|
427
|
+
oSubPanel.addContent(oItem);
|
|
428
|
+
} else {
|
|
429
|
+
addColFields();
|
|
430
|
+
oPanel.addContent(oItem);
|
|
431
|
+
}
|
|
348
432
|
} else {
|
|
349
433
|
var oConfig = oItem.getConfiguration(),
|
|
350
434
|
aInfoHBox = new HBox(),
|
|
@@ -462,30 +546,58 @@ sap.ui.define([
|
|
|
462
546
|
}
|
|
463
547
|
//render lable and field for NotWrapping parameter
|
|
464
548
|
if (oItem._cols === 1) {
|
|
465
|
-
if (
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
549
|
+
if (oSubPanel) {
|
|
550
|
+
if (oColFieldsOfSubPanel.length === 2) {
|
|
551
|
+
addColFieldsOfSubPanel();
|
|
552
|
+
}
|
|
553
|
+
if (oConfig.hint) {
|
|
554
|
+
var oHint = oControl._createHint(oConfig.hint);
|
|
555
|
+
var oColVBox = new VBox({
|
|
556
|
+
items: [
|
|
557
|
+
oHBox,
|
|
558
|
+
oHint.addStyleClass("sapUiIntegrationEditorHint")
|
|
559
|
+
]
|
|
560
|
+
});
|
|
561
|
+
oColVBox.addStyleClass("col1");
|
|
562
|
+
oColFieldsOfSubPanel.push(oColVBox);
|
|
563
|
+
} else {
|
|
564
|
+
oHBox.addStyleClass("col1");
|
|
565
|
+
oColFieldsOfSubPanel.push(oHBox);
|
|
566
|
+
}
|
|
478
567
|
} else {
|
|
479
|
-
|
|
480
|
-
|
|
568
|
+
if (oColFields.length === 2) {
|
|
569
|
+
addColFields();
|
|
570
|
+
}
|
|
571
|
+
if (oConfig.hint) {
|
|
572
|
+
var oHint = oControl._createHint(oConfig.hint);
|
|
573
|
+
var oColVBox = new VBox({
|
|
574
|
+
items: [
|
|
575
|
+
oHBox,
|
|
576
|
+
oHint.addStyleClass("sapUiIntegrationEditorHint")
|
|
577
|
+
]
|
|
578
|
+
});
|
|
579
|
+
oColVBox.addStyleClass("col1");
|
|
580
|
+
oColFields.push(oColVBox);
|
|
581
|
+
} else {
|
|
582
|
+
oHBox.addStyleClass("col1");
|
|
583
|
+
oColFields.push(oHBox);
|
|
584
|
+
}
|
|
481
585
|
}
|
|
586
|
+
} else if (oSubPanel) {
|
|
587
|
+
addColFieldsOfSubPanel();
|
|
588
|
+
oSubPanel.addContent(oHBox);
|
|
482
589
|
} else {
|
|
483
590
|
addColFields();
|
|
484
591
|
oPanel.addContent(oHBox);
|
|
485
592
|
}
|
|
486
593
|
oLabelItemForNotWrapping = null;
|
|
487
594
|
} else {
|
|
488
|
-
var oLabel
|
|
595
|
+
var oLabel;
|
|
596
|
+
if (oSubPanel) {
|
|
597
|
+
oLabel = oSubPanel.getContent().pop();
|
|
598
|
+
} else {
|
|
599
|
+
oLabel = oPanel.getContent().pop();
|
|
600
|
+
}
|
|
489
601
|
oLabel.setLayoutData(oFlexItemDataForInfo);
|
|
490
602
|
if (aInfoHBox.getItems().length > 0) {
|
|
491
603
|
oLabel.addStyleClass("sapUiIntegrationEditorItemLabelWithInfo");
|
|
@@ -519,19 +631,40 @@ sap.ui.define([
|
|
|
519
631
|
oColVBox.addItem(oHint.addStyleClass("sapUiIntegrationEditorHint"));
|
|
520
632
|
}
|
|
521
633
|
oColVBox.addStyleClass("col1");
|
|
522
|
-
|
|
634
|
+
if (oSubPanel) {
|
|
635
|
+
oColFieldsOfSubPanel.push(oColVBox);
|
|
636
|
+
} else {
|
|
637
|
+
oColFields.push(oColVBox);
|
|
638
|
+
}
|
|
639
|
+
} else if (oSubPanel) {
|
|
640
|
+
oSubPanel.addContent(oLabelFlexBox);
|
|
641
|
+
oSubPanel.addContent(oItem);
|
|
523
642
|
} else {
|
|
524
643
|
oPanel.addContent(oLabelFlexBox);
|
|
525
644
|
oPanel.addContent(oItem);
|
|
526
645
|
}
|
|
527
646
|
}
|
|
647
|
+
if (oSubPanel) {
|
|
648
|
+
oSubPanel._subItems.push({
|
|
649
|
+
"settingspath": oItem.getConfiguration()._settingspath,
|
|
650
|
+
"itemId": oItem.getId()
|
|
651
|
+
});
|
|
652
|
+
}
|
|
653
|
+
oPanel._subItems.push({
|
|
654
|
+
"settingspath": oItem.getConfiguration()._settingspath,
|
|
655
|
+
"itemId": oItem.getId()
|
|
656
|
+
});
|
|
528
657
|
}
|
|
529
658
|
if (i === aItems.length - 1) {
|
|
659
|
+
if (oSubPanel) {
|
|
660
|
+
//add current col fields to previous sub panel, then empty the col fields list
|
|
661
|
+
addColFieldsOfSubPanel();
|
|
662
|
+
//add sub panel to panel
|
|
663
|
+
addSubPanel(oPanel, oSubPanel);
|
|
664
|
+
}
|
|
530
665
|
//add current col fields to panel, then empty the col fields list
|
|
531
666
|
addColFields();
|
|
532
|
-
|
|
533
|
-
oRm.renderControl(oPanel);
|
|
534
|
-
}
|
|
667
|
+
renderPanel(oPanel);
|
|
535
668
|
}
|
|
536
669
|
} else {
|
|
537
670
|
if (i === 0) {
|
|
@@ -542,12 +675,22 @@ sap.ui.define([
|
|
|
542
675
|
continue;
|
|
543
676
|
}
|
|
544
677
|
if (oItem.isA("sap.m.Panel")) {
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
678
|
+
if (oSubPanel) {
|
|
679
|
+
//add sub panel to panel
|
|
680
|
+
addSubPanel(oPanel, oSubPanel);
|
|
681
|
+
}
|
|
682
|
+
if (oItem._level === "1") {
|
|
683
|
+
oSubPanel = oItem;
|
|
684
|
+
oSubPanel.addStyleClass("sapUiIntegrationEditorSubPanel");
|
|
685
|
+
} else {
|
|
686
|
+
oSubPanel = null;
|
|
687
|
+
//add sub panel if it has content into top panel
|
|
688
|
+
if (oPanel && oPanel.getContent().length > 0) {
|
|
689
|
+
oLanguagePanel.addContent(oPanel);
|
|
690
|
+
}
|
|
691
|
+
oPanel = oItem;
|
|
692
|
+
oPanel.addStyleClass("sapUiIntegrationEditorSubPanel");
|
|
548
693
|
}
|
|
549
|
-
oPanel = oItem;
|
|
550
|
-
oPanel.addStyleClass("sapUiIntegrationEditorTranslationSubPanel");
|
|
551
694
|
continue;
|
|
552
695
|
}
|
|
553
696
|
if (oItem.isA("sap.m.ToolbarSpacer")) {
|
|
@@ -557,7 +700,11 @@ sap.ui.define([
|
|
|
557
700
|
continue;
|
|
558
701
|
}
|
|
559
702
|
if (oItem.isA("sap.m.Label")) {
|
|
560
|
-
|
|
703
|
+
if (oSubPanel) {
|
|
704
|
+
oSubPanel.addContent(oItem);
|
|
705
|
+
} else {
|
|
706
|
+
oPanel.addContent(oItem);
|
|
707
|
+
}
|
|
561
708
|
continue;
|
|
562
709
|
}
|
|
563
710
|
//oItem.addStyleClass("language");
|
|
@@ -573,8 +720,16 @@ sap.ui.define([
|
|
|
573
720
|
oItem
|
|
574
721
|
]
|
|
575
722
|
}).addStyleClass("notWrappingRow");
|
|
576
|
-
|
|
723
|
+
if (oSubPanel) {
|
|
724
|
+
oSubPanel.addContent(oHBox);
|
|
725
|
+
} else {
|
|
726
|
+
oPanel.addContent(oHBox);
|
|
727
|
+
}
|
|
577
728
|
if (i === aItems.length - 1) {
|
|
729
|
+
if (oSubPanel) {
|
|
730
|
+
//add sub panel to panel
|
|
731
|
+
addSubPanel(oPanel, oSubPanel);
|
|
732
|
+
}
|
|
578
733
|
oLanguagePanel.addContent(oPanel);
|
|
579
734
|
}
|
|
580
735
|
}
|
|
@@ -604,9 +759,12 @@ sap.ui.define([
|
|
|
604
759
|
this._appliedLayerManifestChanges = [];
|
|
605
760
|
this._currentLayerManifestChanges = {};
|
|
606
761
|
this._mDestinationDataProviders = {};
|
|
607
|
-
|
|
762
|
+
var oMessageStrip = new MessageStrip({
|
|
608
763
|
showIcon: false
|
|
609
|
-
})
|
|
764
|
+
});
|
|
765
|
+
oMessageStrip.addStyleClass("sapUiIntegrationEditorFieldMessageStrip");
|
|
766
|
+
this.setAggregation("_messageStrip", oMessageStrip);
|
|
767
|
+
MessageStripId = oMessageStrip.getId();
|
|
610
768
|
this.setLanguage(Core.getConfiguration().getLanguage());
|
|
611
769
|
/**
|
|
612
770
|
* Facade of the {@link sap.ui.integration.editor.Editor} control.
|
|
@@ -615,7 +773,7 @@ sap.ui.define([
|
|
|
615
773
|
* @experimental since 1.94
|
|
616
774
|
* @public
|
|
617
775
|
* @author SAP SE
|
|
618
|
-
* @version 1.
|
|
776
|
+
* @version 1.99.0
|
|
619
777
|
* @borrows sap.ui.integration.editor.Editor#getParameters as getParameters
|
|
620
778
|
* @borrows sap.ui.integration.editor.Editor#resolveDestination as resolveDestination
|
|
621
779
|
* @borrows sap.ui.integration.editor.Editor#request as request
|
|
@@ -1693,7 +1851,7 @@ sap.ui.define([
|
|
|
1693
1851
|
oField._layout = oConfig.layout;
|
|
1694
1852
|
}
|
|
1695
1853
|
oField._oDataProviderFactory = this._oDataProviderFactory;
|
|
1696
|
-
oField.setAssociation("_messageStrip",
|
|
1854
|
+
oField.setAssociation("_messageStrip", MessageStripId);
|
|
1697
1855
|
oField._previewPostion = this.getPreviewPosition();
|
|
1698
1856
|
return oField;
|
|
1699
1857
|
};
|
|
@@ -2048,7 +2206,7 @@ sap.ui.define([
|
|
|
2048
2206
|
if (aResult[i].indexOf("destinations.") === 0) {
|
|
2049
2207
|
sValueKey = "/name";
|
|
2050
2208
|
}
|
|
2051
|
-
sDependentPath = sDependentPath + aResult[i].replace(".", "/") +
|
|
2209
|
+
sDependentPath = sDependentPath + "/" + aResult[i].replace(".", "/") + sValueKey;
|
|
2052
2210
|
} else if (aResult[i].indexOf("{items>") === 0) {
|
|
2053
2211
|
sDependentPath = sDependentPath + "/parameters/" + aResult[i].slice(7, -1);
|
|
2054
2212
|
}
|
|
@@ -2104,11 +2262,12 @@ sap.ui.define([
|
|
|
2104
2262
|
return;
|
|
2105
2263
|
}
|
|
2106
2264
|
if (oConfig.type === "group") {
|
|
2265
|
+
oConfig.expanded = oConfig.expanded !== false;
|
|
2107
2266
|
var oPanel = new Panel({
|
|
2108
2267
|
headerText: oConfig.label,
|
|
2109
2268
|
visible: oConfig.visible,
|
|
2110
2269
|
expandable: oConfig.expandable !== false,
|
|
2111
|
-
expanded:
|
|
2270
|
+
expanded: "{currentSettings>expanded}",
|
|
2112
2271
|
width: "auto",
|
|
2113
2272
|
backgroundDesign: "Transparent",
|
|
2114
2273
|
objectBindings: {
|
|
@@ -2124,26 +2283,128 @@ sap.ui.define([
|
|
|
2124
2283
|
},
|
|
2125
2284
|
expand: function (oEvent) {
|
|
2126
2285
|
var oControl = oEvent.getSource();
|
|
2127
|
-
|
|
2128
|
-
|
|
2286
|
+
var bExpand = oEvent.getParameter("expand");
|
|
2287
|
+
// handle error message strip for field
|
|
2288
|
+
var oMessageStrip = oControl._level === "1" ? oControl.getParent().getParent().getAggregation("_messageStrip") : oControl.getParent().getAggregation("_messageStrip");
|
|
2289
|
+
if (oMessageStrip === null) {
|
|
2290
|
+
oMessageStrip = Core.byId(MessageStripId);
|
|
2129
2291
|
}
|
|
2130
|
-
if (
|
|
2131
|
-
|
|
2292
|
+
if (!bExpand && oControl._level === "1") {
|
|
2293
|
+
oControl.getParent().addContent(oMessageStrip);
|
|
2294
|
+
oControl.getParent().focus();
|
|
2295
|
+
} else {
|
|
2132
2296
|
oControl.addContent(oMessageStrip);
|
|
2133
2297
|
oControl.focus();
|
|
2134
2298
|
}
|
|
2299
|
+
// handle error message for panel
|
|
2300
|
+
if (!bExpand && oControl._subItems && oControl._subItems.length > 0) {
|
|
2301
|
+
var oCurrentSettingsModel = oControl.getModel("currentSettings");
|
|
2302
|
+
var bHasError = false;
|
|
2303
|
+
var sErrorType = "None";
|
|
2304
|
+
for (var i = 0; i < oControl._subItems.length; i++) {
|
|
2305
|
+
var sSettingsPath = oControl._subItems[i].settingspath;
|
|
2306
|
+
var oItem = Core.byId(oControl._subItems[i].itemId);
|
|
2307
|
+
if (oCurrentSettingsModel.getProperty(sSettingsPath + "/hasError") === true && oItem.getVisible()) {
|
|
2308
|
+
bHasError = true;
|
|
2309
|
+
var sType = oCurrentSettingsModel.getProperty(sSettingsPath + "/errorType");
|
|
2310
|
+
if (sType === "Error") {
|
|
2311
|
+
sErrorType = "Error";
|
|
2312
|
+
break;
|
|
2313
|
+
} else if (sType === "Warning" && sErrorType !== "Error") {
|
|
2314
|
+
sErrorType = "Warning";
|
|
2315
|
+
}
|
|
2316
|
+
}
|
|
2317
|
+
}
|
|
2318
|
+
oCurrentSettingsModel.setProperty("hasError", bHasError, oControl.getBindingContext("currentSettings"));
|
|
2319
|
+
oCurrentSettingsModel.setProperty("errorType", sErrorType, oControl.getBindingContext("currentSettings"));
|
|
2320
|
+
}
|
|
2135
2321
|
}
|
|
2136
2322
|
});
|
|
2323
|
+
if (sMode !== "translation") {
|
|
2324
|
+
/*
|
|
2325
|
+
var oMessage = new MessageStrip({
|
|
2326
|
+
showIcon: false,
|
|
2327
|
+
text: {
|
|
2328
|
+
path: 'currentSettings>errorType',
|
|
2329
|
+
formatter: function (errorType) {
|
|
2330
|
+
var sPanelTitle = "";
|
|
2331
|
+
switch (errorType) {
|
|
2332
|
+
case "Error":
|
|
2333
|
+
sPanelTitle = oResourceBundle.getText("EDITOR_GROUP_ERRORS");
|
|
2334
|
+
break;
|
|
2335
|
+
case "Warning":
|
|
2336
|
+
sPanelTitle = oResourceBundle.getText("EDITOR_GROUP_WARNINGS");
|
|
2337
|
+
break;
|
|
2338
|
+
default:
|
|
2339
|
+
}
|
|
2340
|
+
return sPanelTitle;
|
|
2341
|
+
}
|
|
2342
|
+
},
|
|
2343
|
+
type: "{currentSettings>errorType}",
|
|
2344
|
+
visible: "{= !${currentSettings>expanded} && ${currentSettings>hasError} === true}"
|
|
2345
|
+
}).addStyleClass("sapUiIntegrationEditorPanelMessageStrip");
|
|
2346
|
+
var oHeaderToolbar = new OverflowToolbar({
|
|
2347
|
+
content: [
|
|
2348
|
+
new Title({
|
|
2349
|
+
text: oConfig.label
|
|
2350
|
+
}),
|
|
2351
|
+
new Separator(),
|
|
2352
|
+
oMessage
|
|
2353
|
+
]
|
|
2354
|
+
}).addStyleClass("sapUiIntegrationEditorPanelHeader");
|
|
2355
|
+
oPanel.setHeaderToolbar(oHeaderToolbar);
|
|
2356
|
+
*/
|
|
2357
|
+
var oResourceBundle = this._oResourceBundle;
|
|
2358
|
+
var oMessageStripOfPanel = new MessageStrip({
|
|
2359
|
+
showIcon: false,
|
|
2360
|
+
visible: "{= !${currentSettings>expanded} && ${currentSettings>hasError} === true}",
|
|
2361
|
+
text: {
|
|
2362
|
+
path: 'currentSettings>errorType',
|
|
2363
|
+
formatter: function (errorType) {
|
|
2364
|
+
var sPanelTitle = "";
|
|
2365
|
+
switch (errorType) {
|
|
2366
|
+
case "Error":
|
|
2367
|
+
sPanelTitle = oResourceBundle.getText("EDITOR_GROUP_ERRORS");
|
|
2368
|
+
break;
|
|
2369
|
+
case "Warning":
|
|
2370
|
+
sPanelTitle = oResourceBundle.getText("EDITOR_GROUP_WARNINGS");
|
|
2371
|
+
break;
|
|
2372
|
+
default:
|
|
2373
|
+
}
|
|
2374
|
+
return sPanelTitle;
|
|
2375
|
+
}
|
|
2376
|
+
},
|
|
2377
|
+
type: "{currentSettings>errorType}",
|
|
2378
|
+
objectBindings: {
|
|
2379
|
+
currentSettings: {
|
|
2380
|
+
path: "currentSettings>" + oConfig._settingspath
|
|
2381
|
+
}
|
|
2382
|
+
}
|
|
2383
|
+
});
|
|
2384
|
+
if (oConfig.level !== "1") {
|
|
2385
|
+
oMessageStripOfPanel.setModel(this._settingsModel, "currentSettings");
|
|
2386
|
+
}
|
|
2387
|
+
oMessageStripOfPanel.addStyleClass("sapUiIntegrationEditorPanelMessageStrip");
|
|
2388
|
+
oPanel._messageStrip = oMessageStripOfPanel;
|
|
2389
|
+
}/* else {
|
|
2390
|
+
oPanel.setHeaderText(oConfig.label);
|
|
2391
|
+
}*/
|
|
2137
2392
|
this.addAggregation("_formContent", oPanel);
|
|
2138
2393
|
oPanel._cols = oConfig.cols || 2; //by default 2 cols
|
|
2394
|
+
oPanel._level = oConfig.level || 0; //by default 0 level
|
|
2139
2395
|
if (oConfig.hint) {
|
|
2140
2396
|
this._addHint(oConfig.hint);
|
|
2141
2397
|
}
|
|
2142
2398
|
//add "aria-label" for each panel to make the landmark uniquely
|
|
2143
2399
|
var oDelegate = {
|
|
2144
|
-
onAfterRendering: function() {
|
|
2400
|
+
onAfterRendering: function(oEvent) {
|
|
2145
2401
|
var ePanel = document.getElementById(oPanel.getId());
|
|
2146
2402
|
ePanel.setAttribute("aria-label", oConfig.label);
|
|
2403
|
+
var oControl = oEvent.srcControl;
|
|
2404
|
+
var oMessageStrip = oControl._messageStrip;
|
|
2405
|
+
if (oControl._level !== "1" && oMessageStrip) {
|
|
2406
|
+
oMessageStrip.rerender();
|
|
2407
|
+
}
|
|
2147
2408
|
}
|
|
2148
2409
|
};
|
|
2149
2410
|
oPanel.addEventDelegate(oDelegate);
|
|
@@ -2313,26 +2574,16 @@ sap.ui.define([
|
|
|
2313
2574
|
if (oContents && oContents.length > 0) {
|
|
2314
2575
|
this.destroyAggregation("_formContent");
|
|
2315
2576
|
}
|
|
2316
|
-
|
|
2577
|
+
|
|
2578
|
+
var oSettingsData = this._settingsModel.getData();
|
|
2317
2579
|
var aItems;
|
|
2318
|
-
if (
|
|
2319
|
-
aItems =
|
|
2320
|
-
//get current language
|
|
2321
|
-
var sLanguage = this._language || this.getLanguage() || Core.getConfiguration().getLanguage().replaceAll('_', '-');
|
|
2322
|
-
if (this.getMode() === "translation") {
|
|
2323
|
-
//add top panel of translation editor
|
|
2324
|
-
this._addItem({
|
|
2325
|
-
type: "group",
|
|
2326
|
-
translatable: true,
|
|
2327
|
-
expandable: false,
|
|
2328
|
-
label: this._oResourceBundle.getText("EDITOR_ORIGINALLANG") + ": " + Editor._languages[sLanguage]
|
|
2329
|
-
});
|
|
2330
|
-
}
|
|
2580
|
+
if (oSettingsData.form && oSettingsData.form.items) {
|
|
2581
|
+
aItems = oSettingsData.form.items;
|
|
2331
2582
|
//add general configuration group
|
|
2332
2583
|
var bAddGeneralSettingsPanel = false;
|
|
2333
2584
|
for (var m in aItems) {
|
|
2334
2585
|
var oItem = aItems[m];
|
|
2335
|
-
if (oItem.type === "group") {
|
|
2586
|
+
if (oItem.type === "group" && oItem.level !== "1") {
|
|
2336
2587
|
break;
|
|
2337
2588
|
} else if (oItem.visible) {
|
|
2338
2589
|
bAddGeneralSettingsPanel = true;
|
|
@@ -2341,13 +2592,38 @@ sap.ui.define([
|
|
|
2341
2592
|
}
|
|
2342
2593
|
if (bAddGeneralSettingsPanel) {
|
|
2343
2594
|
//add general settings panel
|
|
2595
|
+
aItems = merge(
|
|
2596
|
+
{
|
|
2597
|
+
generalPanel : {
|
|
2598
|
+
type: "group",
|
|
2599
|
+
translatable: true,
|
|
2600
|
+
expanded: true,
|
|
2601
|
+
label: this._oResourceBundle.getText("EDITOR_PARAMETERS_GENERALSETTINGS"),
|
|
2602
|
+
_settingspath: "/form/items/generalPanel"
|
|
2603
|
+
}
|
|
2604
|
+
}, aItems
|
|
2605
|
+
);
|
|
2606
|
+
oSettingsData.form.items = aItems;
|
|
2607
|
+
this._settingsModel.setData(oSettingsData);
|
|
2608
|
+
}
|
|
2609
|
+
}
|
|
2610
|
+
|
|
2611
|
+
var oSettings = this._settingsModel.getProperty("/");
|
|
2612
|
+
this._mItemsByPaths = {};
|
|
2613
|
+
if (oSettings.form && oSettings.form.items) {
|
|
2614
|
+
aItems = oSettings.form.items;
|
|
2615
|
+
//get current language
|
|
2616
|
+
var sLanguage = this._language || this.getLanguage() || Core.getConfiguration().getLanguage().replaceAll('_', '-');
|
|
2617
|
+
if (this.getMode() === "translation") {
|
|
2618
|
+
//add top panel of translation editor
|
|
2344
2619
|
this._addItem({
|
|
2345
2620
|
type: "group",
|
|
2346
2621
|
translatable: true,
|
|
2347
|
-
|
|
2622
|
+
expandable: false,
|
|
2623
|
+
expanded: true,
|
|
2624
|
+
label: this._oResourceBundle.getText("EDITOR_ORIGINALLANG") + ": " + Editor._languages[sLanguage]
|
|
2348
2625
|
});
|
|
2349
2626
|
}
|
|
2350
|
-
this._mItemsByPaths = {};
|
|
2351
2627
|
for (var n in aItems) {
|
|
2352
2628
|
var oItem = aItems[n];
|
|
2353
2629
|
if (oItem) {
|
|
@@ -2675,7 +2951,9 @@ sap.ui.define([
|
|
|
2675
2951
|
oSettings.form.items["destination.group"] = {
|
|
2676
2952
|
label: this._oResourceBundle.getText("EDITOR_DESTINATIONS") || "Destinations",
|
|
2677
2953
|
type: "group",
|
|
2678
|
-
|
|
2954
|
+
expanded: true,
|
|
2955
|
+
visible: true,
|
|
2956
|
+
_settingspath: "/form/items/destination.group"
|
|
2679
2957
|
};
|
|
2680
2958
|
}
|
|
2681
2959
|
var oItems = oSettings.form.items,
|