Skip to content

Commit 63970ef

Browse files
authored
fix: redis query page issues (#693)
Co-authored-by: rick <[email protected]>
1 parent 8d3799c commit 63970ef

File tree

1 file changed

+19
-27
lines changed

1 file changed

+19
-27
lines changed

console/atest-ui/src/views/DataManager.vue

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ watch(store, (s) => {
4848
switch (kind.value) {
4949
case 'atest-store-elasticsearch':
5050
case 'atest-store-etcd':
51+
case 'atest-store-redis':
5152
sqlQuery.value = '*'
5253
complexEditor.value = false
5354
break
@@ -92,15 +93,6 @@ const describeTable = (data: QueryData) => {
9293
executeQuery()
9394
}
9495
const queryTables = () => {
95-
switch (kind.value) {
96-
case 'atest-store-elasticsearch':
97-
if (sqlQuery.value === '') {
98-
sqlQuery.value = '*'
99-
}
100-
break
101-
default:
102-
sqlQuery.value = ``
103-
}
10496
executeQuery()
10597
}
10698
watch(kind, (k) => {
@@ -179,28 +171,30 @@ const ormDataHandler = (data: QueryData) => {
179171
180172
const keyValueDataHandler = (data: QueryData) => {
181173
queryResult.value = []
174+
columns.value = ['key', 'value']
182175
data.data.forEach(e => {
183-
const obj = new Map<string, string>();
184-
obj.set('key', e.key)
185-
obj.set('value', e.value)
186-
queryResult.value.push(obj)
187-
188-
columns.value = ['key', 'value']
176+
queryResult.value.push({
177+
key: e.key,
178+
value: e.value
179+
})
189180
})
190181
}
191182
192183
const executeQuery = async () => {
193-
return executeWithQuery(sqlQuery.value)
194-
}
195-
const executeWithQuery = async (sql: string) => {
196184
switch (kind.value) {
185+
case 'atest-store-elasticsearch':
197186
case 'atest-store-etcd':
198-
sqlQuery.value = '*'
199-
break;
200-
case '':
201-
return;
187+
case 'atest-store-redis':
188+
if (sqlQuery.value === '') {
189+
sqlQuery.value = '*'
190+
}
191+
break
192+
default:
193+
sqlQuery.value = ``
202194
}
203-
195+
return executeWithQuery(sqlQuery.value)
196+
}
197+
const executeWithQuery = async (sql: string) => {
204198
let success = false
205199
query.value.store = store.value
206200
query.value.key = queryDataMeta.value.currentDatabase
@@ -218,8 +212,6 @@ const executeWithQuery = async (sql: string) => {
218212
success = true
219213
break;
220214
case 'atest-store-etcd':
221-
keyValueDataHandler(data)
222-
break;
223215
case 'atest-store-redis':
224216
keyValueDataHandler(data)
225217
break;
@@ -240,7 +232,7 @@ const executeWithQuery = async (sql: string) => {
240232
return success
241233
}
242234
const nextPage = () => {
243-
query.value.offset += query.value.limit
235+
query.value.offset = Number(query.value.limit) + Number(query.value.offset)
244236
executeQuery()
245237
}
246238
const overflowChange = () => {
@@ -315,7 +307,7 @@ watch(largeContent, (e) => {
315307
</el-select>
316308
</el-col>
317309
</el-row>
318-
<el-row :gutter="10" v-if="kind === 'atest-store-elasticsearch'">
310+
<el-row :gutter="10" v-if="kind === 'atest-store-elasticsearch' || kind === 'atest-store-redis'">
319311
<el-col :span="10">
320312
<el-input type="number" v-model="query.offset">
321313
<template #prepend>Offset</template>

0 commit comments

Comments
 (0)