From 456d9dc293ffbd4b7d1cfef16583eb77e48428b4 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 23 七月 2024 09:46:57 +0800
Subject: [PATCH] update items
---
jrj/xframe/adt/xarray.hpp | 11 ++++++++++-
jrj/project/business/ProductSample/PictureView.Product3.cpp | 0
jrj/project/business/ProductSample/ProductNewItem.cpp | 0
jrj/project/business/ProductSample/UserProductApply.cpp | 0
jrj/project/business/ProductSample/Quick.Input.NewProduct.cpp | 0
jrj/project/vindexform.cpp | 4 ++--
jrj/project/vindexmenu.cpp | 2 +-
jrj/xframe/wobject/xaserverarg.hpp | 16 ++++++++++++++++
jrj/ext-jrj/ext-jrj.vcxproj | 15 +++++++++++----
9 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 05680f6..92f6f61 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/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>
diff --git a/jrj/project/business/ProductSample/PictureView.Product3.cpp b/jrj/project/business/ProductSample/PictureView.Product3.cpp
index ca36cca..f6432e4 100644
--- a/jrj/project/business/ProductSample/PictureView.Product3.cpp
+++ b/jrj/project/business/ProductSample/PictureView.Product3.cpp
Binary files differ
diff --git a/jrj/project/business/ProductSample/ProductNewItem.cpp b/jrj/project/business/ProductSample/ProductNewItem.cpp
index fba19be..af6dbbf 100644
--- a/jrj/project/business/ProductSample/ProductNewItem.cpp
+++ b/jrj/project/business/ProductSample/ProductNewItem.cpp
Binary files differ
diff --git a/jrj/project/business/ProductSample/Quick.Input.NewProduct.cpp b/jrj/project/business/ProductSample/Quick.Input.NewProduct.cpp
index f26cef3..2debe0c 100644
--- a/jrj/project/business/ProductSample/Quick.Input.NewProduct.cpp
+++ b/jrj/project/business/ProductSample/Quick.Input.NewProduct.cpp
Binary files differ
diff --git a/jrj/project/business/ProductSample/UserProductApply.cpp b/jrj/project/business/ProductSample/UserProductApply.cpp
index f21adaa..81c31ad 100644
--- a/jrj/project/business/ProductSample/UserProductApply.cpp
+++ b/jrj/project/business/ProductSample/UserProductApply.cpp
Binary files differ
diff --git a/jrj/project/vindexform.cpp b/jrj/project/vindexform.cpp
index 931a291..83c3905 100644
--- a/jrj/project/vindexform.cpp
+++ b/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;
}
diff --git a/jrj/project/vindexmenu.cpp b/jrj/project/vindexmenu.cpp
index 6625177..90c7c49 100644
--- a/jrj/project/vindexmenu.cpp
+++ b/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:
diff --git a/jrj/xframe/adt/xarray.hpp b/jrj/xframe/adt/xarray.hpp
index 8801eb4..94a0e3a 100644
--- a/jrj/xframe/adt/xarray.hpp
+++ b/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_;
-
};
+
+
diff --git a/jrj/xframe/wobject/xaserverarg.hpp b/jrj/xframe/wobject/xaserverarg.hpp
index 228c87a..e42a90e 100644
--- a/jrj/xframe/wobject/xaserverarg.hpp
+++ b/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);
--
Gitblit v1.9.3