From 0b8444d0eef50d1ee4e0d0b51e174fa5b447d802 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 17 七月 2024 17:50:35 +0800
Subject: [PATCH] base code

---
 jrj/project/analysis/DataVanalysisWin.cpp |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/jrj/project/analysis/DataVanalysisWin.cpp b/jrj/project/analysis/DataVanalysisWin.cpp
index d1532db..df20830 100644
--- a/jrj/project/analysis/DataVanalysisWin.cpp
+++ b/jrj/project/analysis/DataVanalysisWin.cpp
@@ -5,20 +5,20 @@
 #include <xcontrol/ximageview.hpp>
 #include <xcontrol/xhtml.hpp>
 #include <xcontrol/xexcel.hpp>
-#include "vbusiness/util/publiccode.vutil.vbusiness.hpp "
+#include <vbusiness/vutil/publiccode.vutil.vbusiness.hpp>
 
 using xml = KXMLDOMDocument;
 class __declspec(dllexport) DataVanalysisWin : public xwin
 {
 public:
-	DataVanalysisWin(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
+	DataVanalysisWin(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd),dw_data(0){}
 	static DataVanalysisWin* CreateInstance(void* implPtr, void* hWnd)
 	{
 		return new DataVanalysisWin(implPtr, (HWND)hWnd);
 	}
 public:
 	xhtml	ole_html;
-	xdwgrid  dw_data;
+	xdwgrid*  dw_data;
 	xnode	m_agentNode;	//Agent Condition
 	xstring   htmlStr;
 	xexcel   excel;
@@ -58,7 +58,7 @@
 		HCURSOR hCursor = xutil::SetCursorWait();
 		if (comdid == L"xmConfig")
 		{
-			xstring str = dw_data.DataAnalysis(L"");
+			xstring str = dw_data->DataAnalysis(L"");
 			if (str != L"")
 			{
 				ole_html.LoadHtml(str);
@@ -88,7 +88,7 @@
 
 			xaserver::CreateDirectory(L"C:\\Temp");
 			xstring gid = publiccode::GetGuid();
-			xutil::SaveToFile(L"C:\\Temp\\" + gid + L".html", htmlStr, L"", L"", L"");
+			xutil::SaveToFile(L"C:\\Temp\\" + gid + L".html", htmlStr, L"", L"");
 			excel.OpenDocument(L"C:\\Temp\\" + gid + L".html");
 			excel.put_Visible(true);
 			return 1;
@@ -110,12 +110,14 @@
 		AttachEvent(L"WM_XCOMMAND", (FEvent)&DataVanalysisWin::OnXCommand);
 		//获取焦点事件,用于重置工具条
 		AttachEvent(L"WM_SETFOCUS", (FEvent)&DataVanalysisWin::OnSetFocus);
+
+		return 1;
 	}
 
 	int onload()
 	{
 		htmlStr = L"";
-		ole_html = GetControl(L"ole_html");
+		ole_html = GetControl(L"ole_1");
 		if (!GetWinParam()) return 1;
 		SetArg();
 		xaserverarg arg = GetArg();
@@ -125,7 +127,7 @@
 			htmlStr = str;
 			ole_html.LoadHtml(str);
 		}
-		dw_data = *(xdwgrid*)arg.GetParam(L"obj");
+		dw_data = (xdwgrid*)arg.GetParam(L"obj");
 
 		OnAttachEvent();
 

--
Gitblit v1.9.3