From 91413a3e42e7df36207ece0c7908a7dbb9b8727a Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 30 五月 2024 17:07:29 +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 | 8 +++++---
1 files changed, 5 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..fdee85e 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'
--
Gitblit v1.9.3