This is an automated email from the ASF dual-hosted git repository.
tcodehuber028 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new 88d10940d [AMORO-2971] Remove the redundant status bar for the
Terminal (#2974)
88d10940d is described below
commit 88d10940ddac854e71c8af4da0fd12d225919c43
Author: tcodehuber <[email protected]>
AuthorDate: Fri Jul 5 15:27:12 2024 +0800
[AMORO-2971] Remove the redundant status bar for the Terminal (#2974)
* [AMORO-2971] Remove the redundant status bar for the Terminal
* remove unused code
* WIP [AMORO-3002] Complete internationalization for some remaining pages
(#3006)
[AMORO-3002] Complete internationalization for some remaining pages
* resolve conflicts
---------
Co-authored-by: chouchouji <[email protected]>
---
.../src/views/terminal/components/sql-result.vue | 7 ----
.../src/views/terminal/index.vue | 37 ++++++++++++----------
2 files changed, 20 insertions(+), 24 deletions(-)
diff --git
a/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
b/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
index 3487484ff..a17486abf 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
@@ -27,13 +27,6 @@ const isEmpty = computed(() => {
return !props.info || !props.info?.columns
})
-const status = computed(() => {
- return props.info?.status
-})
-
-// const innerWidth = computed(() => {
-// return window.innerWidth - 220 - 34
-// })
</script>
<template>
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue
b/amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue
index bf871af69..4b8af9845 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue
@@ -399,21 +399,6 @@ export default defineComponent({
}"
/>
</div>
- <div v-if="runStatus" class="run-status" :style="{ background:
bgcMap[runStatus] }">
- <template v-if="runStatus === 'Running' || runStatus ===
'Canceling'">
- <loading-outlined style="color: #1890ff" />
- </template>
- <template v-if="runStatus === 'Canceled' || runStatus ===
'Failed'">
- <close-circle-outlined style="color: #ff4d4f" />
- </template>
- <template v-if="runStatus === 'Finished'">
- <check-circle-outlined style="color: #52c41a" />
- </template>
- <template v-if="runStatus === 'Created'">
- <close-circle-outlined style="color:#333" />
- </template>
- <span class="g-ml-12">{{ $t(runStatus) }}</span>
- </div>
</div>
</div>
<div class="sql-shortcuts">
@@ -430,6 +415,23 @@ export default defineComponent({
</a-button>
</div>
</div>
+
+ <div v-if="runStatus" class="run-status" :style="{ background:
bgcMap[runStatus] }">
+ <template v-if="runStatus === 'Running' || runStatus ===
'Canceling'">
+ <loading-outlined style="color: #1890ff" />
+ </template>
+ <template v-if="runStatus === 'Canceled' || runStatus === 'Failed'">
+ <close-circle-outlined style="color: #ff4d4f" />
+ </template>
+ <template v-if="runStatus === 'Finished'">
+ <check-circle-outlined style="color: #52c41a" />
+ </template>
+ <template v-if="runStatus === 'Created'">
+ <close-circle-outlined style="color:#333" />
+ </template>
+ <span class="g-ml-12">{{ $t(runStatus) }}</span>
+ </div>
+
<!-- sql result -->
<div
class="sql-result" :style="{ height: `calc(100% -
${sqlResultHeight}px)` }"
@@ -638,13 +640,14 @@ export default defineComponent({
}
.run-status {
- padding: 6px 12px;
- position: absolute;
+ padding: 8px 0px;
+ position: flex;
left: 0;
bottom: 0;
width: 100%;
z-index: 2;
background-color: #fff;
+ border-top: 1px solid #e5e5e5;
}
.tab-operation {
