From 180d8d74c2a67a693047e1a587007c734e4f62fb Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 23 七月 2024 14:49:29 +0800
Subject: [PATCH] 日历不可用事件添加查询按钮

---
 _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def
index 4612e07..67028e6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def
@@ -17,10 +17,10 @@
           BaseType: 'WebDataExtractor'
           Properties:
           [
-            DataType: 'LibCal_SubscriberEventTable'
-            Source: 'dhTable'
+            DataType: 'structured[LibCal_SubscriberEventColumn]'
+            Source: 'dhColumns'
             Taborder: 0
-            Transformation: 'LibCal_SubscriberEventColumn.LibCal_SubscriberEventCell'
+            Transformation: 'Elements.LibCal_SubscriberEventCell'
           ]
         }
       ]
@@ -44,12 +44,10 @@
           BaseType: 'WebDataExtractor'
           Properties:
           [
-            DataType: 'LibCal_SubscriberEventTable'
-            FilterArguments: 'subscribers:dhSubscribers;eventtypes:dhEventTypes'
-            FixedFilter: 'object.FilterBySubscriberAndEventType( subscribers, eventtypes )'
-            Source: 'dhTable'
+            DataType: 'structured[LibCal_SubscriberEventRow]'
+            Source: 'dhRows'
             Taborder: 0
-            Transformation: 'LibCal_SubscriberEventRow'
+            Transformation: 'Elements'
           ]
         }
       ]
@@ -72,13 +70,11 @@
           BaseType: 'WebDataExtractor'
           Properties:
           [
-            DataType: 'LibCal_SubscriberEventTable'
+            DataType: 'structured[LibCal_SubscriberEventColumn]'
             Description: 'object.FilterByDatePeriod( Date::MinDate(), Date::MaxDate() )'
-            FilterArguments: 'period:dhDate'
-            FixedFilter: 'object.FilterByDatePeriod( period.Start(), period.End() )'
-            Source: 'dhTable'
+            Source: 'dhColumns'
             Taborder: 0
-            Transformation: 'LibCal_SubscriberEventColumn'
+            Transformation: 'Elements'
           ]
         }
       ]
@@ -110,6 +106,6 @@
     Columns: 'MatrixEditorTableColumns'
     ContextMenu: 'matrixeditorContextMenuTable'
     Rows: 'MatrixEditorTableRows'
-    Taborder: 1
+    Taborder: 2
   ]
 }

--
Gitblit v1.9.3