diff --git a/console/atest-ui/src/components/Button.vue b/console/atest-ui/src/components/Button.vue
new file mode 100644
index 0000000..e69de29
diff --git a/console/atest-ui/src/views/DataManager.vue b/console/atest-ui/src/views/DataManager.vue
index a4d0496..6546d54 100644
--- a/console/atest-ui/src/views/DataManager.vue
+++ b/console/atest-ui/src/views/DataManager.vue
@@ -34,8 +34,17 @@ watch(store, (s) => {
             return
         }
     })
-    queryDataMeta.value.currentDatabase = ''
-    sqlQuery.value = ''
+
+    switch (kind.value) {
+        case 'atest-store-elasticsearch':
+        case 'atest-store-etcd':
+            sqlQuery.value = '*'
+            break
+        default:
+            queryDataMeta.value.currentDatabase = ''
+            sqlQuery.value = ''
+    }
+
     executeQuery()
 })
 
@@ -63,13 +72,22 @@ const describeTable = (data: QueryData) => {
         case 'atest-store-cassandra':
             sqlQuery.value = `@describeTable_${queryDataMeta.value.currentDatabase}:${data.label}`
             break
+            break
         default:
             sqlQuery.value = `@describeTable_${data.label}`
     }
     executeQuery()
 }
 const queryTables = () => {
-    sqlQuery.value = ``
+    switch (kind.value) {
+        case 'atest-store-elasticsearch':
+            if (sqlQuery.value === '') {
+                sqlQuery.value = '*'
+            }
+            break
+        default:
+            sqlQuery.value = ``
+    }
     executeQuery()
 }
 watch(kind, (k) => {
@@ -84,6 +102,9 @@ watch(kind, (k) => {
         case 'atest-store-redis':
             queryTip.value = 'Enter key'
             break;
+        case 'atest-store-elasticsearch':
+            queryTip.value = 'field:value OR field:other'
+            break;
     }
 })
 
@@ -153,12 +174,6 @@ const executeQuery = async () => {
     return executeWithQuery(sqlQuery.value)
 }
 const executeWithQuery = async (sql: string) => {
-    switch (kind.value) {
-        case 'atest-store-etcd':
-            sqlQuery.value = '*'
-            break;
-    }
-
     let success = false
     try {
         const data = await API.DataQueryAsync(store.value, kind.value, queryDataMeta.value.currentDatabase, sql);
@@ -197,7 +212,7 @@ const executeWithQuery = async (sql: string) => {
 <template>
     <div>
         <el-container style="height: calc(100vh - 50px);">
-            <el-aside v-if="kind === 'atest-store-orm' || kind === 'atest-store-iotdb' || kind === 'atest-store-cassandra'">
+            <el-aside v-if="kind === 'atest-store-orm' || kind === 'atest-store-iotdb' || kind === 'atest-store-cassandra' || kind === 'atest-store-elasticsearch'">
                 <el-scrollbar>
                     <el-select v-model="queryDataMeta.currentDatabase" placeholder="Select database"
                         @change="queryTables" filterable>
diff --git a/console/atest-ui/src/views/net.ts b/console/atest-ui/src/views/net.ts
index 6e2f539..0ef2c1f 100644
--- a/console/atest-ui/src/views/net.ts
+++ b/console/atest-ui/src/views/net.ts
@@ -785,21 +785,10 @@ interface QueryObject {
     key: string
 }
 var DataQueryAsync = (store: string, kind: string, currentDatabase: string, query: string) => {
-    const queryObj = {} as QueryObject;
-    switch (kind) {
-        case 'atest-store-orm':
-        case 'atest-store-cassandra':
-        case 'atest-store-iotdb':
-            queryObj['sql'] = query;
-            queryObj['key'] = currentDatabase;
-            break;
-        case 'atest-store-etcd':
-        case 'atest-store-redis':
-        case 'atest-store-elasticsearch':
-            queryObj['key'] = query;
-            queryObj['sql'] = query;
-            break;
-    }
+    const queryObj = {
+        'key': currentDatabase,
+        'sql': query,
+    } as QueryObject;
     const requestOptions = {
         method: 'POST',
         headers: {