Merge c32cb68a64 into 5d08d3b122

* fix:Fixed the issue that normal messages in version v4 are not showed

* feat:support unspecified topic

---------

Co-authored-by: yuanziwei <yuanziwei@xiaomi.com>

src/main/resources/static/src/i18n/en.js

@@ -60,6 +60,7 @@ var en = {
     "RETRY": "RETRY",
     "FIFO": "FIFO",
     "TRANSACTION": "TRANSACTION",
+    "UNSPECIFIED": "UNSPECIFIED",
     "DLQ": "DLQ",
     "QUANTITY":"Quantity",
     "TYPE":"Type",

src/main/resources/static/src/i18n/zh.js

@@ -61,6 +61,7 @@ var zh = {
     "RETRY": "重试",
     "FIFO": "顺序",
     "TRANSACTION": "事务",
+    "UNSPECIFIED": "未指定",
     "DLQ": "死信",
     "QUANTITY":"数量",
     "TYPE":"类型",

src/main/resources/static/src/topic.js

@@ -48,6 +48,7 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
     $scope.filterDelay = false
     $scope.filterFifo = false
     $scope.filterTransaction = false
+    $scope.filterUnspecified = false
     $scope.filterRetry = false
     $scope.filterDLQ = false
     $scope.filterSystem = false
@@ -91,6 +92,9 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
     $scope.$watch('filterTransaction', function () {
         $scope.filterList(1);
     });
+    $scope.$watch('filterUnspecified', function () {
+        $scope.filterList(1);
+    });
     $scope.$watch('filterDelay', function () {
         $scope.filterList(1);
     });
@@ -137,22 +141,30 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
                 return true
             }
         }
+        if (localStorage.getItem('isV5') && $scope.filterUnspecified) {
+            if (type.includes("UNSPECIFIED")) {
+                return true
+            }
+        }
         if ($scope.filterNormal) {
             if (type.includes("NORMAL")) {
                 return true
             }
+            if (!localStorage.getItem('isV5') && type.includes("UNSPECIFIED")) {
+                return true
+            }
         }
-        if ($scope.filterDelay) {
+        if (localStorage.getItem('isV5') && $scope.filterDelay) {
             if (type.includes("DELAY")) {
                 return true
             }
         }
-        if ($scope.filterFifo) {
+        if (localStorage.getItem('isV5') && $scope.filterFifo) {
             if (type.includes("FIFO")) {
                 return true
             }
         }
-        if ($scope.filterTransaction) {
+        if (localStorage.getItem('isV5') && $scope.filterTransaction) {
             if (type.includes("TRANSACTION")) {
                 return true
             }

src/main/resources/static/view/pages/topic.html

@@ -30,6 +30,8 @@
                 </md-checkbox>
                 <md-checkbox aria-label="Checkbox" ng-model="filterTransaction" class="md-primary" ng-show="rmqVersion">{{'TRANSACTION' | translate}}
                 </md-checkbox>
+                <md-checkbox aria-label="Checkbox" ng-model="filterUnspecified" class="md-primary" ng-show="rmqVersion">{{'UNSPECIFIED' | translate}}
+                </md-checkbox>
                 <md-checkbox aria-label="Checkbox" ng-model="filterRetry" class="md-primary">{{'RETRY' | translate}}
                 </md-checkbox>
                 <md-checkbox aria-label="Checkbox" ng-model="filterDLQ" class="md-primary">{{'DLQ' | translate}}