From 9ac9cc9e9cd91b97d35a6e28400df71630765e40 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 21 八月 2024 14:35:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SystemSettings/SysUser.cpp | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/jrj/project/business/SystemSettings/SysUser.cpp b/jrj/project/business/SystemSettings/SysUser.cpp
index 13952ec..a3b66d8 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,7 +52,7 @@
return 1;
}
- int SetEntityData(param p)
+ int SetEntityData(LPARAM p)
{
xml x;
@@ -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();
}
}
@@ -310,8 +310,7 @@
{
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]");
--
Gitblit v1.9.3