From 9ac9cc9e9cd91b97d35a6e28400df71630765e40 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 21 八月 2024 14:35:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/xcontrol/xdwtable.hpp | 87 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 84 insertions(+), 3 deletions(-)
diff --git a/jrj/xframe/xcontrol/xdwtable.hpp b/jrj/xframe/xcontrol/xdwtable.hpp
index 1469277..c51aa4b 100644
--- a/jrj/xframe/xcontrol/xdwtable.hpp
+++ b/jrj/xframe/xcontrol/xdwtable.hpp
@@ -165,12 +165,13 @@
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_(); } //寰楀埌鏁版嵁瑙嗗浘鐨勭骇鍙�
LPCTSTR GetDwXPath() { return GetDwTable()->GetDwXPath_(); } //寰楀埌鏁版嵁瑙嗗浘鐨刋PATH
public:
- kdwtable* GetParent() { return (kdwtable*)GetDwTable()->GetParent_(); } //寰楀埌鐖舵暟鎹瘯鍥�
+ xdwtable GetParent() { return GetDwTable()->GetParent_(); } //寰楀埌鐖舵暟鎹瘯鍥�
public:
int GetChildCount() { return GetDwTable()->GetChildCount_(); } //寰楀埌瀛愭暟鎹鍥炬暟
kdwtable* GetChild(int nIndex) { return (kdwtable*)GetDwTable()->GetChild_(nIndex); } //寰楀埌鎸囧畾搴忓彿鐨勫瓙鏁版嵁瑙嗗浘
@@ -338,10 +339,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 +449,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();
}
@@ -474,6 +537,24 @@
DwRetrieve(ServerUrl, src, arg.GetString());
return 1;
}
+
+ int RetrieveDiff(KXMLDOMElement pElement)
+ {
+ return 0;
+ }
+ int RetrieveDiff(KXMLDOMDocument& xml)
+ {
+ return 0;
+ }
+ int DwUpdateToDiff(KXMLDOMDocument pXmlDoc)
+ {
+ return 0;
+ }
+ int DwUpdateAllToDiff(KXMLDOMDocument pXmlDoc)
+ {
+ return 0;
+ }
+
};
--
Gitblit v1.9.3