提交版本信息。

xiaoweihan · Jun 19, 2017 · 86dd38e · 86dd38e
1 parent e22f806
commit 86dd38e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/Src/Edislab/Edislab Pro/DlgDataGroupProperty.cpp b/Src/Edislab/Edislab Pro/DlgDataGroupProperty.cpp
@@ -82,6 +82,13 @@ void CDlgDataGroupProperty::OnBnClickedBtnOk()
 			return;
 		}
 
+		//如果尚未做某种改变
+		if (strGroupName == m_strGroupName)
+		{
+			OnOK();
+			return;
+		}
+
 		if (CGridColumnGroupManager::CreateInstance().IsHeaderNameExist(strGroupName))
 		{
 			Utility::AfxBCGPMessageBox(_T("该数据组已经存在,请输入另外一个名字!"),MB_OK | MB_ICONERROR);
@@ -104,3 +111,19 @@ CString CDlgDataGroupProperty::GetGroupName(void)
 {
 	return m_strGroupName;
 }
+
+
+BOOL CDlgDataGroupProperty::PreTranslateMessage(MSG* pMsg)
+{
+	// TODO: 在此添加专用代码和/或调用基类
+
+	if (WM_KEYDOWN == pMsg->message)
+	{
+		if (VK_RETURN == pMsg->wParam)
+		{
+			OnBnClickedBtnOk();
+			return TRUE;
+		}
+	}
+	return CBaseDialog::PreTranslateMessage(pMsg);
+}
diff --git a/Src/Edislab/Edislab Pro/DlgDataGroupProperty.h b/Src/Edislab/Edislab Pro/DlgDataGroupProperty.h
@@ -30,4 +30,5 @@ class CDlgDataGroupProperty : public CBaseDialog
 	afx_msg void OnBnClickedBtnCancel();
 
 	CString GetGroupName(void);
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
 };
diff --git a/Src/Edislab/Edislab Pro/Edislab Pro.rc b/Src/Edislab/Edislab Pro/Edislab Pro.rc
diff --git a/Src/Edislab/Edislab Pro/resource.h b/Src/Edislab/Edislab Pro/resource.h