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 |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/jrj/xframe/xcontrol/xdwtable.hpp b/jrj/xframe/xcontrol/xdwtable.hpp
index 39a15b0..c51aa4b 100644
--- a/jrj/xframe/xcontrol/xdwtable.hpp
+++ b/jrj/xframe/xcontrol/xdwtable.hpp
@@ -401,7 +401,7 @@
 public:
 	int AcceptText()
 	{
-		return GetDwTable()->AcceptText();
+		return GetDwTable()->AcceptText_();
 	}
 	int getNullCell(POINT& p)
 	{
@@ -449,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();
 	}
 

--
Gitblit v1.9.3