From 9b3b2eb20b09e13da837a28f16e552ba70a090c4 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 24 四月 2025 14:48:21 +0800
Subject: [PATCH] update
---
jrj/project/start.vframe.vbusiness.cpp | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/jrj/project/start.vframe.vbusiness.cpp b/jrj/project/start.vframe.vbusiness.cpp
index 87c8560..5a7ef99 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);
@@ -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")
{
@@ -900,7 +899,6 @@
trace((xstring)L"\r\n====113======L" + ele.xml());
dw_list.SetRow(row);
if (GetEntityID(1) == L"") return -1;
- xframe::SetAgent((xstring)L"letter", GetEntityID(1));
//trace(ele.xml);
xaserverarg arg;
@@ -914,7 +912,7 @@
return 0;
}
//trace(L"----1111----");
- if (doc.xml() == L"")
+ if ((xstring)doc.xml() == L"")
return -1;
//trace(doc.xml());
@@ -922,6 +920,9 @@
xshtml ht = GetControl(L"taskinfo");
ht.SetContent(doc.xml());
ht.Redraw();
+
+ //xframe::SetAgent((xstring)L"letter", GetEntityID(1));
+
return 1;
}
@@ -935,8 +936,14 @@
trace(L"\r\n-------" + (xstring)row);
- ShowDetail(row);
- SetAgent();
+ if (ShowDetail(row) != 1)
+ {
+ xstring xfNodeAgentArea = L"agentarea";
+ xnode anode = GetAgentNode(xfNodeAgentArea);
+ this->SetAgentNode(anode, L"<vbox/>");
+ }
+ else
+ SetAgent();
return 1;
}
@@ -947,8 +954,14 @@
int row = hdr.row;
if (row<0 || row>dw_list.GetRowCount()) return 0;
trace(L"\r\n-----222------");
- ShowDetail(row);
- SetAgent();
+ if (ShowDetail(row) != 1)
+ {
+ xstring xfNodeAgentArea = L"agentarea";
+ xnode anode = GetAgentNode(xfNodeAgentArea);
+ this->SetAgentNode(anode, L"<vbox/>");
+ }
+ else
+ SetAgent();
return 1;
}
@@ -957,7 +970,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