@sapui5/sap.fe.core 1.102.2 → 1.104.1

package/src/sap/fe/core/controls/massEdit/MassEditField.fragment.xml

@@ -7,6 +7,7 @@
 	xmlns:control="sap.fe.core.controls"
 	xmlns:f="sap.ui.layout.form"
 	xmlns:l="sap.ui.layout"
+	xmlns:customData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	template:require="{
 		ID: 'sap/fe/core/helpers/StableIdHelper',
 		ValueHelpTemplating: 'sap/fe/macros/internal/valuehelp/ValueHelpTemplating'
@@ -38,8 +39,9 @@
 					items="{= '{path : \'' + ${runtimePath>} + ${property>} + '\'}' }"
 					change="MassEditHandlers.handleSelectionChange($event)"
 					selectedKey="{= '{' + ${runtimePath>} + ${property>} + '/selectedKey}' }"
-					selectValue="{= '{ parts : [{ path:\'' +  ${property>} + '\'}, {value: \'' + ${property>} + '\' }, {value: \'' + ID.generate(['MED_', ${dataField>entitySet}, ${property>}, '_MDCField']) + '\' }], formatter: \'MassEditHandlers.contextPropertyChange\' }' }"
+					selectValue="{= (${dataField>inputType} !== 'CheckBox') && ('{ parts : [{ path:\'' +  ${property>} + '\'}, {value: \'' + ${property>} + '\' }, {value: \'' + ID.generate(['MED_', ${dataField>entitySet}, ${property>}, '_MDCField']) + '\' }], formatter: \'MassEditHandlers.contextPropertyChange\' }') }"
 					width="100%"
+					customData:fieldPath="{property>}"
 				>
 					<control:items>
 						<core:Item key="{fieldsInfo>key}" text="{fieldsInfo>text}" />
@@ -48,42 +50,26 @@
 						<l:GridData span="XL12 L12 M12 S12" />
 					</control:layoutData>
 				</control:MassEditSelect>
-				<mdc:dependents>
-					<mdcField:FieldValueHelp
-						core:require="{MassEditHandlers: 'sap/fe/core/controls/massEdit/MassEditHandlers', ValueListHelper: 'sap/fe/macros/internal/valuehelp/ValueListHelper'}"
-						delegate="{= ValueHelpTemplating.getDelegateConfiguration(${property>} === ${dataField>dataProperty} ? ${dataField>propertyPathForValueHelp} : ${dataField>propertyPathForValueHelpUnit})}"
-						validateInput="false"
-						afterClose="MassEditHandlers.afterVHDClose($event)"
-						id="{= ID.generate(['MED_', ${dataField>entitySet}, ${property>}, 'VHD']) }"
-					>
-						<mdcField:dialogContent>
-							<mdcField:FieldValueHelpMdcTableWrapper />
-						</mdcField:dialogContent>
-						<mdcField:suggestContent>
-							<mdcField:FieldValueHelpMTableWrapper />
-						</mdcField:suggestContent>
-					</mdcField:FieldValueHelp>
-				</mdc:dependents>
+				<template:if test="{= ${dataField>inputType} !== 'CheckBox' }">
+					<mdc:dependents>
+						<mdcField:FieldValueHelp
+							core:require="{MassEditHandlers: 'sap/fe/core/controls/massEdit/MassEditHandlers', ValueListHelper: 'sap/fe/macros/internal/valuehelp/ValueListHelper'}"
+							delegate="{= ValueHelpTemplating.getDelegateConfiguration(${property>} === ${dataField>dataProperty} ? ${dataField>propertyPathForValueHelp} : ${dataField>propertyPathForValueHelpUnit})}"
+							validateInput="false"
+							afterClose="MassEditHandlers.afterVHDClose($event)"
+							id="{= ID.generate(['MED_', ${dataField>entitySet}, ${property>}, 'VHD']) }"
+						>
+							<mdcField:dialogContent>
+								<mdcField:FieldValueHelpMdcTableWrapper />
+							</mdcField:dialogContent>
+							<mdcField:suggestContent>
+								<mdcField:FieldValueHelpMTableWrapper />
+							</mdcField:suggestContent>
+						</mdcField:FieldValueHelp>
+					</mdc:dependents>
+				</template:if>
 			</mdc:Field>
 		</template:then>
-		<template:elseif test="{= ${dataField>inputType} === 'CheckBox' }">
-			<control:MassEditSelect
-				core:require="{MassEditHandlers: 'sap/fe/core/controls/massEdit/MassEditHandlers'}"
-				id="{= ID.generate(['MED_', ${dataField>entitySet}, ${property>}]) }"
-				items="{= '{path : \'' + ${runtimePath>} + ${property>} + '\'}' }"
-				change="MassEditHandlers.handleSelectionChange($event)"
-				selectedKey="{= '{' + ${runtimePath>} + ${property>} + '/selectedKey}' }"
-				width="100%"
-			>
-				<control:items>
-					<core:Item key="{fieldsInfo>key}" text="{fieldsInfo>text}" />
-				</control:items>
-				<control:layoutData>
-					<l:GridData span="XL12 L12 M12 S12" />
-				</control:layoutData>
-			</control:MassEditSelect>
-		</template:elseif>
-
 		<template:else>
 			<ComboBox
 				id="{= ID.generate(['MED_', ${dataField>entitySet}, ${property>}]) }"
@@ -92,6 +78,7 @@
 				change="MassEditHandlers.handleSelectionChange($event)"
 				selectedKey="{= '{' + ${runtimePath>} + ${property>} + '/selectedKey}' }"
 				visible="{= '{' + ${runtimePath>} + ${property>} + '/visible}' }"
+				customData:fieldPath="{property>}"
 			>
 				<items>
 					<core:Item key="{fieldsInfo>key}" text="{fieldsInfo>text}" />