diff --git a/ui-vue3/src/Login.vue b/ui-vue3/src/Login.vue index 1988b7edf..6a67a5aac 100644 --- a/ui-vue3/src/Login.vue +++ b/ui-vue3/src/Login.vue @@ -44,8 +44,8 @@ function loginHandle() { updateAuthState(true, userinfo.username) const { data } = await meshesSearch() // if mesh is not set or old mesh is expired - if (!meshStore.mesh || !data.some((x: any) => x.name === meshStore.mesh)) { - meshStore.mesh = data[0]?.name + if (!meshStore.mesh || !data.some((x: any) => x.id === meshStore.mesh)) { + meshStore.mesh = data[0]?.id } router.replace(redirect) }) @@ -63,25 +63,14 @@ function loginHandle() { - + - + - diff --git a/ui-vue3/src/base/i18n/en.ts b/ui-vue3/src/base/i18n/en.ts index 6b52d88d9..503346f98 100644 --- a/ui-vue3/src/base/i18n/en.ts +++ b/ui-vue3/src/base/i18n/en.ts @@ -158,6 +158,12 @@ const words: I18nType = { opened: 'Opened', paramRoute: 'Param Route' }, + servicesDomain: { + appName: 'Application Name', + instanceCount: 'Instance Count', + deployClusters: 'Deploy Clusters', + registryClusters: 'Registry Clusters' + }, appServiceTimeout: 'Adjusting the timeout for application service provision', enableAppInstanceLogs: 'Enable access logs for all instances of this application', appServiceLoadBalance: 'Adjusting the load balancing strategy for application service provision', @@ -198,6 +204,8 @@ const words: I18nType = { service: 'Service', versionGroup: 'Version & Group', avgQPS: 'last 1min QPS', + provider: 'Provider', + subset: 'Group', avgRT: 'last 1min RT', requestTotal: 'last 1min request total', serviceSearch: 'Search Service', @@ -368,6 +376,13 @@ const words: I18nType = { placeholders: { searchService: 'Search by service name' }, + placeholder: { + searchService: 'Search by service name', + typeAppName: 'Enter application name', + typeDefault: 'Please enter', + typeRoutingRules: 'Search routing rules', + searchAppNameOrIP: 'Search application, IP' + }, methods: 'Methods', testModule: { searchServiceHint: @@ -490,10 +505,6 @@ const words: I18nType = { backHome: 'Back Home', noPageTip: 'Sorry, the page you visited does not exist.', globalSearchTip: 'Search ip, application, instance, service', - placeholder: { - typeAppName: 'please type appName, support for prefix', - typeDefault: 'please type ' - }, none: 'No Select', debug: 'Debug', distribution: 'Distribution', diff --git a/ui-vue3/src/base/i18n/zh.ts b/ui-vue3/src/base/i18n/zh.ts index b5968662d..70af37dd8 100644 --- a/ui-vue3/src/base/i18n/zh.ts +++ b/ui-vue3/src/base/i18n/zh.ts @@ -175,9 +175,17 @@ const words: I18nType = { opened: '开启', paramRoute: '参数路由' }, + servicesDomain: { + appName: '应用名', + instanceCount: '实例数量', + deployClusters: '部署集群', + registryClusters: '注册集群' + }, service: '服务', versionGroup: '版本&分组', avgQPS: 'QPS', + provider: '提供者', + subset: '分组', avgRT: 'RT', requestTotal: '近1min请求总量', serviceSearch: '服务查询', @@ -478,9 +486,10 @@ const words: I18nType = { globalSearchTip: '搜索ip,应用,实例,服务', placeholder: { - typeAppName: '请输入应用名,支持前缀搜索', + typeAppName: '请输入应用名', typeDefault: '请输入', - typeRoutingRules: '搜索路由规则,支持前缀过滤' + typeRoutingRules: '搜索路由规则', + searchAppNameOrIP: '搜索应用,ip' }, none: '无', details: '详情', diff --git a/ui-vue3/src/layout/header/layout_header.vue b/ui-vue3/src/layout/header/layout_header.vue index b3ea6fe57..98c32be43 100644 --- a/ui-vue3/src/layout/header/layout_header.vue +++ b/ui-vue3/src/layout/header/layout_header.vue @@ -56,7 +56,7 @@ :options=" meshes.map((x: any) => { return { - value: x.name, + value: x.id, label: x.name } }) diff --git a/ui-vue3/src/utils/SearchUtil.ts b/ui-vue3/src/utils/SearchUtil.ts index a9915be56..980d45c69 100644 --- a/ui-vue3/src/utils/SearchUtil.ts +++ b/ui-vue3/src/utils/SearchUtil.ts @@ -98,9 +98,10 @@ export class SearchDomain { this.searchApi(queryParams) .then((res: any) => { + const { - data: { list, pageInfo } - } = res + data: { list = [], pageInfo } + } = res || {} this.result = handleResult ? handleResult(list) : list if (!this.noPaged) { diff --git a/ui-vue3/src/views/resources/applications/index.vue b/ui-vue3/src/views/resources/applications/index.vue index 091a2d760..37d977491 100644 --- a/ui-vue3/src/views/resources/applications/index.vue +++ b/ui-vue3/src/views/resources/applications/index.vue @@ -30,10 +30,7 @@