From 81212a47b7fb7518d5c10acee32d6c37ce0047b7 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Fri, 22 Dec 2017 21:14:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/XXL-JOB官方文档.md                                | 2 +-
 .../webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl   | 8 ++++++--
 .../src/main/webapp/static/js/jobgroup.index.1.js         | 8 +++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md
index fff7c9c8..35629cf9 100644
--- a/doc/XXL-JOB官方文档.md
+++ b/doc/XXL-JOB官方文档.md
@@ -1081,7 +1081,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
 - 16、JobHandler提供init/destroy方法，支持在JobHandler初始化和销毁时进行附加操作；
 - 17、告警邮件样式优化；邮件组件调整为commons-email简化邮件操作；
 - 18、任务列表界面，左侧菜单合并时样式错乱问题修复；
-- 19、执行器地址长度扩展支持至512位，支持大规模执行器集群配置；
+- 19、执行器地址录入交互优化，地址长度扩展支持至512位，支持大规模执行器集群配置；
 
 
 ### TODO LIST
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl
index 7d286984..2f9eceab 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl
@@ -120,7 +120,9 @@
                         </div>
                         <div class="form-group">
                             <label for="lastname" class="col-sm-2 control-label">机器地址<font color="red">*</font></label>
-                            <div class="col-sm-10"><input type="text" class="form-control" name="addressList" placeholder="请输入执行器地址列表，多地址逗号分隔" maxlength="512" readonly="readonly" ></div>
+                            <div class="col-sm-10">
+                                <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>
+                            </div>
                         </div>
                         <hr>
                         <div class="form-group">
@@ -166,7 +168,9 @@
                         </div>
                         <div class="form-group">
                             <label for="lastname" class="col-sm-2 control-label">机器地址<font color="red">*</font></label>
-                            <div class="col-sm-10"><input type="text" class="form-control" name="addressList" placeholder="请输入执行器地址列表，多地址逗号分隔" maxlength="512" readonly="readonly" ></div>
+                            <div class="col-sm-10">
+                                <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>
+                            </div>
                         </div>
                         <hr>
                         <div class="form-group">
diff --git a/xxl-job-admin/src/main/webapp/static/js/jobgroup.index.1.js b/xxl-job-admin/src/main/webapp/static/js/jobgroup.index.1.js
index c3b8181d..0e0b38fd 100644
--- a/xxl-job-admin/src/main/webapp/static/js/jobgroup.index.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/jobgroup.index.1.js
@@ -122,11 +122,13 @@ $(function() {
 	// 注册方式，切换
 	$("#addModal input[name=addressType], #updateModal input[name=addressType]").click(function(){
 		var addressType = $(this).val();
-		var $addressList = $(this).parents("form").find("input[name=addressList]");
+		var $addressList = $(this).parents("form").find("textarea[name=addressList]");
 		if (addressType == 0) {
+            $addressList.css("background-color", "#eee");	// 自动注册
+            $addressList.attr("readonly","readonly");
 			$addressList.val("");
-			$addressList.attr("readonly","readonly");
 		} else {
+            $addressList.css("background-color", "white");
 			$addressList.removeAttr("readonly");
 		}
 	});
@@ -144,7 +146,7 @@ $(function() {
 		//$("#updateModal .form input[name='addressType'][value='"+ addressType +"']").attr('checked', 'true');
 		$("#updateModal .form input[name='addressType'][value='"+ addressType +"']").click();
 		// 机器地址
-		$("#updateModal .form input[name='addressList']").val($(this).attr("addressList"));
+		$("#updateModal .form textarea[name='addressList']").val($(this).attr("addressList"));
 
 		$('#updateModal').modal({backdrop: false, keyboard: false}).modal('show');
 	});