Skip to content

feat: using code editor instead of input for sql editing #678

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

Merged
merged 2 commits into from
May 14, 2025
Merged

feat: using code editor instead of input for sql editing #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bebf44
feat: using code editor instead of input for sql editing
LinuxSuRen May 13, 2025
283a721
update jq
LinuxSuRen May 14, 2025
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: 6 additions & 2 deletions console/atest-ui/src/views/DataManager.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const columns = ref([] as string[])
const queryTip = ref('')
const loadingStores = ref(true)
const showOverflowTooltip = ref(true)
const complexEditor = ref(false)
const dataFormat = ref('table')
const dataFormatOptions = ['table', 'json']
const queryDataMeta = ref({} as QueryDataMeta)
Expand All @@ -48,8 +49,10 @@ watch(store, (s) => {
case 'atest-store-elasticsearch':
case 'atest-store-etcd':
sqlQuery.value = '*'
complexEditor.value = false
break
default:
complexEditor.value = true
queryDataMeta.value.currentDatabase = ''
sqlQuery.value = ''
}
Expand Down Expand Up @@ -296,7 +299,7 @@ watch(largeContent, (e) => {
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item>
<el-form-item v-if="!complexEditor">
<HistoryInput :placeholder="queryTip" :callback="executeQuery" v-model="sqlQuery" />
</el-form-item>
</el-col>
Expand Down Expand Up @@ -328,6 +331,7 @@ watch(largeContent, (e) => {
</el-col>
</el-row>
</el-form>
<Codemirror v-model="sqlQuery" v-if="complexEditor" style="height: 180px"/>
</el-header>
<el-main>
<div style="display: flex; gap: 8px;">
Expand All @@ -336,7 +340,7 @@ watch(largeContent, (e) => {
<el-tag type="primary" v-for="label in queryDataMeta.labels">{{ label.value }}</el-tag>
<el-check-tag type="primary" :checked="showOverflowTooltip" @change="overflowChange" v-if="queryResult.length > 0">overflow</el-check-tag>
</div>
<el-table :data="queryResult" stripe v-if="dataFormat === 'table'" height="calc(100vh - 200px)" @cell-dblclick="tryShowPrettyJSON">
<el-table :data="queryResult" stripe v-if="dataFormat === 'table'" height="calc(100vh - 380px)" @cell-dblclick="tryShowPrettyJSON">
<el-table-column v-for="col in columns" :key="col" :prop="col" :label="col" sortable :show-overflow-tooltip="showOverflowTooltip" />
</el-table>
<Codemirror v-else-if="dataFormat === 'json'" v-model="queryResultAsJSON" />
Expand Down
5 changes: 3 additions & 2 deletions e2e/code-generator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
ARG LAN_ENV=docker.io/library/golang:1.21

FROM ghcr.io/linuxsuren/api-testing:master AS atest
FROM docker.io/stedolan/jq AS jq
FROM ghcr.io/linuxsuren/hd:v0.0.42 as downloader
RUN hd install jq
FROM $LAN_ENV

WORKDIR /workspace
COPY . .
COPY --from=jq /usr/local/bin/jq /usr/local/bin/jq
COPY --from=downloader /usr/local/bin/jq /usr/local/bin/jq
COPY --from=atest /usr/local/bin/atest /usr/local/bin/atest

CMD [ "/workspace/entrypoint.sh" ]
Loading