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/listwin.vframe.vbusiness.hpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
index cb39487..9f7ec17 100644
--- a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
@@ -41,7 +41,7 @@
return L"";
}
- string GetEntityIDName(/*param*/int pr)
+ xstring GetEntityIDName(/*param*/LPARAM pr)
{
if (m_configDoc)
{
@@ -286,8 +286,8 @@
else
{
KXMLDOMElement ele = dw_list.GetRowElement(row);
- string id = GetEntityIDName(1);
- string entity = ele.selectSingleNode(id).text();
+ xstring id = GetEntityIDName(1);
+ xstring entity = ele.selectSingleNode(id).text();
//alert(ele.xml);
SetAgent(L"list", entity);
}
@@ -406,13 +406,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)
{
// trace("test");
return 1;
@@ -768,7 +768,7 @@
KXMLDOMElement e = n;
//trace("m_configDoc//list/dwview[@type='dwgrid'][1]="+e.xml);
xstring vface = m_configDoc.selectSingleNode(L"//vface[1]").text();
- xstring dwname = L"";//e.selectsingleNode("@name").text;
+ string dwname = L"";//e.selectsingleNode("@name").text;
xstring tpl = GetTemplateUrl();//e.selectsingleNode("@url").text;
xstring selectmode = L"4";
if (e.selectSingleNode(L"@name")) dwname = e.selectSingleNode(L"@name").text();
--
Gitblit v1.9.3