执行器注册节点显示优化，解决注册节点过多时无法展示问题。

xuxueli · Apr 17, 2024 · 693562e · 693562e
1 parent e3b2e12
commit 693562e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md
@@ -2352,8 +2352,8 @@ public void execute() {
 - 3、【修复】"CVE-2024-29025" netty低版本漏洞修复。
 - 4、【修复】"CVE-2024-3366" freemarker模板注入漏洞修复。
 - 5、【修复】调度日志页面XSS漏洞修复(ISSUE-3360)。
-- 6、[规划中]登陆态Token声称逻辑优化，混淆登陆时间属性，降低token泄漏风险。
-- 7、[规划中]注册节点，弹框分页展示；解决注册节点过多时无法展示问题；
+- 6、【优化】执行器注册节点显示优化，解决注册节点过多时无法展示问题。
+- 7、[规划中]登陆态Token声称逻辑优化，混淆登陆时间属性，降低token泄漏风险。
 
 ### TODO LIST
 - 1、调度隔离：调度中心针对不同执行器，各自维护不同的调度和远程触发组件。

diff --git a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js
@@ -123,7 +123,7 @@ $(function() {
 		var id = $(this).attr("_id");
 		var row = tableData['key'+id];
 
-		var html = '<div>';
+		/*var html = '<div>';
 		if (row.registryList) {
 			for (var index in row.registryList) {
 				html += (parseInt(index)+1) + '. <span class="badge bg-green" >' + row.registryList[index] + '</span><br>';
@@ -135,8 +135,19 @@ $(function() {
 			title: I18n.jobinfo_opt_registryinfo ,
 			btn: [ I18n.system_ok ],
 			content: html
-		});
+		});*/
+
+		var html = '<table class="table table-bordered"><tbody>';
+		if (row.registryList) {
+			for (var index in row.registryList) {
+				html += '<tr><th>' + (parseInt(index)+1) + '</th>';
+				html += '<th><span class="badge bg-green" >' + row.registryList[index] + '</span></th><tr>';
+			}
+		}
+		html += '</tbody></table>';
 
+		$('#showRegistryListModal .data').html(html);
+		$('#showRegistryListModal').modal({backdrop: false, keyboard: false}).modal('show');
 	});
 
 

diff --git a/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl b/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl
@@ -70,6 +70,25 @@
 	    </section>
 	</div>
 
+    <!-- 注册列表查看.模态框 -->
+    <div class="modal fade" id="showRegistryListModal" tabindex="-1" role="dialog"  aria-hidden="true">
+        <div class="modal-dialog modal-sm">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title" >${I18n.jobinfo_opt_registryinfo}</h4>
+                </div>
+                <div class="modal-body">
+                    <div class="data" style="word-wrap: break-word;"></div>
+                </div>
+                <div class="modal-footer">
+                    <div class="text-center" >
+                        <button type="button" class="btn btn-info ok" data-dismiss="modal" >${I18n.system_ok}</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <!-- 新增.模态框 -->
     <div class="modal fade" id="addModal" tabindex="-1" role="dialog"  aria-hidden="true">
         <div class="modal-dialog ">