From 9c190b7a9a845bcb35d3d09d255f12d9c879e403 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 23 十月 2024 18:07:50 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/xcontrol/xdwtable.hpp | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/jrj/xframe/xcontrol/xdwtable.hpp b/jrj/xframe/xcontrol/xdwtable.hpp
index 608b3a4..0c55768 100644
--- a/jrj/xframe/xcontrol/xdwtable.hpp
+++ b/jrj/xframe/xcontrol/xdwtable.hpp
@@ -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); }//璇诲彇鏁版嵁
@@ -291,7 +295,7 @@
return GetDwTable()->ClearAdvanceString( nRow, nCol);
}
public:
- LPCTSTR GetGuid(int nRow)
+ xstring GetGuid(int nRow)
{
return GetDwTable()->GetGuid(nRow);
}
@@ -401,7 +405,7 @@
public:
int AcceptText()
{
- return GetDwTable()->AcceptText();
+ return GetDwTable()->AcceptText_();
}
int getNullCell(POINT& p)
{
@@ -453,24 +457,28 @@
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