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_DialogCreateEditScenario/Component_PanelGeneral#549.def | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 43 insertions(+), 5 deletions(-) diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral\043549.def" "b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral\043549.def" index 13a5531..cfe3fcb 100644 --- "a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral\043549.def" +++ "b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Component_PanelGeneral\043549.def" @@ -39,17 +39,55 @@ Taborder: 3 ] } - Component dropDownStringListGeneral + Component CheckboxIsCreateNewVersion { - #keys: '[414384.0.692930324]' - BaseType: 'WebDropDownStringList' + #keys: '[412960.0.157150313]' + BaseType: 'WebCheckbox' + Properties: + [ + DataBinding: 'DataHolderDialogData.Data.IsCreateNewVersion' + Label: 'Create a new version' + 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 - DataBinding: 'DataHolderDialogData.Data.BusinessType' - Label: 'BusinessType' + DisplayField: 'ScenarioName' + Label: 'Scenario Name' Taborder: 4 ] } + Component dsPlanningStart + { + #keys: '[414702.1.259278858]' + BaseType: 'WebDateSelector' + Properties: + [ + Label: '璁″垝寮�濮嬫椂闂�' + Taborder: 8 + ] + } ] } -- Gitblit v1.9.3