update root

xj qian

2024-07-02 e6aa42f5cc3ae814b218ecd221c83fba0749951b

update root

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

@@ -79,6 +79,12 @@
    <Filter Include="project\business\PO">
      <UniqueIdentifier>{0ac8c4fc-fdb3-474f-8d64-6f092367e80c}</UniqueIdentifier>
    </Filter>
    <Filter Include="xframe\win32">
      <UniqueIdentifier>{9a894b1c-9333-4f29-9edd-8ebf6a296216}</UniqueIdentifier>
    </Filter>
    <Filter Include="xframe\adt">
      <UniqueIdentifier>{183c9d39-437c-4c0f-9943-8f28e71eaa1a}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="framework.h">
@@ -270,27 +276,6 @@
    <ClInclude Include="..\project\viewobject\enquiry.view.hpp">
      <Filter>vbusiness\viewobject</Filter>
    </ClInclude>
    <ClInclude Include="..\project\viewobject\custom.view.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\project\viewobject\gdn3.view.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\xframe\adt\xarray.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\xframe\kobject\kcell.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\xframe\win32\win.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\xframe\win32\xfile.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\xframe\xcontrol\xcell.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\xframe\xcontrol\xflowchart.hpp">
      <Filter>xframe\xcontrol</Filter>
    </ClInclude>
@@ -309,6 +294,27 @@
    <ClInclude Include="..\xframe\xcontrol\xexcel.hpp">
      <Filter>xframe\xcontrol</Filter>
    </ClInclude>
    <ClInclude Include="..\xframe\win32\xfile.hpp">
      <Filter>xframe\win32</Filter>
    </ClInclude>
    <ClInclude Include="..\xframe\win32\win.hpp">
      <Filter>xframe\win32</Filter>
    </ClInclude>
    <ClInclude Include="..\xframe\xcontrol\xcell.hpp">
      <Filter>xframe\xcontrol</Filter>
    </ClInclude>
    <ClInclude Include="..\xframe\kobject\kcell.hpp">
      <Filter>xframe\kobject</Filter>
    </ClInclude>
    <ClInclude Include="..\project\viewobject\custom.view.hpp">
      <Filter>vbusiness\viewobject</Filter>
    </ClInclude>
    <ClInclude Include="..\project\viewobject\gdn3.view.hpp">
      <Filter>vbusiness\viewobject</Filter>
    </ClInclude>
    <ClInclude Include="..\xframe\adt\xarray.hpp">
      <Filter>xframe\adt</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="dllmain.cpp">

 jrj/project/vindexform.cpp

@@ -9,9 +9,11 @@
#include "wobject/xaserver.hpp"
#include "xcontrol/xcombobox.hpp"
#include "xcontrol/xlayersheet.hpp"
 #include "vbusiness/vframe/frame.vframe.vbusiness.hpp"


using xml = KXMLDOMDocument;
class __declspec(dllexport) vindexform: public xwin
class __declspec(dllexport) vindexform: public xframe
{
public:
    string m_Assignment;
@@ -239,7 +241,7 @@
        while (hItem > 1)
        {
            //mainsheet.DeleteSheet(hItem - 1);
            SendMessage(GetHWND(), 0x401, L"xmSheetClose", 0);
            SendMessage(GetHWND(), 0x401, (WPARAM)L"xmSheetClose", 0);
            hItem = mainsheet.GetSheetCount();
        }

@@ -265,7 +267,7 @@
        if (m_Assignment == L"")
            alert(L"获取用户数据失败，请重新登录!");
        else
            xaserver::SetUID(m_Assignment);
            xaserver::SetUID((LPWSTR)m_Assignment);

        xcombobox::AddItem(memuId.GetHWND(), L"开始");
        xcombobox::AddItem(tabNo.GetHWND(), L"-1");
@@ -304,7 +306,7 @@
        xstring sInfo = m_Assignment;
        if (s > 0)
        {
            HMENU m = xwin::CreatePopupMenu();
            HMENU m = CreatePopupMenu();
            int MF_STRING = 0x00000000;
            int MF_DISABLED = 0x00000002;
            int TPM_RIGHTBUTTON = 0x0002;
@@ -316,9 +318,9 @@
                xstring id = xitem.selectSingleNode(L"AssignmentID").text();
                xstring name = xitem.selectSingleNode(L"PositionName").text();
                if (sInfo == id)
                    xwin::AppendMenu(m, MF_STRING | MF_CHECKED, i + 1, name);
                    AppendMenu(m, MF_STRING | MF_CHECKED, i + 1, name);
                else
                    xwin::AppendMenu(m, MF_STRING, i + 1, name);
                    AppendMenu(m, MF_STRING, i + 1, name);
            }
            xrect xr;
            xpoint pt;
@@ -340,7 +342,7 @@

    int OnAllCaption()
    {
        int m = xwin::CreatePopupMenu();
        HMENU m = CreatePopupMenu();
        int MF_STRING = 0x00000000;
        int MF_DISABLED = 0x00000002;
        int TPM_RIGHTBUTTON = 0x0002;
@@ -355,14 +357,14 @@
            //string str = xcombobox::GetLBText(memuId.GetId(), i);
            xstring str = mainsheet.GetSheetText(i);
            if (i == k)
                xwin::AppendMenu(m, MF_STRING | MF_CHECKED, i + 1, str);
                AppendMenu(m, MF_STRING | MF_CHECKED, i + 1, str);
            else
                xwin::AppendMenu(m, MF_STRING, i + 1, str);
                AppendMenu(m, MF_STRING, i + 1, str);
        }
        xrect xr;
        xpoint pt;
        GetCursorPos(pt);
        int res = xwin::TrackPopupMenu(m, TPM_RIGHTBUTTON | TPM_RETURNCMD, pt.x, pt.y, 0, GetHWND(), xr);
        int res = TrackPopupMenu(m, TPM_RIGHTBUTTON | TPM_RETURNCMD, pt.x, pt.y, 0, GetHWND(), xr);
        if (res == 0) return 0;
        int nSheet = mainsheet.GetSheetIndex();
        if (nSheet == (res - 1)) return 0;
@@ -408,7 +410,6 @@
            return 1;
        }*/

        int p = pa.toInt();
        xaserverarg arg ;
        
        xstring isnew = arg.GetArgString(L"_isNewModule");
@@ -416,7 +417,7 @@
        if (isnew == L"Y")
        {
            if (vx.find(L".vx", 0) > 0 || vx.find(L".xpage", 0) > 0)
                OpenWindow(L"dev:xpage[" + vx + L"]", p);
                OpenWindow(L"dev:xpage[" + vx + L"]", arg);
            else
                openUrl(vx, p);
            return 1;
@@ -518,7 +519,7 @@

        if (cursheet != mainsheet.GetSheetIndex())
        {
            int hPicture = xwin::FindWindowEx(0, 0, L"XFrameWndClass", L"__ProductPicture");
            int hPicture = FindWindowEx(0, 0, L"XFrameWndClass", L"__ProductPicture");
            if (hPicture > 0)
            {
                int WM_CLOSE = 0x0010;