|
|
@ -1581,18 +1581,22 @@ CString CRecipeMgr::RecipeCtrlExcute(CRecipeCtrlItem &CtrlItem)
|
|
|
|
if(RecipeCtrlType==_RecipeCtrl_AddGroup
|
|
|
|
if(RecipeCtrlType==_RecipeCtrl_AddGroup
|
|
|
|
||RecipeCtrlType==_RecipeCtrl_GroupName
|
|
|
|
||RecipeCtrlType==_RecipeCtrl_GroupName
|
|
|
|
||RecipeCtrlType==_RecipeCtrl_RecipeName
|
|
|
|
||RecipeCtrlType==_RecipeCtrl_RecipeName
|
|
|
|
||RecipeCtrlType==_RecipeCtrl_AddRecipe)
|
|
|
|
||RecipeCtrlType==_RecipeCtrl_AddRecipe
|
|
|
|
|
|
|
|
|| RecipeCtrlType == _RecipeCtrl_CopyRecipe)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(EditName2.Find('.',0)!= -1)
|
|
|
|
if(EditName2=="")
|
|
|
|
{
|
|
|
|
|
|
|
|
ErrMsg = "不能有小数点!";
|
|
|
|
|
|
|
|
return ErrMsg;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(EditName2=="")
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ErrMsg = "输入不能为空!";
|
|
|
|
ErrMsg = "输入不能为空!";
|
|
|
|
return ErrMsg;
|
|
|
|
return ErrMsg;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
ErrMsg = CheckInvalidChar(EditName2);
|
|
|
|
|
|
|
|
if (!ErrMsg.IsEmpty())
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return ErrMsg;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
switch(RecipeCtrlType)
|
|
|
|
switch(RecipeCtrlType)
|
|
|
@ -2526,4 +2530,39 @@ CString CRecipeMgr::GetShowParText(int Row)
|
|
|
|
return str;
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
CString CRecipeMgr::CheckInvalidChar(CString Str)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
CString RetStr = "";
|
|
|
|
|
|
|
|
int Len = Str.GetLength();
|
|
|
|
|
|
|
|
const char* CheckCh = (LPCTSTR)Str;
|
|
|
|
|
|
|
|
char ch;
|
|
|
|
|
|
|
|
for (int i = 0; i<Len; i++)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
ch = *(CheckCh + i);
|
|
|
|
|
|
|
|
if ((ch >= 'a' && ch <= 'z')
|
|
|
|
|
|
|
|
|| (ch >= 'A' && ch <= 'Z')
|
|
|
|
|
|
|
|
|| ('%'==ch )
|
|
|
|
|
|
|
|
|| (ch >= '0' && ch <= '9')
|
|
|
|
|
|
|
|
|| ('_' == ch)
|
|
|
|
|
|
|
|
|| ('.' == ch&&i!=0&&i!= Len-1))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if ('.' == ch)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
RetStr = "'.'不能位于首尾!";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
RetStr = "含无效字符!(有效字符含字母大小写、数字、小数点、下划线、百分号)";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return RetStr;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|