Repository: incubator-rocketmq-externals Updated Branches: refs/heads/master 2a8ff251b -> 1007e8813
fix cluster page's bug closes apache/incubator-rocketmq-externals#2 Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/commit/1007e881 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/tree/1007e881 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/diff/1007e881 Branch: refs/heads/master Commit: 1007e88139603c9cbdd696bc16d7198011a15b02 Parents: 2a8ff25 Author: StyleTang <[email protected]> Authored: Fri Mar 17 21:32:38 2017 +0800 Committer: zander <[email protected]> Committed: Fri Mar 17 21:32:38 2017 +0800 ---------------------------------------------------------------------- .../src/main/resources/static/index.html | 2 +- .../src/main/resources/static/src/controller.js | 6 ++-- .../main/resources/static/src/tools/tools.js | 32 +++++++++----------- 3 files changed, 19 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1007e881/rocketmq-console/src/main/resources/static/index.html ---------------------------------------------------------------------- diff --git a/rocketmq-console/src/main/resources/static/index.html b/rocketmq-console/src/main/resources/static/index.html index 745b1fa..6e3e6aa 100644 --- a/rocketmq-console/src/main/resources/static/index.html +++ b/rocketmq-console/src/main/resources/static/index.html @@ -103,7 +103,7 @@ <script type="text/javascript" src="vendor/echarts/echarts.min.js"></script> <script type="text/javascript" src="src/app.js"></script> <script type="text/javascript" src="src/controller.js?v=201702250025"></script> -<script type="text/javascript" src="src/tools/tools.js"></script> +<script type="text/javascript" src="src/tools/tools.js?v=201703171710"></script> <script type="text/javascript" src="src/cluster.js?timestamp=4"></script> <script type="text/javascript" src="src/topic.js"></script> <script type="text/javascript" src="src/consumer.js?timestamp=6"></script> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1007e881/rocketmq-console/src/main/resources/static/src/controller.js ---------------------------------------------------------------------- diff --git a/rocketmq-console/src/main/resources/static/src/controller.js b/rocketmq-console/src/main/resources/static/src/controller.js index fbf041d..8d5d5d2 100644 --- a/rocketmq-console/src/main/resources/static/src/controller.js +++ b/rocketmq-console/src/main/resources/static/src/controller.js @@ -311,16 +311,16 @@ app.controller('dashboardCtrl', ['$scope','$rootScope','$translate','$filter','N var callback = function (resp) { $scope.barChart.hideLoading(); if (resp.status == 0) { - var clusterMap = resp.data.clusterInfo.clusterAddrTable; + var clusterAddrTable = resp.data.clusterInfo.clusterAddrTable; var brokerMap = resp.data.clusterInfo.brokerAddrTable; var brokerDetail = resp.data.brokerServer; - var clusterMap = tools.generateBrokerMap(brokerDetail,clusterMap,brokerMap); + var clusterMap = tools.generateBrokerMap(brokerDetail,clusterAddrTable,brokerMap); $scope.brokerArray = []; $.each(clusterMap,function(clusterName,brokers){ $.each(brokers,function(i,broker){ $scope.brokerArray.push(broker) }) - }) + }); //sort the brokerArray $scope.brokerArray.sort(function(firstBroker,lastBroker){ http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1007e881/rocketmq-console/src/main/resources/static/src/tools/tools.js ---------------------------------------------------------------------- diff --git a/rocketmq-console/src/main/resources/static/src/tools/tools.js b/rocketmq-console/src/main/resources/static/src/tools/tools.js index 780f088..9ab5ae7 100644 --- a/rocketmq-console/src/main/resources/static/src/tools/tools.js +++ b/rocketmq-console/src/main/resources/static/src/tools/tools.js @@ -20,30 +20,28 @@ app.service('tools', ['$http', function ($http) { var ctx = ""; var dashboardRefreshTime = 5000; // todo improve. when data size is large,request is too slow - var generateBrokerMap = function(brokerDetail,clusterMap,brokerMap){ + var generateBrokerMap = function (brokerServer, clusterAddrTable, brokerAddrTable) { var map = {}; - $.each(brokerDetail,function(k,v){ - $.each(clusterMap,function (ck, cv) { - if(angular.isUndefined(map[ck])){ - map[ck] = []; + $.each(brokerServer, function (brokerName, brokerStatusList) { // broker + $.each(clusterAddrTable, function (clusterName, brokerNameList) { //clusterAddrTable + if (angular.isUndefined(map[clusterName])) { + map[clusterName] = []; } - $.each(cv,function(cvi,cvv){ - if(cvv == k){ - var index = 0; - $.each(v,function(vi,vv){ - vv.split = k; - vv.index = index; - vv.address = brokerMap[cvv].brokerAddrs[index]; - vv.brokerName = brokerMap[cvv].brokerName; - map[ck].push(vv); - index++; + $.each(brokerNameList, function (listIndex, clusterBrokerName) { + if (clusterBrokerName == brokerName) { + $.each(brokerStatusList, function (index, brokerStatus) { + brokerStatus.split = brokerName; + brokerStatus.index = index; + brokerStatus.address = brokerAddrTable[clusterBrokerName].brokerAddrs[index]; + brokerStatus.brokerName = brokerAddrTable[clusterBrokerName].brokerName; + map[clusterName].push(brokerStatus); }) } }) }) - }) + }); return map; - } + }; var fastSort = function (arrayToSort, propertyToSortWith, sortDirection) { // temporary holder of position and sort-value
