@sapui5/sap.rules.ui 1.112.0 → 1.114.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 +8 -6
- package/src/sap/rules/ui/DecisionTableCell.js +13 -3
- 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 +9 -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/library.js +1 -1
- package/src/sap/rules/ui/themes/sap_horizon_dark/AstExpression.less +21 -0
- package/src/sap/rules/ui/themes/sap_horizon_dark/DecisionTableCell.less +3 -0
- package/src/sap/rules/ui/themes/sap_horizon_dark/ExpressionAdvanced.less +11 -0
- package/src/sap/rules/ui/themes/sap_horizon_dark/library.source.less +7 -0
- package/src/sap/rules/ui/themes/sap_horizon_hcb/AstExpression.less +26 -0
- package/src/sap/rules/ui/themes/sap_horizon_hcb/DecisionTableCell.less +3 -0
- package/src/sap/rules/ui/themes/sap_horizon_hcb/ExpressionAdvanced.less +20 -0
- package/src/sap/rules/ui/themes/sap_horizon_hcb/library.source.less +7 -0
- package/src/sap/rules/ui/themes/sap_horizon_hcw/AstExpression.less +26 -0
- package/src/sap/rules/ui/themes/sap_horizon_hcw/DecisionTableCell.less +3 -0
- package/src/sap/rules/ui/themes/sap_horizon_hcw/ExpressionAdvanced.less +11 -0
- package/src/sap/rules/ui/themes/sap_horizon_hcw/library.source.less +7 -0
- package/src/sap/rules/ui/type/ExpressionAbs.js +1 -1
package/package.json
CHANGED
|
@@ -58,7 +58,7 @@ sap.ui.define([
|
|
|
58
58
|
* @extends Control
|
|
59
59
|
*
|
|
60
60
|
* @author SAP SE
|
|
61
|
-
* @version 1.
|
|
61
|
+
* @version 1.114.0
|
|
62
62
|
*
|
|
63
63
|
* @constructor
|
|
64
64
|
* @private
|
|
@@ -640,15 +640,16 @@ sap.ui.define([
|
|
|
640
640
|
var contextModel = oContext.getModel();
|
|
641
641
|
var bindingInfo = contextModel.aBindings;
|
|
642
642
|
this.columnWidth = "auto";
|
|
643
|
-
|
|
643
|
+
var _colIfThenHeader = this._createColIfThenHeader(oContext);
|
|
644
|
+
var _colDescriptionHeader = this._createColDescriptionHeader(oContext, this);
|
|
644
645
|
var column = new Column(sId, {
|
|
645
646
|
width: this.columnWidth,
|
|
646
647
|
minWidth : 128,
|
|
647
648
|
multiLabels: [
|
|
648
|
-
|
|
649
|
-
|
|
649
|
+
_colIfThenHeader, // The order of the labels is important!
|
|
650
|
+
_colDescriptionHeader
|
|
650
651
|
],
|
|
651
|
-
template: this._createCell(oContext) //, headerSpan: columnType === sap.rules.ui.DecisionTableColumn.Condition ? [this.iNumOfCondition, 1] : [this.iNumOfResults, 1]
|
|
652
|
+
template: this._createCell(oContext,_colDescriptionHeader.getId()) //, headerSpan: columnType === sap.rules.ui.DecisionTableColumn.Condition ? [this.iNumOfCondition, 1] : [this.iNumOfResults, 1]
|
|
652
653
|
});
|
|
653
654
|
|
|
654
655
|
relativePath = this._getBindModelName();
|
|
@@ -738,13 +739,14 @@ sap.ui.define([
|
|
|
738
739
|
this._cutCopyRow("copy");
|
|
739
740
|
},
|
|
740
741
|
|
|
741
|
-
_createCell: function (oContext) {
|
|
742
|
+
_createCell: function (oContext, sAriaLabelledId) {
|
|
742
743
|
var colID = oContext.getProperty("Id");
|
|
743
744
|
var colType = oContext.getProperty("Type");
|
|
744
745
|
|
|
745
746
|
var oCell = new DecisionTableCell({
|
|
746
747
|
editable: "{dtModel>/editable}",
|
|
747
748
|
displayModelName: "displayModel",
|
|
749
|
+
ariaLabelledBy: sAriaLabelledId,
|
|
748
750
|
decisionTableCellType: this._decisionTableCellFormatter
|
|
749
751
|
// type: sap.rules.ui.ExpressionType.BooleanEnhanced
|
|
750
752
|
}).data({
|
|
@@ -35,7 +35,7 @@ sap.ui.define([
|
|
|
35
35
|
* @extends sap.ui.core.Control
|
|
36
36
|
*
|
|
37
37
|
* @author SAP SE
|
|
38
|
-
* @version 1.
|
|
38
|
+
* @version 1.114.0
|
|
39
39
|
*
|
|
40
40
|
* @constructor
|
|
41
41
|
* @public
|
|
@@ -205,7 +205,15 @@ sap.ui.define([
|
|
|
205
205
|
type: "sap.rules.ui.services.AstExpressionLanguage",
|
|
206
206
|
multiple: false,
|
|
207
207
|
singularName: "astExpressionLanguage"
|
|
208
|
-
}
|
|
208
|
+
},
|
|
209
|
+
/**
|
|
210
|
+
* Association to controls / IDs which label this control (see WAI-ARIA attribute <code>aria-labelledby</code>).
|
|
211
|
+
*/
|
|
212
|
+
ariaLabelledBy: {
|
|
213
|
+
type: "sap.ui.core.Control",
|
|
214
|
+
multiple: true,
|
|
215
|
+
singularName: "ariaLabelledBy"
|
|
216
|
+
}
|
|
209
217
|
}
|
|
210
218
|
},
|
|
211
219
|
|
|
@@ -339,7 +347,9 @@ sap.ui.define([
|
|
|
339
347
|
oDisplayedControl.destroy();
|
|
340
348
|
}
|
|
341
349
|
oDisplayedControl = new sap.m.Input({
|
|
342
|
-
|
|
350
|
+
ariaLabelledBy:this.getAriaLabelledBy(),
|
|
351
|
+
editable: false,
|
|
352
|
+
|
|
343
353
|
});
|
|
344
354
|
|
|
345
355
|
if(bEditable) {
|
|
@@ -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.114.0
|
|
38
38
|
*
|
|
39
39
|
* @constructor
|
|
40
40
|
* @public
|
|
@@ -231,6 +231,12 @@ sap.ui.define([
|
|
|
231
231
|
enableSettingResult: {
|
|
232
232
|
path: "ruleBuilderInternalModel>/textRuleConfiguration/enableSettingResult"
|
|
233
233
|
},
|
|
234
|
+
enableElse: {
|
|
235
|
+
path: "ruleBuilderInternalModel>/textRuleConfiguration/enableElse"
|
|
236
|
+
},
|
|
237
|
+
enableElseIf: {
|
|
238
|
+
path: "ruleBuilderInternalModel>/textRuleConfiguration/enableElseIf"
|
|
239
|
+
},
|
|
234
240
|
expressionLanguage: this.getExpressionLanguage(),
|
|
235
241
|
astExpressionLanguage: this.getAstExpressionLanguage()
|
|
236
242
|
});
|
|
@@ -361,6 +367,8 @@ sap.ui.define([
|
|
|
361
367
|
|
|
362
368
|
this._setTextRuleConfigurationProperty("enableSettings", oTextRuleConfiguration.getEnableSettings());
|
|
363
369
|
this._setTextRuleConfigurationProperty("enableSettingResult", oTextRuleConfiguration.getEnableSettingResult());
|
|
370
|
+
this._setTextRuleConfigurationProperty("enableElse", oTextRuleConfiguration.getEnableElse());
|
|
371
|
+
this._setTextRuleConfigurationProperty("enableElseIf", oTextRuleConfiguration.getEnableElseIf());
|
|
364
372
|
|
|
365
373
|
return this.setAggregation("textRuleConfiguration", oTextRuleConfiguration, true)
|
|
366
374
|
},
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
@_sap_rules_ui_AstExpression_Color:@sapUiFieldTextColor;
|
|
2
|
+
@_sap_rules_ui_AstExpression_BorderError:@sapUiFieldInvalidColor;
|
|
3
|
+
@_sap_rules_ui_AstExpression_VariableClassColor:#FF0000;
|
|
4
|
+
@_sap_rules_ui_AstExpression_RangeColor:@sapUiFieldTextColor;
|
|
5
|
+
@_sap_rules_ui_AstExpression_OperatorColor:#32CD32;
|
|
6
|
+
@_sap_rules_ui_AstExpression_FunctionalOperatorColor:#8B008B;
|
|
7
|
+
@_sap_rules_ui_AstExpression_FunctionColor:@sapUiLink;
|
|
8
|
+
@_sap_rules_ui_AstExpression_ParenthesisColor:@sapUiFieldTextColor;
|
|
9
|
+
@_sap_rules_ui_AstExpression_LiteralColor:@sapUiFieldTextColor;
|
|
10
|
+
@_sap_rules_ui_AstExpression_LogicalOpertorColor:#ADFF2F;
|
|
11
|
+
@_sap_rules_ui_AstExpression_FieldBorderColor:@sapUiFieldBorderColor;
|
|
12
|
+
@_sap_rules_ui_AstExpression_PopoverBorderColor:@sapUiFieldBorderColor;
|
|
13
|
+
@_sap_rules_ui_AstExpression_SelectionColor:@sapUiSelected;
|
|
14
|
+
|
|
15
|
+
.sapAstExpressionInput ::selection {
|
|
16
|
+
background: @_sap_rules_ui_AstExpression_SelectionColor;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
.sapAstExpressionInput ::-moz-selection { /* Code for Firefox */
|
|
20
|
+
background: @_sap_rules_ui_AstExpression_SelectionColor;
|
|
21
|
+
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
@import "../base/library.source.less";
|
|
2
|
+
@import "../../../../../sap/ui/core/themes/sap_horizon_dark/base.less";
|
|
3
|
+
@import "../../../../../sap/ui/core/themes/sap_horizon_dark/global.less";
|
|
4
|
+
|
|
5
|
+
@import "DecisionTableCell.less";
|
|
6
|
+
@import "AstExpression.less";
|
|
7
|
+
@import "ExpressionAdvanced.less";
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
@_sap_rules_ui_AstExpression_Color:@sapUiFieldTextColor;
|
|
2
|
+
@_sap_rules_ui_AstExpression_BorderError:@sapUiFieldInvalidColor;
|
|
3
|
+
@_sap_rules_ui_AstExpression_VariableClassColor:@sapUiFieldTextColor;
|
|
4
|
+
@_sap_rules_ui_AstExpression_RangeColor:@sapUiFieldTextColor;
|
|
5
|
+
@_sap_rules_ui_AstExpression_OperatorColor:@sapUiFieldTextColor;
|
|
6
|
+
@_sap_rules_ui_AstExpression_FunctionalOperatorColor:@sapUiFieldTextColor;
|
|
7
|
+
@_sap_rules_ui_AstExpression_FunctionColor:@sapUiLink;
|
|
8
|
+
@_sap_rules_ui_AstExpression_ParenthesisColor:@sapUiFieldTextColor;
|
|
9
|
+
@_sap_rules_ui_AstExpression_LiteralColor:@sapUiFieldTextColor;
|
|
10
|
+
@_sap_rules_ui_AstExpression_LogicalOpertorColor:@sapUiFieldTextColor;
|
|
11
|
+
@_sap_rules_ui_AstExpression_FieldBorderColor:@sapUiFieldBorderColor;
|
|
12
|
+
@_sap_rules_ui_AstExpression_PopoverBorderColor:@sapUiFieldBorderColor;
|
|
13
|
+
@_sap_rules_ui_AstExpression_SelectionColor:@sapUiSelected;
|
|
14
|
+
|
|
15
|
+
.sapAstExpressionInput ::selection {
|
|
16
|
+
background: @_sap_rules_ui_AstExpression_SelectionColor;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
.sapAstExpressionInput ::-moz-selection { /* Code for Firefox */
|
|
20
|
+
background: @_sap_rules_ui_AstExpression_SelectionColor;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
.sapAstExpressionInputError {
|
|
24
|
+
border: 2px dashed @_sap_rules_ui_AstExpression_BorderError !important;
|
|
25
|
+
background-color: @sapUiFieldInvalidBackground !important;
|
|
26
|
+
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/* ======================================== */
|
|
2
|
+
/* CSS for sap.rules.ui/ExpressionAdvanced */
|
|
3
|
+
/* Horizon theme */
|
|
4
|
+
/* ======================================== */
|
|
5
|
+
|
|
6
|
+
.sapRULExpressionAdvanced .sapMFocus .sapMInputDivWrapper:not(.sapMInputBaseDisabledInner)::after {
|
|
7
|
+
content: "";
|
|
8
|
+
position: absolute;
|
|
9
|
+
top: 7px;
|
|
10
|
+
left: 3px;
|
|
11
|
+
right: 3px;
|
|
12
|
+
bottom: 7px;
|
|
13
|
+
border: 1px dotted #000000;
|
|
14
|
+
pointer-events: none
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
.sapRULExpressionAdvanced .sapMFocus .sapMInputDivWrapper:not(.sapMInputBaseDisabledInner)::before {
|
|
19
|
+
border: none;
|
|
20
|
+
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
@import "../base/library.source.less";
|
|
2
|
+
@import "../../../../../sap/ui/core/themes/sap_horizon_hcb/base.less";
|
|
3
|
+
@import "../../../../../sap/ui/core/themes/sap_horizon_hcb/global.less";
|
|
4
|
+
|
|
5
|
+
@import "DecisionTableCell.less";
|
|
6
|
+
@import "AstExpression.less";
|
|
7
|
+
@import "ExpressionAdvanced.less";
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
@_sap_rules_ui_AstExpression_Color:@sapUiFieldTextColor;
|
|
2
|
+
@_sap_rules_ui_AstExpression_BorderError:@sapUiFieldInvalidColor;
|
|
3
|
+
@_sap_rules_ui_AstExpression_VariableClassColor:@sapUiFieldTextColor;
|
|
4
|
+
@_sap_rules_ui_AstExpression_RangeColor:@sapUiFieldTextColor;
|
|
5
|
+
@_sap_rules_ui_AstExpression_OperatorColor:@sapUiFieldTextColor;
|
|
6
|
+
@_sap_rules_ui_AstExpression_FunctionalOperatorColor:@sapUiFieldTextColor;
|
|
7
|
+
@_sap_rules_ui_AstExpression_FunctionColor:@sapUiLink;
|
|
8
|
+
@_sap_rules_ui_AstExpression_ParenthesisColor:@sapUiFieldTextColor;
|
|
9
|
+
@_sap_rules_ui_AstExpression_LiteralColor:@sapUiFieldTextColor;
|
|
10
|
+
@_sap_rules_ui_AstExpression_LogicalOpertorColor:@sapUiFieldTextColor;
|
|
11
|
+
@_sap_rules_ui_AstExpression_FieldBorderColor:@sapUiFieldBorderColor;
|
|
12
|
+
@_sap_rules_ui_AstExpression_PopoverBorderColor:@sapUiFieldBorderColor;
|
|
13
|
+
@_sap_rules_ui_AstExpression_SelectionColor:@sapUiSelected;
|
|
14
|
+
|
|
15
|
+
.sapAstExpressionInput ::selection {
|
|
16
|
+
background: @_sap_rules_ui_AstExpression_SelectionColor;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
.sapAstExpressionInput ::-moz-selection { /* Code for Firefox */
|
|
20
|
+
background: @_sap_rules_ui_AstExpression_SelectionColor;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
.sapAstExpressionInputError {
|
|
24
|
+
border: 2px dashed @_sap_rules_ui_AstExpression_BorderError !important;
|
|
25
|
+
background-color: @sapUiFieldInvalidBackground !important;
|
|
26
|
+
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
@import "../base/library.source.less";
|
|
2
|
+
@import "../../../../../sap/ui/core/themes/sap_horizon_hcw/base.less";
|
|
3
|
+
@import "../../../../../sap/ui/core/themes/sap_horizon_hcw/global.less";
|
|
4
|
+
|
|
5
|
+
@import "DecisionTableCell.less";
|
|
6
|
+
@import "AstExpression.less";
|
|
7
|
+
@import "ExpressionAdvanced.less";
|