From f819dba346f6ac9ba89148a12cbd361d23af8303 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 18 七月 2024 16:26:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader#144.def |  129 +++++++++++++++++-------------------------
 1 files changed, 52 insertions(+), 77 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 5c1cfdf..ba6fd1e 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def"
@@ -17,16 +17,6 @@
         Taborder: 0
       ]
     }
-    Component edtEventType
-    {
-      #keys: '[415136.0.647401498]'
-      BaseType: 'WebEditField'
-      Properties:
-      [
-        Label: 'Event type'
-        Taborder: 1
-      ]
-    }
     Component durStartTimeOfDay
     {
       #keys: '[415136.0.647401500]'
@@ -38,7 +28,7 @@
         Label: 'Start time'
         MaxDuration: P0DT23H59M0S
         MinDuration: P0DT0H0M0S
-        Taborder: 10
+        Taborder: 8
       ]
     }
     Component dhStartTimeOfDay
@@ -48,7 +38,7 @@
       Databinding: 'Duration'
       Properties:
       [
-        Taborder: 11
+        Taborder: 9
       ]
     }
     Component durEndTimeOfDay
@@ -62,7 +52,7 @@
         Label: 'End time'
         MaxDuration: P0DT23H59M0S
         MinDuration: P0DT0H0M0S
-        Taborder: 12
+        Taborder: 10
       ]
     }
     Component dhEndTimeOfDay
@@ -72,7 +62,7 @@
       Databinding: 'Duration'
       Properties:
       [
-        Taborder: 13
+        Taborder: 11
       ]
     }
     Component edtDescription
@@ -87,7 +77,7 @@
         Multiline: true
         NumberOfColumns: 29
         ShowLabel: false
-        Taborder: 16
+        Taborder: 13
       ]
     }
     Component dsStartDate
@@ -98,7 +88,7 @@
       [
         DateFormat: 'DMMY'
         Label: 'Date'
-        Taborder: 8
+        Taborder: 6
       ]
     }
     Component dhStartDate
@@ -108,7 +98,7 @@
       Databinding: 'Date'
       Properties:
       [
-        Taborder: 9
+        Taborder: 7
       ]
     }
     Component lblDescription id:lblDescription_456
@@ -119,7 +109,7 @@
       [
         Label: 'Description'
         NumberOfColumns: 0
-        Taborder: 15
+        Taborder: 12
       ]
     }
     Component ButtonCreate
@@ -129,10 +119,9 @@
       Properties:
       [
         Label: '鏂板缓'
-        Taborder: 17
+        Taborder: 14
       ]
     }
-    #child: pnlDuration_119
     Component ddslType id:ddslType_360
     {
       #keys: '[415136.0.646711730]'
@@ -144,61 +133,7 @@
         ShowLabel: false
         Sorting: 'none'
         Strings: 'Available;Unavailable'
-        Taborder: 2
-        Visible: false
-      ]
-    }
-    Component edtCapacity id:edtCapacity_437
-    {
-      #keys: '[415136.0.646711783]'
-      BaseType: 'WebEditField'
-      Properties:
-      [
-        Label: 'Capacity'
-        MaxRows: 1
-        NumberOfColumns: 2
-        Taborder: 3
-        Visible: false
-        WordWrap: false
-      ]
-    }
-    Component dhCategories id:dhCategories_902
-    {
-      #keys: '[415136.0.646711860]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[LibCal_EventCategory]*'
-      Properties:
-      [
-        Taborder: 4
-      ]
-    }
-    Component ddlCategory id:ddlCategory_100
-    {
-      #keys: '[415136.0.646712012]'
-      BaseType: 'WebDropDownList'
-      Databinding: 'LibCal_EventCategory'
-      Children:
-      [
-        Component deCategory id:deCategory_61
-        {
-          #keys: '[415136.0.646712013]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[LibCal_EventCategory]'
-            Source: 'dhCategories'
-            Taborder: 0
-            Transformation: 'Elements'
-          ]
-        }
-      ]
-      Properties:
-      [
-        DataBinding: 'dhEvent.Data.EventCategory'
-        DisplayField: 'Name'
-        NumberOfColumns: 15
-        ShowLabel: false
-        Taborder: 5
+        Taborder: 1
         Visible: false
       ]
     }
@@ -211,7 +146,7 @@
         DataBinding: 'dhEvent.Data.IsDefault'
         Label: 'Apply to new resources'
         NumberOfColumns: 0
-        Taborder: 6
+        Taborder: 4
         Tooltip: 'If checked, calendars of new resources will automatically subscribe to the event.'
         Visible: false
       ]
@@ -226,14 +161,54 @@
         NumberOfColumns: 0
         ShowLabel: false
         SizeRatio: 0
-        Taborder: 7
+        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]'
+            FixedFilter: 'object.IsLeaf()'
+            Source: 'dhEventTypes'
+            Taborder: 0
+            Transformation: 'Elements'
+          ]
+        }
+      ]
+      Properties:
+      [
+        DisplayField: 'Name'
+        Label: 'Event type'
+        NumberOfColumns: 15
+        Taborder: 3
       ]
     }
   ]
   Properties:
   [
+    FixedSize: true
     Orientation: 'horizontal'
     Taborder: 0
   ]

--
Gitblit v1.9.3