@sapui5/sap.rules.ui 1.122.0 → 1.123.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 +14 -2
- package/src/sap/rules/ui/DecisionTableCell.js +12 -9
- 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 +2 -2
- package/src/sap/rules/ui/DecisionTableSettings.js +15 -12
- package/src/sap/rules/ui/DecisionTableSettingsOld.js +3 -3
- package/src/sap/rules/ui/ExpressionBase.js +1 -1
- package/src/sap/rules/ui/ExpressionBasic.js +1 -1
- package/src/sap/rules/ui/InstructionRenderer.js +29 -24
- package/src/sap/rules/ui/RuleBase.js +1 -1
- package/src/sap/rules/ui/RuleBuilder.js +7 -1
- package/src/sap/rules/ui/TextRule.js +9 -9
- package/src/sap/rules/ui/TextRuleConfiguration.js +1 -1
- package/src/sap/rules/ui/TextRuleSettings.js +1 -1
- package/src/sap/rules/ui/i18n/messagebundle.properties +9 -1
- package/src/sap/rules/ui/library.js +1 -2
- package/src/sap/rules/ui/type/ExpressionAbs.js +1 -1
package/package.json
CHANGED
|
@@ -79,7 +79,7 @@ sap.ui.define([
|
|
|
79
79
|
* @extends Control
|
|
80
80
|
*
|
|
81
81
|
* @author SAP SE
|
|
82
|
-
* @version 1.
|
|
82
|
+
* @version 1.123.0
|
|
83
83
|
*
|
|
84
84
|
* @constructor
|
|
85
85
|
* @private
|
|
@@ -108,6 +108,9 @@ sap.ui.define([
|
|
|
108
108
|
type: "boolean",
|
|
109
109
|
defaultValue: true
|
|
110
110
|
},
|
|
111
|
+
/**
|
|
112
|
+
* @deprecated Since 1.52.8, use the attribute RuleFormat instead.
|
|
113
|
+
*/
|
|
111
114
|
cellFormat: {
|
|
112
115
|
type: "sap.rules.ui.DecisionTableCellFormat",
|
|
113
116
|
defaultValue: library.DecisionTableCellFormat.Both
|
|
@@ -125,7 +128,7 @@ sap.ui.define([
|
|
|
125
128
|
},
|
|
126
129
|
decisionTableFormat: {
|
|
127
130
|
type: "sap.rules.ui.DecisionTableFormat",
|
|
128
|
-
defaultValue: library.DecisionTableFormat.
|
|
131
|
+
defaultValue: library.DecisionTableFormat.RuleFormat
|
|
129
132
|
},
|
|
130
133
|
threshold: {
|
|
131
134
|
type: "int",
|
|
@@ -943,6 +946,9 @@ sap.ui.define([
|
|
|
943
946
|
var oDecisionTableSettings = new DecisionTableSettings({
|
|
944
947
|
hitPolicies: "{dtModel>/hitPolicies}",
|
|
945
948
|
newDecisionTable: this._internalModel.getProperty("/newTable"),
|
|
949
|
+
/**
|
|
950
|
+
* @deprecated Since 1.52.8, use the attribute RuleFormat instead.
|
|
951
|
+
*/
|
|
946
952
|
cellFormat: "{dtModel>/cellFormat}",
|
|
947
953
|
decisionTableFormat: this.getDecisionTableFormat(),
|
|
948
954
|
enableSettingResult: this.getEnableSettingResult()
|
|
@@ -1562,6 +1568,9 @@ sap.ui.define([
|
|
|
1562
1568
|
data.sequenceExist = true;
|
|
1563
1569
|
data.busyState = true;
|
|
1564
1570
|
data.busyTableState = true;
|
|
1571
|
+
/**
|
|
1572
|
+
* @deprecated Since 1.52.8, use the attribute RuleFormat instead.
|
|
1573
|
+
*/
|
|
1565
1574
|
data.cellFormat = this.getCellFormat();
|
|
1566
1575
|
data.hitPolicies = this.getHitPolicies();
|
|
1567
1576
|
data.enableSettings = this.getEnableSettings();
|
|
@@ -2056,6 +2065,9 @@ sap.ui.define([
|
|
|
2056
2065
|
return this;
|
|
2057
2066
|
},
|
|
2058
2067
|
|
|
2068
|
+
/**
|
|
2069
|
+
* @deprecated Since 1.52.8, use the attribute RuleFormat instead.
|
|
2070
|
+
*/
|
|
2059
2071
|
setCellFormat: function (value) {
|
|
2060
2072
|
this.setProperty("cellFormat", value, true);
|
|
2061
2073
|
this._internalModel.setProperty("/cellFormat", value);
|
|
@@ -18,8 +18,6 @@ sap.ui.define([
|
|
|
18
18
|
"sap/rules/ui/services/AstExpressionLanguage",
|
|
19
19
|
"sap/rules/ui/ast/util/AstUtil",
|
|
20
20
|
"sap/ui/core/LocaleData",
|
|
21
|
-
"sap/rules/ui/ExpressionAdvanced",
|
|
22
|
-
"sap/rules/ui/AstExpressionBasic",
|
|
23
21
|
"sap/ui/core/Control",
|
|
24
22
|
"sap/m/Input",
|
|
25
23
|
"sap/ui/model/Context",
|
|
@@ -34,8 +32,7 @@ sap.ui.define([
|
|
|
34
32
|
"./DecisionTableCellRenderer"
|
|
35
33
|
],
|
|
36
34
|
function (jQuery, library, DecisionTableCellExpressionAdvanced, DecisionTableCellFormatter, DecisionTableCellExpressionBasic, Popover,
|
|
37
|
-
Constants, ConstantUtils, AstExpressionLanguage, AstUtil, LocaleData,
|
|
38
|
-
AstExpressionBasic, Control, Input, Context, coreLibrary, Formatting,
|
|
35
|
+
Constants, ConstantUtils, AstExpressionLanguage, AstUtil, LocaleData, Control, Input, Context, coreLibrary, Formatting,
|
|
39
36
|
DateFormat, EventBus, coreLib, Element, Fragment, DecisionTableCellAstExpressionBasic, DecisionTableCellRenderer) {
|
|
40
37
|
"use strict";
|
|
41
38
|
|
|
@@ -50,7 +47,7 @@ sap.ui.define([
|
|
|
50
47
|
* @extends sap.ui.core.Control
|
|
51
48
|
*
|
|
52
49
|
* @author SAP SE
|
|
53
|
-
* @version 1.
|
|
50
|
+
* @version 1.123.0
|
|
54
51
|
*
|
|
55
52
|
* @constructor
|
|
56
53
|
* @public
|
|
@@ -150,7 +147,7 @@ sap.ui.define([
|
|
|
150
147
|
* Define the DecisionTableCell type/formatter.
|
|
151
148
|
*/
|
|
152
149
|
decisionTableCellType: {
|
|
153
|
-
type: "
|
|
150
|
+
type: "any",
|
|
154
151
|
multiple: false
|
|
155
152
|
},
|
|
156
153
|
/**
|
|
@@ -166,7 +163,7 @@ sap.ui.define([
|
|
|
166
163
|
*/
|
|
167
164
|
decisionTableFormat: {
|
|
168
165
|
type: "sap.rules.ui.DecisionTableFormat",
|
|
169
|
-
defaultValue: library.DecisionTableFormat.
|
|
166
|
+
defaultValue: library.DecisionTableFormat.RuleFormat
|
|
170
167
|
},
|
|
171
168
|
/**
|
|
172
169
|
* Contains the key properties of cell : RowId,ColId,RuleId, Version needed for binding context
|
|
@@ -634,12 +631,12 @@ sap.ui.define([
|
|
|
634
631
|
var fnAfterPopOverClose = function (oEvent) {
|
|
635
632
|
if (this._oPopover) {
|
|
636
633
|
var oDecisionTableCellExpression = this._oPopover.getAggregation('content')[1];
|
|
637
|
-
if (oDecisionTableCellExpression
|
|
634
|
+
if (oDecisionTableCellExpression.isA("sap.rules.ui.ExpressionAdvanced")) { //after choose hint popover close, we fix it with focus in DecisionTableCellExpressionAdvanced so we need to copy the value from the code mirror to the expression advanced value
|
|
638
635
|
if (oDecisionTableCellExpression.codeMirror) {
|
|
639
636
|
var sExpression = oDecisionTableCellExpression.codeMirror.getValue();
|
|
640
637
|
oDecisionTableCellExpression.setValue(sExpression);
|
|
641
638
|
}
|
|
642
|
-
} else if (oDecisionTableCellExpression
|
|
639
|
+
} else if (oDecisionTableCellExpression.isA("sap.rules.ui.AstExpressionBasic")) {
|
|
643
640
|
//While making changes in one cell and focusing into another cell, _fireChange is not called from
|
|
644
641
|
//AstExpressionBasic._handlePopupFocusOut
|
|
645
642
|
oDecisionTableCellExpression._fireChange(oDecisionTableCellExpression._input.text())
|
|
@@ -732,6 +729,12 @@ sap.ui.define([
|
|
|
732
729
|
return returnValue;
|
|
733
730
|
};
|
|
734
731
|
|
|
732
|
+
DecisionTableCell.prototype.setDecisionTableCellType = function (value) {
|
|
733
|
+
if(value != null && value.isA("sap.rules.ui.type.DecisionTableCell")) {
|
|
734
|
+
this.setProperty("decisionTableCellType", value);
|
|
735
|
+
}
|
|
736
|
+
};
|
|
737
|
+
|
|
735
738
|
return DecisionTableCell;
|
|
736
739
|
|
|
737
740
|
}, /* bExport= */ true);
|
|
@@ -23,7 +23,7 @@ sap.ui.define([
|
|
|
23
23
|
* @extends sap.ui.core.Element
|
|
24
24
|
*
|
|
25
25
|
* @author SAP SE
|
|
26
|
-
* @version 1.
|
|
26
|
+
* @version 1.123.0
|
|
27
27
|
*
|
|
28
28
|
* @constructor
|
|
29
29
|
* @public
|
|
@@ -75,7 +75,7 @@ sap.ui.define([
|
|
|
75
75
|
*/
|
|
76
76
|
decisionTableFormat: {
|
|
77
77
|
type: "sap.rules.ui.DecisionTableFormat",
|
|
78
|
-
defaultValue: library.DecisionTableFormat.
|
|
78
|
+
defaultValue: library.DecisionTableFormat.RuleFormat
|
|
79
79
|
},
|
|
80
80
|
/**
|
|
81
81
|
* The threshold defines how many additional (not yet visible records) shall be pre-fetched to enable smooth scrolling.
|
|
@@ -73,7 +73,7 @@ sap.ui.define([
|
|
|
73
73
|
* @extends Control
|
|
74
74
|
*
|
|
75
75
|
* @author SAP SE
|
|
76
|
-
* @version 1.
|
|
76
|
+
* @version 1.123.0
|
|
77
77
|
*
|
|
78
78
|
* @constructor
|
|
79
79
|
* @private
|
|
@@ -84,6 +84,9 @@ sap.ui.define([
|
|
|
84
84
|
metadata: {
|
|
85
85
|
library: "sap.rules.ui",
|
|
86
86
|
properties: {
|
|
87
|
+
/**
|
|
88
|
+
* @deprecated Since 1.52.8, use the attribute RuleFormat instead.
|
|
89
|
+
*/
|
|
87
90
|
cellFormat: {
|
|
88
91
|
type: "sap.rules.ui.DecisionTableCellFormat",
|
|
89
92
|
defaultValue: library.DecisionTableCellFormat.Both
|
|
@@ -102,7 +105,7 @@ sap.ui.define([
|
|
|
102
105
|
},
|
|
103
106
|
decisionTableFormat: {
|
|
104
107
|
type: "sap.rules.ui.DecisionTableFormat",
|
|
105
|
-
defaultValue: library.DecisionTableFormat.
|
|
108
|
+
defaultValue: library.DecisionTableFormat.RuleFormat
|
|
106
109
|
},
|
|
107
110
|
enableSettingResult: {
|
|
108
111
|
type: "boolean",
|
|
@@ -778,7 +781,7 @@ sap.ui.define([
|
|
|
778
781
|
this.oResultInput = new Input({
|
|
779
782
|
width: "220px",
|
|
780
783
|
//enabled: "{settingsModel>/results/enabled}",
|
|
781
|
-
valueHelpOnly: true,
|
|
784
|
+
//valueHelpOnly: true,
|
|
782
785
|
showValueHelp: true,
|
|
783
786
|
value: resultText,
|
|
784
787
|
tooltip: this.oBundle.getText("chooseResultTooltip"),
|
|
@@ -1134,19 +1137,19 @@ sap.ui.define([
|
|
|
1134
1137
|
|
|
1135
1138
|
oDecisionTableSettings.prototype._getCellFormat = function () {
|
|
1136
1139
|
//Handling the valueOnly when the DecisionTableFormat is set to RuleFormat
|
|
1137
|
-
var sCellFormat = this.getProperty("cellFormat");
|
|
1140
|
+
//var sCellFormat = this.getProperty("cellFormat");
|
|
1138
1141
|
var sdecisionTableFormat = this.getProperty("decisionTableFormat");
|
|
1139
1142
|
if (sdecisionTableFormat === library.DecisionTableFormat.RuleFormat) {
|
|
1140
1143
|
return (this.getModel().getData().RuleFormat === library.RuleFormat.Basic) ? true : false;
|
|
1141
1144
|
}
|
|
1142
|
-
return (sCellFormat !== library.DecisionTableCellFormat.Text) ? true : false;
|
|
1145
|
+
//return (sCellFormat !== library.DecisionTableCellFormat.Text) ? true : false;
|
|
1143
1146
|
};
|
|
1144
1147
|
|
|
1145
1148
|
//structure definition for the visibility of columns. This will be a part of the settings model
|
|
1146
1149
|
oDecisionTableSettings.prototype._getCellFormatAcccessOptions = function () {
|
|
1147
|
-
var sCellFormat = this.getProperty("cellFormat");
|
|
1150
|
+
//var sCellFormat = this.getProperty("cellFormat");
|
|
1148
1151
|
var oCellFormatData = {
|
|
1149
|
-
CellFormat: sCellFormat,
|
|
1152
|
+
//CellFormat: sCellFormat,
|
|
1150
1153
|
cellFormatEnumration: [{
|
|
1151
1154
|
key: Constants.KEY_EDITABLE,
|
|
1152
1155
|
value: this.editableModeText
|
|
@@ -1158,7 +1161,7 @@ sap.ui.define([
|
|
|
1158
1161
|
return oCellFormatData;
|
|
1159
1162
|
};
|
|
1160
1163
|
|
|
1161
|
-
oDecisionTableSettings.prototype._getCellFormatData = function () {
|
|
1164
|
+
/*oDecisionTableSettings.prototype._getCellFormatData = function () {
|
|
1162
1165
|
var sCellFormat = this.getProperty("cellFormat");
|
|
1163
1166
|
var oCellFormatData = {
|
|
1164
1167
|
CellFormat: sCellFormat,
|
|
@@ -1171,7 +1174,7 @@ sap.ui.define([
|
|
|
1171
1174
|
}]
|
|
1172
1175
|
};
|
|
1173
1176
|
return oCellFormatData;
|
|
1174
|
-
}
|
|
1177
|
+
};*/
|
|
1175
1178
|
|
|
1176
1179
|
oDecisionTableSettings.prototype._getColumnInputMode = function (bValueOnly) {
|
|
1177
1180
|
if (!bValueOnly) {
|
|
@@ -1404,12 +1407,12 @@ sap.ui.define([
|
|
|
1404
1407
|
return oHitPolicyData;
|
|
1405
1408
|
};
|
|
1406
1409
|
|
|
1407
|
-
oDecisionTableSettings.prototype._getInputModeEnabled = function (sCellFormat, bValueOnly) {
|
|
1410
|
+
/*oDecisionTableSettings.prototype._getInputModeEnabled = function (sCellFormat, bValueOnly) {
|
|
1408
1411
|
if (sCellFormat !== library.DecisionTableCellFormat.Both || bValueOnly === false) {
|
|
1409
1412
|
return false;
|
|
1410
1413
|
}
|
|
1411
1414
|
return true;
|
|
1412
|
-
}
|
|
1415
|
+
};*/
|
|
1413
1416
|
|
|
1414
1417
|
//Rebinding predefined table when result is change or refresh event
|
|
1415
1418
|
oDecisionTableSettings.prototype._getLatestResultDataObjects = function (newResultDataObjectId) {
|
|
@@ -1583,7 +1586,7 @@ sap.ui.define([
|
|
|
1583
1586
|
initialData.hitPolicy = this._getHitPoliciesData();
|
|
1584
1587
|
initialData.tableData = {};
|
|
1585
1588
|
initialData.removeRowEnabled = false;
|
|
1586
|
-
initialData.cellFormat = this._getCellFormatData();
|
|
1589
|
+
//initialData.cellFormat = this._getCellFormatData();
|
|
1587
1590
|
initialData.accessOptions = this._getCellFormatAcccessOptions();
|
|
1588
1591
|
initialData.updateAllRows = false;
|
|
1589
1592
|
initialData.predefinedResults = [];
|
|
@@ -38,7 +38,7 @@ sap.ui.define([
|
|
|
38
38
|
* @extends Control
|
|
39
39
|
*
|
|
40
40
|
* @author SAP SE
|
|
41
|
-
* @version 1.
|
|
41
|
+
* @version 1.123.0
|
|
42
42
|
*
|
|
43
43
|
* @constructor
|
|
44
44
|
* @private
|
|
@@ -486,9 +486,9 @@ sap.ui.define([
|
|
|
486
486
|
backgroundDesign: sap.m.BackgroundDesign.Solid,
|
|
487
487
|
showSeparators: sap.m.ListSeparators.None,
|
|
488
488
|
fixedLayout: true,
|
|
489
|
-
layoutData: new sap.ui.layout.form.GridContainerData({
|
|
489
|
+
/*layoutData: new sap.ui.layout.form.GridContainerData({
|
|
490
490
|
halfGrid: false
|
|
491
|
-
})
|
|
491
|
+
}),*/
|
|
492
492
|
columns: [
|
|
493
493
|
new sap.m.Column({
|
|
494
494
|
width: "50%",
|
|
@@ -22,10 +22,16 @@ sap.ui.define([
|
|
|
22
22
|
"sap/rules/ui/providers/ValueHelpProvider",
|
|
23
23
|
"sap/rules/ui/providers/ValueHelpDialogProvider",
|
|
24
24
|
"sap/ui/core/LocaleData",
|
|
25
|
-
"sap/rules/ui/Constants"
|
|
25
|
+
"sap/rules/ui/Constants",
|
|
26
|
+
"sap/m/Popover",
|
|
27
|
+
"sap/base/i18n/Formatting",
|
|
28
|
+
"sap/ui/model/type/String",
|
|
29
|
+
"sap/m/MessageBox",
|
|
30
|
+
"sap/ui/core/format/DateFormat",
|
|
31
|
+
"sap/ui/core/library",
|
|
26
32
|
], function(Control, CoreItem, Select, Input, Button, SelectDialog, StandardListItem, Text, DatePicker,
|
|
27
33
|
TypeFloat, TypeDate, TypeTime, TypeDateTime, HTML, JSONModel, Filter, FilterOperator, Utils, DateTimePicker,
|
|
28
|
-
TimePicker, ValueHelpProvider, ValueHelpDialogProvider, LocaleData, Constants) {
|
|
34
|
+
TimePicker, ValueHelpProvider, ValueHelpDialogProvider, LocaleData, Constants, Popover, Formatting, String, MessageBox, DateFormat, coreLibrary) {
|
|
29
35
|
"use strict";
|
|
30
36
|
|
|
31
37
|
return Control.extend("sap.rules.ui.InstructionRenderer", {
|
|
@@ -72,7 +78,7 @@ sap.ui.define([
|
|
|
72
78
|
"|" +
|
|
73
79
|
"^[^" + ILLEGAL_CHARS + "]*$";
|
|
74
80
|
|
|
75
|
-
this.lineBreakIndexes = { // auxiliary rendering data to support
|
|
81
|
+
this.lineBreakIndexes = { // auxiliary rendering data to support
|
|
76
82
|
start: {}, // lines breaking in indent mode
|
|
77
83
|
end: {}
|
|
78
84
|
};
|
|
@@ -184,7 +190,7 @@ sap.ui.define([
|
|
|
184
190
|
},
|
|
185
191
|
|
|
186
192
|
/**
|
|
187
|
-
* @returns {string} a concatenated string of space separated tokens
|
|
193
|
+
* @returns {string} a concatenated string of space separated tokens
|
|
188
194
|
* **/
|
|
189
195
|
getExpression: function() {
|
|
190
196
|
var expression = [];
|
|
@@ -196,7 +202,7 @@ sap.ui.define([
|
|
|
196
202
|
expression.push(token);
|
|
197
203
|
}
|
|
198
204
|
var tokenExpression = instructions[instructions.length - 1].token;
|
|
199
|
-
|
|
205
|
+
|
|
200
206
|
if (!tokenExpression && tokenExpression !== 0) {
|
|
201
207
|
expression.pop(instructions.length - 1);
|
|
202
208
|
}
|
|
@@ -363,12 +369,12 @@ sap.ui.define([
|
|
|
363
369
|
bAddSpace: false
|
|
364
370
|
});
|
|
365
371
|
var oPopover = this.getParent().getParent();
|
|
366
|
-
if (oPopover instanceof
|
|
372
|
+
if (oPopover instanceof Popover) {
|
|
367
373
|
this.valueHelpCtrl.oValueHelpDialogProvider._popover = oPopover;
|
|
368
374
|
}
|
|
369
375
|
}
|
|
370
|
-
|
|
371
|
-
|
|
376
|
+
|
|
377
|
+
|
|
372
378
|
this.valueHelpCtrl.addStyleClass(this.TOKENS_GAP_CLASS);
|
|
373
379
|
|
|
374
380
|
return {
|
|
@@ -392,7 +398,7 @@ sap.ui.define([
|
|
|
392
398
|
change: function(event) {
|
|
393
399
|
|
|
394
400
|
},
|
|
395
|
-
enabled: (oParent.bReadOnly && oParent
|
|
401
|
+
enabled: (oParent.bReadOnly && oParent.isA("sap.rules.ui.DecisionTableCellExpressionBasics")) ? false : true
|
|
396
402
|
});
|
|
397
403
|
ctrl.addStyleClass(this.TOKENS_GAP_CLASS);
|
|
398
404
|
|
|
@@ -498,10 +504,10 @@ sap.ui.define([
|
|
|
498
504
|
var valueRange = this._createValueRange(instruction);
|
|
499
505
|
this._removeTextSingleQuote(localPath);
|
|
500
506
|
//bug 5312
|
|
501
|
-
var oLocale =
|
|
507
|
+
var oLocale = Formatting.getLanguageTag();
|
|
502
508
|
var oLocaleData = LocaleData.getInstance(oLocale);
|
|
503
509
|
var timeFormat = oLocaleData.getTimePattern('medium');
|
|
504
|
-
|
|
510
|
+
|
|
505
511
|
var ctrl = new TimePicker({
|
|
506
512
|
width: "auto",
|
|
507
513
|
type: "Time",
|
|
@@ -528,7 +534,7 @@ sap.ui.define([
|
|
|
528
534
|
var valueRange = this._createValueRange(instruction);
|
|
529
535
|
this._removeTextSingleQuote(localPath);
|
|
530
536
|
//bug 5312
|
|
531
|
-
var oLocale =
|
|
537
|
+
var oLocale = Formatting.getLanguageTag();
|
|
532
538
|
var oLocaleData = LocaleData.getInstance(oLocale);
|
|
533
539
|
var dateFormatted = oLocaleData.getDatePattern('short');
|
|
534
540
|
var timeFormat = oLocaleData.getTimePattern('medium');
|
|
@@ -559,7 +565,7 @@ sap.ui.define([
|
|
|
559
565
|
var ctrl = new Input({
|
|
560
566
|
value: {
|
|
561
567
|
path: fullPath + this.TEXT,
|
|
562
|
-
type: new
|
|
568
|
+
type: new String(
|
|
563
569
|
null, {
|
|
564
570
|
search: this.VALIDATION_REGEX
|
|
565
571
|
}) // prevent illegal characters
|
|
@@ -585,7 +591,7 @@ sap.ui.define([
|
|
|
585
591
|
},
|
|
586
592
|
|
|
587
593
|
_createBooleanSelectionControl: function(instruction, nextCreateFunction, localPath, fullPath) {
|
|
588
|
-
var ctrl = new
|
|
594
|
+
var ctrl = new Select({
|
|
589
595
|
selectedKey: "{" + fullPath + this.TOKEN + "}",
|
|
590
596
|
width: "auto",
|
|
591
597
|
items: [{
|
|
@@ -790,9 +796,8 @@ sap.ui.define([
|
|
|
790
796
|
},
|
|
791
797
|
|
|
792
798
|
_showErrorMessage: function(message) {
|
|
793
|
-
|
|
794
|
-
|
|
795
|
-
icon: sap.m.MessageBox.Icon.ERROR //,
|
|
799
|
+
MessageBox.alert(message, {
|
|
800
|
+
icon: "ERROR" //,
|
|
796
801
|
|
|
797
802
|
//title: this.oBundle.getText("ERROR")
|
|
798
803
|
});
|
|
@@ -811,7 +816,7 @@ sap.ui.define([
|
|
|
811
816
|
addEndQuote = false;
|
|
812
817
|
var newValue = "";
|
|
813
818
|
var businessDataType = "";
|
|
814
|
-
|
|
819
|
+
|
|
815
820
|
if (model) {
|
|
816
821
|
newValue = model.getProperty(localPath + this.TEXT);
|
|
817
822
|
if (model.oData && model.oData.instructions) {
|
|
@@ -819,17 +824,17 @@ sap.ui.define([
|
|
|
819
824
|
for (var instruction in instructions) {
|
|
820
825
|
businessDataType = instructions[instruction].businessDataType;
|
|
821
826
|
}
|
|
822
|
-
|
|
827
|
+
|
|
823
828
|
}
|
|
824
829
|
}
|
|
825
|
-
|
|
830
|
+
|
|
826
831
|
// Date instance which is used to convert the selected date from calendar control to short format
|
|
827
|
-
var oLocale =
|
|
832
|
+
var oLocale = Formatting.getLanguageTag();
|
|
828
833
|
var oLocaleData = LocaleData.getInstance(oLocale);
|
|
829
|
-
|
|
830
|
-
this.oFormatDate =
|
|
834
|
+
|
|
835
|
+
this.oFormatDate = DateFormat.getInstance({
|
|
831
836
|
pattern: oLocaleData.getDatePattern('short'),
|
|
832
|
-
calendarType:
|
|
837
|
+
calendarType: coreLibrary.CalendarType.Gregorian
|
|
833
838
|
},
|
|
834
839
|
oLocale
|
|
835
840
|
);
|
|
@@ -34,7 +34,7 @@ sap.ui.define([
|
|
|
34
34
|
* @extends sap.ui.core.Control
|
|
35
35
|
*
|
|
36
36
|
* @author SAP SE
|
|
37
|
-
* @version 1.
|
|
37
|
+
* @version 1.123.0
|
|
38
38
|
*
|
|
39
39
|
* @constructor
|
|
40
40
|
* @public
|
|
@@ -265,6 +265,9 @@ sap.ui.define([
|
|
|
265
265
|
editable: {
|
|
266
266
|
path: "ruleBuilderInternalModel>/editable"
|
|
267
267
|
},
|
|
268
|
+
/**
|
|
269
|
+
* @deprecated Since 1.52.8, use the attribute RuleFormat instead.
|
|
270
|
+
*/
|
|
268
271
|
cellFormat: {
|
|
269
272
|
path: "ruleBuilderInternalModel>/decisionTableConfiguration/cellFormat"
|
|
270
273
|
},
|
|
@@ -388,6 +391,9 @@ sap.ui.define([
|
|
|
388
391
|
this._setDecisionTableConfigurationProperty("enableSettings", oDecisionTableConfiguration.getEnableSettings());
|
|
389
392
|
this._setDecisionTableConfigurationProperty("enableSettingResult", oDecisionTableConfiguration.getEnableSettingResult());
|
|
390
393
|
this._setDecisionTableConfigurationProperty("hitPolicies", oDecisionTableConfiguration.getHitPolicies());
|
|
394
|
+
/**
|
|
395
|
+
* @deprecated Since 1.52.8, use the attribute RuleFormat instead.
|
|
396
|
+
*/
|
|
391
397
|
this._setDecisionTableConfigurationProperty("cellFormat", oDecisionTableConfiguration.getCellFormat());
|
|
392
398
|
this._setDecisionTableConfigurationProperty("decisionTableFormat", oDecisionTableConfiguration.getDecisionTableFormat());
|
|
393
399
|
this._setDecisionTableConfigurationProperty("visibleRowCount", oDecisionTableConfiguration.getVisibleRowCount());
|
|
@@ -64,7 +64,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
|
|
|
64
64
|
* @extends Control
|
|
65
65
|
*
|
|
66
66
|
* @author SAP SE
|
|
67
|
-
* @version 1.
|
|
67
|
+
* @version 1.123.0
|
|
68
68
|
*
|
|
69
69
|
* @constructor
|
|
70
70
|
* @private
|
|
@@ -204,7 +204,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
|
|
|
204
204
|
.results.length > 1);
|
|
205
205
|
if (response.Type === that.typeElse) {
|
|
206
206
|
that.getModel("displayModel").getProperty("/textRuleConditions/Else").push(response);
|
|
207
|
-
var oElsePanel = that._createElseFormLayout(oContext, that.oBundle.getText("
|
|
207
|
+
var oElsePanel = that._createElseFormLayout(oContext, that.oBundle.getText("title_else"), true);
|
|
208
208
|
oVerticalLayout.removeContent(data.nIndex);
|
|
209
209
|
oVerticalLayout.insertContent(oElsePanel, data.nIndex);
|
|
210
210
|
oElsePanel.addEventDelegate({
|
|
@@ -228,7 +228,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
|
|
|
228
228
|
nNewIndex = data.nIndex + 1;
|
|
229
229
|
}
|
|
230
230
|
sNumbering = " (" + nNewIndex + ")";
|
|
231
|
-
var oElseIfPanel = that._createFormLayout(oContext, that.oBundle.getText("
|
|
231
|
+
var oElseIfPanel = that._createFormLayout(oContext, that.oBundle.getText("title_elseIf") + sNumbering, true);
|
|
232
232
|
oVerticalLayout.insertContent(oElseIfPanel, nNewIndex);
|
|
233
233
|
that._adjustElseIfTitle(data.verticalLayout, nNewIndex, true);
|
|
234
234
|
oElseIfPanel.addEventDelegate({
|
|
@@ -261,7 +261,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
|
|
|
261
261
|
*/
|
|
262
262
|
_adjustElseIfTitle: function (oVerticalLayout, nNewIndex, bAdded) {
|
|
263
263
|
var oContents = oVerticalLayout.getContent();
|
|
264
|
-
var sElseIf = this.oBundle.getText("
|
|
264
|
+
var sElseIf = this.oBundle.getText("title_elseIf");
|
|
265
265
|
var iterator;
|
|
266
266
|
if (bAdded) {
|
|
267
267
|
iterator = nNewIndex + 1;
|
|
@@ -457,7 +457,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
|
|
|
457
457
|
formContainers: [
|
|
458
458
|
// If form container
|
|
459
459
|
// Then form container
|
|
460
|
-
that._createThenFormContainer(oContext, this.oBundle.getText("
|
|
460
|
+
that._createThenFormContainer(oContext, this.oBundle.getText("title_then"))
|
|
461
461
|
]
|
|
462
462
|
})]
|
|
463
463
|
}).addStyleClass("sapTextRulePanel");
|
|
@@ -892,7 +892,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
|
|
|
892
892
|
}
|
|
893
893
|
|
|
894
894
|
|
|
895
|
-
oElement.getParent().insertFormElement(that._formElementsFactory(that.oBundle.getText("
|
|
895
|
+
oElement.getParent().insertFormElement(that._formElementsFactory(that.oBundle.getText("title_then") + "result" + nIndex,
|
|
896
896
|
oExpressionContext), nIndex);
|
|
897
897
|
break;
|
|
898
898
|
}
|
|
@@ -1158,7 +1158,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
|
|
|
1158
1158
|
* Else returns a panel with "add Else If" button
|
|
1159
1159
|
*/
|
|
1160
1160
|
_getElseIfPanel: function () {
|
|
1161
|
-
var sTitle = this.oBundle.getText("
|
|
1161
|
+
var sTitle = this.oBundle.getText("title_elseIf");
|
|
1162
1162
|
var oControls = [];
|
|
1163
1163
|
var oElseIfData = this._displayModel.getProperty("/textRuleConditions/ElseIf");
|
|
1164
1164
|
if (oElseIfData.length > 0) {
|
|
@@ -1191,7 +1191,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
|
|
|
1191
1191
|
* Else returns a panel with "add Else" button
|
|
1192
1192
|
*/
|
|
1193
1193
|
_getElsePanel: function () {
|
|
1194
|
-
var sTitle = this.oBundle.getText("
|
|
1194
|
+
var sTitle = this.oBundle.getText("title_else");
|
|
1195
1195
|
var oControls = [];
|
|
1196
1196
|
var oElseData = this._displayModel.getProperty("/textRuleConditions/Else");
|
|
1197
1197
|
if (oElseData.length > 0) {
|
|
@@ -1433,7 +1433,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
|
|
|
1433
1433
|
* Returns If panel
|
|
1434
1434
|
*/
|
|
1435
1435
|
_getIfPanel: function () {
|
|
1436
|
-
var sTitle = this.oBundle.getText("
|
|
1436
|
+
var sTitle = this.oBundle.getText("title_if");
|
|
1437
1437
|
var oIfData = this._displayModel.getProperty("/textRuleConditions/If");
|
|
1438
1438
|
var oHeaderKey = {
|
|
1439
1439
|
RuleId: oIfData[0].RuleId,
|
|
@@ -610,4 +610,12 @@ textrule_confirmation_dialog_cancel=Cancel
|
|
|
610
610
|
# XFLD: Text for time and Duration Dialog
|
|
611
611
|
condition_delete_confirmation_message=Delete this condition?
|
|
612
612
|
# XFLD: Dialog title
|
|
613
|
-
warning_title=Delete
|
|
613
|
+
warning_title=Delete
|
|
614
|
+
#NOTR: Type of Condition. Please do not translate!
|
|
615
|
+
title_if=If
|
|
616
|
+
#NOTR: Type of Condition. Please do not translate!
|
|
617
|
+
title_elseIf=Else If
|
|
618
|
+
#NOTR: Type of Condition. Please do not translate!
|
|
619
|
+
title_else=Else
|
|
620
|
+
#NOTR: Text for label of the Result. Please do not translate!
|
|
621
|
+
title_then=Then
|
|
@@ -86,7 +86,7 @@ sap.ui.define([
|
|
|
86
86
|
"sap.rules.ui.type.Expression"
|
|
87
87
|
],
|
|
88
88
|
noLibraryCSS: false,
|
|
89
|
-
version: "1.
|
|
89
|
+
version: "1.123.0"
|
|
90
90
|
});
|
|
91
91
|
|
|
92
92
|
// sap.rules.ui library contants
|
|
@@ -248,7 +248,6 @@ sap.ui.define([
|
|
|
248
248
|
*
|
|
249
249
|
* @enum {string}
|
|
250
250
|
* @public
|
|
251
|
-
* @deprecated Since 1.120.2, to configure the settings, use the Manage Rules Project app or the Rule Authoring APIs.
|
|
252
251
|
*/
|
|
253
252
|
rulesUI.RuleHitPolicy = {
|
|
254
253
|
/**
|