From 94d3840bda13f23c0cd4619a99ac215b74ffcd94 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 07 十一月 2024 13:54:14 +0800
Subject: [PATCH] update
---
jrj/xframe/xcontrol/xdwtable.hpp | 91 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 79 insertions(+), 12 deletions(-)
diff --git a/jrj/xframe/xcontrol/xdwtable.hpp b/jrj/xframe/xcontrol/xdwtable.hpp
index 4dfd9bf..78c4ca5 100644
--- a/jrj/xframe/xcontrol/xdwtable.hpp
+++ b/jrj/xframe/xcontrol/xdwtable.hpp
@@ -23,16 +23,16 @@
public:
int SetRow(int row) { return GetDwTable()->SetRow_(row); }
public:
- LPCTSTR GetNote(int nRow, int nColumn) { return GetDwTable()->GetNote_(nRow, nColumn); }//寰楀埌澶囨敞
+ xstring GetNote(int nRow, int nColumn) { return GetDwTable()->GetNote_(nRow, nColumn); }//寰楀埌澶囨敞
bool SetNote(int nRow, int nColumn, LPCTSTR pStrNote) { return GetDwTable()->SetNote_(nRow, nColumn, pStrNote); } //璁剧疆澶囨敞
bool AddNote(int nRow, int nColumn, LPCTSTR pStrNote, LPCTSTR pUser = NULL, LPCTSTR pData = NULL) { return GetDwTable()->AddNote_(nRow, nColumn, pStrNote, pUser, pData); } //璁剧疆澶囨敞
- LPCTSTR GetNote1(int nRow, int nColumn) { return GetDwTable()->GetNote1_(nRow, nColumn); }//寰楀埌淇敼
+ xstring GetNote1(int nRow, int nColumn) { return GetDwTable()->GetNote1_(nRow, nColumn); }//寰楀埌淇敼
bool SetNote1(int nRow, int nColumn, LPCTSTR pStrNote) { return GetDwTable()->SetNote1_(nRow, nColumn, pStrNote); } //璁剧疆淇敼
bool AddNote1(int nRow, int nColumn, LPCTSTR pStrNote, LPCTSTR pUser = NULL, LPCTSTR pData = NULL) { return GetDwTable()->AddNote1_(nRow, nColumn, pStrNote, pUser, pData); } //璁剧疆淇敼
- LPCTSTR GetNote2(int nRow, int nColumn) { return GetDwTable()->GetNote2_(nRow, nColumn); }//寰楀埌鎵规敞
- bool SetNote2(int nRow, int nColumn, LPCTSTR pStrNote) { return GetDwTable()->SetNote2_(nRow, nColumn, pStrNote); } //璁剧疆鎵规敞
+ xstring GetNote2(int nRow, int nColumn) { return GetDwTable()->GetNote2_(nRow, nColumn); }//寰楀埌鎵规敞
+ bool SetNote2(int nRow, int nColumn, xstring pStrNote) { return GetDwTable()->SetNote2_(nRow, nColumn, pStrNote); } //璁剧疆鎵规敞
bool AddNote2(int nRow, int nColumn, LPCTSTR pStrNote, LPCTSTR pUser = NULL, LPCTSTR pData = NULL) { return GetDwTable()->AddNote2_(nRow, nColumn, pStrNote, pUser, pData); } //璁剧疆鎵规敞
public:
@@ -41,7 +41,7 @@
int InsertRows(int nRow, int nAmt) { return GetDwTable()->InsertRows_(nRow, nAmt); }//鎻掑叆澶氳
int DeleteRows(int nRow, int nAmt) { return GetDwTable()->DeleteRows_(nRow, nAmt); }//鍒犻櫎澶氳
public:
- LPCTSTR GetColumnName(int nColumn) { return GetDwTable()->GetColumnName_(nColumn); }//寰楀埌鍒楀悕
+ xstring GetColumnName(int nColumn) { return GetDwTable()->GetColumnName_(nColumn); }//寰楀埌鍒楀悕
int GetColumnIndex(LPCTSTR pColumn) { return GetDwTable()->GetColumnIndex_(pColumn); } //寰楀埌鍒楀彿
public:
//LPCTSTR GetItemString(int nRow, int nColumn, kdwtable::DWBuffer dwBuffer = kdwtable::dbuf_normal) { return GetDwTable()->GetItemString_(nRow, nColumn, dwBuffer); }//寰楀埌鏁版嵁鍊�
@@ -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,17 +169,18 @@
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
+ xstring GetDwXPath() { return GetDwTable()->GetDwXPath_(); } //寰楀埌鏁版嵁瑙嗗浘鐨刋PATH
public:
xdwtable GetParent() { return GetDwTable()->GetParent_(); } //寰楀埌鐖舵暟鎹瘯鍥�
public:
int GetChildCount() { return GetDwTable()->GetChildCount_(); } //寰楀埌瀛愭暟鎹鍥炬暟
kdwtable* GetChild(int nIndex) { return (kdwtable*)GetDwTable()->GetChild_(nIndex); } //寰楀埌鎸囧畾搴忓彿鐨勫瓙鏁版嵁瑙嗗浘
public:
- LPCTSTR GetDwName() { return GetDwTable()->GetDwName_(); } //寰楀埌鏁版嵁瑙嗗浘鐨勫悕绉�
+ xstring GetDwName() { return GetDwTable()->GetDwName_(); } //寰楀埌鏁版嵁瑙嗗浘鐨勫悕绉�
kdwtable* FindDwTable(LPCTSTR pStrName, kdwtable* pParent = NULL) { return (kdwtable*)GetDwTable()->FindDwTable_(pStrName, (Hxsoft::XFrame::IDwView*)pParent); } //鏌ユ壘鏁版嵁璇曞浘
kdwtable* GetCurTable(int& nRow, int& nCol) { return (kdwtable*)GetDwTable()->GetCurTable_(nRow, nCol); }//寰楀埌褰撳墠鏁版嵁瑙嗗浘锛屽苟杩斿洖琛屽垪
kdwtable* GetCurTable() { return (kdwtable*)GetDwTable()->GetCurTable_(); }//寰楀埌褰撳墠鏁版嵁瑙嗗浘
@@ -290,7 +295,7 @@
return GetDwTable()->ClearAdvanceString( nRow, nCol);
}
public:
- LPCTSTR GetGuid(int nRow)
+ xstring GetGuid(int nRow)
{
return GetDwTable()->GetGuid(nRow);
}
@@ -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();
}
--
Gitblit v1.9.3