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_DialogCreateEditScenario/Component_PanelGeneral#549.def | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral\043549.def" "b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral\043549.def"
index 158887f..cfe3fcb 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral\043549.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral\043549.def"
@@ -39,18 +39,6 @@
Taborder: 3
]
}
- Component dropDownStringListGeneral
- {
- #keys: '[414384.0.692930324]'
- BaseType: 'WebDropDownStringList'
- Properties:
- [
- AllowEmpty: true
- DataBinding: 'DataHolderDialogData.Data.ScenarioName'
- Label: 'Scenario Name'
- Taborder: 4
- ]
- }
Component CheckboxIsCreateNewVersion
{
#keys: '[412960.0.157150313]'
@@ -62,5 +50,44 @@
Taborder: 7
]
}
+ Component DropDownListGeneral
+ {
+ #keys: '[412960.0.324971441]'
+ BaseType: 'WebDropDownList'
+ Databinding: 'BusinessType'
+ Children:
+ [
+ Component DataExtractorGeneral
+ {
+ #keys: '[412960.0.324971443]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'GlobalOTDTable'
+ Description: '浼犲叆Business Type绫昏繘Dosync'
+ Source: 'GlobalOTDTable'
+ Taborder: 0
+ Transformation: 'BusinessType'
+ ]
+ }
+ ]
+ Properties:
+ [
+ AllowEmpty: true
+ DisplayField: 'ScenarioName'
+ Label: 'Scenario Name'
+ Taborder: 4
+ ]
+ }
+ Component dsPlanningStart
+ {
+ #keys: '[414702.1.259278858]'
+ BaseType: 'WebDateSelector'
+ Properties:
+ [
+ Label: '璁″垝寮�濮嬫椂闂�'
+ Taborder: 8
+ ]
+ }
]
}
--
Gitblit v1.9.3