jiulinxiri/rocketmq-dashboard
1
0
Fork 0
mirror of https://github.com/apache/rocketmq-dashboard.git synced 2025-09-11 03:49:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support Unspecified Topic Add & Update & Query (#223)

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

* feat:support unspecified topic

---------

Co-authored-by: yuanziwei <yuanziwei@xiaomi.com>
This commit is contained in:
Akai
2024-07-24 10:57:04 +08:00
committed by GitHub
parent d9fc76d3a3
commit 5d08d3b122
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/static/src/i18n/en.js
View File

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

1
src/main/resources/static/src/i18n/zh.js
View File

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

15
src/main/resources/static/src/topic.js
View File

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

2
src/main/resources/static/view/pages/topic.html
View File

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