From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def
index 4a8f9f1..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'
- FixedFilter: 'object.FilterBySubscriberAndEventType( subscribers )'
- 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,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