From 94d3840bda13f23c0cd4619a99ac215b74ffcd94 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 07 十一月 2024 13:54:14 +0800
Subject: [PATCH] update
---
jrj/project/vindexform.cpp | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/jrj/project/vindexform.cpp b/jrj/project/vindexform.cpp
index 83c3905..58821fc 100644
--- a/jrj/project/vindexform.cpp
+++ b/jrj/project/vindexform.cpp
@@ -48,7 +48,7 @@
xml x ;
x.load(L"cache\\config.xml");
//alert(x.GetXml());
- if (x.xml() == L"") return L"";
+ if ((xstring)x.xml() == L"") return L"";
KXMLDOMElement e = x.documentElement();
if (e.selectSingleNode(L"home"))
{
@@ -63,9 +63,9 @@
{
xml x ;
x.load(L"cache\\config.xml");
- if (x.xml() == L"")
+ if ((xstring)x.xml() == L"")
{
- //alert(L"<config><home "+att+L"=L"+value+L"/></config>");
+ //alert(L"<config><home "+att+L"="+value+L"/></config>");
x.loadXML(L"<config><home " + att + L"='" + value + L"'/></config>");
}
else
@@ -103,9 +103,8 @@
if (!hMenu)
{
HWND hw = m_hMenu;
- bool f = IsWindow(hw);
-
- if (hw == 0 && f <= 0)
+ bool bwin = hw ? IsWindow(hw):false;
+ if (!bwin)
{
xaserverarg* arg = new xaserverarg();
HWND hWnd = GetHWND();
@@ -256,9 +255,16 @@
int ResetMenu()
{
+ ::DestroyWindow(m_hMenu);
+ m_hMenu = 0;
+ return 1;
+
//if(m_nHwnd) xwin::CloseWindow(m_nHwnd);
m_nHwnd = 0;
+ OnMenu(NULL);
+ OnMenuAgent(L"");
+#if 0
menuShow = -1;
xstring f = getHomeConfig(L"menuposition");
if (f == L"0")
@@ -267,6 +273,7 @@
OnMenuAgent(L"");
}
+
xaserverarg arg;
HWND h = GetHWND();
@@ -274,7 +281,7 @@
arg.SetParam(L"hwnd", h);
OpenWindow(L"dev:xpage[vindexforold.vx]", arg);
-
+#endif
return 1;
}
@@ -305,7 +312,7 @@
//trace(x.GetXml());
return -1;
}
- if (x.xml() == L"") return -1;
+ if ((xstring)x.xml() == L"") return -1;
KXMLDOMElement e = x.documentElement();
if (/*m_Assignment == L"" &&*/ e.selectSingleNode(L"AssignmentID"))
{
@@ -347,7 +354,7 @@
trace(x.xml());
return -1;
}
- if (x.xml() == L"") return -1;
+ if ((xstring)x.xml() == L"") return -1;
KXMLDOMElement e = x.documentElement();
KXMLDOMNodeList li = e.selectNodes(L"item");
int i;
@@ -403,7 +410,7 @@
int cs = mainsheet.GetSheetCount();
int i;
for (i = 0; i < cs; i++) {
- //string str = xcombobox::GetLBText(cbx_menu.GetId(), i);
+ //xstring str = xcombobox::GetLBText(cbx_menu.GetId(), i);
xstring str = mainsheet.GetSheetText(i);
if (i == k)
AppendMenu(m, MF_STRING | MF_CHECKED, i + 1, str);
@@ -605,7 +612,7 @@
Hxsoft::XFrame::KXMLDOMElement e = x.documentElement();
if((xstring)m_Assignment == L"" && e.selectSingleNode(L"AssignmentID"))
{
- string sInfoEx = e.selectSingleNode(L"AssignmentID").text();
+ xstring sInfoEx = e.selectSingleNode(L"AssignmentID").text();
m_Assignment = sInfoEx;
}
@@ -635,6 +642,16 @@
int Initial()
{
SetUserID();
+ xstring userno = xaserver::GetUserNo();
+ if (userno == L"admin")
+ {
+ xnode anode = GetAgentNode(L"dev");
+ int LayerFlow_WE_ = 0x00000002;
+ int LayerFlow_Control_ = 0x00000010;
+ anode.SetLayerFlow(LayerFlow_WE_ | LayerFlow_Control_);
+ }
+ m_Assignment = L"";
+
return 1;
}
int onload()
@@ -651,11 +668,22 @@
Initial();
OnAttachListon();
- OpenWindow(L"dev:xpage[start.vframe.vbusiness.vx]");
return 1;
}
+ int onloaded()
+ {
+ ReSetInfo();
+ //OpenWindow("dev:xpage[start.vframe.vbusiness.vx]");
+ //xwin* lw_face = OpenWindow(L"dev:xpage[start.vframe.vbusiness.vx]");
+ xwin* lw_face = OpenWindow(L"dev:xpage[Business5.vx]");
+ if(lw_face)m_startwin = lw_face->GetHWND();
+ cbx_panelName.SetCurSel( -1);
+ ResetMenu();
+
+ return 1;
+ }
};
--
Gitblit v1.9.3