item

xj qian

2024-07-11 6e9569f0f27eeadb24f1dfd808fa9d53a74a395f

item

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -127,7 +127,7 @@
      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <EnableUAC>false</EnableUAC>
      <AdditionalDependencies>xarch.shape.lib;xarch.base.lib;xarch.util.lib;xarch.network.lib;xarch.xframe.lib;xarch.xcontrol.lib;xoffice.xcell.lib;xoffice.xgrid.lib;xoffice.xreport.lib;xoffice.frame.lib;shlwapi.lib;xoffice.xflow.lib;comsuppw.lib;%(AdditionalDependencies);$(CoreLibraryDependencies)</AdditionalDependencies>
      <AdditionalDependencies>xarch.shape.lib;xarch.base.lib;xarch.util.lib;xarch.network.lib;xarch.xframe.lib;xarch.xcontrol.lib;xoffice.xcell.lib;xoffice.xgrid.lib;xoffice.xreport.lib;xoffice.frame.lib;shlwapi.lib;xoffice.xflow.lib;comsuppw.lib;tsclib.lib;%(AdditionalDependencies);$(CoreLibraryDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>D:\xclient64</AdditionalLibraryDirectories>
    </Link>
    <PostBuildEvent>
@@ -521,7 +521,7 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\OutstoreSample3Win.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\SampleBarcodePrint.cpp" />
    <ClCompile Include="..\project\business\Public\GroupManagerList.cpp">
@@ -680,7 +680,7 @@
    </ClCompile>
    <ClCompile Include="..\project\start.vframe.vbusiness.cpp" />
    <ClCompile Include="..\project\total3\ViewTotalArgWin.cpp" />
    <ClCompile Include="..\project\total3\ViewTotalWin.cpp" />
    <ClCompile Include="..\project\total3\ViewExTotalWin.cpp" />
    <ClCompile Include="..\project\tradedocument\DocFileSaveDlg.cpp" />
    <ClCompile Include="..\project\tradedocument\DocSelectDlg.cpp" />
    <ClCompile Include="..\project\tradedocument\HelpDocWin.cpp" />

 jrj/ext-jrj/ext-jrj.vcxproj.filters

@@ -668,7 +668,7 @@
    <ClCompile Include="..\project\analysis\DataVanalysisWin.cpp">
      <Filter>vbusiness\analysis</Filter>
    </ClCompile>
    <ClCompile Include="..\project\total3\ViewTotalWin.cpp">
    <ClCompile Include="..\project\total3\ViewExTotalWin.cpp">
      <Filter>vbusiness\total</Filter>
    </ClCompile>
    <ClCompile Include="..\project\tradedocument\DocFileSaveDlg.cpp">

 jrj/project/business/PO/Habit.PO.cpp

Binary files differ

 jrj/project/business/PO/Maint.PaperCard.PO.cpp

Binary files differ

 jrj/project/total3/ViewExTotalWin.cpp

ÎļþÃû´Ó jrj/project/total3/ViewTotalWin.cpp ÐÞ¸Ä
@@ -11,15 +11,14 @@


using xml = KXMLDOMDocument;
class __declspec(dllexport) ViewTotalWin : public xwin
class __declspec(dllexport) ViewExTotalWin : public xwin
{
public:
    ViewTotalWin(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
    ViewExTotalWin(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
public:
    static ViewTotalWin* CreateInstance(void* implPtr, void* hWnd)
    static ViewExTotalWin* CreateInstance(void* implPtr, void* hWnd)
    {
        ViewTotalWin* pWin = new ViewTotalWin(implPtr, (HWND)hWnd);
        return pWin;
        return new ViewExTotalWin(implPtr, (HWND)hWnd);
    }
public:
    xdwgrid    dw_list;
@@ -137,7 +136,7 @@
                if (argUrl != L"")
                {
                    xaserverarg ar ;
                    ar.setNativePointer(ar.CreateInstance());
                    //ar.setNativePointer(ar.CreateInstance());
                    ar.AddArg(L"argurl", argUrl);
                    if (argStr != L"")
                        ar.AddArg(L"arg", argStr);
@@ -386,13 +385,13 @@
    int OnAttachEvent()
    {
        //绑定工具条点击事件
        AttachEvent(L"WM_XCOMMAND", (FEvent)&ViewTotalWin::OnXCommand);
        AttachEvent(L"WM_XCOMMAND", (FEvent)&ViewExTotalWin::OnXCommand);
        //获取焦点事件，用于重置工具条
        AttachEvent(L"WM_SETFOCUS", (FEvent)&ViewTotalWin::OnSetFocus);
        AttachEvent(L"cb_report", L"CBN_SELCHANGE", (FEvent)&ViewTotalWin::OnCombboChanged);
        AttachEvent(L"dw_report", L"DWV_CLICKED", (FEvent)&ViewTotalWin::OnDWClick);
        AttachEvent(L"dw_report", L"DWV_ROWFOCUSCHANGED", (FEvent)&ViewTotalWin::OnRowChanged);//绑定行更改触发事件OnRowChanged
        AttachEvent(L"dw_report", xstring(0x400 + 81), (FEvent)&ViewTotalWin::OnRetrieveFinished);
        AttachEvent(L"WM_SETFOCUS", (FEvent)&ViewExTotalWin::OnSetFocus);
        AttachEvent(L"cb_report", L"CBN_SELCHANGE", (FEvent)&ViewExTotalWin::OnCombboChanged);
        AttachEvent(L"dw_report", L"DWV_CLICKED", (FEvent)&ViewExTotalWin::OnDWClick);
        AttachEvent(L"dw_report", L"DWV_ROWFOCUSCHANGED", (FEvent)&ViewExTotalWin::OnRowChanged);//绑定行更改触发事件OnRowChanged
        AttachEvent(L"dw_report", xstring(0x400 + 81), (FEvent)&ViewExTotalWin::OnRetrieveFinished);

        return 1;
    }
@@ -401,7 +400,7 @@
    {
        if (!rptEle) return 0;
        if (dataretrieveing) return -1;
        dw_list.Reset();
        //dw_list.Reset();

        xml x ;
        xaserverarg arg ;
@@ -496,7 +495,7 @@
            {
                KXMLDOMElement rpt = nlist.item(i);
                xstring name = rpt.getAttribute(L"name");
                xc.AddItem( name, rpt);
                xc.AddItem( name, rpt.ptr());
                if (i == 0) xc.SetText(name);
                if (i == 0) rptEle = rpt;
            }

 jrj/project/total3/ViewTotalArgWin.cpp

@@ -24,7 +24,7 @@
        }
        /*int SetAgent()
        {
            string xfNodeAgentArea  = L"agentarea";
            xstring xfNodeAgentArea  = L"agentarea";
            xnode anode = GetAgentNode(xfNodeAgentArea);
            if(m_agentNode)
            {
@@ -36,7 +36,7 @@
                msxml::IXMLDOMElement agent = xframeElement.selectSingleNode(L"agent/"+xfNodeAgentArea+L"[1]/*");
                if(agent)
                {
                    string s = agent.xml;
                    xstring s = agent.xml;
                    m_agentNode =  SetAgentNodeContent (anode,s);
                }
            }
@@ -52,7 +52,7 @@
        }

        //命令发布函数
        int OnCmdDispatch(string comdid)
        int OnCmdDispatch(xstring comdid)
        {
            if (comdid == L"xmOk")
            {
@@ -99,7 +99,7 @@
            if (GetWinParam())
            {
                arg = GetArg();
                string dw = arg.GetArgString(L"argurl");
                xstring dw = arg.GetArgString(L"argurl");
                dw_arg.openUrl(dw);

                dw_arg.SetColHeaderHeight(0);
@@ -107,7 +107,7 @@
                dw_arg.SetHScrollState(false);
                dw_arg.SetVScrollState(false);

                string d = arg.GetArgString(L"arg");
                xstring d = arg.GetArgString(L"arg");
                if (d != L"")
                {
                    xml x ;

 jrj/xframe/xcontrol/xcombobox.hpp

@@ -104,6 +104,11 @@
        return SendMessage(GetHWND(),CB_RESETCONTENT_,0,0);
    }

   int SetItemData(int nIndex, KXMLDOMElement p)
   {
       return  SetItemData(nIndex, p.ptr());
    }

   int SetItemData(int nIndex, LPARAM p) 
    {
        int CB_SETITEMDATA_  =   0x0151;
@@ -126,7 +131,11 @@
        return SendMessage(GetHWND(),CB_GETITEMDATA_,nIndex,0);
    }

   int AddItem(string str, int p)
   int AddItem(string str, KXMLDOMElement ele)
   {
       AddItem(str, ele.ptr());
   }
   int AddItem(string str, LPARAM p)
    {
        int CB_ADDSTRING_ =  0x0143;
        int h = SendMessage(GetHWND(),CB_ADDSTRING_  ,0,(LPARAM)str);