@openui5/sap.ui.mdc 1.97.1 → 1.100.0

package/src/sap/ui/mdc/field/content/DefaultContent.js

@@ -13,6 +13,7 @@ sap.ui.define([
 	"use strict";
 
 	var EmptyIndicatorMode = mLibrary.EmptyIndicatorMode;
+	var TokenizerRenderMode = mLibrary.TokenizerRenderMode;
 
 	/**
 	 * Object-based definition of the default content type that is used in the {@link sap.ui.mdc.field.content.ContentFactory}.
@@ -31,7 +32,7 @@ sap.ui.define([
 			return ["sap/m/Text"];
 		},
 		getDisplayMultiValue: function() {
-			return this.getDisplayMultiLine();
+			return ["sap/ui/mdc/field/TokenizerDisplay", "sap/ui/mdc/field/TokenDisplay"];
 		},
 		getDisplayMultiLine: function() {
 			return ["sap/m/ExpandableText"];
@@ -60,8 +61,8 @@ sap.ui.define([
 		/**
 		 * Determines which controls to return for a given {@link sap.ui.mdc.enum.ContentMode}.
 		 * @param {sap.ui.mdc.enum.ContentMode} sContentMode The given content mode
-		 * @param {String} sOperator Name of the operator if the <code>EditOperator</code> content mode is used
-		 * @returns {String[]} aControlNames Names of the determined controls
+		 * @param {string} sOperator Name of the operator if the <code>EditOperator</code> content mode is used
+		 * @returns {string[]} aControlNames Names of the determined controls
 		 */
 		getControlNames: function(sContentMode, sOperator) {
 			var aControlNames;
@@ -103,9 +104,9 @@ sap.ui.define([
 		 * Creates the suitable controls for the given content mode and returns the control instances.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls this function
 		 * @param {sap.ui.mdc.enum.ContentMode} sContentMode a given content mode
-		 * @param {String} sOperator Name of the operator if the <code>EditOperator</code> content mode is used
+		 * @param {string} sOperator Name of the operator if the <code>EditOperator</code> content mode is used
 		 * @param {Object[]} aControls Array containing the control classes that are to be created
-		 * @param {String} sId ID of the {@link sap.ui.mdc.field.FieldBase}
+		 * @param {string} sId ID of the {@link sap.ui.mdc.field.FieldBase}
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 */
 		create: function(oContentFactory, sContentMode, sOperator, aControls, sId) {
@@ -135,7 +136,7 @@ sap.ui.define([
 		 * Creates the suitable controls for content mode <code>Edit</code>.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
 		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
-		 * @param {String} sId ID of the field control
+		 * @param {string} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 */
 		createEdit: function(oContentFactory, aControlClasses, sId) {
@@ -172,7 +173,7 @@ sap.ui.define([
 		 * Creates the suitable controls for content mode <code>EditMultiValue</code>.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
 		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
-		 * @param {String} sId ID of the field control
+		 * @param {string} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 */
 		createEditMultiValue: function(oContentFactory, aControlClasses, sId) {
@@ -219,7 +220,7 @@ sap.ui.define([
 		 * Creates the suitable controls for content mode <code>EditMultiLine</code>.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
 		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
-		 * @param {String} sId ID of the field control
+		 * @param {string} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 */
 		createEditMultiLine: function(oContentFactory, aControlClasses, sId) {
@@ -252,7 +253,7 @@ sap.ui.define([
 		 * Creates the suitable controls for content mode <code>Display</code>.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
 		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
-		 * @param {String} sId ID of the field control
+		 * @param {string} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 */
 		createDisplay: function(oContentFactory, aControlClasses, sId) {
@@ -275,7 +276,7 @@ sap.ui.define([
 		 * Creates the suitable controls for content mode <code>DisplayMultiLine</code>.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
 		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
-		 * @param {String} sId ID of the field control
+		 * @param {string} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 * @since 1.91
 		 */
@@ -297,18 +298,39 @@ sap.ui.define([
 		 * Creates the suitable controls for content mode <code>DisplayMultiValue</code>.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
 		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
-		 * @param {String} sId ID of the field control
+		 * @param {string} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 * @since 1.96
 		 */
 		createDisplayMultiValue: function(oContentFactory, aControlClasses, sId) {
-			return this.createDisplayMultiLine(oContentFactory, aControlClasses, sId); // for now just return the same asl in MultiLine mode
+			var Tokenizer = aControlClasses[0];
+			var Token = aControlClasses[1];
+			var oConditionType = oContentFactory.getConditionType();
+			var oToken = new Token(sId + "-token", {
+				text: {
+					path: '$field>',
+					type: oConditionType
+				}
+			});
+
+			var oTokenizer = new Tokenizer(sId, {
+				editable: false,
+				// textAlign: "{$field>/textAlign}",
+				emptyIndicatorMode: EmptyIndicatorMode.Auto,
+				renderMode: TokenizerRenderMode.Narrow,
+				width: "100%",
+				tooltip: "{$field>/tooltip}",
+				tokens: { path: "$field>/conditions", template: oToken },
+				dependents: [oToken] // to destroy it if Control is destroyed
+			});
+
+			return [oTokenizer];
 		},
 		/**
 		 * Creates the suitable controls for content mode <code>EditForHelp</code>.
 		 * @param {sap.ui.mdc.field.content.ContentFactory} oContentFactory The content factory that calls the create function
 		 * @param {Object[]} aControlClasses Array containing the control classes which are to be created
-		 * @param {String} sId ID of the field control
+		 * @param {string} sId ID of the field control
 		 * @returns {sap.ui.core.Control[]} Array containing the created controls
 		 * @since 1.96
 		 */

package/src/sap/ui/mdc/field/content/LinkContent.js

@@ -43,7 +43,7 @@ sap.ui.define([
 				textDirection: "{$field>/textDirection}",
 				tooltip: "{$field>/tooltip}",
 				press: oContentFactory.getHandleContentPress(),
-				wrapping: true
+				wrapping: "{$field>/multipleLines}"
 			});
 			var oFieldInfo = oContentFactory.getField().getFieldInfo();
 			if (oFieldInfo) {