@openui5/sap.m 1.101.0 → 1.102.0

package/src/sap/m/messagebundle_zh_CN.properties

@@ -292,6 +292,8 @@ FACETFILTER_AVAILABLE_FILTER_NAMES=\u53EF\u7528\u8FC7\u6EE4\u5668\u540D\u79F0
 
 TABLESELECTDIALOG_SELECTEDITEMS=\u5DF2\u9009\u62E9\uFF1A{0}
 
+TABLESELECTDIALOG_SELECTEDITEMS_SR=\u6240\u9009\u9879\u76EE {0}
+
 TABLESELECTDIALOG_CLEARBUTTON=\u6E05\u9664
 
 SELECTDIALOG_CLEARBUTTON=\u6E05\u9664
@@ -553,10 +555,18 @@ p13n.MOVE_TO_BOTTOM=\u79FB\u52A8\u5230\u5E95\u90E8
 p13n.HEADER_COUNT=({0}/{1})
 p13n.SORT_ASCENDING=\u5347\u5E8F
 p13n.SORT_DESCENDING=\u964D\u5E8F
-p13n.QUERY_NONE=\uFF08\u65E0\uFF09
+p13n.SORT_PLACEHOLDER=\u6392\u5E8F\u65B9\u5F0F
+p13n.GROUP_PLACEHOLDER=\u5206\u7EC4\u4F9D\u636E
+p13n.FILTER_PLACEHOLDER=\u8FC7\u6EE4\u6761\u4EF6
+p13n.FILTER_REMOVEICONTOOLTIP=\u79FB\u9664\u8FC7\u6EE4\u6761\u4EF6
+p13n.GROUP_REMOVEICONTOOLTIP=\u79FB\u9664\u5206\u7EC4\u6761\u4EF6
+p13n.SORT_REMOVEICONTOOLTIP=\u79FB\u9664\u6392\u5E8F\u6761\u4EF6
+
 p13n.SHOW_SELECTED=\u663E\u793A\u5DF2\u9009\u9879
 p13n.SHOW_ALL=\u5168\u90E8\u663E\u793A
 p13n.DEFAULT_DESCRIPTION=\u5B57\u6BB5
+p13n.ACTIVESTATE_ACTIVE=\u5B57\u6BB5\u5904\u4E8E\u6D3B\u52A8\u72B6\u6001
+p13n.ACTIVESTATE_INACTIVE=\u5B57\u6BB5\u5904\u4E8E\u975E\u6D3B\u52A8\u72B6\u6001
 p13n.GROUP_CHECKBOX=\u5B57\u6BB5\u663E\u793A\u4E3A\u5217
 p13n.POPUP_RESET=\u91CD\u7F6E
 p13n.POPUP_OK=\u786E\u5B9A
@@ -847,6 +857,8 @@ ACTION_PRIORITY_LOW=\u4F4E
 
 ACTION_PRIORITY_MEDIUM=\u4E2D
 
+TEXT_CONTENT_PRIORITY=\u4F18\u5148\u7EA7
+
 SEMANTIC_COLOR_CRITICAL=\u8B66\u544A
 
 SEMANTIC_COLOR_GOOD=\u826F\u597D
@@ -1561,3 +1573,83 @@ IllustratedMessage_DESCRIPTION_SuccessScreen=\u60A8\u5DF2\u5B8C\u6210\u4E86\u624
 IllustratedMessage_TITLE_UploadCollection=\u5C06\u6587\u4EF6\u653E\u4E8E\u6B64\u5904
 
 IllustratedMessage_DESCRIPTION_UploadCollection=\u8FD8\u53EF\u4EE5\u540C\u65F6\u4E0A\u8F7D\u591A\u4E2A\u6587\u4EF6\u3002
