From e05f7cc8755eb7f5525e6bf86a7e5454a0c91fd0 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 23 十月 2024 18:07:24 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SystemSettings/SysUser.cpp | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/jrj/project/business/SystemSettings/SysUser.cpp b/jrj/project/business/SystemSettings/SysUser.cpp
index 13952ec..5b4161b 100644
--- a/jrj/project/business/SystemSettings/SysUser.cpp
+++ b/jrj/project/business/SystemSettings/SysUser.cpp
@@ -8,7 +8,7 @@
#include "viewobject/view.base.hpp"
using xml = KXMLDOMDocument;
-class __declspec(dllexport) SysUser : public xwin
+class __declspec(dllexport) SysUser : public listwin
{
public:
xtreeview tv_usergroup;
@@ -16,7 +16,7 @@
xnode m_agentNode;
xstring strJobID;
public:
- SysUser(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
+ SysUser(void* implPtr, HWND hWnd) :listwin(implPtr, hWnd) {}
public:
static SysUser* CreateInstance(void* implPtr, void* hWnd)
{
@@ -52,11 +52,11 @@
return 1;
}
- int SetEntityData(param p)
+ int SetEntityData(xaserverarg arg)
{
xml x;
- xaserverarg arg;
+ //xaserverarg arg;
xstring str = m_QueryTxt;
//trace(ele.xml);
@@ -117,7 +117,7 @@
alert(L"请选择职位！");
return 0;
}
- OpenWindow(L"dev:xpage[UserImport.vx]");
+ OpenWindow(L"dev:xpage[UserImport.vx]",(LPARAM)this);
//openUrl(L"系统用户.vface/xpage/SysUser/UserImport", this);
return 1;
}
@@ -236,8 +236,8 @@
if (comdid == L"ok")
{
xstring strxml = arg.GetArgString(L"xml");
- dw_user.SetItemDisplayString(row, colname, strxml);
- dw_user.SetItemString(row, colname, strxml);
+ dw_user.SetItemDisplayString(row, colname.c_str(), strxml);
+ dw_user.SetItemString(row, colname.c_str(), strxml);
dw_user.Redraw();
}
}
@@ -308,10 +308,7 @@
int onload()
{
- m_agentNode = new xnode;
-
- tv_usergroup = new treeview;
- tv_usergroup.setNativePointer(GetControl(L"tv_usergroup"));
+ tv_usergroup = GetControl(L"tv_usergroup");
dw_user = new xdwgrid;
dw_user.setNativePointer(GetControl(L"dw_user"));
dw_user.SetDataObject(GetServerUrl(), L"dev:sheet[SysUser.tpl/UserList]");
@@ -323,8 +320,9 @@
HTREEITEM root = tv_usergroup.GetRootItem();
tv_usergroup.ExpandItem( root);
- xml x;
+ //return 1;
+ xml x;
x.loadXML(L"<Config/>");
m_configDoc = x;
rowSearch(L"系统用户.vface/template/SysUser/list");
--
Gitblit v1.9.3