From b8e6a7bb37d04f1e974e231a5caffc1854cf7f41 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 27 六月 2024 09:37:26 +0800
Subject: [PATCH] this update tree data item

---
 jrj/project/business/GDN3.list.cpp |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/jrj/project/business/GDN3.list.cpp b/jrj/project/business/GDN3.list.cpp
index 0ae84fd..cef6bc4 100644
--- a/jrj/project/business/GDN3.list.cpp
+++ b/jrj/project/business/GDN3.list.cpp
@@ -5,14 +5,14 @@
 #include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
 #include "viewobject/view.base.hpp"
 
-class __declspec(dllexport) GDN3list : public listwin
+class __declspec(dllexport) ListGDN3Win : public listwin
 {
 public:
-	GDN3list(void* implPtr, HWND hWnd) :listwin(implPtr, hWnd) {}
+	ListGDN3Win(void* implPtr, HWND hWnd) :listwin(implPtr, hWnd) {}
 public:
-	static GDN3list* CreateInstance(void* implPtr, void* hWnd)
+	static ListGDN3Win* CreateInstance(void* implPtr, void* hWnd)
 	{
-		GDN3list* pWin = new GDN3list(implPtr, (HWND)hWnd);
+		ListGDN3Win* pWin = new ListGDN3Win(implPtr, (HWND)hWnd);
 		return pWin;
 	}
 
@@ -100,7 +100,6 @@
 			HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, 35);
 			ExpandCatChildFolder(h, e, 35);
 		}
-		x.Free();
 		return 1;
 	}
 
@@ -201,10 +200,10 @@
 
 		if (readed) return 1;
 		HTREEITEM hItem = tv_folder.GetSelectedItem();
-		if (hItem <= 0)
+		if (!hItem)
 		{
 			hItem = tv_folder.GetRootItem();
-			if (hItem <= 0)  return 1;
+			if (!hItem)  return 1;
 		}
 		HCURSOR hCursor = xutil::SetCursorWait();
 		KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
@@ -212,7 +211,7 @@
 		//xml x = 0;
 		//x = ViewObject::RetrieveData(myDataUrl,L"no",no,L"QueryTxt", m_QueryTxt,L"rows",rows);
 		xstring DeptName = publiccode::GetUser().deptname;
-		xaserverarg arg = xaserverarg::Make();
+		xaserverarg arg ;
 		arg.AddArg(L"no", no);
 		arg.AddArg(L"QueryTxt", m_QueryTxt);
 		arg.AddArg(L"rows", rows);
@@ -224,7 +223,6 @@
 			dw_list.DwRetrieve(GetServerUrl(),L"[list.folder.gdn.sql.xq]",arg.GetString());
 		}*/
 		dw_list.DwRetrieve(GetServerUrl(), L"[list.folder.gdn.sql.xq]", arg.GetString());
-		arg.Free();
 		dw_list.SetReadOnly(true);
 		dw_list.SetRowSort(L"ETD", false);
 
@@ -238,7 +236,7 @@
 	int OnPreRetrieve()
 	{
 		HTREEITEM hItem = tv_folder.GetSelectedItem();
-		if (hItem <= 0) return 1;
+		if (!hItem) return 1;
 
 		HCURSOR hCursor = xutil::SetCursorWait();
 
@@ -254,7 +252,7 @@
 		}
 		else
 		{
-			dw_list.ResetEx();
+			dw_list.Reset();
 			dw_list.Redraw();
 		}
 		dw_list.SetReadOnly(true);
@@ -592,11 +590,11 @@
 
 	int PostOnAttachEvent()
 	{
-		AttachEvent(L"tv_folder", L"TVN_SELCHANGED", (FEvent)&GDN3list::OnTreeSelChanged); //树选择
-		//AttachEvent(L"tv_folder", L"TVN_ITEMEXPANDING",(FEvent)&GDN3list::OnTreeExpanding); //树展开
-		AttachEvent(L"dw_list", L"DWV_ROWFOCUSCHANGED", (FEvent)&GDN3list::OnRowChanged);
-		AttachEvent(L"cbx_1", L"CBN_SELCHANGE", (FEvent)&GDN3list::OnSelectDdlb);
-		AttachEvent(L"cbx_datashow", L"CBN_SELCHANGE", (FEvent)&GDN3list::OnSelectDataShowDdlb);
+		AttachEvent(L"tv_folder", L"TVN_SELCHANGED", (FEvent)&ListGDN3Win::OnTreeSelChanged); //树选择
+		//AttachEvent(L"tv_folder", L"TVN_ITEMEXPANDING",(FEvent)&ListGDN3Win::OnTreeExpanding); //树展开
+		AttachEvent(L"dw_list", L"DWV_ROWFOCUSCHANGED", (FEvent)&ListGDN3Win::OnRowChanged);
+		AttachEvent(L"cbx_1", L"CBN_SELCHANGE", (FEvent)&ListGDN3Win::OnSelectDdlb);
+		AttachEvent(L"cbx_datashow", L"CBN_SELCHANGE", (FEvent)&ListGDN3Win::OnSelectDataShowDdlb);
 		return 1;
 	}
 
@@ -707,7 +705,7 @@
 		}
 
 		HTREEITEM hItem = tv_folder.GetCaretItem();
-		if (hItem <= 0) return 1;
+		if (!hItem) return 1;
 		KXMLDOMElement e = tv_folder.GetItemData(hItem);
 		xstring  no = e.getAttribute(L"no");
 		if (no.find(L"Customer:") >= 0)

--
Gitblit v1.9.3