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 | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
index a2d59af..ea5b653 100644
--- a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
@@ -12,9 +12,11 @@
{
public:
KXMLDOMDocument m_configDoc;
- string m_EntityID;
+ xstring m_EntityID;
- maint(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {}
+ maint(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {
+ this->SetArg();
+ }
xstring GetEntityWorkNode(LPARAM pr, xstring what)
{
if (m_configDoc)
@@ -53,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"";
@@ -66,23 +68,26 @@
int getURLParam()
{
- //xpage xp = GetXPage();
- //xstring aurl = xp.GetWkUrl();
- xaserverarg* arg = (xaserverarg *)GetParam();
- m_EntityID = arg->GetArgString(L"EntityID");
- xstring config = arg->GetArgString(L"config");
- KXMLDOMDocument x;
- if (config == L"")
+ if (GetWinParam())
{
- string configXml = arg->GetArgString(L"configxml");
- if (configXml == L"") return 1;
- x.loadXML(configXml);
+ //xpage xp = GetXPage();
+ //xstring aurl = xp.GetWkUrl();
+ xaserverarg arg = GetArg();
+ m_EntityID = arg.GetArgString(L"EntityID");
+ xstring config = arg.GetArgString(L"config");
+ KXMLDOMDocument x;
+ if (config == L"")
+ {
+ string configXml = arg.GetArgString(L"configxml");
+ if (configXml == L"") return 1;
+ x.loadXML(configXml);
+ }
+ else
+ {
+ getUrl(config, L"", x);
+ }
+ m_configDoc = x;
}
- else
- {
- getUrl(config, L"", x);
- }
- m_configDoc = x;
return 1;
}
@@ -149,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")
@@ -198,20 +203,20 @@
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;
}
int OnPrint()
{
- xaserverarg* arg;
+ xaserverarg* arg = new xaserverarg;
arg->AddArg(L"EntityName", GetEntityName(1), L"");
arg->AddArg(L"EntityID", GetEntityID(1), L"");
openUrl(L"/sale/view/view.base/xpage/Template/PrintView", arg);
@@ -483,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