日历备忘修改

HZH_Controls/HZH_Controls/Controls/Step/UCStep.cs

@@ -131,7 +131,7 @@ namespace HZH_Controls.Controls
 			get { return m_steps; }
 			set
 			{
-				if (m_steps == null || m_steps.Length < 1)
+                if (value == null || value.Length < 1)
 					return;
 				m_steps = value;
 				Refresh();

HZH_Controls/Test/UC/UCTestCalendarNotes.Designer.cs

@@ -37,10 +37,10 @@
             this.ucCalendarNotes1.BackColor = System.Drawing.Color.White;
             this.ucCalendarNotes1.CurrentTime = new System.DateTime(2020, 8, 13, 0, 0, 0, 0);
             this.ucCalendarNotes1.DataSource = null;
-            this.ucCalendarNotes1.Location = new System.Drawing.Point(28, 43);
+            this.ucCalendarNotes1.Location = new System.Drawing.Point(28, 3);
             this.ucCalendarNotes1.Name = "ucCalendarNotes1";
             this.ucCalendarNotes1.SelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(77)))), ((int)(((byte)(59)))));
-            this.ucCalendarNotes1.Size = new System.Drawing.Size(441, 346);
+            this.ucCalendarNotes1.Size = new System.Drawing.Size(722, 422);
             this.ucCalendarNotes1.TabIndex = 2;
             this.ucCalendarNotes1.TipColor = System.Drawing.Color.Green;
             this.ucCalendarNotes1.ClickNote += new HZH_Controls.Controls.UCCalendarNotes.ClickNoteEvent(this.ucCalendarNotes1_ClickNote);

HZH_Controls/Test/UC/UCTestCalendarNotes.cs

@@ -94,6 +94,20 @@ namespace Test.UC
                         thisDt = thisDt.AddDays(7);
                     }
                 }
+                else if (item.LoopType == 3)
+                {
+                    DateTime thisDt = item.BeginDateTime;
+                    while (thisDt <= item.EndDateTime)
+                    {
+                        DateTime noteBeginTime = DateTime.Parse(thisDt.ToString("yyyy-MM-dd") + " " + item.LoopBeginTime.ToString("HH:mm:ss"));
+                        DateTime noteEndTime = noteBeginTime.Add(item.LoopDuration);
+                        if (noteBeginTime >= item.BeginDateTime && noteEndTime < item.EndDateTime)//是否在整个计划范围时间内
+                        {
+                            lst.Add(new NoteEntity() { Title = item.Title, Note = item.Msg, BeginTime = noteBeginTime, EndTime = noteEndTime, DataSource = item });
+                        }
+                        thisDt = thisDt.AddMonths(1);
+                    }
+                }
                 //月，年类似周
             }
 
@@ -103,6 +117,7 @@ namespace Test.UC
         private bool ucCalendarNotes1_ClickNote(NoteEntity note)
         {
             TestEntity entity = (TestEntity)note.DataSource;
+
             //对entity进行修改、删除操作
             entity.Title += "修改1次；";
             //加载数据
@@ -114,6 +129,7 @@ namespace Test.UC
             return true;
         }
    
+
         private void ucCalendarNotes1_AddClick(DateTime beginTime)
         {
             //弹出一个新增窗体，新增数据