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 de1be34 i18n for v-data-table
de1be34 is described below
commit de1be341d6f026680a2a48c317a2109cdac145cd
Author: Jinkai Ma <m...@vip.qq.com>
AuthorDate: Fri Jan 11 10:30:55 2019 +0800
i18n for v-data-table
---
dubbo-admin-frontend/src/components/governance/AccessControl.vue | 1 +
dubbo-admin-frontend/src/components/governance/LoadBalance.vue | 1 +
dubbo-admin-frontend/src/components/governance/Overrides.vue | 1 +
dubbo-admin-frontend/src/components/governance/RoutingRule.vue | 1 +
dubbo-admin-frontend/src/components/governance/TagRule.vue | 1 +
dubbo-admin-frontend/src/components/governance/WeightAdjust.vue | 1 +
dubbo-admin-frontend/src/components/public/Toolbar.vue | 4 ++--
dubbo-admin-frontend/src/lang/en.js | 1 +
dubbo-admin-frontend/src/lang/zh.js | 1 +
9 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dubbo-admin-frontend/src/components/governance/AccessControl.vue
b/dubbo-admin-frontend/src/components/governance/AccessControl.vue
index e643537..7778764 100644
--- a/dubbo-admin-frontend/src/components/governance/AccessControl.vue
+++ b/dubbo-admin-frontend/src/components/governance/AccessControl.vue
@@ -75,6 +75,7 @@
:items="accesses"
:loading="loading"
hide-actions
+ :no-data-text="$t('noDataText')"
class="elevation-0">
<template slot="items"
slot-scope="props">
diff --git a/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
index 140a9a6..355c76d 100644
--- a/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
+++ b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
@@ -69,6 +69,7 @@
:items="loadBalances"
hide-actions
class="elevation-0"
+ :no-data-text="$t('noDataText')"
>
<template slot="items" slot-scope="props">
<td class="text-xs-left">{{ props.item.service }}</td>
diff --git a/dubbo-admin-frontend/src/components/governance/Overrides.vue
b/dubbo-admin-frontend/src/components/governance/Overrides.vue
index 9b51345..4b5a782 100644
--- a/dubbo-admin-frontend/src/components/governance/Overrides.vue
+++ b/dubbo-admin-frontend/src/components/governance/Overrides.vue
@@ -68,6 +68,7 @@
:headers="serviceHeaders"
:items="serviceConfigs"
hide-actions
+ :no-data-text="$t('noDataText')"
class="elevation-0"
>
<template slot="items" slot-scope="props">
diff --git a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
index 97ef8cc..b057545 100644
--- a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
+++ b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
@@ -67,6 +67,7 @@
:headers="serviceHeaders"
:items="serviceRoutingRules"
hide-actions
+ :no-data-text="$t('noDataText')"
class="elevation-0"
>
<template slot="items" slot-scope="props">
diff --git a/dubbo-admin-frontend/src/components/governance/TagRule.vue
b/dubbo-admin-frontend/src/components/governance/TagRule.vue
index 19242fe..9d4e546 100644
--- a/dubbo-admin-frontend/src/components/governance/TagRule.vue
+++ b/dubbo-admin-frontend/src/components/governance/TagRule.vue
@@ -35,6 +35,7 @@
:headers="headers"
:items="tagRoutingRules"
hide-actions
+ :no-data-text="$t('noDataText')"
class="elevation-0"
>
<template slot="items" slot-scope="props">
diff --git a/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
b/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
index 60515cd..317be0c 100644
--- a/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
+++ b/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
@@ -68,6 +68,7 @@
:headers="serviceHeaders"
:items="weights"
hide-actions
+ :no-data-text="$t('noDataText')"
class="elevation-0"
>
<template slot="items" slot-scope="props">
diff --git a/dubbo-admin-frontend/src/components/public/Toolbar.vue
b/dubbo-admin-frontend/src/components/public/Toolbar.vue
index 25db341..66fdd35 100644
--- a/dubbo-admin-frontend/src/components/public/Toolbar.vue
+++ b/dubbo-admin-frontend/src/components/public/Toolbar.vue
@@ -133,10 +133,10 @@
methods: {
submit () {
if (window.location.href.includes('#/service')) {
- window.location.href = '#/service?filter=' + this.global +
'&pattern=service';
+ window.location.href = '#/service?filter=' + this.global +
'&pattern=service'
window.location.reload()
} else {
- window.location.href = '#/service?filter=' + this.global +
'&pattern=service';
+ window.location.href = '#/service?filter=' + this.global +
'&pattern=service'
}
this.global = ''
},
diff --git a/dubbo-admin-frontend/src/lang/en.js
b/dubbo-admin-frontend/src/lang/en.js
index 273dd81..90de8de 100644
--- a/dubbo-admin-frontend/src/lang/en.js
+++ b/dubbo-admin-frontend/src/lang/en.js
@@ -15,6 +15,7 @@
* limitations under the License.
*/
export default {
+ noDataText: 'No data available',
serviceSearch: 'Search service name',
serviceGovernance: 'Service Governance',
routingRule: 'Condition Rule',
diff --git a/dubbo-admin-frontend/src/lang/zh.js
b/dubbo-admin-frontend/src/lang/zh.js
index 43d534b..5ede56f 100644
--- a/dubbo-admin-frontend/src/lang/zh.js
+++ b/dubbo-admin-frontend/src/lang/zh.js
@@ -15,6 +15,7 @@
* limitations under the License.
*/
export default {
+ noDataText: '没有可用的数据',
serviceSearch: '服务查询',
serviceGovernance: '服务治理',
routingRule: '条件路由',
