From 8e35897f73080f930030ef56eb087f2ba28b41c6 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 05 七月 2024 17:14:52 +0800
Subject: [PATCH] update some
---
jrj/xframe/xcontrol/xlistbox.hpp | 4 +
jrj/xframe/xcontrol/xlistview.hpp | 133 +++++++++++++++++++++++++++++++++
jrj/project/business/SO/maint.Document.SO3.v3.cpp | 45 +++++-----
jrj/project/business/PO/maint.Document.PO.v3 .cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj | 7 +
jrj/ext-jrj/ext-jrj.vcxproj.user | 6 +
6 files changed, 170 insertions(+), 25 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index bd4c15d..b8dcfd3 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -304,12 +304,15 @@
</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>
</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>
</ClCompile>
<ClCompile Include="..\project\business\PO\maint.Document.PO.v3 .cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\PO\Maint.PaperCard.PO.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -320,15 +323,19 @@
</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>
</ClCompile>
<ClCompile Include="..\project\business\PO\paperImage.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\PO\PO.BatchPrecess.polist.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\PO\PO.maint.base.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Product.list.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.user b/jrj/ext-jrj/ext-jrj.vcxproj.user
index 08c2241..240bdd3 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.user
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.user
@@ -1,13 +1,15 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LocalDebuggerCommand>d:\xclient64\xexplorer.exe</LocalDebuggerCommand>
+ <LocalDebuggerCommand>d:\xclient64\xexplorer64.exe</LocalDebuggerCommand>
<LocalDebuggerWorkingDirectory>d:\xclient64</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ <LocalDebuggerCommandArguments>-noupdate</LocalDebuggerCommandArguments>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LocalDebuggerCommand>d:\xclient64r\xexplorer.exe</LocalDebuggerCommand>
+ <LocalDebuggerCommand>d:\xclient64r\xexplorer64.exe</LocalDebuggerCommand>
<LocalDebuggerWorkingDirectory>d:\xclient64r</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ <LocalDebuggerCommandArguments>-noupdate</LocalDebuggerCommandArguments>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/jrj/project/business/PO/maint.Document.PO.v3 .cpp b/jrj/project/business/PO/maint.Document.PO.v3 .cpp
index 2482a72..17b9c7c 100644
--- a/jrj/project/business/PO/maint.Document.PO.v3 .cpp
+++ b/jrj/project/business/PO/maint.Document.PO.v3 .cpp
Binary files differ
diff --git a/jrj/project/business/SO/maint.Document.SO3.v3.cpp b/jrj/project/business/SO/maint.Document.SO3.v3.cpp
index 4ca8b6f..b5af603 100644
--- a/jrj/project/business/SO/maint.Document.SO3.v3.cpp
+++ b/jrj/project/business/SO/maint.Document.SO3.v3.cpp
@@ -1,5 +1,6 @@
#include <wobject/xstring.hpp>
#include <xcontrol/xtreeview.hpp>
+#include <xcontrol/xlistview.hpp>
#include <xcontrol/xdwgrid.hpp>
#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
@@ -78,7 +79,7 @@
int LVNI_CUT = 0x0004;
int LVNI_DROPHILITED = 0x0008;
- int nItem = xlistview::GetNextItem(lv_view.GetId(), -1, LVNI_FOCUSED);
+ int nItem = lv_view.GetNextItem( -1, LVNI_FOCUSED);
if (nItem < 0) return 1;
int LVIF_PARAM = 0x0004;
@@ -88,8 +89,8 @@
lvItem.iSubItem = 0;
lvItem.mask = LVIF_PARAM;
- xlistview::GetItem(lv_view.GetId(), lvItem);
- KXMLDOMElement ele = trust(lvItem.lParam as KXMLDOMElement);
+ lv_view.GetItem( lvItem);
+ KXMLDOMElement ele = lvItem.lParam;
xstring src = ele.getAttribute(L"url");
xstring name = ele.getAttribute(L"caption");
@@ -221,7 +222,7 @@
int LVNI_CUT = 0x0004;
int LVNI_DROPHILITED = 0x0008;
- int nItem = xlistview::GetNextItem(lv_view.GetId(), -1, LVNI_FOCUSED);
+ int nItem = lv_view.GetNextItem( -1, LVNI_FOCUSED);
if (nItem < 0) return 1;
int LVIF_PARAM = 0x0004;
@@ -231,8 +232,8 @@
lvItem.iSubItem = 0;
lvItem.mask = LVIF_PARAM;
- xlistview::GetItem(lv_view.GetId(), lvItem);
- KXMLDOMElement ele = trust(lvItem.lParam as KXMLDOMElement);
+ lv_view.GetItem( lvItem);
+ KXMLDOMElement ele = lvItem.lParam;
xstring src = ele.getAttribute(L"url");
xstring file = L"";
@@ -272,7 +273,7 @@
int LVNI_CUT = 0x0004;
int LVNI_DROPHILITED = 0x0008;
- int nItem = xlistview::GetNextItem(lv_view.GetId(), -1, LVNI_FOCUSED);
+ int nItem = lv_view.GetNextItem( -1, LVNI_FOCUSED);
if (nItem < 0) return 1;
int LVIF_PARAM = 0x0004;
@@ -282,8 +283,8 @@
lvItem.iSubItem = 0;
lvItem.mask = LVIF_PARAM;
- xlistview::GetItem(lv_view.GetId(), lvItem);
- KXMLDOMElement ele = trust(lvItem.lParam as KXMLDOMElement);
+ lv_view.GetItem( lvItem);
+ KXMLDOMElement ele = lvItem.lParam;
xstring src = ele.getAttribute(L"url");
xstring file = L"";
@@ -306,7 +307,7 @@
else
{
//alert(x.GetXmlDoc().text);
- xlistview::DeleteItem(lv_view.GetId(), nItem);
+ lv_view.DeleteItem( nItem);
}
return 1;
@@ -315,9 +316,9 @@
xstring GetPayType()
{
xcombobox cbx_type = GetControl(L"cbx_type");
- int h = xcombobox::GetCurSel(cbx_type.GetId());
+ int h = cbx_type.GetCurSel();
if (h < 0) return L"";
- return xcombobox::GetLBText(cbx_type.GetId(), h);
+ return cbx_type.GetLBText( h);
}
//命令发布函数
@@ -390,11 +391,11 @@
int SetListViewHeaderColumn(xstring Url)
{
const int LVCFMT_LEFT = 0;
- for (int i = 0; i < 3; i++) lv_view.DeleteColumn(lv_view.GetId(), 1);
- lv_view.InsertColumn(lv_view.GetId(), 0, L"类型", 0, 80, 0);
- lv_view.InsertColumn(lv_view.GetId(), 0, L"创建日期", LVCFMT_LEFT, 80, 0);
- lv_view.InsertColumn(lv_view.GetId(), 0, L"创建人员", LVCFMT_LEFT, 80, 0);
- lv_view.InsertColumn(lv_view.GetId(), 0, L"名称", 0, 120, 0);
+ for (int i = 0; i < 3; i++) lv_view.DeleteColumn( 1);
+ lv_view.InsertColumn( 0, L"类型", 0, 80, 0);
+ lv_view.InsertColumn( 0, L"创建日期", LVCFMT_LEFT, 80, 0);
+ lv_view.InsertColumn( 0, L"创建人员", LVCFMT_LEFT, 80, 0);
+ lv_view.InsertColumn( 0, L"名称", 0, 120, 0);
columnCount = 3;
return 1;
@@ -402,7 +403,7 @@
int Retrieve(xstring entityid)
{
- lv_view.DeleteItemAll(lv_view.GetId());
+ lv_view.DeleteItemAll();
xstring src = L"object/Forwarder";
xml x = ViewObject::RetrieveData(L"/sale/data/TDocument3/folder/listex", L"src", src, L"entityid", entityid);
if (x)
@@ -417,10 +418,10 @@
KXMLDOMElement e = nlist.item(i);
xstring name = e.getAttribute(L"caption");
- int nItem = xlistview::InsertItemEx(lv_view.GetId(), 0, name, 23, cast(e as int));
- xlistview::SetItemText(lv_view.GetId(), nItem, 1, e.getAttribute(L"Creator"));
- xlistview::SetItemText(lv_view.GetId(), nItem, 2, e.getAttribute(L"CreateDate"));
- xlistview::SetItemText(lv_view.GetId(), nItem, 3, e.getAttribute(L"Type"));
+ int nItem = lv_view.InsertItemEx( 0, name, 23,e);
+ lv_view.SetItemText( nItem, 1, e.getAttribute(L"Creator"));
+ lv_view.SetItemText( nItem, 2, e.getAttribute(L"CreateDate"));
+ lv_view.SetItemText( nItem, 3, e.getAttribute(L"Type"));
}
}
diff --git a/jrj/xframe/xcontrol/xlistbox.hpp b/jrj/xframe/xcontrol/xlistbox.hpp
index bbadab4..d308fce 100644
--- a/jrj/xframe/xcontrol/xlistbox.hpp
+++ b/jrj/xframe/xcontrol/xlistbox.hpp
@@ -5,6 +5,10 @@
class xlistbox : public xcontrol
{
+public:
+ xlistbox() :xcontrol(nullptr) {}
+ xlistbox(void* implptr) :xcontrol(implptr) {}
+
static int GetCount(HWND hWnd)//杩斿洖鍒楄〃椤规�婚」鏁�
{
int LB_GETCOUNT = 0x018B;
diff --git a/jrj/xframe/xcontrol/xlistview.hpp b/jrj/xframe/xcontrol/xlistview.hpp
index 4f29612..4ea4050 100644
--- a/jrj/xframe/xcontrol/xlistview.hpp
+++ b/jrj/xframe/xcontrol/xlistview.hpp
@@ -74,6 +74,10 @@
class xlistview : public xcontrol
{
+public:
+ xlistview() :xcontrol(nullptr) {}
+ xlistview(void* implptr) :xcontrol(implptr) {}
+public:
static int SetdwStyle(HWND hWnd, int dwStyle)//璁剧疆椋庢牸
{
int GWL_STYLE_ = -16;
@@ -205,7 +209,7 @@
return SendMessage(hWnd, LVM_INSERTITEM_, 0, (LPARAM) & lvi);
}
- static int InsertItemEx(HWND hWnd, int xIndex, string label, int pictureindex = 0, int data = 0)//only the label and picture index need to be specified
+ static int InsertItemEx(HWND hWnd, int xIndex, string label, int pictureindex = 0, LPARAM data = 0)//only the label and picture index need to be specified
{
int LVM_FIRST_ = 0x1000;// ListView messages
int LVM_INSERTITEM_ = LVM_FIRST_ + 77;
@@ -530,4 +534,131 @@
{
}*/
+ int SetdwStyle(int dwStyle)//璁剧疆椋庢牸
+ {
+ return SetdwStyle(GetHWND(), dwStyle);
+ }
+ int SetReportStyle()
+ {
+ return SetReportStyle(GetHWND());
+ }
+
+ int GetImageList(int iImageList)//ImageList
+ {
+ return GetImageList(GetHWND(),iImageList);
+ }
+ int SetImageList(int iImageList, int himl)//璁剧疆ImageList
+ {
+ return SetImageList(GetHWND(), iImageList, himl);
+ }
+
+ int InsertColumn(int nCol, string label, int nFormat, int nWidth, int nSubItem)//澧炲姞鍒楋紝鍔犲叆鍒楀ご
+ {
+ return InsertColumn(GetHWND(), nCol, label, nFormat, nWidth, nSubItem);
+ }
+
+ int InsertItem(int xIndex, string label, int pictureindex = 0)//only the label and picture index need to be specified
+ {
+ return InsertItem(GetHWND(),xIndex, label, pictureindex);
+ }
+
+ int InsertItemEx(int xIndex, string label, int pictureindex = 0,LPARAM data)//only the label and picture index need to be specified
+ {
+ return InsertItemEx(GetHWND(), xIndex, label, pictureindex , data);
+ }
+
+ int SetItemText(int nItem, int nSubItem, string label)
+ {
+ return SetItemText(GetHWND(), nItem,nSubItem, label);
+ }
+
+ int DeleteItemAll()//鍒犻櫎鎵�鏈�
+ {
+ return DeleteItemAll(GetHWND());
+ }
+
+ int DeleteColumn(int nCol)//鍒犻櫎鍒�
+ {
+ return DeleteColumn(GetHWND(), nCol);
+ }
+
+ int DeleteItem(int nIndex)//鍒犻櫎琛�
+ {
+ return DeleteItem(GetHWND(),nIndex);
+ }
+
+ int EditLabel(int nIndex)//nIndex= -1琛ㄧず鍙栨秷缂栬緫
+ {
+ return EditLabel(GetHWND(), nIndex);
+ }
+
+ int FindItem(int iStart, string label, bool partial, bool wrap)
+ {
+ return FindItem(GetHWND(), iStart, label,partial, wrap);
+ }
+
+ int GetColumn(int iCol, lvcolumn lvc)
+ {
+ return GetColumn(GetHWND(), iCol, lvc);
+ }
+
+ int GetItem(lvitem& lvi)
+ {
+ return GetItem(GetHWND(), lvi);
+ }
+
+ int GetItemCount()
+ {
+ return GetItemCount(GetHWND());
+ }
+
+ int GetItemText(int nIndex, lvitem lvi)
+ {
+ return GetItemText(GetHWND(), nIndex, lvi);
+ }
+
+ int GetNextItem(int nIndex, int flags)//nIndex=-1鏃朵粠绗竴涓紑濮�
+ {
+ return GetNextItem(GetHWND(), nIndex, flags);
+ }
+
+ int GetSelectColumn()
+ {
+ return GetSelectColumn(GetHWND() );
+ }
+
+ int GetSelectCount()
+ {
+ return GetSelectCount(GetHWND());
+ }
+
+ int SetColumn(int iCol, lvcolumn lvc)
+ {
+ return SetColumn(GetHWND(),iCol, lvc);
+ }
+
+ int SetItem(lvitem lvi)
+ {
+ return SetItem(GetHWND(), lvi);
+ }
+
+ int SetItemText(int nIndex, lvitem &lvi)
+ {
+ return SetItemText(GetHWND(), nIndex, lvi);
+ }
+
+ int InsertColumn(int nCol, int nFormat, int nWidth, string label, int nSubItem)//澧炲姞鍒�
+ {
+ return InsertColumn(GetHWND(), nCol, nFormat, nWidth, label, nSubItem);
+
+ }
+ int InsertItem(int nItem, int nSubItem, string label, int pictureindex)//澧炲姞琛�
+ {
+ return InsertItem(GetHWND(), nItem, nSubItem, label, pictureindex);
+ }
+
+ string GetItemText(int nIndex)
+ {
+ return GetItemText(GetHWND(), nIndex);
+ }
};
\ No newline at end of file
--
Gitblit v1.9.3