From eb39d3d2ca26581f9f0254acd0b1f5d56c9869a8 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 23 七月 2024 11:19:29 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
index 18eb1d6..f0f46b6 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)
@@ -152,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")
@@ -486,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