From ae5fd37fc3cfdf60ad385211460e9d39ee53e5ba Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 14 十一月 2024 15:31:50 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/start.vframe.vbusiness.cpp | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/jrj/project/start.vframe.vbusiness.cpp b/jrj/project/start.vframe.vbusiness.cpp
index f43f0a7..f42bbb6 100644
--- a/jrj/project/start.vframe.vbusiness.cpp
+++ b/jrj/project/start.vframe.vbusiness.cpp
@@ -35,7 +35,7 @@
dw_list.Retrieve(doc);
dw_list.CreateTree((LPCWSTR)L"node()", 1, 15, 16);
-
+ dw_list.Redraw();
/*
dw_list.Redraw();
dw_list.SetReadOnly(true);
@@ -53,8 +53,8 @@
int nRow = dw_list.GetRow();
if (nRow < 0) return L"";
KXMLDOMElement ele = dw_list.GetRowElement(nRow);
- xstring x = ele.getAttribute(L"category");
- return x;
+ if (!ele) return L"";
+ return ele.getAttribute(L"category");
}
xstring GetEntityID(LPARAM pr)
@@ -123,8 +123,7 @@
{
//return frame::GetReason(pr);
arg.AddArg(L"EntityID", GetEntityID(2));
- arg.AddArg(L"_ModuelPage", L"dev:xpage[workflow.chkdlg.vx]");
- OpenWindow(L"dev:xpage[vindexforold.vx]", arg);
+ OpenWindow(L"dev:xpage[workflow.chkdlg.vx]", arg);
//openUrl(L"/sale/view/workflow.view/xpage/chkdlg", arg);
xstring comdid2 = arg.GetArgString(L"comdid");
if (comdid2 == L"xmOK")
@@ -199,7 +198,7 @@
{
xq = xq.replace(L"dev:xpage[", L"");
xq = xq.replace(L"]", L"");
- xaserverarg args;
+ xaserverarg& args = *(xaserverarg*)para;
args.AddArg(L"_ModuelPage", xq);
//alert(args.GetString());
OpenWindow(L"dev:xpage[vindexforold.vx]", args);
@@ -208,7 +207,7 @@
}
else
{
- xaserverarg arg;
+ xaserverarg& arg = *(xaserverarg*)para;
n = doc.selectSingleNode(L"//resource[@vface!='' and @view!='']");
if (n)
{
@@ -258,7 +257,7 @@
return 1;
}
- int pr = pr1;
+ LPARAM pr = pr1;
xstring action = comdid.mid(comdid.find(L"action:", 0) + 7, 9999);
if (action == L"bill.delete" || action == L"bill.deleteEx")
{
@@ -482,7 +481,7 @@
return 1;
}
- int pr = pr1;
+ LPARAM pr = pr1;
xstring action = comdid.mid(comdid.find(L"action:",0)+7,9999);
if(action == L"bill.delete" || action == L"bill.deleteEx")
{
@@ -914,7 +913,7 @@
return 0;
}
//trace(L"----1111----");
- if (doc.xml() == L"")
+ if ((xstring)doc.xml() == L"")
return -1;
//trace(doc.xml());
@@ -957,7 +956,7 @@
{
//alert(L"xxxxxxxxxxx");
//SetAgent();
- AttachEvent(L"WM_SETFOCUS", (FEvent)&startvframevbusiness::OnSetFocus);
+ //AttachEvent(L"WM_SETFOCUS", (FEvent)&startvframevbusiness::OnSetFocus);
//绑定工具条点击事件
AttachEvent(L"WM_XCOMMAND", (FEvent)&startvframevbusiness::OnXCommand);
//AttachEvent(L"WM_TIMER",OnTimer);
--
Gitblit v1.9.3