+
+VARIANT_MANAGEMENT_SAVE=\u4FDD\u5B58
+
+VARIANT_MANAGEMENT_SAVEAS=\u53E6\u5B58\u4E3A
+
+VARIANT_MANAGEMENT_OK=\u786E\u5B9A
+
+VARIANT_MANAGEMENT_CANCEL=\u53D6\u6D88
+
+VARIANT_MANAGEMENT_MANAGE=\u7BA1\u7406
+
+VARIANT_MANAGEMENT_NAME=\u89C6\u56FE
+
+VARIANT_MANAGEMENT_KEY=\u952E\u503C\uFF1A
+
+VARIANT_MANAGEMENT_SETASDEFAULT=\u8BBE\u7F6E\u4E3A\u7F3A\u7701\u503C
+
+VARIANT_MANAGEMENT_SETASPUBLIC=\u516C\u5171
+
+VARIANT_MANAGEMENT_VARIANTTYPE=\u5171\u4EAB
+
+VARIANT_MANAGEMENT_PUBLIC=\u516C\u5171
+
+VARIANT_MANAGEMENT_PRIVATE=\u79C1\u6709
+
+VARIANT_MANAGEMENT_SAVEDIALOG=\u4FDD\u5B58\u89C6\u56FE
+
+VARIANT_MANAGEMENT_MANAGEDIALOG=\u7BA1\u7406\u89C6\u56FE
+
+VARIANT_MANAGEMENT_NODATA=\u9009\u62E9\u201C\u4FDD\u5B58\u201D\u4EE5\u5B58\u50A8\u65B0\u89C6\u56FE
+
+VARIANT_MANAGEMENT_DEFAULT=\u7F3A\u7701
+
+VARIANT_MANAGEMENT_EXECUTEONSELECT=\u81EA\u52A8\u5E94\u7528
+
+VARIANT_MANAGEMENT_AUTHOR=\u521B\u5EFA\u8005
+
+VARIANT_MANAGEMENT_ACTION_COLUMN=\u64CD\u4F5C
+
+VARIANT_MANAGEMENT_SEL_VARIANT=\u89C6\u56FE {0}\u3002\u8981\u9009\u62E9\u89C6\u56FE\uFF0C\u8BF7\u6309\u7A7A\u683C\u952E\u3002
+
+VARIANT_MANAGEMENT_SEL_VARIANT_MOD=\u5DF2\u4FEE\u6539\u89C6\u56FE {0}\u3002\u8981\u9009\u62E9\u89C6\u56FE\uFF0C\u8BF7\u6309\u7A7A\u683C\u952E\u3002
+
+VARIANT_MANAGEMENT_VARIANTS=\u6211\u7684\u89C6\u56FE
+
+VARIANT_MANAGEMENT_ERROR_DUPLICATE=\u89C6\u56FE\u540D\u79F0\u5DF2\u5B58\u5728\u3002\u8BF7\u8F93\u5165\u53E6\u4E00\u4E0D\u540C\u540D\u79F0\u3002
+
+VARIANT_MANAGEMENT_ERROR_EMPTY=\u8BF7\u8F93\u5165\u540D\u79F0\u3002
+
+VARIANT_MANAGEMENT_NOT_ALLOWED_CHAR=\u4E0D\u5141\u8BB8\u5BF9\u89C6\u56FE\u540D\u79F0\u4F7F\u7528\u5B57\u7B26 {0}
+
+VARIANT_MANAGEMENT_MAX_LEN=\u89C6\u56FE\u540D\u79F0\u9650\u5236\u4E3A {0} \u4E2A\u5B57\u7B26
+
+VARIANT_MANAGEMENT_TRIGGER_TT=\u9009\u62E9\u89C6\u56FE
+
+VARIANT_MANAGEMENT_DELETE=\u5220\u9664\u89C6\u56FE
+
+VARIANT_MANAGEMENT_FAV_ADD_ACC=\u6536\u85CF\u5939\u56FE\u6807\u672A\u9009\u4E2D
+
+VARIANT_MANAGEMENT_FAV_DEL_ACC=\u6536\u85CF\u5939\u56FE\u6807\u5DF2\u9009\u4E2D
+
+VARIANT_MANAGEMENT_FAV_DEL_TOOLTIP=\u5DF2\u9009\u62E9\u4E3A\u6536\u85CF\u5939
+
+VARIANT_MANAGEMENT_FAV_ADD_TOOLTIP=\u672A\u9009\u62E9\u4E3A\u6536\u85CF\u5939
+
+VARIANT_MANAGEMENT_ERROR_TEXT1=\u65E0\u6CD5\u52A0\u8F7D\u6570\u636E\u3002
+
+VARIANT_MANAGEMENT_ERROR_TEXT2=\u5982\u679C\u672A\u8FDE\u63A5\u5230 Internet \u6216\u662F\u5E95\u5C42\u7CFB\u7EDF\u6216\u7EC4\u4EF6\u4E0D\u53EF\u7528\uFF0C\u4FBF\u53EF\u80FD\u4F1A\u53D1\u751F\u8FD9\u79CD\u60C5\u51B5\u3002
+
+VARIANT_MANAGEMENT_VISIBILITY=\u53EF\u89C1\u6027
+
+VARIANT_MANAGEMENT_CHANGE_VISIBILITY=\u66F4\u6539 {0} \u7684\u53EF\u89C1\u6027
+
+VARIANT_MANAGEMENT_VISIBILITY_NON_RESTRICTED=\u6240\u6709\u7528\u6237
+
+VARIANT_MANAGEMENT_VISIBILITY_RESTRICTED=\u53D7\u9650\u5236
+
+VARIANT_MANAGEMENT_VISIBILITY_ICON_TT=\u8981\u66F4\u6539\u53EF\u89C1\u6027\uFF0C\u8BF7\u6309\u7A7A\u683C\u952E\u3002
+
+VARIANT_MANAGEMENT_SELECTROLES_DIALOG=\u9009\u62E9\u89D2\u8272

