From e7d957fdf6716f44d32ffe0631e61e0eb4f13d45 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 05 十一月 2024 09:47:18 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
index 6a99b04..ea5b653 100644
--- a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
@@ -12,7 +12,7 @@
{
public:
KXMLDOMDocument m_configDoc;
- string m_EntityID;
+ xstring m_EntityID;
maint(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {
this->SetArg();
@@ -55,12 +55,12 @@
return L"";
}
- virtual string GetEntityRowData(int pr)
+ virtual xstring GetEntityRowData(LPARAM pr)
{
return GetEntityData(pr);
}
- virtual string GetEntityData(int /*param*/ pr)
+ virtual xstring GetEntityData(LPARAM pr)
{
//trace(L"zzz");
return L"";
@@ -154,8 +154,8 @@
//trace(L"maint:"+index.toString());
//alert(L"xq.xml = "+d.GetXml());
//trace(L"xxx");
- string dwname = L"";//e.selectsingleNode(L"@name").text();
- string tpy = L"dwgrid";
+ xstring dwname = L"";//e.selectsingleNode(L"@name").text();
+ xstring tpy = L"dwgrid";
if (e.selectSingleNode(L"@name")) dwname = e.selectSingleNode(L"@name").text();
if (e.selectSingleNode(L"@type")) tpy = e.selectSingleNode(L"@type").text();
if (tpy == L"dwgrid")
@@ -203,13 +203,13 @@
return 1;
}
- virtual int PreOnCmdDispatch(string comdid)
+ virtual int PreOnCmdDispatch(xstring comdid)
{
//返回0——不在执行以下代码；返回其他——执行以下代码。
return 1;
}
- virtual int PostOnCmdDispatch(string comdid)
+ virtual int PostOnCmdDispatch(xstring comdid)
{
return 1;
}
@@ -488,7 +488,7 @@
e = nlist.item(index);
//if(!e.selectSingleNode(L"@type")) continue;
//alert(e.xml);
- xstring xdwname = L"";//e.selectsingleNode(L"@name").text();
+ string xdwname = L"";//e.selectsingleNode(L"@name").text();
xstring xtpl = L"";//e.selectsingleNode(L"@url").text();
xstring xtpy = L"dwgrid";
if (e.selectSingleNode(L"@name")) xdwname = e.selectSingleNode(L"@name").text();
--
Gitblit v1.9.3