From 30c02e0c981b16be0918483543f4b812956c45d4 Mon Sep 17 00:00:00 2001 From: Lai,Risheng <risheng.lai@capgemini.com> Date: 星期四, 02 十一月 2023 10:50:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev' --- _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