From a33505da985e9c1aca31643b84da77fdcc0fe2a4 Mon Sep 17 00:00:00 2001
From: chouchouji <1305974212@qq.com>
Date: Thu, 17 Oct 2024 20:21:16 +0800
Subject: [PATCH] [AMORO-3139] Improve list content of optimizing page
---
amoro-web/src/hooks/usePlaceholder.ts | 2 +-
amoro-web/src/language/en.ts | 11 ++++-------
amoro-web/src/language/zh.ts | 11 ++++-------
amoro-web/src/views/catalogs/Detail.vue | 2 +-
amoro-web/src/views/resource/index.vue | 12 ++++++------
5 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/amoro-web/src/hooks/usePlaceholder.ts b/amoro-web/src/hooks/usePlaceholder.ts
index 01a6b454a4..923d34e17d 100644
--- a/amoro-web/src/hooks/usePlaceholder.ts
+++ b/amoro-web/src/hooks/usePlaceholder.ts
@@ -24,7 +24,7 @@ export function usePlaceholder() {
const catalogPh = computed(() => t('catalog')).value
const dbNamePh = computed(() => t('databaseName')).value
const tableNamePh = computed(() => t('tableName')).value
- const optimizerGroupPh = computed(() => t('optimzerGroup')).value
+ const optimizerGroupPh = computed(() => t('optimizerGroup')).value
const resourceGroupPh = computed(() => t('resourceGroup')).value
const parallelismPh = computed(() => t('parallelism')).value
const usernamePh = computed(() => t('username')).value
diff --git a/amoro-web/src/language/en.ts b/amoro-web/src/language/en.ts
index 5377650ffc..efea76e99e 100644
--- a/amoro-web/src/language/en.ts
+++ b/amoro-web/src/language/en.ts
@@ -31,7 +31,6 @@ export default {
optimizing: 'Optimizing',
terminal: 'Terminal',
settings: 'Settings',
- optimizergroup: 'Optimizer Groups',
systemSetting: 'System Settings',
containerSetting: 'Container Settings',
backHome: 'Back to Home',
@@ -108,7 +107,6 @@ export default {
container: 'Container',
status: 'Status',
optimizingStatus: 'Optimizing Status',
- optimzerGroup: 'Optimizer Group',
allGroups: 'All Groups',
retry: 'Retry',
costTime: 'Cost Time',
@@ -125,8 +123,8 @@ export default {
optimizerGroups: 'Optimizer Groups',
resourceAllocation: 'Resource Allocation',
resourceGroup: 'Resource Group',
- releaseOptModalTitle: 'Release this optimizer？',
- cancelOptimizingProcessOptModalTitle: 'Cancel the optimizing process of this table？',
+ releaseOptModalTitle: 'Release this optimizer?',
+ cancelOptimizingProcessOptModalTitle: 'Cancel the optimizing process of this table?',
welcomeTip: 'Welcome to Amoro!',
signIn: 'Sign in',
username: 'Username',
@@ -182,13 +180,12 @@ export default {
save: 'Save',
remove: 'Remove',
edit: 'Edit',
- deleteCatalogModalTitle: 'Remove this catalog？',
+ deleteCatalogModalTitle: 'Remove this catalog?',
cannotDeleteModalTitle: 'Can\'t remove this catalog.',
cannotDeleteModalContent: 'This catalog has been used.',
success: 'Success',
- optimzeGroup: 'Optimize Group',
propertiesMemory: 'properties.{type}.memory',
- leavePageModalTitle: 'Leave this page？',
+ leavePageModalTitle: 'Leave this page?',
leavePageModalContent: 'Changes you made may not be saved.',
leave: 'Leave',
search: 'Search',
diff --git a/amoro-web/src/language/zh.ts b/amoro-web/src/language/zh.ts
index 15b66c0311..e59ff40f88 100644
--- a/amoro-web/src/language/zh.ts
+++ b/amoro-web/src/language/zh.ts
@@ -17,10 +17,10 @@
*/
export default {
- last1h: '最近 1小时',
- last12h: '最近 12小时',
- last24h: '最近 24小时',
- last7day: '最近 7天',
+ last1h: '最近 1 小时',
+ last12h: '最近 12 小时',
+ last24h: '最近 24 小时',
+ last7day: '最近 7 天',
healthScore: '健康度',
overview: '总览',
top10Tables: '表 TOP 10',
@@ -31,7 +31,6 @@ export default {
optimizing: '优化',
terminal: '终端',
settings: '设置',
- optimizergroup: '优化器组',
systemSetting: '系统设置',
containerSetting: '容器设置',
backHome: '返回首页',
@@ -108,7 +107,6 @@ export default {
container: '容器',
status: '状态',
optimizingStatus: '优化状态',
- optimzerGroup: '优化器组',
allGroups: '全部优化器',
retry: '重试',
costTime: '花费时长',
@@ -186,7 +184,6 @@ export default {
cannotDeleteModalTitle: '不能移除这个目录',
cannotDeleteModalContent: '这个目录已被使用',
success: '成功',
- optimzeGroup: '优化组',
propertiesMemory: 'properties.{type}.memory',
leavePageModalTitle: '离开当前页面？',
leavePageModalContent: '您所做的更改可能无法保存。',
diff --git a/amoro-web/src/views/catalogs/Detail.vue b/amoro-web/src/views/catalogs/Detail.vue
index 707a6a0514..682ee17f09 100644
--- a/amoro-web/src/views/catalogs/Detail.vue
+++ b/amoro-web/src/views/catalogs/Detail.vue
@@ -207,7 +207,7 @@ async function getOptimizerGroupList() {
okText: t('goToButtonText'),
onOk: async () => {
try {
- router.push({ path: '/optimizing', query: { tab: 'optimizergroup' } })
+ router.push({ path: '/optimizing', query: { tab: 'optimizerGroups' } })
}
catch (error) {
console.error('Navigation error:', error)
diff --git a/amoro-web/src/views/resource/index.vue b/amoro-web/src/views/resource/index.vue
index 364f219e4d..d4ab7ab4fa 100644
--- a/amoro-web/src/views/resource/index.vue
+++ b/amoro-web/src/views/resource/index.vue
@@ -48,13 +48,13 @@ export default defineComponent({
const router = useRouter()
const route = useRoute()
const tabConfig: ILableAndValue[] = shallowReactive([
- { label: t('optimizergroup'), value: 'optimizergroup' },
+ { label: t('optimizerGroups'), value: 'optimizerGroups' },
{ label: t('optimizers'), value: 'optimizers' },
])
const placeholder = reactive(usePlaceholder())
const pagination = reactive(usePagination())
const state = reactive({
- activeTab: 'optimizergroup' as string,
+ activeTab: 'optimizerGroups' as string,
showGroupModal: false as boolean,
groupEdit: false,
groupEditRecord: {
@@ -159,16 +159,16 @@ export default defineComponent({
{{ t("addGroup") }}