From 42e52dd7a48775cd83be92cc46ea42aa124cb15c Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 14 六月 2024 13:06:19 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def
index 4a8f9f1..8b3cfbe 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def
@@ -45,8 +45,8 @@
Properties:
[
DataType: 'LibCal_SubscriberEventTable'
- FilterArguments: 'subscribers:dhSubscribers'
- FixedFilter: 'object.FilterBySubscriberAndEventType( subscribers )'
+ FilterArguments: 'subscribers:dhSubscribers;eventtypes:dhEventTypes'
+ FixedFilter: 'object.FilterBySubscriberAndEventType( subscribers, eventtypes )'
Source: 'dhTable'
Taborder: 0
Transformation: 'LibCal_SubscriberEventRow'
@@ -73,7 +73,9 @@
Properties:
[
DataType: 'LibCal_SubscriberEventTable'
- FilterArguments: 'starttime:dhStartDate;endtime:dhEndDate'
+ Description: 'object.FilterByDatePeriod( Date::MinDate(), Date::MaxDate() )'
+ FilterArguments: 'period:dhDate'
+ FixedFilter: 'object.FilterByDatePeriod( period.Start(), period.End() )'
Source: 'dhTable'
Taborder: 0
Transformation: 'LibCal_SubscriberEventColumn'
@@ -89,6 +91,19 @@
}
#child: matrixEditorActionBarPageTable
#child: matrixeditorContextMenuTable
+ Component UserConfigurableInformationTable
+ {
+ #keys: '[415136.0.720821389]'
+ BaseType: 'WebUserConfigurableInformation'
+ Properties:
+ [
+ Identifier: 'Cell:sec'
+ ObjectType: 'LibCal_SubscriberEventCell'
+ Precondition: 'object.LibCal_SubscriberEventColumn().Index() > 1'
+ Taborder: 5
+ Tooltip: "VALUE(guard( object.GetMatrixTooltip() , '' ))"
+ ]
+ }
]
Properties:
[
--
Gitblit v1.9.3