From 03ef0b51103c735077c784c7df81ae2bcc1599ab Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 13 二月 2025 18:33:56 +0800
Subject: [PATCH] update

---
 jrj/xframe/xcontrol/xdwgrid.hpp |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/jrj/xframe/xcontrol/xdwgrid.hpp b/jrj/xframe/xcontrol/xdwgrid.hpp
index 0781f6f..16c97b0 100644
--- a/jrj/xframe/xcontrol/xdwgrid.hpp
+++ b/jrj/xframe/xcontrol/xdwgrid.hpp
@@ -28,7 +28,7 @@
 	int SetRow(int row) { return getKReport()->SetRow_(row); }
 public:
 	int GetColumnCount() { return getKReport()->GetColumnCount_(); }
-	LPCTSTR GetColumnName(int col) { return getKReport()->GetColumnName_(col); }
+	xstring GetColumnName(int col) { return getKReport()->GetColumnName_(col); }
 	int GetColumnIndex(LPCTSTR pColumn) { return getKReport()->GetColumnIndex_(pColumn); }
 public:
 	xstring GetItemString(int nRow, int nColumn, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
@@ -212,22 +212,22 @@
 		return getKReport()->AllowSort(sort);
 	}
 public:
-	int FindByColumn(int startRow, int columnIndex, LPCTSTR columnValue)
+	int FindByColumn(int startRow, int columnIndex, xstring columnValue)
 	{
-		return getKReport()->FindByColumn(startRow, columnIndex, columnValue);
+		return getKReport()->FindByColumn(startRow, columnIndex, columnValue.c_str());
 	}
-	int FindByColumn(int startRow, LPCTSTR column, LPCTSTR columnValue)
+	int FindByColumn(int startRow, xstring column, xstring columnValue)
 	{
-		return getKReport()->FindByColumn(startRow,column,columnValue);
+		return getKReport()->FindByColumn(startRow,column.c_str(), columnValue.c_str());
 	}
 
 	int SetReadOnlyColumn(int columnIndex, bool flag = true)
 	{
 		return getKReport()->SetReadOnlyColumn(columnIndex, flag);
 	}
-	int SetReadOnlyColumn(LPCTSTR column, bool flag = true)
+	int SetReadOnlyColumn(xstring column, bool flag = true)
 	{
-		return getKReport()->SetReadOnlyColumn(column, flag);
+		return getKReport()->SetReadOnlyColumn(column.c_str(), flag);
 	}
 
 	int SetColumnWidth(int columnIndex, int width = 1)
@@ -261,7 +261,7 @@
 	}
 	int AcceptText()
 	{
-		return getKReport()->AcceptText();
+		return getKReport()->AcceptText_();
 	}
 	int ShowRowTo(int row)
 	{
@@ -572,6 +572,24 @@
 		DwRetrieve(ServerUrl, src, arg.GetString());
 		return 1;
 	}
+
+	xstring GetItemDisplayXmlString(int nRow, int nColumn, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+	{
+		return xutil::ToXmlText(getKReport()->GetItemDisplayString(nRow, nColumn, dwBuffer));
+	}
+	xstring GetItemDisplayXmlString(int nRow, xstring ColumnName, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+	{
+		return xutil::ToXmlText(getKReport()->GetItemDisplayString(nRow, ColumnName.c_str(), dwBuffer));
+	}
+	xstring GetItemXmlString(int nRow, int nColumn, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+	{
+		return xutil::ToXmlText(getKReport()->GetItemString_(nRow, nColumn, dwBuffer));
+	}
+	xstring GetItemXmlString(int nRow, xstring ColumnName, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+	{
+		return xutil::ToXmlText(getKReport()->GetItemString_(nRow, ColumnName.c_str(), dwBuffer));
+	}
+
 };
 
 

--
Gitblit v1.9.3