From e4b4c508c599943ddb22b7d4868ccd40ac05a043 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 27 六月 2024 16:06:10 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/GDN3.list.cpp | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/jrj/project/business/GDN3.list.cpp b/jrj/project/business/GDN3.list.cpp
index 51cf513..8d9a8fd 100644
--- a/jrj/project/business/GDN3.list.cpp
+++ b/jrj/project/business/GDN3.list.cpp
@@ -4,15 +4,15 @@
#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;
}
@@ -80,14 +80,18 @@
int ExpandFolderItem(HTREEITEM hItem, xstring no)
{
//xml x = ViewObject::RetrieveData(urlTree,L"no",no);
- xml x = xml::Make();
+ /*xml x = xml::Make();
xaserverarg arg = xaserverarg::Make();
arg.AddArg(L"no", no);
xaserver::ExecXQuery(GetServerUrl(), L"[customerfolder.gdn.sql.xq]", arg.GetString(), x);
+ */
+
+
+ KXMLDOMDocument x = ViewObject::RetrieveData(GetServerUrl(), L"[customerfolder.gdn.sql.xq]", L"id", no);
if (!x) return 0;
- KXMLDOMNodeList nlist = x.SelectNodes(L"/data/item");
+ KXMLDOMNodeList nlist = x.selectNodes(L"/data/item");
int len = nlist.length();
for (int i = 0; i < len; i++)
{
@@ -96,7 +100,6 @@
HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, 35);
ExpandCatChildFolder(h, e, 35);
}
- x.Free();
return 1;
}
@@ -197,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);
@@ -208,10 +211,11 @@
//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);
+
trace(no + L"***" + m_QueryTxt + L"***" + rows);
/*if(DeptName==L"跟单部"){
dw_list.DwRetrieve(GetServerUrl(),L"[list.creator.gdn.sql.xq]",arg.GetString());
@@ -219,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);
@@ -233,7 +236,7 @@
int OnPreRetrieve()
{
HTREEITEM hItem = tv_folder.GetSelectedItem();
- if (hItem <= 0) return 1;
+ if (!hItem) return 1;
HCURSOR hCursor = xutil::SetCursorWait();
@@ -249,7 +252,7 @@
}
else
{
- dw_list.ResetEx();
+ dw_list.Reset();
dw_list.Redraw();
}
dw_list.SetReadOnly(true);
@@ -556,9 +559,8 @@
int OnSelectDdlb(TEvent* evt, LPARAM p)
{
changeddlb = 1;
- int wid = ddlb_1.GetId();
int CB_GETCURSEL = 0x0147;
- int nIndex = SendMessageW(wid, CB_GETCURSEL, 0, 0);
+ int nIndex = SendMessageW(HWND(), CB_GETCURSEL, 0, 0);
KXMLDOMElement e = ddlb_1.GetElement();
KXMLDOMElement e2 = e.selectSingleNode(L"item[" + xstring(nIndex + 1) + L"]");
xstring no = e2.selectSingleNode(L"@element").text();
@@ -575,9 +577,8 @@
int OnSelectDataShowDdlb(TEvent* evt, LPARAM p)
{
- int wid = cbx_datashow.GetId();
int CB_GETCURSEL = 0x0147;
- int nIndex = SendMessageW(wid, CB_GETCURSEL, 0, 0);
+ int nIndex = SendMessageW(HWND(), CB_GETCURSEL, 0, 0);
KXMLDOMElement e = cbx_datashow.GetElement();
KXMLDOMElement e2 = e.selectSingleNode(L"item[" + xstring(nIndex + 1) + L"]");
rows = e2.selectSingleNode(L"@rows").text();
@@ -587,13 +588,13 @@
}
- int AttachEvent()
+ 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;
}
@@ -679,7 +680,7 @@
//attach my control event
- AttachEvent();
+ PostOnAttachEvent();
readed = false;
@@ -704,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