update arg

xj qian

2024-06-26 da2dab05bfc057f9a31599710cf52fc523092055

update arg

 jrj/project/business/Customer3.maint.cpp

@@ -970,18 +970,13 @@
            
        if(value == L"人员")
        {
            xaserverarg& arg2 =* new xaserverarg;
            xaserverarg arg = GetArg();
            OpenWindow(L"dev:xpage[UserGroupPersonSelect.vx]", arg);
                
			
            xaserverarg& parg2 = *(xaserverarg*)GetParam();

            OpenWindow(L"dev:xpage[UserGroupPersonSelect.vx]", (LPARAM)&arg2);
			
            if(arg2.GetArgString(L"comdid")==L"xmOk")
            if(arg.GetArgString(L"comdid")==L"xmOk")
            {
                xstring data = arg2.GetArgString(L"data");
                xstring data = arg.GetArgString(L"data");
                xml x2;
				
                x2.loadXML(data);
                KXMLDOMNodeList nodes = x2.selectNodes(L"/root/item");
                trace(x2.xml());
@@ -1020,7 +1015,7 @@
        xstring value = hdr->data;
        int row = hdr->row;
        //alert(value);
        xaserverarg& arg=*new xaserverarg;
        xaserverarg arg;
                        
        
        if(value == L"附件上传")
@@ -1033,20 +1028,18 @@
            
            arg.AddArg(L"entityid",dw.GetGuid(dw.GetRow()));
            
            OpenWindow(L"dev:xpage[maint.Document.Customer.v3.vx]",(LPARAM)&arg);
            OpenWindow(L"dev:xpage[maint.Document.Customer.v3.vx]",arg);
            return 1;
        }
            
        if(value == L"人员")
        {
            xaserverarg& arg2 = *new xaserverarg;
            xaserverarg arg;
            OpenWindow(L"dev:xpage[UserGroupPersonSelectEx.vx]", arg);
            
            xaserverarg parg2 = *(xaserverarg*)GetParam();
            OpenWindow(L"dev:xpage[UserGroupPersonSelectEx.vx]", (LPARAM)&arg2);
			
            if(arg2.GetArgString(L"comdid")==L"xmOk")
            if(arg.GetArgString(L"comdid")==L"xmOk")
            {
                xstring data = arg2.GetArgString(L"data");
                xstring data = arg.GetArgString(L"data");
                xml x2;
                
                x2.loadXML(data);
@@ -1216,11 +1209,9 @@
        
        
        
        if (GetParam())
        if (GetWinParam())
        {
            xaserverarg& args = *(xaserverarg * )GetParam();
			

            xaserverarg args = GetArg();
            if (args.GetArgString(L"PartyID") != L"")
            {
                CustomerBase(m_EntityID);

 jrj/project/business/Quote3.maint.cpp

Binary files differ

 jrj/project/business/SO3.maint.cpp

@@ -1001,12 +1001,12 @@
        }*/
        xstring SONo;
        xstring CustomerID;
        xaserverarg* arg = 0;
        if (GetParam())
        xaserverarg arg;
        if (GetWinParam())
        {
            arg = (xaserverarg *)GetParam();
            SONo = arg->GetArgString(L"SONo");
            if (SONo == L"") SONo = arg->GetArgString(L"EntityNo");
            arg = GetArg();
            SONo = arg.GetArgString(L"SONo");
            if (SONo == L"") SONo = arg.GetArgString(L"EntityNo");
        }
        if (SONo != L"")
        {
@@ -1046,8 +1046,8 @@

            if (CustomerID != L"")
            {
                dw_base.ItemChangeTo(1, L"CustomerID", arg->GetArgString(L"CustomerID"));
                dw_base.SetItemDisplayString(1, L"CustomerID", arg->GetArgString(L"CustomerName"));
                dw_base.ItemChangeTo(1, L"CustomerID", arg.GetArgString(L"CustomerID"));
                dw_base.SetItemDisplayString(1, L"CustomerID", arg.GetArgString(L"CustomerName"));
                xstring dwname = L"dw_base";
                xstring colname = L"CustomerID";
                xstring value = CustomerID;
@@ -1065,9 +1065,9 @@
    {
        SetAgent();

        if (GetParam())
        if (GetWinParam())
        {
            xaserverarg& arg = *(xaserverarg * )GetParam();
            xaserverarg arg = GetArg();
            HCURSOR hCursor = xutil::SetCursorWait();
            xstring SONo = arg.GetArgString(L"SONo");
            if (SONo == L"") SONo = arg.GetArgString(L"EntityNo");

 jrj/project/vindexmenu.cpp

@@ -458,9 +458,9 @@

    int OnInitial()
    {            
        if(GetParam())
        if(GetWinParam())
        {
            xaserverarg& arg = *(xaserverarg*)GetParam();
            xaserverarg arg = GetArg();
            m_nHwnd = (HWND)arg.GetParam(L"hwnd");
            cbx_menu = (void*)arg.GetParam(L"memuId");
            cbx_tab = (void*)arg.GetParam(L"tabNo");
@@ -475,6 +475,8 @@
        
    int onload()
    {
        SetArg();

        m_bCanDestroy = 1;        
        
        tv_menu1 = GetControl(L"menu1");

 jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp

@@ -6,7 +6,9 @@
class xframe : public xwin
{
public:
    xframe(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
    xframe(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {
        this->SetArg(this->GetWinParam());
    }

    static int getUrl(string url1, string para, KXMLDOMDocument x)
    {

 jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp

@@ -147,14 +147,14 @@

    int getURLParam()
    {
        if (GetParam())
        if (GetWinParam())
        {
            xaserverarg* arg = (xaserverarg * )GetParam();
            xstring config = arg->GetArgString(L"config");
            xaserverarg arg = GetArg();
            xstring config = arg.GetArgString(L"config");
            KXMLDOMDocument x;
            if (config == L"")
            {
                string configXml = arg->GetArgString(L"configxml");
                string configXml = arg.GetArgString(L"configxml");
                if (configXml == L"") return 1;
                x.loadXML(configXml);
            }

 jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp

@@ -66,15 +66,17 @@

    int getURLParam()
    {
        if (GetWinParam())
        {
        //xpage xp = GetXPage();
        //xstring aurl = xp.GetWkUrl();
        xaserverarg* arg = (xaserverarg *)GetParam();
        m_EntityID = arg->GetArgString(L"EntityID");
        xstring config = arg->GetArgString(L"config");
            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");
                string configXml = arg.GetArgString(L"configxml");
            if (configXml == L"") return 1;
            x.loadXML(configXml);
        }
@@ -83,6 +85,7 @@
            getUrl(config, L"", x);
        }
        m_configDoc = x;
        }

        return 1;
    }

 jrj/xframe/wobject/xaserverarg.hpp

@@ -39,7 +39,7 @@
    xaserverarg(kxaserverarg* impl) :xnative(impl) {}
    xaserverarg():xnative(Hxsoft::XFrame::IXAServerArg::CreateInstance()){}
    xaserverarg(xaserverarg& rhs) {
        ((kxaserverarg*)rhs.getNativePointer())->AddRef_();
        if(rhs.GetKXAServerArg()) rhs.GetKXAServerArg()->AddRef_();
        this->setNativePointer(rhs.GetNativePtr());
    }
    xaserverarg(xaserverarg&& rhs) {
@@ -69,6 +69,11 @@
        return *this;
    }

    operator LPARAM()
    {
        return (LPARAM)this;
    }

public:
    /*int AddArg(string argname,double val,string typ=NULL)// alias "?AddArg@IXAServerArg@XFrame@Hxsoft@@QAEHPB_WNO@Z";
    {

 jrj/xframe/wobject/xwin.hpp

@@ -14,6 +14,22 @@
class xwin: public xview
{
public:
    xaserverarg m_xaserverarg;
public:
    xaserverarg& GetArg() { return m_xaserverarg; }
    void SetArg(LPARAM p)
    {
        m_xaserverarg = *(xaserverarg*)p;
    }
    void SetArg(xaserverarg & p)
    {
        m_xaserverarg = p;
    }
    void SetArg()
    {
        SetArg(GetWinParam());
    }
public:
    xwin(void * impl, HWND hWnd):xview(impl,hWnd){}
public:
    kwin* getKWin()
@@ -96,11 +112,11 @@
        return xnode(getKWin()->SetAgentNodeContent((knode*)node.getNativePointer(), (knode*)val.getNativePointer()));
    }

    LPARAM GetParam()
    LPARAM GetWinParam()
    {
        return (LPARAM)getKWin()->GetParam();
    }
    bool  SetParam(LPARAM pParam)
    bool  SetWinParam(LPARAM pParam)
    {
        return getKWin()->SetParam((void*)pParam);
    }