From 35d07b6e7d26dba5869d298567ef53b75867c258 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 30 十月 2024 12:15:30 +0800
Subject: [PATCH] update
---
jrj/project/business/Affair/Business5.cpp | 29 +++++----
jrj/project/business/Affair/message.business.cpp | 17 +++--
jrj/project/business/Affair/message.supplier.cpp | 14 ++--
jrj/xframe/devloper/sqlwatch.cpp | 10 +-
jrj/xframe/wobject/xwin.hpp | 23 +++++++
jrj/ext-jrj/ext-jrj.vcxproj | 11 ++-
jrj/ext-jrj/ext-jrj.vcxproj.filters | 27 ++++-----
7 files changed, 78 insertions(+), 53 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 09e92ed..26003b9 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -293,16 +293,19 @@
<ClCompile Include="..\jarch.impl\JStringImpl.cpp" />
<ClCompile Include="..\project\analysis\DataVanalysisWin.cpp" />
<ClCompile Include="..\project\business\Affair\Business5.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Affair\message.business.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Affair\message.supplier.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Affair\ProcessManagement.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\AP\APBank.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index e7c9d05..3b75437 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -136,9 +136,6 @@
<Filter Include="jarch.impl">
<UniqueIdentifier>{4d691658-8fdc-4c09-8cfa-d8fa62419ef3}</UniqueIdentifier>
</Filter>
- <Filter Include="project\business\Affair">
- <UniqueIdentifier>{24c32061-a8e2-4f3a-9e5f-597e238284e4}</UniqueIdentifier>
- </Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="framework.h">
@@ -1472,6 +1469,18 @@
<ClCompile Include="..\project\business\PO\paymentmethod.cpp">
<Filter>project\business\PO</Filter>
</ClCompile>
+ <ClCompile Include="..\project\business\Affair\Business5.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Affair\message.business.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Affair\message.supplier.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Affair\ProcessManagement.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
<ClCompile Include="JArgument.cpp">
<Filter>婧愭枃浠�</Filter>
</ClCompile>
@@ -1501,18 +1510,6 @@
</ClCompile>
<ClCompile Include="JVariant.cpp">
<Filter>婧愭枃浠�</Filter>
- </ClCompile>
- <ClCompile Include="..\project\business\Affair\Business5.cpp">
- <Filter>project\business\Affair</Filter>
- </ClCompile>
- <ClCompile Include="..\project\business\Affair\message.business.cpp">
- <Filter>project\business\Affair</Filter>
- </ClCompile>
- <ClCompile Include="..\project\business\Affair\message.supplier.cpp">
- <Filter>project\business\Affair</Filter>
- </ClCompile>
- <ClCompile Include="..\project\business\Affair\ProcessManagement.cpp">
- <Filter>project\business\Affair</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
diff --git a/jrj/project/business/Affair/Business5.cpp b/jrj/project/business/Affair/Business5.cpp
index 0441872..34f9a1d 100644
--- a/jrj/project/business/Affair/Business5.cpp
+++ b/jrj/project/business/Affair/Business5.cpp
@@ -6,6 +6,7 @@
#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
+#include "xcontrol/xshtml.hpp"
using xml = KXMLDOMDocument;
@@ -20,15 +21,15 @@
xnode m_agentNode; //Agent Condition
xtreeview tv_folder;
- int hMessage;
- int hTask;
+ HTREEITEM hMessage;
+ HTREEITEM hTask;
xstring agentFor;
xstring selectname;
xwin sheet;
public:
- Business5Win(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {}
+ Business5Win(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd),sheet(0) {}
public:
static Business5Win* CreateInstance(void* implPtr, void* hWnd)
{
@@ -418,7 +419,7 @@
if(doc.xml() == L"")
return -1;
//trace(doc.xml());
- htmlctrl ht = GetControl(L"taskinfo");
+ xshtml ht = GetControl(L"taskinfo");
ht.SetContent(doc.xml());
ht.Redraw();
return 1;
@@ -426,7 +427,7 @@
int OnItemAskStyle(TEvent* evt, int p)
{
int DMS_CSSSTYLE = 0x8;
- ref DWASKSTYLENMHDR hdr = trust(evt.pnmh as ref DWASKSTYLENMHDR);
+ DWASKSTYLENMHDR& hdr = *(DWASKSTYLENMHDR*)evt->notify.pnmh;
int row = hdr.row;
int col = hdr.col;
xstring colname = hdr.colname;
@@ -444,7 +445,7 @@
{
hdr.mask = DMS_CSSSTYLE;
//hdr.cssstyle = L"color:#cccccc";
- hdr.cssstyle = L"font-weight:700";
+ hdr.pCssStyle = (LPTSTR)L"font-weight:700";
}
}
@@ -513,7 +514,7 @@
xstring TaskID = ele.getAttribute(L"guid");
xstring Category = dw_message.GetItemString(row,L"Category");
if(Category==L"货号申请"){
- int p1 ;
+ int p1=0 ;
OpenWindow(L"dev:xpage[UserProductApply.vx]", p1);
}
if(Category==L"普通"){
@@ -530,7 +531,7 @@
{
if(dw_message.GetRowCount() < 1) return 1;
xstring No = dw_message.GetItemString(dw_message.GetRow(),L"No");
- OpenWindow(L"dev:xpage[EnquiryEx.quote.vx]",cast(No as int));
+ OpenWindow(L"dev:xpage[EnquiryEx.quote.vx]",(LPARAM)No.c_str());
}
if(Category==L"SupplierV3")
{
@@ -591,7 +592,7 @@
return 1;
}
- int ExpandChildFolder(int hItem, KXMLDOMElement pElement)
+ int ExpandChildFolder(HTREEITEM hItem, KXMLDOMElement pElement)
{
KXMLDOMNodeList nlist = pElement.selectNodes(L"Item");
int len = nlist.length();
@@ -603,7 +604,7 @@
xstring child = e.getAttribute(L"child");
int image = 15;
if(sImage) image = sImage.toInt();
- int h= tv_folder.InsertChildItem(tv_folder.GetId(),hItem,name, trust(e as int),image);
+ HTREEITEM h= tv_folder.InsertChildItem(hItem,name, e,image);
if(child !=L"no" ) tv_folder.SetItemChild(h,1);
ExpandChildFolder(h,e);
}
@@ -616,14 +617,14 @@
KXMLDOMNodeList nlist = x.selectNodes(L"/data/Item");
KXMLDOMNode t = nlist.item(0);
xstring informationQuantity =t.selectSingleNode(L"informationQuantity").text();
- tv_folder.SetItemLabel(hMessage, L"消息"+L"(L"+informationQuantity+L")L");
+ tv_folder.SetItemLabel(hMessage, (xstring)L"消息"+L"("+informationQuantity+L")");
xml x1 = ViewObject::RetrieveData(L"/sale/data/business/list/AdjustTipTask");
//alert(x1.xml());
KXMLDOMNodeList nlist1 = x1.selectNodes(L"/data/Item");
KXMLDOMNode t1= nlist1.item(0);
xstring informationQuantityTask =t1.selectSingleNode(L"informationQuantityTask").text();
- tv_folder.SetItemLabel(hTask, L"任务"+L"(L"+informationQuantityTask+L")L");
+ tv_folder.SetItemLabel(hTask, (xstring)L"任务"+L"("+informationQuantityTask+L")");
/*select count(*) from bpm_task where typ='notify' and process='N'
and charindex('|'+'00303'+'|','|' + rtrim(receiver) +'|')>=1*/
@@ -663,9 +664,9 @@
tv_folder.SetLineAtRoot(true);
sheet = GetChildWin(L"sheet1");
- int hItem = tv_folder.GetRootItem();
+ HTREEITEM hItem = tv_folder.GetRootItem();
tv_folder.ExpandItem(hItem);
- int hcItem =tv_folder.GetChildItem(hItem);
+ HTREEITEM hcItem =tv_folder.GetChildItem(hItem);
hTask = hcItem;
tv_folder.ExpandItemAll(hcItem);
tv_folder.ItemFocus(tv_folder.GetChildItem(hcItem));
diff --git a/jrj/project/business/Affair/message.business.cpp b/jrj/project/business/Affair/message.business.cpp
index 1589db3..6e3e7af 100644
--- a/jrj/project/business/Affair/message.business.cpp
+++ b/jrj/project/business/Affair/message.business.cpp
@@ -6,6 +6,7 @@
#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
+#include "xcontrol/xhtml.hpp"
using xml = KXMLDOMDocument;
class __declspec(dllexport) MessageBusinessWin : public xframe
@@ -20,7 +21,7 @@
xstring bill;
public:
- MessageBusinessWin(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {}
+ MessageBusinessWin(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd),sheet(0) {}
public:
static MessageBusinessWin* CreateInstance(void* implPtr, void* hWnd)
{
@@ -212,7 +213,7 @@
if(sheet)
{
- SendMessage(sheet.GetHWND(),0x401,L"GetEntityData:"+arg,0);
+ SendMessage(sheet.GetHWND(),0x401,(LPARAM)(L"GetEntityData:"+xstring((__int64) & arg)).c_str(true), 0);
xstring data = arg.GetArgString(L"EntityData");
murl = L"/sale/data/Business/message/attach/update";
arg1.AddArg(L"url",L"message/attach");
@@ -253,7 +254,7 @@
if(sheet)
{
- SendMessage(sheet.GetHWND(),0x401,L"GetEntityData:"+arg,0);
+ SendMessage(sheet.GetHWND(),0x401, (LPARAM)(L"GetEntityData:" + xstring((__int64)&arg)).c_str(true),0);
xstring data = arg.GetArgString(L"EntityData");
murl = L"/sale/data/Business/message/attach/update";
arg1.AddArg(L"url",L"message/attach");
@@ -321,7 +322,7 @@
{
xstring str = x.selectSingleNode(L"root/Content").text();
str = str.replace(L"\n",L"\r\n");
- GetControl(L"content").SetText(str);
+ SetWindowText(GetControl(L"content")->GetHWND(),str.c_str());
}
//alert(x.xml());
if(x.selectSingleNode(L"root/Content2"))
@@ -334,14 +335,14 @@
int pos = str2.find(L"EntityID=L");
if(pos >= 0)
{
- tm = str2.mid(pos + L"EntityID=L".length(),64);
+ tm = str2.mid(pos + ((xstring)L"EntityID=").length(),64);
if(tm.find(L" ")>0) tm = tm.left(tm.find(L" "));
EntityID=tm;
}
pos = str2.find(L"Category=L");
if(pos >= 0)
{
- tm = str2.mid(pos+L"Category=L".length(),64);
+ tm = str2.mid(pos+((xstring)L"Category=").length(),64);
if(tm.find(L" ")>0) tm = tm.left(tm.find(L" "));
Category=tm;
}
@@ -374,8 +375,8 @@
if(doc.xml() == L"")
return -1;
- htmlctrl ht = GetControl(L"taskinfo");
- ht.SetContent(doc.xml());
+ xhtml ht = GetControl(L"taskinfo");
+ ht.LoadHtml(doc.xml());
ht.Redraw();
return 1;
diff --git a/jrj/project/business/Affair/message.supplier.cpp b/jrj/project/business/Affair/message.supplier.cpp
index f53db45..e50cf78 100644
--- a/jrj/project/business/Affair/message.supplier.cpp
+++ b/jrj/project/business/Affair/message.supplier.cpp
@@ -120,30 +120,30 @@
return 1;
}
- int GetEntityData(xaserverarg arg)
+ int GetEntityData(xaserverarg* arg)
{
xml x;
dw_base.DwUpdateAllTo(x);
- arg.AddArg(L"EntityData",x.xml());
+ arg->AddArg(L"EntityData",x.xml());
return 1;
}
- xaserverarg GetArg(xstring comdid)
+ xaserverarg* GetArg(xstring comdid)
{
if(comdid.find(L":")>=0)
{
- xaserverarg arg = comdid.mid(comdid.find(L":")+1,64).toInt();
+ xaserverarg* arg = (xaserverarg * )comdid.mid(comdid.find(L":")+1,64).toInt64();
return arg;
}
return 0;
}
- int GetEntityInfo(xaserverarg arg)
+ int GetEntityInfo(xaserverarg* arg)
{
- arg.AddArg(L"EntityName",L"Supplier");
- arg.AddArg(L"EntityID",dw_base.GetGuid(1));
+ arg->AddArg(L"EntityName",L"Supplier");
+ arg->AddArg(L"EntityID",dw_base.GetGuid(1));
return 1;
}
diff --git a/jrj/xframe/devloper/sqlwatch.cpp b/jrj/xframe/devloper/sqlwatch.cpp
index bf1ad65..1011e23 100644
--- a/jrj/xframe/devloper/sqlwatch.cpp
+++ b/jrj/xframe/devloper/sqlwatch.cpp
@@ -378,7 +378,7 @@
values = L"";
if (xutil::HasCacheData(L"object-types"))values = xutil::GetUrlData(L"object-types");
- if (values.find(L",L" + typ + L",L") < 0) values += L",L" + typ + L",L";
+ if (values.find(L",L" + typ + L",") < 0) values += L"," + typ + L",";
xutil::CacheUrlData(L"object-types", values);
values = L"";
@@ -750,16 +750,16 @@
xstring values = L"";
xstring tvalue = L"";
if (xutil::HasCacheData(L"object-types"))values = xutil::GetUrlData(L"object-types");
- values = values.replace(L",,L", L",L");
+ values = values.replace(L",,", L",");
trace(values);
if (values != L"")
{
int len = values.length();
- int pos = values.find(L",L", 0);
+ int pos = values.find(L",", 0);
xstring typ = L"";
while (pos >= 0)
{
- int pos1 = values.find(L",L", pos + 1);
+ int pos1 = values.find(L",", pos + 1);
if (pos1 < 0) break;
typ = values.mid(pos + 1, pos1 - pos - 1);
tvalue = L"";
@@ -1009,7 +1009,7 @@
{
KXMLDOMElement ele = nodes.item(i);
xstring tmp = ele.getAttribute(L"name");
- if (i < s - 1) tmp = tmp + L",L";
+ if (i < s - 1) tmp = tmp + L",";
str += L"\t" + tmp + L"\r\n";
}
//str += L"FROM " + caption;
diff --git a/jrj/xframe/wobject/xwin.hpp b/jrj/xframe/wobject/xwin.hpp
index 4afb28e..12a740e 100644
--- a/jrj/xframe/wobject/xwin.hpp
+++ b/jrj/xframe/wobject/xwin.hpp
@@ -6,6 +6,8 @@
#include "win32/win.hpp"
#include "wobject/xnode.hpp"
#include "wobject/xurl.hpp"
+#include "wobject/xpage.hpp"
+#include "wobject/xnode.hpp"
using kwin=Hxsoft::XFrame::IXFWin;
using kcontrol = Hxsoft::XFrame::IXFControl;
@@ -42,6 +44,8 @@
}
public:
xwin(void * impl, HWND hWnd):xview(impl,hWnd){}
+ xwin(kwin* kw) :xview(kw ? kw : nullptr, kw ? kw->GetHWND() : 0) {}
+ const xwin& operator =(kwin* kw) { this->SetNativePtr(kw ? kw : nullptr); this->SetHandle(kw ? kw->GetHWND() : 0); return *this; }
public:
kwin* getKWin()
{
@@ -121,6 +125,11 @@
xnode SetAgentNode(xnode node,xnode val)
{
return xnode(getKWin()->SetAgentNodeContent((knode*)node.getNativePointer(), (knode*)val.getNativePointer()));
+ }
+
+ xnode GetXNode()
+ {
+ return xnode(getKWin()->GetXNode());
}
Hxsoft::XFrame::IXPage* GetXPage()
@@ -252,4 +261,18 @@
{
return getKWin()->SwitchLayer((LPTSTR)pStrLayerSheet, (LPTSTR)pStrLayerFrame);
}
+
+ xpage GetChildXPage(string name)
+ {
+ xnode tnode = GetXNode().GetNodeByName(name);
+ if (!tnode) return 0;
+ return tnode.GetXPage();
+ }
+
+ kwin* GetChildWin(string name)
+ {
+ xpage tpage = GetChildXPage(name);
+ if (!tpage) return nullptr;
+ return tpage.GetWin();
+ }
};
--
Gitblit v1.9.3