From 30d30ea6256142e1700e1b8b7780e4d84c0f77fd Mon Sep 17 00:00:00 2001
From: FangfangZhao <zhaofang123@gmail.com>
Date: Mon, 29 Oct 2018 00:02:15 +0800
Subject: [PATCH] some fixed

---
 .../server/bizz/privileges/UserStore.java     | 20 +++--
 src/main/webapp/admin/bizuser/change-dept.jsp |  7 +-
 src/main/webapp/admin/bizuser/change-role.jsp |  7 +-
 .../webapp/admin/entity/picklist-config.jsp   |  7 +-
 src/main/webapp/assets/css/rb-page.css        | 22 ++++-
 src/main/webapp/assets/js/assign-share.jsx    |  4 +-
 src/main/webapp/assets/js/rb-forms.jsx        |  1 +
 src/main/webapp/assets/js/rb-list.jsx         | 10 +--
 src/main/webapp/settings/nav-settings.jsp     | 90 ++++++++-----------
 9 files changed, 85 insertions(+), 83 deletions(-)

diff --git a/src/main/java/com/rebuild/server/bizz/privileges/UserStore.java b/src/main/java/com/rebuild/server/bizz/privileges/UserStore.java
index 16de1d795..ec208a8fd 100644
--- a/src/main/java/com/rebuild/server/bizz/privileges/UserStore.java
+++ b/src/main/java/com/rebuild/server/bizz/privileges/UserStore.java
@@ -246,19 +246,23 @@ public class UserStore {
 		// ROLE
 		
 		ID newRoleId = (ID) u[7];
-		if (oldRole == null || !oldRole.getIdentity().equals(newRoleId)) {
-			getRole(newRoleId).addMember(newUser);
-		} else {
-			oldRole.addMember(newUser);
+		if (!(newRoleId == null && oldRole == null)) {
+			if (oldRole == null || !oldRole.getIdentity().equals(newRoleId)) {
+				getRole(newRoleId).addMember(newUser);
+			} else {
+				oldRole.addMember(newUser);
+			}
 		}
 		
 		// DEPT
 		
 		ID newDeptId = (ID) u[6];
-		if (oldDept == null || !oldDept.getIdentity().equals(newDeptId)) {
-			getDepartment(newDeptId).addMember(newUser);
-		} else {
-			oldDept.addMember(newUser);
+		if (!(newDeptId == null && oldDept == null)) {
+			if (oldDept == null || !oldDept.getIdentity().equals(newDeptId)) {
+				getDepartment(newDeptId).addMember(newUser);
+			} else {
+				oldDept.addMember(newUser);
+			}
 		}
 		
 		return getUser(userId);
diff --git a/src/main/webapp/admin/bizuser/change-dept.jsp b/src/main/webapp/admin/bizuser/change-dept.jsp
index 8b7a50ad0..c061adc77 100644
--- a/src/main/webapp/admin/bizuser/change-dept.jsp
+++ b/src/main/webapp/admin/bizuser/change-dept.jsp
@@ -13,7 +13,7 @@
 		<div class="form-group row">
 			<label class="col-sm-3 col-form-label text-sm-right">选择新部门</label>
 			<div class="col-sm-7 col-lg-4">
-				<select class="form-control form-control-sm" id="newDept" multiple="multiple">
+				<select class="form-control form-control-sm" id="newDept">
 				</select>
 			</div>
 		</div>
@@ -36,6 +36,7 @@ $(document).ready(function(){
         width: '100%',
         minimumInputLength: 1,
         maximumSelectionLength: 1,
+        allowClear: true,
         ajax: {
             url: rb.baseUrl + '/commons/search',
             delay: 300,
@@ -56,10 +57,10 @@ $(document).ready(function(){
 	
 	let btn = $('.btn-primary').click(function(){
 		let dept = select2.val()
-		if (dept.length == 0){ rb.notice('请选择新部门'); return }
+		if (!!!dept){ rb.notice('请选择新部门'); return }
 		
 		btn.button('loading')
-		$.post(rb.baseUrl + '/admin/bizuser/change-dept?dept=' + dept[0] + '&user=' + user, function(res){
+		$.post(rb.baseUrl + '/admin/bizuser/change-dept?dept=' + dept + '&user=' + user, function(res){
 			if (res.error_code == 0) parent.location.reload()
 			else rb.notice(res.error_msg, 'danger')
 			btn.button('reset')
diff --git a/src/main/webapp/admin/bizuser/change-role.jsp b/src/main/webapp/admin/bizuser/change-role.jsp
index 9e8f3229b..1cf7b6b41 100644
--- a/src/main/webapp/admin/bizuser/change-role.jsp
+++ b/src/main/webapp/admin/bizuser/change-role.jsp
@@ -13,7 +13,7 @@
 		<div class="form-group row">
 			<label class="col-sm-3 col-form-label text-sm-right">选择新角色</label>
 			<div class="col-sm-7 col-lg-4">
-				<select class="form-control form-control-sm" id="newRole" multiple="multiple">
+				<select class="form-control form-control-sm" id="newRole">
 				</select>
 			</div>
 		</div>
@@ -36,6 +36,7 @@ $(document).ready(function(){
         width: '100%',
         minimumInputLength: 1,
         maximumSelectionLength: 1,
+        allowClear: true,
         ajax: {
             url: rb.baseUrl + '/commons/search',
             delay: 300,
@@ -56,10 +57,10 @@ $(document).ready(function(){
 	
 	let btn = $('.btn-primary').click(function(){
 		let dept = select2.val()
-		if (dept.length == 0){ rb.notice('请选择新角色'); return }
+		if (!!!dept){ rb.notice('请选择新角色'); return }
 		
 		btn.button('loading')
-		$.post(rb.baseUrl + '/admin/bizuser/change-role?role=' + dept[0] + '&user=' + user, function(res){
+		$.post(rb.baseUrl + '/admin/bizuser/change-role?role=' + dept + '&user=' + user, function(res){
 			if (res.error_code == 0) parent.location.reload()
 			else rb.notice(res.error_msg, 'danger')
 			btn.button('reset')
diff --git a/src/main/webapp/admin/entity/picklist-config.jsp b/src/main/webapp/admin/entity/picklist-config.jsp
index da6dedb0b..9f7562be4 100644
--- a/src/main/webapp/admin/entity/picklist-config.jsp
+++ b/src/main/webapp/admin/entity/picklist-config.jsp
@@ -5,7 +5,6 @@
 <%@ include file="/_include/Head.jsp"%>
 <title>列表选项</title>
 <style type="text/css">
-.dd3-item.default .dd3-content{background-color:#dedede !important}
 .unset-list .dd-handle{font-style:italic;color:#aaa}
 .unset-list .dd-item a.action{position:absolute;right:24px;top:1px;font-style:normal;}
 .unset-list .dd-item:hover a.action{color:#fff}
@@ -57,7 +56,7 @@ $(document).ready(function(){
 				let item = render_item([this.id, this.text])
 				if (this['default'] == true) {
 					default_item = this.id
-					item.addClass('default')
+					item.addClass('active')
 				}
 			}
 		})
@@ -115,8 +114,8 @@ render_item_after = function(item, data){
 	
 	let default0 = $('<a href="javascript:;">[默认]</a>').appendTo(item.find('.dd3-action'))
 	default0.click(function(){
-		$('.J_config li').removeClass('default')
-		default0.parent().parent().addClass('default')
+		$('.J_config li').removeClass('active')
+		default0.parent().parent().addClass('active')
 		default_item = data[0]
 	})
 }
diff --git a/src/main/webapp/assets/css/rb-page.css b/src/main/webapp/assets/css/rb-page.css
index 76ea7b0de..059ef2868 100644
--- a/src/main/webapp/assets/css/rb-page.css
+++ b/src/main/webapp/assets/css/rb-page.css
@@ -103,7 +103,7 @@
 }
 
 .modal.rbmodal .modal-dialog .modal-body {
-	min-height: 155px;
+	min-height: 162px;
 	padding-top: 20px;
 }
 
@@ -138,7 +138,7 @@ body.dialog, body.view-body {
 }
 
 body.dialog .main-content {
-	min-height: 155px;
+	min-height: 162px;
 	overflow: hidden;
 }
 
@@ -656,6 +656,9 @@ i.split.ui-draggable-dragging {
 
 .sortable-box .dd-list .dd-handle, .sortable-box .dd-list .dd3-content {
 	margin: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap
 }
 
 .sortable-box .dd-list .dd3-action {
@@ -672,12 +675,23 @@ i.split.ui-draggable-dragging {
 	margin-right: 6px;
 }
 
+.sortable-box .dd-list .dd3-action a .zmdi {
+	font-size: 1.23rem;
+	margin-top: 3px;
+}
+.sortable-box .dd-list .dd3-action a:hover .zmdi {
+	color: #4285f4;
+}
+
 .sortable-box .dd-list .dd3-item:hover .dd3-action {
 	display: block;
 }
 
-.sortable-box .unset-list .dd-handle::after{content:'\f278';font:normal normal normal 14px/1 'Material-Design-Iconic-Font';float:right;font-size:1.6rem;color:#999;}
-.sortable-box .unset-list .dd-item:hover .dd-handle::after{color:#fff}
+.sortable-box .unset-list .dd-handle{padding-right:30px}
+.sortable-box .unset-list .dd-handle::before{content:'\f278';font:normal normal normal 14px/1 'Material-Design-Iconic-Font';float:right;font-size:1.6rem;color:#999;float:right;margin-right:-20px}
+.sortable-box .unset-list .dd-item:hover .dd-handle::before{color:#fff}
+
+.sortable-box .dd-list .dd3-item.active .dd3-content{background-color:#dedede !important}
 
 .rb-left-sidebar .bottom-widget {
 	padding: 3px 20px;
diff --git a/src/main/webapp/assets/js/assign-share.jsx b/src/main/webapp/assets/js/assign-share.jsx
index d36dd44ac..a5eab3b51 100644
--- a/src/main/webapp/assets/js/assign-share.jsx
+++ b/src/main/webapp/assets/js/assign-share.jsx
@@ -25,7 +25,7 @@ class TheBothDialog extends React.Component {
                                 <div className="form-group row">
                                     <label className="col-sm-3 col-form-label text-sm-right">{this.opType + '给谁'}</label>
                                     <div className="col-sm-7">
-                                        <select className="form-control form-control-sm" ref="toUser" multiple="multiple" />
+                                        <select className="form-control form-control-sm" ref="toUser" />
                                     </div>
                                 </div>
                                 <div className={'form-group row ' + (this.state.cascadesSpec == false ? '' : 'hide')}>
@@ -62,7 +62,7 @@ class TheBothDialog extends React.Component {
             placeholder: '选择用户',
             width: '100%',
             minimumInputLength: 1,
-            maximumSelectionLength: 1,
+            allowClear: true,
             ajax: {
                 url: rb.baseUrl + '/commons/search',
                 delay: 300,
diff --git a/src/main/webapp/assets/js/rb-forms.jsx b/src/main/webapp/assets/js/rb-forms.jsx
index 722d48c15..e7bfe4f5b 100644
--- a/src/main/webapp/assets/js/rb-forms.jsx
+++ b/src/main/webapp/assets/js/rb-forms.jsx
@@ -556,6 +556,7 @@ class RbFormPickList extends RbFormElement {
             language: 'zh-CN',
             placeholder: '选择' + that.props.label,
             allowClear: true,
+            width: '100%',
         }).on('change.select2', function(e){
             let opt = e.target.value
             that.handleChange({ target:{ value: opt } }, true)
diff --git a/src/main/webapp/assets/js/rb-list.jsx b/src/main/webapp/assets/js/rb-list.jsx
index a4e2e1fb8..af7150859 100644
--- a/src/main/webapp/assets/js/rb-list.jsx
+++ b/src/main/webapp/assets/js/rb-list.jsx
@@ -358,13 +358,9 @@ const RbListPage = {
         })
         
         $('.J_delete').click(function(){
-            let selected = that._RbList.getSelectedRows()
-            if (selected.length < 1) return
-            rb.alter('确认删除选中的 ' + selected.length + ' 条记录吗？', '删除确认', { type: 'danger', confirm: function(){
-                let ids = selected.map((item)=>{
-                    return item[0]
-                })
-                
+            let ids = that._RbList.getSelectedIds()
+            if (ids.length < 1) return
+            rb.alter('确认删除选中的 ' + ids.length + ' 条记录吗？', '删除确认', { type: 'danger', confirm: function(){
                 $(this.refs['rbalter']).find('.btn').button('loading')
                 let thatModal = this
                 $.post(rb.baseUrl + '/app/entity/record-delete?id=' + ids.join(','), function(res){
diff --git a/src/main/webapp/settings/nav-settings.jsp b/src/main/webapp/settings/nav-settings.jsp
index 343687bb9..8c2a416a8 100644
--- a/src/main/webapp/settings/nav-settings.jsp
+++ b/src/main/webapp/settings/nav-settings.jsp
@@ -5,14 +5,8 @@
 <%@ include file="/_include/Head.jsp"%>
 <title>导航菜单</title>
 <style type="text/css">
-.sortable-box{padding:0 1px;padding-top:1px;}
-.dd-list .dd3-item .dd3-content,.dd-placeholder{margin:0 0 1px !important;cursor:default;}
-.sortable-box .dd-list .dd3-item.ui-sortable-helper .dd3-handle{top:0;height:36px}
-.dd-list .dd3-item .dd3-content{position:relative;padding-left:66px}
-.dd-list .dd3-item .dd3-content i.zmdi{font-size:1.4rem;width:22px;overflow:hidden;position:absolute;left:43px;margin-top:1px}
-.dd-placeholder{height:36px !important}
-.dd-list .dd3-item:hover .dd3-content,.dd-list .dd3-item.active .dd3-content{background-color:#5a95f5;border-color:#5a95f5;color:#fff}
-.dd-list .dd3-item:hover a{color:#fff !important;display:inline-block;width:24px !important}
+.dd3-content>.zmdi{position:absolute;width:28px;height:28px;font-size:1.45rem;margin-left:-20px;}
+.dd3-content{padding-left:60px !important;cursor:default;}
 .input-group-prepend .input-group-text{padding:0;width:37px;text-align:center;display:inline-block;overflow:hidden;padding-top:9px;background-color:#fff}
 .input-group-prepend .input-group-text:hover{background-color:#eee;cursor:pointer;}
 .input-group-prepend .input-group-text i.zmdi{font-size:1.5rem;}
@@ -20,11 +14,10 @@
 </head>
 <body class="dialog">
 <div class="main-content">
-	<div class="row margin-0">
+	<div class="row m-0">
 		<div class="col-5" style="padding-top:9px">
 			<div class="sortable-box rb-scroller">
-				<ol class="dd-list J_configbox">
-				</ol>
+				<ol class="dd-list J_config"></ol>
 			</div>
 			<div class="actions">
 				<button type="button" class="btn btn-secondary btn-sm J_add-menu">+ 添加菜单项</button>
@@ -38,7 +31,7 @@
 						<li class="nav-item"><a class="nav-link J_menuType active" href="#ENTITY" data-toggle="tab">关联实体</a></li>
 						<li class="nav-item"><a class="nav-link J_menuType" href="#URL" data-toggle="tab">外部地址</a></li>
 					</ul>
-					<div class="tab-content margin-0" style="padding:20px 0">
+					<div class="tab-content m-0" style="padding:20px 0">
 						<div class="tab-pane active" id="ENTITY">
 							<select class="form-control form-control-sm J_menuEntity">
 								<option value="">请选择实体</option>
@@ -72,29 +65,18 @@
 		<button class="btn btn-secondary" onclick="parent.navsModal.hide()" type="button">取消</button>
 	</div>
 </div>
-<script type="text/plain" id="item-temp">
-<li class="dd-item dd3-item">
-	<div class="dd3-content text-3dot">HOLD</div>
-	<div class="dd-handle dd3-handle"></div>
-	<div class="dd3-action"><a href="javascript:;" class="J_del" title="移除"><i class="zmdi zmdi-close"></i></a></div>
-</li>
-</script>
 <%@ include file="/_include/Foot.jsp"%>
 <script type="text/javascript">
 const UNICON_NAME = 'texture'
 $(document).ready(function(){
-	$('.J_add-menu').click(function(){
-		itemRender({}, true)
-	});
-	
-	$('.dd-list').sortable({
-		connectWith: '.dd-list',
-		cursor: 'move',
+	$('.J_config').sortable({
 		placeholder: 'dd-placeholder',
-		handle: '.dd-handle',
-		axis: 'y'
-	})
+		handle: '.dd3-handle',
+		axis: 'y',
+	}).disableSelection()
 
+	$('.J_add-menu').click(function(){ render_item({}, true) });
+	
 	$.get(rb.baseUrl + '/commons/metadata/entities', function(res){
 		$(res.data).each(function(){
 			$('<option value="' + this.name + '" data-icon="' + this.icon + '">' + this.label + '</option>').appendTo('.J_menuEntity');
@@ -133,10 +115,10 @@ $(document).ready(function(){
 			if (!!!value){ rb.notice('请输入 URL'); return }
 			else if (!!value && !$regex.isUrl(value)){ rb.notice('请输入有效的 URL'); return }
 		}
-		itemRender({ id:item_currentid, text:name, type:type, value:value, icon:$('.J_menuIcon i').attr('class').replace('zmdi zmdi-', '') })
+		render_item({ id:item_currentid, text:name, type:type, value:value, icon:$('.J_menuIcon i').attr('class').replace('zmdi zmdi-', '') })
 		
 		item_currentid = null;
-		$('.J_configbox li').removeClass('active')
+		$('.J_config li').removeClass('active')
 		$('.J_edit-tips').removeClass('hide')
 		$('.J_edit-menu').addClass('hide')
 	})
@@ -144,12 +126,11 @@ $(document).ready(function(){
 	var cfgid = null
 	$('.J_save').click(function(){
 		let navs = []
-		$('.J_configbox .dd-item').each(function(){
+		$('.J_config .dd-item').each(function(){
 			let _this = $(this)
 			let item = { text:$.trim(_this.find('.dd3-content').text()), type:_this.attr('attr-type'), value:_this.attr('attr-value'), icon:_this.attr('attr-icon') }
 			if (!!item.value) navs.push(item)
 		})
-		console.log(JSON.stringify(navs))
 		if (navs.length == 0) { rb.notice('请至少设置一个菜单项'); return }
 		
 		let btn = $(this).button('loading')
@@ -162,35 +143,39 @@ $(document).ready(function(){
 	$.get(rb.baseUrl + '/app/settings/nav-settings', function(res){
 		if (res.data){
 			cfgid = res.data.id
-			$(res.data.config).each(function(){
-				itemRender(this)
-			})
+			$(res.data.config).each(function(){ render_item(this) })
 		}
 	})
 });
-var item_currentid;
-var item_current_isNew;
-var item_randomid = new Date().getTime();
-const itemRender = function(data, fromAdd){
+
+let item_currentid
+let item_current_isNew
+let item_randomid = new Date().getTime()
+const render_item = function(data, isNew) {
 	data.id = data.id || item_randomid++
 	data.text = data.text || '未命名菜单'
 	data.icon = data.icon || UNICON_NAME
 	
-	let item = $('.J_configbox').find("li[attr-id='" + data.id + "']")
-	if (item.length == 0) item = $($('#item-temp').html()).appendTo('.J_configbox');
-	item.find('.dd3-content').html('<i class="zmdi zmdi-' + data.icon + '"></i> ' + data.text)
+	let item = $('.J_config').find("li[attr-id='" + data.id + "']")
+	if (item.length == 0){
+		item = $('<li class="dd-item dd3-item"><div class="dd-handle dd3-handle"></div><div class="dd3-content"><i class="zmdi"></i><span></span></div></li>').appendTo('.J_config')
+		let action = $('<div class="dd3-action"><a class="J_addsub" title="添加子菜单"><i class="zmdi zmdi-plus"></i></a><a class="J_del" title="移除"><i class="zmdi zmdi-close"></i></a></div>').appendTo(item)
+		action.find('a.J_del').off('click').click(function() {
+			item.remove()
+		})
+	}
+	item.find('.dd3-content .zmdi').attr('class', 'zmdi zmdi-' + data.icon)
+	item.find('.dd3-content span').text(data.text)
 	item.attr({
 		'attr-id': data.id,
 		'attr-type': data.type || 'ENTITY',
 		'attr-value': data.value || '',
 		'attr-icon': data.icon,
-	});
-	item.find('.J_del').click(function(){
-		$(this).parent().parent().remove();
-		return false
 	})
-	item.find('.dd3-content').click(function(){
-		$('.J_configbox li').removeClass('active')
+	
+	// Event
+	item.find('.dd3-content').off('click').click(function(){
+		$('.J_config li').removeClass('active')
 		item.addClass('active')
 		
 		$('.J_edit-tips').addClass('hide')
@@ -208,12 +193,13 @@ const itemRender = function(data, fromAdd){
 		}
 		item_currentid = data.id
 	})
-	if (fromAdd == true){
+	
+	if (isNew == true){
 		item.find('.dd3-content').trigger('click')
 		$('.J_menuName').focus()
 	}
-	item_current_isNew = fromAdd
-};
+	item_current_isNew = isNew
+}
 </script>
 </body>
 </html>