diff --git a/amoro-web/src/components/Sidebar.vue b/amoro-web/src/components/Sidebar.vue index 04176cf8b7..e86cf12711 100644 --- a/amoro-web/src/components/Sidebar.vue +++ b/amoro-web/src/components/Sidebar.vue @@ -74,8 +74,8 @@ export default defineComponent({ icon: 'catalogs', }, { - key: 'optimizing', - title: t('optimizing'), + key: 'execution', + title: t('execution'), icon: 'optimizers', }, { diff --git a/amoro-web/src/hooks/usePlaceholder.ts b/amoro-web/src/hooks/usePlaceholder.ts index 923d34e17d..33f948e4cd 100644 --- a/amoro-web/src/hooks/usePlaceholder.ts +++ b/amoro-web/src/hooks/usePlaceholder.ts @@ -31,6 +31,7 @@ export function usePlaceholder() { const passwordPh = computed(() => t('password')).value const filterDBPh = computed(() => t('database', 2)).value const filterTablePh = computed(() => t('table', 2)).value + const filterDbTblPh = computed(() => t('dbTbl', 2)).value const namePh = computed(() => t('name')).value const containerPh = computed(() => t('container')).value return { @@ -48,6 +49,7 @@ export function usePlaceholder() { passwordPh: t('inputPlaceholder', { inputPh: passwordPh }), filterDBPh: t('filterPlaceholder', { inputPh: filterDBPh }), filterTablePh: t('filterPlaceholder', { inputPh: filterTablePh }), + filterDbTblPh: t('filterPlaceholder', { inputPh: filterDbTblPh }), groupNamePh: t('inputPlaceholder', { inputPh: namePh }), groupContainer: t('selectPlaceholder', { selectPh: containerPh }), } diff --git a/amoro-web/src/language/en.ts b/amoro-web/src/language/en.ts index 5ae29ed7de..44f351d88a 100644 --- a/amoro-web/src/language/en.ts +++ b/amoro-web/src/language/en.ts @@ -28,7 +28,12 @@ export default { catalogs: 'Catalogs', catalog: 'Catalog', tables: 'Tables', + dbTbl: 'DB Table', + processes: 'Processes', + activeProcesses: 'Active Processes', + summary: 'Summary', optimizing: 'Optimizing', + execution: 'Execution', terminal: 'Terminal', settings: 'Settings', systemSetting: 'System Settings', diff --git a/amoro-web/src/language/zh.ts b/amoro-web/src/language/zh.ts index 269bce77c1..f9292976cd 100644 --- a/amoro-web/src/language/zh.ts +++ b/amoro-web/src/language/zh.ts @@ -28,7 +28,9 @@ export default { catalogs: '目录', catalog: '目录', tables: '表', + dbTbl: '数据库表', optimizing: '优化', + execution: '执行', terminal: '终端', settings: '设置', systemSetting: '系统设置', @@ -44,6 +46,9 @@ export default { database: '库', tableSize: '表大小', table: '表', + processes: '进程', + activeProcesses: '活跃进程', + summary: '摘要', size: '大小', file: '文件', files: '文件', diff --git a/amoro-web/src/router/index.ts b/amoro-web/src/router/index.ts index 734395410e..9bb25a0f33 100644 --- a/amoro-web/src/router/index.ts +++ b/amoro-web/src/router/index.ts @@ -31,6 +31,7 @@ const Settings = () => import('@/views/settings/index.vue') const Terminal = () => import('@/views/terminal/index.vue') const Login = () => import('@/views/login/index.vue') const Resource = () => import('@/views/resource/index.vue') +const Execution = () => import('@/views/execution/index.vue') const Overview = () => import('@/views/overview/index.vue') const routes: Array = [ @@ -70,9 +71,9 @@ const routes: Array = [ ], }, { - path: 'optimizing', - name: 'Optimizing', - component: Resource, + path: 'execution', + name: 'Execution', + component: Execution, }, { path: 'settings', diff --git a/amoro-web/src/views/execution/components/CreateOptimizerModal.vue b/amoro-web/src/views/execution/components/CreateOptimizerModal.vue new file mode 100644 index 0000000000..2e0081027e --- /dev/null +++ b/amoro-web/src/views/execution/components/CreateOptimizerModal.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/amoro-web/src/views/execution/components/GroupModal.vue b/amoro-web/src/views/execution/components/GroupModal.vue new file mode 100644 index 0000000000..56500c3aca --- /dev/null +++ b/amoro-web/src/views/execution/components/GroupModal.vue @@ -0,0 +1,148 @@ + + + + + + + diff --git a/amoro-web/src/views/execution/components/List.vue b/amoro-web/src/views/execution/components/List.vue new file mode 100644 index 0000000000..908c7193be --- /dev/null +++ b/amoro-web/src/views/execution/components/List.vue @@ -0,0 +1,269 @@ + + + + + + + diff --git a/amoro-web/src/views/execution/components/ProcessList.vue b/amoro-web/src/views/execution/components/ProcessList.vue new file mode 100644 index 0000000000..5b8c043a81 --- /dev/null +++ b/amoro-web/src/views/execution/components/ProcessList.vue @@ -0,0 +1,286 @@ + + + + + + + + diff --git a/amoro-web/src/views/execution/components/ScaleOut.vue b/amoro-web/src/views/execution/components/ScaleOut.vue new file mode 100644 index 0000000000..001d403565 --- /dev/null +++ b/amoro-web/src/views/execution/components/ScaleOut.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/amoro-web/src/views/execution/components/TableList.vue b/amoro-web/src/views/execution/components/TableList.vue new file mode 100644 index 0000000000..2866bf2f27 --- /dev/null +++ b/amoro-web/src/views/execution/components/TableList.vue @@ -0,0 +1,284 @@ + + + + + + + + diff --git a/amoro-web/src/views/execution/index.vue b/amoro-web/src/views/execution/index.vue new file mode 100644 index 0000000000..7192fe5ccd --- /dev/null +++ b/amoro-web/src/views/execution/index.vue @@ -0,0 +1,233 @@ + + + + + + + diff --git a/amoro-web/src/views/resource/index.vue b/amoro-web/src/views/resource/index.vue index d4ab7ab4fa..08996ad994 100644 --- a/amoro-web/src/views/resource/index.vue +++ b/amoro-web/src/views/resource/index.vue @@ -148,6 +148,13 @@ export default defineComponent({ > + + +