From e05f7cc8755eb7f5525e6bf86a7e5454a0c91fd0 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 23 十月 2024 18:07:24 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SystemSettings/FlowTermSelect.cpp | 128 +++++++++++++++++++++++-------------------
1 files changed, 70 insertions(+), 58 deletions(-)
diff --git a/jrj/project/business/SystemSettings/FlowTermSelect.cpp b/jrj/project/business/SystemSettings/FlowTermSelect.cpp
index 29f7b09..fc62b88 100644
--- a/jrj/project/business/SystemSettings/FlowTermSelect.cpp
+++ b/jrj/project/business/SystemSettings/FlowTermSelect.cpp
@@ -1,70 +1,84 @@
-use "xcontrol.vframe.vbusiness.vd"
-use "xbase.vframe.vbusiness.vd"
+#include <wobject/xstring.hpp>
+#include <xcontrol/xtreeview.hpp>
+#include <xcontrol/xdwgrid.hpp>
+#include <wobject/xdouble.hpp>
+#include <xcontrol/xlayersheet.hpp>
+#include <xcontrol/xdatetimepick.hpp>
-unit trade
-[
- class FlowTermSelect : public xframe
+
+#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
+#include "viewobject/view.base.hpp"
+
+using xml = KXMLDOMDocument;
+ class __declspec(dllexport) FlowTermSelect : public xframe
{
+ public:
xdwgrid dw_list;
- string stype;
- string sdata;
- string flowid;
- string datacolumn;
- string displaycolumn;
+ xstring stype;
+ xstring sdata;
+ xstring flowid;
+ xstring datacolumn;
+ xstring displaycolumn;
xnode m_agentNode; //Agent Condition
-
+ public:
+ FlowTermSelect(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {}
+ public:
+ static FlowTermSelect* CreateInstance(void* implPtr, void* hWnd)
+ {
+ FlowTermSelect* pWin = new FlowTermSelect(implPtr, (HWND)hWnd);
+ return pWin;
+ }
int SetAgent()
{
- string xfNodeAgentArea = "agentarea";
+ xstring xfNodeAgentArea = L"agentarea";
xnode anode = GetAgentNode(xfNodeAgentArea);
if(m_agentNode)
{
- SetAgentNodeContent (anode,m_agentNode);
+ SetAgentNode (anode,m_agentNode);
}
else
{
- msxml::IXMLDOMElement xframeElement = GetElement();
- msxml::IXMLDOMElement agent = xframeElement.selectSingleNode("agent/"+xfNodeAgentArea+"[1]/*");
+ KXMLDOMElement xframeElement = GetElement();
+ KXMLDOMElement agent = xframeElement.selectSingleNode(L"agent/"+xfNodeAgentArea+L"[1]/*");
if(agent)
{
- string s = agent.xml;
- m_agentNode = SetAgentNodeContent (anode,s);
+ xstring s = agent.xml();
+ m_agentNode = SetAgentNode (anode,s);
}
}
return 1;
}
//焦点激活处理函数
- int OnSetFocus(ref TEvent evt,int param)
+ int OnSetFocus(TEvent* evt, LPARAM param)
{
//重置工具条
//SetAgent();
return 1;
}
- int OnOK(string comdid)
+ int OnOK(xstring comdid)
{
- xaserverarg arg = new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
- arg = GetParam();
- arg.AddArg("comdid",comdid);
+ xaserverarg arg = GetArg();
+
+ arg.AddArg(L"comdid",comdid);
int row = dw_list.GetNextSelectRow(1);
if(row < 1 && dw_list.GetRowCount()==1) row = 1;
if (row<1)
{
- alert("请选择项!");
+ alert(L"请选择项!");
return 1;
}
while (row>0)
{
- msxml::IXMLDOMElement e = dw_list.GetRowElement(row);
- string data = e.selectSingleNode(datacolumn).text+"";
- string display = e.selectSingleNode(displaycolumn).text+"";
- arg.AddArg("data",data);
- arg.AddArg("display",display);
+ KXMLDOMElement e = dw_list.GetRowElement(row);
+ xstring data = e.selectSingleNode(datacolumn).text()+(xstring)L"";
+ xstring display = e.selectSingleNode(displaycolumn).text()+ (xstring)L"";
+ arg.AddArg(L"data",data);
+ arg.AddArg(L"display",display);
row = dw_list.GetNextSelectRow(row + 1);
}
CloseWindow();
@@ -72,14 +86,14 @@
}
//命令发布函数
- int OnCmdDispatch(string comdid)
+ int OnCmdDispatch(xstring comdid)
{
- if (comdid=="xmOk")
+ if (comdid==L"xmOk")
{
OnOK(comdid);
return 1;
}
- else if (comdid=="xmCancel")
+ else if (comdid==L"xmCancel")
{
CloseWindow();
return 1;
@@ -88,33 +102,32 @@
}
//命令处理事件
- int OnXCommand(ref TXCommandEvent evt,int param)
+ int OnXCommand(TEvent* evt, LPARAM param)
{
- return OnCmdDispatch(evt.pStrID);
+ return OnCmdDispatch(evt->xcommand.pStrID);
}
int OnAttachEvent()
{
//绑定工具条点击事件
- AttachEvent("WM_XCOMMAND",OnXCommand);
+ AttachEvent(L"WM_XCOMMAND", (FEvent)&FlowTermSelect::OnXCommand);
//获取焦点事件，用于重置工具条
- AttachEvent("WM_SETFOCUS",OnSetFocus);
+ AttachEvent(L"WM_SETFOCUS", (FEvent)&FlowTermSelect::OnSetFocus);
+ return 1;
}
int OnRetrieve()
{
- xml x = new xml;
- x.setNativePointer(xml::CreateInstance());
- xaserverarg arg = new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xml x;
+ xaserverarg arg;
- arg.AddArg("stype",stype);
- arg.AddArg("sdata",sdata);
- arg.AddArg("flowID",flowid);
+ arg.AddArg(L"stype",stype);
+ arg.AddArg(L"sdata",sdata);
+ arg.AddArg(L"flowID",flowid);
- if (getUrl("/sale/data/Flow3/retrieve/flowex",arg.GetString(),x)!=1)
+ if (getUrl(L"/sale/data/Flow3/retrieve/flowex",arg.GetString(),x)!=1)
{
- trace(x.GetXmlDoc().text);
+ trace(x.text());
return -1;
}else
{
@@ -127,20 +140,20 @@
int onload()
{
-
- dw_list = GetControl("dw_list");
- //dw_list.openUrl("xxx");
- if(GetParam())
+ SetArg();
+ dw_list = GetControl(L"dw_list");
+ //dw_list.openUrl(L"xxx");
+ if(GetWinParam())
{
- xaserverarg arg = GetParam();
- stype = arg.GetArgString("stype");
- sdata = arg.GetArgString("sdata");
- flowid = arg.GetArgString("flowid");
+ xaserverarg arg = GetArg();
+ stype = arg.GetArgString(L"stype");
+ sdata = arg.GetArgString(L"sdata");
+ flowid = arg.GetArgString(L"flowid");
- datacolumn = arg.GetArgString("datacolumn");
- displaycolumn = arg.GetArgString("displaycolumn");
+ datacolumn = arg.GetArgString(L"datacolumn");
+ displaycolumn = arg.GetArgString(L"displaycolumn");
- string dwname = arg.GetArgString("dwname");
+ xstring dwname = arg.GetArgString(L"dwname");
dw_list.openUrl(dwname);
OnRetrieve();
dw_list.SetSelectionMode(1);
@@ -157,5 +170,4 @@
return 1;
}
- };
-]
\ No newline at end of file
+ };
\ No newline at end of file
--
Gitblit v1.9.3