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 001cc6f fix AccessControl search bug & I18n modify (#241) 001cc6f is described below commit 001cc6f01f8e1d916c86a1c93ca40739d0e85e27 Author: IORI <925716...@qq.com> AuthorDate: Fri Jan 11 10:26:22 2019 +0800 fix AccessControl search bug & I18n modify (#241) --- dubbo-admin-frontend/src/components/ServiceSearch.vue | 14 +++++++------- .../src/components/governance/AccessControl.vue | 8 +++----- dubbo-admin-frontend/src/lang/en.js | 1 + dubbo-admin-frontend/src/lang/zh.js | 1 + 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dubbo-admin-frontend/src/components/ServiceSearch.vue b/dubbo-admin-frontend/src/components/ServiceSearch.vue index 71c1156..bf5b69f 100644 --- a/dubbo-admin-frontend/src/components/ServiceSearch.vue +++ b/dubbo-admin-frontend/src/components/ServiceSearch.vue @@ -104,7 +104,7 @@ :key="i" :href='governanceHref(item.value, props.item.service, props.item.group, props.item.version)' > - <v-list-tile-title>{{ item.title }}</v-list-tile-title> + <v-list-tile-title>{{ $t(item.title) }}</v-list-tile-title> </v-list-tile> </v-list> </v-menu> @@ -127,22 +127,22 @@ {id: 2, title: 'app', value: 'application'} ], options: [ - { title: 'Routing Rule', + { title: 'routingRule', value: 'routingRule' }, - { title: 'Tag Rule', + { title: 'tagRule', value: 'tagRule' }, - { title: 'Dynamic Config', + { title: 'dynamicConfig', value: 'config' }, - { title: 'Access Control', + { title: 'accessControl', value: 'access' }, - { title: 'Weight Adjust', + { title: 'weightAdjust', value: 'weight' }, - { title: 'Load Balance', + { title: 'loadBalance', value: 'loadbalance' } ], diff --git a/dubbo-admin-frontend/src/components/governance/AccessControl.vue b/dubbo-admin-frontend/src/components/governance/AccessControl.vue index 0b5f3c2..e643537 100644 --- a/dubbo-admin-frontend/src/components/governance/AccessControl.vue +++ b/dubbo-admin-frontend/src/components/governance/AccessControl.vue @@ -16,10 +16,8 @@ --> <template> - <v-container grid-list-xl - fluid> - <v-layout row - wrap> + <v-container grid-list-xl fluid> + <v-layout row wrap> <v-flex lg12> <v-card flat color="transparent"> <v-card-text> @@ -32,7 +30,7 @@ append-icon="" hide-no-data :suffix="queryBy" - :label="$t('searchRoutingRule')" + :label="$t('searchAccessRule')" ></v-combobox> <v-menu class="hidden-xs-only"> <v-btn slot="activator" large icon> diff --git a/dubbo-admin-frontend/src/lang/en.js b/dubbo-admin-frontend/src/lang/en.js index 8831a23..273dd81 100644 --- a/dubbo-admin-frontend/src/lang/en.js +++ b/dubbo-admin-frontend/src/lang/en.js @@ -62,6 +62,7 @@ export default { edit: 'Edit', delete: 'Delete', searchRoutingRule: 'Search Routing Rule', + searchAccess: 'Search Access Rule', searchWeightRule: 'Search Weight Adjust Rule', dataIdHint: 'A service ID in form of group/service:version, group and version are optional', agree: 'Agree', diff --git a/dubbo-admin-frontend/src/lang/zh.js b/dubbo-admin-frontend/src/lang/zh.js index 1df128f..43d534b 100644 --- a/dubbo-admin-frontend/src/lang/zh.js +++ b/dubbo-admin-frontend/src/lang/zh.js @@ -62,6 +62,7 @@ export default { edit: '编辑', delete: '删除', searchRoutingRule: '搜索路由规则', + searchAccessRule: '搜索黑白名单', searchWeightRule: '搜索权重调整规则', dataIdHint: '组/服务:版本形式的服务ID,组和版本可选', agree: '同意',