package/src/sap/m/messagebundle_zh_TW.properties

@@ -292,6 +292,8 @@ FACETFILTER_AVAILABLE_FILTER_NAMES=\u53EF\u7528\u7684\u7BE9\u9078\u540D\u7A31
 
 TABLESELECTDIALOG_SELECTEDITEMS=\u5DF2\u9078\u9805\u76EE\u6578\u91CF\uFF1A{0}
 
+TABLESELECTDIALOG_SELECTEDITEMS_SR=\u6240\u9078\u9805\u76EE {0}
+
 TABLESELECTDIALOG_CLEARBUTTON=\u6E05\u9664
 
 SELECTDIALOG_CLEARBUTTON=\u6E05\u9664
@@ -553,10 +555,18 @@ p13n.MOVE_TO_BOTTOM=\u79FB\u81F3\u5E95\u7AEF
 p13n.HEADER_COUNT=({0}/{1})
 p13n.SORT_ASCENDING=\u905E\u589E
 p13n.SORT_DESCENDING=\u905E\u6E1B
-p13n.QUERY_NONE=(\u7121)
+p13n.SORT_PLACEHOLDER=\u6392\u5E8F\u4F9D\u64DA
+p13n.GROUP_PLACEHOLDER=\u5206\u7D44\u4F9D\u64DA
+p13n.FILTER_PLACEHOLDER=\u7BE9\u9078\u4F9D\u64DA
+p13n.FILTER_REMOVEICONTOOLTIP=\u79FB\u9664\u7BE9\u9078\u6E96\u5247
+p13n.GROUP_REMOVEICONTOOLTIP=\u79FB\u9664\u5206\u7D44\u6E96\u5247
+p13n.SORT_REMOVEICONTOOLTIP=\u79FB\u9664\u6392\u5E8F\u6E96\u5247
+
 p13n.SHOW_SELECTED=\u986F\u793A\u6240\u9078
 p13n.SHOW_ALL=\u986F\u793A\u5168\u90E8
 p13n.DEFAULT_DESCRIPTION=\u6B04\u4F4D
+p13n.ACTIVESTATE_ACTIVE=\u6B04\u4F4D\u555F\u7528\u4E2D
+p13n.ACTIVESTATE_INACTIVE=\u6B04\u4F4D\u672A\u555F\u7528
 p13n.GROUP_CHECKBOX=\u5C07\u6B04\u4F4D\u986F\u793A\u70BA\u6B04
 p13n.POPUP_RESET=\u91CD\u8A2D
 p13n.POPUP_OK=\u78BA\u5B9A
@@ -847,6 +857,8 @@ ACTION_PRIORITY_LOW=\u4F4E
 
 ACTION_PRIORITY_MEDIUM=\u4E2D
 
+TEXT_CONTENT_PRIORITY=\u512A\u5148\u9806\u5E8F
+
 SEMANTIC_COLOR_CRITICAL=\u8B66\u544A
 
 SEMANTIC_COLOR_GOOD=\u826F\u597D
@@ -1561,3 +1573,83 @@ IllustratedMessage_DESCRIPTION_SuccessScreen=\u60A8\u5DF2\u5B8C\u6210\u6240\u670
 IllustratedMessage_TITLE_UploadCollection=\u5728\u6B64\u653E\u7F6E\u6A94\u6848
 
 IllustratedMessage_DESCRIPTION_UploadCollection=\u60A8\u4E5F\u53EF\u4E00\u6B21\u4E0A\u50B3\u6578\u500B\u6A94\u6848\u3002
