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/vbusiness/vframe/listex.vframe.vbusiness.hpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
index f123891..695c6bf 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();
@@ -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);
}
--
Gitblit v1.9.3