From 3a3137b405af9728f9a7e4d7ee725498d0e8ecb7 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 18 七月 2024 09:25:10 +0800
Subject: [PATCH] system module

---
 jrj/project/business/BasicCode/QuickCode_Tree.cpp |   81 +++++++++++++++-------------------------
 1 files changed, 31 insertions(+), 50 deletions(-)

diff --git a/jrj/project/business/BasicCode/QuickCode_Tree.cpp b/jrj/project/business/BasicCode/QuickCode_Tree.cpp
index b8b99b0..334fe69 100644
--- a/jrj/project/business/BasicCode/QuickCode_Tree.cpp
+++ b/jrj/project/business/BasicCode/QuickCode_Tree.cpp
@@ -8,7 +8,7 @@
 #include "viewobject/view.base.hpp"
 
 using xml = KXMLDOMDocument;
-class __declspec(dllexport) QuickCode_Tree : public xwin
+class __declspec(dllexport) QuickCode_Tree : public listwin
 {
 public:
 	xdwgrid	dw_list;
@@ -25,19 +25,14 @@
 	xstring m_QueryTxt;
 	xnode	m_agentNode;
 public:
-	QuickCode_Tree(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
+	QuickCode_Tree(void* implPtr, HWND hWnd) :listwin(implPtr, hWnd) {}
 public:
 	static QuickCode_Tree* CreateInstance(void* implPtr, void* hWnd)
 	{
 		QuickCode_Tree* pWin = new QuickCode_Tree(implPtr, (HWND)hWnd);
 		return pWin;
 	}
-	int alert(xstring str)
-	{
-		TApp::alert(this, str);
-		//win::MessageBox(GetHWND(),str,L"提示:",0);
-		return 0;
-	}
+
 	int SetAgent()
 	{
 		xstring xfNodeAgentArea = L"agentarea";
@@ -289,14 +284,14 @@
 		//trace(x.xml());
 		//trace(strtpl);
 		xstring aa = strtpl;
-		var doc = x;
-		var n = doc.selectSingleNode(L"//resource[@url='" + aa + L"']/@src");
+		auto doc = x;
+		auto n = doc.selectSingleNode(L"//resource[@url='" + aa + L"']/@src");
 		//trace(n.text());			
 
 		xaserverarg arg;
 
 		arg.AddArg(L"sheet", n.text());
-		arg.AddArg(L"search", list::m_QueryTxt);
+		arg.AddArg(L"search", listwin::m_QueryTxt);
 		openUrl(L"view.dlg.vface/xpage/grid/column/search", arg);
 		xstring ok = arg.GetArgString(L"return");
 		if (ok == L"ok") {
@@ -331,9 +326,9 @@
 
 				kp.loadXML(L"<root></root>");
 				KXMLDOMElement ele = kp.documentElement();
-				var list = e.selectNodes(L"item[@update.modify='1' or @update.delete='1' ]");
+				auto list = e.selectNodes(L"item[@update.modify='1' or @update.delete='1' ]");
 				int j;
-				int k = list.length;
+				int k = list.length();
 				for (j = 0; j < k; j++)
 				{
 					KXMLDOMElement ele1 = list.item(j);
@@ -409,8 +404,7 @@
 	int OnSetFocus(TEvent* evt, LPARAM p)
 	{
 		SetAgent();
-		tv_1 = new treeview;
-		tv_1.setNativePointer(GetControl(L"tv_1"));
+		tv_1 = GetControl(L"tv_1");
 
 		HTREEITEM root = tv_1.GetRootItem();
 		tv_1.ExpandItem(root);
@@ -426,14 +420,14 @@
 
 		//xstring str = hdr.data;
 		xstring colname = hdr.colname;
-		xstring str = dw_list.GetItemString(row, colname);
+		xstring str = dw_list.GetItemString(row, colname.c_str());
 		arg.AddArg(L"value", str);
 		openUrl(L"/sale/view/view.dlg/xpage/memo/edit", arg);
 		xstring comdid = arg.GetArgString(L"comdid");
 		if (comdid == L"xmOK")
 		{
 			xstring value = arg.GetArgString(L"value");
-			dw_list.SetItemString(row, colname, value);
+			dw_list.SetItemString(row, colname.c_str(), value);
 			dw_list.Redraw();
 		}
 
@@ -441,7 +435,7 @@
 	}
 	int ItemOutput()
 	{
-		xstring d = xaserver::GetCurrentDate();
+		xstring d = publiccode::GetCurrentDate();
 		d = d.left(10) + L"";
 		dw_list.SaveAs(d);
 		return 1;
@@ -491,10 +485,10 @@
 		while (row > 0)
 		{
 			xstring tmp;
-			if (dw_list.GetItemDisplayString(row, col))
-				tmp = dw_list.GetItemDisplayString(row, col);
+			if (dw_list.GetItemDisplayString(row, col.c_str()))
+				tmp = dw_list.GetItemDisplayString(row, col.c_str());
 			else
-				tmp = dw_list.GetItemString(row, col);
+				tmp = dw_list.GetItemString(row, col.c_str());
 			str += tmp + L"\r\n";
 			row = dw_list.GetNextSelectRow(row + 1);
 		}
@@ -507,25 +501,25 @@
 		DWNMHDR& hdr = *(DWNMHDR*)evt->notify.pnmh;
 		int row = hdr.row;
 
-		int m = win::CreatePopupMenu();
+		HMENU m = CreatePopupMenu();
 		int MF_STRING = 0x00000000;
 		int MF_DISABLED = 0x00000002;
 		int TPM_RIGHTBUTTON = 0x0002;
 		int TPM_RETURNCMD = 0x0100;
 		int MF_CHECKED = 0x8;
 		int MF_SEPARATOR = 0x0800;
-		win::AppendMenu(m, MF_STRING, 1, L"复制行");
-		win::AppendMenu(m, MF_STRING, 101, L"复制列");
-		win::AppendMenu(m, MF_SEPARATOR, -1, L"");
-		win::AppendMenu(m, MF_STRING, 2, L"全选");
-		win::AppendMenu(m, MF_SEPARATOR, -1, L"");
-		win::AppendMenu(m, MF_STRING, 4, L"导出到Excel");
-		win::AppendMenu(m, MF_SEPARATOR, -1, L"");
-		win::AppendMenu(m, MF_STRING, 6, L"显示列设置");
-		xrect xr;
+		AppendMenu(m, MF_STRING, 1, L"复制行");
+		AppendMenu(m, MF_STRING, 101, L"复制列");
+		AppendMenu(m, MF_SEPARATOR, -1, L"");
+		AppendMenu(m, MF_STRING, 2, L"全选");
+		AppendMenu(m, MF_SEPARATOR, -1, L"");
+		AppendMenu(m, MF_STRING, 4, L"导出到Excel");
+		AppendMenu(m, MF_SEPARATOR, -1, L"");
+		AppendMenu(m, MF_STRING, 6, L"显示列设置");
+		RECT xr;
 		xpoint pt;
-		win::GetCursorPos(pt);
-		int ret = win::TrackPopupMenu(m, TPM_RIGHTBUTTON | TPM_RETURNCMD, pt.x, pt.y, 0, GetHWND(), xr);
+		GetCursorPos(pt);
+		int ret = TrackPopupMenu(m, TPM_RIGHTBUTTON | TPM_RETURNCMD, pt.x, pt.y, 0, GetHWND(), &xr);
 
 		//trace(ret);
 		HCURSOR hCursor = xutil::SetCursorWait();
@@ -577,20 +571,7 @@
 	{
 		if (GetWinParam())
 		{
-			xpage xp = new xpage;
-			xp.setNativePointer(GetXPage());
-			xstring aurl = xp.GetWkUrl();
-			xaserverarg arg;
-			if (aurl && aurl.find(L"native=true", 0) > 0)
-			{
-				int p = GetParam();
-				arg;
-				arg.setNativePointer(p);
-			}
-			else
-			{
-				arg = GetParam();
-			}
+			xaserverarg arg = GetArg();
 			xstring config = arg.GetArgString(L"config");
 			xml x;
 
@@ -614,7 +595,7 @@
 		getURLParam();
 		KXMLDOMDocument	 ee = m_configDoc;
 		xstring id = m_id;
-		var n = ee.selectSingleNode(L"//list/dwview[@type='dwgrid'][@id='" + id + L"']");
+		auto n = ee.selectSingleNode(L"//list/dwview[@type='dwgrid'][@id='" + id + L"']");
 		if (n)
 		{
 			KXMLDOMElement e = n;
@@ -639,6 +620,7 @@
 			trace(tpl);
 
 		}
+		return 1;
 	}
 	int onload()
 	{
@@ -684,8 +666,7 @@
 		stree += L"</xtree></vbox>";
 		SetAgentNode(tnode, stree);
 
-		tv_1 = new treeview;
-		tv_1.setNativePointer(GetControl(L"tv_1"));
+		tv_1 = GetControl(L"tv_1");
 		
 		HTREEITEM root = tv_1.GetRootItem();
 		tv_1.ExpandItem( root);

--
Gitblit v1.9.3