@openui5/sap.ui.mdc 1.93.3 → 1.96.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 +6 -11
- package/THIRDPARTY.txt +10 -16
- package/package.json +4 -4
- package/src/sap/ui/mdc/.library +1 -1
- package/src/sap/ui/mdc/ActionToolbar.js +236 -334
- package/src/sap/ui/mdc/AggregationBaseDelegate.js +2 -1
- package/src/sap/ui/mdc/Chart.js +150 -22
- package/src/sap/ui/mdc/ChartDelegateNew.js +15 -0
- package/src/sap/ui/mdc/ChartNew.js +107 -66
- package/src/sap/ui/mdc/Control.js +4 -3
- package/src/sap/ui/mdc/Element.js +5 -4
- package/src/sap/ui/mdc/Field.js +2 -2
- package/src/sap/ui/mdc/FilterBar.js +1 -10
- package/src/sap/ui/mdc/FilterField.js +28 -4
- package/src/sap/ui/mdc/Link.js +2 -2
- package/src/sap/ui/mdc/MultiValueField.js +1 -1
- package/src/sap/ui/mdc/Table.js +160 -79
- package/src/sap/ui/mdc/TableDelegate.js +20 -3
- package/src/sap/ui/mdc/ValueHelp.js +1474 -0
- package/src/sap/ui/mdc/ValueHelpDelegate.js +147 -0
- package/src/sap/ui/mdc/actiontoolbar/ActionToolbarAction.js +49 -104
- package/src/sap/ui/mdc/chart/DimensionItem.js +3 -3
- package/src/sap/ui/mdc/chart/Item.js +2 -3
- package/src/sap/ui/mdc/chart/MeasureItem.js +2 -2
- package/src/sap/ui/mdc/chart/SelectionDetailsActions.js +21 -2
- package/src/sap/ui/mdc/chart/ToolbarHandler.js +237 -225
- package/src/sap/ui/mdc/chartNew/ChartSelectionDetailsNew.js +1 -1
- package/src/sap/ui/mdc/chartNew/ChartToolbarNew.js +14 -10
- package/src/sap/ui/mdc/chartNew/ChartTypeButtonNew.js +1 -1
- package/src/sap/ui/mdc/chartNew/DrillStackHandlerNew.js +12 -10
- package/src/sap/ui/mdc/chartNew/ItemNew.js +0 -1
- package/src/sap/ui/mdc/chartNew/PropertyHelperNew.js +1 -1
- package/src/sap/ui/mdc/condition/Condition.js +2 -2
- package/src/sap/ui/mdc/condition/ConditionConverter.js +1 -1
- package/src/sap/ui/mdc/condition/ConditionModel.js +1 -1
- package/src/sap/ui/mdc/condition/FilterConverter.js +1 -1
- package/src/sap/ui/mdc/condition/FilterOperatorUtil.js +13 -7
- package/src/sap/ui/mdc/condition/Operator.js +4 -4
- package/src/sap/ui/mdc/condition/RangeOperator.js +1 -1
- package/src/sap/ui/mdc/designtime/actiontoolbar/ActionToolbar.designtime.js +43 -0
- package/src/sap/ui/mdc/designtime/chart/ChartNew.designtime.js +91 -0
- package/src/sap/ui/mdc/designtime/filterbar/FilterBar.designtime.js +20 -0
- package/src/sap/ui/mdc/designtime/filterbar/FilterBarBase.designtime.js +31 -0
- package/src/sap/ui/mdc/designtime/table/Table.designtime.js +5 -0
- package/src/sap/ui/mdc/enum/ContentMode.js +25 -4
- package/src/sap/ui/mdc/enum/SelectType.js +43 -0
- package/src/sap/ui/mdc/field/BoolFieldHelp.js +1 -1
- package/src/sap/ui/mdc/field/ConditionFieldHelp.js +1 -1
- package/src/sap/ui/mdc/field/ConditionType.js +19 -4
- package/src/sap/ui/mdc/field/ConditionsType.js +5 -4
- package/src/sap/ui/mdc/field/CustomFieldHelp.js +1 -1
- package/src/sap/ui/mdc/field/CustomFieldInfo.js +1 -1
- package/src/sap/ui/mdc/field/DefineConditionPanel.js +38 -14
- package/src/sap/ui/mdc/field/FieldBase.js +92 -41
- package/src/sap/ui/mdc/field/FieldBaseDelegate.js +9 -2
- package/src/sap/ui/mdc/field/FieldHelpBase.js +64 -4
- package/src/sap/ui/mdc/field/FieldInfoBase.js +9 -1
- package/src/sap/ui/mdc/field/FieldInput.js +1 -1
- package/src/sap/ui/mdc/field/FieldInputRenderUtil.js +1 -1
- package/src/sap/ui/mdc/field/FieldMultiInput.js +1 -1
- package/src/sap/ui/mdc/field/FieldValueHelp.js +7 -1
- package/src/sap/ui/mdc/field/FieldValueHelpContentWrapperBase.js +1 -1
- package/src/sap/ui/mdc/field/FieldValueHelpMTableWrapper.js +1 -1
- package/src/sap/ui/mdc/field/FieldValueHelpMdcTableWrapper.js +1 -1
- package/src/sap/ui/mdc/field/FieldValueHelpTableWrapperBase.js +2 -2
- package/src/sap/ui/mdc/field/FieldValueHelpUITableWrapper.js +1 -1
- package/src/sap/ui/mdc/field/InParameter.js +1 -1
- package/src/sap/ui/mdc/field/ListFieldHelp.js +3 -3
- package/src/sap/ui/mdc/field/ListFieldHelpItem.js +1 -1
- package/src/sap/ui/mdc/field/MultiValueFieldItem.js +1 -1
- package/src/sap/ui/mdc/field/OutParameter.js +1 -1
- package/src/sap/ui/mdc/field/ValueHelpPanel.js +1 -1
- package/src/sap/ui/mdc/field/content/BooleanContent.js +15 -3
- package/src/sap/ui/mdc/field/content/ContentFactory.js +16 -8
- package/src/sap/ui/mdc/field/content/DefaultContent.js +64 -23
- package/src/sap/ui/mdc/field/content/LinkContent.js +6 -0
- package/src/sap/ui/mdc/field/content/SearchContent.js +21 -3
- package/src/sap/ui/mdc/field/content/UnitContent.js +2 -2
- package/src/sap/ui/mdc/filterbar/FilterBarBase.js +105 -44
- package/src/sap/ui/mdc/filterbar/PropertyHelper.js +52 -0
- package/src/sap/ui/mdc/filterbar/p13n/AdaptationFilterBar.js +10 -51
- package/src/sap/ui/mdc/filterbar/vh/FilterBar.js +1 -1
- package/src/sap/ui/mdc/flexibility/ActionToolbar.flexibility.js +22 -0
- package/src/sap/ui/mdc/flexibility/ActionToolbarAction.flexibility.js +19 -0
- package/src/sap/ui/mdc/flexibility/Chart.flexibility.js +1 -1
- package/src/sap/ui/mdc/flexibility/ConditionFlex.js +57 -46
- package/src/sap/ui/mdc/flexibility/FilterBar.flexibility.js +1 -1
- package/src/sap/ui/mdc/flexibility/FilterItemFlex.js +1 -1
- package/src/sap/ui/mdc/flexibility/ItemBaseFlex.js +203 -197
- package/src/sap/ui/mdc/library.js +588 -8
- package/src/sap/ui/mdc/link/ContactDetails.js +1 -1
- package/src/sap/ui/mdc/link/ContactDetailsAddressItem.js +1 -1
- package/src/sap/ui/mdc/link/ContactDetailsEmailItem.js +1 -1
- package/src/sap/ui/mdc/link/ContactDetailsItem.js +1 -1
- package/src/sap/ui/mdc/link/ContactDetailsPhoneItem.js +1 -1
- package/src/sap/ui/mdc/link/Factory.js +1 -1
- package/src/sap/ui/mdc/link/FakeFlpConnector.js +1 -1
- package/src/sap/ui/mdc/link/LinkItem.js +1 -1
- package/src/sap/ui/mdc/link/Panel.js +1 -1
- package/src/sap/ui/mdc/link/PanelItem.js +1 -1
- package/src/sap/ui/mdc/link/PanelListItem.js +1 -1
- package/src/sap/ui/mdc/link/SelectionDialog.js +2 -2
- package/src/sap/ui/mdc/link/SelectionDialogItem.js +1 -1
- package/src/sap/ui/mdc/link/SemanticObjectMapping.js +1 -1
- package/src/sap/ui/mdc/link/SemanticObjectMappingItem.js +1 -1
- package/src/sap/ui/mdc/link/SemanticObjectUnavailableAction.js +1 -1
- package/src/sap/ui/mdc/messagebundle.properties +31 -5
- package/src/sap/ui/mdc/messagebundle_ar.properties +11 -4
- package/src/sap/ui/mdc/messagebundle_bg.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_ca.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_cs.properties +12 -5
- package/src/sap/ui/mdc/messagebundle_cy.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_da.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_de.properties +12 -5
- package/src/sap/ui/mdc/messagebundle_el.properties +11 -4
- package/src/sap/ui/mdc/messagebundle_en.properties +9 -2
- package/src/sap/ui/mdc/messagebundle_en_GB.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_en_US_sappsd.properties +11 -3
- package/src/sap/ui/mdc/messagebundle_en_US_saprigi.properties +19 -3
- package/src/sap/ui/mdc/messagebundle_en_US_saptrc.properties +11 -2
- package/src/sap/ui/mdc/messagebundle_es.properties +35 -28
- package/src/sap/ui/mdc/messagebundle_es_MX.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_et.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_fi.properties +11 -4
- package/src/sap/ui/mdc/messagebundle_fr.properties +22 -15
- package/src/sap/ui/mdc/messagebundle_fr_CA.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_hi.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_hr.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_hu.properties +11 -4
- package/src/sap/ui/mdc/messagebundle_id.properties +11 -4
- package/src/sap/ui/mdc/messagebundle_it.properties +33 -26
- package/src/sap/ui/mdc/messagebundle_iw.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_ja.properties +13 -6
- package/src/sap/ui/mdc/messagebundle_kk.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_ko.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_lt.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_lv.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_ms.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_nl.properties +11 -4
- package/src/sap/ui/mdc/messagebundle_no.properties +17 -10
- package/src/sap/ui/mdc/messagebundle_pl.properties +14 -7
- package/src/sap/ui/mdc/messagebundle_pt.properties +11 -4
- package/src/sap/ui/mdc/messagebundle_pt_PT.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_ro.properties +13 -6
- package/src/sap/ui/mdc/messagebundle_ru.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_sh.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_sk.properties +11 -4
- package/src/sap/ui/mdc/messagebundle_sl.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_sv.properties +11 -4
- package/src/sap/ui/mdc/messagebundle_th.properties +16 -9
- package/src/sap/ui/mdc/messagebundle_tr.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_uk.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_vi.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_zh_CN.properties +10 -3
- package/src/sap/ui/mdc/messagebundle_zh_TW.properties +10 -3
- package/src/sap/ui/mdc/mixin/AdaptationMixin.js +1 -1
- package/src/sap/ui/mdc/mixin/DelegateMixin.js +2 -2
- package/src/sap/ui/mdc/mixin/FilterIntegrationMixin.js +3 -3
- package/src/sap/ui/mdc/mixin/PromiseMixin.js +94 -0
- package/src/sap/ui/mdc/odata/v4/ChartPropertyHelperNew.js +1 -1
- package/src/sap/ui/mdc/odata/v4/FilterBarDelegate.js +6 -6
- package/src/sap/ui/mdc/odata/v4/TableDelegate.js +37 -10
- package/src/sap/ui/mdc/odata/v4/ValueHelpDelegate.js +94 -0
- package/src/sap/ui/mdc/odata/v4/vizChart/ChartDelegateNew.js +492 -203
- package/src/sap/ui/mdc/p13n/DefaultProviderRegistry.js +1 -1
- package/src/sap/ui/mdc/p13n/Engine.js +3 -2
- package/src/sap/ui/mdc/p13n/P13nBuilder.js +6 -60
- package/src/sap/ui/mdc/p13n/PropertyHelper.js +1 -1
- package/src/sap/ui/mdc/p13n/UIManager.js +1 -1
- package/src/sap/ui/mdc/p13n/modification/ModificationHandler.js +22 -24
- package/src/sap/ui/mdc/p13n/panels/ActionToolbarPanel.js +59 -0
- package/src/sap/ui/mdc/p13n/panels/AdaptFiltersPanel.js +1 -2
- package/src/sap/ui/mdc/p13n/panels/BasePanel.js +17 -8
- package/src/sap/ui/mdc/p13n/panels/ChartItemPanel.js +1 -2
- package/src/sap/ui/mdc/p13n/panels/ChartItemPanelNew.js +1171 -0
- package/src/sap/ui/mdc/p13n/panels/GroupPanel.js +1 -1
- package/src/sap/ui/mdc/p13n/panels/GroupView.js +7 -11
- package/src/sap/ui/mdc/p13n/panels/ListView.js +5 -3
- package/src/sap/ui/mdc/p13n/panels/QueryPanel.js +16 -9
- package/src/sap/ui/mdc/p13n/panels/SelectionPanel.js +0 -1
- package/src/sap/ui/mdc/p13n/panels/SortPanel.js +0 -1
- package/src/sap/ui/mdc/p13n/panels/SortQueryPanel.js +1 -1
- package/src/sap/ui/mdc/p13n/panels/Wrapper.js +1 -1
- package/src/sap/ui/mdc/p13n/subcontroller/ActionToolbarController.js +89 -0
- package/src/sap/ui/mdc/p13n/subcontroller/BaseController.js +9 -6
- package/src/sap/ui/mdc/p13n/subcontroller/ChartItemController.js +33 -4
- package/src/sap/ui/mdc/p13n/subcontroller/ColumnController.js +9 -15
- package/src/sap/ui/mdc/p13n/subcontroller/FilterController.js +12 -0
- package/src/sap/ui/mdc/p13n/subcontroller/GroupController.js +5 -12
- package/src/sap/ui/mdc/p13n/subcontroller/SortController.js +19 -21
- package/src/sap/ui/mdc/table/Column.js +35 -9
- package/src/sap/ui/mdc/table/CreationRow.js +1 -1
- package/src/sap/ui/mdc/table/GridTableType.js +0 -1
- package/src/sap/ui/mdc/table/PropertyHelper.js +108 -5
- package/src/sap/ui/mdc/table/ResponsiveTableType.js +19 -3
- package/src/sap/ui/mdc/table/RowSettings.js +1 -1
- package/src/sap/ui/mdc/table/TableTypeBase.js +0 -1
- package/src/sap/ui/mdc/table/V4AnalyticsPropertyHelper.js +1 -1
- package/src/sap/ui/mdc/themes/base/FilterBar.less +2 -2
- package/src/sap/ui/mdc/themes/base/GroupView.less +2 -2
- package/src/sap/ui/mdc/themes/base/ListView.less +2 -2
- package/src/sap/ui/mdc/themes/base/ValueHelpDialog.less +56 -21
- package/src/sap/ui/mdc/ui/Container.js +2 -2
- package/src/sap/ui/mdc/ui/ContainerItem.js +2 -2
- package/src/sap/ui/mdc/util/Common.js +26 -0
- package/src/sap/ui/mdc/util/FilterUtil.js +12 -1
- package/src/sap/ui/mdc/util/IdentifierUtil.js +4 -0
- package/src/sap/ui/mdc/util/PromiseCache.js +266 -0
- package/src/sap/ui/mdc/util/PropertyHelper.js +22 -1
- package/src/sap/ui/mdc/valuehelp/Dialog.js +498 -0
- package/src/sap/ui/mdc/valuehelp/Popover.js +362 -0
- package/src/sap/ui/mdc/valuehelp/base/Container.js +642 -0
- package/src/sap/ui/mdc/valuehelp/base/Content.js +628 -0
- package/src/sap/ui/mdc/valuehelp/base/DialogTab.js +139 -0
- package/src/sap/ui/mdc/valuehelp/base/FilterableListContent.js +557 -0
- package/src/sap/ui/mdc/valuehelp/base/ListContent.js +133 -0
- package/src/sap/ui/mdc/valuehelp/content/Bool.js +318 -0
- package/src/sap/ui/mdc/valuehelp/content/Conditions.js +276 -0
- package/src/sap/ui/mdc/valuehelp/content/FixedList.js +532 -0
- package/src/sap/ui/mdc/valuehelp/content/MDCTable.js +638 -0
- package/src/sap/ui/mdc/valuehelp/content/MTable.js +916 -0
- package/test/sap/ui/mdc/testutils/opa/TestLibrary.js +3 -2
- package/test/sap/ui/mdc/testutils/opa/actions/OpenContextMenu.js +48 -0
- package/test/sap/ui/mdc/testutils/opa/chartNew/ActionsBase.js +310 -0
- package/test/sap/ui/mdc/testutils/opa/chartNew/ActionsViz.js +39 -0
- package/test/sap/ui/mdc/testutils/opa/chartNew/AssertionsBase.js +118 -0
- package/test/sap/ui/mdc/testutils/opa/chartNew/AssertionsViz.js +137 -0
- package/test/sap/ui/mdc/testutils/opa/chartNew/ChartNew.js +24 -0
- package/test/sap/ui/mdc/testutils/opa/chartNew/TestObjects.js +289 -0
- package/test/sap/ui/mdc/testutils/opa/filterbar/Actions.js +250 -0
- package/test/sap/ui/mdc/testutils/opa/filterbar/Assertions.js +91 -0
- package/test/sap/ui/mdc/testutils/opa/filterbar/TestObjects.js +137 -0
- package/test/sap/ui/mdc/testutils/opa/filterbar/Util.js +25 -0
- package/test/sap/ui/mdc/testutils/opa/p13n/Actions.js +401 -93
- package/test/sap/ui/mdc/testutils/opa/p13n/Util.js +4 -1
- package/test/sap/ui/mdc/testutils/opa/p13n/{waitForP13nButtonWithParentAndIcon.js → waitForP13nButtonWithMatchers.js} +5 -18
- package/test/sap/ui/mdc/testutils/opa/table/TestObjects.js +0 -1
|
@@ -42,7 +42,7 @@ sap.ui.define([
|
|
|
42
42
|
var ListMode = MLibrary.ListMode;
|
|
43
43
|
|
|
44
44
|
function _getDrillStackDimensions(oMDCChart) {
|
|
45
|
-
var aDrillStack = oMDCChart.getControlDelegate().getDrillStack();
|
|
45
|
+
var aDrillStack = oMDCChart.getControlDelegate().getDrillStack(oMDCChart);
|
|
46
46
|
var aStackDimensions = [];
|
|
47
47
|
|
|
48
48
|
aDrillStack.forEach(function(oStackEntry) {
|
|
@@ -76,6 +76,14 @@ sap.ui.define([
|
|
|
76
76
|
*/
|
|
77
77
|
DrillStackHandler.createDrillDownPopover = function(oMDCChart) {
|
|
78
78
|
|
|
79
|
+
var oSubHeader = new Bar();
|
|
80
|
+
var oPopover = new ResponsivePopover({
|
|
81
|
+
id: oMDCChart.getId() + "-drilldownPopover",
|
|
82
|
+
contentWidth: "25rem",
|
|
83
|
+
contentHeight: "20rem",
|
|
84
|
+
placement: PlacementType.Bottom,
|
|
85
|
+
subHeader: oSubHeader
|
|
86
|
+
});
|
|
79
87
|
var oList = new List({
|
|
80
88
|
mode: ListMode.SingleSelectMaster,
|
|
81
89
|
selectionChange: function(oControlEvent) {
|
|
@@ -98,7 +106,9 @@ sap.ui.define([
|
|
|
98
106
|
}
|
|
99
107
|
});
|
|
100
108
|
|
|
101
|
-
|
|
109
|
+
oPopover.attachAfterClose(function(){
|
|
110
|
+
oPopover.destroy();
|
|
111
|
+
});
|
|
102
112
|
|
|
103
113
|
//TODO add search field
|
|
104
114
|
//var oSearchField = new SearchField({
|
|
@@ -108,14 +118,6 @@ sap.ui.define([
|
|
|
108
118
|
//this._triggerSearchInDrillDownPopover(oEvent, oList);
|
|
109
119
|
//}.bind(this));
|
|
110
120
|
|
|
111
|
-
var oPopover = new ResponsivePopover({
|
|
112
|
-
id: oMDCChart.getId() + "-drilldownPopover",
|
|
113
|
-
contentWidth: "25rem",
|
|
114
|
-
contentHeight: "20rem",
|
|
115
|
-
placement: PlacementType.Bottom,
|
|
116
|
-
subHeader: oSubHeader
|
|
117
|
-
});
|
|
118
|
-
|
|
119
121
|
|
|
120
122
|
var oRb = Core.getLibraryResourceBundle("sap.ui.mdc");
|
|
121
123
|
|
|
@@ -21,7 +21,6 @@ sap.ui.define([
|
|
|
21
21
|
* The control is experimental and the API/behaviour is not finalised and hence this should not be used for productive usage.
|
|
22
22
|
* @extends sap.ui.core.Element
|
|
23
23
|
* @author SAP SE
|
|
24
|
-
* @constructor The API/behaviour is not finalised and hence this control should not be used for productive usage.
|
|
25
24
|
* @private
|
|
26
25
|
* @experimental
|
|
27
26
|
* @since 1.88
|
|
@@ -29,7 +29,7 @@ sap.ui.define([
|
|
|
29
29
|
*
|
|
30
30
|
* @namespace
|
|
31
31
|
* @author SAP SE
|
|
32
|
-
* @version 1.
|
|
32
|
+
* @version 1.96.1
|
|
33
33
|
* @since 1.61.0
|
|
34
34
|
* @alias sap.ui.mdc.condition.Condition
|
|
35
35
|
*
|
|
@@ -52,7 +52,7 @@ sap.ui.define([
|
|
|
52
52
|
* @property {object} [inParameters] In parameters of the condition. For each field path, a value is stored
|
|
53
53
|
* @property {object} [outParameters] Out parameters of the condition. For each field path, a value is stored
|
|
54
54
|
* @property {boolean} [isEmpty] If set, the condition is empty (used as dummy condition in {@link sap.ui.mdc.field.DefineConditionPanel DefineConditionPanel})
|
|
55
|
-
* @property {sap.ui.mdc.
|
|
55
|
+
* @property {sap.ui.mdc.enum.ConditionValidated} validated If set to <code>ConditionValidated.Validated</code>, the condition is validated (by the field help) and not shown in the {@link sap.ui.mdc.field.DefineConditionPanel DefineConditionPanel} control
|
|
56
56
|
* @private
|
|
57
57
|
* @ui5-restricted sap.fe
|
|
58
58
|
* @MDC_PUBLIC_CANDIDATE
|
|
@@ -17,7 +17,8 @@ sap.ui.define([
|
|
|
17
17
|
'sap/ui/core/date/UniversalDate',
|
|
18
18
|
'sap/ui/core/date/UniversalDateUtils',
|
|
19
19
|
'sap/ui/core/format/DateFormat',
|
|
20
|
-
'sap/ui/model/json/JSONModel'
|
|
20
|
+
'sap/ui/model/json/JSONModel',
|
|
21
|
+
'sap/ui/model/type/Integer'
|
|
21
22
|
],
|
|
22
23
|
|
|
23
24
|
function(
|
|
@@ -34,7 +35,8 @@ function(
|
|
|
34
35
|
UniversalDate,
|
|
35
36
|
UniversalDateUtils,
|
|
36
37
|
DateFormat,
|
|
37
|
-
JSONModel
|
|
38
|
+
JSONModel,
|
|
39
|
+
Integer // the Integer type must be available for some of the RangeOperators
|
|
38
40
|
) {
|
|
39
41
|
"use strict";
|
|
40
42
|
|
|
@@ -50,7 +52,7 @@ function(
|
|
|
50
52
|
*
|
|
51
53
|
* @namespace
|
|
52
54
|
* @author SAP SE
|
|
53
|
-
* @version 1.
|
|
55
|
+
* @version 1.96.1
|
|
54
56
|
* @since 1.73.0
|
|
55
57
|
* @alias sap.ui.mdc.condition.FilterOperatorUtil
|
|
56
58
|
*
|
|
@@ -723,7 +725,7 @@ function(
|
|
|
723
725
|
|
|
724
726
|
return null;
|
|
725
727
|
},
|
|
726
|
-
createControl: function(oType, sPath, iIndex, sId) {
|
|
728
|
+
createControl: function(oType, sPath, iIndex, sId, aClass) {
|
|
727
729
|
var getMonthItems = function() {
|
|
728
730
|
if (!this._aMonthsItems) {
|
|
729
731
|
var aMonths = _getMonths.apply(this);
|
|
@@ -740,9 +742,14 @@ function(
|
|
|
740
742
|
return this._aMonthsItems;
|
|
741
743
|
}.bind(this);
|
|
742
744
|
|
|
745
|
+
var ListFieldHelp = sap.ui.require("sap/ui/mdc/field/ListFieldHelp");
|
|
746
|
+
var ListItem = sap.ui.require("sap/ui/core/ListItem");
|
|
747
|
+
var Field = sap.ui.require("sap/ui/mdc/Field");
|
|
748
|
+
if (!ListFieldHelp || !ListItem || !Field) {
|
|
749
|
+
Log.warning("Operator.createControl", "not able to create the control for the operator " + this.name);
|
|
750
|
+
return null;
|
|
751
|
+
}
|
|
743
752
|
if (!this._oListFieldHelp) {
|
|
744
|
-
var ListFieldHelp = sap.ui.requireSync("sap/ui/mdc/field/ListFieldHelp");
|
|
745
|
-
var ListItem = sap.ui.requireSync("sap/ui/core/ListItem");
|
|
746
753
|
this._oListFieldHelp = new ListFieldHelp({
|
|
747
754
|
id: "LFHForSpecificMonth",
|
|
748
755
|
items: {
|
|
@@ -760,7 +767,6 @@ function(
|
|
|
760
767
|
}).setModel(new JSONModel(getMonthItems()), "$items");
|
|
761
768
|
}
|
|
762
769
|
|
|
763
|
-
var Field = sap.ui.requireSync("sap/ui/mdc/Field");
|
|
764
770
|
var oField = new Field(sId, {
|
|
765
771
|
value: { path: sPath, type: oType, mode: 'TwoWay', targetType: 'raw' },
|
|
766
772
|
additionalValue: { path: sPath, formatter: function(iValue) { return this._oListFieldHelp.getTextForKey(iValue); }.bind(this), mode: 'OneWay' },
|
|
@@ -14,7 +14,7 @@ sap.ui.define([
|
|
|
14
14
|
'sap/base/util/deepEqual',
|
|
15
15
|
'./Condition',
|
|
16
16
|
'sap/ui/mdc/enum/ConditionValidated',
|
|
17
|
-
|
|
17
|
+
'sap/base/strings/escapeRegExp'
|
|
18
18
|
], function(
|
|
19
19
|
BaseObject,
|
|
20
20
|
Filter,
|
|
@@ -60,7 +60,7 @@ sap.ui.define([
|
|
|
60
60
|
* If set to <code>Operator.ValueType.Static</code> a simple string type is used to display static text.<br>
|
|
61
61
|
* If set to a name of a data type an instance of this data type will be used.<br>
|
|
62
62
|
* If set to an object with the properties <code>name</code>, <code>formatOptions</code> and <code>constraints</code>
|
|
63
|
-
* an instance of the corresponding data type will be used.<br>
|
|
63
|
+
* an instance of the corresponding data type will be used. The type given via <code>name</code> must be required by the application.<br>
|
|
64
64
|
* @param {string[]} [oConfiguration.paramTypes] Array of type parameters regexp
|
|
65
65
|
* @param {string} [oConfiguration.longText] String representation of the operator as a long text.<br>
|
|
66
66
|
* If longText is not given , it is looked up in the resource bundle of the <code>sap.ui.mdc</code> library by the key
|
|
@@ -83,7 +83,7 @@ sap.ui.define([
|
|
|
83
83
|
* @param {string} [oConfiguration.additionalInfo] additionalInfo text for the operator. Will be shown in the operator suggest as second column. If not used (undefined) the Include or Exclude information of the operator is used.
|
|
84
84
|
* @constructor
|
|
85
85
|
* @author SAP SE
|
|
86
|
-
* @version 1.
|
|
86
|
+
* @version 1.96.1
|
|
87
87
|
* @private
|
|
88
88
|
* @ui5-restricted sap.fe
|
|
89
89
|
* @MDC_PUBLIC_CANDIDATE
|
|
@@ -570,7 +570,7 @@ sap.ui.define([
|
|
|
570
570
|
}
|
|
571
571
|
|
|
572
572
|
if (!oUsedType) {
|
|
573
|
-
|
|
573
|
+
// The used type must be required from the application.
|
|
574
574
|
var TypeClass = ObjectPath.get(sType || "");
|
|
575
575
|
oUsedType = new TypeClass(oFormatOptions, oConstraints);
|
|
576
576
|
oUsedType._bCreatedByOperator = true; // to distinguish in Field between original type and Operator type on Operator change
|
|
@@ -33,7 +33,7 @@ sap.ui.define([
|
|
|
33
33
|
* @param {int[]|function} [oConfiguration.defaultValues] Array of values for the defaults of <code>RangeOperators</code> parameter. This can be a function, which returns the array of values. If not used the default for the values is 1.
|
|
34
34
|
* @constructor
|
|
35
35
|
* @author SAP SE
|
|
36
|
-
* @version 1.
|
|
36
|
+
* @version 1.96.1
|
|
37
37
|
* @private
|
|
38
38
|
* @ui5-restricted sap.fe
|
|
39
39
|
* @MDC_PUBLIC_CANDIDATE
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* ! OpenUI5
|
|
3
|
+
* (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
|
|
4
|
+
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
|
|
5
|
+
*/
|
|
6
|
+
sap.ui.define([], function () {
|
|
7
|
+
"use strict";
|
|
8
|
+
|
|
9
|
+
var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
|
|
10
|
+
|
|
11
|
+
return {
|
|
12
|
+
aggregations: {
|
|
13
|
+
content: {
|
|
14
|
+
ignore: true
|
|
15
|
+
},
|
|
16
|
+
// ActionToolbarActions
|
|
17
|
+
actions: {
|
|
18
|
+
ignore: true
|
|
19
|
+
},
|
|
20
|
+
begin: {
|
|
21
|
+
ignore: true
|
|
22
|
+
},
|
|
23
|
+
between: {
|
|
24
|
+
ignore: true
|
|
25
|
+
},
|
|
26
|
+
end: {
|
|
27
|
+
ignore: true
|
|
28
|
+
}
|
|
29
|
+
},
|
|
30
|
+
actions: {
|
|
31
|
+
settings: {
|
|
32
|
+
name: oResourceBundle.getText("actiontoolbar.RTA_SETTINGS_NAME"),
|
|
33
|
+
handler: function (oControl, mPropertyBag) {
|
|
34
|
+
return sap.ui.mdc.p13n.Engine.getInstance().getRTASettingsActionHandler(oControl, mPropertyBag, "actionsKey").then(function(aChanges){
|
|
35
|
+
return aChanges;
|
|
36
|
+
});
|
|
37
|
+
},
|
|
38
|
+
CAUTION_variantIndependent: true
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
});
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* ! OpenUI5
|
|
3
|
+
* (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
|
|
4
|
+
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
|
|
5
|
+
*/
|
|
6
|
+
sap.ui.define([
|
|
7
|
+
"sap/ui/mdc/p13n/Engine"
|
|
8
|
+
], function (Engine) {
|
|
9
|
+
"use strict";
|
|
10
|
+
|
|
11
|
+
return {
|
|
12
|
+
actions: {
|
|
13
|
+
settings: function () {
|
|
14
|
+
//RTA expects the settings to be returned as function
|
|
15
|
+
return {
|
|
16
|
+
handler: function (oControl, mPropertyBag) {
|
|
17
|
+
return Engine.getInstance().getRTASettingsActionHandler(oControl, mPropertyBag, oControl.getP13nMode());
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
},
|
|
22
|
+
properties: {
|
|
23
|
+
width: {
|
|
24
|
+
ignore: false
|
|
25
|
+
},
|
|
26
|
+
height: {
|
|
27
|
+
ignore: false
|
|
28
|
+
},
|
|
29
|
+
delegate: {
|
|
30
|
+
ignore: true
|
|
31
|
+
},
|
|
32
|
+
header: {
|
|
33
|
+
ignore: false
|
|
34
|
+
},
|
|
35
|
+
noDataText: {
|
|
36
|
+
ignore: false
|
|
37
|
+
},
|
|
38
|
+
p13nMode: {
|
|
39
|
+
ignore: false
|
|
40
|
+
},
|
|
41
|
+
legendVisible: {
|
|
42
|
+
ignore: false
|
|
43
|
+
},
|
|
44
|
+
ignoreToolbarActions: {
|
|
45
|
+
ignore: false
|
|
46
|
+
},
|
|
47
|
+
minWidth: {
|
|
48
|
+
ignore: false
|
|
49
|
+
},
|
|
50
|
+
minHeight: {
|
|
51
|
+
ignore: false
|
|
52
|
+
},
|
|
53
|
+
sortConditions: {
|
|
54
|
+
ignore: true
|
|
55
|
+
},
|
|
56
|
+
showChartTooltip: {
|
|
57
|
+
ignore: false
|
|
58
|
+
},
|
|
59
|
+
autoBindOnInit: {
|
|
60
|
+
ignore: false
|
|
61
|
+
},
|
|
62
|
+
chartType: {
|
|
63
|
+
ignore: false
|
|
64
|
+
},
|
|
65
|
+
showSelectionDetails: {
|
|
66
|
+
ignore: false
|
|
67
|
+
}
|
|
68
|
+
},
|
|
69
|
+
aggregations: {
|
|
70
|
+
items: {
|
|
71
|
+
ignore: false
|
|
72
|
+
},
|
|
73
|
+
actions: {
|
|
74
|
+
ignore: false
|
|
75
|
+
},
|
|
76
|
+
selectionDetailsActions: {
|
|
77
|
+
ignore: false
|
|
78
|
+
},
|
|
79
|
+
_toolbar: {
|
|
80
|
+
ignore: true
|
|
81
|
+
},
|
|
82
|
+
_breadcrumbs: {
|
|
83
|
+
ignore: true
|
|
84
|
+
},
|
|
85
|
+
_innerChart: {
|
|
86
|
+
ignore: true
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
};
|
|
90
|
+
|
|
91
|
+
});
|
|
@@ -12,11 +12,31 @@ sap.ui.define([
|
|
|
12
12
|
actions: {
|
|
13
13
|
settings: function () {
|
|
14
14
|
return {
|
|
15
|
+
name: "filterbar.ADAPT_TITLE",
|
|
15
16
|
handler: function (oControl, mPropertyBag) {
|
|
16
17
|
return Engine.getInstance().getRTASettingsActionHandler(oControl, mPropertyBag, "Item");
|
|
17
18
|
}
|
|
18
19
|
};
|
|
19
20
|
}
|
|
21
|
+
},
|
|
22
|
+
aggregations: {
|
|
23
|
+
layout: {
|
|
24
|
+
ignore: true
|
|
25
|
+
},
|
|
26
|
+
basicSearchField: {
|
|
27
|
+
ignore: true
|
|
28
|
+
},
|
|
29
|
+
filterItems: {
|
|
30
|
+
ignore: true
|
|
31
|
+
}
|
|
32
|
+
},
|
|
33
|
+
properties: {
|
|
34
|
+
showAdaptFiltersButton: {
|
|
35
|
+
ignore: false
|
|
36
|
+
},
|
|
37
|
+
p13nMode: {
|
|
38
|
+
ignore: false
|
|
39
|
+
}
|
|
20
40
|
}
|
|
21
41
|
};
|
|
22
42
|
});
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* ! OpenUI5
|
|
3
|
+
* (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
|
|
4
|
+
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
|
|
5
|
+
*/
|
|
6
|
+
sap.ui.define([], function() {
|
|
7
|
+
"use strict";
|
|
8
|
+
|
|
9
|
+
return {
|
|
10
|
+
properties: {
|
|
11
|
+
showGoButton: {
|
|
12
|
+
ignore: false
|
|
13
|
+
},
|
|
14
|
+
delegate: {
|
|
15
|
+
ignore: true
|
|
16
|
+
},
|
|
17
|
+
liveMode: {
|
|
18
|
+
ignore: false
|
|
19
|
+
},
|
|
20
|
+
showMessages: {
|
|
21
|
+
ignore: false
|
|
22
|
+
},
|
|
23
|
+
filterConditions: {
|
|
24
|
+
ignore: true
|
|
25
|
+
},
|
|
26
|
+
suspendSelection: {
|
|
27
|
+
ignore: true
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
};
|
|
31
|
+
});
|
|
@@ -8,7 +8,7 @@ sap.ui.define(function() {
|
|
|
8
8
|
"use strict";
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
|
-
* Defines in which mode the content of a <code>Field</code> or <code>
|
|
11
|
+
* Defines in which mode the content of a <code>Field</code>, <code>FilterField</code> or <code>MultiValueField</code> is rendered.
|
|
12
12
|
*
|
|
13
13
|
* @enum {string}
|
|
14
14
|
* @private
|
|
@@ -18,37 +18,58 @@ sap.ui.define(function() {
|
|
|
18
18
|
*/
|
|
19
19
|
var ContentMode = {
|
|
20
20
|
/**
|
|
21
|
+
* Display mode for single value
|
|
21
22
|
* @private
|
|
22
23
|
* @ui5-restricted sap.ui.mdc
|
|
23
24
|
*/
|
|
24
25
|
Display: "Display",
|
|
25
26
|
/**
|
|
27
|
+
* Display mode for multiple values
|
|
28
|
+
* @private
|
|
29
|
+
* @ui5-restricted sap.ui.mdc
|
|
30
|
+
* @since 1.96
|
|
31
|
+
*/
|
|
32
|
+
DisplayMultiValue: "DisplayMultiValue",
|
|
33
|
+
/**
|
|
34
|
+
* Display mode for multiline single value
|
|
26
35
|
* @private
|
|
27
36
|
* @ui5-restricted sap.ui.mdc
|
|
28
37
|
* @since 1.91
|
|
29
38
|
*/
|
|
30
39
|
DisplayMultiLine: "DisplayMultiLine",
|
|
31
40
|
/**
|
|
41
|
+
* Edit mode for single value
|
|
32
42
|
* @private
|
|
33
43
|
* @ui5-restricted sap.ui.mdc
|
|
34
44
|
*/
|
|
35
45
|
Edit: "Edit",
|
|
36
46
|
/**
|
|
47
|
+
* Edit mode for multiple values
|
|
37
48
|
* @private
|
|
38
49
|
* @ui5-restricted sap.ui.mdc
|
|
39
50
|
*/
|
|
40
|
-
|
|
51
|
+
EditMultiValue: "EditMultiValue",
|
|
41
52
|
/**
|
|
53
|
+
* Edit mode for multiple lines single value
|
|
42
54
|
* @private
|
|
43
55
|
* @ui5-restricted sap.ui.mdc
|
|
44
56
|
*/
|
|
45
57
|
EditMultiLine: "EditMultiLine",
|
|
46
58
|
/**
|
|
59
|
+
* Edit mode for operator dependent controls
|
|
60
|
+
* This is used for single value and only one operator.
|
|
61
|
+
* @private
|
|
62
|
+
* @ui5-restricted sap.ui.mdc
|
|
63
|
+
*/
|
|
64
|
+
EditOperator: "EditOperator",
|
|
65
|
+
/**
|
|
66
|
+
* Edit mode for single value field if a field help is assigned
|
|
67
|
+
* To support field help, in some cases a different control needs to be rendered.
|
|
47
68
|
* @private
|
|
48
69
|
* @ui5-restricted sap.ui.mdc
|
|
49
70
|
*/
|
|
50
|
-
|
|
51
|
-
|
|
71
|
+
EditForHelp: "EditForHelp"
|
|
72
|
+
};
|
|
52
73
|
|
|
53
74
|
return ContentMode;
|
|
54
75
|
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/*!
|
|
2
|
+
* OpenUI5
|
|
3
|
+
* (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
|
|
4
|
+
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
// Provides enumeration sap.ui.mdc.enum.SelectType
|
|
8
|
+
sap.ui.define(function() {
|
|
9
|
+
"use strict";
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Enumeration of the possible selection types
|
|
14
|
+
*
|
|
15
|
+
* @enum {string}
|
|
16
|
+
* @private
|
|
17
|
+
* @ui5-restricted sap.ui.mdc
|
|
18
|
+
* @since 1.90.1
|
|
19
|
+
* @alias sap.ui.mdc.enum.SelectType
|
|
20
|
+
*/
|
|
21
|
+
var SelectType = {
|
|
22
|
+
/**
|
|
23
|
+
* @private
|
|
24
|
+
* @ui5-restricted sap.ui.mdc
|
|
25
|
+
*/
|
|
26
|
+
Set: "Set",
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* @private
|
|
30
|
+
* @ui5-restricted sap.ui.mdc
|
|
31
|
+
*/
|
|
32
|
+
Add: "Add",
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* @private
|
|
36
|
+
* @ui5-restricted sap.ui.mdc
|
|
37
|
+
*/
|
|
38
|
+
Remove: "Remove"
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
return SelectType;
|
|
42
|
+
|
|
43
|
+
}, /* bExport= */ true);
|
|
@@ -35,7 +35,7 @@ sap.ui.define([
|
|
|
35
35
|
* @param {object} [mSettings] Initial settings for the new control
|
|
36
36
|
* @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls that shows a list for Boolean values.
|
|
37
37
|
* @extends sap.ui.mdc.field.FieldHelpBase
|
|
38
|
-
* @version 1.
|
|
38
|
+
* @version 1.96.1
|
|
39
39
|
* @constructor
|
|
40
40
|
* @private
|
|
41
41
|
* @ui5-restricted sap.ui.mdc.field.FieldBase
|
|
@@ -35,7 +35,7 @@ sap.ui.define([
|
|
|
35
35
|
* @param {object} [mSettings] Initial settings for the new control
|
|
36
36
|
* @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls to show a popover of conditions.
|
|
37
37
|
* @extends sap.ui.mdc.field.FieldHelpBase
|
|
38
|
-
* @version 1.
|
|
38
|
+
* @version 1.96.1
|
|
39
39
|
* @constructor
|
|
40
40
|
* @private
|
|
41
41
|
* @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
|
|
@@ -46,7 +46,7 @@ sap.ui.define([
|
|
|
46
46
|
* @extends sap.ui.model.SimpleType
|
|
47
47
|
*
|
|
48
48
|
* @author SAP SE
|
|
49
|
-
* @version 1.
|
|
49
|
+
* @version 1.96.1
|
|
50
50
|
*
|
|
51
51
|
* @since 1.62.0
|
|
52
52
|
* @private
|
|
@@ -721,7 +721,7 @@ sap.ui.define([
|
|
|
721
721
|
var sID = this.oFormatOptions.fieldHelpID;
|
|
722
722
|
if (sID) {
|
|
723
723
|
var oFieldHelp = sap.ui.getCore().byId(sID);
|
|
724
|
-
if (oFieldHelp && oFieldHelp.
|
|
724
|
+
if (oFieldHelp && oFieldHelp.isValidationSupported()) {
|
|
725
725
|
return oFieldHelp;
|
|
726
726
|
}
|
|
727
727
|
}
|
|
@@ -861,11 +861,26 @@ sap.ui.define([
|
|
|
861
861
|
var oFieldHelp = _getFieldHelp.call(this);
|
|
862
862
|
var oDelegate = this.oFormatOptions.delegate;
|
|
863
863
|
var oPayload = this.oFormatOptions.payload;
|
|
864
|
+
var oConfig = {
|
|
865
|
+
value: vValue,
|
|
866
|
+
parsedValue: vParsedValue,
|
|
867
|
+
inParameters: undefined, // TODO: needed?
|
|
868
|
+
outParameters: undefined, // TODO: needed?
|
|
869
|
+
bindingContext: oBindingContext,
|
|
870
|
+
checkKeyFirst: bCheckKeyFirst, // TODO: not longer needed?
|
|
871
|
+
checkKey: bCheckKey,
|
|
872
|
+
checkDescription: bCheckDescription,
|
|
873
|
+
conditionModel: oConditionModel,
|
|
874
|
+
conditionModelName: sConditionModelName,
|
|
875
|
+
exception: ParseException
|
|
876
|
+
};
|
|
864
877
|
|
|
865
878
|
if (oDelegate) {
|
|
866
|
-
return oDelegate.getItemForValue(oPayload, oFieldHelp, vValue, vParsedValue, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
|
|
879
|
+
// return oDelegate.getItemForValue(oPayload, oFieldHelp, vValue, vParsedValue, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
|
|
880
|
+
return oDelegate.getItemForValue(oPayload, oFieldHelp, oConfig);
|
|
867
881
|
} else if (oFieldHelp) {
|
|
868
|
-
return oFieldHelp.getItemForValue(vValue, vParsedValue, undefined, undefined, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
|
|
882
|
+
// return oFieldHelp.getItemForValue(vValue, vParsedValue, undefined, undefined, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
|
|
883
|
+
return oFieldHelp.getItemForValue(oConfig);
|
|
869
884
|
}
|
|
870
885
|
|
|
871
886
|
}
|
|
@@ -36,7 +36,7 @@ sap.ui.define([
|
|
|
36
36
|
* @extends sap.ui.model.SimpleType
|
|
37
37
|
*
|
|
38
38
|
* @author SAP SE
|
|
39
|
-
* @version 1.
|
|
39
|
+
* @version 1.96.1
|
|
40
40
|
*
|
|
41
41
|
* @since 1.62.0
|
|
42
42
|
* @private
|
|
@@ -73,6 +73,7 @@ sap.ui.define([
|
|
|
73
73
|
oFormatOptions = _createFormatOptionsForConditionType(oFormatOptions);
|
|
74
74
|
// var oConstraints = merge({}, this.oConstraints);
|
|
75
75
|
this._oConditionType = new ConditionType(oFormatOptions, this.oConstraints);
|
|
76
|
+
this._oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
|
|
76
77
|
}
|
|
77
78
|
|
|
78
79
|
});
|
|
@@ -160,8 +161,8 @@ sap.ui.define([
|
|
|
160
161
|
}
|
|
161
162
|
|
|
162
163
|
return SyncPromise.all(aSyncPromises).then(function(aFormattedValues) {
|
|
163
|
-
return _concatenateFormattedValues(aFormattedValues, vValue);
|
|
164
|
-
}).unwrap();
|
|
164
|
+
return _concatenateFormattedValues.call(this, aFormattedValues, vValue);
|
|
165
|
+
}.bind(this)).unwrap();
|
|
165
166
|
|
|
166
167
|
};
|
|
167
168
|
|
|
@@ -169,7 +170,7 @@ sap.ui.define([
|
|
|
169
170
|
|
|
170
171
|
for (var i = 0; i < aFormattedValues.length; i++) {
|
|
171
172
|
if (vValue) {
|
|
172
|
-
vValue = vValue + "
|
|
173
|
+
vValue = vValue + this._oResourceBundle.getText("field.SEPARATOR") + aFormattedValues[i];
|
|
173
174
|
} else {
|
|
174
175
|
vValue = aFormattedValues[i];
|
|
175
176
|
}
|
|
@@ -16,7 +16,7 @@ sap.ui.define([
|
|
|
16
16
|
* @param {object} [mSettings] Initial settings for the new control
|
|
17
17
|
* @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls that allows you to add custom content.
|
|
18
18
|
* @extends sap.ui.mdc.field.FieldHelpBase
|
|
19
|
-
* @version 1.
|
|
19
|
+
* @version 1.96.1
|
|
20
20
|
* @constructor
|
|
21
21
|
* @private
|
|
22
22
|
* @ui5-restricted sap.fe
|
|
@@ -16,7 +16,7 @@ sap.ui.define([
|
|
|
16
16
|
* @param {object} [mSettings] Initial settings for the new control
|
|
17
17
|
* @class A field help used in the <code>FieldInfo</code> aggregation in <code>FieldBase</code> controls that allows you to add custom content.
|
|
18
18
|
* @extends sap.ui.mdc.field.FieldInfoBase
|
|
19
|
-
* @version 1.
|
|
19
|
+
* @version 1.96.1
|
|
20
20
|
* @constructor
|
|
21
21
|
* @private
|
|
22
22
|
* @ui5-restricted sap.fe
|