From 4e81774a232b45a6a9df3dfd06893c481c83695d Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 07 八月 2024 15:56:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader#144.def | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 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 c4af7a8..56e3225 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def"
@@ -29,7 +29,7 @@
MaxDuration: P0DT23H59M0S
MinDuration: P0DT0H0M0S
ShowLabel: false
- Taborder: 8
+ Taborder: 9
]
}
Component dhStartTimeOfDay
@@ -39,7 +39,7 @@
Databinding: 'Duration'
Properties:
[
- Taborder: 9
+ Taborder: 10
]
}
Component durEndTimeOfDay
@@ -54,7 +54,7 @@
MaxDuration: P0DT23H59M0S
MinDuration: P0DT0H0M0S
ShowLabel: false
- Taborder: 12
+ Taborder: 13
]
}
Component dhEndTimeOfDay
@@ -64,7 +64,7 @@
Databinding: 'Duration'
Properties:
[
- Taborder: 13
+ Taborder: 14
]
}
Component edtDescription
@@ -79,7 +79,7 @@
Multiline: true
NumberOfColumns: 29
ShowLabel: false
- Taborder: 15
+ Taborder: 16
]
}
Component dsStartDate
@@ -90,7 +90,7 @@
[
DateFormat: 'DMMY'
Label: '寮�濮嬫棩鏈�'
- Taborder: 6
+ Taborder: 7
]
}
Component dhStartDate
@@ -100,7 +100,7 @@
Databinding: 'Date'
Properties:
[
- Taborder: 7
+ Taborder: 8
]
}
Component lblDescription id:lblDescription_456
@@ -111,7 +111,7 @@
[
Label: '澶囨敞'
NumberOfColumns: 0
- Taborder: 14
+ Taborder: 15
]
}
Component ButtonCreate
@@ -121,7 +121,7 @@
Properties:
[
Label: '鏂板'
- Taborder: 16
+ Taborder: 17
]
}
Component ddslType id:ddslType_360
@@ -192,7 +192,6 @@
Properties:
[
DataType: 'structured[LibCal_EventType]'
- FixedFilter: 'object.IsLeaf()'
Source: 'dhEventTypes'
Taborder: 0
Transformation: 'Elements'
@@ -201,6 +200,7 @@
]
Properties:
[
+ AllowEmpty: true
DisplayField: 'Name'
Label: '浜嬩欢绫诲瀷'
NumberOfColumns: 15
@@ -215,7 +215,7 @@
[
DateFormat: 'DMMY'
Label: '缁撴潫鏃ユ湡'
- Taborder: 10
+ Taborder: 11
]
}
Component dhEndDate
@@ -225,7 +225,19 @@
Databinding: 'Date'
Properties:
[
- Taborder: 11
+ Taborder: 12
+ ]
+ }
+ Component ckbIsAllDay id:ckbIsAllDay_812
+ {
+ #keys: '[415136.0.926885762]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ CheckboxType: 'toggle'
+ Label: 'All day'
+ NumberOfColumns: 0
+ Taborder: 6
]
}
]
--
Gitblit v1.9.3