Merge pull request #282 from Zhangxinguo/2.1.1

Fixed #270
apache · Apr 13, 2017 · f8b2508 · f8b2508
2 parents 9e777d1 + 5132431
commit f8b2508
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 36 deletions.
diff --git a/.../elastic-job-lite-console/src/main/resources/console/js/global/event_trace_data_source.js b/.../elastic-job-lite-console/src/main/resources/console/js/global/event_trace_data_source.js
@@ -1,8 +1,6 @@
 $(function() {
     renderDataSources();
     validate();
-    bindConnectButtons();
-    bindDeleteButtons();
     dealDataSourceModal();
     handleFieldValidator();
     submitDataSource();
@@ -35,7 +33,13 @@ function renderDataSources() {
             field: "operation",
             title: "操作",
             formatter: "generateOperationButtons"
-        }]
+        }],
+        onLoadSuccess: function() {
+            bindButtons();
+        },
+        onSort: function(name, order) {
+            $("#data-sources").bootstrapTable("refresh");
+        }
     });
     renderDataSourceForDashboardNav();
 }
@@ -51,8 +55,13 @@ function generateOperationButtons(val, row) {
     return operationTd;
 }
 
+function bindButtons() {
+    bindConnectButtons();
+    bindDeleteButtons();
+}
+
 function bindConnectButtons() {
-    $(document).on("click", "button[operation='connectDataSource']", function(event) {
+    $("button[operation='connectDataSource']").click(function(event) {
         var btn = $(this).button("loading");
         var dataSourceName = $(event.currentTarget).attr("dataSourceName");
         $.ajax({
@@ -76,7 +85,7 @@ function bindConnectButtons() {
 }
 
 function bindDeleteButtons() {
-    $(document).on("click", "button[operation='deleteDataSource']", function(event) {
+    $("button[operation='deleteDataSource']").click(function(event) {
         $("#delete-confirm-dialog").modal({backdrop: 'static', keyboard: true});
         var dataSourceName = $(event.currentTarget).attr("dataSourceName");
         $(document).off("click", "#delete-confirm-dialog-confirm-btn");

diff --git a/...job-lite/elastic-job-lite-console/src/main/resources/console/js/global/registry_center.js b/...job-lite/elastic-job-lite-console/src/main/resources/console/js/global/registry_center.js
@@ -1,8 +1,6 @@
 $(function() {
     renderRegCenters();
     validate();
-    bindConnectButtons();
-    bindDeleteButtons();
     dealRegCenterModal();
     handleFieldValidator();
     submitRegCenter();
@@ -35,7 +33,13 @@ function renderRegCenters() {
             field: "operation",
             title: "操作",
             formatter: "generateOperationButtons"
-        }]
+        }],
+        onLoadSuccess: function() {
+            bindButtons();
+        },
+        onSort: function(name, order) {
+            $("#reg-centers").bootstrapTable("refresh");
+        }
     });
     renderRegCenterForDashboardNav();
 }
@@ -51,8 +55,13 @@ function generateOperationButtons(val, row) {
     return operationTd;
 }
 
+function bindButtons() {
+    bindConnectButtons();
+    bindDeleteButtons();
+}
+
 function bindConnectButtons() {
-    $(document).on("click", "button[operation='connect']", function(event) {
+    $("button[operation='connect']").click(function(event) {
         var btn = $(this).button("loading");
         var regName = $(event.currentTarget).attr("regName");
         $.ajax({
@@ -78,7 +87,7 @@ function bindConnectButtons() {
 }
 
 function bindDeleteButtons() {
-    $(document).on("click", "button[operation='delete']", function(event) {
+    $("button[operation='delete']").click(function(event) {
         $("#delete-confirm-dialog").modal({backdrop: 'static', keyboard: true});
         var regName = $(event.currentTarget).attr("regName");
         $(document).off("click", "#delete-confirm-dialog-confirm-btn");

diff --git a/...te/elastic-job-lite-console/src/main/resources/console/js/status/job/job_status_detail.js b/...te/elastic-job-lite-console/src/main/resources/console/js/status/job/job_status_detail.js
@@ -1,7 +1,6 @@
 $(function() {
     $("#job-name").text($("#index-job-name").text());
     renderShardingTable();
-    bindButtons();
     renderBreadCrumbMenu();
 });
 
@@ -29,7 +28,13 @@ function renderShardingTable() {
                 field: "operation",
                 title: "操作",
                 formatter: "generateOperationButtons"
-            }]
+            }],
+            onLoadSuccess: function() {
+                bindButtons();
+            },
+            onSort: function(name, order) {
+                $("#sharding").bootstrapTable("refresh");
+            }
     });
 }
 
@@ -73,7 +78,7 @@ function bindButtons() {
 }
 
 function bindDisableButton() {
-    $(document).on("click", "button[operation='disable-sharding']", function(event) {
+    $("button[operation='disable-sharding']").click(function(event) {
         var jobName = $("#index-job-name").text();
         var item = $(event.currentTarget).attr("item");
         $.ajax({
@@ -88,7 +93,7 @@ function bindDisableButton() {
 }
 
 function bindEnableButton() {
-    $(document).on("click", "button[operation='enable-sharding']", function(event) {
+    $("button[operation='enable-sharding']").click(function(event) {
         var jobName = $("#index-job-name").text();
         var item = $(event.currentTarget).attr("item");
         $.ajax({

diff --git a/...elastic-job-lite-console/src/main/resources/console/js/status/job/jobs_status_overview.js b/...elastic-job-lite-console/src/main/resources/console/js/status/job/jobs_status_overview.js
@@ -1,6 +1,5 @@
 $(function() {
     renderJobsOverview();
-    bindButtons();
 });
 
 function renderJobsOverview() {
@@ -45,7 +44,17 @@ function renderJobsOverview() {
     if (activated) {
         jsonData.url = "/api/jobs";
     }
-    $("#jobs-status-overview-tbl").bootstrapTable(jsonData);
+    $("#jobs-status-overview-tbl").bootstrapTable({
+        columns: jsonData.columns,
+        url: jsonData.url,
+        cache: jsonData.cache,
+        onLoadSuccess: function() {
+            bindButtons();
+        },
+        onSort: function(name, order) {
+            $("#jobs-status-overview-tbl").bootstrapTable("refresh");
+        }
+    });
 }
 
 function statusFormatter(value, row) {
@@ -100,7 +109,7 @@ function bindButtons() {
 }
 
 function bindModifyButton() {
-    $(document).on("click", "button[operation='modify-job'][data-toggle!='modal']", function(event) {
+    $("button[operation='modify-job'][data-toggle!='modal']").click(function(event) {
         var jobName = $(event.currentTarget).attr("job-name");
         $.ajax({
             url: "/api/jobs/config/" + jobName,
@@ -118,15 +127,15 @@ function bindModifyButton() {
 }
 
 function bindShardingStatusButton() {
-    $(document).on("click", "button[operation='job-detail'][data-toggle!='modal']", function(event) {
+    $("button[operation='job-detail'][data-toggle!='modal']").click(function(event) {
         var jobName = $(event.currentTarget).attr("job-name");
         $("#index-job-name").text(jobName);
         $("#content").load("html/status/job/job_status_detail.html");
     });
 }
 
 function bindTriggerButton() {
-    $(document).on("click", "button[operation='trigger-job'][data-toggle!='modal']", function(event) {
+    $("button[operation='trigger-job'][data-toggle!='modal']").click(function(event) {
         var jobName = $(event.currentTarget).attr("job-name");
         $.ajax({
             url: "/api/jobs/" + jobName + "/trigger",
@@ -140,7 +149,7 @@ function bindTriggerButton() {
 }
 
 function bindDisableButton() {
-    $(document).on("click", "button[operation='disable-job']", function(event) {
+    $("button[operation='disable-job']").click(function(event) {
         var jobName = $(event.currentTarget).attr("job-name");
         $.ajax({
             url: "/api/jobs/" + jobName + "/disable",
@@ -154,7 +163,7 @@ function bindDisableButton() {
 }
 
 function bindEnableButton() {
-    $(document).on("click", "button[operation='enable-job']", function(event) {
+    $("button[operation='enable-job']").click(function(event) {
         var jobName = $(event.currentTarget).attr("job-name");
         $.ajax({
             url: "/api/jobs/" + jobName + "/disable",
@@ -168,7 +177,7 @@ function bindEnableButton() {
 }
 
 function bindShutdownButton() {
-    $(document).on("click", "button[operation='shutdown-job']", function(event) {
+    $("button[operation='shutdown-job']").click(function(event) {
         $("#shutdown-confirm-dialog").modal({backdrop: 'static', keyboard: true});
         var jobName = $(event.currentTarget).attr("job-name");
         $(document).off("click", "#shutdown-confirm-dialog-confirm-btn");
@@ -188,7 +197,7 @@ function bindShutdownButton() {
 }
 
 function bindRemoveButton() {
-    $(document).on("click", "button[operation='remove-job']", function(event) {
+    $("button[operation='remove-job']").click(function(event) {
         var jobName = $(event.currentTarget).attr("job-name");
         $("#delete-confirm-dialog").modal({backdrop: 'static', keyboard: true});
         $(document).off("click", "#delete-confirm-dialog-confirm-btn");

diff --git a/...stic-job-lite-console/src/main/resources/console/js/status/server/server_status_detail.js b/...stic-job-lite-console/src/main/resources/console/js/status/server/server_status_detail.js
@@ -1,7 +1,6 @@
 $(function() {
     $("#server-ip").text($("#index-server-ip").text());
     renderJobs();
-    bindButtons();
     renderBreadCrumbMenu();
 });
 
@@ -27,7 +26,13 @@ function renderJobs() {
             field: "operation",
             title: "操作",
             formatter: "generateOperationButtons"
-        }]
+        }],
+        onLoadSuccess: function() {
+            bindButtons();
+        },
+        onSort: function(name, order) {
+            $("#server-jobs-tbl").bootstrapTable("refresh");
+        }
     });
 }
 
@@ -69,7 +74,7 @@ function bindButtons() {
 }
 
 function bindDisableButton() {
-    $(document).on("click", "button[operation='disable']", function(event) {
+    $("button[operation='disable']").click(function(event) {
         $.ajax({
             url: "/api/servers/" + $("#server-ip").text() + "/jobs/" + $(event.currentTarget).attr("job-name") + "/disable",
             type: "POST",
@@ -82,7 +87,7 @@ function bindDisableButton() {
 }
 
 function bindEnableButton() {
-    $(document).on("click", "button[operation='enable']", function(event) {
+    $("button[operation='enable']").click(function(event) {
         $.ajax({
             url: "/api/servers/" + $("#server-ip").text() + "/jobs/" + $(event.currentTarget).attr("job-name") + "/disable",
             type: "DELETE",
@@ -95,7 +100,7 @@ function bindEnableButton() {
 }
 
 function bindShutdownButton() {
-    $(document).on("click", "button[operation='shutdown']", function(event) {
+    $("button[operation='shutdown']").click(function(event) {
         $("#shutdown-confirm-dialog").modal({backdrop: 'static', keyboard: true});
         var serverIp = $("#server-ip").text();
         var jobName = $(event.currentTarget).attr("job-name");
@@ -116,7 +121,7 @@ function bindShutdownButton() {
 }
 
 function bindRemoveButton() {
-    $(document).on("click", "button[operation='remove']", function(event) {
+    $("button[operation='remove']").click(function(event) {
         $("#delete-confirm-dialog").modal({backdrop: 'static', keyboard: true});
         var serverIp = $("#server-ip").text();
         var jobName = $(event.currentTarget).attr("job-name");

diff --git a/...c-job-lite-console/src/main/resources/console/js/status/server/servers_status_overview.js b/...c-job-lite-console/src/main/resources/console/js/status/server/servers_status_overview.js
@@ -1,6 +1,5 @@
 $(function() {
     renderServersOverview();
-    bindOperationButtons();
 });
 
 function renderServersOverview() {
@@ -40,7 +39,17 @@ function renderServersOverview() {
     if (activated) {
         jsonData.url = "/api/servers";
     }
-    $("#servers-overview-tbl").bootstrapTable(jsonData);
+    $("#servers-overview-tbl").bootstrapTable({
+        columns: jsonData.columns,
+        url: jsonData.url,
+        cache: jsonData.cache,
+        onLoadSuccess: function() {
+            bindOperationButtons();
+        },
+        onSort: function(name, order) {
+            $("#servers-overview-tbl").bootstrapTable("refresh");
+        }
+    });
 }
 
 function bindOperationButtons() {
@@ -70,15 +79,15 @@ function generateOperationButtons(val, row) {
 }
 
 function bindServerStatusDetailButton() {
-    $(document).on("click", "button[operation='server-detail'][data-toggle!='modal']", function(event) {
+    $("button[operation='server-detail'][data-toggle!='modal']").click(function(event) {
         var serverIp = $(event.currentTarget).attr("server-ip");
         $("#index-server-ip").text(serverIp);
         $("#content").load("html/status/server/server_status_detail.html");
     });
 }
 
 function bindDisableServerButton() {
-    $(document).on("click", "button[operation='disable-server']", function(event) {
+    $("button[operation='disable-server']").click(function(event) {
         var serverIp = $(event.currentTarget).attr("server-ip");
         $.ajax({
             url: "/api/servers/" + serverIp + "/disable",
@@ -92,7 +101,7 @@ function bindDisableServerButton() {
 }
 
 function bindEnableServerButton() {
-    $(document).on("click", "button[operation='enable-server']", function(event) {
+    $("button[operation='enable-server']").click(function(event) {
         var serverIp = $(event.currentTarget).attr("server-ip");
         $.ajax({
             url: "/api/servers/" + serverIp + "/disable",
@@ -106,7 +115,7 @@ function bindEnableServerButton() {
 }
 
 function bindShutdownServerButton() {
-    $(document).on("click", "button[operation='shutdown-server']", function(event) {
+    $("button[operation='shutdown-server']").click(function(event) {
         $("#shutdown-confirm-dialog").modal({backdrop: 'static', keyboard: true});
         var serverIp = $(event.currentTarget).attr("server-ip");
         $(document).off("click", "#shutdown-confirm-dialog-confirm-btn");
@@ -126,7 +135,7 @@ function bindShutdownServerButton() {
 }
 
 function bindRemoveServerButton() {
-    $(document).on("click", "button[operation='remove-server']", function(event) {
+    $("button[operation='remove-server']").click(function(event) {
         $("#delete-confirm-dialog").modal({backdrop: 'static', keyboard: true});
         var serverIp = $(event.currentTarget).attr("server-ip");
         $(document).off("click", "#delete-confirm-dialog-confirm-btn");

diff --git a/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/js/util/dashboard.js b/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/js/util/dashboard.js
@@ -92,6 +92,7 @@ function switchRegCenter() {
                     renderRegCenterForDashboardNav();
                     refreshJobNavTag();
                     refreshServerNavTag();
+                    $("#content").load("html/global/registry_center.html");
                 } else {
                     link.button("reset");
                     showFailureDialog("switch-reg-center-failure-dialog");
@@ -117,6 +118,7 @@ function switchDataSource() {
                     showSuccessDialog();
                     $("#data-sources").bootstrapTable("refresh");
                     renderDataSourceForDashboardNav();
+                    $("#content").load("html/global/event_trace_data_source.html");
                 } else {
                     link.button("reset");
                     showFailureDialog("switch-data-source-failure-dialog");