From 8da3dba7cd9f7d64876af84c2ce37da87d7113d2 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期一, 02 九月 2024 18:52:38 +0800
Subject: [PATCH] update

---
 jrj/xframe/xcontrol/xdwtable.hpp |   79 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/jrj/xframe/xcontrol/xdwtable.hpp b/jrj/xframe/xcontrol/xdwtable.hpp
index 7823808..fe217e8 100644
--- a/jrj/xframe/xcontrol/xdwtable.hpp
+++ b/jrj/xframe/xcontrol/xdwtable.hpp
@@ -83,8 +83,12 @@
 public:
 	int ClearObserver() { return GetDwTable()-> ClearObserver_(); }//娓呴櫎浜嬩欢渚﹀惉瀵硅薄
 public:
-	int DwUpdateTo(KXMLDOMDocument pXmlDoc) { return GetDwTable()->DwUpdateTo_(pXmlDoc); }//鎶婃暟鎹洿鏂板埌XML瀵硅薄涓�
-	int DwUpdateAllTo(KXMLDOMDocument  pXmlDoc) { return GetDwTable()->DwUpdateAllTo_(pXmlDoc); }//鎶婃暟鎹洿鏂板埌XML瀵硅薄涓�
+	int DwUpdateTo(KXMLDOMDocument pXmlDoc) { 		
+		return GetDwTable()->DwUpdateTo_(pXmlDoc); 
+	}//鎶婃暟鎹洿鏂板埌XML瀵硅薄涓�
+	int DwUpdateAllTo(KXMLDOMDocument  pXmlDoc) { 
+		return GetDwTable()->DwUpdateAllTo_(pXmlDoc);
+	}//鎶婃暟鎹洿鏂板埌XML瀵硅薄涓�
 public:
 	int Retrieve(LPCTSTR pServer, LPCTSTR pDataUrl, LPCTSTR pArgStr) { return GetDwTable()->Retrieve_(pServer, pDataUrl, pArgStr); }//璇诲彇鏁版嵁
 	int Retrieve(LPCTSTR pDataUrl, LPCTSTR pArgStr) { return GetDwTable()->Retrieve_(pDataUrl, pArgStr); }//璇诲彇鏁版嵁
@@ -165,6 +169,7 @@
 	int GetGroupStartRow(int nGroup) { return GetDwTable()->GetGroupStartRow_(nGroup); } //寰楀埌鎸囧畾缁勭殑寮�濮嬭
 	int GetGroupRowCount(int nGroup) { return GetDwTable()->GetGroupRowCount_(nGroup); } //寰楀埌鎸囧畾缁勭殑缁撴潫琛�
 	int InsertGroupRow(int nGroup, int nRow) { return GetDwTable()->InsertGroupRow_(nGroup, nRow); } //鎻掑叆缁勮
+	int GetGroupFromRow(int nRow) { return GetDwTable()->GetGroupFromRow(nRow); }
 public:
 	int GetMaxDeep() { return GetDwTable()->GetMaxDeep_(); } //鎻掑叆鏁版嵁瑙嗗浘鐨勬渶澶ф繁搴�
 	int GetLevel() { return GetDwTable()->GetLevel_(); } //寰楀埌鏁版嵁瑙嗗浘鐨勭骇鍙�
@@ -338,10 +343,69 @@
 	{
 		return GetDwTable()->SetItemTipString(nRow, ColumnName, lptStr, dwBuffer);
 	}
+
+	xstring GetItemString(int nRow, xstring ColumnName, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->GetItemString_(nRow, ColumnName.c_str(), dwBuffer);
+	}//寰楀埌鏁版嵁鍊�
+	xstring SetItemString(int nRow, xstring ColumnName, LPCTSTR value,kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->SetItemString_(nRow, ColumnName.c_str(),value, dwBuffer);
+	}
+	xstring SetItemString(int nRow, xstring ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->SetItemString_(nRow, ColumnName.c_str(), value.c_str(), dwBuffer);
+	}
+	xstring SetItemString(int nRow, LPCTSTR ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->SetItemString_(nRow, ColumnName, value.c_str(), dwBuffer);
+	}
+	xstring SetItemString(int nRow, int ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->SetItemString_(nRow, ColumnName, value.c_str(), dwBuffer);
+	}
+
+	xstring GetItemDisplayString(int nRow, xstring ColumnName, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->GetItemDisplayString(nRow, ColumnName.c_str(), dwBuffer);
+	}//寰楀埌鏁版嵁鍊�
+	xstring SetItemDisplayString(int nRow, xstring ColumnName, LPCTSTR value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->SetItemDisplayString(nRow, ColumnName.c_str(), value, dwBuffer);
+	}
+	xstring SetItemDisplayString(int nRow, xstring ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->SetItemDisplayString(nRow, ColumnName.c_str(), value.c_str(), dwBuffer);
+	}
+	xstring SetItemDisplayString(int nRow, LPCTSTR ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->SetItemDisplayString(nRow, ColumnName, value.c_str(), dwBuffer);
+	}
+	xstring SetItemDisplayString(int nRow, int ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->SetItemDisplayString(nRow, ColumnName, value.c_str(), dwBuffer);
+	}
+
+	xstring ItemChangeTo(int nRow, xstring ColumnName, LPCTSTR value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->ItemChangeTo(nRow, ColumnName.c_str(), value, dwBuffer);
+	}
+	xstring ItemChangeTo(int nRow, xstring ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->ItemChangeTo(nRow, ColumnName.c_str(), value.c_str(), dwBuffer);
+	}
+	xstring ItemChangeTo(int nRow, LPCTSTR ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->ItemChangeTo(nRow, ColumnName, value.c_str(), dwBuffer);
+	}
+	xstring ItemChangeTo(int nRow, int ColumnName, xstring value, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal)
+	{
+		return GetDwTable()->ItemChangeTo(nRow, ColumnName, value.c_str(), dwBuffer);
+	}
 public:
 	int AcceptText()
 	{
-		return GetDwTable()->AcceptText();
+		return GetDwTable()->AcceptText_();
 	}
 	int getNullCell(POINT& p)
 	{
@@ -389,29 +453,32 @@
 	{
 		return GetDwTable()->SetRowSort(colName, colOrder);
 	}
-
 public:
 	int GetItemInt(int row, int col)
 	{
 		xstring str = GetItemString(row, col);
+		str = str.replace(L",", L"");
 		return str.toInt();
 	}
 
 	double GetItemDouble(int row, int col)
 	{
 		xstring str = GetItemString(row, col);
+		str = str.replace(L",", L"");
 		return str.toDouble();
 	}
 
 	int GetItemInt(int row, string col)
 	{
 		xstring str = GetItemString(row, col);
+		str = str.replace(L",", L"");
 		return str.toInt();
 	}
 
 	double GetItemDouble(int row, string col)
 	{
 		xstring str = GetItemString(row, col);
+		str = str.replace(L",", L"");
 		return str.toDouble();
 	}
 
@@ -483,11 +550,11 @@
 	{
 		return 0;
 	}
-	int DwUpdateToDiff_(KXMLDOMDocument  pXmlDoc)
+	int DwUpdateToDiff(KXMLDOMDocument  pXmlDoc)
 	{
 		return 0;
 	}
-	int DwUpdateAllToDiff_(KXMLDOMDocument  pXmlDoc)
+	int DwUpdateAllToDiff(KXMLDOMDocument  pXmlDoc)
 	{
 		return 0;
 	}

--
Gitblit v1.9.3