From cbaf9b93e0393cc7205285b047dec7fcef6ab0ed Mon Sep 17 00:00:00 2001
From: haorenhui <renhui.hao@capgemini.com>
Date: 星期三, 18 十月 2023 10:48:00 +0800
Subject: [PATCH] Merge branch 'dev' into dev_hrh_global
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 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 72e5ee3..49e8c72 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
@@ -11,6 +11,10 @@
[
#child: ActionBarPageData
#child: ActionBarPageSales
+ #child: applicationDevelopmentActionBarPageDef_1
+ #child: ActionBarPagePlan
+ #child: ActionBarPageInventory
+ #child: ActionBarPageScenarioSelection
]
}
Component DataHolderCapacityAndSaleBudgeFilterItem
@@ -43,5 +47,38 @@
Taborder: 42
]
}
+ Component DataHolderCapacityAndSaleBudgeFilterBusinessType
+ {
+ #keys: '[414384.0.874472860]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[CapacityAndSaleBudgeFilterBusinessType]*'
+ Properties:
+ [
+ Taborder: 43
+ ]
+ }
+ Component DataHolderCapacityAndSaleBudgeFilterPlaceOfProductionOfArray
+ {
+ #keys: '[414384.0.874472866]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[CapacityAndSaleBudgeFilterPlaceOfProductionOfArray]*'
+ Properties:
+ [
+ Taborder: 44
+ ]
+ }
+ Component DataHolderAvailableScenarios
+ {
+ #keys: '[414702.1.131690403]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[ScenarioNode]*'
+ Properties:
+ [
+ Taborder: 45
+ ]
+ }
+ Component DataHolderCurrentUser #extension
+ {
+ }
]
}
--
Gitblit v1.9.3