合并修改

UTS_Core/obj/Debug/UTS_Core.vbproj.CoreCompileInputs.cache

@@ -1 +1,5 @@
+<<<<<<< HEAD
 8992de695cb4747f2d61d8ca9c137991718f6aad703974b1d98d7b62777d4093
+=======
+123841b57461e4faf5bdd4496fa809c8ea3dfc46239271d30d61e3bd64bcde7d
+>>>>>>> e82bfaaf20ab8230c1840fbb0068ce2e7d5fd4ec

UTS_Core/obj/Debug/UTS_Core.xml

@@ -1513,53 +1513,48 @@ UTS_Core
  <param name="path"></param>
  <returns></returns>
 </member>
-<member name="M:UTS_Core.Undo.ICommand.Execute">
- <summary>
- 运行一条需要记录在撤销栈的命令
- </summary>
-</member>
-<member name="M:UTS_Core.Undo.ICommand.Redo">
+<member name="M:UTS_Core.ICommand.Redo">
  <summary>
  重做命令
  </summary>
 </member>
-<member name="M:UTS_Core.Undo.ICommand.Undo">
+<member name="M:UTS_Core.ICommand.Undo">
  <summary>
  撤销命令
  </summary>
 </member>
-<member name="M:UTS_Core.Undo.CommandManager.RunCommand(UTS_Core.Undo.ICommand)">
+<member name="M:UTS_Core.CommandManager.RunCommand(UTS_Core.ICommand)">
  <summary>
  运行命令，并将命令添加至撤销堆栈
  </summary>
  <param name="command"></param>
 </member>
-<member name="M:UTS_Core.Undo.CommandManager.AddUndoCommand(UTS_Core.Undo.ICommand)">
+<member name="M:UTS_Core.CommandManager.AddUndoCommand(UTS_Core.ICommand)">
  <summary>
  将命令添加至撤销堆栈
  </summary>
 </member>
-<member name="M:UTS_Core.Undo.CommandManager.ClearUndoCommands">
+<member name="M:UTS_Core.CommandManager.ClearUndoCommands">
  <summary>
  清空撤销命令堆栈
  </summary>
 </member>
-<member name="M:UTS_Core.Undo.CommandManager.ClearRedoCommands">
+<member name="M:UTS_Core.CommandManager.ClearRedoCommands">
  <summary>
  清空重做命令堆栈
  </summary>
 </member>
-<member name="M:UTS_Core.Undo.CommandManager.ClearCommands">
+<member name="M:UTS_Core.CommandManager.ClearCommands">
  <summary>
  清空撤销与重做命令堆栈
  </summary>
 </member>
-<member name="M:UTS_Core.Undo.CommandManager.Undo">
+<member name="M:UTS_Core.CommandManager.Undo">
  <summary>
  执行撤销命令
  </summary>
 </member>
-<member name="M:UTS_Core.Undo.CommandManager.Redo">
+<member name="M:UTS_Core.CommandManager.Redo">
  <summary>
  执行重做命令
  </summary>
@@ -6074,12 +6069,42 @@ UTS_Core
 <member name="P:UTS_Core.UTSModule.Station.StationPlan.ParentPacket">
  <summary>测试流程所关联的项目站包信息</summary>
 </member>
+<member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._grd">
+ <summary>表格控件对象</summary>
+</member>
+<member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._headNode">
+ <summary>表格树状目录起始节点</summary>
+</member>
+<member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._drawCol">
+ <summary>起始绘制列</summary>
+</member>
+<member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._drawStartRow">
+ <summary>起始绘制行</summary>
+</member>
+<member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._debugMode">
+ <summary>调试模式是否开启</summary>
+</member>
+<member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._showNodeIcon">
+ <summary>是否显示节点图标</summary>
+</member>
 <member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._uploading">
  <summary>处于更新表格状态中,不触发表格单元格修改事件</summary>
 </member>
 <member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._paramChar">
  <summary>多个参数间的分割符号</summary>
 </member>
+<member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._testCmdManager">
+ <summary>测试命令管理器</summary>
+</member>
+<member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._errCodeManager">
+ <summary>错误代码管理器</summary>
+</member>
+<member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._labelNames">
+ <summary>表格标签字段字典</summary>
+</member>
+<member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._recordNames">
+ <summary>表格记录名称字段字典</summary>
+</member>
 <member name="F:UTS_Core.UTSModule.Station.StationPlanGrid.ActiveNode">
  <summary>当前活动节点</summary>
 </member>
@@ -6089,11 +6114,8 @@ UTS_Core
 <member name="E:UTS_Core.UTSModule.Station.StationPlanGrid.RowNodeTextChanged">
  <summary>节点文本被修改事件</summary>
 </member>
-<member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._testCmdManager">
- <summary>测试命令管理器</summary>
-</member>
-<member name="F:UTS_Core.UTSModule.Station.StationPlanGrid._errCodeManager">
- <summary>错误代码管理器</summary>
+<member name="E:UTS_Core.UTSModule.Station.StationPlanGrid.PlanGridCommandChanged">
+ <summary>节点执行可撤销事件</summary>
 </member>
 <member name="P:UTS_Core.UTSModule.Station.StationPlanGrid.SkipEvent">
  <summary>