+
+VARIANT_MANAGEMENT_SAVE=\u5132\u5B58
+
+VARIANT_MANAGEMENT_SAVEAS=\u53E6\u5B58\u65B0\u6A94
+
+VARIANT_MANAGEMENT_OK=\u78BA\u5B9A
+
+VARIANT_MANAGEMENT_CANCEL=\u53D6\u6D88
+
+VARIANT_MANAGEMENT_MANAGE=\u7BA1\u7406
+
+VARIANT_MANAGEMENT_NAME=\u6AA2\u8996
+
+VARIANT_MANAGEMENT_KEY=\u9375\u503C\uFF1A
+
+VARIANT_MANAGEMENT_SETASDEFAULT=\u8A2D\u70BA\u9810\u8A2D
+
+VARIANT_MANAGEMENT_SETASPUBLIC=\u516C\u958B
+
+VARIANT_MANAGEMENT_VARIANTTYPE=\u5171\u7528
+
+VARIANT_MANAGEMENT_PUBLIC=\u516C\u958B
+
+VARIANT_MANAGEMENT_PRIVATE=\u79C1\u4EBA
+
+VARIANT_MANAGEMENT_SAVEDIALOG=\u5132\u5B58\u6AA2\u8996
+
+VARIANT_MANAGEMENT_MANAGEDIALOG=\u7BA1\u7406\u6AA2\u8996
+
+VARIANT_MANAGEMENT_NODATA=\u9078\u64C7 [\u5132\u5B58] \u4EE5\u5132\u5B58\u65B0\u6AA2\u8996
+
+VARIANT_MANAGEMENT_DEFAULT=\u9810\u8A2D
+
+VARIANT_MANAGEMENT_EXECUTEONSELECT=\u81EA\u52D5\u5957\u7528
+
+VARIANT_MANAGEMENT_AUTHOR=\u5EFA\u7ACB\u8005
+
+VARIANT_MANAGEMENT_ACTION_COLUMN=\u4F5C\u696D
+
+VARIANT_MANAGEMENT_SEL_VARIANT=\u6AA2\u8996 {0}\u3002\u82E5\u8981\u9078\u64C7\u6AA2\u8996\uFF0C\u8ACB\u6309\u7A7A\u767D\u9375\u3002
+
+VARIANT_MANAGEMENT_SEL_VARIANT_MOD=\u4FEE\u6539\u7684\u6AA2\u8996 {0}\u3002\u82E5\u8981\u9078\u64C7\u6AA2\u8996\uFF0C\u8ACB\u6309\u7A7A\u767D\u9375\u3002
+
+VARIANT_MANAGEMENT_VARIANTS=\u6211\u7684\u6AA2\u8996
+
+VARIANT_MANAGEMENT_ERROR_DUPLICATE=\u6AA2\u8996\u540D\u7A31\u5DF2\u5B58\u5728\uFF0C\u8ACB\u8F38\u5165\u4E0D\u540C\u7684\u540D\u7A31\u3002
+
+VARIANT_MANAGEMENT_ERROR_EMPTY=\u8ACB\u8F38\u5165\u540D\u7A31\u3002
+
+VARIANT_MANAGEMENT_NOT_ALLOWED_CHAR=\u4E0D\u5141\u8A31\u6AA2\u8996\u540D\u7A31\u7684\u5B57\u5143 {0}
+
+VARIANT_MANAGEMENT_MAX_LEN=\u6AA2\u8996\u540D\u7A31\u7684\u9650\u5236\u70BA {0} \u500B\u5B57\u5143
+
+VARIANT_MANAGEMENT_TRIGGER_TT=\u9078\u64C7\u6AA2\u8996
+
+VARIANT_MANAGEMENT_DELETE=\u522A\u9664\u6AA2\u8996
+
+VARIANT_MANAGEMENT_FAV_ADD_ACC=\u672A\u52FE\u9078\u6700\u611B\u5716\u793A
+
+VARIANT_MANAGEMENT_FAV_DEL_ACC=\u5DF2\u52FE\u9078\u6700\u611B\u5716\u793A
+
+VARIANT_MANAGEMENT_FAV_DEL_TOOLTIP=\u5DF2\u9078\u64C7\u4F5C\u70BA\u6700\u611B
+
+VARIANT_MANAGEMENT_FAV_ADD_TOOLTIP=\u672A\u9078\u64C7\u4F5C\u70BA\u6700\u611B
+
+VARIANT_MANAGEMENT_ERROR_TEXT1=\u7121\u6CD5\u8F09\u5165\u8CC7\u6599\u3002
+
+VARIANT_MANAGEMENT_ERROR_TEXT2=\u6B64\u60C5\u6CC1\u53EF\u80FD\u6703\u5728\u60A8\u672A\u9023\u7DDA\u81F3\u7DB2\u969B\u7DB2\u8DEF\uFF0C\u6216\u6C92\u6709\u57FA\u790E\u7CFB\u7D71\u6216\u5143\u4EF6\u6642\u767C\u751F
+
+VARIANT_MANAGEMENT_VISIBILITY=\u53EF\u898B\u5EA6
+
+VARIANT_MANAGEMENT_CHANGE_VISIBILITY=\u66F4\u6539 {0} \u7684\u53EF\u898B\u5EA6
+
+VARIANT_MANAGEMENT_VISIBILITY_NON_RESTRICTED=\u6240\u6709\u4F7F\u7528\u8005
+
+VARIANT_MANAGEMENT_VISIBILITY_RESTRICTED=\u9650\u5236
+
+VARIANT_MANAGEMENT_VISIBILITY_ICON_TT=\u82E5\u8981\u66F4\u6539\u53EF\u898B\u5EA6\uFF0C\u8ACB\u6309\u7A7A\u767D\u9375\u3002
+
+VARIANT_MANAGEMENT_SELECTROLES_DIALOG=\u9078\u64C7\u89D2\u8272

