@sapui5/sap.rules.ui 1.94.0 → 1.98.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/AstExpressionBasic.js +1 -1
- package/src/sap/rules/ui/AstExpressionBasicRenderer.js +4 -2
- package/src/sap/rules/ui/AutoCompleteSuggestionContentRenderer.js +4 -2
- package/src/sap/rules/ui/BindingSpy.js +5 -3
- package/src/sap/rules/ui/Constants.js +4 -2
- package/src/sap/rules/ui/DecisionTable.js +9 -7
- package/src/sap/rules/ui/DecisionTableCell.js +5 -3
- package/src/sap/rules/ui/DecisionTableCellAstExpressionBasic.js +5 -3
- package/src/sap/rules/ui/DecisionTableCellAstExpressionBasicRenderer.js +4 -2
- package/src/sap/rules/ui/DecisionTableCellExpressionAdvanced.js +5 -3
- package/src/sap/rules/ui/DecisionTableCellExpressionAdvancedRenderer.js +4 -2
- package/src/sap/rules/ui/DecisionTableCellExpressionBasic.js +5 -3
- package/src/sap/rules/ui/DecisionTableCellExpressionBasicRenderer.js +4 -2
- package/src/sap/rules/ui/DecisionTableCellRenderer.js +4 -2
- package/src/sap/rules/ui/DecisionTableConfiguration.js +5 -3
- package/src/sap/rules/ui/DecisionTableRenderer.js +4 -2
- package/src/sap/rules/ui/DecisionTableSettings.js +5 -3
- package/src/sap/rules/ui/DecisionTableSettingsOld.js +5 -3
- package/src/sap/rules/ui/DecisionTableSettingsOldRenderer.js +4 -2
- package/src/sap/rules/ui/DecisionTableSettingsRenderer.js +4 -2
- package/src/sap/rules/ui/ExpressionAdvanced.js +4 -2
- package/src/sap/rules/ui/ExpressionAdvancedRenderer.js +4 -2
- package/src/sap/rules/ui/ExpressionBase.js +5 -3
- package/src/sap/rules/ui/ExpressionBasic.js +5 -3
- package/src/sap/rules/ui/ExpressionBasicRenderer.js +4 -2
- package/src/sap/rules/ui/RuleBase.js +5 -3
- package/src/sap/rules/ui/RuleBuilder.js +5 -3
- package/src/sap/rules/ui/RuleBuilderRenderer.js +4 -2
- package/src/sap/rules/ui/TextRule.js +5 -3
- package/src/sap/rules/ui/TextRuleConfiguration.js +5 -3
- package/src/sap/rules/ui/TextRuleRenderer.js +4 -2
- package/src/sap/rules/ui/TextRuleSettings.js +5 -3
- package/src/sap/rules/ui/TextRuleSettingsRenderer.js +4 -2
- package/src/sap/rules/ui/Utils.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionAdvancedFunctionPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionAggregateFunctionPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionArrayOperatorPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionComparisionOperatorPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionDateAndTimePanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionFixedValuePanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionFunctionalOperatorPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionLogicalOperatorPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionLoopFunctionPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionMathematicalOperatorPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionMiscellaneousOperatorPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionOperationsPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionRangeOperatorPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionSelectFunctionPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionTimeAndDurationFunctionPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionVocabularyPanelRenderer.js +4 -2
- package/src/sap/rules/ui/ast/builder/TermsBuilder.js +36 -2
- package/src/sap/rules/ui/ast/parser/bundle.js +2973 -1471
- package/src/sap/rules/ui/ast/util/AggregateFunctionDialog.js +1 -1
- package/src/sap/rules/ui/library.js +8 -5
- package/src/sap/rules/ui/oldast/lib/AstYamlConverter.js +4 -2
- package/src/sap/rules/ui/oldast/lib/Constants.js +4 -2
- package/src/sap/rules/ui/providers/ValueHelpDialogProvider.js +4 -2
- package/src/sap/rules/ui/services/AstExpressionLanguage.js +4 -2
- package/src/sap/rules/ui/services/ExpressionLanguage.js +4 -2
- package/src/sap/rules/ui/themes/base/library.source.less +4 -2
- package/src/sap/rules/ui/themes/sap_horizon/ExpressionAdvanced.less +20 -0
- package/src/sap/rules/ui/themes/sap_horizon/library.source.less +5 -0
- package/src/sap/rules/ui/type/DecisionTableCell.js +4 -2
- package/src/sap/rules/ui/type/DecisionTableHeader.js +4 -2
- package/src/sap/rules/ui/type/Expression.js +4 -2
- package/src/sap/rules/ui/type/ExpressionAbs.js +5 -3
- package/ui5.yaml +2 -3
|
@@ -197,11 +197,15 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
|
|
|
197
197
|
}
|
|
198
198
|
};
|
|
199
199
|
|
|
200
|
-
/* returns
|
|
200
|
+
/* returns the nested DO */
|
|
201
201
|
TermsBuilder.prototype._getNestedDataObject = function (id) {
|
|
202
202
|
for (var doIterator = 0; doIterator < this._nestedDataObjects.length; doIterator++) {
|
|
203
203
|
if (id === this._nestedDataObjects[doIterator].Id) {
|
|
204
|
-
|
|
204
|
+
var nestedDO = this._nestedDataObjects[doIterator];
|
|
205
|
+
if(nestedDO.DataObjectReference && nestedDO.DataObjectReference.TargetDataObjectId){
|
|
206
|
+
return this._getNestedDataObject(nestedDO.DataObjectReference.TargetDataObjectId);
|
|
207
|
+
}
|
|
208
|
+
return nestedDO;
|
|
205
209
|
}
|
|
206
210
|
}
|
|
207
211
|
};
|
|
@@ -248,7 +252,16 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
|
|
|
248
252
|
dataObject = _dataObjects[doIterator];
|
|
249
253
|
if(dataObject.Id === term.ResultDataObjectId) {
|
|
250
254
|
var doVisited = [];
|
|
255
|
+
//check if DO reference
|
|
256
|
+
var referencedDO = null;
|
|
257
|
+
if(dataObject.DataObjectReference && dataObject.DataObjectReference.TargetDataObjectId){
|
|
258
|
+
referencedDO = this._getNestedDataObject(dataObject.DataObjectReference.TargetDataObjectId);
|
|
259
|
+
}
|
|
260
|
+
|
|
251
261
|
attributes = dataObject.Attributes;
|
|
262
|
+
if(referencedDO){
|
|
263
|
+
attributes = referencedDO.Attributes;
|
|
264
|
+
}
|
|
252
265
|
for (var attrIterator = 0; attrIterator < attributes.length; attrIterator++) {
|
|
253
266
|
attribute = attributes[attrIterator];
|
|
254
267
|
//if label is undefined then name will be used for label map
|
|
@@ -265,6 +278,9 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
|
|
|
265
278
|
}
|
|
266
279
|
|
|
267
280
|
associations = dataObject.Associations;
|
|
281
|
+
if(referencedDO){
|
|
282
|
+
associations = referencedDO.Associations;
|
|
283
|
+
}
|
|
268
284
|
for (var assocIterator = 0; assocIterator < associations.length; assocIterator++) {
|
|
269
285
|
association = associations[assocIterator];
|
|
270
286
|
doVisited.push(dataObject.Id);
|
|
@@ -277,6 +293,9 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
|
|
|
277
293
|
if(dataObject && dataObject.References) {
|
|
278
294
|
references = dataObject.References;
|
|
279
295
|
}
|
|
296
|
+
if(referencedDO){
|
|
297
|
+
references = referencedDO.References;
|
|
298
|
+
}
|
|
280
299
|
for (var refIterator = 0; refIterator < references.length; refIterator++) {
|
|
281
300
|
reference = references[refIterator];
|
|
282
301
|
doVisited.push(dataObject.Id);
|
|
@@ -337,8 +356,17 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
|
|
|
337
356
|
this.termsProviderInstance.addToTermsIdMap(dataObject.Id, term);
|
|
338
357
|
this.termsProviderInstance.addToTermsNameMap(dataObject.Name, term);
|
|
339
358
|
this.termsProviderInstance.addToTermsLabelMap(doLabel, term);
|
|
359
|
+
|
|
360
|
+
//check if DO reference
|
|
361
|
+
var referencedDO = null;
|
|
362
|
+
if(dataObject.DataObjectReference && dataObject.DataObjectReference.TargetDataObjectId){
|
|
363
|
+
referencedDO = this._getNestedDataObject(dataObject.DataObjectReference.TargetDataObjectId);
|
|
364
|
+
}
|
|
340
365
|
|
|
341
366
|
attributes = dataObject.Attributes;
|
|
367
|
+
if(referencedDO){
|
|
368
|
+
attributes = referencedDO.Attributes;
|
|
369
|
+
}
|
|
342
370
|
for (var attrIterator = 0; attrIterator < attributes.length; attrIterator++) {
|
|
343
371
|
attribute = attributes[attrIterator];
|
|
344
372
|
|
|
@@ -357,6 +385,9 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
|
|
|
357
385
|
|
|
358
386
|
var doVisited = [];
|
|
359
387
|
associations = dataObject.Associations;
|
|
388
|
+
if(referencedDO){
|
|
389
|
+
associations = referencedDO.Associations;
|
|
390
|
+
}
|
|
360
391
|
for (var assocIterator = 0; assocIterator < associations.length; assocIterator++) {
|
|
361
392
|
association = associations[assocIterator];
|
|
362
393
|
doVisited.push(dataObject.Id);
|
|
@@ -369,6 +400,9 @@ sap.ui.define(["sap/rules/ui/ast/util/AstUtil", "sap/rules/ui/ast/provider/Terms
|
|
|
369
400
|
if(dataObject && dataObject.References) {
|
|
370
401
|
references = dataObject.References;
|
|
371
402
|
}
|
|
403
|
+
if(referencedDO){
|
|
404
|
+
references = referencedDO.References;
|
|
405
|
+
}
|
|
372
406
|
for (var refIterator = 0; refIterator < references.length; refIterator++) {
|
|
373
407
|
reference = references[refIterator];
|
|
374
408
|
doVisited.push(dataObject.Id);
|