From acf70acb5438a3358d07978afdc0eb28950f40d5 Mon Sep 17 00:00:00 2001 From: lihongji <3117313295@qq.com> Date: 星期一, 12 八月 2024 16:28:01 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev --- _Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader#144.def | 120 ++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 92 insertions(+), 28 deletions(-) diff --git "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def" "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def" index 8f68633..56e3225 100644 --- "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def" +++ "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def" @@ -12,19 +12,9 @@ Properties: [ DataBinding: 'dhEvent.Data.Subject' - Label: 'Name' + Label: '浜嬩欢' PlaceHolder: '<Enter a name>' Taborder: 0 - ] - } - Component edtEventType - { - #keys: '[415136.0.647401498]' - BaseType: 'WebEditField' - Properties: - [ - Label: 'Event type' - Taborder: 1 ] } Component durStartTimeOfDay @@ -35,10 +25,11 @@ [ CanBeNegative: false DurationFormat: 'h:m' - Label: 'Start time' + Label: '寮�濮嬫棩鏈�' MaxDuration: P0DT23H59M0S MinDuration: P0DT0H0M0S - Taborder: 7 + ShowLabel: false + Taborder: 9 ] } Component dhStartTimeOfDay @@ -48,7 +39,7 @@ Databinding: 'Duration' Properties: [ - Taborder: 8 + Taborder: 10 ] } Component durEndTimeOfDay @@ -59,10 +50,11 @@ [ CanBeNegative: false DurationFormat: 'h:m' - Label: 'End time' + Label: '缁撴潫鏃ユ湡' MaxDuration: P0DT23H59M0S MinDuration: P0DT0H0M0S - Taborder: 9 + ShowLabel: false + Taborder: 13 ] } Component dhEndTimeOfDay @@ -72,7 +64,7 @@ Databinding: 'Duration' Properties: [ - Taborder: 10 + Taborder: 14 ] } Component edtDescription @@ -87,7 +79,7 @@ Multiline: true NumberOfColumns: 29 ShowLabel: false - Taborder: 12 + Taborder: 16 ] } Component dsStartDate @@ -97,8 +89,8 @@ Properties: [ DateFormat: 'DMMY' - Label: 'Date' - Taborder: 5 + Label: '寮�濮嬫棩鏈�' + Taborder: 7 ] } Component dhStartDate @@ -108,7 +100,7 @@ Databinding: 'Date' Properties: [ - Taborder: 6 + Taborder: 8 ] } Component lblDescription id:lblDescription_456 @@ -117,9 +109,9 @@ BaseType: 'WebLabel' Properties: [ - Label: 'Description' + Label: '澶囨敞' NumberOfColumns: 0 - Taborder: 11 + Taborder: 15 ] } Component ButtonCreate @@ -128,8 +120,8 @@ BaseType: 'WebButton' Properties: [ - Label: '鏂板缓' - Taborder: 13 + Label: '鏂板' + Taborder: 17 ] } Component ddslType id:ddslType_360 @@ -143,7 +135,7 @@ ShowLabel: false Sorting: 'none' Strings: 'Available;Unavailable' - Taborder: 2 + Taborder: 1 Visible: false ] } @@ -156,7 +148,7 @@ DataBinding: 'dhEvent.Data.IsDefault' Label: 'Apply to new resources' NumberOfColumns: 0 - Taborder: 3 + Taborder: 4 Tooltip: 'If checked, calendars of new resources will automatically subscribe to the event.' Visible: false ] @@ -171,11 +163,83 @@ NumberOfColumns: 0 ShowLabel: false SizeRatio: 0 - Taborder: 4 + Taborder: 5 Text: '<Timezone>' Visible: false ] } + Component dhEventTypes id:dhEventTypes_836 + { + #keys: '[415136.0.706740648]' + BaseType: 'WebDataHolder' + Databinding: 'structured[LibCal_EventType]*' + Properties: + [ + Taborder: 2 + ] + } + Component ddlEventType id:ddlEventType_568 + { + #keys: '[415136.0.706740548]' + BaseType: 'WebDropDownList' + Databinding: 'LibCal_EventType' + Children: + [ + Component deEventType id:deEventType_393 + { + #keys: '[415136.0.706740549]' + BaseType: 'WebDataExtractor' + Properties: + [ + DataType: 'structured[LibCal_EventType]' + Source: 'dhEventTypes' + Taborder: 0 + Transformation: 'Elements' + ] + } + ] + Properties: + [ + AllowEmpty: true + DisplayField: 'Name' + Label: '浜嬩欢绫诲瀷' + NumberOfColumns: 15 + Taborder: 3 + ] + } + Component dsEndDate + { + #keys: '[415136.0.923680588]' + BaseType: 'WebDateSelector' + Properties: + [ + DateFormat: 'DMMY' + Label: '缁撴潫鏃ユ湡' + Taborder: 11 + ] + } + Component dhEndDate + { + #keys: '[415136.0.923671132]' + BaseType: 'WebDataHolder' + Databinding: 'Date' + Properties: + [ + Taborder: 12 + ] + } + Component ckbIsAllDay id:ckbIsAllDay_812 + { + #keys: '[415136.0.926885762]' + BaseType: 'WebCheckbox' + Properties: + [ + CheckboxType: 'toggle' + Label: 'All day' + NumberOfColumns: 0 + Taborder: 6 + ] + } ] Properties: [ -- Gitblit v1.9.3