Merge branch 'vue_warn_fix' into '4.1.0-SNAPSHOT'

修复vue warn报错

See merge request laf/journalQ!252

Author: liyue25

joyqueue-console/joyqueue-portal/src/views/setting/brokerMonitor.vue

@@ -75,9 +75,11 @@
               render: (h, params) => {
                 var list=params.item.brokerTopicMonitorRecordList;
                 var html=[];
-                for(var i=0;i<list.length;i++){
-                  var p=h('div',list[i].app);
-                  html.push(p);
+                if (list != undefined) {
+                  for (var i = 0; i < list.length; i++) {
+                    var p = h('div', list[i].app);
+                    html.push(p);
+                  }
                 }
                 return h('div',{},html)
               }
@@ -88,9 +90,11 @@
               render: (h, params) => {
                 var list=params.item.brokerTopicMonitorRecordList;
                 var html=[];
-                for(var i=0;i<list.length;i++){
-                  var p=h('div',list[i].connections);
-                  html.push(p);
+                if (list != undefined) {
+                  for (var i = 0; i < list.length; i++) {
+                    var p = h('div', list[i].connections);
+                    html.push(p);
+                  }
                 }
                 return h('div',html)
               }
@@ -101,9 +105,11 @@
               render: (h, params) => {
                 var list=params.item.brokerTopicMonitorRecordList;
                 var html=[]
-                for(var i=0;i<list.length;i++){
-                  var p=h('div',list[i].count);
-                  html.push(p);
+                if (list != undefined) {
+                  for (var i = 0; i < list.length; i++) {
+                    var p = h('div', list[i].count);
+                    html.push(p);
+                  }
                 }
                 return h('div',html)
               }
@@ -114,9 +120,11 @@
               render: (h, params) => {
                 var list=params.item.brokerTopicMonitorRecordList;
                 var html=[];
-                for(var i=0;i<list.length;i++){
-                  var p=h('div',list[i].totalSize);
-                  html.push(p);
+                if (list != undefined) {
+                  for (var i = 0; i < list.length; i++) {
+                    var p = h('div', list[i].totalSize);
+                    html.push(p);
+                  }
                 }
                 return h('div',html)
               }

joyqueue-console/joyqueue-portal/src/views/setting/brokerPartitionGroupMonitor.vue

@@ -49,12 +49,14 @@ export default {
             render: (h, params) => {
               var list = params.item.partitionGroupMetricList
               if (list!= null && list.length > 0) {
-                list = list.sort((a,b) => a.partitionGroup-b.partitionGroup)
+                list = list.slice().sort((a,b) => a.partitionGroup-b.partitionGroup)
               }
               var html = []
-              for (var i = 0; i < list.length; i++) {
-                var p = h('div',{ style:'border-bottom: 1px solid #ECECEC;'},list[i].partitionGroup)
-                html.push(p)
+              if (list != undefined) {
+                for (var i = 0; i < list.length; i++) {
+                  var p = h('div', {style: 'border-bottom: 1px solid #ECECEC;'}, list[i].partitionGroup)
+                  html.push(p)
+                }
               }
               return h('div', {}, html)
             }
@@ -65,12 +67,14 @@ export default {
             render: (h, params) => {
               var list = params.item.partitionGroupMetricList;
               if (list!= null && list.length > 0) {
-                list = list.sort((a,b) => a.partitionGroup-b.partitionGroup)
+                list = list.slice().sort((a,b) => a.partitionGroup-b.partitionGroup)
               }
               var html = []
-              for (var i = 0; i < list.length; i++) {
-                var p = h('div',{style:'border-bottom: 1px solid #ECECEC;'}, list[i].partitions)
-                html.push(p)
+              if (list != undefined) {
+                for (var i = 0; i < list.length; i++) {
+                  var p = h('div', {style: 'border-bottom: 1px solid #ECECEC;'}, list[i].partitions)
+                  html.push(p)
+                }
               }
               return h('div', {}, html)
             }

joyqueue-console/joyqueue-portal/src/views/setting/brokerServerMonitor.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
-    <div style="border:10px solid #f7f7f7;width:600px;">
+    <div style="border:10px solid #f7f7f7;width:600px;" v-if="detail.store">
       <h4>存储监控:</h4>
       <span>started:</span><span v-if="detail.store.started">Running</span><span v-else>Stop</span>&nbsp&nbsp
       <span>totalSpace:</span><span>{{detail.store.totalSpace}}</span>&nbsp&nbsp
       <span>freeSpace:</span><span>{{detail.store.freeSpace}}</span>
     </div>
-    <div style="border:10px solid #f7f7f7;width:600px;">
+    <div style="border:10px solid #f7f7f7;width:600px;" v-if="detail.bufferPoolMonitorInfo">
       <h4>内存:</h4>
       <div v-for="item in detail.bufferPoolMonitorInfo.plMonitorInfos">
         <span>bufferSize:</span><span>{{item.bufferSize}}</span>&nbsp&nbsp
@@ -21,17 +21,17 @@
       <span>mmp:</span><span>{{detail.bufferPoolMonitorInfo.mmpUsed}}</span>&nbsp&nbsp
       <span>maxMemorySize:</span><span>{{detail.bufferPoolMonitorInfo.maxMemorySize}}</span>
     </div>
-    <div style="border:10px solid #f7f7f7;width:600px;">
+    <div style="border:10px solid #f7f7f7;width:600px;" v-if="detail.connection">
       <h4>连接数:</h4>
       <span>total:</span><span>{{detail.connection.total}}</span>&nbsp&nbsp
       <span>consumer:</span><span>{{detail.connection.consumer}}</span>&nbsp&nbsp
       <span>producer:</span><span>{{detail.connection.producer}}</span>
     </div>
-    <div style="border:10px solid #f7f7f7;width:600px;">
+    <div style="border:10px solid #f7f7f7;width:600px;" v-if="detail.election">
       <h4>选举:</h4>
       <span>started:</span><span v-if="detail.election.started" >Running</span><span v-else >Stop</span>
     </div>
-    <div style="border:10px solid #f7f7f7;width:600px;">
+    <div style="border:10px solid #f7f7f7;width:600px;" v-if="detail.nameServer">
       <h4>nsr:</h4>
       <span>started:</span><span v-if="detail.nameServer.started" >Running</span><span v-else>Stop</span>
     </div>
@@ -65,6 +65,8 @@
           },
           election:{
 
+          },
+          bufferPoolMonitorInfo:{
           }
         },
 
@@ -75,23 +77,12 @@
         apiRequest.get(this.urls.findbroker+"/" + this.brokerId,"",{}).then(data=>{
           if(data.code == 200) {
             this.detail = data.data;
-            console.log(data.data)
-        }
+          }
         })
       }
     },
     mounted () {
       this.getList();
-    },
-    filters: {
-      numFilter(value) {
-        // 截取当前数据到小数点后两位
-        let value1 = value/1024/1024/1024;
-        let realVal = parseFloat(value1).toFixed(2)
-        return realVal
-
-      }
-
     }
   }
 </script>