From 10c7321b383650c4e08ac3b06f9d191684ad71b4 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 07 八月 2024 09:45:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews#859.def | 14 --------------
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def | 11 +++++++++++
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupReport_ButtonScenarioComparisonDeman#968.def | 6 +++---
3 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def
index 7f3a077..1b42609 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def
@@ -82,6 +82,17 @@
Taborder: 6
]
}
+ Component ButtonScenarioComparisonDemandComparison id:ButtonScenarioComparisonDemandComparison_256
+ {
+ #keys: '[412672.1.90201789]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'EQUALS'
+ Label: '闇�姹傚姣�'
+ Taborder: 7
+ ]
+ }
]
Properties:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews\043859.def" "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews\043859.def"
index 062b204..f5f7736 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews\043859.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupScenarioComparisonViews\043859.def"
@@ -1,18 +1,4 @@
Quintiq file version 2.0
Component ActionBarGroupScenarioComparisonViews #extension
{
- Children:
- [
- Component ButtonScenarioComparisonDemandComparison
- {
- #keys: '[412672.0.1090347286]'
- BaseType: 'WebButton'
- Properties:
- [
- Image: 'EQUALS'
- Label: '闇�姹傚姣�'
- Taborder: 8
- ]
- }
- ]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupScenarioComparisonViews_ButtonScenarioCo.def "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupReport_ButtonScenarioComparisonDeman\043968.def"
similarity index 75%
rename from _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupScenarioComparisonViews_ButtonScenarioCo.def
rename to "_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupReport_ButtonScenarioComparisonDeman\043968.def"
index b8c7979..9f5a28e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupScenarioComparisonViews_ButtonScenarioCo.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupReport_ButtonScenarioComparisonDeman\043968.def"
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: ActionBarGroupScenarioComparisonViews/ButtonScenarioComparisonDemandComparison
-Response OnClick () id:Response_MacroPlanner_ActionBarGroupScenarioComparisonViews_ButtonScenarioComparisonDemandComparison_OnClick
+#parent: ActionBarGroupReport/ButtonScenarioComparisonDemandComparison_256
+Response OnClick () id:Response_MacroPlanner_ActionBarGroupScenarioComparisonViews_ButtonScenarioComparisonDemandComparison_OnClick_968
{
- #keys: '[412672.0.1090347405]'
+ #keys: '[412672.1.90201788]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebButton_OnClick'
QuillAction
--
Gitblit v1.9.3