@sapui5/sap.rules.ui 1.103.0 → 1.105.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 +1 -1
- package/src/sap/rules/ui/.library +1 -1
- package/src/sap/rules/ui/BindingSpy.js +1 -1
- package/src/sap/rules/ui/DecisionTable.js +1 -1
- package/src/sap/rules/ui/DecisionTableCell.js +1 -1
- package/src/sap/rules/ui/DecisionTableCellAstExpressionBasic.js +1 -1
- package/src/sap/rules/ui/DecisionTableCellExpressionAdvanced.js +1 -1
- package/src/sap/rules/ui/DecisionTableCellExpressionBasic.js +1 -1
- package/src/sap/rules/ui/DecisionTableConfiguration.js +1 -1
- package/src/sap/rules/ui/DecisionTableSettings.js +1 -1
- package/src/sap/rules/ui/DecisionTableSettingsOld.js +1 -1
- package/src/sap/rules/ui/ExpressionBase.js +1 -1
- package/src/sap/rules/ui/ExpressionBasic.js +1 -1
- package/src/sap/rules/ui/RuleBase.js +1 -1
- package/src/sap/rules/ui/RuleBuilder.js +1 -1
- package/src/sap/rules/ui/TextRule.js +1 -1
- package/src/sap/rules/ui/TextRuleConfiguration.js +1 -1
- package/src/sap/rules/ui/TextRuleSettings.js +1 -1
- package/src/sap/rules/ui/ast/autoComplete/dataStructure/ArrayAndRangeStack.js +8 -5
- package/src/sap/rules/ui/ast/autoComplete/dataStructure/ComparisionOperatorStack.js +8 -6
- package/src/sap/rules/ui/ast/autoComplete/dataStructure/FunctionalStack.js +8 -5
- package/src/sap/rules/ui/ast/autoComplete/dataStructure/Stack.js +6 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionFixedValuePanel.js +36 -22
- package/src/sap/rules/ui/i18n/messagebundle.properties +4 -0
- package/src/sap/rules/ui/i18n/messagebundle_ar.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_bg.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_ca.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_cs.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_cy.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_da.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_de.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_el.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_en.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_en_GB.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_en_US_sappsd.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_en_US_saprigi.properties +296 -0
- package/src/sap/rules/ui/i18n/messagebundle_en_US_saptrc.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_es.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_es_MX.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_et.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_fi.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_fr.properties +13 -11
- package/src/sap/rules/ui/i18n/messagebundle_fr_CA.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_hi.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_hr.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_hu.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_id.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_it.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_iw.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_ja.properties +3 -1
- package/src/sap/rules/ui/i18n/messagebundle_kk.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_ko.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_lt.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_lv.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_ms.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_nl.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_no.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_pl.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_pt.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_pt_PT.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_ro.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_ru.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_sh.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_sk.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_sl.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_sv.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_th.properties +12 -10
- package/src/sap/rules/ui/i18n/messagebundle_tr.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_uk.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_vi.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_zh_CN.properties +2 -0
- package/src/sap/rules/ui/i18n/messagebundle_zh_TW.properties +2 -0
- package/src/sap/rules/ui/library.js +1 -1
- package/src/sap/rules/ui/services/AstExpressionLanguage.js +9 -1
- package/src/sap/rules/ui/type/ExpressionAbs.js +1 -1
package/package.json
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
sap.ui.define(["sap/rules/ui/ast/constants/Constants",
|
|
2
|
-
"sap/rules/ui/ast/autoComplete/dataStructure/BaseStack"
|
|
3
|
-
"sap/rules/ui/ast/autoComplete/dataStructure/Stack"
|
|
2
|
+
"sap/rules/ui/ast/autoComplete/dataStructure/BaseStack"
|
|
4
3
|
],
|
|
5
|
-
function (Constants, BaseStack
|
|
4
|
+
function (Constants, BaseStack) {
|
|
6
5
|
"use strict";
|
|
7
6
|
|
|
8
7
|
var ArrayAndRangeStack = function () {
|
|
@@ -12,6 +11,10 @@ sap.ui.define(["sap/rules/ui/ast/constants/Constants",
|
|
|
12
11
|
|
|
13
12
|
ArrayAndRangeStack.prototype = new BaseStack();
|
|
14
13
|
ArrayAndRangeStack.prototype.constructor = BaseStack;
|
|
14
|
+
|
|
15
|
+
ArrayAndRangeStack.prototype.init = function (oStack) {
|
|
16
|
+
this.oStack = oStack;
|
|
17
|
+
};
|
|
15
18
|
|
|
16
19
|
ArrayAndRangeStack.prototype.push = function (oToken) {
|
|
17
20
|
var type = oToken.getTokenType();
|
|
@@ -32,7 +35,7 @@ sap.ui.define(["sap/rules/ui/ast/constants/Constants",
|
|
|
32
35
|
|
|
33
36
|
case Constants.COMMA:
|
|
34
37
|
case Constants.RANGE_DOTS:
|
|
35
|
-
var node = new
|
|
38
|
+
var node = new this.oStack(this.getTermPrefixId());
|
|
36
39
|
node.setPrevious(this._top);
|
|
37
40
|
this._top = node;
|
|
38
41
|
this._size += 1;
|
|
@@ -54,7 +57,7 @@ sap.ui.define(["sap/rules/ui/ast/constants/Constants",
|
|
|
54
57
|
ArrayAndRangeStack.prototype._handleLeftParenthesis = function (oToken) {
|
|
55
58
|
if (this.getHasOpenParenthesis() === false) {
|
|
56
59
|
this.setHasOpenParenthesis(true);
|
|
57
|
-
var node = new
|
|
60
|
+
var node = new this.oStack(this.getTermPrefixId());
|
|
58
61
|
node.setPrevious(this._top);
|
|
59
62
|
this._top = node;
|
|
60
63
|
this._size += 1;
|
|
@@ -1,25 +1,27 @@
|
|
|
1
1
|
sap.ui.define(["sap/rules/ui/ast/autoComplete/dataStructure/BaseStack",
|
|
2
2
|
"sap/rules/ui/ast/constants/Constants",
|
|
3
3
|
"sap/rules/ui/ast/autoComplete/node/TermNode",
|
|
4
|
-
"sap/rules/ui/ast/autoComplete/dataStructure/Stack",
|
|
5
4
|
"sap/rules/ui/ast/provider/OperatorProvider"
|
|
6
5
|
],
|
|
7
|
-
function (BaseStack, Constants, TermNode,
|
|
6
|
+
function (BaseStack, Constants, TermNode, OperatorProvider) {
|
|
8
7
|
"use strict";
|
|
9
8
|
|
|
10
9
|
var ComparisionOperatorStack = function () {
|
|
11
10
|
BaseStack.apply(this, arguments);
|
|
12
11
|
this._name = "";
|
|
13
12
|
this._sLeftOperandBusinessDataType = null;
|
|
14
|
-
var node = new sap.rules.ui.ast.autoComplete.dataStructure.Stack(this.getTermPrefixId());
|
|
15
|
-
node.setContextComparision(true);
|
|
16
|
-
node.setPrevious(this);
|
|
17
|
-
this._top = node;
|
|
18
13
|
this._size += 1;
|
|
19
14
|
};
|
|
20
15
|
|
|
21
16
|
ComparisionOperatorStack.prototype = new BaseStack();
|
|
22
17
|
ComparisionOperatorStack.prototype.constructor = BaseStack;
|
|
18
|
+
|
|
19
|
+
ComparisionOperatorStack.prototype.init = function (oStack) {
|
|
20
|
+
var node = new oStack(this.getTermPrefixId());
|
|
21
|
+
node.setContextComparision(true);
|
|
22
|
+
node.setPrevious(this);
|
|
23
|
+
this._top = node;
|
|
24
|
+
};
|
|
23
25
|
|
|
24
26
|
ComparisionOperatorStack.prototype.push = function (oToken) {
|
|
25
27
|
var type = oToken.getTokenType();
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
sap.ui.define(["sap/rules/ui/ast/autoComplete/dataStructure/BaseStack",
|
|
2
2
|
"sap/rules/ui/ast/constants/Constants",
|
|
3
|
-
"sap/rules/ui/ast/autoComplete/node/TermNode"
|
|
4
|
-
"sap/rules/ui/ast/autoComplete/dataStructure/Stack"
|
|
3
|
+
"sap/rules/ui/ast/autoComplete/node/TermNode"
|
|
5
4
|
],
|
|
6
|
-
function (BaseStack, Constants, TermNode
|
|
5
|
+
function (BaseStack, Constants, TermNode) {
|
|
7
6
|
"use strict";
|
|
8
7
|
|
|
9
8
|
var FunctionalStack = function () {
|
|
@@ -14,6 +13,10 @@ sap.ui.define(["sap/rules/ui/ast/autoComplete/dataStructure/BaseStack",
|
|
|
14
13
|
|
|
15
14
|
FunctionalStack.prototype = new BaseStack();
|
|
16
15
|
FunctionalStack.prototype.constructor = BaseStack;
|
|
16
|
+
|
|
17
|
+
FunctionalStack.prototype.init = function (oStack) {
|
|
18
|
+
this.oStack = oStack;
|
|
19
|
+
};
|
|
17
20
|
|
|
18
21
|
FunctionalStack.prototype.push = function (oToken) {
|
|
19
22
|
var type = oToken.getTokenType();
|
|
@@ -265,7 +268,7 @@ sap.ui.define(["sap/rules/ui/ast/autoComplete/dataStructure/BaseStack",
|
|
|
265
268
|
FunctionalStack.prototype.handleLeftParenthesisToken = function (oToken) {
|
|
266
269
|
if (this.getHasOpenParenthesis() === false && this.getSize() == 0) {
|
|
267
270
|
this.setHasOpenParenthesis(true);
|
|
268
|
-
this._top = new
|
|
271
|
+
this._top = new this.oStack(this.getTermPrefixId());
|
|
269
272
|
// TODO : read from mandatory parameter and set the expected
|
|
270
273
|
// dataObjectType and BusinessDataType
|
|
271
274
|
var aArgsMetadata = this.getFunction().getArgumentsMetadata();
|
|
@@ -307,7 +310,7 @@ sap.ui.define(["sap/rules/ui/ast/autoComplete/dataStructure/BaseStack",
|
|
|
307
310
|
errorMessage: "More number of arguments is been added"
|
|
308
311
|
};
|
|
309
312
|
}
|
|
310
|
-
var node = new
|
|
313
|
+
var node = new this.oStack(this.getTermPrefixId());
|
|
311
314
|
if (this.getFunction().getCategory() == Constants.AGGREGATE || this.getFunction().getCategory() == Constants.SELECTION) {
|
|
312
315
|
if (this.getSize() <= aArgsMetadata.length) {
|
|
313
316
|
// TODO: hack for now to make attribute with prefix id
|
|
@@ -76,6 +76,7 @@ function (TermNode, Constants, BaseStack, FunctionProvider, OperatorProvider, Fu
|
|
|
76
76
|
var sOperatorName = oToken.getText();
|
|
77
77
|
var oOperator = OperatorProvider.getInstance().getOperatorByName(sOperatorName.toUpperCase());
|
|
78
78
|
node = new ArrayAndRangeStack(this.getTermPrefixId());
|
|
79
|
+
node.init(Stack);
|
|
79
80
|
node.setOperator(oOperator);
|
|
80
81
|
node.setPrevious(this._top);
|
|
81
82
|
this._top = node;
|
|
@@ -89,6 +90,7 @@ function (TermNode, Constants, BaseStack, FunctionProvider, OperatorProvider, Fu
|
|
|
89
90
|
var sFunctionName = oToken.getText();
|
|
90
91
|
var oFunction = FunctionProvider.getInstance().getFunctionByName(sFunctionName.toUpperCase());
|
|
91
92
|
node = new FunctionalStack(this.getTermPrefixId());
|
|
93
|
+
node.init(Stack);
|
|
92
94
|
node.setFunction(oFunction);
|
|
93
95
|
node.setPrevious(this._top);
|
|
94
96
|
this._top = node;
|
|
@@ -118,14 +120,16 @@ function (TermNode, Constants, BaseStack, FunctionProvider, OperatorProvider, Fu
|
|
|
118
120
|
var oTopNode = this._getNodeRecursively(this._top);
|
|
119
121
|
|
|
120
122
|
if (oTopNode && "getBusinessDataType" in oTopNode && oTopNode.getBusinessDataType()) {
|
|
121
|
-
|
|
123
|
+
//TODO:To enable the value help in Autosuggestion. Recheck for extra autosuggestion content
|
|
124
|
+
/*if ((sOperatorName === '=' || sOperatorName === '!=') && (oTopNode.getBusinessDataType() === Constants.BOOLEANBUSINESSDATATYPE)) {
|
|
122
125
|
this.empty();
|
|
123
126
|
return {
|
|
124
127
|
bTokenPushed: true
|
|
125
128
|
};
|
|
126
|
-
}
|
|
129
|
+
}*/
|
|
127
130
|
var node;
|
|
128
131
|
node = new ComparisionOperatorStack(this.getTermPrefixId());
|
|
132
|
+
node.init(Stack);
|
|
129
133
|
node.setName(sOperatorName);
|
|
130
134
|
node.setLeftOperandBusinessDataType(oTopNode.getBusinessDataType());
|
|
131
135
|
node.setPrevious(this._top);
|
|
@@ -375,7 +375,7 @@ sap.ui.define([
|
|
|
375
375
|
var aControlConfiguration = [new sap.ui.comp.smartfilterbar.ControlConfiguration({
|
|
376
376
|
hasValueHelpDialog: true,
|
|
377
377
|
key: "Value",
|
|
378
|
-
label: "
|
|
378
|
+
label: this.oBundle.getText("value"),
|
|
379
379
|
visibleInAdvancedArea: true,
|
|
380
380
|
width: "100px",
|
|
381
381
|
index: 1
|
|
@@ -383,7 +383,7 @@ sap.ui.define([
|
|
|
383
383
|
}), new sap.ui.comp.smartfilterbar.ControlConfiguration({
|
|
384
384
|
hasValueHelpDialog: true,
|
|
385
385
|
key: "Description",
|
|
386
|
-
label: "
|
|
386
|
+
label: this.oBundle.getText("description"),
|
|
387
387
|
visibleInAdvancedArea: true,
|
|
388
388
|
width: "100px",
|
|
389
389
|
index: 2
|
|
@@ -453,7 +453,13 @@ sap.ui.define([
|
|
|
453
453
|
oTable.setThreshold(10);
|
|
454
454
|
|
|
455
455
|
for (var i = 0; i < mEntities.valueHelp.properties.length; i++) {
|
|
456
|
-
|
|
456
|
+
var sColumnName = "";
|
|
457
|
+
if (mEntities.valueHelp.properties[i] === "Value") {
|
|
458
|
+
sColumnName = this.oBundle.getText("value");
|
|
459
|
+
} else if(mEntities.valueHelp.properties[i] === "Description") {
|
|
460
|
+
sColumnName = this.oBundle.getText("description");
|
|
461
|
+
}
|
|
462
|
+
this._addValueHelpColumn(mEntities.valueHelp.properties[i], oTable, sColumnName);
|
|
457
463
|
}
|
|
458
464
|
|
|
459
465
|
var oModel = new sap.ui.model.odata.v2.ODataModel(basePath);
|
|
@@ -475,12 +481,12 @@ sap.ui.define([
|
|
|
475
481
|
},
|
|
476
482
|
|
|
477
483
|
// Utility function to create columns for the table.
|
|
478
|
-
_addValueHelpColumn: function (oColumName, oTable) {
|
|
484
|
+
_addValueHelpColumn: function (oColumName, oTable, sColumnName) {
|
|
479
485
|
var oColumn = new sap.ui.table.Column().setLabel(new sap.m.Label({
|
|
480
|
-
text:
|
|
486
|
+
text: sColumnName
|
|
481
487
|
}));
|
|
482
488
|
if (oColumName === this._propertyValue) {
|
|
483
|
-
oColumn.setSortProperty(
|
|
489
|
+
oColumn.setSortProperty(sColumnName);
|
|
484
490
|
}
|
|
485
491
|
oTable.addColumn(oColumn.setTemplate(new sap.m.Text().bindProperty("text", oColumName)));
|
|
486
492
|
},
|
|
@@ -512,7 +518,7 @@ sap.ui.define([
|
|
|
512
518
|
if (!jQuery.isEmptyObject(searchParam) && aFilters && aFilters.length > 0) {
|
|
513
519
|
searchParam = this.oFilterBar.getParameters().custom.search;
|
|
514
520
|
aSearchParams = this._getSearchFilters(searchParam);
|
|
515
|
-
aFilters = that._formatFilterParams(aFilters);
|
|
521
|
+
aFilters = that._formatFilterParams(aFilters, valueHelpInfo.sourceType);
|
|
516
522
|
aFilterParams.push(new sap.ui.model.Filter({
|
|
517
523
|
filters: [new sap.ui.model.Filter(aFilters), new sap.ui.model.Filter(aSearchParams)],
|
|
518
524
|
and: true
|
|
@@ -524,7 +530,7 @@ sap.ui.define([
|
|
|
524
530
|
aFilterParams.push(aSearchParams);
|
|
525
531
|
} else if (aFilters && aFilters.length > 0) {
|
|
526
532
|
//When only filters is selected.
|
|
527
|
-
aFilters = that._formatFilterParams(aFilters);
|
|
533
|
+
aFilters = that._formatFilterParams(aFilters, valueHelpInfo.sourceType);
|
|
528
534
|
aFilterParams.push(aFilters[0]);
|
|
529
535
|
}
|
|
530
536
|
return aFilterParams;
|
|
@@ -533,42 +539,46 @@ sap.ui.define([
|
|
|
533
539
|
/*
|
|
534
540
|
* format the filterParams to support Contains and Between.
|
|
535
541
|
*/
|
|
536
|
-
_formatFilterParams: function (aFilters) {
|
|
542
|
+
_formatFilterParams: function (aFilters, valuehelpSourceType) {
|
|
537
543
|
var that = this;
|
|
538
544
|
if (aFilters[0] && aFilters.length === 1 && aFilters[0].aFilters[0] && aFilters[0].aFilters[0].sOperator) {
|
|
539
|
-
aFilters = that._formatSingleFilter(aFilters);
|
|
545
|
+
aFilters = that._formatSingleFilter(aFilters, valuehelpSourceType);
|
|
540
546
|
} else if (aFilters[0] && aFilters[0].aFilters[0] && aFilters[0].aFilters[0].aFilters[0] && aFilters[0].aFilters[0].aFilters[0].aFilters &&
|
|
541
547
|
aFilters[0].aFilters[1].aFilters[0].aFilters) {
|
|
542
|
-
aFilters = that._formatMultiFilter(aFilters, 0, true);
|
|
543
|
-
aFilters = that._formatMultiFilter(aFilters, 1, true);
|
|
548
|
+
aFilters = that._formatMultiFilter(aFilters, 0, true, valuehelpSourceType);
|
|
549
|
+
aFilters = that._formatMultiFilter(aFilters, 1, true, valuehelpSourceType);
|
|
544
550
|
|
|
545
551
|
} else if (aFilters[0] && aFilters[0].aFilters[0] && aFilters[0].aFilters[1] && aFilters[0].aFilters[0].aFilters[0] && aFilters[0].aFilters[
|
|
546
552
|
0].aFilters[0].aFilters && aFilters[0].aFilters[1].aFilters) {
|
|
547
|
-
aFilters = that._formatMultiFilter(aFilters, 0, true);
|
|
548
|
-
aFilters = that._formatMultiFilter(aFilters, 1, false);
|
|
553
|
+
aFilters = that._formatMultiFilter(aFilters, 0, true, valuehelpSourceType);
|
|
554
|
+
aFilters = that._formatMultiFilter(aFilters, 1, false, valuehelpSourceType);
|
|
549
555
|
|
|
550
556
|
} else if (aFilters[0] && aFilters[0].aFilters[0] && aFilters[0].aFilters[1] && aFilters[0].aFilters[1].aFilters[0] && aFilters[0].aFilters[
|
|
551
557
|
0].aFilters && aFilters[0].aFilters[1].aFilters[0].aFilters) {
|
|
552
|
-
aFilters = that._formatMultiFilter(aFilters, 0, false);
|
|
553
|
-
aFilters = that._formatMultiFilter(aFilters, 1, true);
|
|
558
|
+
aFilters = that._formatMultiFilter(aFilters, 0, false, valuehelpSourceType);
|
|
559
|
+
aFilters = that._formatMultiFilter(aFilters, 1, true, valuehelpSourceType);
|
|
554
560
|
|
|
555
561
|
} else if (aFilters[0] && aFilters[0].aFilters[0] && aFilters[0].aFilters[1] && aFilters[0].aFilters[0].aFilters && aFilters[0].aFilters[
|
|
556
562
|
1].aFilters) {
|
|
557
|
-
aFilters = that._formatMultiFilter(aFilters, 0, false);
|
|
558
|
-
aFilters = that._formatMultiFilter(aFilters, 1, false);
|
|
563
|
+
aFilters = that._formatMultiFilter(aFilters, 0, false, valuehelpSourceType);
|
|
564
|
+
aFilters = that._formatMultiFilter(aFilters, 1, false, valuehelpSourceType);
|
|
559
565
|
|
|
560
566
|
}
|
|
561
567
|
|
|
562
568
|
return aFilters;
|
|
563
569
|
},
|
|
564
570
|
|
|
565
|
-
_formatSingleFilter: function (aFilters) {
|
|
571
|
+
_formatSingleFilter: function (aFilters, valuehelpSourceType) {
|
|
566
572
|
var that = this;
|
|
567
573
|
var _valueField = null;
|
|
568
574
|
|
|
569
575
|
for (var iterator = 0; iterator < aFilters[0].aFilters.length; iterator++) {
|
|
570
|
-
if (aFilters[0].aFilters[iterator].sOperator === "Contains") {
|
|
576
|
+
if (aFilters[0].aFilters[iterator].sOperator === "Contains" && valuehelpSourceType === "U") {
|
|
571
577
|
aFilters[0].aFilters[iterator].sOperator = "EQ";
|
|
578
|
+
} else if (aFilters[0].aFilters[iterator].sOperator === "Contains") {
|
|
579
|
+
_valueField = (aFilters[0].aFilters[iterator].sPath === this._propertyValue) ? this._valueFieldValue : this._valueFieldDescription;
|
|
580
|
+
_valueField.setValueState("Error");
|
|
581
|
+
_valueField.setValueStateText(aFilters[0].aFilters[iterator].sOperator + " operator not supported");
|
|
572
582
|
} else if (aFilters[0].aFilters[iterator].sOperator === "BT") {
|
|
573
583
|
|
|
574
584
|
var convertedFilterParam = that._manageParam(aFilters[0].aFilters[iterator].sPath, aFilters[0].aFilters[iterator].sOperator,
|
|
@@ -590,7 +600,7 @@ sap.ui.define([
|
|
|
590
600
|
|
|
591
601
|
},
|
|
592
602
|
|
|
593
|
-
_formatMultiFilter: function (aFilters, index, bMultifilter) {
|
|
603
|
+
_formatMultiFilter: function (aFilters, index, bMultifilter, valuehelpSourceType) {
|
|
594
604
|
var that = this;
|
|
595
605
|
var _valueField = null;
|
|
596
606
|
var aComputeFilterParma = [];
|
|
@@ -600,8 +610,12 @@ sap.ui.define([
|
|
|
600
610
|
aComputeFilterParma = aFilters[0].aFilters[index].aFilters;
|
|
601
611
|
}
|
|
602
612
|
for (var iterator = 0; iterator < aComputeFilterParma.length; iterator++) {
|
|
603
|
-
if (aComputeFilterParma[iterator].sOperator === "Contains") {
|
|
613
|
+
if (aComputeFilterParma[iterator].sOperator === "Contains" && valuehelpSourceType === "U") {
|
|
604
614
|
aComputeFilterParma[iterator].sOperator = "EQ";
|
|
615
|
+
} else if (aComputeFilterParma[iterator].sOperator === "Contains") {
|
|
616
|
+
_valueField = (aComputeFilterParma[iterator].sPath === this._propertyValue) ? this._valueFieldValue : this._valueFieldDescription;
|
|
617
|
+
_valueField.setValueState("Error");
|
|
618
|
+
_valueField.setValueStateText(aComputeFilterParma[iterator].sOperator + " operator not supported");
|
|
605
619
|
} else if (aComputeFilterParma[iterator].sOperator === "BT") {
|
|
606
620
|
|
|
607
621
|
var convertedFilterParam = that._manageParam(aComputeFilterParma[iterator].sPath, aComputeFilterParma[iterator].sOperator,
|
|
@@ -292,3 +292,5 @@ month=\u043C\u0435\u0441\u0435\u0446
|
|
|
292
292
|
year=\u0433\u043E\u0434\u0438\u043D\u0430
|
|
293
293
|
week=\u0441\u0435\u0434\u043C\u0438\u0446\u0430
|
|
294
294
|
quarter=\u0442\u0440\u0438\u043C\u0435\u0441\u0435\u0447\u0438\u0435
|
|
295
|
+
value=\u0421\u0442\u043E\u0439\u043D\u043E\u0441\u0442
|
|
296
|
+
description=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435
|
|
@@ -292,3 +292,5 @@ month=\u03BC\u03AE\u03BD\u03B1\u03C2
|
|
|
292
292
|
year=\u03B5\u03C4\u03BF\u03C2
|
|
293
293
|
week=\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1
|
|
294
294
|
quarter=\u03C4\u03C1\u03AF\u03BC\u03B7\u03BD\u03BF
|
|
295
|
+
value=\u03A4\u03B9\u03BC\u03AE
|
|
296
|
+
description=\u03A0\u03B5\u03C1\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE
|
|
@@ -292,3 +292,5 @@ month=[[[\u0271\u014F\u014B\u0163\u0125\u2219\u2219\u2219\u2219\u2219\u2219\u221
|
|
|
292
292
|
year=[[[\u0177\u0113\u0105\u0157]]]
|
|
293
293
|
week=[[[\u0175\u0113\u0113\u0137]]]
|
|
294
294
|
quarter=[[[\u01A3\u0171\u0105\u0157\u0163\u0113\u0157\u2219\u2219\u2219\u2219\u2219\u2219\u2219]]]
|
|
295
|
+
value=[[[\u01B2\u0105\u013A\u0171\u0113\u2219\u2219\u2219\u2219\u2219\u2219\u2219\u2219\u2219]]]
|
|
296
|
+
description=[[[\u010E\u0113\u015F\u010B\u0157\u012F\u03C1\u0163\u012F\u014F\u014B\u2219\u2219\u2219\u2219\u2219\u2219\u2219\u2219]]]
|