From 9a2d8c993779b096665daf199fc26169fc8a2ad1 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 01 七月 2024 14:57:42 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
index 899c8d3..7d3007d 100644
--- a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
@@ -18,7 +18,9 @@
int m_pageNumber;
listEx* m_listEx;
- listwin(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd){}
+ listwin(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd){
+ this->SetArg();
+ }
xstring GetEntityWorkNode(/*param*/LPARAM pr, xstring what)
{
@@ -147,14 +149,14 @@
int getURLParam()
{
- if (GetParam())
+ if (GetWinParam())
{
- xaserverarg* arg = (xaserverarg * )GetParam();
- xstring config = arg->GetArgString(L"config");
+ xaserverarg arg = GetArg();
+ xstring config = arg.GetArgString(L"config");
KXMLDOMDocument x;
if (config == L"")
{
- string configXml = arg->GetArgString(L"configxml");
+ string configXml = arg.GetArgString(L"configxml");
if (configXml == L"") return 1;
x.loadXML(configXml);
}
@@ -404,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;
@@ -766,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