Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

人员选择增加用户名属性

Browse Source
This commit is contained in:
wanggeng 2021-10-22 18:42:21 +08:00
parent aaad74eb29
commit 41421b38f2
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
login-oauth2-client/src/main/resources/templates/department/user/select-user.html
View File

@ -142,7 +142,7 @@
} else { } else {
avatarDom = '<img class="user-avatar" src="route/file/download/false/'+ item.userAvatar +'"/> '; avatarDom = '<img class="user-avatar" src="route/file/download/false/'+ item.userAvatar +'"/> ';
} }
userDom += '<a id="user_'+ item.userId +'" href="javascript:void(0);" class="users list-group-item '+ (isUserSelected(item.userId) ? 'user-selected' : '') +'" lay-click-user data-userid="'+ item.userId +'" data-username="'+ item.userName +'">'+ avatarDom + item.userName +' ['+ item.userUsername +']</a>'; userDom += '<a id="user_'+ item.userId +'" href="javascript:void(0);" class="users list-group-item '+ (isUserSelected(item.userId) ? 'user-selected' : '') +'" lay-click-user data-userid="'+ item.userId +'" data-username="'+ item.userName +'" data-user-username="'+ item.userUsername +'">'+ avatarDom + item.userName +' ['+ item.userUsername +']</a>';
} }
$('#userWrapper').append(userDom); $('#userWrapper').append(userDom);
} }
@ -231,10 +231,11 @@
ids: selectedUserIds.split('\_') ids: selectedUserIds.split('\_')
}, null, function(code, data) { }, null, function(code, data) {
for(var i = 0, item; item = data[i++]; ) { for(var i = 0, item; item = data[i++]; ) {
selectUser(item.userId, item.userName); selectUser(item.userId, item.userName, item.userUsername);
selectDepartmentUserOldArray.push({ selectDepartmentUserOldArray.push({
userId: item.userId, userId: item.userId,
userName: item.userName userName: item.userName,
username: item.userUsername
}); });
} }
callback(); callback();
@ -292,12 +293,13 @@
} }
} }
// 选择人员 // 选择人员
function selectUser(userId, userName, isOnlySelect) { function selectUser(userId, userName, username, isOnlySelect) {
if(!isUserSelected(userId)) { if(!isUserSelected(userId)) {
$('#user_'+ userId).addClass('user-selected'); $('#user_'+ userId).addClass('user-selected');
selectDepartmentUserArray.push({ selectDepartmentUserArray.push({
userId: userId, userId: userId,
userName: userName userName: userName
username: username
}); });
$('#selectUsers').append('<a id="selected_user_'+ userId +'" href="javascript:void(0);" class="layui-btn layui-btn-xs">'+ userName +' <i class="fa fa-close" lay-click-removeuser data-userid="'+ userId +'"></i></a>'); $('#selectUsers').append('<a id="selected_user_'+ userId +'" href="javascript:void(0);" class="layui-btn layui-btn-xs">'+ userName +' <i class="fa fa-close" lay-click-removeuser data-userid="'+ userId +'"></i></a>');
$('#selected_user_'+ userId).focus(); $('#selected_user_'+ userId).focus();
@ -309,7 +311,7 @@
} }
$(document.body).on('click', '*[lay-click-user]', null, function() { $(document.body).on('click', '*[lay-click-user]', null, function() {
var data = this.dataset; var data = this.dataset;
selectUser(data.userid, data.username); selectUser(data.userid, data.username, data.userUsername);
}); });
$(document.body).on('click', '*[lay-click-removeuser]', null, function() { $(document.body).on('click', '*[lay-click-removeuser]', null, function() {
var data = this.dataset; var data = this.dataset;
@ -318,7 +320,7 @@
$(document.body).on('click', '*[lay-click-select-all-user]', null, function() { $(document.body).on('click', '*[lay-click-select-all-user]', null, function() {
$('#userWrapper').children().each(function() { $('#userWrapper').children().each(function() {
var data = this.dataset; var data = this.dataset;
selectUser(data.userid, data.username, true); selectUser(data.userid, data.username, data.userUsername, true);
}); });
}); });
$(document.body).on('click', '*[lay-click-clear-all-user]', null, function() { $(document.body).on('click', '*[lay-click-clear-all-user]', null, function() {

19
service-department/src/main/resources/templates/department/user/select-user.html
View File

@ -142,7 +142,7 @@
} else { } else {
avatarDom = '<img class="user-avatar" src="route/file/download/false/'+ item.userAvatar +'"/> '; avatarDom = '<img class="user-avatar" src="route/file/download/false/'+ item.userAvatar +'"/> ';
} }
userDom += '<a id="user_'+ item.userId +'" href="javascript:void(0);" class="users list-group-item '+ (isUserSelected(item.userId) ? 'user-selected' : '') +'" lay-click-user data-userid="'+ item.userId +'" data-username="'+ item.userName +'">'+ avatarDom + item.userName +' ['+ item.userUsername +']</a>'; userDom += '<a id="user_'+ item.userId +'" href="javascript:void(0);" class="users list-group-item '+ (isUserSelected(item.userId) ? 'user-selected' : '') +'" lay-click-user data-userid="'+ item.userId +'" data-username="'+ item.userName +'" data-user-username="'+ item.userUsername +'">'+ avatarDom + item.userName +' ['+ item.userUsername +']</a>';
} }
$('#userWrapper').append(userDom); $('#userWrapper').append(userDom);
} }
@ -169,7 +169,7 @@
} else { } else {
avatarDom = '<img class="user-avatar" src="route/file/download/false/'+ item.userAvatar +'"/> '; avatarDom = '<img class="user-avatar" src="route/file/download/false/'+ item.userAvatar +'"/> ';
} }
userDom += '<a id="user_'+ item.userId +'" href="javascript:void(0);" class="users search-users list-group-item '+ (isUserSelected(item.userId) ? 'user-selected' : '') +'" lay-click-user data-userid="'+ item.userId +'" data-username="'+ item.userName +'">'+ avatarDom + item.userName +' ['+ item.userUsername +']</a>'; userDom += '<a id="user_'+ item.userId +'" href="javascript:void(0);" class="users search-users list-group-item '+ (isUserSelected(item.userId) ? 'user-selected' : '') +'" lay-click-user data-userid="'+ item.userId +'" data-username="'+ item.userName +'" data-user-username="'+ item.userUsername +'">'+ avatarDom + item.userName +' ['+ item.userUsername +']</a>';
} }
$('#userWrapper').append(userDom); $('#userWrapper').append(userDom);
} }
@ -204,6 +204,7 @@
top.restAjax.get(top.restAjax.path('api/department/user/list/{department}', [selectedParentId]), { top.restAjax.get(top.restAjax.path('api/department/user/list/{department}', [selectedParentId]), {
keywords: searchUser keywords: searchUser
}, null, function(code, data) { }, null, function(code, data) {
console.log(data);
addSearchUserDom(data); addSearchUserDom(data);
}, function(code, data) { }, function(code, data) {
top.dialog.msg(data.msg); top.dialog.msg(data.msg);
@ -231,10 +232,11 @@
ids: selectedUserIds.split('\_') ids: selectedUserIds.split('\_')
}, null, function(code, data) { }, null, function(code, data) {
for(var i = 0, item; item = data[i++]; ) { for(var i = 0, item; item = data[i++]; ) {
selectUser(item.userId, item.userName); selectUser(item.userId, item.userName, item.userUsername);
selectDepartmentUserOldArray.push({ selectDepartmentUserOldArray.push({
userId: item.userId, userId: item.userId,
userName: item.userName userName: item.userName,
username: item.userUsername
}); });
} }
callback(); callback();
@ -292,12 +294,13 @@
} }
} }
// 选择人员 // 选择人员
function selectUser(userId, userName, isOnlySelect) { function selectUser(userId, userName, username, isOnlySelect) {
if(!isUserSelected(userId)) { if(!isUserSelected(userId)) {
$('#user_'+ userId).addClass('user-selected'); $('#user_'+ userId).addClass('user-selected');
selectDepartmentUserArray.push({ selectDepartmentUserArray.push({
userId: userId, userId: userId,
userName: userName userName: userName,
username: username
}); });
$('#selectUsers').append('<a id="selected_user_'+ userId +'" href="javascript:void(0);" class="layui-btn layui-btn-xs">'+ userName +' <i class="fa fa-close" lay-click-removeuser data-userid="'+ userId +'"></i></a>'); $('#selectUsers').append('<a id="selected_user_'+ userId +'" href="javascript:void(0);" class="layui-btn layui-btn-xs">'+ userName +' <i class="fa fa-close" lay-click-removeuser data-userid="'+ userId +'"></i></a>');
$('#selected_user_'+ userId).focus(); $('#selected_user_'+ userId).focus();
@ -309,7 +312,7 @@
} }
$(document.body).on('click', '*[lay-click-user]', null, function() { $(document.body).on('click', '*[lay-click-user]', null, function() {
var data = this.dataset; var data = this.dataset;
selectUser(data.userid, data.username); selectUser(data.userid, data.username, data.userUsername);
}); });
$(document.body).on('click', '*[lay-click-removeuser]', null, function() { $(document.body).on('click', '*[lay-click-removeuser]', null, function() {
var data = this.dataset; var data = this.dataset;
@ -318,7 +321,7 @@
$(document.body).on('click', '*[lay-click-select-all-user]', null, function() { $(document.body).on('click', '*[lay-click-select-all-user]', null, function() {
$('#userWrapper').children().each(function() { $('#userWrapper').children().each(function() {
var data = this.dataset; var data = this.dataset;
selectUser(data.userid, data.username, true); selectUser(data.userid, data.username, data.userUsername, true);
}); });
}); });
$(document.body).on('click', '*[lay-click-clear-all-user]', null, function() { $(document.body).on('click', '*[lay-click-clear-all-user]', null, function() {