Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-12-03 77dc40157d7ebff272f55055708cc8d2a1ae71ce

 _Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Method_EditEvent.def

@@ -36,6 +36,7 @@
    {
      pnlEventType.Visible( false );
    }
    ddlEventType.Data( sEvent.EventType() );
    // Open the dialog.
    this.Show( "modal" );
  *]