@@ -6101,11 +6123,6 @@ UTS_Core
  </summary>
  <returns></returns>
 </member>
-<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.GridUpdateEventTrigger(FlexCell.Grid)">
- <summary>
- 对第二行的Action执行一遍操作，以触发更新事件
- </summary>
-</member>
 <member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.BackwardNavigation">
  <summary>
  向后导航
@@ -6135,6 +6152,80 @@ UTS_Core
  
  </summary>
 </member>
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.IsExistLabelName(System.String)">
+ <summary>
+ 当前模块名是否已存在
+ </summary>
+ <param name="labelName"></param>
+ <returns></returns>
+</member>
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.IsExistRecordName(System.String)">
+ <summary>
+ 当前字段名
+ </summary>
+ <param name="recordName"></param>
+ <returns></returns>
+</member>
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.ClearLabelNames">
+ <summary>
+ 清空标签名称
+ </summary>
+</member>
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.ClearRecordNames">
+ <summary>
+ 清空记录名称
+ </summary>
+</member>
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.AddLabelName(System.String,System.Int32)">
+ <summary>
+ 添加标签名称
+ </summary>
+ <param name="labelName">标签名称</param>
+ <param name="row">行号</param>
+</member>
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.AddRecordName(System.String,System.Int32)">
+ <summary>
+ 添加记录名称
+ </summary>
+ <param name="recordName">记录名</param>
+ <param name="row">行号</param>
+</member>
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.RemoveLabelName(System.String)">
+ <summary>
+ 移出标签名称
+ </summary>
+ <param name="labelName">标签名称</param>
+</member>
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.RemoveRecordName(System.String)">
+ <summary>
+ 移出记录名称
+ </summary>
+ <param name="recordName">记录名称</param>
+</member>
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.GetLabelNameGridRow(System.String)">
+ <summary>
+ 获取标签名称行号
+ </summary>
+ <param name="labelName"></param>
+ <returns></returns>
+</member>
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.GetRecordNameGridRow(System.String)">
+ <summary>
+ 获取记录名称行号
+ </summary>
+ <param name="recordName"></param>
+ <returns></returns>
+</member>
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.ReflushLabelNames">
+ <summary>
+ 从表格中重载标签名称
+ </summary>
+</member>
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.ReflushRecordNames">
+ <summary>
+ 从表格中重载记录名称
+ </summary>
+</member>
 <member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.Grid_MouseLeave(System.Object,System.EventArgs)">
  <summary>
  光标离开grd表格时，黄色底色切换到选中行
@@ -6145,38 +6236,16 @@ UTS_Core
  光标进入grd表格时，原底色切换到选中行
  </summary>
 </member>
-<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.setRowTextForeColor(System.String,System.Boolean,UTS_Core.UTSModule.Station.RowNode.RowTypeEnum)">
- <summary>
- 根据CmdType 和 isAction 返回该行字体颜色
- </summary>
- <returns></returns>
-</member>
 <member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.Mouse_MoveOnNode_BackColorRepain(FlexCell.Grid,System.Int32,System.Int32,System.Drawing.Color)">
  <summary>
  鼠标移动到节点位置时所有子节点背景着色
  </summary>
 </member>
-<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.getRowActionEn(FlexCell.Grid,System.Int32)">
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.NodeRowTypeChanged(UTS_Core.UTSModule.Station.RowNode)">
  <summary>
- FixModule节点Action变化时子节点字体重新着色
+ 节点类型变更，修改节点行样式
  </summary>
- 
-</member>
-<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.NodeAction_Change(FlexCell.Grid,System.Int32,System.Int32,System.Boolean)">
- <summary>
- FixModule节点Action变化时子节点字体重新着色
- </summary>
-</member>
-<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.Grid_Repain_By_ActionEn(FlexCell.Grid)">
- <summary>
- 根据总表状态对单元格字体重新着色
- </summary>
-</member>
-<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.UpdateGridInfo(FlexCell.Grid)">
- <summary>
- 遍历表格，并更新到全局数组
- </summary>
- 
+ <param name="node"></param>
 </member>
 <member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.NodeActionChanged(UTS_Core.UTSModule.Station.RowNode)">
  <summary>
@@ -6195,16 +6264,6 @@ UTS_Core
  选定行使能或清除Action选项
  </summary>
 </member>
-<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.Call_UpdateGridActionInfo">
- <summary>
- 更新表格内容到缓存，但是并不重新着色
- </summary>
-</member>
-<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.UpdateGridActionInfo(FlexCell.Grid)">
- <summary>
- 更新ActionEn信息
- </summary>
-</member>
 <member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.Grid_MouseMove(System.Object,System.Windows.Forms.MouseEventArgs)">
  <summary>
  光标移动时，所在行底色高亮
@@ -6251,6 +6310,12 @@ UTS_Core
  初始化测试站表格
  </summary>
 </member>
+<member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.UpdateGrid">
+ <summary>
+ 加载测试文件后更新表格
+ </summary>
+ <remarks></remarks>
+</member>
 <member name="M:UTS_Core.UTSModule.Station.StationPlanGrid.ExpandRows(UTS_Core.UTSModule.Station.RowNode)">
  <summary>
  展开行节点