From 62a635fd585aa1bafb83c2aea1ac29a508a77ae2 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 22 七月 2024 23:25:50 +0800
Subject: [PATCH] update assign

---
 jrj/xframe/xcontrol/xdwgrid.hpp |   47 ++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/jrj/xframe/xcontrol/xdwgrid.hpp b/jrj/xframe/xcontrol/xdwgrid.hpp
index 8f4a517..9436db8 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);
 	}
@@ -71,6 +71,7 @@
 	int SelectRow(int nRow, bool bSelect = true) { return getKReport()->SelectRow_(nRow, bSelect); }
 	int SelectRow(int sRow, int eRow, bool bSelect = true) { return getKReport()->SelectRow_(sRow, eRow, bSelect); }
 	int GetNextSelectRow(int nStartRow) { return getKReport()->GetNextSelectRow_(nStartRow); }
+	int GetPrevSelectRow(int nStartRow) { return getKReport()->GetPrevSelectRow(nStartRow); }
 	bool IsRowSelected(int nRow) { return getKReport()->IsRowSelected_(nRow); }
 	//int SetSelectBkColor(COLORREF color){return getKReport()->SetSelectBkColor_(color);}
 	int SetSelectionMode(int nMode) { return getKReport()->SetSelectionMode_(nMode); } //0 unselection 1 singleSelection 2 multiselection 3 multiselectionex 
@@ -83,8 +84,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); }//璁剧疆妯℃澘瀵硅薄
@@ -101,6 +102,11 @@
 public:
 	int	Reset() { return getKReport()->Reset_(); }
 	int	ResetUpdateStatus() { return getKReport()->ResetUpdateStatus_(); }
+public:
+	LPTSTR GetColumnProps(LPCTSTR pColName) { return getKReport()->GetColumnProps_(pColName); } //寰楀埌鍒楁暣浣揦ML灞炴��
+	int SetColumnProps(LPCTSTR pColName, LPCTSTR pXmlProp) { return getKReport()->SetColumnProps_(pColName, pXmlProp); } //璁剧疆鍒楁暣浣揦ML灞炴��
+	LPTSTR GetColumnProp(LPCTSTR pColName, LPCTSTR pItem) { return getKReport()->GetColumnProp_(pColName, pItem); } //寰楀埌鍒楀睘鎬�
+	int SetColumnProp(LPCTSTR pColName, LPCTSTR pItem, LPCTSTR pProp) { return getKReport()->SetColumnProp_(pColName, pItem, pProp); }//璁剧疆鍒楀睘鎬�
 
 public:
 	int event_ItemFocusChanged(int nRow, int nCol) { return getKReport()->event_ItemFocusChanged_(nRow, nCol); }
@@ -270,9 +276,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)
 	{
@@ -302,9 +308,9 @@
 	{
 		return getKReport()->RetrieveDiff(xml);
 	}
-	int Filter(LPTSTR pColumn, LPTSTR pStr)
+	int Filter(LPCTSTR pColumn, LPCTSTR pStr)
 	{
-		return getKReport()->Filter(pColumn, pStr);
+		return getKReport()->Filter((LPTSTR)pColumn, (LPTSTR)pStr);
 	}
 public:
 	int SetHeaderText(int row, int col, LPTSTR name)
@@ -334,6 +340,12 @@
 		return getKReport()->AddRepeats(colName);
 	}
 public:
+	void ShowEditor()
+	{
+		getKReport()->ShowEditor();
+	}
+public:
+	/*
 	LPCTSTR GetColumnProp(int nCol, LPCTSTR pItem)
 	{
 		return L"";
@@ -345,6 +357,7 @@
 		return L"";
 		//return getKReport()->GetColumnProp(pColName, pItem);
 	}
+	*/
 
 	int GetItemInt(int row, int col)
 	{
@@ -388,6 +401,15 @@
 	bool SetItemDouble(int row, xstring col, double str)
 	{
 		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:
@@ -460,6 +482,17 @@
 		return L"";
 	}
 
+	int SetGuid(int row,xstring val)
+	{
+		KXMLDOMElement  e = GetRowElement(row);
+		if (e)
+		{
+			e.setAttribute(L"guid",val.c_str());
+			return 1;
+		}
+		return 0;
+	}
+
 public:
 
 	int DwRetrieve(string ServerUrl, string src, string argstr)

--
Gitblit v1.9.3