Merge branch 'master' of https://github.com/ikun-Lg/dubbo-kubernetes
diff --git a/ui-vue3/src/base/i18n/en.ts b/ui-vue3/src/base/i18n/en.ts
index e453e34..f165147 100644
--- a/ui-vue3/src/base/i18n/en.ts
+++ b/ui-vue3/src/base/i18n/en.ts
@@ -46,7 +46,6 @@
startTime_k8s: 'Start Time(k8s)',
registerStates: 'Register States',
deployState: 'Deployment Status',
- deployCluster: 'Deploy Cluster',
registerCluster: 'Register Cluster',
owningWorkload_k8s: 'Owning Workload(k8s)',
creationTime: 'Creation Time',
@@ -100,6 +99,8 @@
serialization: 'serialization',
appName: 'Application Name',
instanceNum: 'Instance Number',
+ deployCluster: 'Deploy Cluster',
+ registerClusters: 'Register Clusters',
serviceName: 'Service Name',
registrySource: 'Registry Source',
instanceRegistry: 'Instance Registry',
@@ -331,6 +332,7 @@
tracing: 'Tracing',
provideService: 'Provide Service',
+ idx: 'Index',
dependentService: 'Dependent Service'
}
diff --git a/ui-vue3/src/base/i18n/zh.ts b/ui-vue3/src/base/i18n/zh.ts
index 50ce883..e3fdb6d 100644
--- a/ui-vue3/src/base/i18n/zh.ts
+++ b/ui-vue3/src/base/i18n/zh.ts
@@ -329,7 +329,8 @@
tracing: '链路追踪',
provideService: '提供服务',
- dependentService: '依赖服务'
+ dependentService: '依赖服务',
+ idx: '序号'
}
export default words
diff --git a/ui-vue3/src/components/SearchTable.vue b/ui-vue3/src/components/SearchTable.vue
index 0d7a229..5fca6a0 100644
--- a/ui-vue3/src/components/SearchTable.vue
+++ b/ui-vue3/src/components/SearchTable.vue
@@ -78,7 +78,7 @@
<script setup lang="ts">
import type { ComponentInternalInstance } from 'vue'
-import { getCurrentInstance, inject } from 'vue'
+import { computed, getCurrentInstance, inject } from 'vue'
import { PROVIDE_INJECT_KEY } from '@/base/enums/ProvideInject'
import type { SearchDomain } from '@/utils/SearchUtil'
@@ -92,7 +92,10 @@
const searchDomain: SearchDomain | any = inject(PROVIDE_INJECT_KEY.SEARCH_DOMAIN)
searchDomain.table.columns.forEach((column: any) => {
- column.title = globalProperties.$t(column.title)
+ if (column.title) {
+ const tmp = column.title
+ column.title = computed(() => globalProperties.$t(tmp))
+ }
})
console.log(searchDomain)
const pagination = {