Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

lazhen

2024-05-30 91413a3e42e7df36207ece0c7908a7dbb9b8727a

 _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_MatrixEditorTable.def

@@ -45,6 +45,8 @@
          Properties:
          [
            DataType: 'LibCal_SubscriberEventTable'
            FilterArguments: 'subscribers:dhSubscribers;eventtypes:dhEventTypes'
            FixedFilter: 'object.FilterBySubscriberAndEventType( subscribers, eventtypes )'
            Source: 'dhTable'
            Taborder: 0
            Transformation: 'LibCal_SubscriberEventRow'
@@ -71,6 +73,9 @@
          Properties:
          [
            DataType: 'LibCal_SubscriberEventTable'
            Description: 'object.FilterByDatePeriod( Date::MinDate(), Date::MaxDate() )'
            FilterArguments: 'period:dhDate'
            FixedFilter: 'object.FilterByDatePeriod( period.Start(), period.End() )'
            Source: 'dhTable'
            Taborder: 0
            Transformation: 'LibCal_SubscriberEventColumn'