From 4988c8950db8640eaeb2498b51aca2dfed2c685b Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 15 七月 2024 12:10:15 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/xcontrol/xdwgrid.hpp | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/jrj/xframe/xcontrol/xdwgrid.hpp b/jrj/xframe/xcontrol/xdwgrid.hpp
index 254e5ff..8525154 100644
--- a/jrj/xframe/xcontrol/xdwgrid.hpp
+++ b/jrj/xframe/xcontrol/xdwgrid.hpp
@@ -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