From 2f2eb9a7c4e99e663c82d156bf5af7ecdbc8fa39 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 02 九月 2024 18:02:52 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
index fb87ba0..9b6f92d 100644
--- a/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
@@ -6,7 +6,9 @@
class xframe : public xwin
{
public:
- xframe(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
+ xframe(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {
+
+ }
static int getUrl(string url1, string para, KXMLDOMDocument x)
{
@@ -124,7 +126,7 @@
xstring comdid = arg.GetArgString(L"comdid");
if (comdid ==L"xmOK")
{
- string value = arg.GetArgString(L"content");
+ xstring value = arg.GetArgString(L"content");
return value;
}
return L"";
@@ -335,7 +337,7 @@
}
}
//更新要求
- if (execResult & 0xf)
+ if (execResult)
{
nlist = x.selectNodes(L"//view/update");
nlen = nlist.length();
@@ -382,7 +384,7 @@
return 1;
}
- virtual string GetTaskID()
+ virtual xstring GetTaskID()
{
return L"";
}
@@ -481,13 +483,13 @@
if (content ==L"") return 1;
if (content.find(L"update.modify", 0) > 0 || content.find(L"update.delete", 0) > 0)
{
- int MB_YESNOCANCEL = 3;
- int IDYES = 6;
- int IDNO = 7;
- int IDCANCEL = 2;
- int re = MessageBoxW(GetHWND(),L"数据已经修改，是否保存?",L"提示:", MB_YESNOCANCEL);
- if (re == IDCANCEL) return -1;
- if (re == IDNO) return 1;
+ int MB_YESNOCANCEL_ = 3;
+ int IDYES_ = 6;
+ int IDNO_ = 7;
+ int IDCANCEL_ = 2;
+ int re = MessageBoxW(GetHWND(),L"数据已经修改，是否保存?",L"提示:", MB_YESNOCANCEL_);
+ if (re == IDCANCEL_) return -1;
+ if (re == IDNO_) return 1;
if (DoUpdate(false) == 1) return 1;
return -1;
}
--
Gitblit v1.9.3