Browse Source

执行器地址录入交互优化

xuxueli 8 years ago
parent
commit
81212a47b7

+ 1 - 1
doc/XXL-JOB官方文档.md View File

1081
 - 16、JobHandler提供init/destroy方法,支持在JobHandler初始化和销毁时进行附加操作;
1081
 - 16、JobHandler提供init/destroy方法,支持在JobHandler初始化和销毁时进行附加操作;
1082
 - 17、告警邮件样式优化;邮件组件调整为commons-email简化邮件操作;
1082
 - 17、告警邮件样式优化;邮件组件调整为commons-email简化邮件操作;
1083
 - 18、任务列表界面,左侧菜单合并时样式错乱问题修复;
1083
 - 18、任务列表界面,左侧菜单合并时样式错乱问题修复;
1084
-- 19、执行器地址长度扩展支持至512位,支持大规模执行器集群配置;
1084
+- 19、执行器地址录入交互优化,地址长度扩展支持至512位,支持大规模执行器集群配置;
1085
 
1085
 
1086
 
1086
 
1087
 ### TODO LIST
1087
 ### TODO LIST

+ 6 - 2
xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl View File

120
                         </div>
120
                         </div>
121
                         <div class="form-group">
121
                         <div class="form-group">
122
                             <label for="lastname" class="col-sm-2 control-label">机器地址<font color="red">*</font></label>
122
                             <label for="lastname" class="col-sm-2 control-label">机器地址<font color="red">*</font></label>
123
-                            <div class="col-sm-10"><input type="text" class="form-control" name="addressList" placeholder="请输入执行器地址列表,多地址逗号分隔" maxlength="512" readonly="readonly" ></div>
123
+                            <div class="col-sm-10">
124
+                                <textarea class="textarea" name="addressList" maxlength="512" placeholder="请输入执行器地址列表,多地址逗号分隔" readonly="readonly" style="background-color:#eee; width: 100%; height: 100px; font-size: 14px; line-height: 10px; border: 1px solid #dddddd; padding: 10px;"></textarea>
125
+                            </div>
124
                         </div>
126
                         </div>
125
                         <hr>
127
                         <hr>
126
                         <div class="form-group">
128
                         <div class="form-group">
166
                         </div>
168
                         </div>
167
                         <div class="form-group">
169
                         <div class="form-group">
168
                             <label for="lastname" class="col-sm-2 control-label">机器地址<font color="red">*</font></label>
170
                             <label for="lastname" class="col-sm-2 control-label">机器地址<font color="red">*</font></label>
169
-                            <div class="col-sm-10"><input type="text" class="form-control" name="addressList" placeholder="请输入执行器地址列表,多地址逗号分隔" maxlength="512" readonly="readonly" ></div>
171
+                            <div class="col-sm-10">
172
+                                <textarea class="textarea" name="addressList" maxlength="512" placeholder="请输入执行器地址列表,多地址逗号分隔" readonly="readonly" style="background-color:#eee; width: 100%; height: 100px; font-size: 14px; line-height: 10px; border: 1px solid #dddddd; padding: 10px;"></textarea>
173
+                            </div>
170
                         </div>
174
                         </div>
171
                         <hr>
175
                         <hr>
172
                         <div class="form-group">
176
                         <div class="form-group">

+ 5 - 3
xxl-job-admin/src/main/webapp/static/js/jobgroup.index.1.js View File

122
 	// 注册方式,切换
122
 	// 注册方式,切换
123
 	$("#addModal input[name=addressType], #updateModal input[name=addressType]").click(function(){
123
 	$("#addModal input[name=addressType], #updateModal input[name=addressType]").click(function(){
124
 		var addressType = $(this).val();
124
 		var addressType = $(this).val();
125
-		var $addressList = $(this).parents("form").find("input[name=addressList]");
125
+		var $addressList = $(this).parents("form").find("textarea[name=addressList]");
126
 		if (addressType == 0) {
126
 		if (addressType == 0) {
127
+            $addressList.css("background-color", "#eee");	// 自动注册
128
+            $addressList.attr("readonly","readonly");
127
 			$addressList.val("");
129
 			$addressList.val("");
128
-			$addressList.attr("readonly","readonly");
129
 		} else {
130
 		} else {
131
+            $addressList.css("background-color", "white");
130
 			$addressList.removeAttr("readonly");
132
 			$addressList.removeAttr("readonly");
131
 		}
133
 		}
132
 	});
134
 	});
144
 		//$("#updateModal .form input[name='addressType'][value='"+ addressType +"']").attr('checked', 'true');
146
 		//$("#updateModal .form input[name='addressType'][value='"+ addressType +"']").attr('checked', 'true');
145
 		$("#updateModal .form input[name='addressType'][value='"+ addressType +"']").click();
147
 		$("#updateModal .form input[name='addressType'][value='"+ addressType +"']").click();
146
 		// 机器地址
148
 		// 机器地址
147
-		$("#updateModal .form input[name='addressList']").val($(this).attr("addressList"));
149
+		$("#updateModal .form textarea[name='addressList']").val($(this).attr("addressList"));
148
 
150
 
149
 		$('#updateModal').modal({backdrop: false, keyboard: false}).modal('show');
151
 		$('#updateModal').modal({backdrop: false, keyboard: false}).modal('show');
150
 	});
152
 	});