From aefafd2142478d4fb07d6b8b45c3047e247389e0 Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期五, 03 十一月 2023 16:31:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
index 4f48b76..c307f2a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
@@ -14,6 +14,8 @@
#child: applicationDevelopmentActionBarPageDef_1
#child: ActionBarPagePlan
#child: ActionBarPageInventory
+ #child: ActionBarPageScenarioSelection
+ #child: ActionBarPageScenarioComparison
]
}
Component DataHolderCapacityAndSaleBudgeFilterItem
@@ -66,5 +68,44 @@
Taborder: 44
]
}
+ Component DataHolderAvailableScenarios
+ {
+ #keys: '[414702.1.131690403]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[ScenarioNode]*'
+ Properties:
+ [
+ Taborder: 45
+ ]
+ }
+ Component DataHolderCurrentUser #extension
+ {
+ }
+ Component DataHolderAllScenario
+ {
+ #keys: '[414702.1.169450613]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[ScenarioNode]*'
+ Children:
+ [
+ Component DataExtractorAllScenario
+ {
+ #keys: '[414702.1.166961408]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'ScenarioManager'
+ FixedFilter: 'not object.IsDeleted()'
+ Source: 'ScenarioManager'
+ Taborder: 0
+ Transformation: 'ScenarioNode'
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 46
+ ]
+ }
]
}
--
Gitblit v1.9.3