|
@@ -152,7 +152,7 @@ namespace OTSIncAReportApp
|
|
treeView1.SelectedNode = e.Node; //当前被选中
|
|
treeView1.SelectedNode = e.Node; //当前被选中
|
|
|
|
|
|
treeView1.Refresh();
|
|
treeView1.Refresh();
|
|
-
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -256,11 +256,13 @@ namespace OTSIncAReportApp
|
|
checkednode = "";
|
|
checkednode = "";
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
- //插入多数据源选项
|
|
|
|
- m_ReportApp.MoreSource = checkednode;
|
|
|
|
- m_ConditionChoose.SetDefaultConditionValue();
|
|
|
|
- m_ConditionChoose.DisCurrentPicProperty();//刷新
|
|
|
|
|
|
+ if (treeView1.Nodes.Count>1&&e.Button == MouseButtons.Left)//判断按下鼠标右键
|
|
|
|
+ {
|
|
|
|
+ //插入多数据源选项
|
|
|
|
+ m_ReportApp.MoreSource = checkednode;
|
|
|
|
+ m_ConditionChoose.SetDefaultConditionValue();
|
|
|
|
+ m_ConditionChoose.DisCurrentPicProperty();//刷新
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
if (e.Button == MouseButtons.Right)//判断按下鼠标右键
|
|
if (e.Button == MouseButtons.Right)//判断按下鼠标右键
|
|
@@ -670,7 +672,7 @@ namespace OTSIncAReportApp
|
|
|
|
|
|
CIncAFileMgr pDBFileMgr = new CIncAFileMgr(dbfile);
|
|
CIncAFileMgr pDBFileMgr = new CIncAFileMgr(dbfile);
|
|
var mergedpartdb = pDBFileMgr.GetMergedParticleDB();
|
|
var mergedpartdb = pDBFileMgr.GetMergedParticleDB();
|
|
-
|
|
|
|
|
|
+ mergedpartdb.RemoveAllRows();
|
|
|
|
|
|
foreach (COTSParticleClr part in mergedParts)
|
|
foreach (COTSParticleClr part in mergedParts)
|
|
{
|
|
{
|