Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sql UI change #5

Merged
merged 1 commit into from
Nov 10, 2023
Merged

sql UI change #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions kyuubi-server/web-ui/src/locales/en_US/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ export default {
close_failed: 'Close {name} Failed',
cancel_succeeded: 'Cancel {name} Succeeded',
cancel_failed: 'Cancel {name} Failed',
run_failed: 'Run Sql Failed',
get_sql_log_failed: 'Get Sql Log Failed',
get_sql_result_failed: 'Get Sql Result Failed',
get_sql_metadata_failed: 'Get Sql Metadata Failed'
run_sql_failed: 'Run SQL Failed',
get_sql_log_failed: 'Get SQL Log Failed',
get_sql_result_failed: 'Get SQL Result Failed',
get_sql_metadata_failed: 'Get SQL Metadata Failed'
}
}
8 changes: 4 additions & 4 deletions kyuubi-server/web-ui/src/locales/zh_CN/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ export default {
close_failed: '关闭 {name} 失败',
cancel_succeeded: '取消 {name} 成功',
cancel_failed: '取消 {name} 失败',
run_failed: '运行失败',
get_sql_log_failed: '获取sql日志失败',
get_sql_result_failed: '获取sql结果失败',
get_sql_metadata_failed: '获取sql元数据失败'
run_sql_failed: '运行SQL失败',
get_sql_log_failed: '获取SQL日志失败',
get_sql_result_failed: '获取SQL结果失败',
get_sql_metadata_failed: '获取SQL元数据失败'
}
}
25 changes: 13 additions & 12 deletions kyuubi-server/web-ui/src/views/editor/components/Editor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,10 @@
<template>
<div class="editor">
<el-space>
<el-select
v-model="param.engineType"
disabled
:placeholder="$t('engine_type')">
<el-option
v-for="item in getEngineType()"
:key="item"
:label="item"
:value="item" />
</el-select>
<el-button
:disabled="!param.engineType || !editorVariables.content"
:loading="resultLoading"
type="primary"
type="success"
icon="VideoPlay"
@click="handleQuerySql">
{{ $t('operation.run') }}
Expand All @@ -52,6 +42,16 @@
</el-dropdown-menu>
</template>
</el-dropdown>
<el-select
v-model="param.engineType"
disabled
:placeholder="$t('engine_type')">
<el-option
v-for="item in getEngineType()"
:key="item"
:label="item"
:value="item" />
</el-select>
</el-space>
<section>
<MonacoEditor
Expand Down Expand Up @@ -196,7 +196,7 @@
})
}

const postError = (err: any, title = t('message.run_failed')) => {
const postError = (err: any, title = t('message.run_sql_failed')) => {
errorMessages.value.push({
title,
description: err?.response?.data?.message || err?.message || ''
Expand Down Expand Up @@ -266,6 +266,7 @@
}
.el-dropdown {
margin-left: 4px;
margin-right: 8px;
}
}

Expand Down