From de9349d5502e956b09cebccb2c9dbb66f62a42f0 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期一, 15 七月 2024 17:34:05 +0800
Subject: [PATCH] update

---
 jrj/xframe/xcontrol/xdwgrid.hpp |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/jrj/xframe/xcontrol/xdwgrid.hpp b/jrj/xframe/xcontrol/xdwgrid.hpp
index 254e5ff..e32e3a1 100644
--- a/jrj/xframe/xcontrol/xdwgrid.hpp
+++ b/jrj/xframe/xcontrol/xdwgrid.hpp
@@ -52,7 +52,7 @@
 	{
 		return getKReport()->SaveAs_(pXmlArg);
 	}
-	int SaveAs(KXMLDOMDocument& xml, LPCTSTR pFileName = NULL) //鍙﹀瓨涓�
+	int SaveAs(KXMLDOMDocument xml, LPCTSTR pFileName = NULL) //鍙﹀瓨涓�
 	{
 		return getKReport()->SaveAs_(xml,pFileName);
 	}
@@ -83,8 +83,8 @@
 	//int Retrieve(ITrans *pTrans,LPCTSTR pDataUrl, LPCTSTR pArgStr);//璇诲彇鏁版嵁
 	int Retrieve(LPCTSTR pDataUrl, LPCTSTR pArgStr) { return getKReport()->Retrieve_(pDataUrl, pArgStr); }//璇诲彇鏁版嵁
 
-	int Retrieve(KXMLDOMElement  pElement) { return getKReport()->Retrieve_(pElement); }//璇诲彇鏁版嵁
-	int Retrieve(KXMLDOMDocument& xml) { return  getKReport()->Retrieve_(xml); }//璇诲彇鏁版嵁
+	int Retrieve(KXMLDOMElement  pElement) { return pElement?getKReport()->Retrieve_(pElement):0; }//璇诲彇鏁版嵁
+	int Retrieve(KXMLDOMDocument xml) { return  xml?getKReport()->Retrieve_(xml):0; }//璇诲彇鏁版嵁
 
 public:
 	int SetDataObject(LPCTSTR pServer, LPCTSTR pUrl) { return getKReport()->SetDataObject_(pServer, pUrl); }//璁剧疆妯℃澘瀵硅薄
@@ -270,9 +270,9 @@
 		return getKReport()->GetTitleName(col);
 	}
 public:
-	int SetRowSort(LPTSTR colName, bool colOrder = true)
+	int SetRowSort(LPCTSTR colName, bool colOrder = true)
 	{
-		return getKReport()->SetRowSort(colName, colOrder);
+		return getKReport()->SetRowSort((LPTSTR)colName, colOrder);
 	}
 	int SetClickEditFlag(bool f)
 	{
@@ -334,6 +334,11 @@
 		return getKReport()->AddRepeats(colName);
 	}
 public:
+	void ShowEditor()
+	{
+		getKReport()->ShowEditor();
+	}
+public:
 	LPCTSTR GetColumnProp(int nCol, LPCTSTR pItem)
 	{
 		return L"";
@@ -390,6 +395,15 @@
 		return SetItemString(row, col.c_str(), xstring(str));
 	}
 
+	int DataBI(LPCTSTR pSchema = NULL) //鏁版嵁BI鍒嗘瀽
+	{
+		return getKReport()->DataBI_(pSchema);
+	}
+	LPTSTR DataAnalysis(LPCTSTR pSchema = NULL)
+	{
+		return getKReport()->DataAnalysis(pSchema);
+	}
+
 public:
 	int openUrl(string aurl)
 	{

--
Gitblit v1.9.3