This is an automated email from the ASF dual-hosted git repository. mjk 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 c8da751 Remove spaces in pattern c8da751 is described below commit c8da751f7e29d50430dc8a2801b5e272d9629eef Author: Ma.Jinkai <m...@vip.qq.com> AuthorDate: Thu Nov 1 15:38:09 2018 +0800 Remove spaces in pattern --- .../dubbo/admin/controller/ServiceController.java | 4 ++-- .../src/components/ServiceSearch.vue | 22 +++++++++------------- 2 files changed, 11 insertions(+), 15 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 c5f0f9c..4298065 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 @@ -78,10 +78,10 @@ public class ServiceController { case "application": key = provider.getApplication().toLowerCase(); break; - case "service name": + case "serviceName": key = provider.getService().toLowerCase(); break; - case "IP": + case "ip": key = provider.getService().toLowerCase(); break; } diff --git a/dubbo-admin-frontend/src/components/ServiceSearch.vue b/dubbo-admin-frontend/src/components/ServiceSearch.vue index fa8b8d1..fd8a941 100644 --- a/dubbo-admin-frontend/src/components/ServiceSearch.vue +++ b/dubbo-admin-frontend/src/components/ServiceSearch.vue @@ -23,15 +23,13 @@ <v-card-text> <v-form> <v-layout row wrap> - <v-text-field label="Search dubbo service" + <v-text-field label="Search dubbo services" :hint="hint" :suffix="queryBy" v-model="filter"></v-text-field> - <v-menu bottom left class="hidden-xs-only"> - <v-btn - slot="activator" - icon> + <v-menu class="hidden-xs-only"> + <v-btn slot="activator" large icon> <v-icon>unfold_more</v-icon> </v-btn> @@ -86,9 +84,9 @@ export default { data: () => ({ items: [ - {id: 0, title: 'service name'}, - {id: 1, title: 'IP'}, - {id: 2, title: 'application'} + {id: 0, title: 'service name', value: 'serviceName'}, + {id: 1, title: 'IP', value: 'ip'}, + {id: 2, title: 'application', value: 'application'} ], selected: 0, services: [], @@ -136,7 +134,7 @@ return '/#/serviceDetail?service=' + service + '&app=' + app }, submit () { - let pattern = this.items[this.selected].title + let pattern = this.items[this.selected].value this.search(this.filter, pattern, true) }, search: function (filter, pattern, rewrite) { @@ -167,11 +165,11 @@ }) if (filter !== '' && pattern !== '') { this.filter = filter - if (pattern === 'service name') { + if (pattern === 'serviceName') { this.selected = 0 } else if (pattern === 'application') { this.selected = 2 - } else if (pattern === 'IP') { + } else if (pattern === 'ip') { this.selected = 1 } this.search(filter, pattern, false) @@ -183,8 +181,6 @@ <style scoped> table.v-table tbody td { - font-size: 13px; - font-weight: 400; word-break: break-all; }