package/src/sap/m/p13n/AbstractContainer.js

@@ -22,12 +22,12 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @alias sap.m.p13n.AbstractContainer
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 * @experimental Since 1.96.
 	 * @since 1.96
 	 *

package/src/sap/m/p13n/AbstractContainerItem.js

@@ -20,12 +20,12 @@ sap.ui.define(['sap/ui/core/Element', "sap/ui/core/Control"],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.101.0
+		 * @version 1.102.0
 		 *
 		 * @constructor
 		 * @alias sap.m.p13n.AbstractContainerItem
 		 * @author SAP SE
-		 * @version 1.101.0
+		 * @version 1.102.0
 		 * @experimental Since 1.96.
 	 	 * @since 1.96
 		 * @ui5-restricted

package/src/sap/m/p13n/BasePanel.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @ui5-restricted

package/src/sap/m/p13n/Container.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.AbstractContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @ui5-restricted

package/src/sap/m/p13n/GroupPanel.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @public
 	 * @experimental Since 1.96.
@@ -135,12 +135,23 @@ sap.ui.define([
 		});
 	};
 
-	GroupPanel.prototype._selectKey = function(oEvt) {
+	GroupPanel.prototype._getPlaceholderText = function () {
+		return this._getResourceText("p13n.GROUP_PLACEHOLDER");
+	};
+
+	GroupPanel.prototype._getRemoveButtonTooltipText = function () {
+		return this._getResourceText("p13n.GROUP_REMOVEICONTOOLTIP");
+	};
+
+	GroupPanel.prototype._selectKey = function(oComboBox) {
 		QueryPanel.prototype._selectKey.apply(this, arguments);
+
 		//Enable CheckBox
-		var oListItem = oEvt.getSource().getParent().getParent();
-		var sNewKey = oEvt.getParameter("selectedItem").getKey();
-		oListItem.getContent()[0].getContent()[1].getItems()[0].setEnabled(sNewKey !== this.NONE_KEY);
+		var oListItem = oComboBox.getParent().getParent();
+		var sNewKey = oComboBox.getSelectedKey();
+		var aContent = oListItem.getContent()[0].getContent();
+
+		aContent[1].getItems()[0].setEnabled(!!sNewKey);
 	};
 
 	return GroupPanel;

package/src/sap/m/p13n/Popup.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @public
 	 * @experimental Since 1.97.

package/src/sap/m/p13n/QueryPanel.js

@@ -4,11 +4,13 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/layout/Grid", "./BasePanel", "sap/ui/core/ListItem", "sap/m/CustomListItem", "sap/m/Select", "sap/m/List", "sap/m/HBox", "sap/m/library", "sap/m/Button", "sap/base/util/merge"
-], function (Grid, BasePanel, Item, CustomListItem, Select, List, HBox, mLibrary, Button, merge) {
+	"sap/ui/layout/Grid", "./BasePanel", "sap/ui/core/ListItem", "sap/m/CustomListItem", "sap/m/ComboBox", "sap/m/List", "sap/m/HBox", "sap/m/library", "sap/m/Button", "sap/base/util/merge", 'sap/ui/core/library'
+], function (Grid, BasePanel, Item, CustomListItem, ComboBox, List, HBox, mLibrary, Button, merge, coreLibrary) {
 	"use strict";
 
 
+	var ValueState = coreLibrary.ValueState;
+
 	/**
 	 * Constructor for a new <code>QueryPanel</code>.
 	 *
@@ -22,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @ui5-restricted
@@ -54,8 +56,6 @@ sap.ui.define([
 	// shortcut for sap.m.ButtonType
 	var ButtonType = mLibrary.ButtonType;
 
-	QueryPanel.prototype.NONE_KEY = "$_none";
-
 	QueryPanel.prototype.init = function () {
 		BasePanel.prototype.init.apply(this, arguments);
 		this._bFocusOnRearrange = false;
@@ -162,11 +162,7 @@ sap.ui.define([
 	QueryPanel.prototype._getAvailableItems = function (sKey) {
 		var aItems = this._getP13nModel().getProperty("/items");
 
-		var aAvailableItems = [new Item({
-			key: this.NONE_KEY,
-			text: this._getResourceText("p13n.QUERY_NONE"),
-			enabled: !sKey
-		})];
+		var aAvailableItems = [];
 
 		aItems.forEach(function (oNonPresent, iIndex) {
 			aAvailableItems.push(new Item({
@@ -175,7 +171,14 @@ sap.ui.define([
 				enabled: {
 					path: this.P13N_MODEL + ">/items/" + iIndex + "/" + this.PRESENCE_ATTRIBUTE,
 					formatter: function(bQueried) {
-						return !bQueried; //Only enable the selection in case there is not yet a query present
+						var oComboBox = this.getParent();
+						var selItem =  oComboBox.getSelectedItem();
+						var selItemIndex = selItem && oComboBox.getItems().indexOf(selItem);
+
+						var sPath = this.getBindingPath("enabled");
+						var pathIndex = parseInt(sPath.split("/")[2]);
+
+						return !bQueried || selItemIndex === pathIndex; //Only enable the selection in case there is not yet a query present or the item is the selected item
 					}
 				}
 			}));
@@ -209,9 +212,9 @@ sap.ui.define([
 		// 2) At least 2 queries can be made
 		// 3) The row is not exeeding the query limit
 		if (
-				this.getEnableReorder() &&
-				(this.getQueryLimit() === -1 || (this.getQueryLimit() > 1 && this._oListControl.getItems().length < this.getQueryLimit()))
-			){
+			this.getEnableReorder() &&
+			(this.getQueryLimit() === -1 || (this.getQueryLimit() > 1 && this._oListControl.getItems().length < this.getQueryLimit()))
+		){
 			this._addHover(oRow);
 		}
 
@@ -252,9 +255,17 @@ sap.ui.define([
 		}
 	};
 
+	QueryPanel.prototype._getPlaceholderText = function () {
+		return "";
+	};
+
+	QueryPanel.prototype._getRemoveButtonTooltipText = function () {
+		return "";
+	};
+
 	QueryPanel.prototype._createKeySelect = function (sKey) {
 		var that = this;
-		var oKeySelect = new Select({
+		var oKeySelect = new ComboBox({
 			width: "14rem",
 			enabled: {
 				path: this.P13N_MODEL + ">/items/",
@@ -274,43 +285,50 @@ sap.ui.define([
 			},
 			items: this._getAvailableItems(sKey),
 			selectedKey: sKey,
-			change: this._selectKey.bind(this)
+			placeholder: this._getPlaceholderText(),
+			selectionChange: function(oEvt) {
+				var oComboBox =  oEvt.getSource();
+				var oSelItem = oComboBox.getSelectedItem();
+				// var sNewKey = oComboBox.getSelectedKey();
+				if (!oSelItem) {
+					this._selectKey(oComboBox);
+				}
+			}.bind(this),
+			change: function(oEvt) {
+				var oComboBox = oEvt.getSource();
+				var newValue = oEvt.getParameter("newValue");
+				this._selectKey(oComboBox);
+				oComboBox.setValueState( newValue && !oComboBox.getSelectedItem() ? ValueState.Error : ValueState.None);
+			}.bind(this)
 		});
 
 		return oKeySelect;
 	};
 
-	QueryPanel.prototype._selectKey = function(oEvt) {
-
-		var oListItem = oEvt.getSource().getParent().getParent();
-
+	QueryPanel.prototype._selectKey = function(oComboBox) {
+		var sNewKey = oComboBox.getSelectedKey();
+		var sOldKey = oComboBox._key;
+		var oListItem = oComboBox.getParent().getParent();
 		var bIsLastRow = this._oListControl.getItems().length - 1 == this._oListControl.getItems().indexOf(oListItem);
-		var sNewKey = oEvt.getParameter("selectedItem").getKey();
-		var sOldKey = oEvt.getSource()._key;
-
-		var oBtnContainer = oListItem.getContent()[0].getContent()[oListItem.getContent()[0].getContent().length - 1];
-		//var oRemoveBtn = oBtnContainer.getItems()[oBtnContainer.getItems().length - 1];
 
-		oBtnContainer.setVisible(sNewKey !== this.NONE_KEY);
+		var aContent = oListItem.getContent()[0].getContent();
+		var oBtnContainer = aContent[aContent.length - 1];
+		oBtnContainer.setVisible(!(bIsLastRow && sNewKey == ""));
 
 		//Remove previous
 		if (sOldKey) {
 			this._updatePresence(sOldKey, false, undefined);
 		}
+
 		//store old key
-		oEvt.getSource()._key = sNewKey;
+		oComboBox._key = sNewKey;
 
 		//add new
 		this._updatePresence(sNewKey, true, this._oListControl.getItems().indexOf(oListItem));
 
 		//Add a new row in case the last "empty" row has been configured
-		if (sNewKey !== this.NONE_KEY && bIsLastRow) {
+		if (sNewKey !== "" && bIsLastRow) {
 			this._addQueryRow();
-			var oSelect = oEvt.getSource();
-			var oNoneItem = oSelect.getItemByKey(this.NONE_KEY);
-			if (oNoneItem) {
-				oNoneItem.setEnabled(false);
-			}
 		}
 	};
 
@@ -347,6 +365,10 @@ sap.ui.define([
 			]
 		});
 
+		if (this._getRemoveButtonTooltipText()) {
+			oRemoveBox.getItems()[0].setTooltip(this._getRemoveButtonTooltipText());
+		}
+
 		return oRemoveBox;
 	};
 

package/src/sap/m/p13n/SelectionPanel.js

@@ -19,8 +19,9 @@ sap.ui.define([
 	"sap/m/Button",
 	"sap/m/OverflowToolbar",
 	"sap/ui/model/Filter",
-	"sap/base/util/merge"
-], function(BasePanel, Label, ColumnListItem, HBox, VBox, coreLibrary, Icon, Text, Column, Table, mLibrary, ToolbarSpacer, Button, OverflowToolbar, Filter, merge) {
+	"sap/base/util/merge",
+	"sap/ui/core/InvisibleText"
+], function(BasePanel, Label, ColumnListItem, HBox, VBox, coreLibrary, Icon, Text, Column, Table, mLibrary, ToolbarSpacer, Button, OverflowToolbar, Filter, merge, InvisibleText) {
 	"use strict";
 
 	// shortcut for sap.ui.core.IconColor
@@ -47,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @public
 	 * @experimental Since 1.96.
@@ -151,6 +152,17 @@ sap.ui.define([
 									}
 								}
 							}
+						}),
+						// The active status is visiually represented as dot icon in the tabular view, for the screen reader it needs to be ensured
+						// that a similar information is available without the UI. This InvisibleText will provide a text in the screen reader as:
+						// "Active Field is active" & "Active Field is inactive"
+						new InvisibleText({
+							text: {
+								path: this.P13N_MODEL + ">active",
+								formatter: function(bactive) {
+									return bactive ? this._getResourceText("p13n.ACTIVESTATE_ACTIVE") : this._getResourceText("p13n.ACTIVESTATE_INACTIVE");
+								}.bind(this)
+							}
 						})
 					]
 				})
@@ -280,6 +292,12 @@ sap.ui.define([
 		}
 		BasePanel.prototype.setP13nData.call(this, aP13nData);
 		this._updateCount();
+
+		//After explicitly updating the data (e.g. outer influences by the p13n.Popup such as reset, open & update)
+		//Ensure that the remove buttons and currently selected item will be reset, as it's not clear anymore
+		//remove the reorder buttons from their current location and hence reset the hover logic
+		this._removeMoveButtons();
+		this._oSelectedItem = null;
 	};
 
 	SelectionPanel.prototype._updateCount = function() {
@@ -359,8 +377,15 @@ sap.ui.define([
 		this._oListControl.getItems().forEach(function(oItem){
 			var oContext = oItem.getBindingContext(this.P13N_MODEL);
 			var oField = this.getItemFactory().call(this, oContext);
-			var oCell = oItem.getCells()[0];
-			oCell.addItem(oField);
+
+			//set 'labelFor'
+			var oFirstCell = oItem.getCells()[0];
+			var oLabel = oFirstCell.getItems()[0];
+			if (oLabel) {
+				oLabel.setLabelFor(oField);
+			}
+
+			oFirstCell.addItem(oField);
 		}.bind(this));
 		this.addStyleClass("sapUiMDCAFLabelMarkingList");
 	};

package/src/sap/m/p13n/SortPanel.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @public
 	 * @experimental Since 1.96.
@@ -106,7 +106,7 @@ sap.ui.define([
 		return oSortOrderSwitch;
 	};
 
-	SortPanel.prototype._createSortOrderText = function (bDesc) {
+	SortPanel.prototype._createSortOrderText = function (sKey, bDesc) {
 		return new Text({
 			layoutData: new GridData({
 				span: "XL3 L3 M3 S3",
@@ -120,7 +120,7 @@ sap.ui.define([
 		//Enhance row with sort specific controls (Segmented Button + sort order text)
 		var oSelect = this._createKeySelect(oItem.name);
 		var oSortOrderSwitch = this._createOrderSwitch(oItem.name, oItem.descending);
-		var oSortOrderText = this._createSortOrderText(oItem.descending);
+		var oSortOrderText = this._createSortOrderText(oItem.name, oItem.descending);
 
 		return new Grid({
 			containerQuery: true,
@@ -133,16 +133,25 @@ sap.ui.define([
 		}).addStyleClass("sapUiTinyMargin");
 	};
 
-	SortPanel.prototype._selectKey = function(oEvt) {
+	SortPanel.prototype._getPlaceholderText = function () {
+		return this._getResourceText("p13n.SORT_PLACEHOLDER");
+	};
+
+	SortPanel.prototype._getRemoveButtonTooltipText = function () {
+		return this._getResourceText("p13n.SORT_REMOVEICONTOOLTIP");
+	};
+
+	SortPanel.prototype._selectKey = function(oComboBox) {
 		QueryPanel.prototype._selectKey.apply(this, arguments);
 
 		//Enable SegmentedButton
-		var oListItem = oEvt.getSource().getParent().getParent();
-		var sNewKey = oEvt.getParameter("selectedItem").getKey();
-		oListItem.getContent()[0].getContent()[1].setEnabled(sNewKey !== this.NONE_KEY);
+		var oListItem = oComboBox.getParent().getParent();
+		var sNewKey = oComboBox.getSelectedKey();
+		var aContent = oListItem.getContent()[0].getContent();
+		aContent[1].setEnabled(!!sNewKey);
 
 		//keep existing 'sortorder' selection
-		var bDescending = oListItem.getContent()[0].getContent()[1].getSelectedKey() === "desc";
+		var bDescending = aContent[1].getSelectedKey() === "desc";
 		this._changeOrder(sNewKey, bDescending);
 	};
 
@@ -155,12 +164,14 @@ sap.ui.define([
 			return oItem.name === sKey;
 		});
 
-		aItems[0].descending = bDesc;
+		if (aItems.length > 0) {
+			aItems[0].descending = bDesc;
 
-		this.fireChange({
-			reason: this.CHANGE_REASON_SORTORDER,
-			item: aItems[0]
-		});
+			this.fireChange({
+				reason: this.CHANGE_REASON_SORTORDER,
+				item: aItems[0]
+			});
+		}
 	};
 
 	return SortPanel;