From 5fa4a6a06c62fd41731ff6cc1f1f6e031bd7436f Mon Sep 17 00:00:00 2001
From: yypsybs <yypsybs@foxmail.com>
Date: 星期三, 18 十月 2023 09:50:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def | 14 ++++++++++++++
1 files changed, 14 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..49e8c72 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
@@ -14,6 +14,7 @@
#child: applicationDevelopmentActionBarPageDef_1
#child: ActionBarPagePlan
#child: ActionBarPageInventory
+ #child: ActionBarPageScenarioSelection
]
}
Component DataHolderCapacityAndSaleBudgeFilterItem
@@ -66,5 +67,18 @@
Taborder: 44
]
}
+ Component DataHolderAvailableScenarios
+ {
+ #keys: '[414702.1.131690403]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[ScenarioNode]*'
+ Properties:
+ [
+ Taborder: 45
+ ]
+ }
+ Component DataHolderCurrentUser #extension
+ {
+ }
]
}
--
Gitblit v1.9.3