You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by mi...@apache.org on 2018/09/13 13:59:30 UTC
[incubator-dubbo-ops] branch develop updated: enhance search page
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/develop by this push:
new 380613f enhance search page
380613f is described below
commit 380613f3db3ad331e27cf441b3019ff362b35f45
Author: nzomkxia <z8...@gmail.com>
AuthorDate: Thu Sep 13 21:59:20 2018 +0800
enhance search page
---
.../java/org/apache/dubbo/admin/controller/ServiceController.java | 6 +++---
dubbo-admin-frontend/src/components/ServiceSearch.vue | 8 ++++++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
index e0e2752..cae1eb0 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/controller/ServiceController.java
@@ -57,7 +57,7 @@ public class ServiceController {
List<Provider> allProviders = providerService.findAll();
List<ServiceDO> result = new ArrayList<>();
- if (pattern.equals("App")) {
+ if (pattern.equals("application")) {
for (Provider provider : allProviders) {
Map<String, String> map = StringUtils.parseQueryString(provider.getParameters());
String app = map.get(Constants.APPLICATION_KEY);
@@ -71,7 +71,7 @@ public class ServiceController {
}
}
- } else if (pattern.equals("Service")) {
+ } else if (pattern.equals("service name")) {
for (Provider provider : allProviders) {
String service = provider.getService();
Map<String, String> map = StringUtils.parseQueryString(provider.getParameters());
@@ -85,7 +85,7 @@ public class ServiceController {
}
}
- } else if (pattern.equals("Ip")) {
+ } else if (pattern.equals("IP")) {
for (Provider provider : allProviders) {
String address = provider.getAddress();
Map<String, String> map = StringUtils.parseQueryString(provider.getParameters());
diff --git a/dubbo-admin-frontend/src/components/ServiceSearch.vue b/dubbo-admin-frontend/src/components/ServiceSearch.vue
index 6a9533d..44280ab 100644
--- a/dubbo-admin-frontend/src/components/ServiceSearch.vue
+++ b/dubbo-admin-frontend/src/components/ServiceSearch.vue
@@ -166,6 +166,14 @@
}
})
if (filter !== '' && pattern !== '') {
+ this.filter = filter
+ if (pattern === 'service name') {
+ this.selected = 0
+ } else if (pattern === 'application') {
+ this.selected = 2
+ } else if (pattern === 'IP') {
+ this.selected = 1
+ }
this.search(filter, pattern, false)
}
}