From 027504b77a701edd94fb76d76b87e9c6c7ed336d Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 01 七月 2024 13:25:01 +0800
Subject: [PATCH] update print object
---
jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp | 6 +++---
jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp | 6 +++---
jrj/project/printview/Template.Print.Dialog.cpp | 16 +++++-----------
jrj/project/printview/Maint.Template.PrintEx.cpp | 1 +
4 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/jrj/project/printview/Maint.Template.PrintEx.cpp b/jrj/project/printview/Maint.Template.PrintEx.cpp
index e060d3e..0092f7d 100644
--- a/jrj/project/printview/Maint.Template.PrintEx.cpp
+++ b/jrj/project/printview/Maint.Template.PrintEx.cpp
@@ -98,6 +98,7 @@
AttachEvent(L"WM_XCOMMAND", (FEvent)&MaintTemplatePrintWin::OnXCommand);
//获取焦点事件，用于重置工具条
AttachEvent(L"WM_SETFOCUS", (FEvent)&MaintTemplatePrintWin::OnSetFocus);
+ return 1;
}
int onload()
diff --git a/jrj/project/printview/Template.Print.Dialog.cpp b/jrj/project/printview/Template.Print.Dialog.cpp
index 3158b09..f6cc784 100644
--- a/jrj/project/printview/Template.Print.Dialog.cpp
+++ b/jrj/project/printview/Template.Print.Dialog.cpp
@@ -25,17 +25,11 @@
xdwgrid dw_list;
xdwgrid dw_doclist;
bool bupdate;
-public:
- TemplatePrintDialog(void* implPtr, HWND hWnd) :responsewin(implPtr, hWnd) {}
-public:
- static TemplatePrintDialog* CreateInstance(void* implPtr, void* hWnd)
- {
- return new TemplatePrintDialog(implPtr, (HWND)hWnd);
- }
+
public:
int OnRetrieve()
{
- xstring username = publiccode::GetUser()->name;
+ xstring username = publiccode::GetUser().name;
if (username != L"admin" && m_Dir != username)
{
bupdate = false;
@@ -361,7 +355,7 @@
int SetAgent()
{
- PUser& puser = *publiccode::GetUser();
+ PUser& puser = publiccode::GetUser();
xstring susername = puser.name;
if (susername != L"admin")
{
@@ -376,7 +370,7 @@
int CreateDir()
{
- PUser& puser = *publiccode::GetUser();
+ PUser& puser = publiccode::GetUser();
xstring susername = puser.name;
xml x;
@@ -398,7 +392,7 @@
int i;
int nlen = nlist.length();
xstring toolStr = L"<vbox name='Dir'>";
- xstring deptName = publiccode::GetUser()->deptname;
+ xstring deptName = publiccode::GetUser().deptname;
if (deptName == L"跟单部" && m_EntityName == L"GDN3") {
for (i = 2; i < nlen; i++)
{
diff --git a/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
index 6ebcee1..f123891 100644
--- a/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
@@ -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;
}
diff --git a/jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp b/jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp
index 262ab32..53022c0 100644
--- a/jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp
@@ -46,7 +46,7 @@
}
//取当前用户
- static PUser* GetUser(xstring id)
+ static PUser& GetUser(xstring id)
{
string userno = xaserver::GetUserNo();
//trace(userno);
@@ -89,9 +89,9 @@
if (e.selectSingleNode(L"电话")) p.tel = e.selectSingleNode(L"电话").text();
}
- return &p;
+ return p;
}
- static PUser* GetUser()
+ static PUser& GetUser()
{
return GetUser(L"");
}
--
Gitblit v1.9.3