From a7042deea556e6ac56f4849de2ec448b5aa0592f Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 24 七月 2024 10:07:49 +0800
Subject: [PATCH] update operator itemstring
---
jrj/project/business/PO/Maint.PaperCard.PO.hpp | 0
jrj/project/business/PO/Habit.PO.cpp | 0
jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp | 28 +++---
jrj/project/business/Enquiry/Entity.Product.Select.cpp | 1
jrj/project/business/PO/MakeAllPOEx.PO.cpp | 0
jrj/xframe/wobject/xaserverarg.hpp | 10 ++
jrj/xframe/xcontrol/xdwgrid.hpp | 54 +++++++++++++
jrj/xframe/xcontrol/xdwtable.hpp | 59 ++++++++++++++
jrj/ext-jrj/ext-jrj.vcxproj | 26 +++---
jrj/project/business/PO/InsertPO.PO.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj.filters | 8 +-
11 files changed, 151 insertions(+), 35 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 5086e8b..3643beb 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -465,8 +465,8 @@
</ClCompile>
<ClCompile Include="..\project\business\EnquiryEx3.list.cpp" />
<ClCompile Include="..\project\business\Enquiry\Enquiry.maint.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Enquiry\EnquiryEx.quote.vx.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -493,8 +493,8 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Enquiry\SKU.PictureView.Product3.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Enquiry\ViewPictures.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -671,28 +671,28 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\PO\Habit.PO.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\PO\InsertPO.PO.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\PO\maint.Document.PO.v3 .cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\project\business\PO\Maint.PaperCard.PO.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ClCompile Include="..\project\business\PO\Maint.PaperCard.PO.hpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\PO\Maint.PurcherItem.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\PO\MakeAllPOEx.PO.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\PO\paperImage.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index c1e1e2d..05fb0bd 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -566,13 +566,10 @@
<ClCompile Include="..\project\business\PO\business4.cpp">
<Filter>project\business\PO</Filter>
</ClCompile>
- <ClCompile Include="..\project\vindexformex.cpp">
- <Filter>vbusiness\wface</Filter>
- </ClCompile>
<ClCompile Include="..\project\business\PO\Maint.PurcherItem.cpp">
<Filter>project\business\PO</Filter>
</ClCompile>
- <ClCompile Include="..\project\business\PO\Maint.PaperCard.PO.cpp">
+ <ClCompile Include="..\project\business\PO\Maint.PaperCard.PO.hpp">
<Filter>project\business\PO</Filter>
</ClCompile>
<ClCompile Include="..\project\business\PO\Habit.PO.cpp">
@@ -1250,5 +1247,8 @@
<ClCompile Include="..\project\vindexmenu.cpp">
<Filter>vbusiness\wface</Filter>
</ClCompile>
+ <ClCompile Include="..\project\total3\ViewEx1.total.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/jrj/project/business/Enquiry/Entity.Product.Select.cpp b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
index 35f0d4e..499ca5b 100644
--- a/jrj/project/business/Enquiry/Entity.Product.Select.cpp
+++ b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
@@ -1117,7 +1117,6 @@
else
g_xdoc_shoppingcart.Retrieve(ShoppingCartView::GetGoodsList(selectname, queryString));
}
- dwc_list.PostRetrieve();
dwc_list.Redraw();
if (dwc_list.GetRowCount() >= 1)
diff --git a/jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp b/jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp
index 09867d7..01123d4 100644
--- a/jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp
+++ b/jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp
@@ -15,8 +15,8 @@
public:
ximageview im;
xml doc;
- int m_winHwnd;
- int ParentHWND;
+ HWND m_winHwnd;
+ HWND ParentHWND;
public:
SKUProductPictureView3(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {}
public:
@@ -29,15 +29,15 @@
{
//xnode anode = GetAgentNode(name);
xnode anode = GetAgentNode(name);
- int LayerFlow_None = 0x00000001;
- int LayerFlow_UnLayer = 0x00000100;
- int LayerFlow_NS = 0x00000004;
- int LayerFlow_WE = 0x00000008;
- int LayerFlow_Control = 0x00000010;
+ int LayerFlow_None_ = 0x00000001;
+ int LayerFlow_UnLayer_ = 0x00000100;
+ int LayerFlow_NS_ = 0x00000004;
+ int LayerFlow_WE_ = 0x00000008;
+ int LayerFlow_Control_ = 0x00000010;
if (f)
- anode.SetLayerFlow(LayerFlow_WE | LayerFlow_Control);
+ anode.SetLayerFlow(LayerFlow_WE_ | LayerFlow_Control_);
else
- anode.SetLayerFlow(LayerFlow_None | LayerFlow_UnLayer);
+ anode.SetLayerFlow(LayerFlow_None_ | LayerFlow_UnLayer_);
return 1;
}
@@ -108,15 +108,14 @@
}
else if (comdid == L"xmDelete")
{
- int hh = ParentHWND;
- if (hh > 0)
+ if (ParentHWND)
{
int nIndex = im.GetSelectIndex();
if (nIndex < 0 || nIndex >= im.GetImageCount()) return 0;
im.RemoveImage(nIndex);
im.Redraw();
xstring comd = L"Delete:" +xstring(nIndex);
- SendMessage(hh, 0x401, comd, 0);
+ SendMessage(ParentHWND, 0x401, (WPARAM)comd.c_str(), 0);
}
}
return 0;
@@ -179,8 +178,7 @@
xaserverarg arg;
//
arg = GetArg();
- xstring hh = arg.GetArgString(L"ParentHWND");
- ParentHWND = hh.toInt();
+ ParentHWND = (HWND)arg.GetParam(L"ParentHWND");
xstring openflag = arg.GetArgString(L"OpenFlag");
//alert(openflag);
if (openflag != L"0") hiddenBox(L"xmDelete", false);
@@ -218,7 +216,7 @@
im.AddImages(L"/business/products/chanpin/BL-002/417884.jpg", L"x3");
im.Redraw();
}
- win32::SetFocus(im.GetId());
+ SetFocus(im.GetHWND());
xstring userno = xaserver::GetUserNo();
/*if(userno == L"1003" || userno == L"1137" || userno == L"admin") {
diff --git a/jrj/project/business/PO/Habit.PO.cpp b/jrj/project/business/PO/Habit.PO.cpp
index ff8a2dc..9f9366c 100644
--- a/jrj/project/business/PO/Habit.PO.cpp
+++ b/jrj/project/business/PO/Habit.PO.cpp
Binary files differ
diff --git a/jrj/project/business/PO/InsertPO.PO.cpp b/jrj/project/business/PO/InsertPO.PO.cpp
index 3d2ed63..120fc92 100644
--- a/jrj/project/business/PO/InsertPO.PO.cpp
+++ b/jrj/project/business/PO/InsertPO.PO.cpp
Binary files differ
diff --git a/jrj/project/business/PO/Maint.PaperCard.PO.cpp b/jrj/project/business/PO/Maint.PaperCard.PO.hpp
similarity index 99%
rename from jrj/project/business/PO/Maint.PaperCard.PO.cpp
rename to jrj/project/business/PO/Maint.PaperCard.PO.hpp
index 78481ca..fb87dec 100644
--- a/jrj/project/business/PO/Maint.PaperCard.PO.cpp
+++ b/jrj/project/business/PO/Maint.PaperCard.PO.hpp
Binary files differ
diff --git a/jrj/project/business/PO/MakeAllPOEx.PO.cpp b/jrj/project/business/PO/MakeAllPOEx.PO.cpp
index a828194..e4b0cdb 100644
--- a/jrj/project/business/PO/MakeAllPOEx.PO.cpp
+++ b/jrj/project/business/PO/MakeAllPOEx.PO.cpp
Binary files differ
diff --git a/jrj/xframe/wobject/xaserverarg.hpp b/jrj/xframe/wobject/xaserverarg.hpp
index e42a90e..a54aeb1 100644
--- a/jrj/xframe/wobject/xaserverarg.hpp
+++ b/jrj/xframe/wobject/xaserverarg.hpp
@@ -1,7 +1,6 @@
#pragma once
#include "xnative.hpp"
#include "xcontrol.hpp"
-
namespace Hxsoft{ namespace XFrame
{
class IXAServerArg
@@ -165,6 +164,15 @@
return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->GetParam(pArgName);
}
+ void* GetControl(LPCTSTR pArgName)
+ {
+ return (void*)((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->GetParam(pArgName);
+ }
+ HWND GetHWND(LPCTSTR pArgName)
+ {
+ return (HWND)((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->GetParam(pArgName);
+ }
+
template<class T>
int SetParam(LPCTSTR pArgName, T pValue)
{
diff --git a/jrj/xframe/xcontrol/xdwgrid.hpp b/jrj/xframe/xcontrol/xdwgrid.hpp
index 9436db8..68b214c 100644
--- a/jrj/xframe/xcontrol/xdwgrid.hpp
+++ b/jrj/xframe/xcontrol/xdwgrid.hpp
@@ -400,7 +400,7 @@
bool SetItemDouble(int row, xstring col, double str)
{
- return SetItemString(row, col.c_str(), xstring(str));
+ return SetItemString(row, col, xstring(str));
}
int DataBI(LPCTSTR pSchema = NULL) //鏁版嵁BI鍒嗘瀽
@@ -412,6 +412,58 @@
return getKReport()->DataAnalysis(pSchema);
}
+ xstring GetItemString(int nRow, xstring ColumnName, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->GetItemString_(nRow, ColumnName.c_str(),dwBuffer);
+ }
+
+ bool SetItemString(int nRow, int ColumnName, xstring lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemString_(nRow, ColumnName, lptStr.c_str(), dwBuffer);
+ }
+
+ bool SetItemString(int nRow, LPCTSTR ColumnName, xstring lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemString_(nRow, ColumnName, lptStr.c_str(), dwBuffer);
+ }
+
+ bool SetItemString(int nRow, xstring ColumnName,xstring lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemString_(nRow, ColumnName.c_str(), lptStr.c_str(), dwBuffer);
+ }
+ bool SetItemString(int nRow, xstring ColumnName, LPCTSTR lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemString_(nRow, ColumnName.c_str(), lptStr, dwBuffer);
+ }
+
+ xstring GetItemDisplayString(int nRow, xstring ColumnName, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->GetItemDisplayString(nRow, ColumnName.c_str(), dwBuffer);
+ }
+
+ bool SetItemDisplayString(int nRow, int ColumnName, xstring lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemDisplayString(nRow, ColumnName, lptStr.c_str(), dwBuffer);
+ }
+
+ bool SetItemDisplayString(int nRow, LPCTSTR ColumnName, xstring lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemDisplayString(nRow, ColumnName, lptStr.c_str(), dwBuffer);
+ }
+
+ bool SetItemDisplayString(int nRow, xstring ColumnName, xstring lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemDisplayString(nRow, ColumnName.c_str(), lptStr.c_str(), dwBuffer);
+ }
+ bool SetItemDisplayString(int nRow, xstring ColumnName, LPCTSTR lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemDisplayString(nRow, ColumnName.c_str(), lptStr, dwBuffer);
+ }
+ LPCTSTR GetItemTipString(int nRow, xstring ColumnName, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->GetItemTipString(nRow, ColumnName.c_str(), dwBuffer);
+ }
+
public:
int openUrl(string aurl)
{
diff --git a/jrj/xframe/xcontrol/xdwtable.hpp b/jrj/xframe/xcontrol/xdwtable.hpp
index 9ea422f..39a15b0 100644
--- a/jrj/xframe/xcontrol/xdwtable.hpp
+++ b/jrj/xframe/xcontrol/xdwtable.hpp
@@ -339,6 +339,65 @@
{
return GetDwTable()->SetItemTipString(nRow, ColumnName, lptStr, dwBuffer);
}
+
+ xstring GetItemString(int nRow, xstring ColumnName, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->GetItemString_(nRow, ColumnName.c_str(), dwBuffer);
+ }//寰楀埌鏁版嵁鍊�
+ xstring SetItemString(int nRow, xstring ColumnName, LPCTSTR value,kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->SetItemString_(nRow, ColumnName.c_str(),value, dwBuffer);
+ }
+ xstring SetItemString(int nRow, xstring ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->SetItemString_(nRow, ColumnName.c_str(), value.c_str(), dwBuffer);
+ }
+ xstring SetItemString(int nRow, LPCTSTR ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->SetItemString_(nRow, ColumnName, value.c_str(), dwBuffer);
+ }
+ xstring SetItemString(int nRow, int ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->SetItemString_(nRow, ColumnName, value.c_str(), dwBuffer);
+ }
+
+ xstring GetItemDisplayString(int nRow, xstring ColumnName, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->GetItemDisplayString(nRow, ColumnName.c_str(), dwBuffer);
+ }//寰楀埌鏁版嵁鍊�
+ xstring SetItemDisplayString(int nRow, xstring ColumnName, LPCTSTR value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->SetItemDisplayString(nRow, ColumnName.c_str(), value, dwBuffer);
+ }
+ xstring SetItemDisplayString(int nRow, xstring ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->SetItemDisplayString(nRow, ColumnName.c_str(), value.c_str(), dwBuffer);
+ }
+ xstring SetItemDisplayString(int nRow, LPCTSTR ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->SetItemDisplayString(nRow, ColumnName, value.c_str(), dwBuffer);
+ }
+ xstring SetItemDisplayString(int nRow, int ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->SetItemDisplayString(nRow, ColumnName, value.c_str(), dwBuffer);
+ }
+
+ xstring ItemChangeTo(int nRow, xstring ColumnName, LPCTSTR value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->ItemChangeTo(nRow, ColumnName.c_str(), value, dwBuffer);
+ }
+ xstring ItemChangeTo(int nRow, xstring ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->ItemChangeTo(nRow, ColumnName.c_str(), value.c_str(), dwBuffer);
+ }
+ xstring ItemChangeTo(int nRow, LPCTSTR ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->ItemChangeTo(nRow, ColumnName, value.c_str(), dwBuffer);
+ }
+ xstring ItemChangeTo(int nRow, int ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+ {
+ return GetDwTable()->ItemChangeTo(nRow, ColumnName, value.c_str(), dwBuffer);
+ }
public:
int AcceptText()
{
--
Gitblit v1.9.3