From e3f724c9fd36995c207a6ed173849c20aaa2e3d7 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 17 十二月 2024 13:06:22 +0800
Subject: [PATCH] update

---
 jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
index 6ebcee1..7d49ef7 100644
--- a/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
@@ -30,7 +30,7 @@
 		return m_this->alert(str);
 	}
 
-	string GetServerUrl()
+	xstring GetServerUrl()
 	{
 		return L"";
 	}
@@ -50,7 +50,7 @@
 		return xurl::get(GetServerUrl(),aurl, para, x);
 	}
 
-	string EditCombo(KXMLDOMElement d)
+	xstring EditCombo(KXMLDOMElement d)
 	{
 		if (d.selectSingleNode(L"datas")) {
 			KXMLDOMElement e = d.selectSingleNode(L"datas");
@@ -105,13 +105,13 @@
 		return L"";
 	}
 
-	string EditDate(KXMLDOMElement e)
+	xstring EditDate(KXMLDOMElement e)
 	{
-		string str = L"<xedit name='_cb_grid_value1' bind='_cb_grid_search'/><xlabel caption='~' width='8'/><xedit name='_cb_grid_value2' bind='_cb_grid_search'/>";
+		xstring str = L"<xedit name='_cb_grid_value1' bind='_cb_grid_search'/><xlabel caption='~' width='8'/><xedit name='_cb_grid_value2' bind='_cb_grid_search'/>";
 		return str;
 	}
 
-	string EditSheet(KXMLDOMElement d)
+	xstring EditSheet(KXMLDOMElement d)
 	{
 		xstring str = L"<xedit  name='_cb_grid_value1'  bind='_cb_grid_search'/>";
 		if (d.selectSingleNode(L"@sheet")) {
@@ -153,7 +153,7 @@
 		return str;
 	}
 
-	string EditTree(KXMLDOMElement e)
+	xstring EditTree(KXMLDOMElement e)
 	{
 		if (e.selectSingleNode(L"@xpage") && e.selectSingleNode(L"@column1") && e.selectSingleNode(L"@column2")) {
 			xstring xq = e.selectSingleNode(L"@xpage").text();
@@ -268,15 +268,15 @@
 		}
 		else if (str == L"userid")
 		{
-			ret = publiccode::GetUser()->id;
+			ret = publiccode::GetUser().id;
 		}
 		else if (str == L"userno")
 		{
-			ret = publiccode::GetUser()->no;
+			ret = publiccode::GetUser().no;
 		}
 		else if (str == L"username")
 		{
-			ret = publiccode::GetUser()->name;
+			ret = publiccode::GetUser().name;
 		}
 		return ret;
 	}
@@ -437,7 +437,7 @@
 			else continue;
 			KXMLDOMElement colename = e.selectSingleNode(L"//row[@rowindex='5']/cell[@colindex='" + colindex + L"']");
 			//查询列
-			string searchcolumn = searchcol(colename);
+			xstring searchcolumn = searchcol(colename);
 			if (searchcolumn == L"否") continue;
 			//英文名
 			string ename = colename.selectSingleNode(L"@column").text();
@@ -506,7 +506,7 @@
 		{
 			KXMLDOMDocument x;
 			int ret = getUrl(tpl, L"<args/>", x);
-			if (ret == 1 && x.xml() != L"")
+			if (ret == 1 && (xstring)x.xml() != L"")
 			{
 				setSheetSearch(x);
 			}
@@ -524,7 +524,7 @@
 		//alert("ex");
 		int h = dw_col.GetCurSel();
 		if (h < 0) return L"";
-		string  str = (string)dw_col.GetItemData(h);
+		xstring  str = (string)dw_col.GetItemData(h);
 		KXMLDOMDocument x;
 		if (x.loadXML(str))
 		{

--
Gitblit v1.9.3