From a4344c9bada0722c6ef7fac5d95f29a110eea0f1 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 21 四月 2025 10:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/xcontrol/xdwgrid.hpp | 90 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 80 insertions(+), 10 deletions(-)
diff --git a/jrj/xframe/xcontrol/xdwgrid.hpp b/jrj/xframe/xcontrol/xdwgrid.hpp
index 9436db8..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)
{
@@ -286,7 +286,7 @@
}
int Redraw()
{
- return getKReport()->RedrawEx();
+ return getKReport()->Redraw();
}
bool SetRowMove(int row, int movecount)
{
@@ -400,7 +400,7 @@
bool SetItemDouble(int row, xstring col, double str)
{
- return SetItemString(row, col.c_str(), xstring(str));
+ return SetItemString(row, col, xstring(str));
}
int DataBI(LPCTSTR pSchema = NULL) //鏁版嵁BI鍒嗘瀽
@@ -410,6 +410,58 @@
LPTSTR DataAnalysis(LPCTSTR pSchema = NULL)
{
return getKReport()->DataAnalysis(pSchema);
+ }
+
+ xstring GetItemString(int nRow, xstring ColumnName, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->GetItemString_(nRow, ColumnName.c_str(),dwBuffer);
+ }
+
+ bool SetItemString(int nRow, int ColumnName, xstring lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemString_(nRow, ColumnName, lptStr.c_str(), dwBuffer);
+ }
+
+ bool SetItemString(int nRow, LPCTSTR ColumnName, xstring lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemString_(nRow, ColumnName, lptStr.c_str(), dwBuffer);
+ }
+
+ bool SetItemString(int nRow, xstring ColumnName,xstring lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemString_(nRow, ColumnName.c_str(), lptStr.c_str(), dwBuffer);
+ }
+ bool SetItemString(int nRow, xstring ColumnName, LPCTSTR lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemString_(nRow, ColumnName.c_str(), lptStr, dwBuffer);
+ }
+
+ xstring GetItemDisplayString(int nRow, xstring ColumnName, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->GetItemDisplayString(nRow, ColumnName.c_str(), dwBuffer);
+ }
+
+ bool SetItemDisplayString(int nRow, int ColumnName, xstring lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemDisplayString(nRow, ColumnName, lptStr.c_str(), dwBuffer);
+ }
+
+ bool SetItemDisplayString(int nRow, LPCTSTR ColumnName, xstring lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemDisplayString(nRow, ColumnName, lptStr.c_str(), dwBuffer);
+ }
+
+ bool SetItemDisplayString(int nRow, xstring ColumnName, xstring lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemDisplayString(nRow, ColumnName.c_str(), lptStr.c_str(), dwBuffer);
+ }
+ bool SetItemDisplayString(int nRow, xstring ColumnName, LPCTSTR lptStr, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->SetItemDisplayString(nRow, ColumnName.c_str(), lptStr, dwBuffer);
+ }
+ LPCTSTR GetItemTipString(int nRow, xstring ColumnName, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
+ {
+ return getKReport()->GetItemTipString(nRow, ColumnName.c_str(), dwBuffer);
}
public:
@@ -520,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