update items

xj qian

2024-07-23 456d9dc293ffbd4b7d1cfef16583eb77e48428b4

update items

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -724,6 +724,7 @@
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\new.Sample3.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\outstore.Sample3.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -732,7 +733,8 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\PictureView.Product3.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\Product.SearchDlg.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -742,12 +744,15 @@
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\ProductLibraryItemMaint3.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\ProductNewItem.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\Quick.Input.NewProduct.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\SampleAbnormal.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -755,9 +760,11 @@
    <ClCompile Include="..\project\business\ProductSample\SampleBarcodePrint.cpp" />
    <ClCompile Include="..\project\business\ProductSample\ShipmentNew.Sample3.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\UserProductApply.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\ViewPicturesEx.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

 jrj/project/business/ProductSample/PictureView.Product3.cpp

Binary files differ

 jrj/project/business/ProductSample/ProductNewItem.cpp

Binary files differ

 jrj/project/business/ProductSample/Quick.Input.NewProduct.cpp

Binary files differ

 jrj/project/business/ProductSample/UserProductApply.cpp

Binary files differ

 jrj/project/vindexform.cpp

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

        xcombobox::AddItem(cbx_menu.GetHWND(), L"开始");
        xcombobox::AddItem(cbx_tab.GetHWND(), L"-1");
@@ -612,7 +612,7 @@
        if((xstring)m_Assignment == L"")
            alert(L"获取用户数据失败，请重新登录!");
        else
            xaserver::SetUID((LPWSTR)m_Assignment.c_str());
            xaserver::SetUID((LPWSTR)m_Assignment.c_str(true));
        return 1;
    }


 jrj/project/vindexmenu.cpp

@@ -29,7 +29,7 @@
    int tabNo;

    //int m_panelNo; // 当前菜单组
    string m_Assignment;
    xstring m_Assignment;
public:
    vindexmenu(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
public:

 jrj/xframe/adt/xarray.hpp

@@ -20,11 +20,19 @@
        return this;
    }


    xarray* pop_back()
    {
        if (length() > 0)
            erase(length() - 1);
        return this;
    }

    void clear()
    {
        for (int i = 0; i <= length(); i++)
            items[i].~T();
        length_ = 0;
    }

    xarray* erase(int index)
@@ -125,5 +133,6 @@
    T* items;
    int length_;
    int capacity_;

};



 jrj/xframe/wobject/xaserverarg.hpp

@@ -1,5 +1,6 @@
#pragma once
#include "xnative.hpp"
#include "xcontrol.hpp"

namespace Hxsoft{ namespace XFrame
{
@@ -139,6 +140,21 @@
        return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->GetArgString((LPTSTR)argname);
    }

    int SetParam(LPCTSTR pArgName, xcontrol& xc)
    {
        return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->SetParam(pArgName,(LPARAM)xc.getNativePointer());
    }

    int SetParam(LPCTSTR pArgName, HWND hWnd)
    {
        return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->SetParam(pArgName, (LPARAM)hWnd);
    }

    int SetParam(LPCTSTR pArgName, KXMLDOMElement ele)
    {
        return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->SetParam(pArgName, ele.ptr());
    }

    int SetParam(LPCTSTR pArgName, LPARAM pValue)
    {
        return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->SetParam(pArgName,pValue);