From 23f7cd51d607dead573dfa5b251d402d502111a2 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期五, 26 七月 2024 16:44:14 +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 | 69 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 17 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 ba6fd1e..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,7 +12,7 @@
Properties:
[
DataBinding: 'dhEvent.Data.Subject'
- Label: 'Name'
+ Label: '浜嬩欢'
PlaceHolder: '<Enter a name>'
Taborder: 0
]
@@ -25,10 +25,11 @@
[
CanBeNegative: false
DurationFormat: 'h:m'
- Label: 'Start time'
+ Label: '寮�濮嬫棩鏈�'
MaxDuration: P0DT23H59M0S
MinDuration: P0DT0H0M0S
- Taborder: 8
+ ShowLabel: false
+ Taborder: 9
]
}
Component dhStartTimeOfDay
@@ -38,7 +39,7 @@
Databinding: 'Duration'
Properties:
[
- Taborder: 9
+ Taborder: 10
]
}
Component durEndTimeOfDay
@@ -49,10 +50,11 @@
[
CanBeNegative: false
DurationFormat: 'h:m'
- Label: 'End time'
+ Label: '缁撴潫鏃ユ湡'
MaxDuration: P0DT23H59M0S
MinDuration: P0DT0H0M0S
- Taborder: 10
+ ShowLabel: false
+ Taborder: 13
]
}
Component dhEndTimeOfDay
@@ -62,7 +64,7 @@
Databinding: 'Duration'
Properties:
[
- Taborder: 11
+ Taborder: 14
]
}
Component edtDescription
@@ -77,7 +79,7 @@
Multiline: true
NumberOfColumns: 29
ShowLabel: false
- Taborder: 13
+ Taborder: 16
]
}
Component dsStartDate
@@ -87,8 +89,8 @@
Properties:
[
DateFormat: 'DMMY'
- Label: 'Date'
- Taborder: 6
+ Label: '寮�濮嬫棩鏈�'
+ Taborder: 7
]
}
Component dhStartDate
@@ -98,7 +100,7 @@
Databinding: 'Date'
Properties:
[
- Taborder: 7
+ Taborder: 8
]
}
Component lblDescription id:lblDescription_456
@@ -107,9 +109,9 @@
BaseType: 'WebLabel'
Properties:
[
- Label: 'Description'
+ Label: '澶囨敞'
NumberOfColumns: 0
- Taborder: 12
+ Taborder: 15
]
}
Component ButtonCreate
@@ -118,8 +120,8 @@
BaseType: 'WebButton'
Properties:
[
- Label: '鏂板缓'
- Taborder: 14
+ Label: '鏂板'
+ Taborder: 17
]
}
Component ddslType id:ddslType_360
@@ -190,7 +192,6 @@
Properties:
[
DataType: 'structured[LibCal_EventType]'
- FixedFilter: 'object.IsLeaf()'
Source: 'dhEventTypes'
Taborder: 0
Transformation: 'Elements'
@@ -199,12 +200,46 @@
]
Properties:
[
+ AllowEmpty: true
DisplayField: 'Name'
- Label: 'Event type'
+ 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