From 6d9968b5e3de0f425bef89103b9d4eec06a897f6 Mon Sep 17 00:00:00 2001 From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com> Date: 星期五, 18 十月 2024 12:00:58 +0800 Subject: [PATCH] 修复产量对比报表日期筛选导出不生效的bug --- _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def index 4a8f9f1..f0cf4a9 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,18 +44,16 @@ BaseType: 'WebDataExtractor' Properties: [ - DataType: 'LibCal_SubscriberEventTable' - FilterArguments: 'subscribers:dhSubscribers' - FixedFilter: 'object.FilterBySubscriberAndEventType( subscribers )' - Source: 'dhTable' + DataType: 'structured[LibCal_SubscriberEventRow]' + Source: 'dhRows' Taborder: 0 - Transformation: 'LibCal_SubscriberEventRow' + Transformation: 'Elements' ] } ] Properties: [ - Legend: 'RowNr' + Legend: 'Name' SortCriteria: 'RowNr' Taborder: 1 ] @@ -72,29 +70,41 @@ BaseType: 'WebDataExtractor' Properties: [ - DataType: 'LibCal_SubscriberEventTable' - FilterArguments: 'starttime:dhStartDate;endtime:dhEndDate' - Source: 'dhTable' + DataType: 'structured[LibCal_SubscriberEventColumn]' + Description: 'object.FilterByDatePeriod( Date::MinDate(), Date::MaxDate() )' + 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