From 880f3c0257eeb8c37761d484258fdd102a369a19 Mon Sep 17 00:00:00 2001
From: 陈清红 <420599804@qq.com>
Date: 星期一, 14 四月 2025 16:46:36 +0800
Subject: [PATCH] BUG&优化项

---
 _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def
index fdee85e..eacae66 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,19 +44,17 @@
           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'
           ]
         }
       ]
       Properties:
       [
-        Legend: 'RowNr'
-        SortCriteria: 'RowNr'
+        Legend: 'Name'
+        SortCriteria: 'Name'
         Taborder: 1
       ]
     }
@@ -72,31 +70,41 @@
           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'
           ]
         }
       ]
       Properties:
       [
         Legend: 'Name'
-        SortCriteria: 'Index'
+        SortCriteria: 'Period'
         Taborder: 2
       ]
     }
     #child: matrixEditorActionBarPageTable
     #child: matrixeditorContextMenuTable
+    Component UserConfigurableInformationTable
+    {
+      #keys: '[415136.0.720821389]'
+      BaseType: 'WebUserConfigurableInformation'
+      Properties:
+      [
+        Identifier: 'Cell:sec'
+        ObjectType: 'LibCal_SubscriberEventCell'
+        Taborder: 5
+        Tooltip: "VALUE(guard( object.GetMatrixTooltip() , '' ))"
+      ]
+    }
   ]
   Properties:
   [
     Columns: 'MatrixEditorTableColumns'
     ContextMenu: 'matrixeditorContextMenuTable'
     Rows: 'MatrixEditorTableRows'
-    Taborder: 1
+    Taborder: 2
   ]
 }

--
Gitblit v1.9.3